mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

regex: make match_string() receiver immutable

Browse Source
This commit is contained in:
Alexander Medvednikov 2022-12-10 13:03:31 +03:00
parent 7c4f45a375
commit 42a9eaac0e
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vlib/regex/regex_util.v
View File

@ -124,29 +124,31 @@ pub fn (re RE) get_group_list() []Re_group {
******************************************************************************/ ******************************************************************************/
// match_string Match the pattern with the in_txt string // match_string Match the pattern with the in_txt string
[direct_array_access] [direct_array_access]
pub fn (mut re RE) match_string(in_txt string) (int, int) { pub fn (re &RE) match_string(in_txt string) (int, int) {
start, mut end := re.match_base(in_txt.str, in_txt.len + 1) unsafe {
if end > in_txt.len { start, mut end := re.match_base(in_txt.str, in_txt.len + 1)
end = in_txt.len if end > in_txt.len {
} end = in_txt.len
if start >= 0 && end > start {
if (re.flag & f_ms) != 0 && start > 0 {
return no_match_found, 0
} }
if (re.flag & f_me) != 0 && end < in_txt.len {
if in_txt[end] in new_line_list { if start >= 0 && end > start {
return start, end if (re.flag & f_ms) != 0 && start > 0 {
return no_match_found, 0
} }
return no_match_found, 0 if (re.flag & f_me) != 0 && end < in_txt.len {
if in_txt[end] in new_line_list {
return start, end
}
return no_match_found, 0
}
return start, end
} }
return start, end return start, end
} }
return start, end
} }
// matches_string Checks if the pattern matches the in_txt string // matches_string Checks if the pattern matches the in_txt string
pub fn (mut re RE) matches_string(in_txt string) bool { pub fn (re &RE) matches_string(in_txt string) bool {
start, _ := re.match_string(in_txt) start, _ := re.match_string(in_txt)
return start != no_match_found return start != no_match_found
} }