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

Merge branch 'master' of 10.24.0.2:working/hammer

Browse source
This commit is contained in:
Dan Hirsch 2012-05-13 01:25:58 +01:00
commit bd6e7d1b63
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/hammer.c
View file

@ -58,7 +58,7 @@ parse_result_t* do_parse(const parser_t* parser, parse_state_t *state) {
// It doesn't exist, so create a dummy result to cache // It doesn't exist, so create a dummy result to cache
LR_t *base = a_new(LR_t, 1); LR_t *base = a_new(LR_t, 1);
base->seed = NULL; base->rule = parser; base->head = NULL; base->seed = NULL; base->rule = parser; base->head = NULL;
g_queue_push_head(state->input_stream.lr_stack, base); g_queue_push_head(state->lr_stack, base);
// cache it // cache it
parser_cache_value_t *dummy = a_new(parser_cache_value_t, 1); parser_cache_value_t *dummy = a_new(parser_cache_value_t, 1);
dummy->value_type = PC_LEFT; dummy->left = base; dummy->value_type = PC_LEFT; dummy->left = base;
@ -79,7 +79,7 @@ parse_result_t* do_parse(const parser_t* parser, parse_state_t *state) {
} }
#endif #endif
// the base variable has passed equality tests with the cache // the base variable has passed equality tests with the cache
g_queue_pop_head(state->input_stream.lr_stack); g_queue_pop_head(state->lr_stack);
// setupLR, used below, mutates the LR to have a head if appropriate, so we check to see if we have one // setupLR, used below, mutates the LR to have a head if appropriate, so we check to see if we have one
if (NULL == base->head) { if (NULL == base->head) {
parser_cache_value_t *right = a_new(parser_cache_value_t, 1); parser_cache_value_t *right = a_new(parser_cache_value_t, 1);
@ -95,7 +95,7 @@ parse_result_t* do_parse(const parser_t* parser, parse_state_t *state) {
// it exists! // it exists!
parser_cache_value_t *value = g_hash_table_lookup(state->cache, key); parser_cache_value_t *value = g_hash_table_lookup(state->cache, key);
if (PC_LEFT == value->value_type) { if (PC_LEFT == value->value_type) {
setupLR(parser, state->input_stream.lr_stack, value->left); setupLR(parser, state->lr_stack, value->left);
return value->left->seed; // BUG: this might not be correct return value->left->seed; // BUG: this might not be correct
} else { } else {
return value->right; return value->right;
@ -685,7 +685,7 @@ parse_result_t* parse(const parser_t* parser, const uint8_t* input, size_t lengt
parse_state->input_stream.overrun = 0; parse_state->input_stream.overrun = 0;
parse_state->input_stream.endianness = BIT_BIG_ENDIAN | BYTE_BIG_ENDIAN; parse_state->input_stream.endianness = BIT_BIG_ENDIAN | BYTE_BIG_ENDIAN;
parse_state->input_stream.length = length; parse_state->input_stream.length = length;
g_queue_init(parse_state->input_stream.lr_stack); parse_state->lr_stack = g_queue_new();
parse_state->arena = arena; parse_state->arena = arena;
parse_result_t *res = do_parse(parser, parse_state); parse_result_t *res = do_parse(parser, parse_state);
// tear down the parse state. For now, leak like a sieve. // tear down the parse state. For now, leak like a sieve.

2
src/hammer.h
View file

@ -43,13 +43,13 @@ typedef struct input_stream {
char bit_offset; char bit_offset;
char endianness; char endianness;
char overrun; char overrun;
GQueue *lr_stack;
} input_stream_t; } input_stream_t;
typedef struct parse_state { typedef struct parse_state {
GHashTable *cache; GHashTable *cache;
input_stream_t input_stream; input_stream_t input_stream;
arena_t arena; arena_t arena;
GQueue *lr_stack;
} parse_state_t; } parse_state_t;
typedef enum token_type { typedef enum token_type {