CHOICE_AMBIGUITY_CHECK = 2;
OTHER_AMBIGUITY_CHECK = 1;
STATIC = true;
- DEBUG_PARSER = false;
+ DEBUG_PARSER = true;
DEBUG_LOOKAHEAD = false;
DEBUG_TOKEN_MANAGER = false;
OPTIMIZE_TOKEN_MANAGER = false;
import org.eclipse.jface.preference.IPreferenceStore;
import java.util.Hashtable;
-import java.util.Enumeration;
import java.util.ArrayList;
import java.io.StringReader;
import java.io.*;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
import net.sourceforge.phpdt.internal.compiler.ast.*;
import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
+import net.sourceforge.phpdt.internal.compiler.parser.Outlineable;
import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
+import net.sourceforge.phpdt.internal.corext.Assert;
/**
* A new php parser.
*/
public final class PHPParser extends PHPParserSuperclass {
- /** The file that is parsed. */
- private static IFile fileToParse;
-
/** The current segment. */
private static OutlineableWithChildren currentSegment;
private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
static PHPOutlineInfo outlineInfo;
- public static MethodDeclaration currentFunction;
- 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 */
private static int errorStart = -1;
private static int errorEnd = -1;
private static PHPDocument phpDocument;
+
+ private static final char[] SYNTAX_ERROR_CHAR = {'s','y','n','t','a','x',' ','e','r','r','o','r'};
/**
* The point where html starts.
* It will be used by the token manager to create HTMLCode objects
private static AstNode[] nodes;
/** The cursor in expression stack. */
private static int nodePtr;
- private static VariableDeclaration[] variableDeclarationStack;
- private static int variableDeclarationPtr;
- private static Statement[] statementStack;
- private static int statementPtr;
- private static ElseIf[] elseIfStack;
- private static int elseIfPtr;
+
+ private static final boolean PARSER_DEBUG = true;
public final void setFileToParse(final IFile fileToParse) {
- this.fileToParse = fileToParse;
+ PHPParser.fileToParse = fileToParse;
}
public PHPParser() {
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();
}
/**
*/
private static final void init() {
nodes = new AstNode[AstStackIncrement];
- statementStack = new Statement[AstStackIncrement];
- elseIfStack = new ElseIf[AstStackIncrement];
nodePtr = -1;
- statementPtr = -1;
- elseIfPtr = -1;
htmlStart = 0;
}
* 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;
}
}
- private static final void pushOnVariableDeclarationStack(VariableDeclaration var) {
- try {
- variableDeclarationStack[++variableDeclarationPtr] = var;
- } catch (IndexOutOfBoundsException e) {
- int oldStackLength = variableDeclarationStack.length;
- VariableDeclaration[] oldStack = variableDeclarationStack;
- variableDeclarationStack = new VariableDeclaration[oldStackLength + AstStackIncrement];
- System.arraycopy(oldStack, 0, variableDeclarationStack, 0, oldStackLength);
- variableDeclarationPtr = oldStackLength;
- variableDeclarationStack[variableDeclarationPtr] = var;
- }
- }
-
- private static final void pushOnStatementStack(Statement statement) {
- try {
- statementStack[++statementPtr] = statement;
- } catch (IndexOutOfBoundsException e) {
- int oldStackLength = statementStack.length;
- Statement[] oldStack = statementStack;
- statementStack = new Statement[oldStackLength + AstStackIncrement];
- System.arraycopy(oldStack, 0, statementStack, 0, oldStackLength);
- statementPtr = oldStackLength;
- statementStack[statementPtr] = statement;
- }
- }
-
- private static final void pushOnElseIfStack(ElseIf elseIf) {
- try {
- elseIfStack[++elseIfPtr] = elseIf;
- } catch (IndexOutOfBoundsException e) {
- int oldStackLength = elseIfStack.length;
- ElseIf[] oldStack = elseIfStack;
- elseIfStack = new ElseIf[oldStackLength + AstStackIncrement];
- System.arraycopy(oldStack, 0, elseIfStack, 0, oldStackLength);
- elseIfPtr = oldStackLength;
- elseIfStack[elseIfPtr] = elseIf;
- }
- }
-
- public static final void phpParserTester(final String strEval) throws CoreException, ParseException {
- PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
- final StringReader stream = new StringReader(strEval);
- if (jj_input_stream == null) {
- jj_input_stream = new SimpleCharStream(stream, 1, 1);
- }
- ReInit(new StringReader(strEval));
- init();
- phpTest();
- }
-
- public static final void htmlParserTester(final File fileName) throws CoreException, ParseException {
- try {
- final Reader stream = new FileReader(fileName);
- if (jj_input_stream == null) {
- jj_input_stream = new SimpleCharStream(stream, 1, 1);
- }
- ReInit(stream);
- init();
- phpFile();
- } catch (FileNotFoundException e) {
- e.printStackTrace(); //To change body of catch statement use Options | File Templates.
- }
- }
-
- public static final void htmlParserTester(final String strEval) throws CoreException, ParseException {
- final StringReader stream = new StringReader(strEval);
- if (jj_input_stream == null) {
- jj_input_stream = new SimpleCharStream(stream, 1, 1);
- }
- ReInit(stream);
- init();
- phpFile();
- }
-
public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
- currentSegment = new PHPDocument(parent);
- outlineInfo = new PHPOutlineInfo(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) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
init();
try {
parse();
- phpDocument = new PHPDocument(null);
- phpDocument.nodes = nodes;
- PHPeclipsePlugin.log(1,phpDocument.toString());
+ 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);
}
return outlineInfo;
}
+ 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
if (errorMessage == null) {
PHPeclipsePlugin.log(e);
errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it";
- errorStart = jj_input_stream.getPosition();
+ errorStart = SimpleCharStream.getPosition();
errorEnd = errorStart + 1;
}
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) {
if (errorStart == -1) {
setMarker(fileToParse,
errorMessage,
- jj_input_stream.tokenBegin,
- jj_input_stream.tokenBegin + e.currentToken.image.length(),
+ SimpleCharStream.tokenBegin,
+ SimpleCharStream.tokenBegin + e.currentToken.image.length(),
errorLevel,
"Line " + e.currentToken.beginLine);
} else {
}
}
- /**
- * 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("<br />", 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("<br>", 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 <b>");
+ final int onLine = current.indexOf("on line <b>");
if (onLine != -1) {
lineNumberBuffer.delete(0, lineNumberBuffer.length());
for (int i = onLine; i < current.length(); i++) {
}
}
- 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("<b>", "");
}
}
- 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);
*/
public static final void createNewHTMLCode() {
final int currentPosition = SimpleCharStream.getPosition();
- if (currentPosition == htmlStart) {
+ if (currentPosition == htmlStart || currentPosition > SimpleCharStream.currentBuffer.length()) {
return;
}
- final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition).toCharArray();
+ final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray();
pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
}
+ /** Create a new task. */
+ public static final void createNewTask() {
+ final int currentPosition = SimpleCharStream.getPosition();
+ final String todo = SimpleCharStream.currentBuffer.substring(currentPosition-3,
+ SimpleCharStream.currentBuffer.indexOf("\n",
+ currentPosition)-1);
+ PHPeclipsePlugin.log(1,SimpleCharStream.currentBuffer.toString());
+ try {
+ setMarker(fileToParse,
+ todo,
+ SimpleCharStream.getBeginLine(),
+ TASK,
+ "Line "+SimpleCharStream.getBeginLine());
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
+ }
+
private static final void parse() throws ParseException {
phpFile();
}
<PHPPARSING> SPECIAL_TOKEN :
{
"//" : IN_SINGLE_LINE_COMMENT
-|
- "#" : IN_SINGLE_LINE_COMMENT
-|
- <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT
-|
- "/*" : IN_MULTI_LINE_COMMENT
+| "#" : IN_SINGLE_LINE_COMMENT
+| <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT
+| "/*" : IN_MULTI_LINE_COMMENT
}
<IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
{
<SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : PHPPARSING
+| "?>" : DEFAULT
}
-<IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
+<IN_SINGLE_LINE_COMMENT,IN_FORMAL_COMMENT,IN_MULTI_LINE_COMMENT> SPECIAL_TOKEN :
{
- <SINGLE_LINE_COMMENT_PHPEND : "?>" > : DEFAULT
+ "todo" {PHPParser.createNewTask();}
}
-<IN_FORMAL_COMMENT>
-SPECIAL_TOKEN :
+<IN_FORMAL_COMMENT> SPECIAL_TOKEN :
{
- <FORMAL_COMMENT: "*/" > : PHPPARSING
+ "*/" : PHPPARSING
}
-<IN_MULTI_LINE_COMMENT>
-SPECIAL_TOKEN :
+<IN_MULTI_LINE_COMMENT> SPECIAL_TOKEN :
{
- <MULTI_LINE_COMMENT: "*/" > : PHPPARSING
+ "*/" : PHPPARSING
}
<IN_SINGLE_LINE_COMMENT,IN_FORMAL_COMMENT,IN_MULTI_LINE_COMMENT>
| <INCLUDE_ONCE : "include_once">
| <REQUIRE_ONCE : "require_once">
| <GLOBAL : "global">
+| <DEFINE : "define">
| <STATIC : "static">
| <CLASSACCESS : "->">
| <STATICCLASSACCESS : "::">
{
<OR_OR : "||">
| <AND_AND : "&&">
-| <INCR : "++">
-| <DECR : "--">
+| <PLUS_PLUS : "++">
+| <MINUS_MINUS : "--">
| <PLUS : "+">
| <MINUS : "-">
| <STAR : "*">
<#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
|
<STRING_LITERAL: (<STRING_1> | <STRING_2> | <STRING_3>)>
-| <STRING_1:
- "\""
- (
- ~["\"","{","}"]
- | "\\\""
- | "\\"
- | "{" ~["\""] "}"
- )*
- "\""
- >
-| <STRING_2:
- "'"
- (
- ~["'"]
- | "\\'"
- )*
-
- "'"
- >
-| <STRING_3:
- "`"
- (
- ~["`"]
- | "\\`"
- )*
- "`"
- >
+| <STRING_1: "\"" ( ~["\"","\\"] | "\\" ~[] )* "\"">
+| <STRING_2: "'" ( ~["'","\\"] | "\\" ~[] )* "'">
+| <STRING_3: "`" ( ~["`","\\"] | "\\" ~[] )* "`">
}
/* IDENTIFIERS */
<PHPPARSING> TOKEN :
{
- < IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
+ <IDENTIFIER: (<LETTER>|<SPECIAL>) (<LETTER>|<DIGIT>|<SPECIAL>)* >
|
< #LETTER:
["a"-"z"] | ["A"-"Z"]
<PHPPARSING> TOKEN :
{
- < DOLLAR_ID: <DOLLAR> <IDENTIFIER> >
+ <DOLLAR_ID: <DOLLAR> <IDENTIFIER>>
}
void phpTest() :
{
Php()
<EOF>
- {PHPParser.createNewHTMLCode();}
}
void phpFile() :
{
try {
(PhpBlock())*
- <EOF>
+ {PHPParser.createNewHTMLCode();}
} catch (TokenMgrError e) {
PHPeclipsePlugin.log(e);
errorStart = SimpleCharStream.getPosition();
*/
void PhpBlock() :
{
- final int start = jj_input_stream.getPosition();
+ final int start = SimpleCharStream.getPosition();
+ final PHPEchoBlock phpEchoBlock;
}
{
- phpEchoBlock()
+ phpEchoBlock = phpEchoBlock()
+ {pushOnAstNodes(phpEchoBlock);}
|
- [ <PHPSTARTLONG>
+ [ <PHPSTARTLONG>
| <PHPSTARTSHORT>
{try {
setMarker(fileToParse,
"You should use '<?php' instead of '<?' it will avoid some problems with XML",
start,
- jj_input_stream.getPosition(),
+ SimpleCharStream.getPosition(),
INFO,
"Line " + token.beginLine);
} catch (CoreException e) {
} catch (ParseException e) {
errorMessage = "'?>' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
}
{
final Expression expr;
final int pos = SimpleCharStream.getPosition();
- PHPEchoBlock echoBlock;
+ final PHPEchoBlock echoBlock;
}
{
<PHPECHOSTART> expr = Expression() [ <SEMICOLON> ] <PHPEND>
ClassDeclaration ClassDeclaration() :
{
final ClassDeclaration classDeclaration;
- final Token className;
- Token superclassName = null;
+ final Token className,superclassName;
final int pos;
+ char[] classNameImage = SYNTAX_ERROR_CHAR;
+ char[] superclassNameImage = null;
}
{
<CLASS>
+ {pos = SimpleCharStream.getPosition();}
try {
- {pos = jj_input_stream.getPosition();}
className = <IDENTIFIER>
+ {classNameImage = className.image.toCharArray();}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
[
<EXTENDS>
try {
superclassName = <IDENTIFIER>
+ {superclassNameImage = superclassName.image.toCharArray();}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
+ superclassNameImage = SYNTAX_ERROR_CHAR;
}
]
{
- if (superclassName == null) {
+ if (superclassNameImage == null) {
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
+ classNameImage,
pos,
0);
} else {
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
- superclassName.image.toCharArray(),
+ classNameImage,
+ superclassNameImage,
pos,
0);
}
}
ClassBody(classDeclaration)
{currentSegment = (OutlineableWithChildren) currentSegment.getParent();
- classDeclaration.sourceEnd = SimpleCharStream.getPosition();
+ classDeclaration.setSourceEnd(SimpleCharStream.getPosition());
pushOnAstNodes(classDeclaration);
return classDeclaration;}
}
-void ClassBody(ClassDeclaration classDeclaration) :
+void ClassBody(final ClassDeclaration classDeclaration) :
{}
{
try {
<LBRACE>
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
( ClassBodyDeclaration(classDeclaration) )*
try {
<RBRACE>
} 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 = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
}
/**
* A class can contain only methods and fields.
*/
-void ClassBodyDeclaration(ClassDeclaration classDeclaration) :
+void ClassBodyDeclaration(final ClassDeclaration classDeclaration) :
{
- MethodDeclaration method;
- FieldDeclaration field;
+ final MethodDeclaration method;
+ final FieldDeclaration field;
}
{
- method = MethodDeclaration() {classDeclaration.addMethod(method);}
-| field = FieldDeclaration() {classDeclaration.addVariable(field);}
+ method = MethodDeclaration() {method.analyzeCode();
+ classDeclaration.addMethod(method);}
+| field = FieldDeclaration() {classDeclaration.addField(field);}
}
/**
* A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
+ * it is only used by ClassBodyDeclaration()
*/
FieldDeclaration FieldDeclaration() :
{
VariableDeclaration variableDeclaration;
- VariableDeclaration[] list;
+ final VariableDeclaration[] list;
final ArrayList arrayList = new ArrayList();
final int pos = SimpleCharStream.getPosition();
}
{
- <VAR> variableDeclaration = VariableDeclarator()
+ <VAR> variableDeclaration = VariableDeclaratorNoSuffix()
{arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name));
- currentSegment.add(variableDeclaration);}
- ( <COMMA> variableDeclaration = VariableDeclarator()
+ outlineInfo.addVariable(new String(variableDeclaration.name()));}
+ (
+ <COMMA> variableDeclaration = VariableDeclaratorNoSuffix()
{arrayList.add(variableDeclaration);
- outlineInfo.addVariable(new String(variableDeclaration.name));
- currentSegment.add(variableDeclaration);}
+ outlineInfo.addVariable(new String(variableDeclaration.name()));}
)*
try {
<SEMICOLON>
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
{list = new VariableDeclaration[arrayList.size()];
arrayList.toArray(list);
return new FieldDeclaration(list,
pos,
- SimpleCharStream.getPosition());}
+ SimpleCharStream.getPosition(),
+ currentSegment);}
+}
+
+/**
+ * a strict variable declarator : there cannot be a suffix here.
+ * It will be used by fields and formal parameters
+ */
+VariableDeclaration VariableDeclaratorNoSuffix() :
+{
+ final Token varName;
+ Expression initializer = null;
+}
+{
+ varName = <DOLLAR_ID>
+ {final int pos = SimpleCharStream.getPosition()-varName.image.length();}
+ [
+ <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;
+ processParseExceptionDebug(e);
+ }
+ ]
+ {
+ if (initializer == null) {
+ return new VariableDeclaration(currentSegment,
+ new Variable(varName.image.substring(1),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
+ pos,
+ SimpleCharStream.getPosition());
+ }
+ return new VariableDeclaration(currentSegment,
+ new Variable(varName.image.substring(1),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()),
+ initializer,
+ VariableDeclaration.EQUAL,
+ pos);
+ }
}
+/**
+ * this will be used by static statement
+ */
VariableDeclaration VariableDeclarator() :
{
- final String varName, varValue;
+ final AbstractVariable variable;
Expression initializer = null;
- final int pos = jj_input_stream.getPosition();
+ final int pos = SimpleCharStream.getPosition();
}
{
- varName = VariableDeclaratorId()
+ variable = VariableDeclaratorId()
[
<ASSIGN>
try {
} catch (ParseException e) {
errorMessage = "Literal expression expected in variable initializer";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
]
{
if (initializer == null) {
return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- pos,
- jj_input_stream.getPosition());
+ variable,
+ pos,
+ SimpleCharStream.getPosition());
}
return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- initializer,
- pos);
+ variable,
+ initializer,
+ VariableDeclaration.EQUAL,
+ pos);
}
}
* A Variable name.
* @return the variable name (with suffix)
*/
-String VariableDeclaratorId() :
+AbstractVariable VariableDeclaratorId() :
{
- String expr;
- Expression expression;
- final StringBuffer buff = new StringBuffer();
+ final Variable var;
+ AbstractVariable expression = null;
final int pos = SimpleCharStream.getPosition();
- ConstantIdentifier ex;
}
{
try {
- expr = Variable() {buff.append(expr);}
- ( LOOKAHEAD(2)
- {ex = new ConstantIdentifier(expr.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
- expression = VariableSuffix(ex)
- {buff.append(expression.toStringExpression());}
+ var = Variable()
+ (
+ LOOKAHEAD(2)
+ expression = VariableSuffix(var)
)*
- {return buff.toString();}
+ {
+ if (expression == null) {
+ return var;
+ }
+ return expression;
+ }
} catch (ParseException e) {
errorMessage = "'$' expected for variable identifier";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
-String Variable():
+/**
+ * Return a variablename without the $.
+ * @return a variable name
+ */
+Variable Variable():
{
final StringBuffer buff;
Expression expression = null;
final Token token;
- final String expr;
+ Variable expr;
+ final int pos;
}
{
- token = <DOLLAR_ID> [<LBRACE> expression = Expression() <RBRACE>]
+ token = <DOLLAR_ID> {pos = SimpleCharStream.getPosition()-token.image.length();}
+ [<LBRACE> expression = Expression() <RBRACE>]
{
- if (expression == null && !assigning) {
- return token.image.substring(1);
+ if (expression == null) {
+ return new Variable(token.image.substring(1),pos,SimpleCharStream.getPosition());
}
- buff = new StringBuffer(token.image);
- buff.append('{');
- buff.append(expression.toStringExpression());
- buff.append('}');
- return buff.toString();
+ String s = expression.toStringExpression();
+ buff = new StringBuffer(token.image.length()+s.length()+2);
+ buff.append(token.image);
+ buff.append("{");
+ buff.append(s);
+ buff.append("}");
+ s = buff.toString();
+ return new Variable(s,pos,SimpleCharStream.getPosition());
}
|
- <DOLLAR> expr = VariableName()
- {return expr;}
+ <DOLLAR> {pos = SimpleCharStream.getPosition()-1;}
+ expr = VariableName()
+ {return new Variable(expr,pos,SimpleCharStream.getPosition());}
}
-String VariableName():
+/**
+ * A Variable name (without the $)
+ * @return a variable name String
+ */
+Variable VariableName():
{
final StringBuffer buff;
- String expr = null;
+ String expr;
+ final Variable var;
Expression expression = null;
final Token token;
+ int pos;
}
{
- <LBRACE> expression = Expression() <RBRACE>
- {buff = new StringBuffer('{');
- buff.append(expression.toStringExpression());
- buff.append('}');
- return buff.toString();}
+ <LBRACE>
+ {pos = SimpleCharStream.getPosition()-1;}
+ expression = Expression() <RBRACE>
+ {expr = expression.toStringExpression();
+ buff = new StringBuffer(expr.length()+2);
+ buff.append("{");
+ buff.append(expr);
+ buff.append("}");
+ pos = SimpleCharStream.getPosition();
+ expr = buff.toString();
+ return new Variable(expr,
+ pos,
+ SimpleCharStream.getPosition());
+
+ }
|
- token = <IDENTIFIER> [<LBRACE> expression = Expression() <RBRACE>]
+ token = <IDENTIFIER>
+ {pos = SimpleCharStream.getPosition() - token.image.length();}
+ [<LBRACE> expression = Expression() <RBRACE>]
{
if (expression == null) {
- return token.image;
+ return new Variable(token.image,
+ pos,
+ SimpleCharStream.getPosition());
}
- buff = new StringBuffer(token.image);
- buff.append('{');
- buff.append(expression.toStringExpression());
- buff.append('}');
- return buff.toString();
+ expr = expression.toStringExpression();
+ buff = new StringBuffer(token.image.length()+expr.length()+2);
+ buff.append(token.image);
+ buff.append("{");
+ buff.append(expr);
+ buff.append("}");
+ expr = buff.toString();
+ return new Variable(expr,
+ pos,
+ SimpleCharStream.getPosition());
}
|
- <DOLLAR> expr = VariableName()
+ <DOLLAR> {pos = SimpleCharStream.getPosition() - 1;}
+ var = VariableName()
{
- buff = new StringBuffer('$');
- buff.append(expr);
- return buff.toString();
+ return new Variable(var,
+ pos,
+ SimpleCharStream.getPosition());
}
|
- token = <DOLLAR_ID> {return token.image;}
+ token = <DOLLAR_ID>
+ {
+ pos = SimpleCharStream.getPosition();
+ return new Variable(token.image,
+ pos-token.image.length(),
+ pos);
+ }
}
Expression VariableInitializer() :
ArrayVariableDeclaration ArrayVariable() :
{
-Expression expr,expr2;
+final Expression expr,expr2;
}
{
expr = Expression()
- [<ARRAYASSIGN> expr2 = Expression()
- {return new ArrayVariableDeclaration(expr,expr2);}
+ [
+ <ARRAYASSIGN> expr2 = Expression()
+ {return new ArrayVariableDeclaration(expr,expr2);}
]
{return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
}
final ArrayList list = new ArrayList();
}
{
- <LPAREN> [ expr = ArrayVariable()
- {list.add(expr);}
- ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
- {list.add(expr);}
- )*
- ]
- [<COMMA> {list.add(null);}]
+ <LPAREN>
+ [
+ expr = ArrayVariable()
+ {list.add(expr);}
+ ( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
+ {list.add(expr);}
+ )*
+ ]
+ [
+ <COMMA> {list.add(null);}
+ ]
<RPAREN>
{
- ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
+ final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
list.toArray(vars);
return vars;}
}
MethodDeclaration MethodDeclaration() :
{
final MethodDeclaration functionDeclaration;
- Token functionToken;
final Block block;
+ final OutlineableWithChildren seg = currentSegment;
}
{
- functionToken = <FUNCTION>
+ <FUNCTION>
try {
functionDeclaration = MethodDeclarator()
{outlineInfo.addVariable(new String(functionDeclaration.name));}
if (errorMessage != null) throw e;
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
- {
- if (currentSegment != null) {
- currentSegment.add(functionDeclaration);
- currentSegment = functionDeclaration;
- }
- currentFunction = functionDeclaration;
- }
+ {currentSegment = functionDeclaration;}
block = Block()
- {
- functionDeclaration.statements = block.statements;
- currentFunction = null;
- if (currentSegment != null) {
- currentSegment = (OutlineableWithChildren) currentSegment.getParent();
- }
- return functionDeclaration;
- }
+ {functionDeclaration.statements = block.statements;
+ currentSegment = seg;
+ return functionDeclaration;}
}
/**
Token reference = null;
final Hashtable formalParameters;
final int pos = SimpleCharStream.getPosition();
+ char[] identifierChar = SYNTAX_ERROR_CHAR;
}
{
- [reference = <BIT_AND>] identifier = <IDENTIFIER>
+ [reference = <BIT_AND>]
+ try {
+ identifier = <IDENTIFIER>
+ {identifierChar = identifier.image.toCharArray();}
+ } catch (ParseException 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;
+ processParseExceptionDebug(e);
+ }
formalParameters = FormalParameters()
- {return new MethodDeclaration(currentSegment,
- identifier.image.toCharArray(),
- formalParameters,
- reference != null,
- pos,
- SimpleCharStream.getPosition());}
+ {MethodDeclaration method = new MethodDeclaration(currentSegment,
+ identifierChar,
+ formalParameters,
+ reference != null,
+ pos,
+ SimpleCharStream.getPosition());
+ return method;}
}
/**
*/
Hashtable FormalParameters() :
{
- String expr;
- final StringBuffer buff = new StringBuffer("(");
VariableDeclaration var;
final Hashtable parameters = new Hashtable();
}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
- [ var = FormalParameter()
- {parameters.put(new String(var.name),var);}
- (
- <COMMA> var = FormalParameter()
- {parameters.put(new String(var.name),var);}
- )*
- ]
+ [
+ var = FormalParameter()
+ {parameters.put(new String(var.name()),var);}
+ (
+ <COMMA> var = FormalParameter()
+ {parameters.put(new String(var.name()),var);}
+ )*
+ ]
try {
<RPAREN>
} catch (ParseException e) {
errorMessage = "')' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
{return parameters;}
}
Token token = null;
}
{
- [token = <BIT_AND>] variableDeclaration = VariableDeclarator()
+ [token = <BIT_AND>] variableDeclaration = VariableDeclaratorNoSuffix()
{
if (token != null) {
variableDeclaration.setReference(true);
{final int pos;}
{
<STRING> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.STRING,
- pos,pos-6);}
+ return new ConstantIdentifier(Types.STRING,pos,pos-6);}
| <BOOL> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.BOOL,
- pos,pos-4);}
+ return new ConstantIdentifier(Types.BOOL,pos,pos-4);}
| <BOOLEAN> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.BOOLEAN,
- pos,pos-7);}
+ return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);}
| <REAL> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.REAL,
- pos,pos-4);}
+ return new ConstantIdentifier(Types.REAL,pos,pos-4);}
| <DOUBLE> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.DOUBLE,
- pos,pos-5);}
+ return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);}
| <FLOAT> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.FLOAT,
- pos,pos-5);}
+ return new ConstantIdentifier(Types.FLOAT,pos,pos-5);}
| <INT> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.INT,
- pos,pos-3);}
+ return new ConstantIdentifier(Types.INT,pos,pos-3);}
| <INTEGER> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.INTEGER,
- pos,pos-7);}
+ return new ConstantIdentifier(Types.INTEGER,pos,pos-7);}
| <OBJECT> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.OBJECT,
- pos,pos-6);}
+ return new ConstantIdentifier(Types.OBJECT,pos,pos-6);}
}
Expression Expression() :
{
final Expression expr;
-}
-{
- expr = PrintExpression() {return expr;}
-| expr = ListExpression() {return expr;}
-| LOOKAHEAD(varAssignation())
- expr = varAssignation() {return expr;}
-| expr = ConditionalExpression() {return expr;}
-}
-
-/**
- * A Variable assignation.
- * varName (an assign operator) any expression
- */
-VarAssignation varAssignation() :
-{
- String varName;
- final Expression expression;
- final int assignOperator;
+ Expression initializer = null;
final int pos = SimpleCharStream.getPosition();
+ int assignOperator = -1;
}
{
- varName = VariableDeclaratorId()
- assignOperator = AssignmentOperator()
+ LOOKAHEAD(1)
+ expr = ConditionalExpression()
+ [
+ assignOperator = AssignmentOperator()
try {
- expression = Expression()
+ initializer = Expression()
} catch (ParseException e) {
if (errorMessage != null) {
throw e;
}
- errorMessage = "expression expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorEnd = SimpleCharStream.getPosition();
throw e;
}
- {return new VarAssignation(varName.toCharArray(),
- expression,
- assignOperator,
- pos,
- SimpleCharStream.getPosition());}
+ ]
+ {
+ if (assignOperator != -1) {// todo : change this, very very bad :(
+ if (expr instanceof AbstractVariable) {
+ return new VariableDeclaration(currentSegment,
+ (AbstractVariable) expr,
+ pos,
+ SimpleCharStream.getPosition());
+ }
+ String varName = expr.toStringExpression().substring(1);
+ return new VariableDeclaration(currentSegment,
+ new Variable(varName,SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()),
+ pos,
+ SimpleCharStream.getPosition());
+ }
+ return expr;
+ }
+| expr = ExpressionWBang() {return expr;}
}
+Expression ExpressionWBang() :
+{
+ final Expression expr;
+ final int pos = SimpleCharStream.getPosition();
+}
+{
+ <BANG> expr = ExpressionWBang() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+| expr = ExpressionNoBang() {return expr;}
+}
+
+Expression ExpressionNoBang() :
+{
+ Expression expr;
+}
+{
+ expr = ListExpression() {return expr;}
+|
+ expr = PrintExpression() {return expr;}
+}
+
+/**
+ * Any assignement operator.
+ * @return the assignement operator id
+ */
int AssignmentOperator() :
{}
{
- <ASSIGN> {return VarAssignation.EQUAL;}
-| <STARASSIGN> {return VarAssignation.STAR_EQUAL;}
-| <SLASHASSIGN> {return VarAssignation.SLASH_EQUAL;}
-| <REMASSIGN> {return VarAssignation.REM_EQUAL;}
-| <PLUSASSIGN> {return VarAssignation.PLUS_EQUAL;}
-| <MINUSASSIGN> {return VarAssignation.MINUS_EQUAL;}
-| <LSHIFTASSIGN> {return VarAssignation.LSHIFT_EQUAL;}
-| <RSIGNEDSHIFTASSIGN> {return VarAssignation.RSIGNEDSHIFT_EQUAL;}
-| <ANDASSIGN> {return VarAssignation.AND_EQUAL;}
-| <XORASSIGN> {return VarAssignation.XOR_EQUAL;}
-| <ORASSIGN> {return VarAssignation.OR_EQUAL;}
-| <DOTASSIGN> {return VarAssignation.DOT_EQUAL;}
-| <TILDEEQUAL> {return VarAssignation.TILDE_EQUAL;}
+ <ASSIGN> {return VariableDeclaration.EQUAL;}
+| <STARASSIGN> {return VariableDeclaration.STAR_EQUAL;}
+| <SLASHASSIGN> {return VariableDeclaration.SLASH_EQUAL;}
+| <REMASSIGN> {return VariableDeclaration.REM_EQUAL;}
+| <PLUSASSIGN> {return VariableDeclaration.PLUS_EQUAL;}
+| <MINUSASSIGN> {return VariableDeclaration.MINUS_EQUAL;}
+| <LSHIFTASSIGN> {return VariableDeclaration.LSHIFT_EQUAL;}
+| <RSIGNEDSHIFTASSIGN> {return VariableDeclaration.RSIGNEDSHIFT_EQUAL;}
+| <ANDASSIGN> {return VariableDeclaration.AND_EQUAL;}
+| <XORASSIGN> {return VariableDeclaration.XOR_EQUAL;}
+| <ORASSIGN> {return VariableDeclaration.OR_EQUAL;}
+| <DOTASSIGN> {return VariableDeclaration.DOT_EQUAL;}
+| <TILDEEQUAL> {return VariableDeclaration.TILDE_EQUAL;}
}
Expression ConditionalExpression() :
(
<OR_OR> {operator = OperatorIds.OR_OR;}
| <_ORL> {operator = OperatorIds.ORL;}
- ) expr2 = ConditionalAndExpression()
+ )
+ expr2 = ConditionalAndExpression()
{
expr = new BinaryExpression(expr,expr2,operator);
}
{
expr = EqualityExpression()
(
+ LOOKAHEAD(1)
<BIT_AND> expr2 = EqualityExpression()
{expr = new BinaryExpression(expr,expr2,OperatorIds.AND);}
)*
}
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{
{
expr = MultiplicativeExpression()
(
- ( <PLUS> {operator = OperatorIds.PLUS;}
- | <MINUS> {operator = OperatorIds.MINUS;} )
+ LOOKAHEAD(1)
+ ( <PLUS> {operator = OperatorIds.PLUS;}
+ | <MINUS> {operator = OperatorIds.MINUS;}
+ )
expr2 = MultiplicativeExpression()
{expr = new BinaryExpression(expr,expr2,operator);}
)*
if (errorMessage != null) throw e;
errorMessage = "unexpected token '"+e.currentToken.next.image+"'";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
(
*/
Expression UnaryExpression() :
{
- Expression expr;
+ final Expression expr;
final int pos = SimpleCharStream.getPosition();
}
{
- <BIT_AND> expr = UnaryExpressionNoPrefix()
+ /* <BIT_AND> expr = UnaryExpressionNoPrefix() //why did I had that ?
{return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);}
-|
- expr = AtUnaryExpression() {return expr;}
+| */
+ expr = AtNotUnaryExpression() {return expr;}
}
-Expression AtUnaryExpression() :
+/**
+ * An expression prefixed (or not) by one or more @ and !.
+ * @return the expression
+ */
+Expression AtNotUnaryExpression() :
{
- Expression expr;
+ final Expression expr;
final int pos = SimpleCharStream.getPosition();
}
{
<AT>
- expr = AtUnaryExpression()
+ expr = AtNotUnaryExpression()
{return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);}
|
+ <BANG>
+ expr = AtNotUnaryExpression()
+ {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
+|
expr = UnaryExpressionNoPrefix()
{return expr;}
}
Expression UnaryExpressionNoPrefix() :
{
- Expression expr;
- int operator;
+ final Expression expr;
final int pos = SimpleCharStream.getPosition();
}
{
- ( <PLUS> {operator = OperatorIds.PLUS;}
- | <MINUS> {operator = OperatorIds.MINUS;})
- expr = UnaryExpression()
- {return new PrefixedUnaryExpression(expr,operator,pos);}
+ <PLUS> expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.PLUS,pos);}
+|
+ <MINUS> expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.MINUS,pos);}
|
expr = PreIncDecExpression()
{return expr;}
final int pos = SimpleCharStream.getPosition();
}
{
- ( <INCR> {operator = OperatorIds.PLUS_PLUS;}
- | <DECR> {operator = OperatorIds.MINUS_MINUS;})
- expr = PrimaryExpression()
+ (
+ <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
+ |
+ <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+ )
+ expr = PrimaryExpression()
{return new PrefixedUnaryExpression(expr,operator,pos);}
}
Expression UnaryExpressionNotPlusMinus() :
{
- Expression expr;
+ final Expression expr;
final int pos = SimpleCharStream.getPosition();
}
{
- <BANG> expr = UnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);}
-| LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
+ LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
expr = CastExpression() {return expr;}
| expr = PostfixExpression() {return expr;}
| expr = Literal() {return expr;}
} catch (ParseException e) {
errorMessage = "')' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{return expr;}
}
{
<LPAREN>
- (type = Type()
- | <ARRAY> {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());})
+ (
+ type = Type()
+ |
+ <ARRAY> {type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition());}
+ )
<RPAREN> expr = UnaryExpression()
{return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());}
}
Expression PostfixExpression() :
{
- Expression expr;
+ final Expression expr;
int operator = -1;
final int pos = SimpleCharStream.getPosition();
}
{
expr = PrimaryExpression()
- [ <INCR> {operator = OperatorIds.PLUS_PLUS;}
- | <DECR> {operator = OperatorIds.MINUS_MINUS;}]
+ [
+ <PLUS_PLUS> {operator = OperatorIds.PLUS_PLUS;}
+ |
+ <MINUS_MINUS> {operator = OperatorIds.MINUS_MINUS;}
+ ]
{
if (operator == -1) {
return expr;
Expression PrimaryExpression() :
{
+ Expression expr = null;
+ Expression expr2;
+ int assignOperator = -1;
final Token identifier;
- Expression expr;
- final StringBuffer buff = new StringBuffer();
- final int pos = SimpleCharStream.getPosition();
+ final String var;
+ final int pos;
}
{
- LOOKAHEAD(2)
- identifier = <IDENTIFIER> <STATICCLASSACCESS> expr = ClassIdentifier()
- {expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
- expr,
- ClassAccess.STATIC);}
- (expr = PrimarySuffix(expr))*
+ token = <IDENTIFIER>
+ {
+ pos = SimpleCharStream.getPosition();
+ expr = new ConstantIdentifier(token.image.toCharArray(),
+ pos-token.image.length(),
+ pos);
+ }
+ (
+ <STATICCLASSACCESS> expr2 = ClassIdentifier()
+ {expr = new ClassAccess(expr,
+ expr2,
+ ClassAccess.STATIC);}
+ )*
+ [ expr = Arguments(expr) ]
{return expr;}
|
- expr = PrimaryPrefix()
- (expr = PrimarySuffix(expr))*
+ expr = VariableDeclaratorId()
+ [ expr = Arguments(expr) ]
+ {return expr;}
+|
+ <NEW>
+ {pos = SimpleCharStream.getPosition();}
+ expr = ClassIdentifier()
+ {expr = new PrefixedUnaryExpression(expr,
+ OperatorIds.NEW,
+ pos-3);
+ }
+ [ expr = Arguments(expr) ]
{return expr;}
|
expr = ArrayDeclarator()
{return expr;}
}
+/**
+ * An array declarator.
+ * array(vars)
+ * @return an array
+ */
ArrayInitializer ArrayDeclarator() :
{
final ArrayVariableDeclaration[] vars;
{return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());}
}
-Expression PrimaryPrefix() :
-{
- final Expression expr;
- final Token token;
- final String var;
- final int pos = SimpleCharStream.getPosition();
-}
-{
- token = <IDENTIFIER> {return new ConstantIdentifier(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
-| <NEW> expr = ClassIdentifier() {return new PrefixedUnaryExpression(expr,
- OperatorIds.NEW,
- pos);}
-| var = VariableDeclaratorId() {return new ConstantIdentifier(var.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
-}
-
PrefixedUnaryExpression classInstantiation() :
{
Expression expr;
pos);}
}
-ConstantIdentifier ClassIdentifier():
+Expression ClassIdentifier():
{
- final String expr;
+ final Expression expr;
final Token token;
- final int pos = SimpleCharStream.getPosition();
-}
-{
- token = <IDENTIFIER> {return new ConstantIdentifier(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
-| expr = VariableDeclaratorId() {return new ConstantIdentifier(expr.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
+ final ConstantIdentifier type;
}
-
-AbstractSuffixExpression PrimarySuffix(Expression prefix) :
{
- final AbstractSuffixExpression expr;
-}
-{
- expr = Arguments(prefix) {return expr;}
-| expr = VariableSuffix(prefix) {return expr;}
+ token = <IDENTIFIER>
+ {final int pos = SimpleCharStream.getPosition();
+ return new ConstantIdentifier(token.image.toCharArray(),
+ pos-token.image.length(),
+ pos);}
+| expr = Type() {return expr;}
+| expr = VariableDeclaratorId() {return expr;}
}
-AbstractSuffixExpression VariableSuffix(Expression prefix) :
+/**
+ * Used by Variabledeclaratorid and primarysuffix
+ */
+AbstractVariable VariableSuffix(final AbstractVariable prefix) :
{
- String expr = null;
+ Variable expr = null;
final int pos = SimpleCharStream.getPosition();
Expression expression = null;
}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{return new ClassAccess(prefix,
- new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()),
+ expr,
ClassAccess.NORMAL);}
|
<LBRACKET> [ expression = Expression() | expression = Type() ] //Not good
} catch (ParseException e) {
errorMessage = "']' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
| token = <FLOATING_POINT_LITERAL> {pos = SimpleCharStream.getPosition();
return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
| token = <STRING_LITERAL> {pos = SimpleCharStream.getPosition();
- return new StringLiteral(token.image.toCharArray(),pos-token.image.length(),pos);}
+ return new StringLiteral(token.image.toCharArray(),pos-token.image.length());}
| <TRUE> {pos = SimpleCharStream.getPosition();
return new TrueLiteral(pos-4,pos);}
| <FALSE> {pos = SimpleCharStream.getPosition();
return new NullLiteral(pos-4,pos);}
}
-FunctionCall Arguments(Expression func) :
+FunctionCall Arguments(final Expression func) :
{
-ArgumentDeclaration[] args = null;
+Expression[] args = null;
}
{
<LPAREN> [ args = ArgumentList() ]
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{return new FunctionCall(func,args,SimpleCharStream.getPosition());}
* argumentDeclaration() (, argumentDeclaration)*
* @return an array of arguments
*/
-ArgumentDeclaration[] ArgumentList() :
+Expression[] ArgumentList() :
{
-ArgumentDeclaration arg;
+Expression arg;
final ArrayList list = new ArrayList();
-ArgumentDeclaration argument;
}
{
- arg = argumentDeclaration()
+ arg = Expression()
{list.add(arg);}
( <COMMA>
try {
- arg = argumentDeclaration()
+ arg = Expression()
{list.add(arg);}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
)*
{
- ArgumentDeclaration[] args = new ArgumentDeclaration[list.size()];
- list.toArray(args);
- return args;}
+ final Expression[] arguments = new Expression[list.size()];
+ list.toArray(arguments);
+ return arguments;}
}
/**
- * Here is an argument declaration.
- * It's [&]$variablename[=variableInitializer]
+ * A Statement without break.
+ * @return a statement
*/
-ArgumentDeclaration argumentDeclaration() :
+Statement StatementNoBreak() :
{
- boolean reference = false;
- String varName;
- Expression initializer = null;
- final int pos = SimpleCharStream.getPosition();
+ final Statement statement;
+ Token token = null;
}
{
- [<BIT_AND> {reference = true;}]
- varName = VariableDeclaratorId()
- [
- <ASSIGN>
- try {
- initializer = VariableInitializer()
- } catch (ParseException e) {
- errorMessage = "Literal expression expected in variable initializer";
- errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
- }
- ]
- {
- if (initializer == null) {
- return new ArgumentDeclaration(varName.toCharArray(),
- reference,
- pos);
- }
- return new ArgumentDeclaration(varName.toCharArray(),
- reference,
- initializer,
- pos);
+ LOOKAHEAD(2)
+ statement = expressionStatement() {return statement;}
+| LOOKAHEAD(1)
+ statement = LabeledStatement() {return statement;}
+| statement = Block() {return statement;}
+| statement = EmptyStatement() {return statement;}
+| statement = SwitchStatement() {return statement;}
+| statement = IfStatement() {return statement;}
+| statement = WhileStatement() {return statement;}
+| statement = DoStatement() {return statement;}
+| statement = ForStatement() {return statement;}
+| statement = ForeachStatement() {return statement;}
+| statement = ContinueStatement() {return statement;}
+| statement = ReturnStatement() {return statement;}
+| statement = EchoStatement() {return statement;}
+| [token=<AT>] statement = IncludeStatement()
+ {if (token != null) {
+ ((InclusionStatement)statement).silent = true;
}
+ return statement;}
+| statement = StaticStatement() {return statement;}
+| statement = GlobalStatement() {return statement;}
+| statement = defineStatement() {currentSegment.add((Outlineable)statement);return statement;}
}
+
/**
- * A Statement without break.
+ * A statement expression.
+ * expression ;
+ * @return an expression
*/
-Statement StatementNoBreak() :
+Statement expressionStatement() :
{
final Statement statement;
- Token token = null;
}
{
- LOOKAHEAD(2)
statement = Expression()
try {
<SEMICOLON>
} catch (ParseException e) {
- if (e.currentToken.next.kind != 4) {
+ if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
{return statement;}
-| LOOKAHEAD(2)
- statement = LabeledStatement() {return statement;}
-| statement = Block() {return statement;}
-| statement = EmptyStatement() {return statement;}
-| statement = StatementExpression()
+}
+
+Define defineStatement() :
+{
+ final int start = SimpleCharStream.getPosition();
+ Expression defineName,defineValue;
+}
+{
+ <DEFINE>
try {
- <SEMICOLON>
+ <LPAREN>
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
+ }
+ try {
+ defineName = Expression()
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
- {return statement;}
-| statement = SwitchStatement() {return statement;}
-| statement = IfStatement() {return statement;}
-| statement = WhileStatement() {return statement;}
-| statement = DoStatement() {return statement;}
-| statement = ForStatement() {return statement;}
-| statement = ForeachStatement() {return statement;}
-| statement = ContinueStatement() {return statement;}
-| statement = ReturnStatement() {return statement;}
-| statement = EchoStatement() {return statement;}
-| [token=<AT>] statement = IncludeStatement()
- {if (token != null) {
- ((InclusionStatement)statement).silent = true;
+ try {
+ <COMMA>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
- return statement;}
-| statement = StaticStatement() {return statement;}
-| statement = GlobalStatement() {return statement;}
+ try {
+ defineValue = Expression()
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ throw e;
+ }
+ try {
+ <RPAREN>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
+ }
+ {return new Define(currentSegment,
+ defineName,
+ defineValue,
+ start,
+ SimpleCharStream.getPosition());}
}
/**
HTMLBlock htmlBlock() :
{
final int startIndex = nodePtr;
- AstNode[] blockNodes;
- int nbNodes;
+ final AstNode[] blockNodes;
+ final int nbNodes;
}
{
<PHPEND> (phpEchoBlock())*
try {
(<PHPSTARTLONG> | <PHPSTARTSHORT>)
} catch (ParseException e) {
- errorMessage = "End of file unexpected, '<?php' expected";
+ errorMessage = "unexpected end of file , '<?php' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition();
- errorEnd = jj_input_stream.getPosition();
+ errorStart = SimpleCharStream.getPosition();
+ errorEnd = SimpleCharStream.getPosition();
throw e;
}
{
- nbNodes = nodePtr-startIndex - 1;
+ nbNodes = nodePtr - startIndex;
blockNodes = new AstNode[nbNodes];
System.arraycopy(nodes,startIndex,blockNodes,0,nbNodes);
- return new HTMLBlock(nodes);}
+ nodePtr = startIndex;
+ return new HTMLBlock(blockNodes);}
}
/**
InclusionStatement IncludeStatement() :
{
final Expression expr;
- final Token token;
final int keyword;
- final int pos = jj_input_stream.getPosition();
+ final int pos = SimpleCharStream.getPosition();
final InclusionStatement inclusionStatement;
}
{
}
errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{inclusionStatement = new InclusionStatement(currentSegment,
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{return inclusionStatement;}
ListExpression ListExpression() :
{
- String expr = null;
- Expression expression = null;
- ArrayList list = new ArrayList();
+ Expression expr = null;
+ final Expression expression;
+ final ArrayList list = new ArrayList();
final int pos = SimpleCharStream.getPosition();
}
{
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
[
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
- expr = VariableDeclaratorId()
- {list.add(expr);}
+ [expr = VariableDeclaratorId() {list.add(expr);}]
)*
try {
<RPAREN>
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
[ <ASSIGN> expression = Expression()
{
- String[] strings = new String[list.size()];
- list.toArray(strings);
- return new ListExpression(strings,
+ final Variable[] vars = new Variable[list.size()];
+ list.toArray(vars);
+ return new ListExpression(vars,
expression,
pos,
SimpleCharStream.getPosition());}
]
{
- String[] strings = new String[list.size()];
- list.toArray(strings);
- return new ListExpression(strings,pos,SimpleCharStream.getPosition());}
+ final Variable[] vars = new Variable[list.size()];
+ list.toArray(vars);
+ return new ListExpression(vars,pos,SimpleCharStream.getPosition());}
}
/**
)*
try {
<SEMICOLON>
- {
- Expression[] exprs = new Expression[expressions.size()];
- expressions.toArray(exprs);
- return new EchoStatement(exprs,pos);}
} catch (ParseException e) {
if (e.currentToken.next.kind != 4) {
errorMessage = "';' expected after 'echo' statement";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
+ {final Expression[] exprs = new Expression[expressions.size()];
+ expressions.toArray(exprs);
+ return new EchoStatement(exprs,pos);}
}
GlobalStatement GlobalStatement() :
{
- final int pos = jj_input_stream.getPosition();
- String expr;
- ArrayList vars = new ArrayList();
- GlobalStatement global;
+ final int pos = SimpleCharStream.getPosition();
+ Variable expr;
+ final ArrayList vars = new ArrayList();
+ final GlobalStatement global;
}
{
<GLOBAL>
- expr = VariableDeclaratorId()
+ expr = Variable()
{vars.add(expr);}
(<COMMA>
- expr = VariableDeclaratorId()
+ expr = Variable()
{vars.add(expr);}
)*
try {
<SEMICOLON>
{
- String[] strings = new String[vars.size()];
- vars.toArray(strings);
+ final Variable[] variables = new Variable[vars.size()];
+ vars.toArray(variables);
global = new GlobalStatement(currentSegment,
- strings,
+ variables,
pos,
SimpleCharStream.getPosition());
currentSegment.add(global);
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
VariableDeclaration expr;
}
{
- <STATIC> expr = VariableDeclarator() {vars.add(new String(expr.name));}
- (<COMMA> expr = VariableDeclarator() {vars.add(new String(expr.name));})*
+ <STATIC> expr = VariableDeclarator() {vars.add(expr);}
+ (
+ <COMMA> expr = VariableDeclarator() {vars.add(expr);}
+ )*
try {
<SEMICOLON>
{
- String[] strings = new String[vars.size()];
- vars.toArray(strings);
- return new StaticStatement(strings,
- pos,
- SimpleCharStream.getPosition());}
+ final VariableDeclaration[] variables = new VariableDeclaration[vars.size()];
+ vars.toArray(variables);
+ return new StaticStatement(variables,
+ pos,
+ SimpleCharStream.getPosition());}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
} catch (ParseException e) {
errorMessage = "'{' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
( statement = BlockStatement() {list.add(statement);}
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{
- Statement[] statements = new Statement[list.size()];
+ final Statement[] statements = new Statement[list.size()];
list.toArray(statements);
return new Block(statements,pos,SimpleCharStream.getPosition());}
}
final Statement statement;
}
{
- statement = Statement() {return statement;}
+ statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
+ return statement;}
| statement = ClassDeclaration() {return statement;}
-| statement = MethodDeclaration() {return statement;}
+| statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
+ currentSegment.add((MethodDeclaration) statement);
+ ((MethodDeclaration) statement).analyzeCode();
+ return statement;}
}
/**
{
statement = StatementNoBreak() {return statement;}
| statement = ClassDeclaration() {return statement;}
-| statement = MethodDeclaration() {return statement;}
+| statement = MethodDeclaration() {currentSegment.add((MethodDeclaration) statement);
+ ((MethodDeclaration) statement).analyzeCode();
+ return statement;}
}
+/**
+ * used only by ForInit()
+ */
VariableDeclaration[] LocalVariableDeclaration() :
{
final ArrayList list = new ArrayList();
{list.add(var);}
( <COMMA> var = LocalVariableDeclarator() {list.add(var);})*
{
- VariableDeclaration[] vars = new VariableDeclaration[list.size()];
+ final VariableDeclaration[] vars = new VariableDeclaration[list.size()];
list.toArray(vars);
return vars;}
}
+/**
+ * used only by LocalVariableDeclaration().
+ */
VariableDeclaration LocalVariableDeclarator() :
{
- final String varName;
+ final Variable varName;
Expression initializer = null;
final int pos = SimpleCharStream.getPosition();
}
{
- varName = VariableDeclaratorId() [ <ASSIGN> initializer = Expression() ]
+ varName = Variable() [ <ASSIGN> initializer = Expression() ]
{
if (initializer == null) {
return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- pos,
- jj_input_stream.getPosition());
+ varName,
+ pos,
+ SimpleCharStream.getPosition());
}
return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- initializer,
- pos);
+ varName,
+ initializer,
+ VariableDeclaration.EQUAL,
+ pos);
}
}
return new EmptyStatement(pos-1,pos);}
}
-Statement StatementExpression() :
+/**
+ * used only by StatementExpressionList() which is used only by ForInit() and ForStatement()
+ */
+Expression StatementExpression() :
{
- Expression expr,expr2;
- int operator;
+ final Expression expr,expr2;
+ final int operator;
}
{
expr = PreIncDecExpression() {return expr;}
|
expr = PrimaryExpression()
- [ <INCR> {return new PostfixedUnaryExpression(expr,
+ [ <PLUS_PLUS> {return new PostfixedUnaryExpression(expr,
OperatorIds.PLUS_PLUS,
SimpleCharStream.getPosition());}
- | <DECR> {return new PostfixedUnaryExpression(expr,
+ | <MINUS_MINUS> {return new PostfixedUnaryExpression(expr,
OperatorIds.MINUS_MINUS,
SimpleCharStream.getPosition());}
- | operator = AssignmentOperator() expr2 = Expression()
- {return new BinaryExpression(expr,expr2,operator);}
]
{return expr;}
}
} catch (ParseException e) {
errorMessage = "'(' expected after 'switch'";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
}
errorMessage = "expression expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
} catch (ParseException e) {
errorMessage = "')' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
(cases = switchStatementBrace() | cases = switchStatementColon(pos, pos + 6))
try {
<RBRACE>
{
- AbstractCase[] abcase = new AbstractCase[cases.size()];
+ final AbstractCase[] abcase = new AbstractCase[cases.size()];
cases.toArray(abcase);
return abcase;}
} catch (ParseException e) {
errorMessage = "'}' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
} catch (ParseException e) {
errorMessage = "'endswitch' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
<SEMICOLON>
{
- AbstractCase[] abcase = new AbstractCase[cases.size()];
+ final AbstractCase[] abcase = new AbstractCase[cases.size()];
cases.toArray(abcase);
return abcase;}
} catch (ParseException e) {
errorMessage = "';' expected after 'endswitch' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
| statement = htmlBlock() {stmts.add(statement);})*
[ statement = BreakStatement() {stmts.add(statement);}]
{
- Statement[] stmtsArray = new Statement[stmts.size()];
+ final Statement[] stmtsArray = new Statement[stmts.size()];
stmts.toArray(stmtsArray);
if (expr == null) {//it's a default
return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition());
*/
Expression SwitchLabel() :
{
- final Token token;
final Expression expr;
}
{
if (errorMessage != null) throw e;
errorMessage = "expression expected after 'case' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
} catch (ParseException e) {
errorMessage = "':' expected after case expression";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
|
} catch (ParseException e) {
errorMessage = "':' expected after 'default' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
} catch (ParseException e) {
errorMessage = "';' expected after 'break' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{return new Break(expression, start, SimpleCharStream.getPosition());}
IfStatement IfStatement() :
{
- final int pos = jj_input_stream.getPosition();
- Expression condition;
- IfStatement ifStatement;
+ final int pos = SimpleCharStream.getPosition();
+ final Expression condition;
+ final IfStatement ifStatement;
}
{
<IF> condition = Condition("if") ifStatement = IfStatement0(condition, pos,pos+2)
} catch (ParseException e) {
errorMessage = "'(' expected after " + keyword + " keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length();
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length();
errorEnd = errorStart +1;
- processParseException(e);
+ processParseExceptionDebug(e);
}
condition = Expression()
try {
<RPAREN>
- {return condition;}
} catch (ParseException e) {
errorMessage = "')' expected after " + keyword + " keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
+ {return condition;}
}
-IfStatement IfStatement0(Expression condition, final int start,final int end) :
+IfStatement IfStatement0(final Expression condition, final int start,final int end) :
{
Statement statement;
- Statement stmt;
+ final Statement stmt;
final Statement[] statementsArray;
ElseIf elseifStatement;
Else elseStatement = null;
- ArrayList stmts;
+ final ArrayList stmts;
final ArrayList elseIfList = new ArrayList();
- ElseIf[] elseIfs;
+ final ElseIf[] elseIfs;
int pos = SimpleCharStream.getPosition();
- int endStatements;
+ final int endStatements;
}
{
<COLON>
} catch (ParseException e) {
errorMessage = "'endif' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
} catch (ParseException e) {
errorMessage = "';' expected after 'endif' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{
stmts.toArray(statementsArray);
return new IfStatement(condition,
new Block(statementsArray,pos,endStatements),
- elseIfs,
- elseStatement,
- pos,
- SimpleCharStream.getPosition());
+ elseIfs,
+ elseStatement,
+ pos,
+ SimpleCharStream.getPosition());
}
}
}
errorMessage = "unexpected token '"+e.currentToken.next.image+"', a statement was expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
]
ElseIf ElseIfStatementColon() :
{
- Expression condition;
+ final Expression condition;
Statement statement;
final ArrayList list = new ArrayList();
final int pos = SimpleCharStream.getPosition();
<COLON> ( statement = Statement() {list.add(statement);}
| statement = htmlBlock() {list.add(statement);})*
{
- Statement[] stmtsArray = new Statement[list.size()];
+ final Statement[] stmtsArray = new Statement[list.size()];
list.toArray(stmtsArray);
return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());}
}
<ELSE> <COLON> ( statement = Statement() {list.add(statement);}
| statement = htmlBlock() {list.add(statement);})*
{
- Statement[] stmtsArray = new Statement[list.size()];
+ final Statement[] stmtsArray = new Statement[list.size()];
list.toArray(stmtsArray);
return new Else(stmtsArray,pos,SimpleCharStream.getPosition());}
}
ElseIf ElseIfStatement() :
{
- Expression condition;
- Statement statement;
+ final Expression condition;
+ final Statement statement;
final ArrayList list = new ArrayList();
final int pos = SimpleCharStream.getPosition();
}
{
<ELSEIF> condition = Condition("elseif") statement = Statement() {list.add(statement);/*todo:do better*/}
{
- Statement[] stmtsArray = new Statement[list.size()];
+ final Statement[] stmtsArray = new Statement[list.size()];
list.toArray(stmtsArray);
return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());}
}
} catch (ParseException e) {
errorMessage = "'endwhile' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
<SEMICOLON>
{
- Statement[] stmtsArray = new Statement[stmts.size()];
+ final Statement[] stmtsArray = new Statement[stmts.size()];
stmts.toArray(stmtsArray);
return new Block(stmtsArray,pos,SimpleCharStream.getPosition());}
} catch (ParseException e) {
errorMessage = "';' expected after 'endwhile' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
|
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
{
Statement statement;
Expression expression;
- final StringBuffer buff = new StringBuffer();
final int pos = SimpleCharStream.getPosition();
ArrayVariableDeclaration variable;
}
} catch (ParseException e) {
errorMessage = "'(' expected after 'foreach' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
} catch (ParseException e) {
errorMessage = "variable expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
} catch (ParseException e) {
errorMessage = "'as' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
} catch (ParseException e) {
errorMessage = "variable expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
} catch (ParseException e) {
errorMessage = "')' expected after 'foreach' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
if (errorMessage != null) throw e;
errorMessage = "statement expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
{return new ForeachStatement(expression,
{
final Token token;
final int pos = SimpleCharStream.getPosition();
-Statement[] initializations = null;
+Expression[] initializations = null;
Expression condition = null;
-Statement[] increments = null;
+Expression[] increments = null;
Statement action;
final ArrayList list = new ArrayList();
final int startBlock, endBlock;
} catch (ParseException e) {
errorMessage = "'(' expected after 'for' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
[ initializations = ForInit() ] <SEMICOLON>
} catch (ParseException e) {
errorMessage = "'endfor' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
try {
<SEMICOLON>
{
- Statement[] stmtsArray = new Statement[list.size()];
+ final Statement[] stmtsArray = new Statement[list.size()];
list.toArray(stmtsArray);
return new ForStatement(initializations,condition,increments,new Block(stmtsArray,startBlock,endBlock),pos,SimpleCharStream.getPosition());}
} catch (ParseException e) {
errorMessage = "';' expected after 'endfor' keyword";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
)
}
-Statement[] ForInit() :
+Expression[] ForInit() :
{
- Statement[] statements;
+ final Expression[] exprs;
}
{
LOOKAHEAD(LocalVariableDeclaration())
- statements = LocalVariableDeclaration()
- {return statements;}
+ exprs = LocalVariableDeclaration()
+ {return exprs;}
|
- statements = StatementExpressionList()
- {return statements;}
+ exprs = StatementExpressionList()
+ {return exprs;}
}
-Statement[] StatementExpressionList() :
+Expression[] StatementExpressionList() :
{
final ArrayList list = new ArrayList();
- Statement expr;
+ final Expression expr;
}
{
expr = StatementExpression() {list.add(expr);}
(<COMMA> StatementExpression() {list.add(expr);})*
{
- Statement[] stmtsArray = new Statement[list.size()];
- list.toArray(stmtsArray);
- return stmtsArray;}
+ final Expression[] exprsArray = new Expression[list.size()];
+ list.toArray(exprsArray);
+ return exprsArray;}
}
Continue ContinueStatement() :
} catch (ParseException e) {
errorMessage = "';' expected after 'continue' statement";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
} catch (ParseException e) {
errorMessage = "';' expected after 'return' statement";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
\ No newline at end of file
git://git.phpeclipse.com / phpeclipse.git / blobdiff