jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

less verbose type mismatch messages (#21191)

Browse source 
* less verbose type mismatch messages

* Update compiler/types.nim

* fixes i386

* fixes i386
This commit is contained in:
ringabout 2022-12-29 03:54:15 +08:00 • committed by GitHub
commit 761c5a0830
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 105 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

44
compiler/semcall.nim
View file

@ -10,7 +10,8 @@
## This module implements semantic checking for calls.
# included from sem.nim
from algorithm import sort
from std/algorithm import sort
proc sameMethodDispatcher(a, b: PSym): bool =
result = false
@ -192,7 +193,7 @@ proc presentFailedCandidates(c: PContext, n: PNode, errors: CandidateErrors):
# argument in order to remove plenty of candidates. This is
# comparable to what C# does and C# is doing fine.
var filterOnlyFirst = false
if optShowAllMismatches notin c.config.globalOptions:
if optShowAllMismatches notin c.config.globalOptions and verboseTypeMismatch in c.config.legacyFeatures:
for err in errors:
if err.firstMismatch.arg > 1:
filterOnlyFirst = true
@ -208,6 +209,10 @@ proc presentFailedCandidates(c: PContext, n: PNode, errors: CandidateErrors):
if filterOnlyFirst and err.firstMismatch.arg == 1:
inc skipped
continue
if verboseTypeMismatch notin c.config.legacyFeatures:
candidates.add "[" & $err.firstMismatch.arg & "] "
if err.sym.kind in routineKinds and err.sym.ast != nil:
candidates.add(renderTree(err.sym.ast,
{renderNoBody, renderNoComments, renderNoPragmas}))
@ -217,7 +222,7 @@ proc presentFailedCandidates(c: PContext, n: PNode, errors: CandidateErrors):
candidates.add("\n")
let nArg = if err.firstMismatch.arg < n.len: n[err.firstMismatch.arg] else: nil
let nameParam = if err.firstMismatch.formal != nil: err.firstMismatch.formal.name.s else: ""
if n.len > 1:
if n.len > 1 and verboseTypeMismatch in c.config.legacyFeatures:
candidates.add(" first type mismatch at position: " & $err.firstMismatch.arg)
# candidates.add "\n reason: " & $err.firstMismatch.kind # for debugging
case err.firstMismatch.kind
@ -274,11 +279,28 @@ proc presentFailedCandidates(c: PContext, n: PNode, errors: CandidateErrors):
const
errTypeMismatch = "type mismatch: got <"
errButExpected = "but expected one of:"
errExpectedPosition = "Expected one of (first mismatch at position [#]):"
errUndeclaredField = "undeclared field: '$1'"
errUndeclaredRoutine = "attempting to call undeclared routine: '$1'"
errBadRoutine = "attempting to call routine: '$1'$2"
errAmbiguousCallXYZ = "ambiguous call; both $1 and $2 match for: $3"
proc describeParamList(c: PContext, n: PNode, startIdx = 1; prefer = preferName): string =
result = "Expression: " & $n
for i in startIdx..<n.len:
result.add "\n [" & $i & "] " & renderTree(n[i]) & ": "
result.add describeArg(c, n, i, startIdx, prefer)
result.add "\n"
template legacynotFoundError(c: PContext, n: PNode, errors: CandidateErrors) =
let (prefer, candidates) = presentFailedCandidates(c, n, errors)
var result = errTypeMismatch
result.add(describeArgs(c, n, 1, prefer))
result.add('>')
if candidates != "":
result.add("\n" & errButExpected & "\n" & candidates)
localError(c.config, n.info, result & "\nexpression: " & $n)
proc notFoundError*(c: PContext, n: PNode, errors: CandidateErrors) =
# Gives a detailed error message; this is separated from semOverloadedCall,
# as semOverloadedCall is already pretty slow (and we need this information
@ -306,13 +328,15 @@ proc notFoundError*(c: PContext, n: PNode, errors: CandidateErrors) =
localError(c.config, n.info, "expression '$1' cannot be called" % n[0].renderTree)
return
let (prefer, candidates) = presentFailedCandidates(c, n, errors)
var result = errTypeMismatch
result.add(describeArgs(c, n, 1, prefer))
result.add('>')
if candidates != "":
result.add("\n" & errButExpected & "\n" & candidates)
localError(c.config, n.info, result & "\nexpression: " & $n)
if verboseTypeMismatch in c.config.legacyFeatures:
legacynotFoundError(c, n, errors)
else:
let (prefer, candidates) = presentFailedCandidates(c, n, errors)
var result = "type mismatch\n"
result.add describeParamList(c, n, 1, prefer)
if candidates != "":
result.add("\n" & errExpectedPosition & "\n" & candidates)
localError(c.config, n.info, result)
proc bracketNotFoundError(c: PContext; n: PNode) =
var errors: CandidateErrors = @[]