Track which filename a token was defined in

Author: MatheusRich

spec/e2e/import/runtime_error_on_other_file.lit

@@ -0,0 +1 @@
+import '../../fixtures/runtime_error.lit' # error: [runtime_error.lit:2] Runtime error: Undefined variable 'variable'.

spec/e2e/import/runtime_error_when_using_imported_function.lit

@@ -0,0 +1,3 @@
+import '../../fixtures/function.lit'
+
+open_file("unknown-file.foobar") # error: [function.lit:4] Runtime error: File not found: unknown-file.foobar

spec/fixtures/function.lit

@@ -0,0 +1,5 @@
+# a comment
+
+fn open_file { |path|
+  open!(path)
+}

spec/support/create.cr

@@ -37,20 +37,20 @@ module Create
   def token(type : Symbol, value = nil) : Lit::Token
     case type
     when :number
-      Lit::Token.new(Lit::TokenType.parse(type.to_s), "1", 1.0, 1)
+      Lit::Token.new(Lit::TokenType.parse(type.to_s), "1", 1.0, 1, ::Lit.current_file_name)
     when :string
-      Lit::Token.new(Lit::TokenType.parse(type.to_s), %("some text"), "some text", 1)
+      Lit::Token.new(Lit::TokenType.parse(type.to_s), %("some text"), "some text", 1, ::Lit.current_file_name)
     when :identifier
-      Lit::Token.new(Lit::TokenType.parse(type.to_s), value || "my_var", nil, 1)
+      Lit::Token.new(Lit::TokenType.parse(type.to_s), value || "my_var", nil, 1, ::Lit.current_file_name)
     when :string_interpolation
-      Lit::Token.new(Lit::TokenType.parse(type.to_s), "#{value}", value, 1)
+      Lit::Token.new(Lit::TokenType.parse(type.to_s), "#{value}", value, 1, ::Lit.current_file_name)
     else
       if TOKENS.has_key?(type)
-        return Lit::Token.new(Lit::TokenType.parse(type.to_s), TOKENS[type], nil, 1)
+        return Lit::Token.new(Lit::TokenType.parse(type.to_s), TOKENS[type], nil, 1, ::Lit.current_file_name)
       elsif type.to_s.starts_with?("number_")
         number = type.to_s.lchop("number_")
 
-        return Lit::Token.new(token_type(NUMBER), number, number.to_f, 1)
+        return Lit::Token.new(token_type(NUMBER), number, number.to_f, 1, ::Lit.current_file_name)
       end
 
       raise "Don't know hot to build token with type '#{type}'"

src/lit/error_reporter.cr

@@ -25,7 +25,7 @@ module Lit
     end
 
     def report_runtime_error(error)
-      STDERR.puts Text.error("[#{::Lit.current_file_name}:#{error.token.line}] Runtime error: #{error.message}")
+      STDERR.puts Text.error("[#{error.token.filename}:#{error.token.line}] Runtime error: #{error.message}")
 
       @had_runtime_error = true
     end

src/lit/parser.cr

@@ -121,9 +121,10 @@ module Lit
     private def until_expr
       condition = expression
       body = block_expr("I was expecting a block after the until condition.")
+      filename = previous.filename
 
       # desugar until to while
-      Expr::While.new(Expr::Unary.new(Token.new(TokenType::BANG, "!", nil, 0), condition), body)
+      Expr::While.new(Expr::Unary.new(Token.new(TokenType::BANG, "!", nil, 0, filename), condition), body)
     end
 
     private def loop_expr
@@ -216,7 +217,7 @@ module Lit
           raise error(@default_param.not_nil!, "Default parameter can't be used when explicit parameters are defined.")
         elsif @default_param && !@block_has_explicit_params
           # Inject implicit `it`
-          return {block_body, [Token.new(TokenType::IDENTIFIER, "it", nil, peek.line)]}
+          return {block_body, [Token.new(TokenType::IDENTIFIER, "it", nil, peek.line, peek.filename)]}
         end
 
         {block_body, params}

src/lit/scanner.cr

@@ -339,11 +339,11 @@ module Lit
     private def add_token(type, literal)
       # Make line tokens appear on the line containing the "\n".
       line = type == TokenType::NEWLINE ? @line - 1 : @line
-      @tokens << Token.new(type, current_token_string, literal, line)
+      @tokens << Token.new(type, current_token_string, literal, line, ::Lit.current_file_name)
     end
 
     private def add_eof_token
-      @tokens << Token.new(TokenType::EOF, "", nil, @line)
+      @tokens << Token.new(TokenType::EOF, "", nil, @line, ::Lit.current_file_name)
     end
 
     private def digit?(c : Char) : Bool

src/lit/token.cr

@@ -6,15 +6,16 @@ module Lit
     getter lexeme : String
     getter literal : Int64 | Float64 | String | Nil
     getter line : Int32
+    getter filename : String
 
-    def initialize(@type, @lexeme, @literal, @line); end
+    def initialize(@type, @lexeme, @literal, @line, @filename); end
 
     def inspect
       %(<#{type} lexeme: #{lexeme.inspect} literal: #{literal ? literal.inspect : "nothing"}>)
     end
 
     def with_lexeme(lexeme)
-      self.class.new(type, lexeme, literal, line)
+      self.class.new(type, lexeme, literal, line, filename)
     end
 
     delegate :to_s, to: :inspect