diff options
| author | Kevin Newton <kddnewton@gmail.com> | 2024-04-03 14:54:50 -0400 |
|---|---|---|
| committer | Kevin Newton <kddnewton@gmail.com> | 2024-04-03 17:34:12 -0400 |
| commit | ffba484754bd5bed0f7c69646291fd99ed8959cc (patch) | |
| tree | 0d9998b06af7d9cd9bde111cc4c1de66281872a5 /bootstraptest | |
| parent | e48fd40974e9e726b7782ce6d74e0954a6a5d73f (diff) | |
| download | ruby-ffba484754bd5bed0f7c69646291fd99ed8959cc.tar.gz | |
[PRISM] Fix up syntax error message parsing in btests
Diffstat (limited to 'bootstraptest')
| -rw-r--r-- | bootstraptest/test_literal_suffix.rb | 6 | ||||
| -rw-r--r-- | bootstraptest/test_syntax.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bootstraptest/test_literal_suffix.rb b/bootstraptest/test_literal_suffix.rb index 5d813d5818..2ed0f8aeeb 100644 --- a/bootstraptest/test_literal_suffix.rb +++ b/bootstraptest/test_literal_suffix.rb @@ -47,8 +47,8 @@ assert_equal '10000000000000000001/10000000000000000000', '1.0000000000000000001r' assert_equal 'unexpected local variable or method, expecting end-of-input', - %q{begin eval('1ir', nil, '', 0); rescue SyntaxError => e; e.message[/(?:\A:(?:\d+:)? syntax error,|\^) (.*)/, 1] end} + %q{begin eval('1ir', nil, '', 0); rescue SyntaxError => e; e.message[/(?:\^~*|\A:(?:\d+:)? syntax error(?! found)) (.*)/, 1] end} assert_equal 'unexpected local variable or method, expecting end-of-input', - %q{begin eval('1.2ir', nil, '', 0); rescue SyntaxError => e; e.message[/(?:\A:(?:\d+:)? syntax error,|\^) (.*)/, 1] end} + %q{begin eval('1.2ir', nil, '', 0); rescue SyntaxError => e; e.message[/(?:\^~*|\A:(?:\d+:)? syntax error(?! found)) (.*)/, 1] end} assert_equal 'unexpected local variable or method, expecting end-of-input', - %q{begin eval('1e1r', nil, '', 0); rescue SyntaxError => e; e.message[/(?:\A:(?:\d+:)? syntax error,|\^) (.*)/, 1] end} + %q{begin eval('1e1r', nil, '', 0); rescue SyntaxError => e; e.message[/(?:\^~*|\A:(?:\d+:)? syntax error(?! found)) (.*)/, 1] end} diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb index 44bd697d4f..fbc9c6f62e 100644 --- a/bootstraptest/test_syntax.rb +++ b/bootstraptest/test_syntax.rb @@ -529,7 +529,7 @@ assert_equal %q{1}, %q{ } def assert_syntax_error expected, code, message = '' assert_match /^#{Regexp.escape(expected)}/, - "begin eval(%q{#{code}}, nil, '', 0)"'; rescue SyntaxError => e; e.message[/(?:\^|\A:(?:\d+:)?(?! syntax errors? found)(?: syntax error,)?) (.*)/, 1] end', message + "begin eval(%q{#{code}}, nil, '', 0)"'; rescue SyntaxError => e; e.message[/(?:\^~*|\A:(?:\d+:)?(?! syntax errors? found)(?: syntax error,)?) (.*)/, 1] end', message end assert_syntax_error "unterminated string meets end of file", '().."', '[ruby-dev:29732]' assert_equal %q{[]}, %q{$&;[]}, '[ruby-dev:31068]' |