Fix file names in assert macro.

Neat-Lang · May 26, 2023 · ec443dd · ec443dd
1 parent 421a799
commit ec443dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/neat/base.nt b/src/neat/base.nt
@@ -725,6 +725,8 @@ abstract class CompilerBase
  // for std.macro.cimport
  string[] cFlags;
 
+ FileIdTable fileIdTable;
+
  // parser
  abstract (Parser | fail Error) createParser(string filename, string fulltext);
 

diff --git a/src/neat/compiler.nt b/src/neat/compiler.nt
@@ -42,8 +42,6 @@ class CompilerImpl : CompilerBase
 
  GlobalUniqCounter glob;
 
- FileIdTable fileIdTable;
-
  this(this.defaultImports, this.modParseConfig, this.cFlags, this.workPool, string[int] inheritedFileIds) {
  this.mutex = new Mutex;
  this.glob = new GlobalUniqCounter;

diff --git a/src/std/macro/assert.nt b/src/std/macro/assert.nt
@@ -179,7 +179,8 @@ class ASTAssertion : ASTStatement
 
  auto ifFailed = dispatch(context, test)?;
  if (auto ifFailed = ifFailed) {
- string failedMsg = locRange.toString ~ ": assertion failed: " ~ exprText ~ ", because ";
+ string failedMsg = locRange.repr(context.compiler.fileIdTable) ~
+ ": assertion failed: " ~ exprText ~ ", because ";
  context = context.withNamespace(context.compiler.exprAlias(
  context.namespace, "ifFailed", ifFailed));
  context = context.withNamespace(context.compiler.exprAlias(
@@ -196,7 +197,8 @@ class ASTAssertion : ASTStatement
  auto assertTestStmt = assertTest.compile(context)?;
  return StatementCompileResult(assertTestStmt.statement, context.namespace);
  }
- string failedMsg = locRange.toString ~ ": assertion failed: '" ~ exprText ~ "' was false";
+ string failedMsg = locRange.repr(context.compiler.fileIdTable) ~
+ ": assertion failed: '" ~ exprText ~ "' was false";
  context = context.withNamespace(context.compiler.exprAlias(
  context.namespace,
  "failedMsg",