vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

regex: fix #11404 (#11406)

pull/11407/head
penguindark 2021-09-06 02:11:38 +02:00 committed by GitHub
parent e5c4c408b5
commit 438bdd1b0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vlib/regex/regex.v
View File

@ -1768,6 +1768,17 @@ pub fn (mut re RE) match_base(in_txt &byte, in_txt_len int) (int, int) {
// m_state = .end // m_state = .end
// break // break
// no groups open, check the last token quantifier
if ist != regex.ist_group_end && re.prog[state.pc + 1].ist == regex.ist_prog_end {
if re.prog[state.pc].rep >= re.prog[state.pc].rep_min
&& re.prog[state.pc].rep <= re.prog[state.pc].rep_max {
// println("We are in good repetition")
return state.first_match, state.i
}
}
// print("No good exit!!")
return regex.no_match_found, 0 return regex.no_match_found, 0
} }
@ -2268,12 +2279,14 @@ pub fn (mut re RE) match_base(in_txt &byte, in_txt_len int) (int, int) {
} }
// ist_quant_p => quantifier positive test on token // ist_quant_p => quantifier positive test on token
else if m_state == .ist_quant_p { else if m_state == .ist_quant_p {
// println("Here .ist_quant_p")
// exit on first match // exit on first match
if (re.flag & regex.f_efm) != 0 { if (re.flag & regex.f_efm) != 0 {
return state.i, state.i + 1 return state.i, state.i + 1
} }
rep := re.prog[state.pc].rep rep := re.prog[state.pc].rep
// println(rep)
// under range // under range
if rep > 0 && rep < re.prog[state.pc].rep_min { if rep > 0 && rep < re.prog[state.pc].rep_min {

4
vlib/regex/regex_test.v
View File

@ -155,6 +155,10 @@ match_test_suite = [
// particular groups // particular groups
TestItem{"ababababac", r"ab(.*)(ac)",0,10}, TestItem{"ababababac", r"ab(.*)(ac)",0,10},
// backslash on finish string
TestItem{"a", r"\S+",0,1},
TestItem{"aaaa", r"\S+",0,4},
TestItem{"aaaa ", r"\S+",0,4},
] ]
) )