mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-01-22 21:26:51 +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
Show Stats 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; s->mode = oldmode;
if (!result) return NULL; if (!result) return NULL;
/* Add matched text */
pushcap(s, janet_stringv(text, (int32_t)(result - text)), text, result);
/* Now check captures with provided function */ /* Now check captures with provided function */
int32_t argc = s->captures->count - cs.cap; int32_t argc = s->captures->count - cs.cap;
Janet *argv = s->captures->data + cs.cap; Janet *argv = s->captures->data + cs.cap;
@ -417,11 +414,12 @@ tail:
cap = cfun(argc, argv); cap = cfun(argc, argv);
} }
cap_load(s, cs);
/* Capture failed */ /* Capture failed */
if (janet_checktype(cap, JANET_NIL)) return NULL; if (!janet_truthy(cap)) return NULL;
/* Capture worked, so use new capture */ /* Capture worked, so use new capture */
cap_load(s, cs);
pushcap(s, cap, text, result); pushcap(s, cap, text, result);
return result; return result;
@ -698,9 +696,9 @@ static void spec_reference(Builder *b, int32_t argc, const Janet *argv) {
Reserve r = reserve(b, 2); Reserve r = reserve(b, 2);
int32_t index = peg_getinteger(b, argv[0]); int32_t index = peg_getinteger(b, argv[0]);
if (index < 0) { if (index < 0) {
emit_1(r, RULE_BACKINDEX, -index); emit_1(r, RULE_REPINDEX, -index - 1);
} else { } else {
emit_1(r, RULE_REPINDEX, index); emit_1(r, RULE_BACKINDEX, index);
} }
} }

34
test/suite3.janet
View File

@ -182,6 +182,7 @@
(check-match '(* (some (range "az" "AZ")) -1) "hello" true) (check-match '(* (some (range "az" "AZ")) -1) "hello" true)
(check-match '(* (some (range "az" "AZ")) -1) "hello world" false) (check-match '(* (some (range "az" "AZ")) -1) "hello world" false)
(check-match '(* (some (range "az" "AZ")) -1) "1he11o" false) (check-match '(* (some (range "az" "AZ")) -1) "1he11o" false)
(check-match '(* (some (range "az" "AZ")) -1) "" false)
# Pre compile # Pre compile
@ -271,7 +272,7 @@
# Matchtime capture # Matchtime capture
(def scanner (peg/compile ~(cmt (some 1) ,scan-number))) (def scanner (peg/compile ~(cmt (capture (some 1)) ,scan-number)))
(check-deep scanner "123" @[123]) (check-deep scanner "123" @[123])
(check-deep scanner "0x86" @[0x86]) (check-deep scanner "0x86" @[0x86])
@ -287,4 +288,35 @@
(check-match g "aacbb" true) (check-match g "aacbb" true)
(check-match g "aadbb" false) (check-match g "aadbb" false)
# Back reference
(def wrapped-string
~{:pad (any "=")
:open (* "[" (capture :pad) "[")
:close (* "]" (cmt (* (backref 0) (capture :pad)) ,=) "]")
:main (* :open (any (if-not 1 :close)) :close -1)})
(check-match wrapped-string "[[]]" true)
(check-match wrapped-string "[==[a]==]" true)
(check-match wrapped-string "[==[]===]" false)
(check-match wrapped-string "[[blark]]" true)
(check-match wrapped-string "[[bl[ark]]" true)
(check-match wrapped-string "[[bl]rk]]" true)
(check-match wrapped-string "[[bl]rk]] " false)
(check-match wrapped-string "[=[bl]]rk]=] " false)
(check-match wrapped-string "[=[bl]==]rk]=] " false)
(def janet-longstring
~{:open (capture (some "`"))
:close (cmt (* (backref 0) :open) ,=)
:main (* :open (any (if-not 1 :close)) (not (> -1 "`")) :close -1)})
(check-match janet-longstring "`john" false)
(check-match janet-longstring "abc" false)
(check-match janet-longstring "` `" true)
(check-match janet-longstring "` `" true)
(check-match janet-longstring "`` ``" true)
(check-match janet-longstring "``` `` ```" true)
(check-match janet-longstring "`` ```" false)
(end-suite) (end-suite)