Fixed some bugs in the syntax editor preference page

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

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index 41ebfce..9012909 100644 (file)
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -2766,7 +2766,8 @@ final Token token,lparen;
     }
     processParseExceptionDebug(e);
     }
-   {if (true) return new FunctionCall(func,args,args[args.length-1].sourceEnd);}
+  int sourceEnd = (args == null && args.length != 0) ? lparen.sourceEnd+1 : args[args.length-1].sourceEnd;
+  {if (true) return new FunctionCall(func,args,sourceEnd);}
     throw new Error("Missing return statement in function");
   }
 
@@ -4154,7 +4155,6 @@ Token token;
       }
       try {
         token = jj_consume_token(COLON);
-     {if (true) return expr;}
       } catch (ParseException e) {
     errorMessage = "':' expected after case expression";
     errorLevel   = ERROR;
@@ -4162,6 +4162,7 @@ Token token;
     errorEnd   = expr.sourceEnd+1;
     processParseExceptionDebug(e);
       }
+   {if (true) return expr;}
       break;
     case _DEFAULT:
       token = jj_consume_token(_DEFAULT);
@@ -5884,6 +5885,14 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
+  static final private boolean jj_3R_51() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_49()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_200() {
     if (jj_scan_token(STATICCLASSACCESS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -5904,14 +5913,6 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
-  static final private boolean jj_3R_51() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_49()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_45() {
     if (jj_3R_49()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -6008,20 +6009,20 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
-  static final private boolean jj_3R_94() {
-    if (jj_scan_token(ORASSIGN)) return true;
+  static final private boolean jj_3_5() {
+    if (jj_3R_45()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_93() {
-    if (jj_scan_token(XORASSIGN)) return true;
+  static final private boolean jj_3R_94() {
+    if (jj_scan_token(ORASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3_5() {
-    if (jj_3R_45()) return true;
+  static final private boolean jj_3R_93() {
+    if (jj_scan_token(XORASSIGN)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -6312,12 +6313,6 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
-  static final private boolean jj_3R_168() {
-    if (jj_scan_token(MINUS_MINUS)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_44() {
     if (jj_3R_49()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -6326,6 +6321,12 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
+  static final private boolean jj_3R_168() {
+    if (jj_scan_token(MINUS_MINUS)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_167() {
     if (jj_scan_token(PLUS_PLUS)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -6854,6 +6855,12 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
+  static final private boolean jj_3R_117() {
+    if (jj_3R_116()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_179() {
     if (jj_scan_token(INTEGER_LITERAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -6886,12 +6893,6 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
-  static final private boolean jj_3R_117() {
-    if (jj_3R_116()) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_138() {
     if (jj_scan_token(GE)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -6910,12 +6911,6 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
-  static final private boolean jj_3R_135() {
-    if (jj_scan_token(LT)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_112() {
     if (jj_scan_token(COMMA)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -6926,6 +6921,12 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
+  static final private boolean jj_3R_135() {
+    if (jj_scan_token(LT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3R_124() {
     Token xsp;
     xsp = jj_scanpos;
@@ -6957,14 +6958,14 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
-  static final private boolean jj_3R_72() {
-    if (jj_3R_50()) return true;
+  static final private boolean jj_3R_111() {
+    if (jj_3R_116()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_111() {
-    if (jj_3R_116()) return true;
+  static final private boolean jj_3R_72() {
+    if (jj_3R_50()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
@@ -6998,12 +6999,6 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
-  static final private boolean jj_3R_206() {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    return false;
-  }
-
   static final private boolean jj_3R_104() {
     if (jj_scan_token(LIST)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -7026,6 +7021,12 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
+  static final private boolean jj_3R_206() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
   static final private boolean jj_3_2() {
     if (jj_scan_token(COMMA)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -7120,22 +7121,22 @@ final ArrayList list = new ArrayList();
     return false;
   }
 
-  static final private boolean jj_3R_125() {
-    if (jj_scan_token(EQUAL_EQUAL)) return true;
+  static final private boolean jj_3R_105() {
+    if (jj_scan_token(PRINT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_49()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_54() {
-    if (jj_3R_68()) return true;
+  static final private boolean jj_3R_125() {
+    if (jj_scan_token(EQUAL_EQUAL)) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  static final private boolean jj_3R_105() {
-    if (jj_scan_token(PRINT)) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-    if (jj_3R_49()) return true;
+  static final private boolean jj_3R_54() {
+    if (jj_3R_68()) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }