crystal-lang · Jul 5, 2016 · Jul 5, 2016
diff --git a/samples/sdl/sdl/lib_sdl.cr b/samples/sdl/sdl/lib_sdl.cr
@@ -5,6 +5,7 @@
 {% else %}
   @[Link("SDL")]
 {% end %}
+
 lib LibSDL
   INIT_TIMER       = 0x00000001_u32
   INIT_AUDIO       = 0x00000010_u32
@@ -160,6 +161,6 @@ end
   end
 {% elsif flag?(:darwin) %}
   redefine_main(SDL_main) do |main|
-    {{main}}
+    \{{main}}
   end
 {% end %}
diff --git a/src/compiler/crystal/core_ext/enumerable.cr b/src/compiler/crystal/core_ext/enumerable.cr
diff --git a/src/compiler/crystal/macros/macros.cr b/src/compiler/crystal/macros/macros.cr
@@ -46,7 +46,7 @@ module Crystal
         end
         normalize(generated_node, inside_exp: inside_exp)
       rescue ex : Crystal::SyntaxException
-        node.raise "macro didn't expand to a valid program, it expanded to:\n\n#{"=" * 80}\n#{"-" * 80}\n#{generated_source.lines.to_s_with_line_numbers}\n#{"-" * 80}\n#{ex.to_s_with_source(generated_source)}\n#{"=" * 80}"
+        node.raise "macro didn't expand to a valid program, it expanded to:\n\n#{"=" * 80}\n#{"-" * 80}\n#{Crystal.with_line_numbers(generated_source)}\n#{"-" * 80}\n#{ex.to_s_with_source(generated_source)}\n#{"=" * 80}"
       end
     end
   end

diff --git a/src/compiler/crystal/semantic/cleanup_transformer.cr b/src/compiler/crystal/semantic/cleanup_transformer.cr
@@ -406,10 +406,6 @@ module Crystal
       node
     end
 
-    def number_lines(source)
-      source.lines.to_s_with_line_numbers
-    end
-
     class ClosuredVarsCollector < Visitor
       getter vars : Array(ASTNode)
       @a_def : Def

diff --git a/src/compiler/crystal/semantic/exception.cr b/src/compiler/crystal/semantic/exception.cr
@@ -87,9 +87,8 @@ module Crystal
           append_error_message io, msg
         end
       when VirtualFile
-        lines = filename.source.lines.to_a
         io << "in macro '#{filename.macro.name}' #{filename.macro.location.try &.filename}:#{filename.macro.location.try &.line_number}, line #{@line}:\n\n"
-        io << lines.to_s_with_line_numbers
+        io << Crystal.with_line_numbers(filename.source)
         is_macro = true
       else
         lines = source ? source.lines.to_a : nil

diff --git a/src/compiler/crystal/tools/formatter.cr b/src/compiler/crystal/tools/formatter.cr
@@ -1228,7 +1228,7 @@ module Crystal
     end
 
     def format_ifdef_cond(cond : ASTNode)
-      cond.raise "Bug: unexpected node in ifdef condition"
+      raise "Bug: unexpected node in ifdef condition"
     end
 
     def format_ifdef_nested_cond(cond)

diff --git a/src/compiler/crystal/util.cr b/src/compiler/crystal/util.cr
@@ -41,4 +41,8 @@ module Crystal
   def self.tempfile(basename)
     CacheDir.instance.join("crystal-run-#{basename}.tmp")
   end
+
+  def self.with_line_numbers(source : String)
+    source.lines.map_with_index { |line, i| "#{"%3d" % (i + 1)}. #{line.to_s.chomp}" }.join "\n"
+  end
 end