mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-11-06 10:33:03 +00:00
Code Issues 1 Releases Wiki Activity

Update Matchtime captures to not include all of the

Browse Source 
matched text automatically, and fix pattern recursion
in grammars.
This commit is contained in:
Calvin Rose
2019-01-14 17:44:21 -05:00
parent 170e785b72
commit d0ec89c7c1
2 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/peg.c
View File

@@ -402,9 +402,6 @@ tail:
s->mode = oldmode;
if (!result) return NULL;
/* Add matched text */
pushcap(s, janet_stringv(text, (int32_t)(result - text)), text, result);
/* Now check captures with provided function */
int32_t argc = s->captures->count - cs.cap;
Janet *argv = s->captures->data + cs.cap;
@@ -417,11 +414,12 @@ tail:
cap = cfun(argc, argv);
}
cap_load(s, cs);
/* Capture failed */
if (janet_checktype(cap, JANET_NIL)) return NULL;
if (!janet_truthy(cap)) return NULL;
/* Capture worked, so use new capture */
cap_load(s, cs);
pushcap(s, cap, text, result);
return result;
@@ -698,9 +696,9 @@ static void spec_reference(Builder *b, int32_t argc, const Janet *argv) {
Reserve r = reserve(b, 2);
int32_t index = peg_getinteger(b, argv[0]);
if (index < 0) {
emit_1(r, RULE_BACKINDEX, -index);
emit_1(r, RULE_REPINDEX, -index - 1);
} else {
emit_1(r, RULE_REPINDEX, index);
emit_1(r, RULE_BACKINDEX, index);
}
}