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.

src/hammer.h

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

src/parsers/indirect.c

@@ -10,8 +10,10 @@ static bool indirect_isValidCF(void *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 = {