Support file and line arguments in eval

lib/natalie/compiler/macro_expander.rb

@@ -158,7 +158,7 @@ def macro_load(expr:, current_path:, **)
       def macro_eval(expr:, current_path:, locals:, **)
         args = expr.arguments&.arguments || []
         node = args.first
-        $stderr.puts 'FIXME: binding passed to eval() will be ignored.' if args.size > 1
+        $stderr.puts 'FIXME: binding passed to eval() will be ignored.' if args.size > 1 && args[1].type != :nil_node
         if node.type == :interpolated_string_node && node.parts.all? { |subnode| subnode.type == :string_node }
           node = Prism::StringNode.new(
             nil,
@@ -170,9 +170,24 @@ def macro_eval(expr:, current_path:, locals:, **)
             node.location,
           )
         end
+        line = nil
         if node.type == :string_node
+          if args.size > 2
+            if args[2].is_a?(Prism::StringNode)
+              current_path = args[2].unescaped
+            else
+              $stderr.puts 'FIXME: passed file to eval() will be ignored'
+            end
+          end
+          if args.size > 3
+            if args[3].is_a?(Prism::IntegerNode)
+              line = args[3].value
+            else
+              $stderr.puts 'FIXME: passed line to eval() will be ignored'
+            end
+          end
           begin
-            Natalie::Parser.new(node.unescaped, current_path, locals: locals).ast
+            Natalie::Parser.new(node.unescaped, current_path, line: line, locals: locals).ast
           rescue Parser::ParseError => e
             drop_error(:SyntaxError, e.message, location: node.location)
           end

lib/natalie/parser.rb

@@ -63,9 +63,10 @@ class ParseError < StandardError
     class IncompleteExpression < ParseError
     end
 
-    def initialize(code_str, path, locals: [])
+    def initialize(code_str, path, line: nil, locals: [])
       @code_str = code_str
       @path = path
+      @line = line
       @locals = locals
     end
 
@@ -74,7 +75,7 @@ def tokenize
     end
 
     def result
-      @result ||= Prism.parse(@code_str, filepath: @path, scopes: [@locals])
+      @result ||= Prism.parse(@code_str, filepath: @path, line: @line, scopes: [@locals])
     end
 
     def source = result.source

spec/core/proc/binding_spec.rb

@@ -15,8 +15,9 @@ def obj.test_binding(some, params)
 
     lambdas_binding = obj.test_binding(1, 2).binding
 
-    # NATFIXME: binding passed to eval() will be ignored.
-    # eval("some", lambdas_binding).should == 1
-    # eval("params", lambdas_binding).should == 2
+    NATFIXME 'binding passed to eval() will be ignored.', exception: NoMethodError, message: "undefined method `some' for main" do
+      eval("some", lambdas_binding).should == 1
+      eval("params", lambdas_binding).should == 2
+    end
   end
 end

test/natalie/eval_test.rb

@@ -56,4 +56,9 @@ class C
       a
     RUBY
   end
+
+  it 'can handle file and line argument' do
+    eval('"#{__FILE__}:#{__LINE__}"', nil, 'foo.rb').should == 'foo.rb:1'
+    eval('"#{__FILE__}:#{__LINE__}"', nil, 'foo.rb', 1234).should == 'foo.rb:1234'
+  end
 end