X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java
index a25a5b4..4030cca 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java
@@ -1,24 +1,83 @@
/* Generated By:JavaCC: Do not edit this line. PHPParser.java */
package test;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.ArrayList;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.Reader;
import java.io.StringReader;
-import java.io.*;
import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Hashtable;
-import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpdt.internal.compiler.ast.*;
+import net.sourceforge.phpdt.core.IJavaModelMarker;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractCase;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractVariable;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayDeclarator;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayInitializer;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayVariableDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.AstNode;
+import net.sourceforge.phpdt.internal.compiler.ast.BinaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Block;
+import net.sourceforge.phpdt.internal.compiler.ast.Break;
+import net.sourceforge.phpdt.internal.compiler.ast.Case;
+import net.sourceforge.phpdt.internal.compiler.ast.CastExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ClassAccess;
+import net.sourceforge.phpdt.internal.compiler.ast.ClassDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ClassInstantiation;
+import net.sourceforge.phpdt.internal.compiler.ast.ConditionalExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstantIdentifier;
+import net.sourceforge.phpdt.internal.compiler.ast.Continue;
+import net.sourceforge.phpdt.internal.compiler.ast.DefaultCase;
+import net.sourceforge.phpdt.internal.compiler.ast.Define;
+import net.sourceforge.phpdt.internal.compiler.ast.DoStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.EchoStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.Else;
+import net.sourceforge.phpdt.internal.compiler.ast.ElseIf;
+import net.sourceforge.phpdt.internal.compiler.ast.EmptyStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.FalseLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ForStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ForeachStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.FunctionCall;
+import net.sourceforge.phpdt.internal.compiler.ast.GlobalStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.HTMLBlock;
+import net.sourceforge.phpdt.internal.compiler.ast.HTMLCode;
+import net.sourceforge.phpdt.internal.compiler.ast.IfStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.InclusionStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.LabeledStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ListExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Literal;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.NullLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.NumberLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.OperatorIds;
+import net.sourceforge.phpdt.internal.compiler.ast.PHPDocument;
+import net.sourceforge.phpdt.internal.compiler.ast.PHPEchoBlock;
+import net.sourceforge.phpdt.internal.compiler.ast.PostfixedUnaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.PrefixedUnaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.PrintExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ReturnStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.Statement;
+import net.sourceforge.phpdt.internal.compiler.ast.StaticStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.SwitchStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.TrueLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.Variable;
+import net.sourceforge.phpdt.internal.compiler.ast.VariableDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.WhileStatement;
+import net.sourceforge.phpdt.internal.compiler.parser.Outlineable;
import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.ui.texteditor.MarkerUtilities;
/**
* A new php parser.
@@ -27,10 +86,11 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
* You can test the parser with the PHPParserTestCase2.java
* @author Matthieu Casanova
*/
-public final class PHPParser extends PHPParserSuperclass implements PHPParserConstants {
+public class PHPParser extends PHPParserSuperclass implements PHPParserConstants {
+
+//todo : fix the variables names bug
+//todo : handle tilde operator
- /** The file that is parsed. */
- private static IFile fileToParse;
/** The current segment. */
private static OutlineableWithChildren currentSegment;
@@ -39,8 +99,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
static PHPOutlineInfo outlineInfo;
- private static boolean assigning;
-
/** The error level of the current ParseException. */
private static int errorLevel = ERROR;
/** The message of the current ParseException. If it's null it's because the parse exception wasn't handled */
@@ -49,6 +107,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
private static int errorStart = -1;
private static int errorEnd = -1;
private static PHPDocument phpDocument;
+
+ private static final String SYNTAX_ERROR_CHAR = "syntax error";
/**
* The point where html starts.
* It will be used by the token manager to create HTMLCode objects
@@ -58,12 +118,14 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
//ast stack
private final static int AstStackIncrement = 100;
/** The stack of node. */
- private static AstNode[] nodes;
+ protected static AstNode[] nodes;
/** The cursor in expression stack. */
private static int nodePtr;
+ public static final boolean PARSER_DEBUG = false;
+
public final void setFileToParse(final IFile fileToParse) {
- this.fileToParse = fileToParse;
+ PHPParser.fileToParse = fileToParse;
}
public PHPParser() {
@@ -71,13 +133,53 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
public PHPParser(final IFile fileToParse) {
this(new StringReader(""));
- this.fileToParse = fileToParse;
+ PHPParser.fileToParse = fileToParse;
+ }
+
+ public static final void phpParserTester(final String strEval) throws ParseException {
+ final StringReader stream = new StringReader(strEval);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ }
+ ReInit(new StringReader(strEval));
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
+ phpTest();
+ }
+
+ public static final void htmlParserTester(final File fileName) throws FileNotFoundException, ParseException {
+ final Reader stream = new FileReader(fileName);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ }
+ ReInit(stream);
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ phpFile();
+ }
+
+ public static final void htmlParserTester(final String strEval) throws ParseException {
+ final StringReader stream = new StringReader(strEval);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ }
+ ReInit(stream);
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ phpFile();
}
/**
* Reinitialize the parser.
*/
- private static final void init() {
+ protected static final void init() {
nodes = new AstNode[AstStackIncrement];
nodePtr = -1;
htmlStart = 0;
@@ -87,12 +189,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* Add an php node on the stack.
* @param node the node that will be added to the stack
*/
- private static final void pushOnAstNodes(AstNode node) {
+ private static final void pushOnAstNodes(final AstNode node) {
try {
nodes[++nodePtr] = node;
} catch (IndexOutOfBoundsException e) {
- int oldStackLength = nodes.length;
- AstNode[] oldStack = nodes;
+ final int oldStackLength = nodes.length;
+ final AstNode[] oldStack = nodes;
nodes = new AstNode[oldStackLength + AstStackIncrement];
System.arraycopy(oldStack, 0, nodes, 0, oldStackLength);
nodePtr = oldStackLength;
@@ -101,7 +203,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
- currentSegment = new PHPDocument(parent);
+ phpDocument = new PHPDocument(parent,"_root".toCharArray());
+ currentSegment = phpDocument;
outlineInfo = new PHPOutlineInfo(parent, currentSegment);
final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
@@ -111,9 +214,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
init();
try {
parse();
- phpDocument = new PHPDocument(null);
phpDocument.nodes = new AstNode[nodes.length];
System.arraycopy(nodes,0,phpDocument.nodes,0,nodes.length);
+ if (PHPeclipsePlugin.DEBUG) {
+ PHPeclipsePlugin.log(1,phpDocument.toString());
+ }
} catch (ParseException e) {
processParseException(e);
}
@@ -121,6 +226,19 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
/**
+ * This function will throw the exception if we are in debug mode
+ * and process it if we are in production mode.
+ * this should be fast since the PARSER_DEBUG is static final so the difference will be at compile time
+ * @param e the exception
+ * @throws ParseException the thrown exception
+ */
+ private static void processParseExceptionDebug(final ParseException e) throws ParseException {
+ if (PARSER_DEBUG) {
+ throw e;
+ }
+ processParseException(e);
+ }
+ /**
* This method will process the parse exception.
* If the error message is null, the parse exception wasn't catched and a trace is written in the log
* @param e the ParseException
@@ -129,15 +247,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
if (errorMessage == null) {
PHPeclipsePlugin.log(e);
errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it";
- errorStart = SimpleCharStream.getPosition();
- errorEnd = errorStart + 1;
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
}
setMarker(e);
errorMessage = null;
+ // if (PHPeclipsePlugin.DEBUG) PHPeclipsePlugin.log(e);
}
/**
- * Create marker for the parse error
+ * Create marker for the parse error.
* @param e the ParseException
*/
private static void setMarker(final ParseException e) {
@@ -145,17 +264,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
if (errorStart == -1) {
setMarker(fileToParse,
errorMessage,
- SimpleCharStream.tokenBegin,
- SimpleCharStream.tokenBegin + e.currentToken.image.length(),
+ e.currentToken.sourceStart,
+ e.currentToken.sourceEnd,
errorLevel,
- "Line " + e.currentToken.beginLine);
+ "Line " + e.currentToken.beginLine+", "+e.currentToken.sourceStart+':'+e.currentToken.sourceEnd);
} else {
setMarker(fileToParse,
errorMessage,
errorStart,
errorEnd,
errorLevel,
- "Line " + e.currentToken.beginLine);
+ "Line " + e.currentToken.beginLine+", "+errorStart+':'+errorEnd);
errorStart = -1;
errorEnd = -1;
}
@@ -164,42 +283,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
}
- /**
- * Create markers according to the external parser output
- */
- private static void createMarkers(final String output, final IFile file) throws CoreException {
- // delete all markers
- file.deleteMarkers(IMarker.PROBLEM, false, 0);
-
- int indx = 0;
- int brIndx;
- boolean flag = true;
- while ((brIndx = output.indexOf("
", indx)) != -1) {
- // newer php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 6;
- flag = false;
- }
- if (flag) {
- while ((brIndx = output.indexOf("
", indx)) != -1) {
- // older php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 4;
- }
- }
- }
-
private static void scanLine(final String output,
final IFile file,
final int indx,
final int brIndx) throws CoreException {
String current;
- StringBuffer lineNumberBuffer = new StringBuffer(10);
+ final StringBuffer lineNumberBuffer = new StringBuffer(10);
char ch;
current = output.substring(indx, brIndx);
if (current.indexOf(PARSE_WARNING_STRING) != -1 || current.indexOf(PARSE_ERROR_STRING) != -1) {
- int onLine = current.indexOf("on line ");
+ final int onLine = current.indexOf("on line ");
if (onLine != -1) {
lineNumberBuffer.delete(0, lineNumberBuffer.length());
for (int i = onLine; i < current.length(); i++) {
@@ -209,9 +303,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
}
- int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
+ final int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
- Hashtable attributes = new Hashtable();
+ final Hashtable attributes = new Hashtable();
current = current.replaceAll("\n", "");
current = current.replaceAll("", "");
@@ -225,12 +319,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
else
attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
MarkerUtilities.setLineNumber(attributes, lineNumber);
- MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM);
+// MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM);
+ MarkerUtilities.createMarker(file, attributes, IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
}
}
}
- public final void parse(final String s) throws CoreException {
+ public final void parse(final String s) {
final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
@@ -270,18 +365,49 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* Put a new html block in the stack.
*/
public static final void createNewHTMLCode() {
- final int currentPosition = SimpleCharStream.getPosition();
- if (currentPosition == htmlStart) {
+ final int currentPosition = token.sourceStart;
+ if (currentPosition == htmlStart ||
+ currentPosition < htmlStart ||
+ currentPosition > SimpleCharStream.currentBuffer.length()) {
return;
}
- final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray();
- pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
+ final String html = SimpleCharStream.currentBuffer.substring(htmlStart, currentPosition);
+ pushOnAstNodes(new HTMLCode(html, htmlStart,currentPosition));
+ }
+
+ /** Create a new task. */
+ public static final void createNewTask(final int todoStart) {
+ final String todo = SimpleCharStream.currentBuffer.substring(todoStart,
+ SimpleCharStream.currentBuffer.indexOf("\n",
+ todoStart)-1);
+ if (!PARSER_DEBUG) {
+ try {
+ setMarker(fileToParse,
+ todo,
+ SimpleCharStream.getBeginLine(),
+ TASK,
+ "Line "+SimpleCharStream.getBeginLine());
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
+ }
}
- private static final void parse() throws ParseException {
+ protected static final void parse() throws ParseException {
phpFile();
}
+ static final public void todo() throws ParseException {
+ Token todoToken;
+ todoToken = jj_consume_token(23);
+ createNewTask(todoToken.sourceStart);
+ }
+
+ static final public void phpTest() throws ParseException {
+ Php();
+ jj_consume_token(0);
+ }
+
static final public void phpFile() throws ParseException {
try {
label_1:
@@ -304,6 +430,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INCLUDE_ONCE:
case REQUIRE_ONCE:
case GLOBAL:
+ case DEFINE:
case STATIC:
case CONTINUE:
case DO:
@@ -317,21 +444,22 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case WHILE:
case FOREACH:
case AT:
- case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
case LBRACE:
case SEMICOLON:
- case DOLLAR_ID:
;
break;
default:
@@ -340,11 +468,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
PhpBlock();
}
- jj_consume_token(0);
+ PHPParser.createNewHTMLCode();
} catch (TokenMgrError e) {
PHPeclipsePlugin.log(e);
- errorStart = SimpleCharStream.getPosition();
- errorEnd = errorStart + 1;
+ errorStart = SimpleCharStream.beginOffset;
+ errorEnd = SimpleCharStream.endOffset;
errorMessage = e.getMessage();
errorLevel = ERROR;
{if (true) throw generateParseException();}
@@ -357,10 +485,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* or
*/
static final public void PhpBlock() throws ParseException {
- final int start = SimpleCharStream.getPosition();
+ final PHPEchoBlock phpEchoBlock;
+ final Token token,phpEnd;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPECHOSTART:
- phpEchoBlock();
+ phpEchoBlock = phpEchoBlock();
+ pushOnAstNodes(phpEchoBlock);
break;
case PHPSTARTSHORT:
case PHPSTARTLONG:
@@ -378,6 +508,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INCLUDE_ONCE:
case REQUIRE_ONCE:
case GLOBAL:
+ case DEFINE:
case STATIC:
case CONTINUE:
case DO:
@@ -391,21 +522,22 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case WHILE:
case FOREACH:
case AT:
- case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
case LBRACE:
case SEMICOLON:
- case DOLLAR_ID:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PHPSTARTSHORT:
case PHPSTARTLONG:
@@ -414,12 +546,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
jj_consume_token(PHPSTARTLONG);
break;
case PHPSTARTSHORT:
- jj_consume_token(PHPSTARTSHORT);
+ token = jj_consume_token(PHPSTARTSHORT);
try {
setMarker(fileToParse,
"You should use '' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
+ processParseExceptionDebug(e);
}
break;
default:
@@ -456,9 +590,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
static final public PHPEchoBlock phpEchoBlock() throws ParseException {
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
- PHPEchoBlock echoBlock;
- jj_consume_token(PHPECHOSTART);
+ final PHPEchoBlock echoBlock;
+ final Token token, token2;
+ token = jj_consume_token(PHPECHOSTART);
+ PHPParser.createNewHTMLCode();
expr = Expression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SEMICOLON:
@@ -468,8 +603,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
jj_la1[4] = jj_gen;
;
}
- jj_consume_token(PHPEND);
- echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition());
+ token2 = jj_consume_token(PHPEND);
+ htmlStart = token2.sourceEnd;
+
+ echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd);
pushOnAstNodes(echoBlock);
{if (true) return echoBlock;}
throw new Error("Missing return statement in function");
@@ -492,6 +629,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INCLUDE_ONCE:
case REQUIRE_ONCE:
case GLOBAL:
+ case DEFINE:
case STATIC:
case CONTINUE:
case DO:
@@ -505,21 +643,22 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case WHILE:
case FOREACH:
case AT:
- case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
case LBRACE:
case SEMICOLON:
- case DOLLAR_ID:
;
break;
default:
@@ -532,68 +671,82 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
static final public ClassDeclaration ClassDeclaration() throws ParseException {
final ClassDeclaration classDeclaration;
- final Token className;
- Token superclassName = null;
- final int pos;
- jj_consume_token(CLASS);
+ Token className = null;
+ final Token superclassName, token, extendsToken;
+ String classNameImage = SYNTAX_ERROR_CHAR;
+ String superclassNameImage = null;
+ final int classEnd;
+ token = jj_consume_token(CLASS);
try {
- pos = SimpleCharStream.getPosition();
className = jj_consume_token(IDENTIFIER);
+ classNameImage = className.image;
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = token.sourceEnd+1;
+ errorEnd = token.sourceEnd+1;
+ processParseExceptionDebug(e);
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EXTENDS:
- jj_consume_token(EXTENDS);
+ extendsToken = jj_consume_token(EXTENDS);
try {
superclassName = jj_consume_token(IDENTIFIER);
+ superclassNameImage = superclassName.image;
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = extendsToken.sourceEnd+1;
+ errorEnd = extendsToken.sourceEnd+1;
+ processParseExceptionDebug(e);
+ superclassNameImage = SYNTAX_ERROR_CHAR;
}
break;
default:
jj_la1[6] = jj_gen;
;
}
- if (superclassName == null) {
+ int start, end;
+ if (className == null) {
+ start = token.sourceStart;
+ end = token.sourceEnd;
+ } else {
+ start = className.sourceStart;
+ end = className.sourceEnd;
+ }
+ if (superclassNameImage == null) {
+
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
- pos,
- 0);
+ classNameImage,
+ start,
+ end);
} else {
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
- superclassName.image.toCharArray(),
- pos,
- 0);
+ classNameImage,
+ superclassNameImage,
+ start,
+ end);
}
currentSegment.add(classDeclaration);
currentSegment = classDeclaration;
- ClassBody(classDeclaration);
+ classEnd = ClassBody(classDeclaration);
currentSegment = (OutlineableWithChildren) currentSegment.getParent();
- classDeclaration.sourceEnd = SimpleCharStream.getPosition();
+ classDeclaration.sourceEnd = classEnd;
pushOnAstNodes(classDeclaration);
{if (true) return classDeclaration;}
throw new Error("Missing return statement in function");
}
- static final public void ClassBody(ClassDeclaration classDeclaration) throws ParseException {
+ static final public int ClassBody(final ClassDeclaration classDeclaration) throws ParseException {
+Token token;
try {
jj_consume_token(LBRACE);
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
+ processParseExceptionDebug(e);
}
label_3:
while (true) {
@@ -609,31 +762,34 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
ClassBodyDeclaration(classDeclaration);
}
try {
- jj_consume_token(RBRACE);
+ token = jj_consume_token(RBRACE);
+ {if (true) return token.sourceEnd;}
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', 'var', 'function' or '}' expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. 'var', 'function' or '}' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
+ processParseExceptionDebug(e);
+ {if (true) return PHPParser.token.sourceEnd;}
}
+ throw new Error("Missing return statement in function");
}
/**
* A class can contain only methods and fields.
*/
- static final public void ClassBodyDeclaration(ClassDeclaration classDeclaration) throws ParseException {
- MethodDeclaration method;
- FieldDeclaration field;
+ static final public void ClassBodyDeclaration(final ClassDeclaration classDeclaration) throws ParseException {
+ final MethodDeclaration method;
+ final FieldDeclaration field;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case FUNCTION:
method = MethodDeclaration();
- method.setParent(classDeclaration);
+ method.analyzeCode();
classDeclaration.addMethod(method);
break;
case VAR:
field = FieldDeclaration();
- classDeclaration.addVariable(field);
+ classDeclaration.addField(field);
break;
default:
jj_la1[8] = jj_gen;
@@ -644,17 +800,19 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
/**
* A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
+ * it is only used by ClassBodyDeclaration()
*/
static final public FieldDeclaration FieldDeclaration() throws ParseException {
VariableDeclaration variableDeclaration;
- VariableDeclaration[] list;
+ final VariableDeclaration[] list;
final ArrayList arrayList = new ArrayList();
- final int pos = SimpleCharStream.getPosition();
- jj_consume_token(VAR);
- variableDeclaration = VariableDeclarator();
- arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name));
- currentSegment.add(variableDeclaration);
+ final Token token;
+ Token token2 = null;
+ int pos;
+ token = jj_consume_token(VAR);
+ variableDeclaration = VariableDeclaratorNoSuffix();
+ arrayList.add(variableDeclaration);
+ pos = variableDeclaration.sourceEnd;
label_4:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -666,61 +824,128 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
break label_4;
}
jj_consume_token(COMMA);
- variableDeclaration = VariableDeclarator();
- arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name));
- currentSegment.add(variableDeclaration);
+ variableDeclaration = VariableDeclaratorNoSuffix();
+ arrayList.add(variableDeclaration);
+ outlineInfo.addVariable(variableDeclaration.name());
+ pos = variableDeclaration.sourceEnd;
}
try {
- jj_consume_token(SEMICOLON);
+ token2 = jj_consume_token(SEMICOLON);
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = pos+1;
+ errorEnd = pos+1;
+ processParseExceptionDebug(e);
}
list = new VariableDeclaration[arrayList.size()];
arrayList.toArray(list);
+ int end;
+ if (token2 == null) {
+ end = list[list.length-1].sourceEnd;
+ } else {
+ end = token2.sourceEnd;
+ }
{if (true) return new FieldDeclaration(list,
- pos,
- SimpleCharStream.getPosition(),
+ token.sourceStart,
+ end,
currentSegment);}
throw new Error("Missing return statement in function");
}
+/**
+ * a strict variable declarator : there cannot be a suffix here.
+ * It will be used by fields and formal parameters
+ */
+ static final public VariableDeclaration VariableDeclaratorNoSuffix() throws ParseException {
+ final Token token, lbrace,rbrace;
+ Expression expr, initializer = null;
+ Token assignToken;
+ Variable variable;
+ jj_consume_token(DOLLAR);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
+ token = jj_consume_token(IDENTIFIER);
+ variable = new Variable(token.image,token.sourceStart,token.sourceEnd);
+ break;
+ case LBRACE:
+ lbrace = jj_consume_token(LBRACE);
+ expr = Expression();
+ rbrace = jj_consume_token(RBRACE);
+ variable = new Variable(expr,lbrace.sourceStart,rbrace.sourceEnd);
+ break;
+ default:
+ jj_la1[10] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ASSIGN:
+ assignToken = jj_consume_token(ASSIGN);
+ try {
+ initializer = VariableInitializer();
+ } catch (ParseException e) {
+ errorMessage = "Literal expression expected in variable initializer";
+ errorLevel = ERROR;
+ errorStart = assignToken.sourceEnd +1;
+ errorEnd = assignToken.sourceEnd +1;
+ processParseExceptionDebug(e);
+ }
+ break;
+ default:
+ jj_la1[11] = jj_gen;
+ ;
+ }
+ if (initializer == null) {
+ {if (true) return new VariableDeclaration(currentSegment,
+ variable,
+ variable.sourceStart,
+ variable.sourceEnd);}
+ }
+ {if (true) return new VariableDeclaration(currentSegment,
+ variable,
+ initializer,
+ VariableDeclaration.EQUAL,
+ variable.sourceStart);}
+ throw new Error("Missing return statement in function");
+ }
+
+/**
+ * this will be used by static statement
+ */
static final public VariableDeclaration VariableDeclarator() throws ParseException {
- final String varName;
+ final AbstractVariable variable;
Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
- varName = VariableDeclaratorId();
+ final Token token;
+ variable = VariableDeclaratorId();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ASSIGN:
- jj_consume_token(ASSIGN);
+ token = jj_consume_token(ASSIGN);
try {
initializer = VariableInitializer();
} catch (ParseException e) {
errorMessage = "Literal expression expected in variable initializer";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = token.sourceEnd+1;
+ errorEnd = token.sourceEnd+1;
+ processParseExceptionDebug(e);
}
break;
default:
- jj_la1[10] = jj_gen;
+ jj_la1[12] = jj_gen;
;
}
if (initializer == null) {
{if (true) return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
+ variable,
+ variable.sourceStart,
+ variable.sourceEnd);}
}
{if (true) return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- initializer,
- pos);}
+ variable,
+ initializer,
+ VariableDeclaration.EQUAL,
+ variable.sourceStart);}
throw new Error("Missing return statement in function");
}
@@ -728,15 +953,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
* A Variable name.
* @return the variable name (with suffix)
*/
- static final public String VariableDeclaratorId() throws ParseException {
- String expr;
- Expression expression;
- final StringBuffer buff = new StringBuffer();
- final int pos = SimpleCharStream.getPosition();
- ConstantIdentifier ex;
+ static final public AbstractVariable VariableDeclaratorId() throws ParseException {
+ final Variable var;
+ AbstractVariable expression = null;
try {
- expr = Variable();
- buff.append(expr);
+ var = Variable();
label_5:
while (true) {
if (jj_2_1(2)) {
@@ -744,112 +965,57 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
} else {
break label_5;
}
- ex = new ConstantIdentifier(expr.toCharArray(),
- pos,
- SimpleCharStream.getPosition());
- expression = VariableSuffix(ex);
- buff.append(expression.toStringExpression());
+ expression = VariableSuffix(var);
}
- {if (true) return buff.toString();}
+ if (expression == null) {
+ {if (true) return var;}
+ }
+ {if (true) return expression;}
} catch (ParseException e) {
errorMessage = "'$' expected for variable identifier";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
{if (true) throw e;}
}
throw new Error("Missing return statement in function");
}
- static final public String Variable() throws ParseException {
- final StringBuffer buff;
- Expression expression = null;
+ static final public Variable Variable() throws ParseException {
+ Variable variable = null;
final Token token;
- final String expr;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case DOLLAR_ID:
- token = jj_consume_token(DOLLAR_ID);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LBRACE:
- jj_consume_token(LBRACE);
- expression = Expression();
- jj_consume_token(RBRACE);
- break;
- default:
- jj_la1[11] = jj_gen;
- ;
- }
- if (expression == null && !assigning) {
- {if (true) return token.image.substring(1);}
- }
- buff = new StringBuffer(token.image);
- buff.append('{');
- buff.append(expression.toStringExpression());
- buff.append('}');
- {if (true) return buff.toString();}
- break;
- case DOLLAR:
- jj_consume_token(DOLLAR);
- expr = VariableName();
- {if (true) return "$" + expr;}
- break;
- default:
- jj_la1[12] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
+ token = jj_consume_token(DOLLAR);
+ variable = Var();
+ {if (true) return variable;}
throw new Error("Missing return statement in function");
}
- static final public String VariableName() throws ParseException {
- final StringBuffer buff;
- String expr = null;
- Expression expression = null;
- final Token token;
+ static final public Variable Var() throws ParseException {
+ Variable variable = null;
+ final Token token,token2;
+ ConstantIdentifier constant;
+ Expression expression;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DOLLAR:
+ token = jj_consume_token(DOLLAR);
+ variable = Var();
+ {if (true) return new Variable(variable,variable.sourceStart,variable.sourceEnd);}
+ break;
case LBRACE:
- jj_consume_token(LBRACE);
+ token = jj_consume_token(LBRACE);
expression = Expression();
- jj_consume_token(RBRACE);
- buff = new StringBuffer("{");
- buff.append(expression.toStringExpression());
- buff.append("}");
- {if (true) return buff.toString();}
+ token2 = jj_consume_token(RBRACE);
+ {if (true) return new Variable(expression,
+ token.sourceStart,
+ token2.sourceEnd);}
break;
case IDENTIFIER:
token = jj_consume_token(IDENTIFIER);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LBRACE:
- jj_consume_token(LBRACE);
- expression = Expression();
- jj_consume_token(RBRACE);
- break;
- default:
- jj_la1[13] = jj_gen;
- ;
- }
- if (expression == null) {
- {if (true) return token.image;}
- }
- buff = new StringBuffer(token.image);
- buff.append('{');
- buff.append(expression.toStringExpression());
- buff.append('}');
- {if (true) return buff.toString();}
- break;
- case DOLLAR:
- jj_consume_token(DOLLAR);
- expr = VariableName();
- buff = new StringBuffer('$');
- buff.append(expr);
- {if (true) return buff.toString();}
- break;
- case DOLLAR_ID:
- token = jj_consume_token(DOLLAR_ID);
- {if (true) return token.image;}
+ outlineInfo.addVariable('$' + token.image);
+ {if (true) return new Variable(token.image,token.sourceStart,token.sourceEnd);}
break;
default:
- jj_la1[14] = jj_gen;
+ jj_la1[13] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -858,8 +1024,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
static final public Expression VariableInitializer() throws ParseException {
final Expression expr;
- final Token token;
- final int pos = SimpleCharStream.getPosition();
+ final Token token, token2;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NULL:
case TRUE:
@@ -867,11 +1032,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
expr = Literal();
{if (true) return expr;}
break;
case MINUS:
- jj_consume_token(MINUS);
+ token2 = jj_consume_token(MINUS);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTEGER_LITERAL:
token = jj_consume_token(INTEGER_LITERAL);
@@ -880,18 +1046,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[15] = jj_gen;
+ jj_la1[14] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
+ {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token),
OperatorIds.MINUS,
- pos);}
+ token2.sourceStart);}
break;
case PLUS:
- jj_consume_token(PLUS);
+ token2 = jj_consume_token(PLUS);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTEGER_LITERAL:
token = jj_consume_token(INTEGER_LITERAL);
@@ -900,15 +1064,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
token = jj_consume_token(FLOATING_POINT_LITERAL);
break;
default:
- jj_la1[16] = jj_gen;
+ jj_la1[15] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
+ {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token),
OperatorIds.PLUS,
- pos);}
+ token2.sourceStart);}
break;
case ARRAY:
expr = ArrayDeclarator();
@@ -916,10 +1078,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
break;
case IDENTIFIER:
token = jj_consume_token(IDENTIFIER);
- {if (true) return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
+ {if (true) return new ConstantIdentifier(token);}
break;
default:
- jj_la1[17] = jj_gen;
+ jj_la1[16] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -927,16 +1089,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon
}
static final public ArrayVariableDeclaration ArrayVariable() throws ParseException {
-Expression expr,expr2;
+final Expression expr,expr2;
expr = Expression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAYASSIGN:
jj_consume_token(ARRAYASSIGN);
expr2 = Expression();
- {if (true) return new ArrayVariableDeclaration(expr,expr2);}
+ {if (true) return new ArrayVariableDeclaration(expr,expr2);}
break;
default:
- jj_la1[18] = jj_gen;
+ jj_la1[17] = jj_gen;
;
}
{if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
@@ -956,21 +1118,22 @@ Expression expr,expr2;
case TRUE:
case FALSE:
case AT:
- case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
expr = ArrayVariable();
- list.add(expr);
+ list.add(expr);
label_6:
while (true) {
if (jj_2_2(2)) {
@@ -980,24 +1143,24 @@ Expression expr,expr2;
}
jj_consume_token(COMMA);
expr = ArrayVariable();
- list.add(expr);
+ list.add(expr);
}
break;
default:
- jj_la1[19] = jj_gen;
+ jj_la1[18] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
jj_consume_token(COMMA);
- list.add(null);
+ list.add(null);
break;
default:
- jj_la1[20] = jj_gen;
+ jj_la1[19] = jj_gen;
;
}
jj_consume_token(RPAREN);
- ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
+ final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
list.toArray(vars);
{if (true) return vars;}
throw new Error("Missing return statement in function");
@@ -1010,28 +1173,25 @@ Expression expr,expr2;
static final public MethodDeclaration MethodDeclaration() throws ParseException {
final MethodDeclaration functionDeclaration;
final Block block;
- jj_consume_token(FUNCTION);
+ final OutlineableWithChildren seg = currentSegment;
+ final Token token;
+ token = jj_consume_token(FUNCTION);
try {
- functionDeclaration = MethodDeclarator();
- outlineInfo.addVariable(new String(functionDeclaration.name));
+ functionDeclaration = MethodDeclarator(token.sourceStart);
+ outlineInfo.addVariable(functionDeclaration.name);
} catch (ParseException e) {
if (errorMessage != null) {if (true) throw e;}
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
{if (true) throw e;}
}
- if (currentSegment != null) {
- currentSegment.add(functionDeclaration);
- currentSegment = functionDeclaration;
- }
+ currentSegment = functionDeclaration;
block = Block();
- functionDeclaration.statements = block.statements;
- if (currentSegment != null) {
- currentSegment = (OutlineableWithChildren) currentSegment.getParent();
- }
- {if (true) return functionDeclaration;}
+ functionDeclaration.statements = block.statements;
+ currentSegment = seg;
+ {if (true) return functionDeclaration;}
throw new Error("Missing return statement in function");
}
@@ -1040,27 +1200,54 @@ Expression expr,expr2;
* [&] IDENTIFIER(parameters ...).
* @return a function description for the outline
*/
- static final public MethodDeclaration MethodDeclarator() throws ParseException {
- final Token identifier;
+ static final public MethodDeclaration MethodDeclarator(final int start) throws ParseException {
+ Token identifier = null;
Token reference = null;
- final Hashtable formalParameters;
- final int pos = SimpleCharStream.getPosition();
+ final ArrayList formalParameters = new ArrayList();
+ String identifierChar = SYNTAX_ERROR_CHAR;
+ int end = start;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BIT_AND:
reference = jj_consume_token(BIT_AND);
+ end = reference.sourceEnd;
break;
default:
- jj_la1[21] = jj_gen;
+ jj_la1[20] = jj_gen;
;
}
- identifier = jj_consume_token(IDENTIFIER);
- formalParameters = FormalParameters();
- {if (true) return new MethodDeclaration(currentSegment,
- identifier.image.toCharArray(),
- formalParameters,
- reference != null,
- pos,
- SimpleCharStream.getPosition());}
+ try {
+ identifier = jj_consume_token(IDENTIFIER);
+ identifierChar = identifier.image;
+ end = identifier.sourceEnd;
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
+ errorLevel = ERROR;
+ errorStart = e.currentToken.sourceEnd;
+ errorEnd = e.currentToken.next.sourceStart;
+ processParseExceptionDebug(e);
+ }
+ end = FormalParameters(formalParameters);
+ int nameStart, nameEnd;
+ if (identifier == null) {
+ if (reference == null) {
+ nameStart = start + 9;
+ nameEnd = start + 10;
+ } else {
+ nameStart = reference.sourceEnd + 1;
+ nameEnd = reference.sourceEnd + 2;
+ }
+ } else {
+ nameStart = identifier.sourceStart;
+ nameEnd = identifier.sourceEnd;
+ }
+ {if (true) return new MethodDeclaration(currentSegment,
+ identifierChar,
+ formalParameters,
+ reference != null,
+ nameStart,
+ nameEnd,
+ start,
+ end);}
throw new Error("Missing return statement in function");
}
@@ -1068,24 +1255,26 @@ Expression expr,expr2;
* FormalParameters follows method identifier.
* (FormalParameter())
*/
- static final public Hashtable FormalParameters() throws ParseException {
+ static final public int FormalParameters(final ArrayList parameters) throws ParseException {
VariableDeclaration var;
- final Hashtable parameters = new Hashtable();
+ final Token token;
+ Token tok = PHPParser.token;
+ int end = tok.sourceEnd;
try {
- jj_consume_token(LPAREN);
+ tok = jj_consume_token(LPAREN);
+ end = tok.sourceEnd;
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = e.currentToken.next.sourceStart;
+ errorEnd = e.currentToken.next.sourceEnd;
+ processParseExceptionDebug(e);
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case DOLLAR:
case BIT_AND:
- case DOLLAR_ID:
+ case DOLLAR:
var = FormalParameter();
- parameters.put(new String(var.name),var);
+ parameters.add(var);end = var.sourceEnd;
label_7:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1093,28 +1282,29 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[22] = jj_gen;
+ jj_la1[21] = jj_gen;
break label_7;
}
jj_consume_token(COMMA);
var = FormalParameter();
- parameters.put(new String(var.name),var);
+ parameters.add(var);end = var.sourceEnd;
}
break;
default:
- jj_la1[23] = jj_gen;
+ jj_la1[22] = jj_gen;
;
}
try {
- jj_consume_token(RPAREN);
+ token = jj_consume_token(RPAREN);
+ end = token.sourceEnd;
} catch (ParseException e) {
errorMessage = "')' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = e.currentToken.next.sourceStart;
+ errorEnd = e.currentToken.next.sourceEnd;
+ processParseExceptionDebug(e);
}
- {if (true) return parameters;}
+ {if (true) return end;}
throw new Error("Missing return statement in function");
}
@@ -1130,10 +1320,11 @@ Expression expr,expr2;
token = jj_consume_token(BIT_AND);
break;
default:
- jj_la1[24] = jj_gen;
+ jj_la1[23] = jj_gen;
;
}
- variableDeclaration = VariableDeclarator();
+ variableDeclaration = VariableDeclaratorNoSuffix();
+ outlineInfo.addVariable('$'+variableDeclaration.name());
if (token != null) {
variableDeclaration.setReference(true);
}
@@ -1142,64 +1333,46 @@ Expression expr,expr2;
}
static final public ConstantIdentifier Type() throws ParseException {
- final int pos;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case STRING:
- jj_consume_token(STRING);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.STRING,
- pos,pos-6);}
+ token = jj_consume_token(STRING);
+ {if (true) return new ConstantIdentifier(token);}
break;
case BOOL:
- jj_consume_token(BOOL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.BOOL,
- pos,pos-4);}
+ token = jj_consume_token(BOOL);
+ {if (true) return new ConstantIdentifier(token);}
break;
case BOOLEAN:
- jj_consume_token(BOOLEAN);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.BOOLEAN,
- pos,pos-7);}
+ token = jj_consume_token(BOOLEAN);
+ {if (true) return new ConstantIdentifier(token);}
break;
case REAL:
- jj_consume_token(REAL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.REAL,
- pos,pos-4);}
+ token = jj_consume_token(REAL);
+ {if (true) return new ConstantIdentifier(token);}
break;
case DOUBLE:
- jj_consume_token(DOUBLE);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.DOUBLE,
- pos,pos-5);}
+ token = jj_consume_token(DOUBLE);
+ {if (true) return new ConstantIdentifier(token);}
break;
case FLOAT:
- jj_consume_token(FLOAT);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.FLOAT,
- pos,pos-5);}
+ token = jj_consume_token(FLOAT);
+ {if (true) return new ConstantIdentifier(token);}
break;
case INT:
- jj_consume_token(INT);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.INT,
- pos,pos-3);}
+ token = jj_consume_token(INT);
+ {if (true) return new ConstantIdentifier(token);}
break;
case INTEGER:
- jj_consume_token(INTEGER);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.INTEGER,
- pos,pos-7);}
+ token = jj_consume_token(INTEGER);
+ {if (true) return new ConstantIdentifier(token);}
break;
case OBJECT:
- jj_consume_token(OBJECT);
- pos = SimpleCharStream.getPosition();
- {if (true) return new ConstantIdentifier(Types.OBJECT,
- pos,pos-6);}
+ token = jj_consume_token(OBJECT);
+ {if (true) return new ConstantIdentifier(token);}
break;
default:
- jj_la1[25] = jj_gen;
+ jj_la1[24] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1208,141 +1381,193 @@ Expression expr,expr2;
static final public Expression Expression() throws ParseException {
final Expression expr;
+ Expression initializer = null;
+ int assignOperator = -1;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PRINT:
- expr = PrintExpression();
- {if (true) return expr;}
+ case ARRAY:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ expr = ConditionalExpression();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ASSIGN:
+ case PLUSASSIGN:
+ case MINUSASSIGN:
+ case STARASSIGN:
+ case SLASHASSIGN:
+ case ANDASSIGN:
+ case ORASSIGN:
+ case XORASSIGN:
+ case DOTASSIGN:
+ case REMASSIGN:
+ case TILDEEQUAL:
+ case LSHIFTASSIGN:
+ case RSIGNEDSHIFTASSIGN:
+ assignOperator = AssignmentOperator();
+ try {
+ initializer = Expression();
+ } catch (ParseException e) {
+ if (errorMessage != null) {
+ {if (true) throw e;}
+ }
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+ errorLevel = ERROR;
+ errorEnd = SimpleCharStream.getPosition();
+ {if (true) throw e;}
+ }
+ break;
+ default:
+ jj_la1[25] = jj_gen;
+ ;
+ }
+ if (assignOperator != -1) {// todo : change this, very very bad :(
+ if (expr instanceof AbstractVariable) {
+ {if (true) return new VariableDeclaration(currentSegment,
+ (AbstractVariable) expr,
+ initializer,
+ expr.sourceStart,
+ initializer.sourceEnd);}
+ }
+ String varName = expr.toStringExpression().substring(1);
+ {if (true) return new VariableDeclaration(currentSegment,
+ new Variable(varName,
+ expr.sourceStart,
+ expr.sourceEnd),
+ expr.sourceStart,
+ initializer.sourceEnd);}
+ }
+ {if (true) return expr;}
break;
case LIST:
- expr = ListExpression();
+ case PRINT:
+ expr = ExpressionWBang();
{if (true) return expr;}
break;
default:
jj_la1[26] = jj_gen;
- if (jj_2_3(2147483647)) {
- expr = varAssignation();
- {if (true) return expr;}
- } else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ARRAY:
- case NEW:
- case NULL:
- case TRUE:
- case FALSE:
- case AT:
- case DOLLAR:
- case BANG:
- case INCR:
- case DECR:
- case PLUS:
- case MINUS:
- case BIT_AND:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case IDENTIFIER:
- case LPAREN:
- case DOLLAR_ID:
- expr = ConditionalExpression();
- {if (true) return expr;}
- break;
- default:
- jj_la1[27] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- }
+ jj_consume_token(-1);
+ throw new ParseException();
}
throw new Error("Missing return statement in function");
}
-/**
- * A Variable assignation.
- * varName (an assign operator) any expression
- */
- static final public VarAssignation varAssignation() throws ParseException {
- String varName;
- final Expression expression;
- final int assignOperator;
- final int pos = SimpleCharStream.getPosition();
- varName = VariableDeclaratorId();
- assignOperator = AssignmentOperator();
- try {
- expression = Expression();
- } catch (ParseException e) {
- if (errorMessage != null) {
- {if (true) throw e;}
- }
- errorMessage = "expression expected";
- errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ static final public Expression ExpressionWBang() throws ParseException {
+ final Expression expr;
+ final Token token;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BANG:
+ token = jj_consume_token(BANG);
+ expr = ExpressionWBang();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
+ break;
+ case LIST:
+ case PRINT:
+ expr = ExpressionNoBang();
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[27] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
- {if (true) return new VarAssignation(varName.toCharArray(),
- expression,
- assignOperator,
- pos,
- SimpleCharStream.getPosition());}
throw new Error("Missing return statement in function");
}
+ static final public Expression ExpressionNoBang() throws ParseException {
+ Expression expr;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LIST:
+ expr = ListExpression();
+ {if (true) return expr;}
+ break;
+ case PRINT:
+ expr = PrintExpression();
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[28] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ throw new Error("Missing return statement in function");
+ }
+
+/**
+ * Any assignement operator.
+ * @return the assignement operator id
+ */
static final public int AssignmentOperator() throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ASSIGN:
jj_consume_token(ASSIGN);
- {if (true) return VarAssignation.EQUAL;}
+ {if (true) return VariableDeclaration.EQUAL;}
break;
case STARASSIGN:
jj_consume_token(STARASSIGN);
- {if (true) return VarAssignation.STAR_EQUAL;}
+ {if (true) return VariableDeclaration.STAR_EQUAL;}
break;
case SLASHASSIGN:
jj_consume_token(SLASHASSIGN);
- {if (true) return VarAssignation.SLASH_EQUAL;}
+ {if (true) return VariableDeclaration.SLASH_EQUAL;}
break;
case REMASSIGN:
jj_consume_token(REMASSIGN);
- {if (true) return VarAssignation.REM_EQUAL;}
+ {if (true) return VariableDeclaration.REM_EQUAL;}
break;
case PLUSASSIGN:
jj_consume_token(PLUSASSIGN);
- {if (true) return VarAssignation.PLUS_EQUAL;}
+ {if (true) return VariableDeclaration.PLUS_EQUAL;}
break;
case MINUSASSIGN:
jj_consume_token(MINUSASSIGN);
- {if (true) return VarAssignation.MINUS_EQUAL;}
+ {if (true) return VariableDeclaration.MINUS_EQUAL;}
break;
case LSHIFTASSIGN:
jj_consume_token(LSHIFTASSIGN);
- {if (true) return VarAssignation.LSHIFT_EQUAL;}
+ {if (true) return VariableDeclaration.LSHIFT_EQUAL;}
break;
case RSIGNEDSHIFTASSIGN:
jj_consume_token(RSIGNEDSHIFTASSIGN);
- {if (true) return VarAssignation.RSIGNEDSHIFT_EQUAL;}
+ {if (true) return VariableDeclaration.RSIGNEDSHIFT_EQUAL;}
break;
case ANDASSIGN:
jj_consume_token(ANDASSIGN);
- {if (true) return VarAssignation.AND_EQUAL;}
+ {if (true) return VariableDeclaration.AND_EQUAL;}
break;
case XORASSIGN:
jj_consume_token(XORASSIGN);
- {if (true) return VarAssignation.XOR_EQUAL;}
+ {if (true) return VariableDeclaration.XOR_EQUAL;}
break;
case ORASSIGN:
jj_consume_token(ORASSIGN);
- {if (true) return VarAssignation.OR_EQUAL;}
+ {if (true) return VariableDeclaration.OR_EQUAL;}
break;
case DOTASSIGN:
jj_consume_token(DOTASSIGN);
- {if (true) return VarAssignation.DOT_EQUAL;}
+ {if (true) return VariableDeclaration.DOT_EQUAL;}
break;
case TILDEEQUAL:
jj_consume_token(TILDEEQUAL);
- {if (true) return VarAssignation.TILDE_EQUAL;}
+ {if (true) return VariableDeclaration.TILDE_EQUAL;}
break;
default:
- jj_la1[28] = jj_gen;
+ jj_la1[29] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1362,7 +1587,7 @@ Expression expr,expr2;
expr3 = ConditionalExpression();
break;
default:
- jj_la1[29] = jj_gen;
+ jj_la1[30] = jj_gen;
;
}
if (expr3 == null) {
@@ -1384,7 +1609,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[30] = jj_gen;
+ jj_la1[31] = jj_gen;
break label_8;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1397,7 +1622,7 @@ Expression expr,expr2;
operator = OperatorIds.ORL;
break;
default:
- jj_la1[31] = jj_gen;
+ jj_la1[32] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1420,7 +1645,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[32] = jj_gen;
+ jj_la1[33] = jj_gen;
break label_9;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1433,7 +1658,7 @@ Expression expr,expr2;
operator = OperatorIds.ANDL;
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[34] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1454,7 +1679,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[34] = jj_gen;
+ jj_la1[35] = jj_gen;
break label_10;
}
jj_consume_token(DOT);
@@ -1475,7 +1700,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[35] = jj_gen;
+ jj_la1[36] = jj_gen;
break label_11;
}
jj_consume_token(BIT_OR);
@@ -1496,7 +1721,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[36] = jj_gen;
+ jj_la1[37] = jj_gen;
break label_12;
}
jj_consume_token(XOR);
@@ -1517,7 +1742,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[37] = jj_gen;
+ jj_la1[38] = jj_gen;
break label_13;
}
jj_consume_token(BIT_AND);
@@ -1531,6 +1756,7 @@ Expression expr,expr2;
static final public Expression EqualityExpression() throws ParseException {
Expression expr,expr2;
int operator;
+ Token token;
expr = RelationalExpression();
label_14:
while (true) {
@@ -1543,32 +1769,32 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[38] = jj_gen;
+ jj_la1[39] = jj_gen;
break label_14;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EQUAL_EQUAL:
- jj_consume_token(EQUAL_EQUAL);
- operator = OperatorIds.EQUAL_EQUAL;
+ token = jj_consume_token(EQUAL_EQUAL);
+ operator = OperatorIds.EQUAL_EQUAL;
break;
case DIF:
- jj_consume_token(DIF);
- operator = OperatorIds.DIF;
+ token = jj_consume_token(DIF);
+ operator = OperatorIds.DIF;
break;
case NOT_EQUAL:
- jj_consume_token(NOT_EQUAL);
- operator = OperatorIds.DIF;
+ token = jj_consume_token(NOT_EQUAL);
+ operator = OperatorIds.DIF;
break;
case BANGDOUBLEEQUAL:
- jj_consume_token(BANGDOUBLEEQUAL);
- operator = OperatorIds.BANG_EQUAL_EQUAL;
+ token = jj_consume_token(BANGDOUBLEEQUAL);
+ operator = OperatorIds.BANG_EQUAL_EQUAL;
break;
case TRIPLEEQUAL:
- jj_consume_token(TRIPLEEQUAL);
- operator = OperatorIds.EQUAL_EQUAL_EQUAL;
+ token = jj_consume_token(TRIPLEEQUAL);
+ operator = OperatorIds.EQUAL_EQUAL_EQUAL;
break;
default:
- jj_la1[39] = jj_gen;
+ jj_la1[40] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1580,9 +1806,10 @@ Expression expr,expr2;
}
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = token.sourceEnd +1;
+ errorEnd = token.sourceEnd +1;
+ expr2 = new ConstantIdentifier(SYNTAX_ERROR_CHAR,token.sourceEnd +1,token.sourceEnd +1);
+ processParseExceptionDebug(e);
}
expr = new BinaryExpression(expr,expr2,operator);
}
@@ -1604,7 +1831,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[40] = jj_gen;
+ jj_la1[41] = jj_gen;
break label_15;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1625,7 +1852,7 @@ Expression expr,expr2;
operator = OperatorIds.GREATER_EQUAL;
break;
default:
- jj_la1[41] = jj_gen;
+ jj_la1[42] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1649,7 +1876,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[42] = jj_gen;
+ jj_la1[43] = jj_gen;
break label_16;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1666,7 +1893,7 @@ Expression expr,expr2;
operator = OperatorIds.UNSIGNED_RIGHT_SHIFT;
break;
default:
- jj_la1[43] = jj_gen;
+ jj_la1[44] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1689,20 +1916,20 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[44] = jj_gen;
+ jj_la1[45] = jj_gen;
break label_17;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS:
jj_consume_token(PLUS);
- operator = OperatorIds.PLUS;
+ operator = OperatorIds.PLUS;
break;
case MINUS:
jj_consume_token(MINUS);
- operator = OperatorIds.MINUS;
+ operator = OperatorIds.MINUS;
break;
default:
- jj_la1[45] = jj_gen;
+ jj_la1[46] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1720,10 +1947,10 @@ Expression expr,expr2;
expr = UnaryExpression();
} catch (ParseException e) {
if (errorMessage != null) {if (true) throw e;}
- errorMessage = "unexpected token '"+e.currentToken.next.image+"'";
+ errorMessage = "unexpected token '"+e.currentToken.next.image+'\'';
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
+ errorStart = PHPParser.token.sourceStart;
+ errorEnd = PHPParser.token.sourceEnd;
{if (true) throw e;}
}
label_18:
@@ -1735,7 +1962,7 @@ Expression expr,expr2;
;
break;
default:
- jj_la1[46] = jj_gen;
+ jj_la1[47] = jj_gen;
break label_18;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1752,7 +1979,7 @@ Expression expr,expr2;
operator = OperatorIds.REMAINDER;
break;
default:
- jj_la1[47] = jj_gen;
+ jj_la1[48] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1767,74 +1994,102 @@ Expression expr,expr2;
* An unary expression starting with @, & or nothing
*/
static final public Expression UnaryExpression() throws ParseException {
- Expression expr;
- final int pos = SimpleCharStream.getPosition();
+ final Expression expr;
+ /* expr = UnaryExpressionNoPrefix() //why did I had that ?
+ {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
+ | */
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return expr;}
+ throw new Error("Missing return statement in function");
+ }
+
+ static final public Expression AtNotTildeUnaryExpression() throws ParseException {
+ final Expression expr;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BIT_AND:
- jj_consume_token(BIT_AND);
- expr = UnaryExpressionNoPrefix();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
+ case AT:
+ token = jj_consume_token(AT);
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);}
+ break;
+ case TILDE:
+ token = jj_consume_token(TILDE);
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.TWIDDLE,token.sourceStart);}
+ break;
+ case BANG:
+ token = jj_consume_token(BANG);
+ expr = AtNotUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
break;
case ARRAY:
case NEW:
case NULL:
case TRUE:
case FALSE:
- case AT:
- case DOLLAR:
- case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
+ case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
- expr = AtUnaryExpression();
- {if (true) return expr;}
+ expr = UnaryExpressionNoPrefix();
+ {if (true) return expr;}
break;
default:
- jj_la1[48] = jj_gen;
+ jj_la1[49] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
- static final public Expression AtUnaryExpression() throws ParseException {
- Expression expr;
- final int pos = SimpleCharStream.getPosition();
+/**
+ * An expression prefixed (or not) by one or more @ and !.
+ * @return the expression
+ */
+ static final public Expression AtNotUnaryExpression() throws ParseException {
+ final Expression expr;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case AT:
- jj_consume_token(AT);
- expr = AtUnaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
+ token = jj_consume_token(AT);
+ expr = AtNotUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,token.sourceStart);}
+ break;
+ case BANG:
+ token = jj_consume_token(BANG);
+ expr = AtNotUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,token.sourceStart);}
break;
case ARRAY:
case NEW:
case NULL:
case TRUE:
case FALSE:
- case DOLLAR:
- case BANG:
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
+ case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
expr = UnaryExpressionNoPrefix();
{if (true) return expr;}
break;
default:
- jj_la1[49] = jj_gen;
+ jj_la1[50] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1842,31 +2097,25 @@ Expression expr,expr2;
}
static final public Expression UnaryExpressionNoPrefix() throws ParseException {
- Expression expr;
- int operator;
- final int pos = SimpleCharStream.getPosition();
+ final Expression expr;
+ final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS:
+ token = jj_consume_token(PLUS);
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,
+ OperatorIds.PLUS,
+ token.sourceStart);}
+ break;
case MINUS:
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case PLUS:
- jj_consume_token(PLUS);
- operator = OperatorIds.PLUS;
- break;
- case MINUS:
- jj_consume_token(MINUS);
- operator = OperatorIds.MINUS;
- break;
- default:
- jj_la1[50] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- expr = UnaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,operator,pos);}
+ token = jj_consume_token(MINUS);
+ expr = AtNotTildeUnaryExpression();
+ {if (true) return new PrefixedUnaryExpression(expr,
+ OperatorIds.MINUS,
+ token.sourceStart);}
break;
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
expr = PreIncDecExpression();
{if (true) return expr;}
break;
@@ -1875,14 +2124,14 @@ Expression expr,expr2;
case NULL:
case TRUE:
case FALSE:
- case DOLLAR:
- case BANG:
+ case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
expr = UnaryExpressionNotPlusMinus();
{if (true) return expr;}
break;
@@ -1897,15 +2146,15 @@ Expression expr,expr2;
static final public Expression PreIncDecExpression() throws ParseException {
final Expression expr;
final int operator;
- final int pos = SimpleCharStream.getPosition();
+final Token token;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case INCR:
- jj_consume_token(INCR);
- operator = OperatorIds.PLUS_PLUS;
+ case PLUS_PLUS:
+ token = jj_consume_token(PLUS_PLUS);
+ operator = OperatorIds.PLUS_PLUS;
break;
- case DECR:
- jj_consume_token(DECR);
- operator = OperatorIds.MINUS_MINUS;
+ case MINUS_MINUS:
+ token = jj_consume_token(MINUS_MINUS);
+ operator = OperatorIds.MINUS_MINUS;
break;
default:
jj_la1[52] = jj_gen;
@@ -1913,62 +2162,53 @@ final int operator;
throw new ParseException();
}
expr = PrimaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,operator,pos);}
+ {if (true) return new PrefixedUnaryExpression(expr,operator,token.sourceStart);}
throw new Error("Missing return statement in function");
}
static final public Expression UnaryExpressionNotPlusMinus() throws ParseException {
- Expression expr;
- final int pos = SimpleCharStream.getPosition();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case BANG:
- jj_consume_token(BANG);
- expr = UnaryExpression();
- {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
- break;
- default:
- jj_la1[53] = jj_gen;
- if (jj_2_4(2147483647)) {
- expr = CastExpression();
+ final Expression expr;
+ if (jj_2_3(2147483647)) {
+ expr = CastExpression();
{if (true) return expr;}
- } else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ARRAY:
- case NEW:
- case DOLLAR:
- case IDENTIFIER:
- case DOLLAR_ID:
- expr = PostfixExpression();
+ } else {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ case NEW:
+ case BIT_AND:
+ case DOLLAR:
+ case IDENTIFIER:
+ expr = PostfixExpression();
{if (true) return expr;}
- break;
- case NULL:
- case TRUE:
- case FALSE:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- expr = Literal();
+ break;
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ expr = Literal();
{if (true) return expr;}
- break;
- case LPAREN:
- jj_consume_token(LPAREN);
- expr = Expression();
- try {
- jj_consume_token(RPAREN);
- } catch (ParseException e) {
+ break;
+ case LPAREN:
+ jj_consume_token(LPAREN);
+ expr = Expression();
+ try {
+ jj_consume_token(RPAREN);
+ } catch (ParseException e) {
errorMessage = "')' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
- }
- {if (true) return expr;}
- break;
- default:
- jj_la1[54] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ errorStart = expr.sourceEnd +1;
+ errorEnd = expr.sourceEnd +1;
+ processParseExceptionDebug(e);
}
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[53] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
}
throw new Error("Missing return statement in function");
@@ -1977,8 +2217,8 @@ final int operator;
static final public CastExpression CastExpression() throws ParseException {
final ConstantIdentifier type;
final Expression expr;
-final int pos = SimpleCharStream.getPosition();
- jj_consume_token(LPAREN);
+final Token token,token1;
+ token1 = jj_consume_token(LPAREN);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case STRING:
case OBJECT:
@@ -1992,226 +2232,210 @@ final int pos = SimpleCharStream.getPosition();
type = Type();
break;
case ARRAY:
- jj_consume_token(ARRAY);
- type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());
+ token = jj_consume_token(ARRAY);
+ type = new ConstantIdentifier(token);
break;
default:
- jj_la1[55] = jj_gen;
+ jj_la1[54] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
jj_consume_token(RPAREN);
expr = UnaryExpression();
- {if (true) return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());}
+ {if (true) return new CastExpression(type,expr,token1.sourceStart,expr.sourceEnd);}
throw new Error("Missing return statement in function");
}
static final public Expression PostfixExpression() throws ParseException {
- Expression expr;
+ final Expression expr;
int operator = -1;
- final int pos = SimpleCharStream.getPosition();
+ Token token = null;
expr = PrimaryExpression();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case INCR:
- case DECR:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case INCR:
- jj_consume_token(INCR);
- operator = OperatorIds.PLUS_PLUS;
+ case PLUS_PLUS:
+ token = jj_consume_token(PLUS_PLUS);
+ operator = OperatorIds.PLUS_PLUS;
break;
- case DECR:
- jj_consume_token(DECR);
- operator = OperatorIds.MINUS_MINUS;
+ case MINUS_MINUS:
+ token = jj_consume_token(MINUS_MINUS);
+ operator = OperatorIds.MINUS_MINUS;
break;
default:
- jj_la1[56] = jj_gen;
+ jj_la1[55] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[57] = jj_gen;
+ jj_la1[56] = jj_gen;
;
}
if (operator == -1) {
{if (true) return expr;}
}
- {if (true) return new PostfixedUnaryExpression(expr,operator,pos);}
+ {if (true) return new PostfixedUnaryExpression(expr,operator,token.sourceEnd);}
throw new Error("Missing return statement in function");
}
static final public Expression PrimaryExpression() throws ParseException {
- final Token identifier;
Expression expr;
- final int pos = SimpleCharStream.getPosition();
- if (jj_2_5(2)) {
+ Token token = null;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case NEW:
+ case BIT_AND:
+ case DOLLAR:
+ case IDENTIFIER:
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case BIT_AND:
+ token = jj_consume_token(BIT_AND);
+ break;
+ default:
+ jj_la1[57] = jj_gen;
+ ;
+ }
+ expr = refPrimaryExpression(token);
+ {if (true) return expr;}
+ break;
+ case ARRAY:
+ expr = ArrayDeclarator();
+ {if (true) return expr;}
+ break;
+ default:
+ jj_la1[58] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ throw new Error("Missing return statement in function");
+ }
+
+ static final public Expression refPrimaryExpression(final Token reference) throws ParseException {
+ Expression expr;
+ Expression expr2 = null;
+ final Token identifier;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
identifier = jj_consume_token(IDENTIFIER);
- jj_consume_token(STATICCLASSACCESS);
- expr = ClassIdentifier();
- expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
- expr,
- ClassAccess.STATIC);
+ expr = new ConstantIdentifier(identifier);
label_19:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case CLASSACCESS:
- case LPAREN:
- case LBRACKET:
+ case STATICCLASSACCESS:
;
break;
default:
- jj_la1[58] = jj_gen;
+ jj_la1[59] = jj_gen;
break label_19;
}
- expr = PrimarySuffix(expr);
+ jj_consume_token(STATICCLASSACCESS);
+ expr2 = ClassIdentifier();
+ expr = new ClassAccess(expr,
+ expr2,
+ ClassAccess.STATIC);
}
- {if (true) return expr;}
- } else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case NEW:
- case DOLLAR:
- case IDENTIFIER:
- case DOLLAR_ID:
- expr = PrimaryPrefix();
- label_20:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case CLASSACCESS:
- case LPAREN:
- case LBRACKET:
- ;
- break;
- default:
- jj_la1[59] = jj_gen;
- break label_20;
- }
- expr = PrimarySuffix(expr);
- }
- {if (true) return expr;}
- break;
- case ARRAY:
- expr = ArrayDeclarator();
- {if (true) return expr;}
+ case LPAREN:
+ expr2 = Arguments(expr);
break;
default:
jj_la1[60] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ ;
}
+ if (expr2 == null) {
+ if (reference != null) {
+ ParseException e = generateParseException();
+ errorMessage = "you cannot use a constant by reference";
+ errorLevel = ERROR;
+ errorStart = reference.sourceStart;
+ errorEnd = reference.sourceEnd;
+ processParseExceptionDebug(e);
+ }
+ {if (true) return expr;}
}
- throw new Error("Missing return statement in function");
- }
-
- static final public ArrayInitializer ArrayDeclarator() throws ParseException {
- final ArrayVariableDeclaration[] vars;
- final int pos = SimpleCharStream.getPosition();
- jj_consume_token(ARRAY);
- vars = ArrayInitializer();
- {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
- throw new Error("Missing return statement in function");
- }
-
- static final public Expression PrimaryPrefix() throws ParseException {
- final Expression expr;
- final Token token;
- final String var;
- final int pos = SimpleCharStream.getPosition();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IDENTIFIER:
- token = jj_consume_token(IDENTIFIER);
- {if (true) return new ConstantIdentifier(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
+ {if (true) return expr2;}
+ break;
+ case DOLLAR:
+ expr = VariableDeclaratorId();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LPAREN:
+ expr = Arguments(expr);
+ break;
+ default:
+ jj_la1[61] = jj_gen;
+ ;
+ }
+ {if (true) return expr;}
break;
case NEW:
- jj_consume_token(NEW);
+ token = jj_consume_token(NEW);
expr = ClassIdentifier();
- {if (true) return new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos);}
- break;
- case DOLLAR:
- case DOLLAR_ID:
- var = VariableDeclaratorId();
- {if (true) return new ConstantIdentifier(var.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
+ int start;
+ if (reference == null) {
+ start = token.sourceStart;
+ } else {
+ start = reference.sourceStart;
+ }
+ expr = new ClassInstantiation(expr,
+ reference != null,
+ start);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LPAREN:
+ expr = Arguments(expr);
+ break;
+ default:
+ jj_la1[62] = jj_gen;
+ ;
+ }
+ {if (true) return expr;}
break;
default:
- jj_la1[61] = jj_gen;
+ jj_la1[63] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
- static final public PrefixedUnaryExpression classInstantiation() throws ParseException {
- Expression expr;
- final StringBuffer buff;
- final int pos = SimpleCharStream.getPosition();
- jj_consume_token(NEW);
- expr = ClassIdentifier();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case ARRAY:
- case NEW:
- case DOLLAR:
- case IDENTIFIER:
- case DOLLAR_ID:
- buff = new StringBuffer(expr.toStringExpression());
- expr = PrimaryExpression();
- buff.append(expr.toStringExpression());
- expr = new ConstantIdentifier(buff.toString().toCharArray(),
- pos,
- SimpleCharStream.getPosition());
- break;
- default:
- jj_la1[62] = jj_gen;
- ;
- }
- {if (true) return new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos);}
+/**
+ * An array declarator.
+ * array(vars)
+ * @return an array
+ */
+ static final public ArrayInitializer ArrayDeclarator() throws ParseException {
+ final ArrayVariableDeclaration[] vars;
+ final Token token;
+ token = jj_consume_token(ARRAY);
+ vars = ArrayInitializer();
+ {if (true) return new ArrayInitializer(vars,
+ token.sourceStart,
+ PHPParser.token.sourceEnd);}
throw new Error("Missing return statement in function");
}
- static final public ConstantIdentifier ClassIdentifier() throws ParseException {
- final String expr;
+ static final public Expression ClassIdentifier() throws ParseException {
+ final Expression expr;
final Token token;
- final int pos = SimpleCharStream.getPosition();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
token = jj_consume_token(IDENTIFIER);
- {if (true) return new ConstantIdentifier(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
+ {if (true) return new ConstantIdentifier(token);}
break;
- case DOLLAR:
- case DOLLAR_ID:
- expr = VariableDeclaratorId();
- {if (true) return new ConstantIdentifier(expr.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
- break;
- default:
- jj_la1[63] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- throw new Error("Missing return statement in function");
- }
-
- static final public AbstractSuffixExpression PrimarySuffix(Expression prefix) throws ParseException {
- final AbstractSuffixExpression expr;
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LPAREN:
- expr = Arguments(prefix);
+ case STRING:
+ case OBJECT:
+ case BOOL:
+ case BOOLEAN:
+ case REAL:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case INTEGER:
+ expr = Type();
{if (true) return expr;}
break;
- case CLASSACCESS:
- case LBRACKET:
- expr = VariableSuffix(prefix);
+ case DOLLAR:
+ expr = VariableDeclaratorId();
{if (true) return expr;}
break;
default:
@@ -2222,28 +2446,53 @@ final int pos = SimpleCharStream.getPosition();
throw new Error("Missing return statement in function");
}
- static final public AbstractSuffixExpression VariableSuffix(Expression prefix) throws ParseException {
- String expr = null;
- final int pos = SimpleCharStream.getPosition();
+/**
+ * Used by Variabledeclaratorid and primarysuffix
+ */
+ static final public AbstractVariable VariableSuffix(final AbstractVariable prefix) throws ParseException {
Expression expression = null;
+ final Token classAccessToken,lbrace,rbrace;
+ Token token;
+ int pos;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CLASSACCESS:
- jj_consume_token(CLASSACCESS);
+ classAccessToken = jj_consume_token(CLASSACCESS);
try {
- expr = VariableName();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LBRACE:
+ lbrace = jj_consume_token(LBRACE);
+ expression = Expression();
+ rbrace = jj_consume_token(RBRACE);
+ expression = new Variable(expression,
+ lbrace.sourceStart,
+ rbrace.sourceEnd);
+ break;
+ case IDENTIFIER:
+ token = jj_consume_token(IDENTIFIER);
+ expression = new ConstantIdentifier(token.image,token.sourceStart,token.sourceEnd);
+ break;
+ case DOLLAR:
+ expression = Variable();
+ break;
+ default:
+ jj_la1[65] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = classAccessToken.sourceEnd +1;
+ errorEnd = classAccessToken.sourceEnd +1;
+ processParseExceptionDebug(e);
}
{if (true) return new ClassAccess(prefix,
- new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+ expression,
ClassAccess.NORMAL);}
break;
case LBRACKET:
- jj_consume_token(LBRACKET);
+ token = jj_consume_token(LBRACKET);
+ pos = token.sourceEnd+1;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
case LIST:
@@ -2262,19 +2511,20 @@ final int pos = SimpleCharStream.getPosition();
case INT:
case INTEGER:
case AT:
- case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
case LIST:
@@ -2284,20 +2534,117 @@ final int pos = SimpleCharStream.getPosition();
case TRUE:
case FALSE:
case AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOUBLEQUOTE:
case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ expression = Expression();
+ pos = expression.sourceEnd+1;
+ break;
+ case STRING:
+ case OBJECT:
+ case BOOL:
+ case BOOLEAN:
+ case REAL:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case INTEGER:
+ expression = Type();
+ pos = expression.sourceEnd+1;
+ break;
+ default:
+ jj_la1[66] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ break;
+ default:
+ jj_la1[67] = jj_gen;
+ ;
+ }
+ try {
+ token = jj_consume_token(RBRACKET);
+ pos = token.sourceEnd;
+ } catch (ParseException e) {
+ errorMessage = "']' expected";
+ errorLevel = ERROR;
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ }
+ {if (true) return new ArrayDeclarator(prefix,expression,pos);}
+ break;
+ case LBRACE:
+ token = jj_consume_token(LBRACE);
+ pos = token.sourceEnd+1;
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ case LIST:
+ case PRINT:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case STRING:
+ case OBJECT:
+ case BOOL:
+ case BOOLEAN:
+ case REAL:
+ case DOUBLE:
+ case FLOAT:
+ case INT:
+ case INTEGER:
+ case AT:
+ case BANG:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
+ case PLUS:
+ case MINUS:
+ case BIT_AND:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
+ case IDENTIFIER:
+ case LPAREN:
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case ARRAY:
+ case LIST:
+ case PRINT:
+ case NEW:
+ case NULL:
+ case TRUE:
+ case FALSE:
+ case AT:
case BANG:
- case INCR:
- case DECR:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
expression = Expression();
+ pos = expression.sourceEnd+1;
break;
case STRING:
case OBJECT:
@@ -2309,30 +2656,32 @@ final int pos = SimpleCharStream.getPosition();
case INT:
case INTEGER:
expression = Type();
+ pos = expression.sourceEnd+1;
break;
default:
- jj_la1[65] = jj_gen;
+ jj_la1[68] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[66] = jj_gen;
+ jj_la1[69] = jj_gen;
;
}
try {
- jj_consume_token(RBRACKET);
+ token = jj_consume_token(RBRACE);
+ pos = token.sourceEnd;
} catch (ParseException e) {
errorMessage = "']' expected";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
}
- {if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
+ {if (true) return new ArrayDeclarator(prefix,expression,pos);}
break;
default:
- jj_la1[67] = jj_gen;
+ jj_la1[70] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2341,49 +2690,97 @@ final int pos = SimpleCharStream.getPosition();
static final public Literal Literal() throws ParseException {
final Token token;
- final int pos;
+ StringLiteral literal;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTEGER_LITERAL:
token = jj_consume_token(INTEGER_LITERAL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
+ {if (true) return new NumberLiteral(token);}
break;
case FLOATING_POINT_LITERAL:
token = jj_consume_token(FLOATING_POINT_LITERAL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
+ {if (true) return new NumberLiteral(token);}
break;
case STRING_LITERAL:
token = jj_consume_token(STRING_LITERAL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new StringLiteral(token.image.toCharArray(),pos-token.image.length());}
+ {if (true) return new StringLiteral(token);}
break;
case TRUE:
- jj_consume_token(TRUE);
- pos = SimpleCharStream.getPosition();
- {if (true) return new TrueLiteral(pos-4,pos);}
+ token = jj_consume_token(TRUE);
+ {if (true) return new TrueLiteral(token);}
break;
case FALSE:
- jj_consume_token(FALSE);
- pos = SimpleCharStream.getPosition();
- {if (true) return new FalseLiteral(pos-4,pos);}
+ token = jj_consume_token(FALSE);
+ {if (true) return new FalseLiteral(token);}
break;
case NULL:
- jj_consume_token(NULL);
- pos = SimpleCharStream.getPosition();
- {if (true) return new NullLiteral(pos-4,pos);}
+ token = jj_consume_token(NULL);
+ {if (true) return new NullLiteral(token);}
+ break;
+ case DOUBLEQUOTE:
+ literal = evaluableString();
+ {if (true) return literal;}
break;
default:
- jj_la1[68] = jj_gen;
+ jj_la1[71] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
- static final public FunctionCall Arguments(Expression func) throws ParseException {
+ static final public StringLiteral evaluableString() throws ParseException {
+ ArrayList list = new ArrayList();
+ Token start,end;
+ Token token,lbrace,rbrace;
+ AbstractVariable var;
+ Expression expr;
+ start = jj_consume_token(DOUBLEQUOTE);
+ label_20:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DOLLARS:
+ ;
+ break;
+ default:
+ jj_la1[72] = jj_gen;
+ break label_20;
+ }
+ jj_consume_token(DOLLARS);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
+ token = jj_consume_token(IDENTIFIER);
+ list.add(new Variable(token.image,
+ token.sourceStart,
+ token.sourceEnd));
+ break;
+ case LBRACE1:
+ lbrace = jj_consume_token(LBRACE1);
+ token = jj_consume_token(ID);
+ list.add(new Variable(token.image,
+ token.sourceStart,
+ token.sourceEnd));
+ rbrace = jj_consume_token(RBRACE1);
+ break;
+ default:
+ jj_la1[73] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ }
+ end = jj_consume_token(DOUBLEQUOTE2);
+ AbstractVariable[] vars = new AbstractVariable[list.size()];
+ list.toArray(vars);
+ {if (true) return new StringLiteral(SimpleCharStream.currentBuffer.substring(start.sourceEnd,end.sourceStart),
+ start.sourceStart,
+ end.sourceEnd,
+ vars);}
+ throw new Error("Missing return statement in function");
+ }
+
+ static final public FunctionCall Arguments(final Expression func) throws ParseException {
Expression[] args = null;
- jj_consume_token(LPAREN);
+final Token token,lparen;
+ lparen = jj_consume_token(LPAREN);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ARRAY:
case LIST:
@@ -2393,35 +2790,43 @@ Expression[] args = null;
case TRUE:
case FALSE:
case AT:
- case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
- case DOLLAR_ID:
args = ArgumentList();
break;
default:
- jj_la1[69] = jj_gen;
+ jj_la1[74] = jj_gen;
;
}
try {
- jj_consume_token(RPAREN);
+ token = jj_consume_token(RPAREN);
+ {if (true) return new FunctionCall(func,args,token.sourceEnd);}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ if (args == null) {
+ errorStart = lparen.sourceEnd+1;
+ errorEnd = lparen.sourceEnd+2;
+ } else {
+ errorStart = args[args.length-1].sourceEnd+1;
+ errorEnd = args[args.length-1].sourceEnd+2;
+ }
+ processParseExceptionDebug(e);
}
- {if (true) return new FunctionCall(func,args,SimpleCharStream.getPosition());}
+ 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");
}
@@ -2433,8 +2838,10 @@ Expression[] args = null;
static final public Expression[] ArgumentList() throws ParseException {
Expression arg;
final ArrayList list = new ArrayList();
+int pos;
+Token token;
arg = Expression();
- list.add(arg);
+ list.add(arg);pos = arg.sourceEnd;
label_21:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2442,22 +2849,24 @@ final ArrayList list = new ArrayList();
;
break;
default:
- jj_la1[70] = jj_gen;
+ jj_la1[75] = jj_gen;
break label_21;
}
- jj_consume_token(COMMA);
+ token = jj_consume_token(COMMA);
+ pos = token.sourceEnd;
try {
arg = Expression();
list.add(arg);
+ pos = arg.sourceEnd;
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list";
errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
+ errorStart = pos+1;
+ errorEnd = pos+1;
+ processParseException(e);
}
}
- Expression[] arguments = new Expression[list.size()];
+ final Expression[] arguments = new Expression[list.size()];
list.toArray(arguments);
{if (true) return arguments;}
throw new Error("Missing return statement in function");
@@ -2465,55 +2874,27 @@ final ArrayList list = new ArrayList();
/**
* A Statement without break.
+ * @return a statement
*/
static final public Statement StatementNoBreak() throws ParseException {
final Statement statement;
Token token = null;
- if (jj_2_6(2)) {
- statement = Expression();
- try {
- jj_consume_token(SEMICOLON);
- } catch (ParseException e) {
- if (e.currentToken.next.kind != 4) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
- errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
- }
- }
- {if (true) return statement;}
- } else if (jj_2_7(2)) {
- statement = LabeledStatement();
- {if (true) return statement;}
+ if (jj_2_4(2)) {
+ statement = expressionStatement();
+ {if (true) return statement;}
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case IDENTIFIER:
+ statement = LabeledStatement();
+ {if (true) return statement;}
+ break;
case LBRACE:
statement = Block();
- {if (true) return statement;}
+ {if (true) return statement;}
break;
case SEMICOLON:
statement = EmptyStatement();
- {if (true) return statement;}
- break;
- case ARRAY:
- case NEW:
- case DOLLAR:
- case INCR:
- case DECR:
- case IDENTIFIER:
- case DOLLAR_ID:
- statement = StatementExpression();
- try {
- jj_consume_token(SEMICOLON);
- } catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
- errorLevel = ERROR;
- errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = SimpleCharStream.getPosition() + 1;
- {if (true) throw e;}
- }
- {if (true) return statement;}
+ {if (true) return statement;}
break;
case SWITCH:
statement = SwitchStatement();
@@ -2561,12 +2942,13 @@ final ArrayList list = new ArrayList();
token = jj_consume_token(AT);
break;
default:
- jj_la1[71] = jj_gen;
+ jj_la1[76] = jj_gen;
;
}
statement = IncludeStatement();
if (token != null) {
((InclusionStatement)statement).silent = true;
+ statement.sourceStart = token.sourceStart;
}
{if (true) return statement;}
break;
@@ -2578,8 +2960,12 @@ final ArrayList list = new ArrayList();
statement = GlobalStatement();
{if (true) return statement;}
break;
+ case DEFINE:
+ statement = defineStatement();
+ currentSegment.add((Outlineable)statement);{if (true) return statement;}
+ break;
default:
- jj_la1[72] = jj_gen;
+ jj_la1[77] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2588,6 +2974,98 @@ final ArrayList list = new ArrayList();
}
/**
+ * A statement expression.
+ * expression ;
+ * @return an expression
+ */
+ static final public Statement expressionStatement() throws ParseException {
+ final Statement statement;
+ final Token token;
+ statement = Expression();
+ try {
+ token = jj_consume_token(SEMICOLON);
+ statement.sourceEnd = token.sourceEnd;
+ } catch (ParseException e) {
+ if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+ errorLevel = ERROR;
+ errorStart = statement.sourceEnd+1;
+ errorEnd = statement.sourceEnd+1;
+ processParseExceptionDebug(e);
+ }
+ }
+ {if (true) return statement;}
+ throw new Error("Missing return statement in function");
+ }
+
+ static final public Define defineStatement() throws ParseException {
+ Expression defineName,defineValue;
+ final Token defineToken;
+ Token token;
+ int pos;
+ defineToken = jj_consume_token(DEFINE);
+ pos = defineToken.sourceEnd+1;
+ try {
+ token = jj_consume_token(LPAREN);
+ pos = token.sourceEnd+1;
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
+ errorLevel = ERROR;
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ }
+ try {
+ defineName = Expression();
+ pos = defineName.sourceEnd+1;
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+ errorLevel = ERROR;
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ defineName = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
+ }
+ try {
+ token = jj_consume_token(COMMA);
+ pos = defineName.sourceEnd+1;
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
+ errorLevel = ERROR;
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ }
+ try {
+ defineValue = Expression();
+ pos = defineValue.sourceEnd+1;
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+ errorLevel = ERROR;
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ defineValue = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
+ }
+ try {
+ token = jj_consume_token(RPAREN);
+ pos = token.sourceEnd+1;
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
+ errorLevel = ERROR;
+ errorStart = pos;
+ errorEnd = pos;
+ processParseExceptionDebug(e);
+ }
+ {if (true) return new Define(currentSegment,
+ defineName,
+ defineValue,
+ defineToken.sourceStart,
+ pos);}
+ throw new Error("Missing return statement in function");
+ }
+
+/**
* A Normal statement.
*/
static final public Statement Statement() throws ParseException {
@@ -2603,6 +3081,7 @@ final ArrayList list = new ArrayList();
case INCLUDE_ONCE:
case REQUIRE_ONCE:
case GLOBAL:
+ case DEFINE:
case STATIC:
case CONTINUE:
case DO:
@@ -2616,21 +3095,22 @@ final ArrayList list = new ArrayList();
case WHILE:
case FOREACH:
case AT:
- case DOLLAR:
case BANG:
- case INCR:
- case DECR:
+ case TILDE:
+ case PLUS_PLUS:
+ case MINUS_MINUS:
case PLUS:
case MINUS:
case BIT_AND:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
+ case DOUBLEQUOTE:
+ case DOLLAR:
case IDENTIFIER:
case LPAREN:
case LBRACE:
case SEMICOLON:
- case DOLLAR_ID:
statement = StatementNoBreak();
{if (true) return statement;}
break;
@@ -2639,7 +3119,7 @@ final ArrayList list = new ArrayList();
{if (true) return statement;}
break;
default:
- jj_la1[73] = jj_gen;
+ jj_la1[78] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2651,9 +3131,11 @@ final ArrayList list = new ArrayList();
*/
static final public HTMLBlock htmlBlock() throws ParseException {
final int startIndex = nodePtr;
- AstNode[] blockNodes;
- int nbNodes;
- jj_consume_token(PHPEND);
+ final AstNode[] blockNodes;
+ final int nbNodes;
+ final Token phpEnd;
+ phpEnd = jj_consume_token(PHPEND);
+ htmlStart = phpEnd.sourceEnd;
label_22:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2661,7 +3143,7 @@ final ArrayList list = new ArrayList();
;
break;
default:
- jj_la1[74] = jj_gen;
+ jj_la1[79] = jj_gen;
break label_22;
}
phpEchoBlock();
@@ -2675,21 +3157,26 @@ final ArrayList list = new ArrayList();
jj_consume_token(PHPSTARTSHORT);
break;
default:
- jj_la1[75] = jj_gen;
+ jj_la1[80] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
+ PHPParser.createNewHTMLCode();
} catch (ParseException e) {
- errorMessage = "End of file unexpected, '= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 123; i++) {
+ for (int i = 0; i < 128; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1< jj_gen) {
@@ -6853,9 +7609,6 @@ final int startBlock, endBlock;
case 2: jj_3_3(); break;
case 3: jj_3_4(); break;
case 4: jj_3_5(); break;
- case 5: jj_3_6(); break;
- case 6: jj_3_7(); break;
- case 7: jj_3_8(); break;
}
}
p = p.next;
@@ -6880,4 +7633,5 @@ final int startBlock, endBlock;
JJCalls next;
}
+
}