parser: Accept comma-separated list in case-statements of switchs

  switch (i) {
  case 0, 1, 2:
    break;
  }

https://bugzilla.gnome.org/show_bug.cgi?id=614015

diff --git a/tests/Makefile.am b/tests/Makefile.am
index efc54d317c8b356d43a2475aec1f1d9729730264..eb009127e82613309323798a4a6bfc211eed157e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -315,6 +315,7 @@ TESTS = \
        annotations/deprecated.vala \
        annotations/description.vala \
        annotations/noaccessormethod.test \
+       parser/switch-statement.vala \
        $(NULL)
 
 NON_NULL_TESTS = \

diff --git a/tests/parser/switch-statement.vala b/tests/parser/switch-statement.vala
new file mode 100644 (file)
index 0000000..28f37f3
--- /dev/null
+++ b/tests/parser/switch-statement.vala
@@ -0,0 +1,13 @@
+void case_with_list () {
+       int i = 1;
+       switch (i) {
+       case 0, 1, 2:
+               break;
+       default:
+               assert_not_reached ();
+       }
+}
+
+void main () {
+       case_with_list ();
+}

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 59b4d5f299f896da8a0a25c91db329369b493d55..ec5e34e82034460d67ff1265ec014f534d2bec9c 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -1907,6 +1907,10 @@ public class Vala.Parser : CodeVisitor {
                        do {
                                if (accept (TokenType.CASE)) {
                                        section.add_label (new SwitchLabel (parse_expression (), get_src (begin)));
+                                       while (current () == TokenType.COMMA) {
+                                               expect (TokenType.COMMA);
+                                               section.add_label (new SwitchLabel (parse_expression (), get_src (begin)));
+                                       }
                                } else {
                                        expect (TokenType.DEFAULT);
                                        section.add_label (new SwitchLabel.with_default (get_src (begin)));