1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow the match cache optimization for atomic groups (#7804)

Browse Source
This commit is contained in:
TSUYUSATO Kitsune 2023-05-22 11:27:34 +09:00 committed by GitHub
parent 872249e209
commit a5819b5b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2023-05-22 02:28:00 +00:00 
Merged-By: makenowjust <make.just.on@gmail.com>
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regexec.c
View File

@ -446,8 +446,10 @@ count_num_cache_opcodes(const regex_t* reg, long* num_cache_opcodes_ptr)
case OP_POP_POS: case OP_POP_POS:
case OP_PUSH_POS_NOT: case OP_PUSH_POS_NOT:
case OP_FAIL_POS: case OP_FAIL_POS:
goto impossible;
case OP_PUSH_STOP_BT: case OP_PUSH_STOP_BT:
case OP_POP_STOP_BT: case OP_POP_STOP_BT:
break;
case OP_LOOK_BEHIND: case OP_LOOK_BEHIND:
case OP_PUSH_LOOK_BEHIND_NOT: case OP_PUSH_LOOK_BEHIND_NOT:
case OP_FAIL_LOOK_BEHIND_NOT: case OP_FAIL_LOOK_BEHIND_NOT:
@ -709,8 +711,10 @@ init_cache_opcodes(const regex_t* reg, OnigCacheOpcode* cache_opcodes, long* num
case OP_POP_POS: case OP_POP_POS:
case OP_PUSH_POS_NOT: case OP_PUSH_POS_NOT:
case OP_FAIL_POS: case OP_FAIL_POS:
goto unexpected_bytecode_error;
case OP_PUSH_STOP_BT: case OP_PUSH_STOP_BT:
case OP_POP_STOP_BT: case OP_POP_STOP_BT:
break;
case OP_LOOK_BEHIND: case OP_LOOK_BEHIND:
case OP_PUSH_LOOK_BEHIND_NOT: case OP_PUSH_LOOK_BEHIND_NOT:
case OP_FAIL_LOOK_BEHIND_NOT: case OP_FAIL_LOOK_BEHIND_NOT:

10
test/ruby/test_regexp.rb
View File

@ -1760,6 +1760,16 @@ class TestRegexp < Test::Unit::TestCase
end; end;
end end
def test_match_cache_atomic
assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
timeout = #{ EnvUtil.apply_timeout_scale(10).inspect }
begin;
Regexp.timeout = timeout
assert_nil(/^(?>a?a?)(a|a)*$/ =~ "a" * 1000000 + "x")
end;
end
def test_cache_opcodes_initialize def test_cache_opcodes_initialize
str = 'test1-test2-test3-test4-test_5' str = 'test1-test2-test3-test4-test_5'
re = '^([0-9a-zA-Z\-/]*){1,256}$' re = '^([0-9a-zA-Z\-/]*){1,256}$'