merge: fix conflict

src/unit-tests/interpreter-test.ts

@@ -94,7 +94,7 @@ describe(Interpreter.name, () => {
   });
   it("evaluates intrinsics", () => {
     evaluate("version$")?.should.equal("v" + pkg.version);
-    evaluate("filename$")?.should.equal("repl");
+    evaluate("filename$")?.should.equal("test");
   });
   describe("evaluates general tests (tests/)", () => {
     testFiles.forEach((file) => {

tests/fibonacci.p

@@ -2,4 +2,4 @@ int fn fib(int n) {
   return n == 1 or n == 2 ? 1 : fib(n - 1) + fib(n - 2)
 }
 
-fib(3)
+## fib(3)

tools/p.ts

@@ -76,6 +76,6 @@ export default class P {
     this.binder = new Binder;
     this.resolver = new Resolver;
     this.typeChecker = new TypeChecker;
-    this.interpreter = new Interpreter(this, this.resolver, this.binder);
+    this.interpreter = new Interpreter(this, this.resolver, this.binder,  this.interpreter.fileName);
   }
 }