Fix #1371992: Error with switch when last case block omits break or return

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / parser / Parser.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
index 1a3da1e..ded438e 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
@@ -745,26 +745,14 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                        if (token == TokenNameSEMICOLON) {
                                getNextToken();
                        } else {
-                               if (token != TokenNameINLINE_HTML ) {
+                               if (token != TokenNameINLINE_HTML) {
                                        throwSyntaxError("';' expected after 'echo' statement.");
                                }
                                getNextToken();
                        }
                        return statement;
                } else if (token == TokenNameINLINE_HTML) {
-//                     if (scanner.phpExpressionTag) {
-//                             // start of <?= ... ?> block
-//                             getNextToken();
-//                             expr();
-//                             if (token == TokenNameSEMICOLON) {
-//                                     getNextToken();
-//                             }
-//                             if (token != TokenNameINLINE_HTML) {
-//                                     throwSyntaxError("Missing '?>' for open PHP expression block ('<?=').");
-//                             }
-//                     } else {
-                               getNextToken();
-//                     }
+                       getNextToken();
                        return statement;
                } else if (token == TokenNameglobal) {
                        getNextToken();
@@ -1737,6 +1725,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                                expr(); // constant();
                                if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
                                        getNextToken();
+                                       if (token == TokenNameRBRACE) {
+                                               // empty case; assumes that the '}' token belongs to the wrapping switch statement
+                                               break;
+                                       }
                                        if (token == TokenNamecase || token == TokenNamedefault) {
                                                // empty case statement ?
                                                continue;
@@ -1764,7 +1756,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                                if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
                                        getNextToken();
                                        if (token == TokenNameRBRACE) {
-                                               // empty default case
+                                               // empty default case; ; assumes that the '}' token belongs to the wrapping switch statement
                                                break;
                                        }
                                        if (token != TokenNamecase) {
@@ -3136,11 +3128,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                                }
                                getNextToken();
                        } else if (token == TokenNameLBRACKET) {
-                               if (ref != null && ref instanceof FieldReference) {
-                                       FieldReference fref = (FieldReference) ref;
-                                       addVariableSet(fref.token);
-                               }
-                               ref = null;
+                               // To remove "ref = null;" here, is probably better than the patch commented in #1368081 - axelcl
                                getNextToken();
                                if (token != TokenNameRBRACKET) {
                                        expr();