*** empty log message ***

[phpeclipse.git] / net.sourceforge.phpeclipse / src / test / PHPParser.jj

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 34ee7b7..e658989 100644 (file)
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -344,6 +344,10 @@ MORE :
 | <ARRAYASSIGN        : "=>">
 }
 
+<PHPPARSING> TOKEN :
+{
+  <LIST   : "list">
+}
 /* RESERVED WORDS AND LITERALS */
 
 <PHPPARSING> TOKEN :
@@ -947,6 +951,9 @@ String Expression() :
   expr = PrintExpression()
   {return expr;}
 |
+  expr = ListExpression()
+  {return expr;}
+|
   expr = ConditionalExpression()
   [
     assignOperator = AssignmentOperator()
@@ -1649,6 +1656,30 @@ String PrintExpression() :
   }
 }
 
+String ListExpression() :
+{
+  final StringBuffer buff = new StringBuffer("list(");
+  String expr;
+}
+{
+  <LIST> <LPAREN>
+  [
+    expr = VariableDeclaratorId()
+    {buff.append(expr);}
+  ]
+  <COMMA>
+  {buff.append(",");}
+  [
+    expr = VariableDeclaratorId()
+    {buff.append(expr);}
+  ]
+  <RPAREN>
+  {
+    buff.append(")");
+    return buff.toString();
+  }
+}
+
 void EchoStatement() :
 {}
 {
@@ -1754,19 +1785,93 @@ void StatementExpression() :
 }
 
 void SwitchStatement() :
-{}
 {
-  <SWITCH> <LPAREN> Expression() <RPAREN> <LBRACE>
-    ( SwitchLabel() ( BlockStatement() )* )*
-  <RBRACE>
+  Token breakToken = null;
+  int line;
+}
+{
+  <SWITCH>
+  try {
+    <LPAREN>
+  } catch (ParseException e) {
+    errorMessage = "'(' expected after 'switch'";
+    errorLevel   = ERROR;
+    throw e;
+  }
+  Expression()
+  try {
+    <RPAREN>
+  } catch (ParseException e) {
+    errorMessage = "')' expected";
+    errorLevel   = ERROR;
+    throw e;
+  }
+  try {
+  <LBRACE>
+  } catch (ParseException e) {
+    errorMessage = "'{' expected";
+    errorLevel   = ERROR;
+    throw e;
+  }
+    (
+      line = SwitchLabel()
+      ( BlockStatement() )*
+      [ breakToken = <BREAK> ]
+      {
+        try {
+          if (breakToken == null) {
+            setMarker(fileToParse,
+                      "You should use put a 'break' at the end of your statement",
+                      line,
+                      INFO,
+                      "Line " + line);
+          }
+        } catch (CoreException e) {
+          PHPeclipsePlugin.log(e);
+        }
+      }
+    )*
+  try {
+    <RBRACE>
+  } catch (ParseException e) {
+    errorMessage = "'}' expected";
+    errorLevel   = ERROR;
+    throw e;
+  }
 }
 
-void SwitchLabel() :
-{}
+int SwitchLabel() :
 {
-  <CASE> Expression() <COLON>
+  final Token token;
+}
+{
+  token = <CASE>
+  try {
+    Expression()
+  } catch (ParseException e) {
+    if (errorMessage != null) throw e;
+    errorMessage = "expression expected after 'case' keyword";
+    errorLevel   = ERROR;
+    throw e;
+  }
+  try {
+    <COLON>
+  } catch (ParseException e) {
+    errorMessage = "':' expected after case expression";
+    errorLevel   = ERROR;
+    throw e;
+  }
+  {return token.beginLine;}
 |
-  <_DEFAULT> <COLON>
+  token = <_DEFAULT>
+  try {
+    <COLON>
+  } catch (ParseException e) {
+    errorMessage = "':' expected after 'default' keyword";
+    errorLevel   = ERROR;
+    throw e;
+  }
+  {return token.beginLine;}
 }
 
 void IfStatement() :