progress

Author: zerbina

compiler/ast/errorhandling.nim

@@ -44,9 +44,6 @@ import
     options,
   ]
 
-when defined(nimDebugUnreportedErrors):
-  import std/tables
-
 proc errorSubNode*(n: PNode): PNode =
   ## find the first error node, or nil, under `n` using a depth first traversal
   case n.kind
@@ -118,9 +115,9 @@ proc newError*(
   if diag.instLoc.filename in ["???", ""]:
     diag.instLoc = inst # compilerInfoPos
 
-  when defined(nimDebugUnreportedErrors):
-    if diag.kind != adWrappedError:
-      conf.unreportedErrors[result.diag.diagId] = result
+  if diag.kind notin {adWrappedError, adWrappedSymError}:
+    # invoke the diagnostic/report handler
+    conf.handle(conf.astDiagToLegacyReport(conf, diag), inst)
 
 template newError*(
     conf: ConfigRef,
@@ -169,9 +166,6 @@ proc buildErrorList(config: ConfigRef, n: PNode, errs: var seq[PNode]) =
     discard
   of nkError:
     buildErrorList(config, n.diag.wrongNode, errs)
-    when defined(nimDebugUnreportedErrors):
-      if n.errorKind == adWrappedError and errs.len == 0:
-        echo "Empty WrappedError: ", config $ n.info
     errs.add n
   of nkWithSons:
     for i in 0..<n.len:

compiler/ast/errorreporting.nim

@@ -1,56 +1 @@
-#
-#
-#           The Nim Compiler
-#        (c) Copyright 2021 Saem Ghani
-#
-#    See the file "copying.txt", included in this
-#    distribution, for details about the copyright.
-#
-
-## module handles reporting errors, it's used in conjunction with errorhandling
-##
-## Todo:
-## * write an error reporting proc that handles string conversion and also
-##   determines which error handling strategy to use doNothing, raise, etc.
-
-import
-  compiler/ast/[
-    ast,
-    errorhandling,
-    renderer,
-    reports,
-  ]
-
-when defined(nimDebugUnreportedErrors):
-  import std/tables
-
-from compiler/front/options import ConfigRef
-from compiler/front/msgs import TErrorHandling, astDiagToLegacyReportKind
-
-export compilerInstInfo, walkErrors, errorKind
-# export because keeping the declaration in `errorhandling` acts as a reminder
-# of what the contract is with the subtleties around line and column info
-# overloading
-
-proc errorHandling*(err: PNode): TErrorHandling =
-  ## which error handling strategy should be used given the error, use with
-  ## `msg.liMessage` when reporting errors.
-  assert err.isError, "err can't be nil and must be an nkError"
-  case err.diag.astDiagToLegacyReportKind:
-    of rsemCustomGlobalError: doRaise
-    of rsemFatalError: doAbort
-    else: doNothing
-
-template localReport*(conf: ConfigRef, node: PNode) =
-  ## Write out existing sem report that is stored in the nkError node
-  {.line.}:
-    assert node.kind == nkError, $node.kind
-
-    when defined(nimDebugUnreportedErrors):
-      conf.unreportedErrors.del node.id
-      for err in walkErrors(conf, node):
-        conf.unreportedErrors.del err.id
-
-    for err in walkErrors(conf, node):
-      if true or canReport(conf, err):
-        handleReport(conf, err.diag, instLoc(), node.errorHandling)
+# TODO: remove

compiler/ast/parser.nim

@@ -134,7 +134,7 @@ proc getTok(p: var Parser) =
   p.lex.rawGetTok(p.tok)
 
   if p.tok.tokType == tkError:
-    p.lex.config.handleLexerDiag(p.tok.error, instLoc(-1), doAbort)
+    p.lex.config.handleLexerDiag(p.tok.error, instLoc(-1), isFatal=true)
 
   for d in p.lex.errorsHintsAndWarnings(lexDiagOffset):
     p.lex.config.handleLexerDiag(d, instLoc(-1))

compiler/ast/report_enums.nim

@@ -297,12 +297,6 @@ type
     # nimsuggest
     rsemSugNoSymbolAtPosition
 
-    # Global Errors
-    rsemCustomGlobalError
-      ## just like custom error, but treat it like a "raise" and fast track the
-      ## "graceful" abort of this compilation run, used by `errorreporting` to
-      ## bridge into the existing `msgs.liMessage` and `msgs.handleError`.
-
     # Module errors
     rsemSystemNeeds
     rsemInvalidModulePath

compiler/ast/reports_sem.nim

@@ -250,4 +250,4 @@ func reportSym*(
     kind: ReportKind,
     sym: PSym, ast: PNode = nil, str: string = "", typ: PType = nil,
   ): SemReport =
-  SemReport(kind: kind, ast: ast, str: str, typ: typ, sym: sym)
+  SemReport(kind: kind, ast: ast, str: str, typ: typ, sym: sym)

compiler/front/cli_reporter.nim

@@ -1746,9 +1746,6 @@ proc reportBody*(conf: ConfigRef, r: SemReport): string =
     of rsemNodeNotAllowed:
       result = "'$1' not allowed here" % r.ast.render
 
-    of rsemCustomGlobalError:
-      result = r.str
-
     of rsemCannotImportItself:
       result = "module '$1' cannot import itself" % r.symstr
 

compiler/front/main.nim

@@ -85,19 +85,6 @@ when not defined(leanCompiler):
     compiler/backend/jsbackend,
     compiler/tools/[docgen, docgen2]
 
-when defined(nimDebugUnreportedErrors):
-  import std/exitprocs
-  import compiler/utils/astrepr
-
-  proc echoAndResetUnreportedErrors(conf: ConfigRef) =
-    if conf.unreportedErrors.len > 0:
-      echo "Unreported errors:"
-      for nodeId, node in conf.unreportedErrors:
-        var reprConf = defaultTReprConf
-        reprConf.flags.incl trfShowNodeErrors
-        echo conf.treeRepr(node)
-      conf.unreportedErrors.clear
-
 type
   InternalStateDump = ref object
     version*: string
@@ -518,9 +505,6 @@ proc mainCommand*(graph: ModuleGraph) =
     if conf.cmd in cmdDocLike + {cmdRst2html, cmdRst2tex}: ret = ret / htmldocsDir
     conf.outDir = ret
 
-  when defined(nimDebugUnreportedErrors):
-    addExitProc proc = echoAndResetUnreportedErrors(conf)
-
   when defined(gcOrc) and not defined(leakTest):
     # Compilation is currently very taxing on ORC due to frequent
     # creations and destructions of ref objects with potential cycles.
@@ -718,9 +702,6 @@ proc mainCommand*(graph: ModuleGraph) =
     if conf.isEnabled(rintSuccessX):
       conf.writeln(cmdOutStatus, $genSuccessX(conf))
 
-  when defined(nimDebugUnreportedErrors):
-    echoAndResetUnreportedErrors(conf)
-
   when PrintRopeCacheStats:
     echo "rope cache stats: "
     echo "  tries : ", gCacheTries