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

More testcases work

Browse source
This commit is contained in:
Dan Hirsch 2013-05-24 12:22:15 +02:00
parent c1b7d9307d
commit b9a33f2c98
7 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/parsers/charset.c
View file

@ -56,7 +56,7 @@ static bool cs_ctrvm(HRVMProg *prog, void *env) {
if (collecting) {
collecting = false;
uint16_t insn = h_rvm_insert_insn(prog, RVM_FORK, 0);
h_rvm_insert_insn(prog, RVM_MATCH, range_start | i << 8);
h_rvm_insert_insn(prog, RVM_MATCH, range_start | (i-1) << 8);
h_rvm_insert_insn(prog, RVM_GOTO, 0);
h_rvm_patch_arg(prog, insn, h_rvm_get_ip(prog));
}

29
src/parsers/choice.c
View file

@ -3,7 +3,7 @@
typedef struct {
size_t len;
const HParser **p_array;
HParser **p_array;
} HSequence;
@ -58,16 +58,15 @@ static HCFChoice* desugar_choice(HAllocator *mm__, void *env) {
static bool choice_ctrvm(HRVMProg *prog, void* env) {
HSequence *s = (HSequence*)env;
uint16_t gotos[s->len];
uint16_t start = h_rvm_get_ip(prog);
for (size_t i=0; i<s->len; ++i) {
uint16_t insn = h_rvm_insert_insn(prog, RVM_FORK, 0);
if (!h_compile_regex(prog, s->p_array[i]->env))
if (!h_compile_regex(prog, s->p_array[i]))
return false;
gotos[i] = h_rvm_insert_insn(prog, RVM_GOTO, 0);
gotos[i] = h_rvm_insert_insn(prog, RVM_GOTO, 65535);
h_rvm_patch_arg(prog, insn, h_rvm_get_ip(prog));
}
uint16_t jump = h_rvm_insert_insn(prog, RVM_STEP, 0);
for (size_t i=start; i<s->len; ++i) {
uint16_t jump = h_rvm_get_ip(prog);
for (size_t i=0; i<s->len; ++i) {
h_rvm_patch_arg(prog, gotos[i], jump);
}
return true;
@ -81,7 +80,7 @@ static const HParserVtable choice_vt = {
.compile_to_rvm = choice_ctrvm,
};
HParser* h_choice(const HParser* p, ...) {
HParser* h_choice(HParser* p, ...) {
va_list ap;
va_start(ap, p);
HParser* ret = h_choice__mv(&system_allocator, p, ap);
@ -89,7 +88,7 @@ HParser* h_choice(const HParser* p, ...) {
return ret;
}
HParser* h_choice__m(HAllocator* mm__, const HParser* p, ...) {
HParser* h_choice__m(HAllocator* mm__, HParser* p, ...) {
va_list ap;
va_start(ap, p);
HParser* ret = h_choice__mv(mm__, p, ap);
@ -97,28 +96,28 @@ HParser* h_choice__m(HAllocator* mm__, const HParser* p, ...) {
return ret;
}
HParser* h_choice__v(const HParser* p, va_list ap) {
HParser* h_choice__v(HParser* p, va_list ap) {
return h_choice__mv(&system_allocator, p, ap);
}
HParser* h_choice__mv(HAllocator* mm__, const HParser* p, va_list ap_) {
HParser* h_choice__mv(HAllocator* mm__, HParser* p, va_list ap_) {
va_list ap;
size_t len = 0;
HSequence *s = h_new(HSequence, 1);
const HParser *arg;
HParser *arg;
va_copy(ap, ap_);
do {
len++;
arg = va_arg(ap, const HParser *);
arg = va_arg(ap, HParser *);
} while (arg);
va_end(ap);
s->p_array = h_new(const HParser *, len);
s->p_array = h_new(HParser *, len);
va_copy(ap, ap_);
s->p_array[0] = p;
for (size_t i = 1; i < len; i++) {
s->p_array[i] = va_arg(ap, const HParser *);
s->p_array[i] = va_arg(ap, HParser *);
} while (arg);
va_end(ap);
@ -139,7 +138,7 @@ HParser* h_choice__ma(HAllocator* mm__, void *args[]) {
} while(arg);
HSequence *s = h_new(HSequence, 1);
s->p_array = h_new(const HParser *, len);
s->p_array = h_new(HParser *, len);
for (size_t i = 0; i < len; i++) {
s->p_array[i] = ((HParser **)args)[i];

2
src/parsers/ignoreseq.c
View file

@ -83,7 +83,7 @@ static bool h_svm_action_ignoreseq(HArena *arena, HSVMContext *ctx, void* env) {
// stack.
assert(seq->len >= 1);
for (int i = seq->len - 1; i>=0; i--) {
if (i == (int)seq->which && ctx->stack[ctx->stack_count]->token_type != TT_MARK)
if (i == (int)seq->which && ctx->stack[ctx->stack_count-1]->token_type != TT_MARK)
save = ctx->stack[ctx->stack_count-1];
// skip over everything up to and including the mark.
while (ctx->stack[--ctx->stack_count]->token_type != TT_MARK)

20
src/parsers/sequence.c
View file

@ -4,7 +4,7 @@
typedef struct {
size_t len;
const HParser **p_array;
HParser **p_array;
} HSequence;
static HParseResult* parse_sequence(void *env, HParseState *state) {
@ -86,7 +86,7 @@ static bool sequence_ctrvm(HRVMProg *prog, void *env) {
HSequence *s = (HSequence*)env;
h_rvm_insert_insn(prog, RVM_PUSH, 0);
for (size_t i=0; i<s->len; ++i) {
if (!s->p_array[i]->vtable->compile_to_rvm(prog, s->p_array[i]->env))
if (!s->p_array[i]->vtable->compile_to_rvm(prog, s->p_array[i]))
return false;
}
h_rvm_insert_insn(prog, RVM_ACTION, h_rvm_create_action(prog, h_svm_action_make_sequence, NULL));
@ -101,7 +101,7 @@ static const HParserVtable sequence_vt = {
.compile_to_rvm = sequence_ctrvm,
};
HParser* h_sequence(const HParser* p, ...) {
HParser* h_sequence(HParser* p, ...) {
va_list ap;
va_start(ap, p);
HParser* ret = h_sequence__mv(&system_allocator, p, ap);
@ -109,7 +109,7 @@ HParser* h_sequence(const HParser* p, ...) {
return ret;
}
HParser* h_sequence__m(HAllocator* mm__, const HParser* p, ...) {
HParser* h_sequence__m(HAllocator* mm__, HParser* p, ...) {
va_list ap;
va_start(ap, p);
HParser* ret = h_sequence__mv(mm__, p, ap);
@ -117,27 +117,27 @@ HParser* h_sequence__m(HAllocator* mm__, const HParser* p, ...) {
return ret;
}
HParser* h_sequence__v(const HParser* p, va_list ap) {
HParser* h_sequence__v(HParser* p, va_list ap) {
return h_sequence__mv(&system_allocator, p, ap);
}
HParser* h_sequence__mv(HAllocator* mm__, const HParser *p, va_list ap_) {
HParser* h_sequence__mv(HAllocator* mm__, HParser *p, va_list ap_) {
va_list ap;
size_t len = 0;
const HParser *arg;
va_copy(ap, ap_);
do {
len++;
arg = va_arg(ap, const HParser *);
arg = va_arg(ap, HParser *);
} while (arg);
va_end(ap);
HSequence *s = h_new(HSequence, 1);
s->p_array = h_new(const HParser *, len);
s->p_array = h_new(HParser *, len);
va_copy(ap, ap_);
s->p_array[0] = p;
for (size_t i = 1; i < len; i++) {
s->p_array[i] = va_arg(ap, const HParser *);
s->p_array[i] = va_arg(ap, HParser *);
} while (arg);
va_end(ap);
@ -158,7 +158,7 @@ HParser* h_sequence__ma(HAllocator* mm__, void *args[]) {
} while(arg);
HSequence *s = h_new(HSequence, 1);
s->p_array = h_new(const HParser *, len);
s->p_array = h_new(HParser *, len);
for (size_t i = 0; i < len; i++) {
s->p_array[i] = ((HParser **)args)[i];