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

Got rid of errUndeclaredProcedureField.

Browse source
This commit is contained in:
Dominik Picheta 2015-06-04 16:39:38 +01:00
commit 5d6f16cc1a
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/msgs.nim
View file

@ -35,7 +35,7 @@ type
errUnknownOS, errUnknownCPU, errGenOutExpectedButXFound, errUnknownOS, errUnknownCPU, errGenOutExpectedButXFound,
errArgsNeedRunOption, errInvalidMultipleAsgn, errColonOrEqualsExpected, errArgsNeedRunOption, errInvalidMultipleAsgn, errColonOrEqualsExpected,
errExprExpected, errUndeclaredIdentifier, errUndeclaredField, errExprExpected, errUndeclaredIdentifier, errUndeclaredField,
errUndeclaredProcedure, errUndeclaredProcedureField, errUseQualifier, errUndeclaredProcedure, errUseQualifier,
errTypeExpected, errTypeExpected,
errSystemNeeds, errExecutionOfProgramFailed, errNotOverloadable, errSystemNeeds, errExecutionOfProgramFailed, errNotOverloadable,
errInvalidArgForX, errStmtHasNoEffect, errXExpectsTypeOrValue, errInvalidArgForX, errStmtHasNoEffect, errXExpectsTypeOrValue,
@ -194,7 +194,6 @@ const
errUndeclaredIdentifier: "undeclared identifier: \'$1\'", errUndeclaredIdentifier: "undeclared identifier: \'$1\'",
errUndeclaredField: "undeclared field: \'$1\'", errUndeclaredField: "undeclared field: \'$1\'",
errUndeclaredProcedure: "attempting to call undeclared procedure: \'$1\'", errUndeclaredProcedure: "attempting to call undeclared procedure: \'$1\'",
errUndeclaredProcedureField: "attempting to call undeclared procedure field: \'$1\'",
errUseQualifier: "ambiguous identifier: \'$1\' -- use a qualifier", errUseQualifier: "ambiguous identifier: \'$1\' -- use a qualifier",
errTypeExpected: "type expected", errTypeExpected: "type expected",
errSystemNeeds: "system module needs \'$1\'", errSystemNeeds: "system module needs \'$1\'",

8
compiler/semcall.nim
View file

@ -209,12 +209,8 @@ proc resolveOverloads(c: PContext, n, orig: PNode,
pickBest(callOp) pickBest(callOp)
if overloadsState == csEmpty and result.state == csEmpty: if overloadsState == csEmpty and result.state == csEmpty:
if nfDotField in n.flags: if nfDotField in n.flags and nfExplicitCall notin n.flags:
if nfExplicitCall in n.flags: localError(n.info, errUndeclaredField, considerQuotedIdent(f).s)
localError(n.info, errUndeclaredProcedureField,
considerQuotedIdent(f).s)
else:
localError(n.info, errUndeclaredField, considerQuotedIdent(f).s)
else: else:
localError(n.info, errUndeclaredProcedure, considerQuotedIdent(f).s) localError(n.info, errUndeclaredProcedure, considerQuotedIdent(f).s)
return return

2
tests/tuples/twrongtupleaccess.nim
View file

@ -1,7 +1,7 @@
discard """ discard """
file: "twrongtupleaccess.nim" file: "twrongtupleaccess.nim"
line: 9 line: 9
errormsg: "attempting to call undeclared procedure field: \'setBLAH\'" errormsg: "attempting to call undeclared procedure: \'setBLAH\'"
""" """
# Bugfix # Bugfix