move error formating to Printer
This commit is contained in:
+1
-32
@@ -95,39 +95,8 @@ class Error {
|
||||
this.origin = origin;
|
||||
this.line = line;
|
||||
}
|
||||
|
||||
private function errorDefToString(): String {
|
||||
switch (e) {
|
||||
case EInvalidChar(c):
|
||||
return "Invalid character: '"+String.fromCharCode(c)+"' ("+c+")";
|
||||
|
||||
case EUnexpected(s):
|
||||
return "Unexpected token: \""+s+"\"";
|
||||
|
||||
case EUnterminatedString:
|
||||
return "Unterminated string";
|
||||
|
||||
case EUnterminatedComment:
|
||||
return "Unterminated comment";
|
||||
|
||||
case EUnknownVariable(v):
|
||||
return "Unknown variable: "+v;
|
||||
|
||||
case EInvalidIterator(v):
|
||||
return "Invalid iterator: "+v;
|
||||
|
||||
case EInvalidOp(op):
|
||||
return "Invalid operator: "+op;
|
||||
|
||||
case EInvalidAccess(f):
|
||||
return "Invalid access to field "+f;
|
||||
}
|
||||
}
|
||||
|
||||
public function toString(): String {
|
||||
var message = errorDefToString();
|
||||
message = origin + ":" + line + ": " + message;
|
||||
return message;
|
||||
return Printer.errorToString(this);
|
||||
}
|
||||
}
|
||||
enum ErrorDef {
|
||||
|
||||
+20
-1
@@ -300,4 +300,23 @@ class Printer {
|
||||
return new Printer().exprToString(e);
|
||||
}
|
||||
|
||||
}
|
||||
public static function errorToString( e : Expr.Error ) {
|
||||
var message = switch( #if hscriptPos e.e #else e #end ) {
|
||||
case EInvalidChar(c): "Invalid character: '"+String.fromCharCode(c)+"' ("+c+")";
|
||||
case EUnexpected(s): "Unexpected token: \""+s+"\"";
|
||||
case EUnterminatedString: "Unterminated string";
|
||||
case EUnterminatedComment: "Unterminated comment";
|
||||
case EUnknownVariable(v): "Unknown variable: "+v;
|
||||
case EInvalidIterator(v): "Invalid iterator: "+v;
|
||||
case EInvalidOp(op): "Invalid operator: "+op;
|
||||
case EInvalidAccess(f): "Invalid access to field "+f;
|
||||
};
|
||||
#if hscriptPos
|
||||
return e.origin + ":" + e.line + ": " + message;
|
||||
#else
|
||||
return message;
|
||||
#end
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user