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

fix infinite loop in isValidCF with indirect

Browse source
This commit is contained in:
Meredith L. Patterson 2014-04-20 21:40:09 +02:00
parent bab376cab7
commit 27f08df1d3
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/parsers/indirect.c
View file

@ -1,16 +1,28 @@
#include "parser_internal.h" #include "parser_internal.h"
typedef struct HIndirectEnv_ {
const HParser* parser;
bool touched;
} HIndirectEnv;
static HParseResult* parse_indirect(void* env, HParseState* state) { static HParseResult* parse_indirect(void* env, HParseState* state) {
return h_do_parse(env, state); return h_do_parse(((HIndirectEnv*)env)->parser, state);
} }
static bool indirect_isValidCF(void *env) { static bool indirect_isValidCF(void *env) {
HParser *p = (HParser*)env; HIndirectEnv *ie = (HIndirectEnv*)env;
return p->vtable->isValidCF(p->env); if (ie->touched)
return true;
ie->touched = true;
const HParser *p = ie->parser;
// self->vtable->isValidCF = h_true;
bool ret = p->vtable->isValidCF(p->env);
ie->touched = false;
return ret;
} }
static void desugar_indirect(HAllocator *mm__, HCFStack *stk__, void *env) { static void desugar_indirect(HAllocator *mm__, HCFStack *stk__, void *env) {
HCFS_DESUGAR( (HParser *)env ); HCFS_DESUGAR( ((HIndirectEnv *)env)->parser );
} }
static const HParserVtable indirect_vt = { static const HParserVtable indirect_vt = {
@ -27,12 +39,15 @@ void h_bind_indirect__m(HAllocator *mm__, HParser* indirect, const HParser* inne
void h_bind_indirect(HParser* indirect, const HParser* inner) { void h_bind_indirect(HParser* indirect, const HParser* inner) {
assert_message(indirect->vtable == &indirect_vt, "You can only bind an indirect parser"); assert_message(indirect->vtable == &indirect_vt, "You can only bind an indirect parser");
indirect->env = (void*)inner; ((HIndirectEnv*)indirect->env)->parser = inner;
} }
HParser* h_indirect() { HParser* h_indirect() {
return h_indirect__m(&system_allocator); return h_indirect__m(&system_allocator);
} }
HParser* h_indirect__m(HAllocator* mm__) { HParser* h_indirect__m(HAllocator* mm__) {
return h_new_parser(mm__, &indirect_vt, NULL); HIndirectEnv *env = h_new(HIndirectEnv, 1);
env->parser = NULL;
env->touched = false;
return h_new_parser(mm__, &indirect_vt, env);
} }