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

clear arena exception handler when exiting llk_parse_chunk_

Browse source
This commit is contained in:
Sven M. Hallberg 2015-12-04 13:13:06 +01:00
parent 9602caf64f
commit d28f182c4f
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/backends/llk.c
View file

@ -383,10 +383,9 @@ static HCountedArray *llk_parse_chunk_(HLLkState *s, const HParser* parser,
HArena *arena = s->arena; HArena *arena = s->arena;
HArena *tarena = s->tarena; HArena *tarena = s->tarena;
HSlist *stack = s->stack; HSlist *stack = s->stack;
HCountedArray *seq = s->seq;
size_t kmax = table->kmax; size_t kmax = table->kmax;
if(!seq) if(!s->seq)
return NULL; // parse already failed return NULL; // parse already failed
// out-of-memory handling // out-of-memory handling
@ -396,6 +395,8 @@ static HCountedArray *llk_parse_chunk_(HLLkState *s, const HParser* parser,
if(setjmp(except)) if(setjmp(except))
goto no_parse; goto no_parse;
HCountedArray *seq = s->seq;
if(s->win.length > 0) { if(s->win.length > 0) {
append_win(kmax, s, chunk); append_win(kmax, s, chunk);
stream = &s->win; stream = &s->win;
@ -534,10 +535,15 @@ static HCountedArray *llk_parse_chunk_(HLLkState *s, const HParser* parser,
// since we started with a single nonterminal on the stack, seq should // since we started with a single nonterminal on the stack, seq should
// contain exactly the parse result. // contain exactly the parse result.
assert(seq->used == 1); assert(seq->used == 1);
end:
h_arena_set_except(arena, NULL);
h_arena_set_except(tarena, NULL);
return seq; return seq;
no_parse: no_parse:
return NULL; seq = NULL;
goto end;
need_input: need_input:
if(stream->last_chunk) if(stream->last_chunk)
@ -545,7 +551,7 @@ static HCountedArray *llk_parse_chunk_(HLLkState *s, const HParser* parser,
if(tok) if(tok)
h_arena_free(arena, tok); // no result, yet h_arena_free(arena, tok); // no result, yet
h_slist_push(stack, x); // try this symbol again next time h_slist_push(stack, x); // try this symbol again next time
return seq; goto end;
} }
static HParseResult *llk_parse_finish_(HAllocator *mm__, HLLkState *s) static HParseResult *llk_parse_finish_(HAllocator *mm__, HLLkState *s)