summaryrefslogtreecommitdiff
path: root/test/prism/ruby/parser_test.rb
diff options
authorKevin Newton <[email protected]>2025-03-13 13:59:45 -0400
committerKevin Newton <[email protected]>2025-03-18 13:36:53 -0400
commitdc48c1aca347f43ef9cb122342c80d699c5860fa (patch)
tree24395bd504610931f9abababa683a334f5a57178 /test/prism/ruby/parser_test.rb
parente3c846463092da8a7533740f9960fd626c749305 (diff)
[ruby/prism] Add a multiple statements flag to parentheses
This can get triggered even if the list of statements only contains a single statement. This is necessary to properly support compiling ```ruby defined? (;a) defined? (a;) ``` as "expression". Previously these were parsed as statements lists with single statements in them. https://github.com/ruby/prism/commit/b63b5d67a9
Diffstat (limited to 'test/prism/ruby/parser_test.rb')
-rw-r--r--test/prism/ruby/parser_test.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/test/prism/ruby/parser_test.rb b/test/prism/ruby/parser_test.rb
index 6b72beddc4..e7cd06bf32 100644
--- a/test/prism/ruby/parser_test.rb
+++ b/test/prism/ruby/parser_test.rb
@@ -92,11 +92,6 @@ module Prism
# These files are either failing to parse or failing to translate, so we'll
# skip them for now.
skip_all = skip_incorrect | [
-<<<<<<< HEAD
-=======
- "unescaping.txt",
- "seattlerb/regexp_esc_C_slash.txt",
->>>>>>> 4edfe9d981 (Further refine string handling in the parser translator)
]
# Not sure why these files are failing on JRuby, but skipping them for now.