st/lama_byterun
1
0
Fork 0
mirror of https://github.com/ProgramSnail/Lama.git synced 2025-12-05 22:38:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed chop-suffix

Browse source
This commit is contained in:
Dmitry Boulytchev 2022-09-13 09:19:28 +03:00
parent e5c5f914bd
commit 98804770e6
5 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
stdlib/Matcher.lama
View file

@ -46,6 +46,14 @@ fun createMatcher (buf, pos, line, col) {
}
fun matchString (s) {
fun min (x, y) {
if x < y then x else y fi
}
-- printf ("Matching string %s against %s...\n", s, substring (buf, pos, min (10, buf.length - pos)));
if s.length > rest ()
then Fail (sprintf ("""%s"" expected", s), line, col)
elif matchSubString (buf, s, pos) then Succ (s, shift (s.length))
@ -55,7 +63,13 @@ fun createMatcher (buf, pos, line, col) {
fun matchRegexp (r) {
var n;
fun min (x, y) {
if x < y then x else y fi
}
-- printf ("Matching regexp %s against %s...\n", r.string, substring (buf, pos, min (10, buf.length - pos)));
if (n := regexpMatch (r[0], buf, pos)) >= 0
then Succ (substring (buf, pos, n), shift (n))
else Fail (sprintf ("%s expected", r[1]), line, col)