diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala index 43ff863de3a847c923656a7ae591ce31753c3efa..08df8a7a73e41244a84898669c2a941b73c6a22e 100644 --- a/vala/valagenieparser.vala +++ b/vala/valagenieparser.vala @@ -162,7 +162,7 @@ public class Vala.Genie.Parser : CodeVisitor { void report_parse_error (ParseError e) { var begin = get_location (); next (); - Report.error (get_src (begin), "syntax error, %s", e.message); + Report.error (get_src (begin), "%s", e.message); } inline bool expect (TokenType type) throws ParseError { @@ -1200,7 +1200,6 @@ public class Vala.Genie.Parser : CodeVisitor { unowned MethodCall? call = expr as MethodCall; unowned ObjectCreationExpression? object_creation = expr as ObjectCreationExpression; if (call == null && object_creation == null) { - Report.error (expr.source_reference, "syntax error, expected method call"); throw new ParseError.SYNTAX ("expected method call"); } diff --git a/vala/valaparser.vala b/vala/valaparser.vala index 4bd0114c9beb80da581a2a9a69e065aa5d58a813..61dfa9d08fb1095c14dce74f7b423567829c970f 100644 --- a/vala/valaparser.vala +++ b/vala/valaparser.vala @@ -134,7 +134,7 @@ public class Vala.Parser : CodeVisitor { void report_parse_error (ParseError e) { var begin = get_location (); next (); - Report.error (get_src (begin), "syntax error, %s", e.message); + Report.error (get_src (begin), "%s", e.message); } inline bool expect (TokenType type) throws ParseError { @@ -1113,7 +1113,6 @@ public class Vala.Parser : CodeVisitor { unowned MethodCall? call = expr as MethodCall; unowned ObjectCreationExpression? object_creation = expr as ObjectCreationExpression; if (call == null && object_creation == null) { - Report.error (expr.source_reference, "syntax error, expected method call"); throw new ParseError.SYNTAX ("expected method call"); } @@ -2245,7 +2244,6 @@ public class Vala.Parser : CodeVisitor { } else { type = parse_type (true, true); if (accept (TokenType.IN)) { - Report.error (type.source_reference, "syntax error, expected `unowned var', `var' or type"); throw new ParseError.SYNTAX ("expected `unowned var', `var' or type"); } } @@ -3887,8 +3885,7 @@ public class Vala.Parser : CodeVisitor { } } -public errordomain Vala.ParseError { - FAILED, - SYNTAX +internal errordomain Vala.ParseError { + SYNTAX, }