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

rvm instructions for ch(); fixed a declaration in optional()

Browse source
This commit is contained in:
Meredith L. Patterson 2013-03-18 01:18:39 -04:00
parent 8a5c4b6b67
commit 875c9b9c57
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/parsers/ch.c
View file

@ -12,10 +12,18 @@ static HParseResult* parse_ch(void* env, HParseState *state) {
} }
} }
static bool ch_ctrvm(HRVMProg *prog, void* env) {
uint8_t c = (uint8_t)(unsigned long)(env);
h_rvm_insert_insn(prog, RVM_MATCH, c & c << 8);
h_rvm_insert_insn(prog, RVM_STEP, 0);
return true;
}
static const HParserVtable ch_vt = { static const HParserVtable ch_vt = {
.parse = parse_ch, .parse = parse_ch,
.isValidRegular = h_true, .isValidRegular = h_true,
.isValidCF = h_true, .isValidCF = h_true,
.compile_to_rvm = ch_ctrvm,
}; };
const HParser* h_ch(const uint8_t c) { const HParser* h_ch(const uint8_t c) {

7
src/parsers/optional.c
View file

@ -21,9 +21,10 @@ static bool opt_isValidCF(void *env) {
return p->vtable->isValidCF(p->env); return p->vtable->isValidCF(p->env);
} }
static bool opt_ctrvm(struct HRVMProg_ *prog, void* env) { static bool opt_ctrvm(HRVMProg *prog, void* env) {
uint16_t insn = h_rvm_insert_insn(prog, RVM_FORK, 0); uint16_t insn = h_rvm_insert_insn(prog, RVM_FORK, 0);
if (!h_compile_regex(prog, (HParser*)env->env)) HParser *p = (HParser*) env;
if (!h_compile_regex(prog, p->env))
return false; return false;
h_rvm_patch_arg(prog, insn, h_rvm_get_ip(prog)); h_rvm_patch_arg(prog, insn, h_rvm_get_ip(prog));
return true; return true;
@ -33,7 +34,7 @@ static const HParserVtable optional_vt = {
.parse = parse_optional, .parse = parse_optional,
.isValidRegular = opt_isValidRegular, .isValidRegular = opt_isValidRegular,
.isValidCF = opt_isValidCF, .isValidCF = opt_isValidCF,
.compile_to_rvm = opt_ctvrm, .compile_to_rvm = opt_ctrvm,
}; };
const HParser* h_optional(const HParser* p) { const HParser* h_optional(const HParser* p) {