Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GR-45043] Import Prism 0.27.0 #3553

Merged
merged 5 commits into from
Apr 26, 2024
Merged

[GR-45043] Import Prism 0.27.0 #3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6dca872
Import ruby/prism@096d01c23ab8717f69af4adefb8b856415a84a88
andrykonchin Apr 24, 2024
667f271
Regenerate parsing YAML fixtures to adopt warnings that Prism returns…
andrykonchin Apr 24, 2024
0dc51d0
Update parsing YAML fixture for retry to avoid SyntaxError
andrykonchin Apr 24, 2024
b287e48
Add specs for incorrect jumps with break/next/etc
andrykonchin Apr 24, 2024
94fde16
Enable TestParse#test_disallowed_gloal_variable MRI test case
andrykonchin Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions spec/ruby/language/break_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,25 @@ def mid(&b)
end
end

describe "The break statement in a method" do
it "is invalid and raises a SyntaxError" do
-> {
eval("def m; break; end")
}.should raise_error(SyntaxError)
end
end

describe "The break statement in a module literal" do
it "is invalid and raises a SyntaxError" do
code = <<~RUBY
module BreakSpecs:ModuleWithBreak
break
end
RUBY

-> { eval(code) }.should raise_error(SyntaxError)
end
end

# TODO: Rewrite all the specs from here to the end of the file in the style
# above.
Expand Down
5 changes: 4 additions & 1 deletion spec/ruby/language/retry_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@
results.should == [1, 2, 3, 1, 2, 4, 5, 6, 4, 5]
end

it "raises a SyntaxError when used outside of a begin statement" do
it "raises a SyntaxError when used outside of a rescue statement" do
-> { eval 'retry' }.should raise_error(SyntaxError)
-> { eval 'begin; retry; end' }.should raise_error(SyntaxError)
-> { eval 'def m; retry; end' }.should raise_error(SyntaxError)
-> { eval 'module RetrySpecs; retry; end' }.should raise_error(SyntaxError)
end
end

Expand Down
12 changes: 12 additions & 0 deletions spec/ruby/language/yield_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,15 @@ class << Object.new
-> { eval(code) }.should raise_error(SyntaxError, /Invalid yield/)
end
end

describe "Using yield in a module literal" do
it 'raises a SyntaxError' do
code = <<~RUBY
module YieldSpecs::ModuleWithYield
yield
end
RUBY

-> { eval(code) }.should raise_error(SyntaxError, /Invalid yield/)
end
end
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/TOPLEVEL_BINDING.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ ast: |
flags = 0
sourceCharIndex = -1
sourceLength = 0
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - a', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 1))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/__END__.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ ast: |
flags = 0
sourceCharIndex = -1
sourceLength = 0
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - a', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 1))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/multi_assignment/with_multiple_variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 51
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - array', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/multi_assignment/with_nested_multi_assignment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 53
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - array', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions .../fixtures/for/multi_assignment/with_preceding_splat_operator_and_following_variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 52
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - array', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions ...fle/parsing/fixtures/for/multi_assignment/with_preceding_variables_and_implicit_rest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 34
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions ...le/parsing/fixtures/for/multi_assignment/with_preceding_variables_and_splat_operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 52
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - array', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions ...le/parsing/fixtures/for/multi_assignment/with_splat_operator_and_following_variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 52
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - array', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/with_attribute_assignment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 41
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/with_class_variable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 37
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/with_constant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 33
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/with_fully_qualified_constant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 39
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/with_global_variable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 35
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/with_instance_variable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 35
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/with_local_variable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 33
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/for/with_reference_assignment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 45
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions ...uffle/parsing/fixtures/for/with_reference_assignment_and_multiple_explicit_arguments.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ast: |
sourceLength = 57
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - b', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 2))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/local_variables/at_top_level/writing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ ast: |
sourceLength = 8
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'assigned but unused variable - foo', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 1))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
7 changes: 5 additions & 2 deletions spec/truffle/parsing/fixtures/retry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ subject: "retry"
description: "retry control flow operator"
focused_on_node: "org.truffleruby.language.control.RetryNode"
ruby: |
retry
begin
rescue
retry
end
ast: |
RetryNode
attributes:
flags = 1
sourceCharIndex = 0
sourceCharIndex = 15
sourceLength = 5
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/strings/with_interpolation_%_string_expression.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ ast: |
sourceLength = 18
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'possibly useless use of a literal in void context', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 1))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down
6 changes: 6 additions & 0 deletions spec/truffle/parsing/fixtures/strings/with_interpolation_string_expression.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ ast: |
sourceLength = 16
children:
body = [
EmitWarningsNode
attributes:
flags = 0
sourceCharIndex = -1
sourceLength = 0
warnings = RubyDeferredWarnings(WarningMessage(message = 'possibly useless use of a literal in void context', verbosity = VERBOSE, fileName = '<parse_ast>', lineNumber = 1))
WriteLocalVariableNode
attributes:
flags = 0
Expand Down