diff options
| author | Kevin Newton <[email protected]> | 2023-10-17 17:45:47 -0400 |
|---|---|---|
| committer | git <[email protected]> | 2023-10-18 16:08:32 +0000 |
| commit | c82b10bbc3a3293ba9464c27ac5e778c70d2fe9b (patch) | |
| tree | 8cd3e8515baa032dec6e425d060dd3f0311c7703 /lib/prism/debug.rb | |
| parent | 5d0604366e695066f32c94ebe3b4b827b2868a34 (diff) | |
[ruby/prism] Modify less of the CRuby locals
https://github.com/ruby/prism/commit/aca24b3a17
Diffstat (limited to 'lib/prism/debug.rb')
| -rw-r--r-- | lib/prism/debug.rb | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/lib/prism/debug.rb b/lib/prism/debug.rb index 9ec3aa9304..6a68a3d33e 100644 --- a/lib/prism/debug.rb +++ b/lib/prism/debug.rb @@ -45,29 +45,16 @@ module Prism # For the given source, compiles with CRuby and returns a list of all of the # sets of local variables that were encountered. def self.cruby_locals(source) - verbose = $VERBOSE - $VERBOSE = nil + verbose, $VERBOSE = $VERBOSE, nil begin locals = [] stack = [ISeq.new(RubyVM::InstructionSequence.compile(source).to_a)] while (iseq = stack.pop) - if iseq.type != :once - names = iseq.local_table - - # CRuby will push on a special local variable when there are keyword - # arguments. We get rid of that here. - names = names.grep_v(Integer) - - # For some reason, CRuby occasionally pushes this special local - # variable when there are splat arguments. We get rid of that here. - names = names.grep_v(:"#arg_rest") - - # Now push them onto the list of locals. - locals << names - end - + # For some reason, CRuby occasionally pushes this special local + # variable when there are splat arguments. We get rid of that here. + locals << (iseq.local_table - [:"#arg_rest"]) iseq.each_child { |child| stack << child } end @@ -77,6 +64,8 @@ module Prism end end + AnonymousLocal = Object.new + # For the given source, parses with prism and returns a list of all of the # sets of local variables that were encountered. def self.prism_locals(source) @@ -97,14 +86,28 @@ module Prism # order here so that we can compare properly. if params sorted = [ - *params.requireds.grep(RequiredParameterNode).map(&:name), + *params.requireds.map do |required| + if required.is_a?(RequiredParameterNode) + required.name + else + AnonymousLocal + end + end, *params.optionals.map(&:name), *((params.rest.name || :*) if params.rest && params.rest.operator != ","), - *params.posts.grep(RequiredParameterNode).map(&:name), + *params.posts.map do |post| + if post.is_a?(RequiredParameterNode) + post.name + else + AnonymousLocal + end + end, *params.keywords.reject(&:value).map(&:name), *params.keywords.select(&:value).map(&:name) ] + sorted << AnonymousLocal if params.keywords.any? + # Recurse down the parameter tree to find any destructured # parameters and add them after the other parameters. param_stack = params.requireds.concat(params.posts).grep(RequiredDestructuredParameterNode).reverse @@ -122,11 +125,19 @@ module Prism names = sorted.concat(names - sorted) end + names.map!.with_index do |name, index| + if name == AnonymousLocal + names.length - index + 1 + else + name + end + end + locals << names when ClassNode, ModuleNode, ProgramNode, SingletonClassNode locals << node.locals when ForNode - locals << [] + locals << [2] when PostExecutionNode locals.push([], []) when InterpolatedRegularExpressionNode |