crystal-lang · Jul 29, 2016 · Jul 29, 2016 · Jul 29, 2016 · Jul 29, 2016
Showing with 33 additions and 16 deletions.

+15 −0 spec/compiler/codegen/macro_spec.cr

+2 −0 spec/compiler/formatter/formatter_spec.cr

+5 −2 src/compiler/crystal/macros/interpreter.cr

+7 −2 src/compiler/crystal/tools/formatter.cr

+4 −12 src/object.cr
diff --git a/spec/compiler/codegen/macro_spec.cr b/spec/compiler/codegen/macro_spec.cr
@@ -1411,4 +1411,19 @@ describe "Code gen: macro" do
       bar("hi")
       )).to_string.should eq("hi")
   end
+
+  it "surrounds {{yield}} with begin/end" do
+    run(%(
+      macro foo
+        a = {{yield}}
+      end
+
+      a = 0
+      foo do
+        1
+        2
+      end
+      a
+      )).to_i.should eq(2)
+  end
 end
diff --git a/spec/compiler/formatter/formatter_spec.cr b/spec/compiler/formatter/formatter_spec.cr
@@ -967,4 +967,6 @@ describe Crystal::Formatter do
 
   assert_format %(puts(<<-FOO\n1\nFOO, 2))
   assert_format %(puts <<-FOO\n1\nFOO, 2)
+
+  assert_format "x : Int32 |\nString", "x : Int32 |\n    String"
 end
diff --git a/src/compiler/crystal/macros/interpreter.cr b/src/compiler/crystal/macros/interpreter.cr
@@ -76,7 +76,7 @@ module Crystal
     def initialize(@program : Program,
                    @scope : Type, @path_lookup : Type, @location : Location?,
                    @vars = {} of String => ASTNode, @block : Block? = nil)
-      @str = String::Builder.new(512)
+      @str = MemoryIO.new(512) # Can't be String::Builder because of `{{debug()}}
       @last = Nop.new
     end
 
@@ -101,8 +101,11 @@ module Crystal
         # In the caseof {{yield}}, we want to paste the block's body
         # retaining the original node's location, so error messages
         # are shown in the block instead of in the generated macro source
-        emit_loc_pragma = node.exp.is_a?(Yield) && !@last.is_a?(Nop)
+        is_yield = node.exp.is_a?(Yield) && !@last.is_a?(Nop)
+        @str << " begin " if is_yield
+        emit_loc_pragma = is_yield
         @last.to_s(@str, emit_loc_pragma: emit_loc_pragma)
+        @str << " end " if is_yield
       end
 
       false

diff --git a/src/compiler/crystal/tools/formatter.cr b/src/compiler/crystal/tools/formatter.cr
@@ -1040,6 +1040,7 @@ module Crystal
       check_open_paren
 
       paren_count = @paren_count
+      column = @column
 
       node.types.each_with_index do |type, i|
         if @token.type == :"?"
@@ -1059,8 +1060,12 @@ module Crystal
           case @token.type
           when :"|"
             write " | "
-            next_token
-            skip_space_or_newline
+            next_token_skip_space
+            if @token.type == :NEWLINE
+              write_line
+              write_indent(column)
+              next_token_skip_space_or_newline
+            end
           when :")"
             if @paren_count > 0
               @paren_count -= 1

diff --git a/src/object.cr b/src/object.cr
@@ -283,15 +283,11 @@ class Object
         @{{name.var.id}} : {{name.type}}?
 
         def {{name.var.id}}
-          @{{name.var.id}} ||= begin
-            {{yield}}
-          end
+          @{{name.var.id}} ||= {{yield}}
         end
       {% else %}
         def {{name.id}}
-          @{{name.id}} ||= begin
-            {{yield}}
-          end
+          @{{name.id}} ||= {{yield}}
         end
       {% end %}
     {% else %}
@@ -745,15 +741,11 @@ class Object
         @{{name.var.id}} : {{name.type}}?
 
         def {{name.var.id}}
-          @{{name.var.id}} ||= begin
-            {{yield}}
-          end
+          @{{name.var.id}} ||= {{yield}}
         end
       {% else %}
         def {{name.id}}
-          @{{name.id}} ||= begin
-            {{yield}}
-          end
+          @{{name.id}} ||= {{yield}}
         end
       {% end %}
     {% else %}