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

remove useless desugar_unimplemented; revert incorrect changes to test_llk()

Browse source
This commit is contained in:
Meredith L. Patterson 2013-05-24 20:10:21 -07:00
parent 02d68f6d18
commit 8618f9cb62
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/backends/llk.c
View file

@ -108,7 +108,7 @@ static void stringmap_merge(HHashSet *workset, HCFStringMap *dst, HCFStringMap *
if(src->epsilon_branch) {
if(dst->epsilon_branch)
dst->epsilon_branch =
combine_entries(workset, dst->epsilon_branch, src->epsilon_branch);
combine_entries(workset, dst->epsilon_branch, src->epsilon_branch);
else
dst->epsilon_branch = src->epsilon_branch;
} else {
@ -122,7 +122,7 @@ static void stringmap_merge(HHashSet *workset, HCFStringMap *dst, HCFStringMap *
if(src->end_branch) {
if(dst->end_branch)
dst->end_branch =
combine_entries(workset, dst->end_branch, src->end_branch);
combine_entries(workset, dst->end_branch, src->end_branch);
else
dst->end_branch = src->end_branch;
}
@ -412,10 +412,10 @@ HParseResult *h_llk_parse(HAllocator* mm__, const HParser* parser, HInputStream*
h_delete_arena(tarena);
return make_result(arena, seq->elements[0]);
no_parse:
h_delete_arena(tarena);
h_delete_arena(arena);
return NULL;
no_parse:
h_delete_arena(tarena);
h_delete_arena(arena);
return NULL;
}
@ -458,9 +458,9 @@ int test_llk(void)
printf("derive epsilon: ");
h_pprint_symbolset(stdout, g, g->geneps, 0);
printf("first(A) = ");
h_pprint_stringset(stdout, g, h_first(2, g, g->start), 0);
printf("follow(C) = ");
h_pprint_stringset(stdout, g, h_follow(2, g, h_desugar(&system_allocator, NULL, c)), 0);
h_pprint_stringset(stdout, h_first(3, g, g->start), 0);
// printf("follow(C) = ");
// h_pprint_stringset(stdout, h_follow(3, g, h_desugar(&system_allocator, NULL, c)), 0);
if(h_compile(p, PB_LLk, (void *)3)) {
fprintf(stderr, "does not compile\n");

7
src/parsers/unimplemented.c
View file

@ -12,16 +12,11 @@ static HParseResult* parse_unimplemented(void* env, HParseState *state) {
return &result;
}
static HCFChoice* desugar_unimplemented(HAllocator *mm__, HCFStack *stk__, void *env) {
assert_message(0, "'h_unimplemented' is not context-free, can't be desugared");
return NULL;
}
static const HParserVtable unimplemented_vt = {
.parse = parse_unimplemented,
.isValidRegular = h_false,
.isValidCF = h_false,
.desugar = desugar_unimplemented,
.desugar = NULL,
.compile_to_rvm = h_not_regular,
};