crystal-lang · May 6, 2016 · May 6, 2016 · May 6, 2016
Showing with 17 additions and 4 deletions.

+4 −0 spec/compiler/macro/macro_methods_spec.cr

+1 −1 src/class.cr

+4 −0 src/compiler/crystal/macros.cr

+7 −0 src/compiler/crystal/macros/methods.cr

+1 −1 src/enum.cr

+0 −2 src/primitives.cr
diff --git a/spec/compiler/macro/macro_methods_spec.cr b/spec/compiler/macro/macro_methods_spec.cr
@@ -510,6 +510,10 @@ describe "macro methods" do
       assert_macro "", %({{ [1, 2, 3].includes?(1) }}), [] of ASTNode, %(true)
       assert_macro "", %({{ [1, 2, 3].includes?(4) }}), [] of ASTNode, %(false)
     end
+
+    it "executes +" do
+      assert_macro "", %({{ [1, 2] + [3, 4, 5] }}), [] of ASTNode, %([1, 2, 3, 4, 5])
+    end
   end
 
   describe "hash methods" do

diff --git a/src/class.cr b/src/class.cr
@@ -36,7 +36,7 @@ class Class
   #     typeof(number)             # => (String | Int32)
   #     typeof(klass.cast(number)) # => Int32
   #
-  macro def cast(other) : self
+  def cast(other) : self
     other as self
   end
 

diff --git a/src/compiler/crystal/macros.cr b/src/compiler/crystal/macros.cr
@@ -498,6 +498,10 @@ module Crystal::Macros
     # Similar to `Array#[]`, but returns `NilLiteral` on out of bounds.
     def [](index : NumberLiteral) : ASTNode
     end
+
+    # Similar to `Array#+`.
+    def +(other : ArrayLiteral) : ArrayLiteral
+    end
   end
 
   # A hash literal.

diff --git a/src/compiler/crystal/macros/methods.cr b/src/compiler/crystal/macros/methods.cr
@@ -508,6 +508,13 @@ module Crystal
         else
           wrong_number_of_arguments "ArrayLiteral##{method}", args.size, 1
         end
+      when "+"
+        interpret_one_arg_method(method, args) do |arg|
+          unless arg.is_a?(ArrayLiteral)
+            arg.raise "argument to `ArrayLiteral#+` must be an array, not #{arg.class_desc}:\n\n#{arg}"
+          end
+          ArrayLiteral.new(elements + arg.elements)
+        end
       else
         super
       end

diff --git a/src/enum.cr b/src/enum.cr
@@ -325,7 +325,7 @@ struct Enum
   # Color.from_value(2) # => Color::Blue
   # Color.from_value(3) # => Exception
   # ```
-  macro def self.from_value(value) : self
+  def self.from_value(value) : self
     from_value?(value) || raise "Unknown enum #{self} value: #{value}"
   end
 

diff --git a/src/primitives.cr b/src/primitives.cr
@@ -284,7 +284,6 @@ end
     end
   {% end %}
 
-
   {% for int in ints %}
     struct {{int.id}}
       # Returns a `Char` that has the unicode codepoint of *self*.
@@ -340,7 +339,6 @@ end
         @[Primitive(:binary)]
         def unsafe_mod(other : {{int2.id}}) : self
         end
-
       {% end %}
 
       {% for float in floats %}