X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index 43f38f3..8f6e050 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -9,14 +9,16 @@ import org.eclipse.jface.preference.IPreferenceStore; import java.util.Hashtable; import java.util.ArrayList; -import java.util.Enumeration; import java.io.StringReader; import java.io.*; import java.text.MessageFormat; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpdt.internal.compiler.parser.*; +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; /** * A new php parser. @@ -30,14 +32,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** The file that is parsed. */ private static IFile fileToParse; - /** The current segment */ - private static PHPSegmentWithChildren currentSegment; + /** The current segment. */ + private static OutlineableWithChildren currentSegment; private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$ private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$ - PHPOutlineInfo outlineInfo; - - private static PHPFunctionDeclaration currentFunction; + static PHPOutlineInfo outlineInfo; /** The error level of the current ParseException. */ private static int errorLevel = ERROR; @@ -46,61 +46,77 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon private static int errorStart = -1; private static int errorEnd = -1; + private static PHPDocument phpDocument; - public PHPParser() { - } + 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 + */ + public static int htmlStart; + + //ast stack + private final static int AstStackIncrement = 100; + /** The stack of node. */ + private static AstNode[] nodes; + /** The cursor in expression stack. */ + private static int nodePtr; public final void setFileToParse(final IFile fileToParse) { this.fileToParse = fileToParse; } + public PHPParser() { + } + public PHPParser(final IFile fileToParse) { this(new StringReader("")); this.fileToParse = fileToParse; } - 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)); - phpTest(); + /** + * Reinitialize the parser. + */ + private static final void init() { + nodes = new AstNode[AstStackIncrement]; + nodePtr = -1; + htmlStart = 0; } - public static final void htmlParserTester(final File fileName) throws CoreException, ParseException { + /** + * 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) { try { - final Reader stream = new FileReader(fileName); - if (jj_input_stream == null) { - jj_input_stream = new SimpleCharStream(stream, 1, 1); - } - ReInit(stream); - phpFile(); - } catch (FileNotFoundException e) { - e.printStackTrace(); //To change body of catch statement use Options | File Templates. + nodes[++nodePtr] = node; + } catch (IndexOutOfBoundsException e) { + int oldStackLength = nodes.length; + AstNode[] oldStack = nodes; + nodes = new AstNode[oldStackLength + AstStackIncrement]; + System.arraycopy(oldStack, 0, nodes, 0, oldStackLength); + nodePtr = oldStackLength; + nodes[nodePtr] = node; } } - 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); - phpFile(); - } - public final PHPOutlineInfo parseInfo(final Object parent, final String s) { - outlineInfo = new PHPOutlineInfo(parent); - currentSegment = outlineInfo.getDeclarations(); + 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); } ReInit(stream); + init(); try { parse(); + 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); } @@ -116,7 +132,7 @@ 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 = jj_input_stream.getPosition(); + errorStart = SimpleCharStream.getPosition(); errorEnd = errorStart + 1; } setMarker(e); @@ -132,8 +148,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon 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 { @@ -151,31 +167,6 @@ 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, @@ -223,6 +214,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_input_stream = new SimpleCharStream(stream, 1, 1); } ReInit(stream); + init(); try { parse(); } catch (ParseException e) { @@ -252,13 +244,39 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - public static final void parse() throws ParseException { - phpFile(); + /** + * Put a new html block in the stack. + */ + public static final void createNewHTMLCode() { + final int currentPosition = SimpleCharStream.getPosition(); + if (currentPosition == htmlStart) { + return; + } + final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray(); + pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); } - static final public void phpTest() throws ParseException { - Php(); - jj_consume_token(0); + /** + * Create a new task. + */ + public static final void createNewTask() { + final int currentPosition = SimpleCharStream.getPosition(); + final String todo = SimpleCharStream.currentBuffer.substring(currentPosition+1, + SimpleCharStream.currentBuffer.indexOf("\n", + currentPosition)-1); + try { + setMarker(fileToParse, + "todo : " + todo, + SimpleCharStream.getBeginLine(), + TASK, + "Line "+SimpleCharStream.getBeginLine()); + } catch (CoreException e) { + PHPeclipsePlugin.log(e); + } + } + + private static final void parse() throws ParseException { + phpFile(); } static final public void phpFile() throws ParseException { @@ -283,6 +301,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: @@ -295,6 +314,14 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case FALSE: case WHILE: case FOREACH: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -302,14 +329,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case LPAREN: case LBRACE: case SEMICOLON: - case AT: - case DOLLAR: - case BANG: - case INCR: - case DECR: - case PLUS: - case MINUS: - case BIT_AND: case DOLLAR_ID: ; break; @@ -319,7 +338,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } PhpBlock(); } - jj_consume_token(0); + PHPParser.createNewHTMLCode(); } catch (TokenMgrError e) { PHPeclipsePlugin.log(e); errorStart = SimpleCharStream.getPosition(); @@ -336,10 +355,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * or */ static final public void PhpBlock() throws ParseException { - final int start = jj_input_stream.getPosition(); + final int start = SimpleCharStream.getPosition(); + final PHPEchoBlock phpEchoBlock; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPECHOSTART: - phpEchoBlock(); + phpEchoBlock = phpEchoBlock(); + pushOnAstNodes(phpEchoBlock); break; case PHPSTARTSHORT: case PHPSTARTLONG: @@ -357,6 +378,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: @@ -369,6 +391,14 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case FALSE: case WHILE: case FOREACH: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -376,14 +406,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case LPAREN: case LBRACE: case SEMICOLON: - case AT: - case DOLLAR: - case BANG: - case INCR: - case DECR: - case PLUS: - case MINUS: - case BIT_AND: case DOLLAR_ID: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPSTARTSHORT: @@ -398,7 +420,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon setMarker(fileToParse, "You should use '' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - {if (true) throw e;} + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } break; default: @@ -433,9 +455,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - static final public void phpEchoBlock() throws ParseException { + static final public PHPEchoBlock phpEchoBlock() throws ParseException { + final Expression expr; + final int pos = SimpleCharStream.getPosition(); + PHPEchoBlock echoBlock; jj_consume_token(PHPECHOSTART); - Expression(); + expr = Expression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: jj_consume_token(SEMICOLON); @@ -445,6 +470,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon ; } jj_consume_token(PHPEND); + echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition()); + pushOnAstNodes(echoBlock); + {if (true) return echoBlock;} + throw new Error("Missing return statement in function"); } static final public void Php() throws ParseException { @@ -464,6 +493,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: @@ -476,6 +506,14 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case FALSE: case WHILE: case FOREACH: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -483,14 +521,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case LPAREN: case LBRACE: case SEMICOLON: - case AT: - case DOLLAR: - case BANG: - case INCR: - case DECR: - case PLUS: - case MINUS: - case BIT_AND: case DOLLAR_ID: ; break; @@ -502,57 +532,74 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - static final public void ClassDeclaration() throws ParseException { - final PHPClassDeclaration classDeclaration; + static final public ClassDeclaration ClassDeclaration() throws ParseException { + final ClassDeclaration classDeclaration; final Token className; + Token superclassName = null; final int pos; + char[] classNameImage = SYNTAX_ERROR_CHAR; + char[] superclassNameImage = null; jj_consume_token(CLASS); + pos = SimpleCharStream.getPosition(); try { - pos = jj_input_stream.getPosition(); className = jj_consume_token(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; - {if (true) throw e;} + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case EXTENDS: jj_consume_token(EXTENDS); try { - jj_consume_token(IDENTIFIER); + superclassName = jj_consume_token(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; - {if (true) throw e;} + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); + superclassNameImage = SYNTAX_ERROR_CHAR; } break; default: jj_la1[6] = jj_gen; ; } - if (currentSegment != null) { - classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos); + if (superclassNameImage == null) { + classDeclaration = new ClassDeclaration(currentSegment, + classNameImage, + pos, + 0); + } else { + classDeclaration = new ClassDeclaration(currentSegment, + classNameImage, + superclassNameImage, + pos, + 0); + } currentSegment.add(classDeclaration); currentSegment = classDeclaration; - } - ClassBody(); - if (currentSegment != null) { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); - } + ClassBody(classDeclaration); + currentSegment = (OutlineableWithChildren) currentSegment.getParent(); + classDeclaration.sourceEnd = SimpleCharStream.getPosition(); + pushOnAstNodes(classDeclaration); + {if (true) return classDeclaration;} + throw new Error("Missing return statement in function"); } - static final public void ClassBody() throws ParseException { + static final public void ClassBody(ClassDeclaration classDeclaration) throws ParseException { try { jj_consume_token(LBRACE); } 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; {if (true) throw e;} } label_3: @@ -566,15 +613,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_la1[7] = jj_gen; break label_3; } - ClassBodyDeclaration(); + ClassBodyDeclaration(classDeclaration); } try { jj_consume_token(RBRACE); } catch (ParseException e) { 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; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} } } @@ -582,13 +629,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** * A class can contain only methods and fields. */ - static final public void ClassBodyDeclaration() throws ParseException { + static final public void ClassBodyDeclaration(ClassDeclaration classDeclaration) throws ParseException { + MethodDeclaration method; + FieldDeclaration field; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FUNCTION: - MethodDeclaration(); + method = MethodDeclaration(); + classDeclaration.addMethod(method); break; case VAR: - FieldDeclaration(); + field = FieldDeclaration(); + classDeclaration.addField(field); break; default: jj_la1[8] = jj_gen; @@ -600,13 +651,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;. */ - static final public void FieldDeclaration() throws ParseException { - PHPVarDeclaration variableDeclaration; + static final public FieldDeclaration FieldDeclaration() throws ParseException { + VariableDeclaration variableDeclaration; + VariableDeclaration[] list; + final ArrayList arrayList = new ArrayList(); + final int pos = SimpleCharStream.getPosition(); jj_consume_token(VAR); variableDeclaration = VariableDeclarator(); - if (currentSegment != null) { - currentSegment.add(variableDeclaration); - } + arrayList.add(variableDeclaration); + outlineInfo.addVariable(new String(variableDeclaration.name)); label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -619,36 +672,42 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } jj_consume_token(COMMA); variableDeclaration = VariableDeclarator(); - if (currentSegment != null) { - currentSegment.add(variableDeclaration); - } + arrayList.add(variableDeclaration); + outlineInfo.addVariable(new String(variableDeclaration.name)); } try { jj_consume_token(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; - {if (true) throw e;} + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } + list = new VariableDeclaration[arrayList.size()]; + arrayList.toArray(list); + {if (true) return new FieldDeclaration(list, + pos, + SimpleCharStream.getPosition(), + currentSegment);} + throw new Error("Missing return statement in function"); } - static final public PHPVarDeclaration VariableDeclarator() throws ParseException { - final String varName, varValue; - final int pos = jj_input_stream.getPosition(); + static final public VariableDeclaration VariableDeclarator() throws ParseException { + final String varName; + Expression initializer = null; + final int pos = SimpleCharStream.getPosition(); varName = VariableDeclaratorId(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); try { - varValue = VariableInitializer(); - {if (true) return new PHPVarDeclaration(currentSegment,varName.substring(1),pos,varValue);} + 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; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} } break; @@ -656,16 +715,31 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_la1[10] = jj_gen; ; } - {if (true) return new PHPVarDeclaration(currentSegment,varName,pos);} + if (initializer == null) { + {if (true) return new VariableDeclaration(currentSegment, + varName.toCharArray(), + pos, + SimpleCharStream.getPosition());} + } + {if (true) return new VariableDeclaration(currentSegment, + varName.toCharArray(), + initializer, + pos);} throw new Error("Missing return statement in function"); } +/** + * A Variable name. + * @return the variable name (with suffix) + */ static final public String VariableDeclaratorId() throws ParseException { String expr; + Expression expression = null; final StringBuffer buff = new StringBuffer(); + final int pos = SimpleCharStream.getPosition(); + ConstantIdentifier ex; try { expr = Variable(); - buff.append(expr); label_5: while (true) { if (jj_2_1(2)) { @@ -673,51 +747,60 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } else { break label_5; } - expr = VariableSuffix(); - buff.append(expr); + ex = new ConstantIdentifier(expr.toCharArray(), + pos, + SimpleCharStream.getPosition()); + expression = VariableSuffix(ex); } - {if (true) return buff.toString();} + if (expression == null) { + {if (true) return expr;} + } + {if (true) return expression.toStringExpression();} } 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; {if (true) throw e;} } throw new Error("Missing return statement in function"); } +/** + * Return a variablename without the $. + * @return a variable name + */ static final public String Variable() throws ParseException { - String expr = null; + final StringBuffer buff; + Expression expression = 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); - expr = Expression(); + expression = Expression(); jj_consume_token(RBRACE); break; default: jj_la1[11] = jj_gen; ; } - if (expr == null) { - if (currentFunction != null) { - PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); - if (var != null) { - var.getVariable().setUsed(true); - } - } - {if (true) return token.image;} + if (expression == null) { + {if (true) return token.image.substring(1);} } - {if (true) return token + "{" + expr + "}";} + 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;} + {if (true) return expr;} break; default: jj_la1[12] = jj_gen; @@ -727,59 +810,56 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon throw new Error("Missing return statement in function"); } +/** + * A Variable name (without the $) + * @return a variable name String + */ static final public String VariableName() throws ParseException { -String expr = null; -final Token token; + final StringBuffer buff; + String expr = null; + Expression expression = null; + final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: jj_consume_token(LBRACE); - expr = Expression(); + expression = Expression(); jj_consume_token(RBRACE); - {if (true) return "{"+expr+"}";} + buff = new StringBuffer("{"); + buff.append(expression.toStringExpression()); + buff.append("}"); + {if (true) return buff.toString();} break; case IDENTIFIER: token = jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: jj_consume_token(LBRACE); - expr = Expression(); + expression = Expression(); jj_consume_token(RBRACE); break; default: jj_la1[13] = jj_gen; ; } - if (expr == null) { - if (currentFunction != null) { - PHPVarDeclaration var = currentFunction.getParameter(token.image); - if (var != null) { - var.getVariable().setUsed(true); - } - } + if (expression == null) { {if (true) return token.image;} } - {if (true) return token + "{" + expr + "}";} + 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 (currentFunction != null) { - PHPVarDeclaration var = currentFunction.getParameter(expr); - if (var != null) { - var.getVariable().setUsed(true); - } - } - {if (true) return "$" + expr;} + buff = new StringBuffer("$"); + buff.append(expr); + {if (true) return buff.toString();} break; case DOLLAR_ID: token = jj_consume_token(DOLLAR_ID); - if (currentFunction != null) { - PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1)); - if (var != null) { - var.getVariable().setUsed(true); - } - } - {if (true) return token.image + expr;} + {if (true) return token.image;} break; default: jj_la1[14] = jj_gen; @@ -789,9 +869,10 @@ final Token token; throw new Error("Missing return statement in function"); } - static final public String VariableInitializer() throws ParseException { - final String expr; + static final public Expression VariableInitializer() throws ParseException { + final Expression expr; final Token token; + final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case NULL: case TRUE: @@ -816,7 +897,11 @@ final Token token; jj_consume_token(-1); throw new ParseException(); } - {if (true) return "-" + token.image;} + {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(), + pos, + SimpleCharStream.getPosition()), + OperatorIds.MINUS, + pos);} break; case PLUS: jj_consume_token(PLUS); @@ -832,7 +917,11 @@ final Token token; jj_consume_token(-1); throw new ParseException(); } - {if (true) return "+" + token.image;} + {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(), + pos, + SimpleCharStream.getPosition()), + OperatorIds.PLUS, + pos);} break; case ARRAY: expr = ArrayDeclarator(); @@ -840,7 +929,7 @@ final Token token; break; case IDENTIFIER: token = jj_consume_token(IDENTIFIER); - {if (true) return token.image;} + {if (true) return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());} break; default: jj_la1[17] = jj_gen; @@ -850,28 +939,26 @@ final Token token; throw new Error("Missing return statement in function"); } - static final public String ArrayVariable() throws ParseException { -String expr; -final StringBuffer buff = new StringBuffer(); + static final public ArrayVariableDeclaration ArrayVariable() throws ParseException { +Expression expr,expr2; expr = Expression(); - buff.append(expr); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAYASSIGN: jj_consume_token(ARRAYASSIGN); - expr = Expression(); - buff.append("=>").append(expr); + expr2 = Expression(); + {if (true) return new ArrayVariableDeclaration(expr,expr2);} break; default: jj_la1[18] = jj_gen; ; } - {if (true) return buff.toString();} + {if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } - static final public String ArrayInitializer() throws ParseException { -String expr; -final StringBuffer buff = new StringBuffer("("); + static final public ArrayVariableDeclaration[] ArrayInitializer() throws ParseException { + ArrayVariableDeclaration expr; + final ArrayList list = new ArrayList(); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: @@ -881,22 +968,22 @@ final StringBuffer buff = new StringBuffer("("); case NULL: case TRUE: case FALSE: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: 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 IDENTIFIER: + case LPAREN: case DOLLAR_ID: expr = ArrayVariable(); - buff.append(expr); + list.add(expr); label_6: while (true) { if (jj_2_2(2)) { @@ -906,7 +993,7 @@ final StringBuffer buff = new StringBuffer("("); } jj_consume_token(COMMA); expr = ArrayVariable(); - buff.append(",").append(expr); + list.add(expr); } break; default: @@ -916,15 +1003,16 @@ final StringBuffer buff = new StringBuffer("("); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - buff.append(","); + list.add(null); break; default: jj_la1[20] = jj_gen; ; } jj_consume_token(RPAREN); - buff.append(")"); - {if (true) return buff.toString();} + ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; + list.toArray(vars); + {if (true) return vars;} throw new Error("Missing return statement in function"); } @@ -932,48 +1020,28 @@ final StringBuffer buff = new StringBuffer("("); * A Method Declaration. * function MetodDeclarator() Block() */ - static final public void MethodDeclaration() throws ParseException { - final PHPFunctionDeclaration functionDeclaration; - Token functionToken; - functionToken = jj_consume_token(FUNCTION); + static final public MethodDeclaration MethodDeclaration() throws ParseException { + final MethodDeclaration functionDeclaration; + final Block block; + final OutlineableWithChildren seg = currentSegment; + jj_consume_token(FUNCTION); try { functionDeclaration = MethodDeclarator(); + outlineInfo.addVariable(new String(functionDeclaration.name)); } catch (ParseException e) { - if (errorMessage != null) { - {if (true) throw e;} - } + if (errorMessage != null) {if (true) 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; {if (true) throw e;} } - if (currentSegment != null) { - currentSegment.add(functionDeclaration); - currentSegment = functionDeclaration; - } - currentFunction = functionDeclaration; - Block(); - Hashtable parameters = currentFunction.getParameters(); - Enumeration vars = parameters.elements(); - while (vars.hasMoreElements()) { - PHPVarDeclaration o = (PHPVarDeclaration) vars.nextElement(); - if (!o.getVariable().isUsed()) { - try { - setMarker(fileToParse, - "Parameter "+o.getVariable().getName()+" is never used in function", - functionToken.beginLine, - WARNING, - "Line " + token.beginLine); - } catch (CoreException e) { - PHPeclipsePlugin.log(e); - } - } - } - currentFunction = null; - if (currentSegment != null) { - currentSegment = (PHPSegmentWithChildren) currentSegment.getParent(); - } + currentSegment = functionDeclaration; + block = Block(); + functionDeclaration.statements = block.statements; + currentSegment = seg; + {if (true) return functionDeclaration;} + throw new Error("Missing return statement in function"); } /** @@ -981,24 +1049,37 @@ final StringBuffer buff = new StringBuffer("("); * [&] IDENTIFIER(parameters ...). * @return a function description for the outline */ - static final public PHPFunctionDeclaration MethodDeclarator() throws ParseException { + static final public MethodDeclaration MethodDeclarator() throws ParseException { final Token identifier; - final StringBuffer methodDeclaration = new StringBuffer(); + Token reference = null; final Hashtable formalParameters; - final int pos = jj_input_stream.getPosition(); + final int pos = SimpleCharStream.getPosition(); + char[] identifierChar = SYNTAX_ERROR_CHAR; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: - jj_consume_token(BIT_AND); - methodDeclaration.append("&"); + reference = jj_consume_token(BIT_AND); break; default: jj_la1[21] = jj_gen; ; } - identifier = jj_consume_token(IDENTIFIER); + try { + identifier = jj_consume_token(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; + processParseException(e); + } formalParameters = FormalParameters(); - methodDeclaration.append(identifier); - {if (true) return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters);} + {if (true) return new MethodDeclaration(currentSegment, + identifierChar, + formalParameters, + reference != null, + pos, + SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } @@ -1007,25 +1088,23 @@ final StringBuffer buff = new StringBuffer("("); * (FormalParameter()) */ static final public Hashtable FormalParameters() throws ParseException { - String expr; - final StringBuffer buff = new StringBuffer("("); - PHPVarDeclaration var; + VariableDeclaration var; final Hashtable parameters = new Hashtable(); try { jj_consume_token(LPAREN); } 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; - {if (true) throw e;} + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR: case BIT_AND: case DOLLAR_ID: var = FormalParameter(); - parameters.put(var.getVariable().getName(),var); + parameters.put(new String(var.name),var); label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1038,7 +1117,7 @@ final StringBuffer buff = new StringBuffer("("); } jj_consume_token(COMMA); var = FormalParameter(); - parameters.put(var.getVariable().getName(),var); + parameters.put(new String(var.name),var); } break; default: @@ -1050,9 +1129,9 @@ final StringBuffer buff = new StringBuffer("("); } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - {if (true) throw e;} + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } {if (true) return parameters;} throw new Error("Missing return statement in function"); @@ -1062,8 +1141,8 @@ final StringBuffer buff = new StringBuffer("("); * A formal parameter. * $varname[=value] (,$varname[=value]) */ - static final public PHPVarDeclaration FormalParameter() throws ParseException { - final PHPVarDeclaration variableDeclaration; + static final public VariableDeclaration FormalParameter() throws ParseException { + final VariableDeclaration variableDeclaration; Token token = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: @@ -1075,49 +1154,59 @@ final StringBuffer buff = new StringBuffer("("); } variableDeclaration = VariableDeclarator(); if (token != null) { - variableDeclaration.getVariable().setPrefix("@"); + variableDeclaration.setReference(true); } {if (true) return variableDeclaration;} throw new Error("Missing return statement in function"); } - static final public String Type() throws ParseException { + static final public ConstantIdentifier Type() throws ParseException { + final int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STRING: jj_consume_token(STRING); - {if (true) return "string";} + pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(Types.STRING,pos,pos-6);} break; case BOOL: jj_consume_token(BOOL); - {if (true) return "bool";} + pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(Types.BOOL,pos,pos-4);} break; case BOOLEAN: jj_consume_token(BOOLEAN); - {if (true) return "boolean";} + pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);} break; case REAL: jj_consume_token(REAL); - {if (true) return "real";} + pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(Types.REAL,pos,pos-4);} break; case DOUBLE: jj_consume_token(DOUBLE); - {if (true) return "double";} + pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);} break; case FLOAT: jj_consume_token(FLOAT); - {if (true) return "float";} + pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(Types.FLOAT,pos,pos-5);} break; case INT: jj_consume_token(INT); - {if (true) return "int";} + pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(Types.INT,pos,pos-3);} break; case INTEGER: jj_consume_token(INTEGER); - {if (true) return "integer";} + pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(Types.INTEGER,pos,pos-7);} break; case OBJECT: jj_consume_token(OBJECT); - {if (true) return "object";} + pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(Types.OBJECT,pos,pos-6);} break; default: jj_la1[25] = jj_gen; @@ -1127,135 +1216,140 @@ final StringBuffer buff = new StringBuffer("("); throw new Error("Missing return statement in function"); } - static final public String Expression() throws ParseException { - final String expr; - final String assignOperator; - final String expr2; + static final public Expression Expression() throws ParseException { + final Expression expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PRINT: expr = PrintExpression(); - {if (true) return expr;} + {if (true) return expr;} break; case LIST: expr = ListExpression(); - {if (true) return expr;} + {if (true) return expr;} break; - case ARRAY: - case NEW: - case NULL: - case TRUE: - case FALSE: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case AT: - case DOLLAR: - case BANG: - case INCR: - case DECR: - case PLUS: - case MINUS: - case BIT_AND: - case DOLLAR_ID: - 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 { - expr2 = Expression(); - {if (true) return expr + assignOperator + expr2;} - } catch (ParseException e) { + 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 PLUS_PLUS: + case MINUS_MINUS: + 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(); + } + } + } + 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 initializer; + final int assignOperator; + final int pos = SimpleCharStream.getPosition(); + varName = VariableDeclaratorId(); + assignOperator = AssignmentOperator(); + try { + initializer = Expression(); + } catch (ParseException e) { if (errorMessage != null) { {if (true) throw e;} } 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; {if (true) throw e;} - } - break; - default: - jj_la1[26] = jj_gen; - ; - } - {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(), + initializer, + assignOperator, + pos, + SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } - static final public String AssignmentOperator() throws ParseException { + static final public int AssignmentOperator() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: jj_consume_token(ASSIGN); - {if (true) return "=";} + {if (true) return VarAssignation.EQUAL;} break; case STARASSIGN: jj_consume_token(STARASSIGN); - {if (true) return "*=";} + {if (true) return VarAssignation.STAR_EQUAL;} break; case SLASHASSIGN: jj_consume_token(SLASHASSIGN); - {if (true) return "/=";} + {if (true) return VarAssignation.SLASH_EQUAL;} break; case REMASSIGN: jj_consume_token(REMASSIGN); - {if (true) return "%=";} + {if (true) return VarAssignation.REM_EQUAL;} break; case PLUSASSIGN: jj_consume_token(PLUSASSIGN); - {if (true) return "+=";} + {if (true) return VarAssignation.PLUS_EQUAL;} break; case MINUSASSIGN: jj_consume_token(MINUSASSIGN); - {if (true) return "-=";} + {if (true) return VarAssignation.MINUS_EQUAL;} break; case LSHIFTASSIGN: jj_consume_token(LSHIFTASSIGN); - {if (true) return "<<=";} + {if (true) return VarAssignation.LSHIFT_EQUAL;} break; case RSIGNEDSHIFTASSIGN: jj_consume_token(RSIGNEDSHIFTASSIGN); - {if (true) return ">>=";} + {if (true) return VarAssignation.RSIGNEDSHIFT_EQUAL;} break; case ANDASSIGN: jj_consume_token(ANDASSIGN); - {if (true) return "&=";} + {if (true) return VarAssignation.AND_EQUAL;} break; case XORASSIGN: jj_consume_token(XORASSIGN); - {if (true) return "|=";} + {if (true) return VarAssignation.XOR_EQUAL;} break; case ORASSIGN: jj_consume_token(ORASSIGN); - {if (true) return "|=";} + {if (true) return VarAssignation.OR_EQUAL;} break; case DOTASSIGN: jj_consume_token(DOTASSIGN); - {if (true) return ".=";} + {if (true) return VarAssignation.DOT_EQUAL;} break; case TILDEEQUAL: jj_consume_token(TILDEEQUAL); - {if (true) return "~=";} + {if (true) return VarAssignation.TILDE_EQUAL;} break; default: jj_la1[28] = jj_gen; @@ -1265,10 +1359,10 @@ final StringBuffer buff = new StringBuffer("("); throw new Error("Missing return statement in function"); } - static final public String ConditionalExpression() throws ParseException { - final String expr; - String expr2 = null; - String expr3 = null; + static final public Expression ConditionalExpression() throws ParseException { + final Expression expr; + Expression expr2 = null; + Expression expr3 = null; expr = ConditionalOrExpression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HOOK: @@ -1283,23 +1377,20 @@ final StringBuffer buff = new StringBuffer("("); } if (expr3 == null) { {if (true) return expr;} - } else { - {if (true) return expr + "?" + expr2 + ":" + expr3;} } + {if (true) return new ConditionalExpression(expr,expr2,expr3);} throw new Error("Missing return statement in function"); } - static final public String ConditionalOrExpression() throws ParseException { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + static final public Expression ConditionalOrExpression() throws ParseException { + Expression expr,expr2; + int operator; expr = ConditionalAndExpression(); - buff.append(expr); label_8: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case OR_OR: case _ORL: - case SC_OR: ; break; default: @@ -1307,36 +1398,35 @@ final StringBuffer buff = new StringBuffer("("); break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SC_OR: - operator = jj_consume_token(SC_OR); + case OR_OR: + jj_consume_token(OR_OR); + operator = OperatorIds.OR_OR; break; case _ORL: - operator = jj_consume_token(_ORL); + jj_consume_token(_ORL); + operator = OperatorIds.ORL; break; default: jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr = ConditionalAndExpression(); - buff.append(operator.image); - buff.append(expr); + expr2 = ConditionalAndExpression(); + expr = new BinaryExpression(expr,expr2,operator); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String ConditionalAndExpression() throws ParseException { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + static final public Expression ConditionalAndExpression() throws ParseException { + Expression expr,expr2; + int operator; expr = ConcatExpression(); - buff.append(expr); label_9: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AND_AND: case _ANDL: - case SC_AND: ; break; default: @@ -1344,30 +1434,29 @@ final StringBuffer buff = new StringBuffer("("); break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SC_AND: - operator = jj_consume_token(SC_AND); + case AND_AND: + jj_consume_token(AND_AND); + operator = OperatorIds.AND_AND; break; case _ANDL: - operator = jj_consume_token(_ANDL); + jj_consume_token(_ANDL); + operator = OperatorIds.ANDL; break; default: jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr = ConcatExpression(); - buff.append(operator.image); - buff.append(expr); + expr2 = ConcatExpression(); + expr = new BinaryExpression(expr,expr2,operator); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String ConcatExpression() throws ParseException { - String expr; - final StringBuffer buff = new StringBuffer(); + static final public Expression ConcatExpression() throws ParseException { + Expression expr,expr2; expr = InclusiveOrExpression(); - buff.append(expr); label_10: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1379,18 +1468,16 @@ final StringBuffer buff = new StringBuffer("("); break label_10; } jj_consume_token(DOT); - expr = InclusiveOrExpression(); - buff.append(".").append(expr); + expr2 = InclusiveOrExpression(); + expr = new BinaryExpression(expr,expr2,OperatorIds.DOT); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String InclusiveOrExpression() throws ParseException { - String expr; - final StringBuffer buff = new StringBuffer(); + static final public Expression InclusiveOrExpression() throws ParseException { + Expression expr,expr2; expr = ExclusiveOrExpression(); - buff.append(expr); label_11: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1402,18 +1489,16 @@ final StringBuffer buff = new StringBuffer("("); break label_11; } jj_consume_token(BIT_OR); - expr = ExclusiveOrExpression(); - buff.append("|").append(expr); + expr2 = ExclusiveOrExpression(); + expr = new BinaryExpression(expr,expr2,OperatorIds.OR); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String ExclusiveOrExpression() throws ParseException { - String expr; - final StringBuffer buff = new StringBuffer(); + static final public Expression ExclusiveOrExpression() throws ParseException { + Expression expr,expr2; expr = AndExpression(); - buff.append(expr); label_12: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1425,19 +1510,16 @@ final StringBuffer buff = new StringBuffer("("); break label_12; } jj_consume_token(XOR); - expr = AndExpression(); - buff.append("^"); - buff.append(expr); + expr2 = AndExpression(); + expr = new BinaryExpression(expr,expr2,OperatorIds.XOR); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String AndExpression() throws ParseException { - String expr; - final StringBuffer buff = new StringBuffer(); + static final public Expression AndExpression() throws ParseException { + Expression expr,expr2; expr = EqualityExpression(); - buff.append(expr); label_13: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1449,24 +1531,22 @@ final StringBuffer buff = new StringBuffer("("); break label_13; } jj_consume_token(BIT_AND); - expr = EqualityExpression(); - buff.append("&").append(expr); + expr2 = EqualityExpression(); + expr = new BinaryExpression(expr,expr2,OperatorIds.AND); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String EqualityExpression() throws ParseException { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + static final public Expression EqualityExpression() throws ParseException { + Expression expr,expr2; + int operator; expr = RelationalExpression(); - buff.append(expr); label_14: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case EQ: - case NE: + case EQUAL_EQUAL: + case NOT_EQUAL: case DIF: case BANGDOUBLEEQUAL: case TRIPLEEQUAL: @@ -1477,20 +1557,25 @@ final StringBuffer buff = new StringBuffer("("); break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case EQ: - operator = jj_consume_token(EQ); + case EQUAL_EQUAL: + jj_consume_token(EQUAL_EQUAL); + operator = OperatorIds.EQUAL_EQUAL; break; case DIF: - operator = jj_consume_token(DIF); + jj_consume_token(DIF); + operator = OperatorIds.DIF; break; - case NE: - operator = jj_consume_token(NE); + case NOT_EQUAL: + jj_consume_token(NOT_EQUAL); + operator = OperatorIds.DIF; break; case BANGDOUBLEEQUAL: - operator = jj_consume_token(BANGDOUBLEEQUAL); + jj_consume_token(BANGDOUBLEEQUAL); + operator = OperatorIds.BANG_EQUAL_EQUAL; break; case TRIPLEEQUAL: - operator = jj_consume_token(TRIPLEEQUAL); + jj_consume_token(TRIPLEEQUAL); + operator = OperatorIds.EQUAL_EQUAL_EQUAL; break; default: jj_la1[39] = jj_gen; @@ -1498,27 +1583,27 @@ final StringBuffer buff = new StringBuffer("("); throw new ParseException(); } try { - expr = RelationalExpression(); + expr2 = RelationalExpression(); } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected after '"+operator.image+"'"; + if (errorMessage != null) { + {if (true) throw 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; {if (true) throw e;} } - buff.append(operator.image); - buff.append(expr); + expr = new BinaryExpression(expr,expr2,operator); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String RelationalExpression() throws ParseException { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + static final public Expression RelationalExpression() throws ParseException { + Expression expr,expr2; + int operator; expr = ShiftExpression(); - buff.append(expr); label_15: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1534,35 +1619,37 @@ final StringBuffer buff = new StringBuffer("("); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LT: - operator = jj_consume_token(LT); + jj_consume_token(LT); + operator = OperatorIds.LESS; break; case GT: - operator = jj_consume_token(GT); + jj_consume_token(GT); + operator = OperatorIds.GREATER; break; case LE: - operator = jj_consume_token(LE); + jj_consume_token(LE); + operator = OperatorIds.LESS_EQUAL; break; case GE: - operator = jj_consume_token(GE); + jj_consume_token(GE); + operator = OperatorIds.GREATER_EQUAL; break; default: jj_la1[41] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr = ShiftExpression(); - buff.append(operator.image).append(expr); + expr2 = ShiftExpression(); + expr = new BinaryExpression(expr,expr2,operator); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String ShiftExpression() throws ParseException { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + static final public Expression ShiftExpression() throws ParseException { + Expression expr,expr2; + int operator; expr = AdditiveExpression(); - buff.append(expr); label_16: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1577,33 +1664,33 @@ final StringBuffer buff = new StringBuffer("("); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LSHIFT: - operator = jj_consume_token(LSHIFT); + jj_consume_token(LSHIFT); + operator = OperatorIds.LEFT_SHIFT; break; case RSIGNEDSHIFT: - operator = jj_consume_token(RSIGNEDSHIFT); + jj_consume_token(RSIGNEDSHIFT); + operator = OperatorIds.RIGHT_SHIFT; break; case RUNSIGNEDSHIFT: - operator = jj_consume_token(RUNSIGNEDSHIFT); + jj_consume_token(RUNSIGNEDSHIFT); + operator = OperatorIds.UNSIGNED_RIGHT_SHIFT; break; default: jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr = AdditiveExpression(); - buff.append(operator.image); - buff.append(expr); + expr2 = AdditiveExpression(); + expr = new BinaryExpression(expr,expr2,operator); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String AdditiveExpression() throws ParseException { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + static final public Expression AdditiveExpression() throws ParseException { + Expression expr,expr2; + int operator; expr = MultiplicativeExpression(); - buff.append(expr); label_17: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1617,44 +1704,44 @@ final StringBuffer buff = new StringBuffer("("); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: - operator = jj_consume_token(PLUS); + jj_consume_token(PLUS); + operator = OperatorIds.PLUS; break; case MINUS: - operator = jj_consume_token(MINUS); + jj_consume_token(MINUS); + operator = OperatorIds.MINUS; break; default: jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr = MultiplicativeExpression(); - buff.append(operator.image); - buff.append(expr); + expr2 = MultiplicativeExpression(); + expr = new BinaryExpression(expr,expr2,operator); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } - static final public String MultiplicativeExpression() throws ParseException { - String expr; - Token operator; - final StringBuffer buff = new StringBuffer(); + static final public Expression MultiplicativeExpression() throws ParseException { + Expression expr,expr2; + int operator; try { expr = UnaryExpression(); } catch (ParseException e) { + if (errorMessage != null) {if (true) 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; {if (true) throw e;} } - buff.append(expr); label_18: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STAR: case SLASH: - case REM: + case REMAINDER: ; break; default: @@ -1663,76 +1750,98 @@ final StringBuffer buff = new StringBuffer("("); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STAR: - operator = jj_consume_token(STAR); + jj_consume_token(STAR); + operator = OperatorIds.MULTIPLY; break; case SLASH: - operator = jj_consume_token(SLASH); + jj_consume_token(SLASH); + operator = OperatorIds.DIVIDE; break; - case REM: - operator = jj_consume_token(REM); + case REMAINDER: + jj_consume_token(REMAINDER); + operator = OperatorIds.REMAINDER; break; default: jj_la1[47] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr = UnaryExpression(); - buff.append(operator.image); - buff.append(expr); + expr2 = UnaryExpression(); + expr = new BinaryExpression(expr,expr2,operator); } - {if (true) return buff.toString();} + {if (true) return expr;} throw new Error("Missing return statement in function"); } /** * An unary expression starting with @, & or nothing */ - static final public String UnaryExpression() throws ParseException { - final String expr; - final Token token; - final StringBuffer buff = new StringBuffer(); + static final public Expression UnaryExpression() throws ParseException { + Expression expr; + final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: - token = jj_consume_token(BIT_AND); + jj_consume_token(BIT_AND); expr = UnaryExpressionNoPrefix(); - if (token == null) { - {if (true) return expr;} - } - {if (true) return token.image + expr;} + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} break; case ARRAY: case NEW: case NULL: case TRUE: case FALSE: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: case IDENTIFIER: case LPAREN: + case DOLLAR_ID: + expr = AtUnaryExpression(); + {if (true) return expr;} + break; + default: + jj_la1[48] = 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(); + 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);} + 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 INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: case DOLLAR_ID: - label_19: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case AT: - ; - break; - default: - jj_la1[48] = jj_gen; - break label_19; - } - jj_consume_token(AT); - buff.append("@"); - } expr = UnaryExpressionNoPrefix(); - {if (true) return buff.append(expr).toString();} + {if (true) return expr;} break; default: jj_la1[49] = jj_gen; @@ -1742,18 +1851,21 @@ final StringBuffer buff = new StringBuffer("("); throw new Error("Missing return statement in function"); } - static final public String UnaryExpressionNoPrefix() throws ParseException { - final String expr; - final Token token; + static final public Expression UnaryExpressionNoPrefix() throws ParseException { + Expression expr; + int operator; + final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: case MINUS: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: - token = jj_consume_token(PLUS); + jj_consume_token(PLUS); + operator = OperatorIds.PLUS; break; case MINUS: - token = jj_consume_token(MINUS); + jj_consume_token(MINUS); + operator = OperatorIds.MINUS; break; default: jj_la1[50] = jj_gen; @@ -1761,10 +1873,10 @@ final StringBuffer buff = new StringBuffer("("); throw new ParseException(); } expr = UnaryExpression(); - {if (true) return token.image + expr;} + {if (true) return new PrefixedUnaryExpression(expr,operator,pos);} break; - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: expr = PreIncDecExpression(); {if (true) return expr;} break; @@ -1773,13 +1885,13 @@ final StringBuffer buff = new StringBuffer("("); case NULL: case TRUE: case FALSE: + case DOLLAR: + case BANG: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: case IDENTIFIER: case LPAREN: - case DOLLAR: - case BANG: case DOLLAR_ID: expr = UnaryExpressionNotPlusMinus(); {if (true) return expr;} @@ -1792,15 +1904,18 @@ final StringBuffer buff = new StringBuffer("("); throw new Error("Missing return statement in function"); } - static final public String PreIncDecExpression() throws ParseException { -final String expr; -final Token token; + static final public Expression PreIncDecExpression() throws ParseException { +final Expression expr; +final int operator; + final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case INCR: - token = jj_consume_token(INCR); + case PLUS_PLUS: + jj_consume_token(PLUS_PLUS); + operator = OperatorIds.PLUS_PLUS; break; - case DECR: - token = jj_consume_token(DECR); + case MINUS_MINUS: + jj_consume_token(MINUS_MINUS); + operator = OperatorIds.MINUS_MINUS; break; default: jj_la1[52] = jj_gen; @@ -1808,32 +1923,33 @@ final Token token; throw new ParseException(); } expr = PrimaryExpression(); - {if (true) return token.image + expr;} + {if (true) return new PrefixedUnaryExpression(expr,operator,pos);} throw new Error("Missing return statement in function"); } - static final public String UnaryExpressionNotPlusMinus() throws ParseException { - final String expr; + 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 "!" + expr;} + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} break; default: jj_la1[53] = jj_gen; - if (jj_2_3(2147483647)) { + if (jj_2_4(2147483647)) { expr = CastExpression(); - {if (true) return expr;} + {if (true) return expr;} } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case NEW: - case IDENTIFIER: case DOLLAR: + case IDENTIFIER: case DOLLAR_ID: expr = PostfixExpression(); - {if (true) return expr;} + {if (true) return expr;} break; case NULL: case TRUE: @@ -1842,7 +1958,7 @@ final Token token; case FLOATING_POINT_LITERAL: case STRING_LITERAL: expr = Literal(); - {if (true) return expr;} + {if (true) return expr;} break; case LPAREN: jj_consume_token(LPAREN); @@ -1852,11 +1968,11 @@ final Token token; } 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; {if (true) throw e;} } - {if (true) return "("+expr+")";} + {if (true) return expr;} break; default: jj_la1[54] = jj_gen; @@ -1868,8 +1984,10 @@ final Token token; throw new Error("Missing return statement in function"); } - static final public String CastExpression() throws ParseException { -final String type, expr; + static final public CastExpression CastExpression() throws ParseException { +final ConstantIdentifier type; +final Expression expr; +final int pos = SimpleCharStream.getPosition(); jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case STRING: @@ -1885,7 +2003,7 @@ final String type, expr; break; case ARRAY: jj_consume_token(ARRAY); - type = "array"; + type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition()); break; default: jj_la1[55] = jj_gen; @@ -1894,23 +2012,26 @@ final String type, expr; } jj_consume_token(RPAREN); expr = UnaryExpression(); - {if (true) return "(" + type + ")" + expr;} + {if (true) return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } - static final public String PostfixExpression() throws ParseException { - final String expr; - Token operator = null; + static final public Expression PostfixExpression() throws ParseException { + Expression expr; + int operator = -1; + final int pos = SimpleCharStream.getPosition(); 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: - operator = jj_consume_token(INCR); + case PLUS_PLUS: + jj_consume_token(PLUS_PLUS); + operator = OperatorIds.PLUS_PLUS; break; - case DECR: - operator = jj_consume_token(DECR); + case MINUS_MINUS: + jj_consume_token(MINUS_MINUS); + operator = OperatorIds.MINUS_MINUS; break; default: jj_la1[56] = jj_gen; @@ -1922,69 +2043,60 @@ final String type, expr; jj_la1[57] = jj_gen; ; } - if (operator == null) { + if (operator == -1) { {if (true) return expr;} } - {if (true) return expr + operator.image;} + {if (true) return new PostfixedUnaryExpression(expr,operator,pos);} throw new Error("Missing return statement in function"); } - static final public String PrimaryExpression() throws ParseException { + static final public Expression PrimaryExpression() throws ParseException { final Token identifier; - String expr; - final StringBuffer buff = new StringBuffer(); - if (jj_2_4(2)) { + Expression expr; + final int pos = SimpleCharStream.getPosition(); + if (jj_2_7(2)) { identifier = jj_consume_token(IDENTIFIER); jj_consume_token(STATICCLASSACCESS); expr = ClassIdentifier(); - buff.append(identifier.image).append("::").append(expr); - label_20: + expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(), + pos, + SimpleCharStream.getPosition()), + expr, + ClassAccess.STATIC); + label_19: while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CLASSACCESS: - case LPAREN: - case LBRACKET: + if (jj_2_5(2147483647)) { ; - break; - default: - jj_la1[58] = jj_gen; - break label_20; + } else { + break label_19; } - expr = PrimarySuffix(); - buff.append(expr); + expr = PrimarySuffix(expr); } - {if (true) return buff.toString();} + {if (true) return expr;} } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case NEW: - case IDENTIFIER: case DOLLAR: + case IDENTIFIER: case DOLLAR_ID: expr = PrimaryPrefix(); - buff.append(expr); - label_21: + label_20: while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CLASSACCESS: - case LPAREN: - case LBRACKET: + if (jj_2_6(2147483647)) { ; - break; - default: - jj_la1[59] = jj_gen; - break label_21; + } else { + break label_20; } - expr = PrimarySuffix(); - buff.append(expr); + expr = PrimarySuffix(expr); } - {if (true) return buff.toString();} + {if (true) return expr;} break; case ARRAY: expr = ArrayDeclarator(); - {if (true) return "array" + expr;} + {if (true) return expr;} break; default: - jj_la1[60] = jj_gen; + jj_la1[58] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1992,106 +2104,134 @@ final String type, expr; throw new Error("Missing return statement in function"); } - static final public String ArrayDeclarator() throws ParseException { - final String expr; +/** + * An array declarator. + * array(vars) + * @return an array + */ + static final public ArrayInitializer ArrayDeclarator() throws ParseException { + final ArrayVariableDeclaration[] vars; + final int pos = SimpleCharStream.getPosition(); jj_consume_token(ARRAY); - expr = ArrayInitializer(); - {if (true) return "array" + expr;} + vars = ArrayInitializer(); + {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } - static final public String PrimaryPrefix() throws ParseException { - final String expr; + 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 token.image;} + {if (true) return new ConstantIdentifier(token.image.toCharArray(), + pos, + SimpleCharStream.getPosition());} break; case NEW: jj_consume_token(NEW); expr = ClassIdentifier(); - {if (true) return "new " + expr;} + {if (true) return new PrefixedUnaryExpression(expr, + OperatorIds.NEW, + pos);} break; case DOLLAR: case DOLLAR_ID: - expr = VariableDeclaratorId(); - {if (true) return expr;} + var = VariableDeclaratorId(); + {if (true) return new VariableDeclaration(currentSegment, + var.toCharArray(), + pos, + SimpleCharStream.getPosition());} break; default: - jj_la1[61] = jj_gen; + jj_la1[59] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public String classInstantiation() throws ParseException { - String expr; - final StringBuffer buff = new StringBuffer("new "); + static final public PrefixedUnaryExpression classInstantiation() throws ParseException { + Expression expr; + final StringBuffer buff; + final int pos = SimpleCharStream.getPosition(); jj_consume_token(NEW); expr = ClassIdentifier(); - buff.append(expr); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case NEW: - case IDENTIFIER: case DOLLAR: + case IDENTIFIER: case DOLLAR_ID: + buff = new StringBuffer(expr.toStringExpression()); expr = PrimaryExpression(); - buff.append(expr); + buff.append(expr.toStringExpression()); + expr = new ConstantIdentifier(buff.toString().toCharArray(), + pos, + SimpleCharStream.getPosition()); break; default: - jj_la1[62] = jj_gen; + jj_la1[60] = jj_gen; ; } - {if (true) return buff.toString();} + {if (true) return new PrefixedUnaryExpression(expr, + OperatorIds.NEW, + pos);} throw new Error("Missing return statement in function"); } - static final public String ClassIdentifier() throws ParseException { + static final public ConstantIdentifier ClassIdentifier() throws ParseException { final String 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 token.image;} + {if (true) return new ConstantIdentifier(token.image.toCharArray(), + pos, + SimpleCharStream.getPosition());} break; case DOLLAR: case DOLLAR_ID: expr = VariableDeclaratorId(); - {if (true) return expr;} + {if (true) return new ConstantIdentifier(expr.toCharArray(), + pos, + SimpleCharStream.getPosition());} break; default: - jj_la1[63] = jj_gen; + jj_la1[61] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public String PrimarySuffix() throws ParseException { - final String expr; + static final public AbstractSuffixExpression PrimarySuffix(Expression prefix) throws ParseException { + final AbstractSuffixExpression expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LPAREN: - expr = Arguments(); - {if (true) return expr;} + expr = Arguments(prefix); + {if (true) return expr;} break; case CLASSACCESS: case LBRACKET: - expr = VariableSuffix(); - {if (true) return expr;} + expr = VariableSuffix(prefix); + {if (true) return expr;} break; default: - jj_la1[64] = jj_gen; + jj_la1[62] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public String VariableSuffix() throws ParseException { + static final public AbstractSuffixExpression VariableSuffix(Expression prefix) throws ParseException { String expr = null; + final int pos = SimpleCharStream.getPosition(); + Expression expression = null; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CLASSACCESS: jj_consume_token(CLASSACCESS); @@ -2100,11 +2240,13 @@ final String type, expr; } 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; {if (true) throw e;} } - {if (true) return "->" + expr;} + {if (true) return new ClassAccess(prefix, + new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()), + ClassAccess.NORMAL);} break; case LBRACKET: jj_consume_token(LBRACKET); @@ -2125,19 +2267,19 @@ final String type, expr; case FLOAT: case INT: case INTEGER: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: 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 IDENTIFIER: + case LPAREN: case DOLLAR_ID: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: @@ -2147,21 +2289,21 @@ final String type, expr; case NULL: case TRUE: case FALSE: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: 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 IDENTIFIER: + case LPAREN: case DOLLAR_ID: - expr = Expression(); + expression = Expression(); break; case STRING: case OBJECT: @@ -2172,16 +2314,16 @@ final String type, expr; case FLOAT: case INT: case INTEGER: - expr = Type(); + expression = Type(); break; default: - jj_la1[65] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[66] = jj_gen; + jj_la1[64] = jj_gen; ; } try { @@ -2189,76 +2331,64 @@ final String type, 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; {if (true) throw e;} } - if(expr == null) { - {if (true) return "[]";} - } - {if (true) return "[" + expr + "]";} + {if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());} break; default: - jj_la1[67] = jj_gen; + jj_la1[65] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public String Literal() throws ParseException { - final String expr; + static final public Literal Literal() throws ParseException { final Token token; + final int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INTEGER_LITERAL: token = jj_consume_token(INTEGER_LITERAL); - {if (true) return token.image;} + pos = SimpleCharStream.getPosition(); + {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);} break; case FLOATING_POINT_LITERAL: token = jj_consume_token(FLOATING_POINT_LITERAL); - {if (true) return token.image;} + pos = SimpleCharStream.getPosition(); + {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);} break; case STRING_LITERAL: token = jj_consume_token(STRING_LITERAL); - {if (true) return token.image;} + pos = SimpleCharStream.getPosition(); + {if (true) return new StringLiteral(token.image.toCharArray(),pos-token.image.length());} break; case TRUE: - case FALSE: - expr = BooleanLiteral(); - {if (true) return expr;} - break; - case NULL: - jj_consume_token(NULL); - {if (true) return "null";} - break; - default: - jj_la1[68] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - throw new Error("Missing return statement in function"); - } - - static final public String BooleanLiteral() throws ParseException { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case TRUE: jj_consume_token(TRUE); - {if (true) return "true";} + pos = SimpleCharStream.getPosition(); + {if (true) return new TrueLiteral(pos-4,pos);} break; case FALSE: jj_consume_token(FALSE); - {if (true) return "false";} + pos = SimpleCharStream.getPosition(); + {if (true) return new FalseLiteral(pos-4,pos);} + break; + case NULL: + jj_consume_token(NULL); + pos = SimpleCharStream.getPosition(); + {if (true) return new NullLiteral(pos-4,pos);} break; default: - jj_la1[69] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public String Arguments() throws ParseException { -String expr = null; + static final public FunctionCall Arguments(Expression func) throws ParseException { +Expression[] args = null; jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: @@ -2268,24 +2398,24 @@ String expr = null; case NULL: case TRUE: case FALSE: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: 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 IDENTIFIER: + case LPAREN: case DOLLAR_ID: - expr = ArgumentList(); + args = ArgumentList(); break; default: - jj_la1[70] = jj_gen; + jj_la1[67] = jj_gen; ; } try { @@ -2293,119 +2423,139 @@ String expr = null; } 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; {if (true) throw e;} } - if (expr == null) { - {if (true) return "()";} - } - {if (true) return "(" + expr + ")";} + {if (true) return new FunctionCall(func,args,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } - static final public String ArgumentList() throws ParseException { -String expr; -final StringBuffer buff = new StringBuffer(); - expr = Expression(); - buff.append(expr); - label_22: +/** + * An argument list is a list of arguments separated by comma : + * argumentDeclaration() (, argumentDeclaration)* + * @return an array of arguments + */ + static final public Expression[] ArgumentList() throws ParseException { +Expression arg; +final ArrayList list = new ArrayList(); + arg = Expression(); + list.add(arg); + label_21: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[71] = jj_gen; - break label_22; + jj_la1[68] = jj_gen; + break label_21; } jj_consume_token(COMMA); try { - expr = Expression(); + arg = Expression(); + list.add(arg); } catch (ParseException e) { - errorMessage = "expression expected after a comma in argument list"; + 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; {if (true) throw e;} } - buff.append(",").append(expr); } - {if (true) return buff.toString();} + Expression[] arguments = new Expression[list.size()]; + list.toArray(arguments); + {if (true) return arguments;} throw new Error("Missing return statement in function"); } /** - * A Statement without break + * A Statement without break. */ - static final public void StatementNoBreak() throws ParseException { - if (jj_2_5(2)) { - Expression(); + static final public Statement StatementNoBreak() throws ParseException { + final Statement statement; + Token token = null; + if (jj_2_8(2)) { + statement = Expression(); try { jj_consume_token(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; {if (true) throw e;} } } - } else if (jj_2_6(2)) { - LabeledStatement(); + {if (true) return statement;} + } else if (jj_2_9(2)) { + statement = LabeledStatement(); + {if (true) return statement;} } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: - Block(); + statement = Block(); + {if (true) return statement;} break; case SEMICOLON: - EmptyStatement(); + statement = EmptyStatement(); + {if (true) return statement;} break; case ARRAY: case NEW: - case IDENTIFIER: case DOLLAR: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: + case IDENTIFIER: case DOLLAR_ID: - StatementExpression(); + statement = StatementExpression(); try { jj_consume_token(SEMICOLON); } 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; {if (true) throw e;} } + {if (true) return statement;} break; case SWITCH: - SwitchStatement(); + statement = SwitchStatement(); + {if (true) return statement;} break; case IF: - IfStatement(); + statement = IfStatement(); + {if (true) return statement;} break; case WHILE: - WhileStatement(); + statement = WhileStatement(); + {if (true) return statement;} break; case DO: - DoStatement(); + statement = DoStatement(); + {if (true) return statement;} break; case FOR: - ForStatement(); + statement = ForStatement(); + {if (true) return statement;} break; case FOREACH: - ForeachStatement(); + statement = ForeachStatement(); + {if (true) return statement;} break; case CONTINUE: - ContinueStatement(); + statement = ContinueStatement(); + {if (true) return statement;} break; case RETURN: - ReturnStatement(); + statement = ReturnStatement(); + {if (true) return statement;} break; case ECHO: - EchoStatement(); + statement = EchoStatement(); + {if (true) return statement;} break; case INCLUDE: case REQUIRE: @@ -2414,32 +2564,138 @@ final StringBuffer buff = new StringBuffer(); case AT: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: - jj_consume_token(AT); + token = jj_consume_token(AT); break; default: - jj_la1[72] = jj_gen; + jj_la1[69] = jj_gen; ; } - IncludeStatement(); + statement = IncludeStatement(); + if (token != null) { + ((InclusionStatement)statement).silent = true; + } + {if (true) return statement;} break; case STATIC: - StaticStatement(); + statement = StaticStatement(); + {if (true) return statement;} break; case GLOBAL: - GlobalStatement(); + statement = GlobalStatement(); + {if (true) return statement;} + break; + case DEFINE: + statement = defineStatement(); + currentSegment.add((Outlineable)statement);{if (true) return statement;} break; default: - jj_la1[73] = jj_gen; + jj_la1[70] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } + throw new Error("Missing return statement in function"); + } + + static final public Define defineStatement() throws ParseException { + final int start = SimpleCharStream.getPosition(); + Expression defineName,defineValue; + jj_consume_token(DEFINE); + try { + jj_consume_token(LPAREN); + } 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; + processParseException(e); + } + try { + defineName = 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; + {if (true) throw e;} + } + try { + jj_consume_token(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; + processParseException(e); + } + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PRINT: + defineValue = PrintExpression(); + break; + default: + jj_la1[71] = jj_gen; + if (jj_2_10(2147483647)) { + defineValue = varAssignation(); + } 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 PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case DOLLAR_ID: + defineValue = ConditionalExpression(); + break; + default: + jj_la1[72] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + } + } 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; + {if (true) throw e;} + } + try { + jj_consume_token(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; + processParseException(e); + } + {if (true) return new Define(currentSegment, + defineName, + defineValue, + start, + SimpleCharStream.getPosition());} + throw new Error("Missing return statement in function"); } /** - * A Normal statement + * A Normal statement. */ - static final public void Statement() throws ParseException { + static final public Statement Statement() throws ParseException { + final Statement statement; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: case ARRAY: @@ -2451,6 +2707,7 @@ final StringBuffer buff = new StringBuffer(); case INCLUDE_ONCE: case REQUIRE_ONCE: case GLOBAL: + case DEFINE: case STATIC: case CONTINUE: case DO: @@ -2463,6 +2720,14 @@ final StringBuffer buff = new StringBuffer(); case FALSE: case WHILE: case FOREACH: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -2470,192 +2735,241 @@ final StringBuffer buff = new StringBuffer(); case LPAREN: case LBRACE: case SEMICOLON: - case AT: - case DOLLAR: - case BANG: - case INCR: - case DECR: - case PLUS: - case MINUS: - case BIT_AND: case DOLLAR_ID: - StatementNoBreak(); + statement = StatementNoBreak(); + {if (true) return statement;} break; case BREAK: - BreakStatement(); + statement = BreakStatement(); + {if (true) return statement;} break; default: - jj_la1[74] = jj_gen; + jj_la1[73] = jj_gen; jj_consume_token(-1); throw new ParseException(); } + throw new Error("Missing return statement in function"); } - static final public void htmlBlock() throws ParseException { +/** + * An html block inside a php syntax. + */ + static final public HTMLBlock htmlBlock() throws ParseException { + final int startIndex = nodePtr; + AstNode[] blockNodes; + int nbNodes; jj_consume_token(PHPEND); - label_23: + label_22: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPECHOSTART: ; break; default: - jj_la1[75] = jj_gen; - break label_23; + jj_la1[74] = jj_gen; + break label_22; } phpEchoBlock(); } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PHPSTARTLONG: - jj_consume_token(PHPSTARTLONG); - break; - case PHPSTARTSHORT: - jj_consume_token(PHPSTARTSHORT); - break; - default: - jj_la1[76] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTLONG: + jj_consume_token(PHPSTARTLONG); + break; + case PHPSTARTSHORT: + jj_consume_token(PHPSTARTSHORT); + break; + default: + jj_la1[75] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { + errorMessage = "unexpected end of file , '= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 126; i++) { + for (int i = 0; i < 123; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< jj_gen) { @@ -6381,6 +7031,10 @@ final int pos = jj_input_stream.getPosition(); case 4: jj_3_5(); break; case 5: jj_3_6(); break; case 6: jj_3_7(); break; + case 7: jj_3_8(); break; + case 8: jj_3_9(); break; + case 9: jj_3_10(); break; + case 10: jj_3_11(); break; } } p = p.next;