emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AttrBool working

Browse source
This commit is contained in:
Dan Hirsch 2013-11-24 18:43:14 -06:00
parent 294bca3fce
commit 43357bbcda
2 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/bindings/python/hammer_tests.py
View file

@ -402,15 +402,15 @@ class TestEpsilonP3(unittest.TestCase):
def test_failure(self): def test_failure(self):
pass pass
# class TestAttrBool(unittest.TestCase): class TestAttrBool(unittest.TestCase):
# @classmethod @classmethod
# def setUpClass(cls): def setUpClass(cls):
# cls.parser = h.h_attr_bool(h.h_many1(h.h_choice__a([h.h_ch("a"), h.h_ch("b")])), lambda x: x[0] == x[1]) cls.parser = h.h_attr_bool(h.h_many1(h.h_choice__a([h.h_ch("a"), h.h_ch("b")])), lambda x: x[0] == x[1])
# def test_success(self): def test_success(self):
# self.assertEqual(h.h_parse(self.parser, "aa"), ["a", "a"]) self.assertEqual(h.h_parse(self.parser, "aa"), ("a", "a"))
# self.assertEqual(h.h_parse(self.parser, "bb"), ["b", "b"]) self.assertEqual(h.h_parse(self.parser, "bb"), ("b", "b"))
# def test_failure(self): def test_failure(self):
# self.assertEqual(h.h_parse(self.parser, "ab"), None) self.assertEqual(h.h_parse(self.parser, "ab"), None)
class TestAnd1(unittest.TestCase): class TestAnd1(unittest.TestCase):
@classmethod @classmethod

32
src/bindings/swig/hammer.i
View file

@ -135,26 +135,28 @@
/*
%typemap(in) (HPredicate* pred, void* user_data) { %typemap(in) (HPredicate pred, void* user_data) {
Py_INCREF($input); Py_INCREF($input);
$2 = $input; $2 = $input;
$1 = call_predicate; $1 = call_predicate;
} }
*/
%typemap(in) (const HAction a, void* user_data) { %typemap(in) (const HAction a, void* user_data) {
Py_INCREF($input); Py_INCREF($input);
$2 = $input; $2 = $input;
$1 = call_action; $1 = call_action;
} }
%inline { %inline %{
struct HParsedToken_; struct HParsedToken_;
struct HParseResult_; struct HParseResult_;
static PyObject* hpt_to_python(const struct HParsedToken_ *token); static PyObject* hpt_to_python(const struct HParsedToken_ *token);
static struct HParsedToken_* call_action(const struct HParseResult_ *p, void* user_data); static struct HParsedToken_* call_action(const struct HParseResult_ *p, void* user_data);
} static int call_predicate(const struct HParseResult_ *p, void* user_data);
%}
#else #else
#warning no uint8_t* typemaps defined #warning no uint8_t* typemaps defined
#endif #endif
@ -164,6 +166,7 @@
#include "allocator.h" #include "allocator.h"
#include "hammer.h" #include "hammer.h"
#include "internal.h" #include "internal.h"
#include "glue.h"
%} %}
%include "allocator.h" %include "allocator.h"
%include "hammer.h" %include "hammer.h"
@ -233,11 +236,30 @@
assert(ret != NULL); assert(ret != NULL);
} }
// TODO: add reference to ret to parse-local data // TODO: add reference to ret to parse-local data
// For now, just hold onto reference
HParsedToken *tok = h_make(p->arena, h_tt_python, ret); HParsedToken *tok = h_make(p->arena, h_tt_python, ret);
return tok; return tok;
} }
static int call_predicate(const struct HParseResult_ *p, void* user_data) {
PyObject *callable = user_data;
PyObject *ret = PyObject_CallFunctionObjArgs(callable,
hpt_to_python(p->ast),
NULL);
int rret = 0;
if (ret == NULL) {
// TODO: throw exception
PyErr_Print();
assert(ret != NULL);
}
// TODO: add reference to ret to parse-local data
rret = PyObject_IsTrue(ret);
Py_DECREF(ret);
return rret;
}
} }
#endif #endif