compiler: show name of instantiating context in error traces (#6763) (#9207)

2018-10-11 14:34:56 +07:00 · 2018-10-11 14:34:56 +07:00 · 8fc7cecfa2
commit 8fc7cecfa2
parent da4215af6a
9 changed files with 31 additions and 19 deletions
--- a/tests/testament/tester.nim
+++ b/tests/testament/tester.nim
@ -53,7 +53,10 @@ let
  pegLineError =
    peg"{[^(]*} '(' {\d+} ', ' {\d+} ') ' ('Error') ':' \s* {.*}"
  pegLineTemplate =
-    peg"{[^(]*} '(' {\d+} ', ' {\d+} ') ' 'template/generic instantiation from here'.*"
+    peg"""
+      {[^(]*} '(' {\d+} ', ' {\d+} ') '
+      'template/generic instantiation' ( ' of `' [^`]+ '`' )? ' from here' .*
+    """
  pegOtherError = peg"'Error:' \s* {.*}"
  pegSuccess = peg"'Hint: operation successful'.*"
  pegOfInterest = pegLineError / pegOtherError