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

Fix: check presence of named argument via external name #6560

Merged
merged 1 commit into from
Aug 19, 2018
Merged

Fix: check presence of named argument via external name #6560

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
6 changes: 6 additions & 0 deletions spec/compiler/normalize/def_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,5 +225,11 @@ module Crystal
other_def = a_def.expand_new_default_arguments(Program.new, 0, ["x", "y", "z"])
other_def.to_s.should eq("def new:x:y:z(x __temp_1, y __temp_2, z __temp_3)\n _ = allocate\n _.initialize(x: __temp_1, y: __temp_2, z: __temp_3)\n if _.responds_to?(:finalize)\n ::GC.add_finalizer(_)\n end\n _\nend")
end

it "expands def with reserved external name (#6559)" do
a_def = parse("def foo(abstract __arg0, **options); @abstract = __arg0; end").as(Def)
other_def = a_def.expand_default_arguments(Program.new, 0, ["abstract"])
other_def.to_s.should eq("def foo:abstract(abstract __arg0)\n options = {}\n @abstract = __arg0\nend")
end
end
end
2 changes: 1 addition & 1 deletion src/compiler/crystal/semantic/default_arguments.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class Crystal::Def
named_tuple_entries = [] of NamedTupleLiteral::Entry
named_args.try &.each_with_index do |named_arg, i|
# Don't put here regular arguments
next if args.any? &.name.==(named_arg)
next if args.any? &.external_name.==(named_arg)

temp_name = named_args_temp_names.not_nil![i]
named_tuple_entries << NamedTupleLiteral::Entry.new(named_arg, Var.new(temp_name))
Expand Down