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