detect uppercase *.PHP extension

[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 8ee1085..0f04260 100644 (file)
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -159,6 +159,7 @@ public final class PHPParser extends PHPParserSuperclass {
     }
     setMarker(e);
     errorMessage = null;
+    if (PHPeclipsePlugin.DEBUG) PHPeclipsePlugin.log(e);
   }
 
   /**
@@ -501,16 +502,16 @@ MORE :
   <#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
 |
   <STRING_LITERAL: (<STRING_1> | <STRING_2> | <STRING_3>)>
-|   <STRING_1: "\"" ( ~["\"","\\"] | "\\" ( ["\"","\\"] ) )* "\"">
-|   <STRING_2: "'" ( ~["'","\\"] | "\\" ( ["'","\\"] ) )* "'">
-|   <STRING_3: "`" ( ~["`","\\"] | "\\" ( ["`","\\"] ) )* "`">
+|   <STRING_1: "\"" ( ~["\"","\\"] | "\\" ~[] )* "\"">
+|   <STRING_2: "'"  ( ~["'","\\"]  | "\\" ~[] )* "'">
+|   <STRING_3: "`"  ( ~["`","\\"]  | "\\" ~[] )* "`">
 }
 
 /* IDENTIFIERS */
 
 <PHPPARSING> TOKEN :
 {
-  < IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
+  <IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
 |
   < #LETTER:
       ["a"-"z"] | ["A"-"Z"]
@@ -1130,10 +1131,45 @@ ConstantIdentifier Type() :
 Expression Expression() :
 {
   final Expression expr;
+  Expression initializer = null;
+  int assignOperator = -1;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  LOOKAHEAD(1)
+  expr = ConditionalExpression()
+  [ assignOperator = AssignmentOperator()
+    try {
+    {final int errorStart = SimpleCharStream.getPosition();}
+    initializer = Expression()
+    } catch (ParseException e) {
+      if (errorMessage != null) {
+        throw e;
+      }
+      errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+      errorLevel   = ERROR;
+      errorEnd   = SimpleCharStream.getPosition();
+      throw e;
+    }
+  ]
+  {
+    if (assignOperator == -1) return expr;
+    return new VarAssignation(expr,
+                               initializer,
+                               assignOperator,
+                               pos,
+                               SimpleCharStream.getPosition());
+  return expr;}
+| expr = ExpressionWBang()       {return expr;}
+}
+
+Expression ExpressionWBang() :
+{
+  final Expression expr;
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  <BANG> expr = Expression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+  <BANG> expr = ExpressionWBang() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
 | expr = ExpressionNoBang() {return expr;}
 }
 
@@ -1144,44 +1180,12 @@ Expression ExpressionNoBang() :
 {
   expr = PrintExpression()       {return expr;}
 | expr = ListExpression()        {return expr;}
-| LOOKAHEAD(varAssignation())
-  expr = varAssignation()        {return expr;}
-| expr = ConditionalExpression() {return expr;}
 }
 
 /**
- * A Variable assignation.
- * varName (an assign operator) any expression
+ * Any assignement operator.
+ * @return the assignement operator id
  */
-VarAssignation varAssignation() :
-{
-  final String varName;
-  final Expression initializer;
-  final int assignOperator;
-  final int pos = SimpleCharStream.getPosition();
-}
-{
-  varName = VariableDeclaratorId()
-  assignOperator = AssignmentOperator()
-    try {
-      initializer = Expression()
-    } catch (ParseException e) {
-      if (errorMessage != null) {
-        throw e;
-      }
-      errorMessage = "expression expected";
-      errorLevel   = ERROR;
-      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = SimpleCharStream.getPosition() + 1;
-      throw e;
-    }
-    {return new VarAssignation(varName.toCharArray(),
-                               initializer,
-                               assignOperator,
-                               pos,
-                               SimpleCharStream.getPosition());}
-}
-
 int AssignmentOperator() :
 {}
 {
@@ -1477,11 +1481,12 @@ final int operator;
 Expression UnaryExpressionNotPlusMinus() :
 {
   final Expression expr;
+  final int pos = SimpleCharStream.getPosition();
 }
 {
-//  <BANG> expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
   LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
   expr = CastExpression()         {return expr;}
+| <BANG> expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
 | expr = PostfixExpression()      {return expr;}
 | expr = Literal()                {return expr;}
 | <LPAREN> expr = Expression()
@@ -1536,18 +1541,6 @@ Expression PrimaryExpression() :
   final int pos = SimpleCharStream.getPosition();
 }
 {
-  LOOKAHEAD(2)
-  identifier = <IDENTIFIER> <STATICCLASSACCESS> expr = ClassIdentifier()
-  {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
-                                                 pos,
-                                                 SimpleCharStream.getPosition()),
-                          expr,
-                          ClassAccess.STATIC);}
-  (
-  LOOKAHEAD(PrimarySuffix())
-  expr = PrimarySuffix(expr))*
-  {return expr;}
-|
   expr = PrimaryPrefix()
   (
   LOOKAHEAD(PrimarySuffix())
@@ -1558,21 +1551,6 @@ Expression PrimaryExpression() :
   {return expr;}
 }
 
-/**
- * An array declarator.
- * array(vars)
- * @return an array
- */
-ArrayInitializer ArrayDeclarator() :
-{
-  final ArrayVariableDeclaration[] vars;
-  final int pos = SimpleCharStream.getPosition();
-}
-{
-  <ARRAY> vars = ArrayInitializer()
-  {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
-}
-
 Expression PrimaryPrefix() :
 {
   final Expression expr;
@@ -1593,6 +1571,36 @@ Expression PrimaryPrefix() :
                                                                 SimpleCharStream.getPosition());}
 }
 
