From 579b1f364d0049c67a14f01241b8bd6696ded236 Mon Sep 17 00:00:00 2001 From: Alistair Thomas Date: Thu, 20 Sep 2018 20:34:32 +0100 Subject: [PATCH 1/2] parser: Remove superfluous phrase 'syntax error,' from Vala and Genie parsers --- vala/valagenieparser.vala | 3 +-- vala/valaparser.vala | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala index 43ff863de..08df8a7a7 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 4bd0114c9..cc1a2143e 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"); } } -- GitLab From ca2e453708b33f4e7ddc1d0bdd4c0520d4351f85 Mon Sep 17 00:00:00 2001 From: Alistair Thomas Date: Thu, 20 Sep 2018 20:56:24 +0100 Subject: [PATCH 2/2] parser: remove ParseError.FAILED and make ParseError internal --- vala/valaparser.vala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vala/valaparser.vala b/vala/valaparser.vala index cc1a2143e..61dfa9d08 100644 --- a/vala/valaparser.vala +++ b/vala/valaparser.vala @@ -3885,8 +3885,7 @@ public class Vala.Parser : CodeVisitor { } } -public errordomain Vala.ParseError { - FAILED, - SYNTAX +internal errordomain Vala.ParseError { + SYNTAX, } -- GitLab