vala: Make try-statement parsing more resilient

Regression of f5934184d050d1a19f394fdab6f2ee66ff30965f

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1304

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f5e0cb8ffb296f685c1561335571fd5b769bfcdc..147c66676078d3288c4c19460520fab87a5de928 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -994,6 +994,7 @@ TESTS = \
        parser/switch-statement.vala \
        parser/switch-section-outside-switch.test \
        parser/template.vala \
+       parser/try-catch-in-switch-case-invalid.test \
        parser/tuple.vala \
        parser/unsupported-property-async.test \
        parser/unsupported-property-throws.test \

diff --git a/tests/parser/try-catch-in-switch-case-invalid.test b/tests/parser/try-catch-in-switch-case-invalid.test
new file mode 100644 (file)
index 0000000..1d67e56
--- /dev/null
+++ b/tests/parser/try-catch-in-switch-case-invalid.test
@@ -0,0 +1,16 @@
+Invalid Code
+
+void main () {
+       switch (42) {
+       case 42:
+               try {
+                       GLib.print ("42");
+                catch (GLib.Error e) {
+                       debug ("foo");
+               }
+               break;
+       default:
+               debug ("bar");
+               break;
+       }
+}

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index cfa0776aeda6199c0567add8b40fcaaea9928805..f703e9c86749003ac6dec01601e8d5b90dc35e42 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -2473,8 +2473,10 @@ public class Vala.Parser : CodeVisitor {
                        if (current () == TokenType.FINALLY) {
                                finally_clause = parse_finally_clause ();
                        }
-               } else {
+               } else if (current () == TokenType.FINALLY) {
                        finally_clause = parse_finally_clause ();
+               } else {
+                       report_parse_error (new ParseError.SYNTAX ("expected `catch' or `finally'"));
                }
                var stmt = new TryStatement (try_block, finally_clause, get_src (begin));
                foreach (CatchClause clause in catch_clauses) {