X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
index fb94814..6440ffd 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/compiler/ITerminalSymbols.java
@@ -1,10 +1,10 @@
 /**********************************************************************
  Copyright (c) 2002 IBM Corp. and others.
- All rights reserved.   This program and the accompanying materials
+ All rights reserved. � This program and the accompanying materials
  are made available under the terms of the Common Public License v0.5
  which accompanies this distribution, and is available at
  http://www.eclipse.org/legal/cpl-v05.html
-  
+ �
  Contributors:
  IBM Corporation - initial API and implementation
  **********************************************************************/
@@ -12,7 +12,7 @@ package net.sourceforge.phpdt.core.compiler;
 /**
  * Maps each terminal symbol in the php-grammar into a unique integer. This
  * integer is used to represent the terminal when computing a parsing action.
- * 
+ *
  * @see IScanner
  * @since 2.0
  */
@@ -72,7 +72,7 @@ public interface ITerminalSymbols {
   final static int TokenNameLBRACKET = 132;
   final static int TokenNameRBRACKET = 133;
   final static int TokenNameCOMMA = 134;
-  final static int TokenNameStringLiteral = 136;
+  final static int TokenNameStringDoubleQuote = 136;
   final static int TokenNameIdentifier = 138;
   final static int TokenNameSEMICOLON = 140;
   final static int TokenNameMINUS_MINUS = 144;
@@ -85,7 +85,7 @@ public interface ITerminalSymbols {
   final static int TokenNameIntegerLiteral = 151;
   final static int TokenNameDoubleLiteral = 152;
   final static int TokenNameStringInterpolated = 153;
-  final static int TokenNameStringConstant = 154;
+  final static int TokenNameStringSingleQuote = 154;
   final static int TokenNameLEFT_SHIFT = 155;
   final static int TokenNameRIGHT_SHIFT = 156;
   final static int TokenNameEQUAL_EQUAL_EQUAL = 157;
@@ -99,18 +99,18 @@ public interface ITerminalSymbols {
   final static int TokenNamearrayCAST = 178;
   final static int TokenNameobjectCAST = 179;
   final static int TokenNameunsetCAST = 180;
-  
-  // ´
+
+  // �
   final static int TokenNameEncapsedString0 = 190;
   // '
-  final static int TokenNameEncapsedString1 = 191;
+//  final static int TokenNameEncapsedString1 = 191;
   // "
-  final static int TokenNameEncapsedString2 = 192;
-  
+//  final static int TokenNameEncapsedString2 = 192;
+
   final static int TokenNameSTRING = 193;
-  
-  final static int TokenNameCURLY_OPEN = 194;
-  
+
+  final static int TokenNameLBRACE_DOLLAR = 194;
+
   // start SQL token - the SQL tokens are only used in the
   // PHPCompletionprocessor:
   public final static int TokenNameSQLselect = 901;
@@ -122,6 +122,13 @@ public interface ITerminalSymbols {
   public final static int TokenNameSQLset = 907;
   public final static int TokenNameSQLvalues = 908;
   // stop SQL token
+
+  /**
+   * Special 0-length token for php short tag syntax;
+   * Detected directly after <?=
+   */
+  public final static int TokenNameECHO_INVISIBLE = 990;
+
   public final static int TokenNameKEYWORD = 1000;
   public final static int TokenNameif = 1001;
   public final static int TokenNameelseif = 1002;
@@ -187,13 +194,16 @@ public interface ITerminalSymbols {
   public final static int TokenNameclone = 1063;
   public final static int TokenNamedeclare = 1064;
   public final static int TokenNameenddeclare = 1065;
-  public final static int TokenNameeval = 1065;
-  public final static int TokenNameuse = 1066;
-  public final static int TokenNameisset = 1066;
-  public final static int TokenNamefinal = 1067;
+  public final static int TokenNameeval = 1066;
+  public final static int TokenNameuse = 1067;
+  public final static int TokenNameisset = 1068;
+  public final static int TokenNamefinal = 1069;
   public final static int TokenNameLINE = 1070;
   public final static int TokenNameFILE = 1071;
   public final static int TokenNameCLASS_C = 1072;
   public final static int TokenNameMETHOD_C = 1073;
   public final static int TokenNameFUNC_C = 1074;
+
+  // special tokens not normally used in the parser
+  public final static int TokenNamethis_PHP_COMPLETION = 2000;
 }