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

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.

Browse source
This commit is contained in:
Meredith L. Patterson 2013-02-20 21:03:34 -05:00
parent ab89b0fd4d
commit 810c06c6db
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/hammer.h
View file

@ -112,10 +112,13 @@ typedef bool (*HPredicate)(HParseResult *p);
typedef struct HParserVtable_ HParserVtable; typedef struct HParserVtable_ HParserVtable;
typedef struct HCFChoice_ HCFChoice; // forward declaration
typedef struct HParser_ { typedef struct HParser_ {
const HParserVtable *vtable; const HParserVtable *vtable;
void *env; void *env;
void *data; /* e.g., parse tables */ void *data; /* e.g., parse tables */
HCFChoice *desugared; /* if the parser can be desugared, its desugared form */
} HParser; } HParser;
// {{{ Stuff for benchmarking // {{{ Stuff for benchmarking

6
src/parsers/indirect.c
View file

@ -10,8 +10,10 @@ static bool indirect_isValidCF(void *env) {
return inner->vtable->isValidCF(inner->env); return inner->vtable->isValidCF(inner->env);
} }
static HCFChoice desugar_indirect(HAllocator *mm__, void *env) { static HCFChoice* desugar_indirect(HAllocator *mm__, void *env) {
HParser *p = (HParser*)env;
HParser *inner = (HParser*)p->env;
return inner->desugared;
} }
static const HParserVtable indirect_vt = { static const HParserVtable indirect_vt = {