crystal-lang · Dec 13, 2016 · Dec 13, 2016
Showing with 52 additions and 2 deletions.

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

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

+1 −0 src/compiler/crystal/compiler.cr

+3 −0 src/compiler/crystal/program.cr

+2 −2 src/compiler/crystal/syntax/ast.cr
diff --git a/spec/compiler/codegen/macro_spec.cr b/spec/compiler/codegen/macro_spec.cr
@@ -1575,4 +1575,46 @@ describe "Code gen: macro" do
       x
       )).to_b.should be_false
   end
+
+  it "forwards file location" do
+    run(%(
+      macro foo
+        bar
+      end
+
+      macro bar(file = __FILE__)
+        {{file}}
+      end
+
+      foo
+      ), filename: "bar.cr").to_string.should eq("bar.cr")
+  end
+
+  it "forwards dir location" do
+    run(%(
+      macro foo
+        bar
+      end
+
+      macro bar(dir = __DIR__)
+        {{dir}}
+      end
+
+      foo
+      ), filename: "somedir/bar.cr").to_string.should eq("somedir")
+  end
+
+  it "forwards line number" do
+    run(%(
+      macro foo
+        bar
+      end
+
+      macro bar(line = __LINE__)
+        {{line}}
+      end
+
+      foo
+      ), filename: "somedir/bar.cr", inject_primitives: false).to_i.should eq(10)
+  end
 end
diff --git a/src/compiler/crystal/codegen/codegen.cr b/src/compiler/crystal/codegen/codegen.cr
@@ -200,6 +200,10 @@ module Crystal
 
       initialize_simple_class_vars_and_constants
 
+      if @debug && (filename = @program.filename)
+        set_current_debug_location Location.new(filename, 1, 1)
+      end
+
       alloca_vars @program.vars, @program
 
       emit_vars_debug_info(@program.vars) if @debug

diff --git a/src/compiler/crystal/compiler.cr b/src/compiler/crystal/compiler.cr
@@ -149,6 +149,7 @@ module Crystal
 
     private def new_program(sources)
       program = Program.new
+      program.filename = sources.first.filename
       program.cache_dir = CacheDir.instance.directory_for(sources)
       program.target_machine = target_machine
       program.flags << "release" if release?

diff --git a/src/compiler/crystal/program.cr b/src/compiler/crystal/program.cr
@@ -106,6 +106,9 @@ module Crystal
     # Whether to show error trace
     property? show_error_trace = false
 
+    # The main filename of this program
+    property filename : String?
+
     def initialize
       super(self, self, "main")
 

diff --git a/src/compiler/crystal/syntax/ast.cr b/src/compiler/crystal/syntax/ast.cr
@@ -2060,15 +2060,15 @@ module Crystal
     end
 
     def self.expand_line(location)
-      location.try(&.line_number) || 0
+      (location.try(&.original_location) || location).try(&.line_number) || 0
     end
 
     def self.expand_file_node(location)
       StringLiteral.new(expand_file(location))
     end
 
     def self.expand_file(location)
-      location.try(&.filename.to_s) || "?"
+      location.try(&.original_filename.to_s) || "?"
     end
 
     def self.expand_dir_node(location)