Fix macro interpolation in NamedTuple#from (crystal-lang#14790)

kojix2 · Jul 9, 2024 · ba518e1 · ba518e1
1 parent 66aa5f0
commit ba518e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/spec/std/named_tuple_spec.cr b/spec/std/named_tuple_spec.cr
@@ -33,6 +33,10 @@ describe "NamedTuple" do
     t.should eq({"foo bar": 1, "baz qux": 2})
     t.class.should eq(NamedTuple("foo bar": Int32, "baz qux": Int32))
 
+    t = NamedTuple("\"": Int32, "\#{exit}": Int32).from({"\"" => 2, "\#{exit}" => 3})
+    t.should eq({"\"": 2, "\#{exit}": 3})
+    t.class.should eq(NamedTuple("\"": Int32, "\#{exit}": Int32))
+
     expect_raises ArgumentError do
       NamedTuple(foo: Int32, bar: Int32).from({:foo => 1})
     end
@@ -74,6 +78,10 @@ describe "NamedTuple" do
     t = {foo: Int32, bar: Int32}.from({"foo" => 1, :bar => 2} of String | Int32 | Symbol => Int32)
     t.should eq({foo: 1, bar: 2})
     t.class.should eq(NamedTuple(foo: Int32, bar: Int32))
+
+    t = {"\"": Int32, "\#{exit}": Int32}.from({"\"" => 2, "\#{exit}" => 3})
+    t.should eq({"\"": 2, "\#{exit}": 3})
+    t.class.should eq(NamedTuple("\"": Int32, "\#{exit}": Int32))
   end
 
   it "gets size" do

diff --git a/src/named_tuple.cr b/src/named_tuple.cr
@@ -119,7 +119,7 @@ struct NamedTuple
     {% begin %}
       NamedTuple.new(
       {% for key, value in T %}
-        {{key.stringify}}: self[{{key.symbolize}}].cast(hash.fetch({{key.symbolize}}) { hash["{{key}}"] }),
+        {{key.stringify}}: self[{{key.symbolize}}].cast(hash.fetch({{key.symbolize}}) { hash[{{key.stringify}}] }),
       {% end %}
       )
     {% end %}