+AbstractSuffixExpression PrimarySuffix(final Expression prefix) :
+{
+  final AbstractSuffixExpression suffix;
+  final Expression expr;
+}
+{
+  suffix = Arguments(prefix)      {return suffix;}
+| suffix = VariableSuffix(prefix) {return suffix;}
+| <STATICCLASSACCESS> expr = ClassIdentifier()
+  {suffix = new ClassAccess(prefix,
+                          expr,
+                          ClassAccess.STATIC);
+   return suffix;}
+}
+
+/**
+ * An array declarator.
+ * array(vars)
+ * @return an array
+ */
+ArrayInitializer ArrayDeclarator() :
+{
+  final ArrayVariableDeclaration[] vars;
+  final int pos = SimpleCharStream.getPosition();
+}
+{
+  <ARRAY> vars = ArrayInitializer()
+  {return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
+}
+
 PrefixedUnaryExpression classInstantiation() :
 {
   Expression expr;
@@ -1619,25 +1627,18 @@ ConstantIdentifier ClassIdentifier():
   final String expr;
   final Token token;
   final int pos = SimpleCharStream.getPosition();
+  final ConstantIdentifier type;
 }
 {
   token = <IDENTIFIER>          {return new ConstantIdentifier(token.image.toCharArray(),
                                                                pos,
                                                                SimpleCharStream.getPosition());}
+| type = Type()          {return type;}
 | expr = VariableDeclaratorId() {return new ConstantIdentifier(expr.toCharArray(),
                                                                pos,
                                                                SimpleCharStream.getPosition());}
 }
 
-AbstractSuffixExpression PrimarySuffix(final Expression prefix) :
-{
-  final AbstractSuffixExpression expr;
-}
-{
-  expr = Arguments(prefix)      {return expr;}
-| expr = VariableSuffix(prefix) {return expr;}
-}
-
 AbstractSuffixExpression VariableSuffix(final Expression prefix) :
 {
   String expr = null;
@@ -1833,10 +1834,7 @@ Define defineStatement() :
     processParseException(e);
   }
   try {
-    (   defineValue = PrintExpression()
-      | LOOKAHEAD(varAssignation())
-        defineValue = varAssignation()
-      | defineValue = ConditionalExpression())
+    defineValue = Expression()
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
     errorLevel   = ERROR;
@@ -2163,17 +2161,8 @@ Statement BlockStatement() :
   final Statement statement;
 }
 {
-  try {
   statement = Statement()         {if (phpDocument == currentSegment) pushOnAstNodes(statement);
                                    return statement;}
-  } catch (ParseException e) {
-    if (errorMessage != null) throw e;
-    errorMessage = "statement expected";
-    errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
-  }
 | statement = ClassDeclaration()  {return statement;}
 | statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
                                    currentSegment.add((MethodDeclaration) statement);