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

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

View file

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