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

Made sequence and choice variadic, and added test suite helper functions

Browse source
This commit is contained in:
Dan Hirsch 2012-05-12 00:40:54 +01:00
parent d13fbbf9c4
commit d5358a724b
5 changed files with 102 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/hammer.c
View file

@ -19,6 +19,7 @@
#include "internal.h"
#include <assert.h>
#include <string.h>
#include <stdarg.h>
parse_state_t* from(parse_state_t *ps, const size_t index) {
parse_state_t *ret = g_new(parse_state_t, 1);
@ -71,7 +72,10 @@ parse_result_t* do_parse(const parser_t* parser, parse_state_t *state) {
} else {
// It doesn't exist... run the
parse_result_t *res;
res = parser->fn(parser->env, state);
if (parser)
res = parser->fn(parser->env, state);
else
res = NULL;
if (state->input_stream.overrun)
res = NULL; // overrun is always failure.
// update the cache
@ -229,10 +233,27 @@ static parse_result_t* parse_sequence(void *env, parse_state_t *state) {
return make_result(tok);
}
const parser_t* sequence(const parser_t* p_array[]) {
size_t len = sizeof(p_array) / sizeof(parser_t*);
const parser_t* sequence(const parser_t *p, ...) {
va_list ap;
size_t len = 0;
const parser_t *arg;
va_start(ap, p);
do {
len++;
arg = va_arg(ap, const parser_t *);
} while (arg);
va_end(ap);
sequence_t *s = g_new(sequence_t, 1);
s->p_array = (const parser_t**)p_array; s->len = len;
s->p_array = g_new(const parser_t *, len);
va_start(ap, p);
s->p_array[0] = p;
for (size_t i = 1; i < len; i++) {
s->p_array[i] = va_arg(ap, const parser_t *);
} while (arg);
va_end(ap);
s->len = len;
parser_t *ret = g_new(parser_t, 1);
ret->fn = parse_sequence; ret->env = (void*)s;
return ret;
@ -252,10 +273,28 @@ static parse_result_t* parse_choice(void *env, parse_state_t *state) {
return NULL;
}
const parser_t* choice(const parser_t* p_array[]) {
size_t len = sizeof(p_array) / sizeof(parser_t*);
const parser_t* choice(const parser_t* p, ...) {
va_list ap;
size_t len = 0;
sequence_t *s = g_new(sequence_t, 1);
s->p_array = (const parser_t**)p_array; s->len = len;
const parser_t *arg;
va_start(ap, p);
do {
len++;
arg = va_arg(ap, const parser_t *);
} while (arg);
va_end(ap);
s->p_array = g_new(const parser_t *, len);
va_start(ap, p);
s->p_array[0] = p;
for (size_t i = 1; i < len; i++) {
s->p_array[i] = va_arg(ap, const parser_t *);
} while (arg);
va_end(ap);
s->len = len;
parser_t *ret = g_new(parser_t, 1);
ret->fn = parse_choice; ret->env = (void*)s;
return ret;
@ -479,6 +518,7 @@ static void test_range(void) {
g_check_failed(ret2);
}
#if 0
static void test_int64(void) {
uint8_t test1[8] = { 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00 };
uint8_t test2[7] = { 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00 };
@ -578,6 +618,8 @@ static void test_float32(void) {
g_check_cmpfloat(ret1->ast->flt, ==, 1);
g_check_failed(ret2);
}
#endif
static void test_whitespace(void) {
uint8_t test1[1] = { 'a' };
@ -620,8 +662,7 @@ static void test_not_in(void) {
static void test_end_p(void) {
uint8_t test1[1] = { 'a' };
uint8_t test2[2] = { 'a', 'a' };
const parser_t *p_array[2] = { ch('a'), end_p() };
const parser_t *end_p_ = sequence(p_array);
const parser_t *end_p_ = sequence(ch('a'), end_p(), NULL);
parse_result_t *ret1 = parse(end_p_, test1, 1);
parse_result_t *ret2 = parse(end_p_, test2, 2);
g_check_cmpint(ret1->ast->uint, ==, 'a');
@ -636,22 +677,16 @@ static void test_nothing_p(void) {
}
static void test_sequence(void) {
uint8_t test1[2] = { 'a', 'b' };
uint8_t test2[1] = { 'a' };
uint8_t test3[1] = { 'b' };
uint8_t test4[3] = { 'a', ' ', 'b' };
uint8_t test5[4] = { 'a', ' ', ' ', 'b' };
uint8_t test6[2] = { 'a', 'b' };
const parser_t *s1[2] = { ch('a'), ch('b') };
const parser_t *s2[2] = { ch('a'), whitespace(ch('b')) };
const parser_t *sequence_1 = sequence(s1);
const parser_t *sequence_2 = sequence(s2);
parse_result_t *ret1 = parse(sequence_1, test1, 2);
parse_result_t *ret2 = parse(sequence_1, test2, 1);
parse_result_t *ret3 = parse(sequence_1, test3, 1);
parse_result_t *ret4 = parse(sequence_2, test4, 3);
parse_result_t *ret5 = parse(sequence_2, test5, 4);
parse_result_t *ret6 = parse(sequence_2, test6, 2);
const parser_t *sequence_1 = sequence(ch('a'), ch('b'), NULL);
const parser_t *sequence_2 = sequence(ch('a'), whitespace(ch('b')), NULL);
g_check_parse_ok(sequence_1, "ab", 2, "(<41> <42>)");
g_check_parse_failed(sequence_1, "a", 1);
g_check_parse_failed(sequence_1, "b", 1);
g_check_parse_ok(sequence_2, "ab", 2, "(<41> <42>)");
g_check_parse_ok(sequence_2, "a b", 3, "(<41> <42>)");
g_check_parse_ok(sequence_2, "a b", 4, "(<41> <42>)");
//g_check_cmpseq(ret1->ast->
}
@ -727,6 +762,7 @@ void register_parser_tests(void) {
g_test_add_func("/core/parser/token", test_token);
g_test_add_func("/core/parser/ch", test_ch);
g_test_add_func("/core/parser/range", test_range);
#if 0
g_test_add_func("/core/parser/int64", test_int64);
g_test_add_func("/core/parser/int32", test_int32);
g_test_add_func("/core/parser/int16", test_int16);
@ -737,6 +773,7 @@ void register_parser_tests(void) {
g_test_add_func("/core/parser/uint8", test_uint8);
g_test_add_func("/core/parser/float64", test_float64);
g_test_add_func("/core/parser/float32", test_float32);
#endif
g_test_add_func("/core/parser/whitespace", test_whitespace);
g_test_add_func("/core/parser/action", test_action);
g_test_add_func("/core/parser/left_factor_action", test_left_factor_action);