vala: Improve parsing of with-statement and allow it as embedded statement

diff --git a/tests/parser/with-embedded.vala b/tests/parser/with-embedded.vala
index c668e5afca240a80724acabf563635655ec1eaf2..6f61891d145e887a66c4d4400512b87bfa36ff8d 100644 (file)
--- a/tests/parser/with-embedded.vala
+++ b/tests/parser/with-embedded.vala
@@ -1,4 +1,8 @@
 void main () {
-    with (10)
-        assert (to_string () == "10");
+       if (true)
+               with ("foo")
+                       assert (to_string () == "foo");
+
+       with (10)
+               assert (to_string () == "10");
 }

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index d184a8431ffe072cad532217c66f8bde4cdb912e..216cd0a7d235377e9167e0fc2715b22f36af3964 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -1836,6 +1836,7 @@ public class Vala.Parser : CodeVisitor {
                case TokenType.LOCK:      return parse_lock_statement ();
                case TokenType.UNLOCK:    return parse_unlock_statement ();
                case TokenType.DELETE:    return parse_delete_statement ();
+               case TokenType.WITH:      return parse_with_statement ();
                case TokenType.VAR:
                case TokenType.CONST:
                        throw new ParseError.SYNTAX ("embedded statement cannot be declaration ");
@@ -2646,6 +2647,7 @@ public class Vala.Parser : CodeVisitor {
                        case TokenType.UNLOCK:
                        case TokenType.VAR:
                        case TokenType.WHILE:
+                       case TokenType.WITH:
                        case TokenType.YIELD:
                                return RecoveryState.STATEMENT_BEGIN;
                        default: