Fixed #3110: splated arguments instrumentation

crystal-lang · Aug 8, 2016 · 27b5652 · Sija · Aug 9, 2016 · asterite
1 parent 349c90b
commit 27b5652
Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/spec/compiler/crystal/tools/playground_spec.cr b/spec/compiler/crystal/tools/playground_spec.cr
@@ -131,6 +131,8 @@ describe Playground::AgentInstrumentorTransformer do
   it "instrument puts with args" do
     assert_agent %(puts 3), %(puts($p.i(1) { 3 }))
     assert_agent %(puts a, 2, b), %(puts(*$p.i(1, ["a", "2", "b"]) { {a, 2, b} }))
+    assert_agent %(puts *{3}), %(puts(*$p.i(1, ["3"]) { {3} }))
+    assert_agent %(puts *{3,a}), %(puts(*$p.i(1, ["3", "a"]) { {3,a} }))
     assert_agent_eq %(puts), %(puts)
   end
 

diff --git a/src/compiler/crystal/tools/playground/agent_instrumentor_transformer.cr b/src/compiler/crystal/tools/playground/agent_instrumentor_transformer.cr
@@ -70,13 +70,16 @@ module Crystal
 
     private def instrument(node, add_as_typeof = false)
       if (location = node.location) && location.line_number != ignore_line
+        splat = node.is_a?(Splat)
+        node = node.exp if node.is_a?(Splat)
         @nested_block_visitor.not_nil!.accept(node)
         args = [NumberLiteral.new(location.line_number)] of ASTNode
         if node.is_a?(TupleLiteral)
           args << ArrayLiteral.new(node.elements.map { |e| StringLiteral.new(e.to_s).as(ASTNode) })
         end
         call = Call.new(Global.new("$p"), "i", args, Block.new([] of Var, node.as(ASTNode)))
         call = Cast.new(call, TypeOf.new([node.clone] of ASTNode)) if add_as_typeof
+        call = Splat.new(call) if splat
         call
       else
         node