crystal-lang · Jul 29, 2016 · Jul 29, 2016 · Jul 29, 2016 · Jul 29, 2016 · Jul 29, 2016
diff --git a/spec/compiler/codegen/macro_spec.cr b/spec/compiler/codegen/macro_spec.cr
@@ -1395,4 +1395,20 @@ describe "Code gen: macro" do
       {% end %}
       )).to_string.should eq(%(hello [{"world", "world"}, "world"]))
   end
+
+  it "retains original yield expression (#2923)" do
+    run(%(
+      macro foo
+        def bar(baz)
+          {{yield}}
+        end
+      end
+
+      foo do
+        baz
+      end
+
+      bar("hi")
+      )).to_string.should eq("hi")
+  end
 end
diff --git a/spec/compiler/lexer/location_spec.cr b/spec/compiler/lexer/location_spec.cr
@@ -68,6 +68,23 @@ describe "Lexer: location" do
     token.filename.should eq("foo")
   end
 
+  it "uses two consecutive loc pragma " do
+    lexer = Lexer.new %(1#<loc:"foo",12,34>#<loc:"foo",56,78>2)
+    lexer.filename = "bar"
+
+    token = lexer.next_token
+    token.type.should eq(:NUMBER)
+    token.line_number.should eq(1)
+    token.column_number.should eq(1)
+    token.filename.should eq("bar")
+
+    token = lexer.next_token
+    token.type.should eq(:NUMBER)
+    token.line_number.should eq(56)
+    token.column_number.should eq(78)
+    token.filename.should eq("foo")
+  end
+
   it "assigns correct loc location to node" do
     exps = Parser.parse(%[(#<loc:"foo.txt",2,3>1 + 2)]).as(Expressions)
     node = exps.expressions.first

diff --git a/spec/compiler/parser/to_s_spec.cr b/spec/compiler/parser/to_s_spec.cr
@@ -71,4 +71,5 @@ describe "ASTNode#to_s" do
   expect_to_s %(Foo("bar baz": Int32))
   expect_to_s %({"foo bar": 1})
   expect_to_s %(def foo("bar baz" qux)\nend)
+  expect_to_s "foo()"
 end
diff --git a/spec/spec_helper.cr b/spec/spec_helper.cr
@@ -259,7 +259,6 @@ def assert_macro_internal(program, sub_node, macro_args, macro_body, expected)
 
   call = Call.new(nil, "", sub_node)
   result = program.expand_macro a_macro, call, program, program
-  result = result.source
   result = result.chomp(';')
   result.should eq(expected)
 end

diff --git a/spec/std/logger_spec.cr b/spec/std/logger_spec.cr
@@ -74,4 +74,9 @@ describe "Logger" do
       r.gets.should match(/  ANY -- shard: another message\n/)
     end
   end
+
+  it "can create a logger with nil (#3065)" do
+    logger = Logger.new(nil)
+    logger.error("ouch")
+  end
 end
diff --git a/spec/std/xml/xpath_spec.cr b/spec/std/xml/xpath_spec.cr
@@ -65,6 +65,7 @@ module XML
 
     it "raises on invalid xpath" do
       expect_raises XML::Error do
+        doc = doc()
         doc.xpath("coco()")
       end
     end