Skip to content

Commit

Permalink
Closes #894
Browse files Browse the repository at this point in the history
  • Loading branch information
@fasterthanlime
fasterthanlime committed Jul 9, 2015
1 parent 092b62b commit 0278c19
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 31 deletions.
7 changes: 7 additions & 0 deletions source/rock/frontend/AstBuilder.ooc
View file
Expand Up @@ -1417,6 +1417,13 @@ nq_error: unmangled func (this: AstBuilder, errorID: Int, message: CString, inde
}

SyntaxError: class extends Error {

init: super func ~tokenMessage

prepareMessage: func -> String {
// syntax errors (from nagaqueen) already have a newline
message
}

}

58 changes: 29 additions & 29 deletions source/rock/middle/FunctionCall.ooc
View file
Expand Up @@ -451,12 +451,18 @@ FunctionCall: class extends Expression {
} else if(expr getType() != null && expr getType() getRef() != null) {
if(!expr getType() getRef() instanceOf?(TypeDecl)) {
message := "No such function %s%s for `%s`" format(prettyName, getArgsTypesRepr(), expr getType() getName())
precisions := ""

if(expr getType() isGeneric()) {
message += " (you can't call methods on generic types! you have to cast them first)"
} else if (ref) {
message += "\n\n>> Closest match: %s\n" format(ref toString())
precisions += showNearestMatch(res params)
}
err := UnresolvedCall new(this, message)
if (!precisions empty?()) {
err next = InfoError new(ref ? ref token : nullToken, precisions)
}
res throwError(UnresolvedCall new(this, message, ""))
res throwError(err)
}
tDecl := expr getType() getRef() as TypeDecl
meta := tDecl getMeta()
Expand Down Expand Up @@ -555,20 +561,12 @@ FunctionCall: class extends Expression {
message := "No such function"
if(expr == null) {
message = "No such function %s%s" format(prettyName, getArgsTypesRepr())
if (ref) {
// TODO: use showNearestMatch (amos)
message += "\n\n>> Closest match: %s\n" format(ref toString())
}
} else if (expr getType() != null) {
if(res params veryVerbose) {
message = "No such function %s%s for `%s` (%s)" format(prettyName, getArgsTypesRepr(),
expr getType() toString(), expr getType() getRef() ? expr getType() getRef() token toString() : "(nil)")
} else {
message = "No such function %s%s for `%s`" format(prettyName, getArgsTypesRepr(), expr getType() toString())
if (ref) {
// TODO: use showNearestMatch (amos)
message += "\n\n>> Closest match: %s\n" format(ref toString())
}
}
}

Expand All @@ -587,7 +585,11 @@ FunctionCall: class extends Expression {
if(similar) message += similar
}
}
res throwError(UnresolvedCall new(this, message, precisions))
err := UnresolvedCall new(this, message)
if (!precisions empty?()) {
err next = InfoError new(ref ? ref token : nullToken, precisions)
}
res throwError(err)
return Response OK
} else {
res wholeAgain(this, "no match yet")
Expand All @@ -609,8 +611,9 @@ FunctionCall: class extends Expression {
(expr as VariableAccess getRef() instanceOf?(ClassDecl) || expr as VariableAccess getRef() instanceOf?(CoverDecl)) && \
(expr as VariableAccess getRef() as TypeDecl inheritsFrom?(ref getOwner()) || \
expr as VariableAccess getRef() == ref getOwner()) && !ref isStatic) {
res throwError(UnresolvedCall new(this, "No such function %s%s for `%s` (%s)" format(prettyName, getArgsTypesRepr(),
expr getType() toString(), expr getType() getRef() ? expr getType() getRef() token toString() : "(nil)"), ""))
msg := "No such function %s%s for `%s` (%s)" format(prettyName, getArgsTypesRepr(),
expr getType() toString(), expr getType() getRef() ? expr getType() getRef() token toString() : "(nil)")
res throwError(UnresolvedCall new(this, msg))
}

/*
Expand Down Expand Up @@ -683,7 +686,7 @@ FunctionCall: class extends Expression {
showNearestMatch: func (params: BuildParams) -> String {
b := Buffer new()

b append("\n\n\tNearest match is:\n\n\t\t%s\n" format(ref toString(this)))
b append("Nearest match is `#{ref toString(this)}`")

callIter := args iterator()
declIter := ref args iterator()
Expand All @@ -694,12 +697,12 @@ FunctionCall: class extends Expression {
callArg := callIter next()

if(declArg getType() == null) {
b append(declArg token formatMessage("\tbut couldn't resolve type of this argument in the declaration\n", ""))
b append("\n..but couldn't resolve type of argument `#{declArg}` in the declaration")
continue
}

if(callArg getType() == null) {
b append(callArg token formatMessage("\tbut couldn't resolve type of this argument in the call\n", ""))
b append("\n..but couldn't resolve type of argument `#{callArg}` in the call")
continue
}

Expand All @@ -711,12 +714,11 @@ FunctionCall: class extends Expression {
score := callArg getType() getScore(declArgType)
if(score < 0) {
if(params veryVerbose) {
b append("\t..but the type of this arg should be `%s` (%s), not %s (%s)\n" format(declArgType toString(), declArgType getRef() ? declArgType getRef() token toString() : "(nil)",
b append("\n..but the type of this arg should be `%s` (%s), not %s (%s)\n" format(declArgType toString(), declArgType getRef() ? declArgType getRef() token toString() : "(nil)",
callArg getType() toString(), callArg getType() getRef() ? callArg getType() getRef() token toString() : "(nil)"))
} else {
b append("\t..but the type of this arg (%s) should be `%s`, not `%s`\n" format(callArg toString(), declArgType toString(), callArg getType() toString()))
b append("\n..but the arg `%s` should be of type `%s` instead of `%s`\n" format(callArg toString(), declArgType toString(), callArg getType() toString()))
}
b append(token formatMessage("\t\t", "", ""))
}
}

Expand Down Expand Up @@ -1618,19 +1620,17 @@ InvalidSlurp: class extends Error {
UnresolvedCall: class extends Error {

call: FunctionCall
precisions: String

init: func (.call, .message, =precisions) {
init(call token, call, message)
init: func (.call, .message) {
super(call token, message)
}

init: func ~withToken(.token, =call, .message) {
super(call expr ? call expr token enclosing(call token) : call token, message)
precisions = ""
}

format: func -> String {
token formatMessage(message, "ERROR") + precisions
init: func ~withToken (.token, call: FunctionCall, message: String) {
token = call token
if (call expr) {
token = call expr token enclosing(token)
}
super(token, message)
}

}
Expand Down
8 changes: 6 additions & 2 deletions source/rock/middle/tinker/Errors.ooc
View file
Expand Up @@ -50,16 +50,20 @@ Error: abstract class {

fatal?: func -> Bool { true }

prepareMessage: func -> String {
message + "\n"
}

format: func -> String {
result := token formatMessage(message, getType())
result := token formatMessage(prepareMessage(), getType())
if (next) {
return result + next format()
}
result
}

print: func {
token printMessage(message, getType())
token printMessage(prepareMessage(), getType())
if (next) {
next print()
}
Expand Down

0 comments on commit 0278c19

Please sign in to comment.