Merge pull request #3367 from Earlopain/parser-translator-3.3-tests

Import code samples for Ruby 3.3 from the parser gem

Author: tenderlove

rakelib/whitequark.rake

@@ -38,7 +38,7 @@ namespace :whitequark do
       # This object is going to collect all of the examples from the parser gem
       # into a hash that we can use to generate our own tests.
       COLLECTED = Hash.new { |hash, key| hash[key] = [] }
-      ALL_VERSIONS = %w[3.1 3.2]
+      ALL_VERSIONS = %w[3.1 3.2 3.3]
 
       private
 
@@ -60,10 +60,10 @@ namespace :whitequark do
       def assert_parses(_ast, code, _source_maps = "", versions = ALL_VERSIONS)
         # We're going to skip any examples that are for older Ruby versions
         # that we do not support.
-        return if (versions & %w[3.1 3.2]).empty?
+        return if (versions & ALL_VERSIONS).empty?
 
-        entry = caller.find { _1.include?("test_parser.rb") }
-        _, name = *entry.match(/\d+:in `(?:block in )?(?:test_|assert_parses_)?(.+)'/)
+        entry = caller_locations.find { _1.base_label.start_with?("test_") }
+        name = entry.base_label.delete_prefix("test_")
 
         COLLECTED[name] << code
       end
@@ -94,7 +94,8 @@ namespace :whitequark do
         test/prism/fixtures/whitequark/if_while_after_class__since_32.txt
         test/prism/fixtures/whitequark/next_block.txt
         test/prism/fixtures/whitequark/next.txt
-        test/prism/fixtures/whitequark/pattern_match.txt
+        test/prism/fixtures/whitequark/pattern_matching_pin_variable.txt
+        test/prism/fixtures/whitequark/pattern_matching_hash_with_string_keys.txt
         test/prism/fixtures/whitequark/range_endless.txt
         test/prism/fixtures/whitequark/redo.txt
         test/prism/fixtures/whitequark/retry.txt

test/prism/fixtures/whitequark/LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2013-2016 whitequark  <[email protected]>
+Copyright (c) 2013-2024 parser project contributors
+Copyright (c) 2013-2016 Catherine  <[email protected]>
 
 Parts of the source are derived from ruby_parser:
 Copyright (c) Ryan Davis, seattle.rb

test/prism/fixtures/whitequark/arg_combinations.txt

@@ -0,0 +1,29 @@
+def f &b; end
+
+def f *r, &b; end
+
+def f *r, p, &b; end
+
+def f ; end
+
+def f a, &b; end
+
+def f a, *r, &b; end
+
+def f a, *r, p, &b; end
+
+def f a, o=1, &b; end
+
+def f a, o=1, *r, &b; end
+
+def f a, o=1, *r, p, &b; end
+
+def f a, o=1, p, &b; end
+
+def f o=1, &b; end
+
+def f o=1, *r, &b; end
+
+def f o=1, *r, p, &b; end
+
+def f o=1, p, &b; end

test/prism/fixtures/whitequark/block_arg_combinations.txt

@@ -0,0 +1,57 @@
+f{  }
+
+f{ | | }
+
+f{ |&b| }
+
+f{ |*, &b| }
+
+f{ |*r, p, &b| }
+
+f{ |*s, &b| }
+
+f{ |*s| }
+
+f{ |*| }
+
+f{ |;
+a
+| }
+
+f{ |;a| }
+
+f{ |a, &b| }
+
+f{ |a, *, &b| }
+
+f{ |a, *r, p, &b| }
+
+f{ |a, *s, &b| }
+
+f{ |a, *s| }
+
+f{ |a, *| }
+
+f{ |a, c| }
+
+f{ |a, o=1, &b| }
+
+f{ |a, o=1, *r, p, &b| }
+
+f{ |a, o=1, o1=2, *r, &b| }
+
+f{ |a, o=1, p, &b| }
+
+f{ |a,| }
+
+f{ |a| }
+
+f{ |o=1, &b| }
+
+f{ |o=1, *r, &b| }
+
+f{ |o=1, *r, p, &b| }
+
+f{ |o=1, p, &b| }
+
+f{ || }

test/prism/fixtures/whitequark/block_kwarg.txt

@@ -0,0 +1 @@
+f{ |foo:| }

test/prism/fixtures/whitequark/block_kwarg_combinations.txt

@@ -0,0 +1,5 @@
+f{ |**baz, &b| }
+
+f{ |foo: 1, &b| }
+
+f{ |foo: 1, bar: 2, **baz, &b| }

test/prism/fixtures/whitequark/emit_arg_inside_procarg0_legacy.txt

@@ -0,0 +1 @@
+f{ |a| }

test/prism/fixtures/whitequark/find_pattern.txt

@@ -0,0 +1,7 @@
+case foo; in *, 42, * then true; end
+
+case foo; in Array[*, 1, *] then true; end
+
+case foo; in String(*, 1, *) then true; end
+
+case foo; in [*x, 1 => a, *y] then true; end

test/prism/fixtures/whitequark/kwarg_combinations.txt

@@ -0,0 +1,7 @@
+def f (foo: 1, &b); end
+
+def f (foo: 1, bar: 2, **baz, &b); end
+
+def f **baz, &b; end
+
+def f *, **; end

test/prism/fixtures/whitequark/kwarg_no_paren.txt

@@ -0,0 +1,5 @@
+def f foo:
+; end
+
+def f foo: -1
+; end