Skip to content

Fix current_environment usages to use accessor instead of instance variable #173

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

Merged
merged 1 commit into from
Oct 18, 2022
Merged

Fix current_environment usages to use accessor instead of instance variable #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions lib/syntax_tree/visitor/with_environment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,41 +64,41 @@ def visit_def_endless(node)
# arguments
def visit_params(node)
node.requireds.each do |param|
@current_environment.add_local_definition(param, :argument)
current_environment.add_local_definition(param, :argument)
end

node.posts.each do |param|
@current_environment.add_local_definition(param, :argument)
current_environment.add_local_definition(param, :argument)
end

node.keywords.each do |param|
@current_environment.add_local_definition(param.first, :argument)
current_environment.add_local_definition(param.first, :argument)
end

node.optionals.each do |param|
@current_environment.add_local_definition(param.first, :argument)
current_environment.add_local_definition(param.first, :argument)
end

super
end

def visit_rest_param(node)
name = node.name
@current_environment.add_local_definition(name, :argument) if name
current_environment.add_local_definition(name, :argument) if name

super
end

def visit_kwrest_param(node)
name = node.name
@current_environment.add_local_definition(name, :argument) if name
current_environment.add_local_definition(name, :argument) if name

super
end

def visit_blockarg(node)
name = node.name
@current_environment.add_local_definition(name, :argument) if name
current_environment.add_local_definition(name, :argument) if name

super
end
Expand All @@ -108,7 +108,7 @@ def visit_var_field(node)
value = node.value

if value.is_a?(SyntaxTree::Ident)
@current_environment.add_local_definition(value, :variable)
current_environment.add_local_definition(value, :variable)
end

super
Expand All @@ -119,7 +119,7 @@ def visit_var_field(node)
# Visits for keeping track of variable and argument usages
def visit_aref_field(node)
name = node.collection.value
@current_environment.add_local_usage(name, :variable) if name
current_environment.add_local_usage(name, :variable) if name

super
end
Expand All @@ -128,10 +128,10 @@ def visit_var_ref(node)
value = node.value

if value.is_a?(SyntaxTree::Ident)
definition = @current_environment.find_local(value.value)
definition = current_environment.find_local(value.value)

if definition
@current_environment.add_local_usage(value, definition.type)
current_environment.add_local_usage(value, definition.type)
end
end

Expand Down
20 changes: 20 additions & 0 deletions test/visitor_with_environment_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,5 +406,25 @@ def foo(a)
assert_equal(2, argument.usages[0].start_line)
assert_equal(4, argument.usages[1].start_line)
end

def test_variables_in_the_top_level
tree = SyntaxTree.parse(<<~RUBY)
a = 123
a
RUBY

visitor = Collector.new
visitor.visit(tree)

assert_equal(0, visitor.arguments.length)
assert_equal(1, visitor.variables.length)

variable = visitor.variables["a"]
assert_equal(1, variable.definitions.length)
assert_equal(1, variable.usages.length)

assert_equal(1, variable.definitions[0].start_line)
assert_equal(2, variable.usages[0].start_line)
end
end
end