Added a void* user_data pointer to HAction

src/parsers/action.c

@@ -4,6 +4,7 @@
 typedef struct {
   const HParser *p;
   HAction action;
+  void* user_data;
 } HParseAction;
 
 static HParseResult* parse_action(void *env, HParseState *state) {
@@ -12,8 +13,8 @@ static HParseResult* parse_action(void *env, HParseState *state) {
     HParseResult *tmp = h_do_parse(a->p, state);
     //HParsedToken *tok = a->action(h_do_parse(a->p, state));
     if(tmp) {
-        const HParsedToken *tok = a->action(tmp);
-        return make_result(state->arena, (HParsedToken*)tok);
+      const HParsedToken *tok = a->action(tmp, a->user_data);
+      return make_result(state->arena, (HParsedToken*)tok);
     } else
       return NULL;
   } else // either the parser's missing or the action's missing
@@ -27,6 +28,7 @@ static void desugar_action(HAllocator *mm__, HCFStack *stk__, void *env) {
     HCFS_BEGIN_SEQ() {
       HCFS_DESUGAR(a->p);
     } HCFS_END_SEQ();
+    HCFS_THIS_CHOICE->user_data = a->user_data;
     HCFS_THIS_CHOICE->action = a->action;
     HCFS_THIS_CHOICE->reshape = h_act_first;
   } HCFS_END_CHOICE();
@@ -44,7 +46,7 @@ static bool action_isValidCF(void *env) {
 
 static bool h_svm_action_action(HArena *arena, HSVMContext *ctx, void* arg) {
   HParseResult res;
-  HAction action = arg;
+  HParseAction *a = arg;
   assert(ctx->stack_count >= 1);
   if (ctx->stack[ctx->stack_count-1]->token_type != TT_MARK) {
     assert(ctx->stack_count >= 2 && ctx->stack[ctx->stack_count-2]->token_type == TT_MARK);
@@ -56,7 +58,7 @@ static bool h_svm_action_action(HArena *arena, HSVMContext *ctx, void* arg) {
   }
   res.arena = arena;
 
-  HParsedToken *tok = action(&res);
+  HParsedToken *tok = a->action(&res, a->user_data);
   if (tok != NULL)
     ctx->stack[ctx->stack_count-1] = tok;
   else
@@ -69,7 +71,7 @@ static bool action_ctrvm(HRVMProg *prog, void* env) {
   h_rvm_insert_insn(prog, RVM_PUSH, 0);
   if (!h_compile_regex(prog, a->p))
     return false;
-  h_rvm_insert_insn(prog, RVM_ACTION, h_rvm_create_action(prog, h_svm_action_action, a->action));
+  h_rvm_insert_insn(prog, RVM_ACTION, h_rvm_create_action(prog, h_svm_action_action, a));
   return true;
 }
 
@@ -81,13 +83,14 @@ static const HParserVtable action_vt = {
   .compile_to_rvm = action_ctrvm,
 };
 
-HParser* h_action(const HParser* p, const HAction a) {
-  return h_action__m(&system_allocator, p, a);
+HParser* h_action(const HParser* p, const HAction a, void* user_data) {
+  return h_action__m(&system_allocator, p, a, user_data);
 }
 
-HParser* h_action__m(HAllocator* mm__, const HParser* p, const HAction a) {
+HParser* h_action__m(HAllocator* mm__, const HParser* p, const HAction a, void* user_data) {
   HParseAction *env = h_new(HParseAction, 1);
   env->p = p;
   env->action = a;
+  env->user_data = user_data;
   return h_new_parser(mm__, &action_vt, env);
 }

src/parsers/bits.c

@@ -17,7 +17,9 @@ static HParseResult* parse_bits(void* env, HParseState *state) {
   return make_result(state->arena, result);
 }
 
-static HParsedToken *reshape_bits(const HParseResult *p, bool signedp) {
+static HParsedToken *reshape_bits(const HParseResult *p, void* signedp_p) {
+  // signedp == NULL iff unsigned
+  bool signedp = (signedp_p != NULL);
   // XXX works only for whole bytes
   // XXX assumes big-endian
   assert(p->ast);
@@ -45,12 +47,6 @@ static HParsedToken *reshape_bits(const HParseResult *p, bool signedp) {
 
   return ret;
 }
-static HParsedToken *reshape_bits_unsigned(const HParseResult *p) {
-  return reshape_bits(p, false);
-}
-static HParsedToken *reshape_bits_signed(const HParseResult *p) {
-  return reshape_bits(p, true);
-}
 
 static void desugar_bits(HAllocator *mm__, HCFStack *stk__, void *env) {
   struct bits_env *bits = (struct bits_env*)env;
@@ -67,9 +63,9 @@ static void desugar_bits(HAllocator *mm__, HCFStack *stk__, void *env) {
 	HCFS_ADD_CHARSET(match_all);
       }
     } HCFS_END_SEQ();
-    HCFS_THIS_CHOICE->reshape = bits->signedp
-      ? reshape_bits_signed
-      : reshape_bits_unsigned;
+    HCFS_THIS_CHOICE->reshape = reshape_bits;
+    HCFS_THIS_CHOICE->user_data = bits->signedp ? HCFS_THIS_CHOICE : NULL; // HCFS_THIS_CHOICE is an arbitrary non-null pointer
+    
   } HCFS_END_CHOICE();
 }
 

src/parsers/optional.c

@@ -22,7 +22,7 @@ static bool opt_isValidCF(void *env) {
   return p->vtable->isValidCF(p->env);
 }
 
-static HParsedToken* reshape_optional(const HParseResult *p) {
+static HParsedToken* reshape_optional(const HParseResult *p, void* user_data) {
   assert(p->ast);
   assert(p->ast->token_type == TT_SEQUENCE);
 
@@ -52,6 +52,7 @@ static void desugar_optional(HAllocator *mm__, HCFStack *stk__, void *env) {
     HCFS_BEGIN_SEQ() {
     } HCFS_END_SEQ();
     HCFS_THIS_CHOICE->reshape = reshape_optional;
+    HCFS_THIS_CHOICE->user_data = NULL;
   } HCFS_END_CHOICE();
 }
 

src/parsers/sequence.c

@@ -43,7 +43,7 @@ static bool sequence_isValidCF(void *env) {
   return true;
 }
 
-static HParsedToken *reshape_sequence(const HParseResult *p) {
+static HParsedToken *reshape_sequence(const HParseResult *p, void* user_data) {
   assert(p->ast);
   assert(p->ast->token_type == TT_SEQUENCE);
 
@@ -72,6 +72,7 @@ static void desugar_sequence(HAllocator *mm__, HCFStack *stk__, void *env) {
 	HCFS_DESUGAR(s->p_array[i]);
     } HCFS_END_SEQ();
     HCFS_THIS_CHOICE->reshape = reshape_sequence;
+    HCFS_THIS_CHOICE->user_data = NULL;
   } HCFS_END_CHOICE();
 }
 

src/parsers/token.c

@@ -20,7 +20,7 @@ static HParseResult* parse_token(void *env, HParseState *state) {
 }
 
 
-static HParsedToken *reshape_token(const HParseResult *p) {
+static HParsedToken *reshape_token(const HParseResult *p, void* user_data) {
   // fetch sequence of uints from p
   assert(p->ast);
   assert(p->ast->token_type == TT_SEQUENCE);
@@ -52,6 +52,7 @@ static void desugar_token(HAllocator *mm__, HCFStack *stk__, void *env) {
 	HCFS_ADD_CHAR(tok->str[i]);
     } HCFS_END_SEQ();
     HCFS_THIS_CHOICE->reshape = reshape_token;
+    HCFS_THIS_CHOICE->user_data = NULL;
   } HCFS_END_CHOICE();
 }