ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-31 20:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

add iter_index and update tests to use easier matcher setup

Browse Source
This commit is contained in:
skytrias
2022-12-20 12:59:32 +01:00
parent 967afd8bbb
commit ff7f139fd7
2 changed files with 30 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/text/lua/strlib.odin
+8 -1
View File
@@ -952,6 +952,7 @@ Matcher :: struct {
// changing content for iterators
iter: string,
iter_index: int,
}
// matcher
@@ -1006,7 +1007,7 @@ matcher_capture_raw :: proc(matcher: ^Matcher, index: int, loc := #caller_locati
matcher_gmatch :: matcher_match_iter
matcher_match_iter :: proc(matcher: ^Matcher) -> (res: string, ok: bool) {
matcher_match_iter :: proc(matcher: ^Matcher) -> (res: string, index: int, ok: bool) {
if len(matcher.iter) > 0 {
matcher.captures_length, matcher.err = find_aux(
matcher.iter,
@@ -1020,7 +1021,13 @@ matcher_match_iter :: proc(matcher: ^Matcher) -> (res: string, ok: bool) {
ok = true
first := matcher.captures_length > 1 ? 1 : 0
match := matcher.captures[first]
// output
res = matcher.iter[match.byte_start:match.byte_end]
index = matcher.iter_index
// advance
matcher.iter_index += 1
matcher.iter = matcher.iter[match.byte_end:]
}
}