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

regex: bug fix on .* cases (#7823)

pull/7826/head
penguindark 2021-01-03 01:33:34 +01:00 committed by GitHub
parent 90839a1b76
commit 681ff3cc0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/regex/regex.v
View File

@ -2000,7 +2000,7 @@ pub fn (mut re RE) match_base(in_txt byteptr, in_txt_len int ) (int,int) {
// check if we must continue or pass to the next IST // check if we must continue or pass to the next IST
if next_check_flag == true && re.prog[state.pc+1].ist != ist_prog_end { if next_check_flag == true && re.prog[state.pc+1].ist != ist_prog_end {
//println("save the state!!") //println("save the state!!")
re.state_list << StateObj { mut dot_state := StateObj {
group_index: state.group_index group_index: state.group_index
match_flag: state.match_flag match_flag: state.match_flag
match_index: state.match_index match_index: state.match_index
@ -2010,6 +2010,13 @@ pub fn (mut re RE) match_base(in_txt byteptr, in_txt_len int ) (int,int) {
char_len: char_len char_len: char_len
last_dot_pc: state.pc last_dot_pc: state.pc
} }
// if we are mananging a .* stay on the same char on return
if re.prog[state.pc].rep_min == 0 {
dot_state.i -= char_len
}
re.state_list << dot_state
m_state = .ist_quant_n m_state = .ist_quant_n
//println("dot_char stack len: ${re.state_list.len}") //println("dot_char stack len: ${re.state_list.len}")
continue continue

1
vlib/regex/regex_test.v
View File

@ -124,6 +124,7 @@ match_test_suite = [
TestItem{"accccb deer", r"^(.*)$",0,11}, TestItem{"accccb deer", r"^(.*)$",0,11},
TestItem{"accccb deer", r"^a(.*)b d(.+)p",-1,0}, TestItem{"accccb deer", r"^a(.*)b d(.+)p",-1,0},
TestItem{"##.#....#.##.####...#.##", r".{18}[.#]",0,19}, TestItem{"##.#....#.##.####...#.##", r".{18}[.#]",0,19},
TestItem{"#.#......##.#..#..##........##....###...##...######.......#.....#..#......#...#........###.#..#.", r'.*#[.#]{4}##[.#]{4}##[.#]{4}###',0,49},
// test bcksls chars // test bcksls chars
TestItem{"[ an s. s! ]( wi4ki:something )", r"\[.*\]\( *(\w*:*\w+) *\)",0,31}, TestItem{"[ an s. s! ]( wi4ki:something )", r"\[.*\]\( *(\w*:*\w+) *\)",0,31},