Merge branch 'master' of https://github.com/thequux/hammer
Conflicts: src/backends/llk.c
Showing
- HACKING 4 additions, 2 deletionsHACKING
- Makefile 6 additions, 4 deletionsMakefile
- src/backends/contextfree.h 147 additions, 0 deletionssrc/backends/contextfree.h
- src/backends/llk.c 3 additions, 3 deletionssrc/backends/llk.c
- src/backends/regex.c 3 additions, 0 deletionssrc/backends/regex.c
- src/cfgrammar.c 3 additions, 1 deletionsrc/cfgrammar.c
- src/desugar.c 12 additions, 2 deletionssrc/desugar.c
- src/glue.c 1 addition, 1 deletionsrc/glue.c
- src/internal.h 7 additions, 5 deletionssrc/internal.h
- src/parsers/action.c 9 additions, 13 deletionssrc/parsers/action.c
- src/parsers/and.c 0 additions, 6 deletionssrc/parsers/and.c
- src/parsers/attr_bool.c 9 additions, 13 deletionssrc/parsers/attr_bool.c
- src/parsers/bits.c 13 additions, 29 deletionssrc/parsers/bits.c
- src/parsers/butnot.c 0 additions, 6 deletionssrc/parsers/butnot.c
- src/parsers/ch.c 2 additions, 6 deletionssrc/parsers/ch.c
- src/parsers/charset.c 2 additions, 6 deletionssrc/parsers/charset.c
- src/parsers/choice.c 9 additions, 13 deletionssrc/parsers/choice.c
- src/parsers/difference.c 0 additions, 6 deletionssrc/parsers/difference.c
- src/parsers/end.c 2 additions, 5 deletionssrc/parsers/end.c
- src/parsers/epsilon.c 3 additions, 0 deletionssrc/parsers/epsilon.c
Loading
Please register or sign in to comment