Support named arguments in macro methods (#8429)

* Support named arguments in macro methods * Make named_args nilable * Some style updates * Update src/compiler/crystal/macros/interpreter.cr Co-Authored-By: Ary Borenszweig <[email protected]> * Simplify named_args assignment
crystal-lang · Nov 15, 2019 · 4559cd6 · 4559cd6
1 parent 1580298
commit 4559cd6
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 58 deletions.
diff --git a/spec/compiler/macro/macro_methods_spec.cr b/spec/compiler/macro/macro_methods_spec.cr
@@ -416,6 +416,16 @@ module Crystal
         assert_macro "", %({{"foo_bar".camelcase}}), [] of ASTNode, %("FooBar")
       end
 
+      it "executes camelcase with lower" do
+        assert_macro "", %({{"foo_bar".camelcase(lower: true)}}), [] of ASTNode, %("fooBar")
+      end
+
+      it "executes camelcase with invalid lower arg type" do
+        expect_raises(Crystal::TypeException, "named argument 'lower' to StringLiteral#camelcase must be a bool, not NumberLiteral") do
+          assert_macro "", %({{"foo_bar".camelcase(lower: 99)}}), [] of ASTNode, ""
+        end
+      end
+
       it "executes underscore" do
         assert_macro "", %({{"FooBar".underscore}}), [] of ASTNode, %("foo_bar")
       end

diff --git a/src/compiler/crystal/macros.cr b/src/compiler/crystal/macros.cr
@@ -393,7 +393,7 @@ module Crystal::Macros
     end
 
     # Similar to `String#camelcase`.
-    def camelcase : StringLiteral
+    def camelcase(*, lower : BoolLiteral = false) : StringLiteral
     end
 
     # Similar to `String#capitalize`.

diff --git a/src/compiler/crystal/macros/interpreter.cr b/src/compiler/crystal/macros/interpreter.cr
@@ -363,9 +363,10 @@ module Crystal
         end
 
         args = node.args.map { |arg| accept arg }
+        named_args = node.named_args.try &.to_h { |arg| {arg.name, accept arg.value} }
 
         begin
-          @last = receiver.interpret(node.name, args, node.block, self)
+          @last = receiver.interpret(node.name, args, named_args, node.block, self)
         rescue ex : MacroRaiseException
           raise ex
         rescue ex : Crystal::Exception
@@ -511,13 +512,13 @@ module Crystal
 
     def visit(node : Splat)
       node.exp.accept self
-      @last = @last.interpret("splat", [] of ASTNode, nil, self)
+      @last = @last.interpret("splat", [] of ASTNode, nil, nil, self)
       false
     end
 
     def visit(node : DoubleSplat)
       node.exp.accept self
-      @last = @last.interpret("double_splat", [] of ASTNode, nil, self)
+      @last = @last.interpret("double_splat", [] of ASTNode, nil, nil, self)
       false
     end