Commit graph

98 commits

Author SHA1 Message Date
Dan Hirsch
b9a33f2c98 More testcases work 2013-05-24 12:22:15 +02:00
Meredith L. Patterson
1c7e9947a4 merging in aegis' JNI bindings 2013-05-23 00:58:27 -07:00
Sven M. Hallberg
29cee318f9 move the h_act_* functions to src/actions.c 2013-05-20 14:58:20 +02:00
Sven M. Hallberg
286458f58a parser->data got renamed to backend_data, also h_llk_free 2013-05-11 22:02:59 +02:00
Sven M. Hallberg
c64a4e435e Merge remote-tracking branch 'tq/master' into LL such that it compiles
Conflicts:
	src/Makefile
	src/backends/packrat.c
	src/compile.c
	src/hammer.h
	src/internal.h
	src/parsers/action.c
	src/parsers/and.c
	src/parsers/attr_bool.c
	src/parsers/bits.c
	src/parsers/butnot.c
	src/parsers/ch.c
	src/parsers/charset.c
	src/parsers/choice.c
	src/parsers/difference.c
	src/parsers/end.c
	src/parsers/epsilon.c
	src/parsers/ignore.c
	src/parsers/ignoreseq.c
	src/parsers/indirect.c
	src/parsers/int_range.c
	src/parsers/many.c
	src/parsers/not.c
	src/parsers/nothing.c
	src/parsers/optional.c
	src/parsers/sequence.c
	src/parsers/token.c
	src/parsers/unimplemented.c
	src/parsers/whitespace.c
	src/parsers/xor.c
2013-05-11 19:09:22 +02:00
Sven M. Hallberg
369dbcd21f actually, just cast off the const inside h_compile 2013-05-11 15:10:31 +02:00
aegis
106b8bb6a7 JNI ready for testing. -fPIC enabled for objects in src and jni. 2013-05-10 12:05:20 +02:00
Sven M. Hallberg
65ee3593bd compile function can't take a const parser 2013-05-08 18:01:55 +02:00
Dan Hirsch
13088c9d7a Finshed up the regex backend 2013-04-26 20:36:54 -07:00
aegis
f817211446 Merge remote branch 'upstream/master'
Conflicts:
	src/hammer.h
2013-04-23 16:31:03 +02:00
Sven M. Hallberg
1325ebcdd1 add LL backend stub 2013-04-17 15:10:33 +02:00
Dan Hirsch
f5245eaa23 Whoops. Meant to compile that first 2013-03-17 22:01:54 -07:00
Dan Hirsch
17b03dbf4d Added implementations of framework functions 2013-03-17 20:17:55 -07:00
Dan Hirsch
c19d7bb66e Regex VM finished but untested. 2013-03-09 21:42:49 -08:00
Meredith L. Patterson
22067685c3 didn't need that comment anyway 2013-02-20 21:46:25 -05:00
Meredith L. Patterson
810c06c6db Desugaring functions are all done! But we're not ready for the CF backends yet because desugared structures still need to be stashed in the parser. 2013-02-20 21:03:34 -05:00
Meredith L. Patterson
156be7a559 Still doesn't build, but desugaring is farther along 2013-02-02 19:31:18 -05:00
Sven M. Hallberg
70aaf1308c massage glue api around some, add a bunch of dummy declarations 2013-01-25 18:12:00 +01:00
Dan Hirsch
b8314f6662 Added regex backend, does not compile 2013-01-13 17:01:10 +01:00
Sven M. Hallberg
4d0ec07c1a make TT_USER > TT_ERR, remove TT_MAX 2013-01-07 23:44:26 +01:00
Meredith L. Patterson
36e1f66de0 Expanded vtable for methods to determine whether a combinator is ok to use with regular or CF grammars. 2012-12-18 18:10:40 -05:00
Meredith L. Patterson
e9b49cf24c gcc 4.4 requires stdarg in hammer.h 2012-11-11 12:39:23 -05:00
Meredith L. Patterson
6893987cbc h_benchmark and h_benchmark_report work. Need tidying. 2012-11-09 01:50:07 -05:00
Meredith L. Patterson
c24044230b Benchmark is actually broken right now, for mysterious double-free related reasons. I will dig into this tomorrow. 2012-11-08 01:36:19 -05:00
Meredith L. Patterson
21ec962d76 Working on benchmarking test. A lot of things needed to be const and weren't. 2012-11-05 23:08:18 -05:00
Dan Hirsch
d0d9a94fd0 Added benchmark skeleton, and at least stubs for all of the necessary functions 2012-11-02 17:16:53 -04:00
Meredith L. Patterson
158b2b3ba6 Removed all glib functions from everything other than the test suite. 2012-10-10 16:24:12 +02:00
Dan Hirsch
d5729efa1f Replaced glib memory allocation 2012-10-10 15:58:03 +02:00
ægis
85e1ca8235 Make enum values of HTokenType in hammer.h explicit 2012-09-28 17:57:46 +02:00
Meredith L. Patterson
1f3a75fafe Merge pull request #3 from pesco/master
add h_in (counterpart to h_not_in)
2012-08-12 01:20:59 -07:00
Meredith L. Patterson
ee32c75837 Pulling more bitwriter changes 2012-07-27 15:29:25 -07:00
Dan Hirsch
68e78fd4b8 Finished bitwriter implementation 2012-07-27 15:28:55 -07:00
Meredith L. Patterson
b698e02b0c Merge bitwriter 2012-07-27 15:27:36 -07:00
Dan Hirsch
1b9314e73e Added bitwriter framework 2012-07-27 15:24:35 -07:00
Meredith L. Patterson
fa093d3b06 Added h_parse_result_free(). 2012-07-27 15:06:40 -07:00
Sven M. Hallberg
d57558bf13 Merge branch 'ignoreseq' 2012-06-02 17:32:28 +02:00
Sven M. Hallberg
7724ff9e6f add h_left, h_right, h_middle combinators 2012-06-02 17:31:06 +02:00
Sven M. Hallberg
7d818e2570 Merge branch 'enable-indirect' 2012-06-01 20:00:51 +02:00
Sven M. Hallberg
4f6989d3ef enable h_indirect 2012-06-01 20:00:10 +02:00
Sven M. Hallberg
2d5b90e174 add h_in (counterpart to h_not_in) 2012-05-29 00:01:30 +02:00
Meredith L. Patterson
8d74686a7e minor changes 2012-05-26 19:15:56 +02:00
Dan Hirsch
6a2f10df0c Changed parsers to use vtables instead of just a function pointer 2012-05-26 15:15:38 +02:00
Dan Hirsch
0284c99f12 Renamed all the public functions 2012-05-26 14:06:52 +02:00
Dan Hirsch
199cde7058 Renamed more types 2012-05-26 13:01:23 +02:00
Dan Hirsch
b10ef575e2 Renamed token_type_t 2012-05-26 12:05:23 +02:00
Dan Hirsch
8cc526f13e Renamed parse state 2012-05-26 12:03:58 +02:00
Meredith L. Patterson
8959d6db07 action is all const all the time. Now to write the dns action. 2012-05-24 19:15:24 +02:00
Dan Hirsch
40be28fb7e Merge remote-tracking branch 'bunter/master'
Also, fix makefile

Conflicts:
	src/hammer.c
2012-05-24 15:51:42 +02:00
Dan Hirsch
5d77c4307f Fix difference and butnot 2012-05-24 15:35:04 +02:00
Meredith L. Patterson
13395d8a54 counted_array now holds parsed_token_t's. TQ will fix the problem with accumulate_size. Compile-time bounds checks added to int_range. 2012-05-24 13:22:43 +02:00