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

Merge branch 'python-bindings' of https://github.com/abiggerhammer/hammer into python-bindings

Browse source 
Conflicts:
	src/bindings/python/SConscript
	src/bindings/python/hammer_tests.py
	src/bindings/swig/hammer.i
	src/hammer.h
	src/parsers/choice.c
	src/parsers/sequence.c
This commit is contained in:
Meredith L. Patterson 2013-11-26 11:35:55 -08:00
commit ef235136d9
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -507,4 +507,3 @@ class TestRightrec(unittest.TestCase):
# # self.assertEqual(self.parser.parse("d+d+d"), ["d", "+", "d", "+", "d"]) # # self.assertEqual(self.parser.parse("d+d+d"), ["d", "+", "d", "+", "d"])
# # def test_failure(self): # # def test_failure(self):
# # self.assertEqual(self.parser.parse("d+"), None) # # self.assertEqual(self.parser.parse("d+"), None)

2
src/parsers/choice.c
View file

@ -143,7 +143,7 @@ HParser* h_choice__ma(HAllocator* mm__, void *args[]) {
s->len = len; s->len = len;
HParser *ret = h_new(HParser, 1); HParser *ret = h_new(HParser, 1);
ret->vtable = &choice_vt; ret->vtable = &choice_vt;
ret->env = (void*)s; ret->env = (void*)s;
ret->backend = PB_MIN; ret->backend = PB_MIN;
return ret; return ret;

4
src/parsers/sequence.c
View file

@ -160,8 +160,8 @@ HParser* h_sequence__ma(HAllocator* mm__, void *args[]) {
s->len = len; s->len = len;
HParser *ret = h_new(HParser, 1); HParser *ret = h_new(HParser, 1);
ret->vtable = &sequence_vt; ret->vtable = &sequence_vt;
ret->env = (void*)s; ret->env = (void*)s;
ret->backend = PB_MIN; ret->backend = PB_MIN;
return ret; return ret;
} }