Merge remote-tracking branch 'upstream/master' into
better_backend_handling Conflicts resolved: src/SConscript src/test_suite.h
Showing
- .gitignore 23 additions, 14 deletions.gitignore
- HACKING 18 additions, 16 deletionsHACKING
- Makefile 1 addition, 1 deletionMakefile
- SConstruct 42 additions, 5 deletionsSConstruct
- docs/hammerman.3 5 additions, 3 deletionsdocs/hammerman.3
- examples/SConscript 9 additions, 2 deletionsexamples/SConscript
- examples/base64.c 12 additions, 58 deletionsexamples/base64.c
- examples/base64_sem1.c 4 additions, 2 deletionsexamples/base64_sem1.c
- examples/base64_sem2.c 4 additions, 2 deletionsexamples/base64_sem2.c
- examples/ttuser.c 140 additions, 0 deletionsexamples/ttuser.c
- src/SConscript 23 additions, 5 deletionssrc/SConscript
- src/allocator.c 142 additions, 22 deletionssrc/allocator.c
- src/allocator.h 23 additions, 0 deletionssrc/allocator.h
- src/backends/glr.c 3 additions, 1 deletionsrc/backends/glr.c
- src/backends/lalr.c 30 additions, 18 deletionssrc/backends/lalr.c
- src/backends/llk.c 1 addition, 1 deletionsrc/backends/llk.c
- src/backends/lr.c 10 additions, 0 deletionssrc/backends/lr.c
- src/backends/packrat.c 77 additions, 27 deletionssrc/backends/packrat.c
- src/backends/regex.c 12 additions, 9 deletionssrc/backends/regex.c
- src/benchmark.c 1 addition, 1 deletionsrc/benchmark.c
Loading
Please register or sign in to comment