X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index b0edb74..76619da 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -8,7 +8,6 @@ import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.jface.preference.IPreferenceStore; import java.util.Hashtable; -import java.util.Enumeration; import java.util.ArrayList; import java.io.StringReader; import java.io.*; @@ -18,6 +17,7 @@ import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; 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; /** @@ -26,6 +26,7 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; * given with JavaCC. You can get JavaCC at http://www.webgain.com * You can test the parser with the PHPParserTestCase2.java * @author Matthieu Casanova + * @version $Reference: 1.0$ */ public final class PHPParser extends PHPParserSuperclass implements PHPParserConstants { @@ -39,9 +40,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon 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 */ @@ -50,6 +48,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon private static int errorStart = -1; private static int errorEnd = -1; private static PHPDocument phpDocument; + + private static final 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 @@ -62,12 +62,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon 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; public final void setFileToParse(final IFile fileToParse) { this.fileToParse = fileToParse; @@ -86,11 +80,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon */ 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; } @@ -98,12 +88,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * Add an php node on the stack. * @param node the node that will be added to the stack */ - private static final void pushOnAstNodes(AstNode node) { + private static final void pushOnAstNodes(final AstNode node) { try { nodes[++nodePtr] = node; } catch (IndexOutOfBoundsException e) { - int oldStackLength = nodes.length; - AstNode[] oldStack = nodes; + final int oldStackLength = nodes.length; + final AstNode[] oldStack = nodes; nodes = new AstNode[oldStackLength + AstStackIncrement]; System.arraycopy(oldStack, 0, nodes, 0, oldStackLength); nodePtr = oldStackLength; @@ -111,83 +101,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - 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); @@ -196,9 +113,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon 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); } @@ -214,15 +133,16 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon if (errorMessage == null) { PHPeclipsePlugin.log(e); errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it"; - errorStart = 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) { @@ -230,8 +150,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 { @@ -249,42 +169,17 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - /** - * Create markers according to the external parser output - */ - private static void createMarkers(final String output, final IFile file) throws CoreException { - // delete all markers - file.deleteMarkers(IMarker.PROBLEM, false, 0); - - int indx = 0; - int brIndx; - boolean flag = true; - while ((brIndx = output.indexOf("
", indx)) != -1) { - // newer php error output (tested with 4.2.3) - scanLine(output, file, indx, brIndx); - indx = brIndx + 6; - flag = false; - } - if (flag) { - while ((brIndx = output.indexOf("
", indx)) != -1) { - // older php error output (tested with 4.2.3) - scanLine(output, file, indx, brIndx); - indx = brIndx + 4; - } - } - } - private static void scanLine(final String output, final IFile file, final int indx, final int brIndx) throws CoreException { String current; - StringBuffer lineNumberBuffer = new StringBuffer(10); + final StringBuffer lineNumberBuffer = new StringBuffer(10); char ch; current = output.substring(indx, brIndx); if (current.indexOf(PARSE_WARNING_STRING) != -1 || current.indexOf(PARSE_ERROR_STRING) != -1) { - int onLine = current.indexOf("on line "); + final int onLine = current.indexOf("on line "); if (onLine != -1) { lineNumberBuffer.delete(0, lineNumberBuffer.length()); for (int i = onLine; i < current.length(); i++) { @@ -294,9 +189,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } } - int lineNumber = Integer.parseInt(lineNumberBuffer.toString()); + final int lineNumber = Integer.parseInt(lineNumberBuffer.toString()); - Hashtable attributes = new Hashtable(); + final Hashtable attributes = new Hashtable(); current = current.replaceAll("\n", ""); current = current.replaceAll("", ""); @@ -356,21 +251,33 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon */ 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)); } - private static final void parse() throws ParseException { - phpFile(); + /** 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); + } } - static final public void phpTest() throws ParseException { - Php(); - jj_consume_token(0); - PHPParser.createNewHTMLCode(); + private static final void parse() throws ParseException { + phpFile(); } static final public void phpFile() throws ParseException { @@ -395,6 +302,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: @@ -410,8 +318,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case AT: case DOLLAR: case BANG: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case PLUS: case MINUS: case BIT_AND: @@ -431,7 +339,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(); @@ -448,10 +356,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: @@ -469,6 +379,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: @@ -484,8 +395,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case AT: case DOLLAR: case BANG: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case PLUS: case MINUS: case BIT_AND: @@ -510,7 +421,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: @@ -548,7 +459,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon static final public PHPEchoBlock phpEchoBlock() throws ParseException { final Expression expr; final int pos = SimpleCharStream.getPosition(); - PHPEchoBlock echoBlock; + final PHPEchoBlock echoBlock; jj_consume_token(PHPECHOSTART); expr = Expression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -583,6 +494,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: @@ -598,8 +510,8 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case AT: case DOLLAR: case BANG: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case PLUS: case MINUS: case BIT_AND: @@ -623,46 +535,50 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon static final public ClassDeclaration ClassDeclaration() throws ParseException { final ClassDeclaration classDeclaration; - final Token className; - Token superclassName = null; + final Token className,superclassName; 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 { 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 (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); } @@ -676,15 +592,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon throw new Error("Missing return statement in function"); } - static final public void ClassBody(ClassDeclaration classDeclaration) throws ParseException { + static final public void ClassBody(final ClassDeclaration classDeclaration) throws ParseException { try { jj_consume_token(LBRACE); } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected"; + errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected"; errorLevel = ERROR; - errorStart = 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); } label_3: while (true) { @@ -702,20 +618,20 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon try { jj_consume_token(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; - {if (true) throw e;} + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } } /** * A class can contain only methods and fields. */ - static final public void ClassBodyDeclaration(ClassDeclaration classDeclaration) throws ParseException { - MethodDeclaration method; - FieldDeclaration field; + static final public void ClassBodyDeclaration(final ClassDeclaration classDeclaration) throws ParseException { + final MethodDeclaration method; + final FieldDeclaration field; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FUNCTION: method = MethodDeclaration(); @@ -723,7 +639,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon break; case VAR: field = FieldDeclaration(); - classDeclaration.addVariable(field); + classDeclaration.addField(field); break; default: jj_la1[8] = jj_gen; @@ -737,14 +653,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon */ static final public FieldDeclaration FieldDeclaration() throws ParseException { VariableDeclaration variableDeclaration; - VariableDeclaration[] list; + final VariableDeclaration[] list; final ArrayList arrayList = new ArrayList(); final int pos = SimpleCharStream.getPosition(); jj_consume_token(VAR); variableDeclaration = VariableDeclarator(); arrayList.add(variableDeclaration); outlineInfo.addVariable(new String(variableDeclaration.name)); - currentSegment.add(variableDeclaration); label_4: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -759,29 +674,29 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon variableDeclaration = VariableDeclarator(); arrayList.add(variableDeclaration); outlineInfo.addVariable(new String(variableDeclaration.name)); - currentSegment.add(variableDeclaration); } 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());} + SimpleCharStream.getPosition(), + currentSegment);} throw new Error("Missing return statement in function"); } static final public VariableDeclaration VariableDeclarator() throws ParseException { - final String varName, varValue; + final String varName; Expression initializer = null; - final int pos = jj_input_stream.getPosition(); + final int pos = SimpleCharStream.getPosition(); varName = VariableDeclaratorId(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: @@ -791,9 +706,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } 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; - {if (true) throw e;} + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseException(e); } break; default: @@ -804,7 +719,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon {if (true) return new VariableDeclaration(currentSegment, varName.toCharArray(), pos, - jj_input_stream.getPosition());} + SimpleCharStream.getPosition());} } {if (true) return new VariableDeclaration(currentSegment, varName.toCharArray(), @@ -818,14 +733,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * @return the variable name (with suffix) */ static final public String VariableDeclaratorId() throws ParseException { - String expr; - Expression expression; - final StringBuffer buff = new StringBuffer(); + final String expr; + Expression expression = null; final int pos = SimpleCharStream.getPosition(); ConstantIdentifier ex; try { expr = Variable(); - buff.append(expr); label_5: while (true) { if (jj_2_1(2)) { @@ -837,19 +750,25 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon pos, SimpleCharStream.getPosition()); expression = VariableSuffix(ex); - buff.append(expression.toStringExpression()); } - {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 { final StringBuffer buff; Expression expression = null; @@ -868,13 +787,13 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_la1[11] = jj_gen; ; } - if (expression == null && !assigning) { + if (expression == null) { {if (true) return token.image.substring(1);} } buff = new StringBuffer(token.image); - buff.append('{'); + buff.append("{"); buff.append(expression.toStringExpression()); - buff.append('}'); + buff.append("}"); {if (true) return buff.toString();} break; case DOLLAR: @@ -890,9 +809,13 @@ 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 { final StringBuffer buff; - String expr = null; + final String expr; Expression expression = null; final Token token; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -900,9 +823,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon jj_consume_token(LBRACE); expression = Expression(); jj_consume_token(RBRACE); - buff = new StringBuffer('{'); + buff = new StringBuffer("{"); buff.append(expression.toStringExpression()); - buff.append('}'); + buff.append("}"); {if (true) return buff.toString();} break; case IDENTIFIER: @@ -921,15 +844,15 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon {if (true) return token.image;} } buff = new StringBuffer(token.image); - buff.append('{'); + buff.append("{"); buff.append(expression.toStringExpression()); - buff.append('}'); + buff.append("}"); {if (true) return buff.toString();} break; case DOLLAR: jj_consume_token(DOLLAR); expr = VariableName(); - buff = new StringBuffer('$'); + buff = new StringBuffer("$"); buff.append(expr); {if (true) return buff.toString();} break; @@ -1016,7 +939,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } static final public ArrayVariableDeclaration ArrayVariable() throws ParseException { -Expression expr,expr2; +final Expression expr,expr2; expr = Expression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAYASSIGN: @@ -1047,8 +970,8 @@ Expression expr,expr2; case AT: case DOLLAR: case BANG: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case PLUS: case MINUS: case BIT_AND: @@ -1086,7 +1009,7 @@ Expression expr,expr2; ; } jj_consume_token(RPAREN); - ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; + final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; list.toArray(vars); {if (true) return vars;} throw new Error("Missing return statement in function"); @@ -1098,34 +1021,25 @@ Expression expr,expr2; */ static final public MethodDeclaration MethodDeclaration() throws ParseException { final MethodDeclaration functionDeclaration; - Token functionToken; final Block block; - functionToken = jj_consume_token(FUNCTION); + 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; + currentSegment = functionDeclaration; block = Block(); - functionDeclaration.statements = block.statements; - currentFunction = null; - if (currentSegment != null) { - currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - } - {if (true) return functionDeclaration;} + functionDeclaration.statements = block.statements; + currentSegment = seg; + {if (true) return functionDeclaration;} throw new Error("Missing return statement in function"); } @@ -1139,6 +1053,7 @@ Expression expr,expr2; Token reference = null; final Hashtable formalParameters; final int pos = SimpleCharStream.getPosition(); + char[] identifierChar = SYNTAX_ERROR_CHAR; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: reference = jj_consume_token(BIT_AND); @@ -1147,14 +1062,23 @@ Expression expr,expr2; 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(); {if (true) return new MethodDeclaration(currentSegment, - identifier.image.toCharArray(), - formalParameters, - reference != null, - pos, - SimpleCharStream.getPosition());} + identifierChar, + formalParameters, + reference != null, + pos, + SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } @@ -1163,8 +1087,6 @@ Expression expr,expr2; * (FormalParameter()) */ static final public Hashtable FormalParameters() throws ParseException { - String expr; - final StringBuffer buff = new StringBuffer("("); VariableDeclaration var; final Hashtable parameters = new Hashtable(); try { @@ -1172,9 +1094,9 @@ Expression expr,expr2; } 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: @@ -1206,9 +1128,9 @@ Expression expr,expr2; } 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"); @@ -1243,56 +1165,47 @@ Expression expr,expr2; case STRING: jj_consume_token(STRING); pos = SimpleCharStream.getPosition(); - {if (true) return new ConstantIdentifier(Types.STRING, - pos,pos-6);} + {if (true) return new ConstantIdentifier(Types.STRING,pos,pos-6);} break; case BOOL: jj_consume_token(BOOL); pos = SimpleCharStream.getPosition(); - {if (true) return new ConstantIdentifier(Types.BOOL, - pos,pos-4);} + {if (true) return new ConstantIdentifier(Types.BOOL,pos,pos-4);} break; case BOOLEAN: jj_consume_token(BOOLEAN); pos = SimpleCharStream.getPosition(); - {if (true) return new ConstantIdentifier(Types.BOOLEAN, - pos,pos-7);} + {if (true) return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);} break; case REAL: jj_consume_token(REAL); pos = SimpleCharStream.getPosition(); - {if (true) return new ConstantIdentifier(Types.REAL, - pos,pos-4);} + {if (true) return new ConstantIdentifier(Types.REAL,pos,pos-4);} break; case DOUBLE: jj_consume_token(DOUBLE); pos = SimpleCharStream.getPosition(); - {if (true) return new ConstantIdentifier(Types.DOUBLE, - pos,pos-5);} + {if (true) return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);} break; case FLOAT: jj_consume_token(FLOAT); pos = SimpleCharStream.getPosition(); - {if (true) return new ConstantIdentifier(Types.FLOAT, - pos,pos-5);} + {if (true) return new ConstantIdentifier(Types.FLOAT,pos,pos-5);} break; case INT: jj_consume_token(INT); pos = SimpleCharStream.getPosition(); - {if (true) return new ConstantIdentifier(Types.INT, - pos,pos-3);} + {if (true) return new ConstantIdentifier(Types.INT,pos,pos-3);} break; case INTEGER: jj_consume_token(INTEGER); pos = SimpleCharStream.getPosition(); - {if (true) return new ConstantIdentifier(Types.INTEGER, - pos,pos-7);} + {if (true) return new ConstantIdentifier(Types.INTEGER,pos,pos-7);} break; case OBJECT: jj_consume_token(OBJECT); pos = SimpleCharStream.getPosition(); - {if (true) return new ConstantIdentifier(Types.OBJECT, - pos,pos-6);} + {if (true) return new ConstantIdentifier(Types.OBJECT,pos,pos-6);} break; default: jj_la1[25] = jj_gen; @@ -1304,6 +1217,106 @@ Expression expr,expr2; static final public Expression Expression() throws ParseException { final Expression expr; + Expression initializer = null; + int assignOperator = -1; + final int pos = SimpleCharStream.getPosition(); + 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(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ASSIGN: + case PLUSASSIGN: + case MINUSASSIGN: + case STARASSIGN: + case SLASHASSIGN: + case ANDASSIGN: + case ORASSIGN: + case XORASSIGN: + case DOTASSIGN: + case REMASSIGN: + case TILDEEQUAL: + case LSHIFTASSIGN: + case RSIGNEDSHIFTASSIGN: + assignOperator = AssignmentOperator(); + try { + initializer = Expression(); + } catch (ParseException e) { + if (errorMessage != null) { + {if (true) throw e;} + } + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; + errorLevel = ERROR; + errorEnd = SimpleCharStream.getPosition(); + {if (true) throw e;} + } + break; + default: + jj_la1[26] = jj_gen; + ; + } + if (assignOperator == -1) {if (true) return expr;} + {if (true) return new VarAssignation(expr, + initializer, + assignOperator, + pos, + SimpleCharStream.getPosition());} + {if (true) return expr;} + break; + case LIST: + case PRINT: + expr = ExpressionWBang(); + {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"); + } + + static final public Expression ExpressionWBang() throws ParseException { + final Expression expr; + final int pos = SimpleCharStream.getPosition(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BANG: + jj_consume_token(BANG); + expr = ExpressionWBang(); + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} + break; + case LIST: + case PRINT: + expr = ExpressionNoBang(); + {if (true) return expr;} + break; + default: + jj_la1[28] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + throw new Error("Missing return statement in function"); + } + + static final public Expression ExpressionNoBang() throws ParseException { + final Expression expr; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PRINT: expr = PrintExpression(); @@ -1314,75 +1327,17 @@ Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[26] = jj_gen; - if (jj_2_3(2147483647)) { - expr = varAssignation(); - {if (true) return expr;} - } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAY: - case NEW: - case NULL: - case TRUE: - case FALSE: - case AT: - case DOLLAR: - case BANG: - case INCR: - case DECR: - case PLUS: - case MINUS: - case BIT_AND: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case DOLLAR_ID: - expr = ConditionalExpression(); - {if (true) return expr;} - break; - default: - jj_la1[27] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } + jj_la1[29] = 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 + * Any assignement operator. + * @return the assignement operator id */ - static final public VarAssignation varAssignation() throws ParseException { - String varName; - final Expression expression; - final int assignOperator; - final int pos = SimpleCharStream.getPosition(); - varName = VariableDeclaratorId(); - assignOperator = AssignmentOperator(); - try { - expression = Expression(); - } catch (ParseException e) { - if (errorMessage != null) { - {if (true) throw e;} - } - errorMessage = "expression expected"; - errorLevel = ERROR; - errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = jj_input_stream.getPosition() + 1; - {if (true) throw e;} - } - {if (true) return new VarAssignation(varName.toCharArray(), - expression, - assignOperator, - pos, - SimpleCharStream.getPosition());} - throw new Error("Missing return statement in function"); - } - static final public int AssignmentOperator() throws ParseException { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ASSIGN: @@ -1438,7 +1393,7 @@ Expression expr,expr2; {if (true) return VarAssignation.TILDE_EQUAL;} break; default: - jj_la1[28] = jj_gen; + jj_la1[30] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1458,7 +1413,7 @@ Expression expr,expr2; expr3 = ConditionalExpression(); break; default: - jj_la1[29] = jj_gen; + jj_la1[31] = jj_gen; ; } if (expr3 == null) { @@ -1480,7 +1435,7 @@ Expression expr,expr2; ; break; default: - jj_la1[30] = jj_gen; + jj_la1[32] = jj_gen; break label_8; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1493,7 +1448,7 @@ Expression expr,expr2; operator = OperatorIds.ORL; break; default: - jj_la1[31] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1516,7 +1471,7 @@ Expression expr,expr2; ; break; default: - jj_la1[32] = jj_gen; + jj_la1[34] = jj_gen; break label_9; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1529,7 +1484,7 @@ Expression expr,expr2; operator = OperatorIds.ANDL; break; default: - jj_la1[33] = jj_gen; + jj_la1[35] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1550,7 +1505,7 @@ Expression expr,expr2; ; break; default: - jj_la1[34] = jj_gen; + jj_la1[36] = jj_gen; break label_10; } jj_consume_token(DOT); @@ -1571,7 +1526,7 @@ Expression expr,expr2; ; break; default: - jj_la1[35] = jj_gen; + jj_la1[37] = jj_gen; break label_11; } jj_consume_token(BIT_OR); @@ -1592,7 +1547,7 @@ Expression expr,expr2; ; break; default: - jj_la1[36] = jj_gen; + jj_la1[38] = jj_gen; break label_12; } jj_consume_token(XOR); @@ -1613,7 +1568,7 @@ Expression expr,expr2; ; break; default: - jj_la1[37] = jj_gen; + jj_la1[39] = jj_gen; break label_13; } jj_consume_token(BIT_AND); @@ -1639,7 +1594,7 @@ Expression expr,expr2; ; break; default: - jj_la1[38] = jj_gen; + jj_la1[40] = jj_gen; break label_14; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1664,7 +1619,7 @@ Expression expr,expr2; operator = OperatorIds.EQUAL_EQUAL_EQUAL; break; default: - jj_la1[39] = jj_gen; + jj_la1[41] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1676,8 +1631,8 @@ Expression expr,expr2; } 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;} } expr = new BinaryExpression(expr,expr2,operator); @@ -1700,7 +1655,7 @@ Expression expr,expr2; ; break; default: - jj_la1[40] = jj_gen; + jj_la1[42] = jj_gen; break label_15; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1721,7 +1676,7 @@ Expression expr,expr2; operator = OperatorIds.GREATER_EQUAL; break; default: - jj_la1[41] = jj_gen; + jj_la1[43] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1745,7 +1700,7 @@ Expression expr,expr2; ; break; default: - jj_la1[42] = jj_gen; + jj_la1[44] = jj_gen; break label_16; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1762,7 +1717,7 @@ Expression expr,expr2; operator = OperatorIds.UNSIGNED_RIGHT_SHIFT; break; default: - jj_la1[43] = jj_gen; + jj_la1[45] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1785,7 +1740,7 @@ Expression expr,expr2; ; break; default: - jj_la1[44] = jj_gen; + jj_la1[46] = jj_gen; break label_17; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1798,7 +1753,7 @@ Expression expr,expr2; operator = OperatorIds.MINUS; break; default: - jj_la1[45] = jj_gen; + jj_la1[47] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1815,13 +1770,11 @@ Expression expr,expr2; try { expr = UnaryExpression(); } catch (ParseException e) { - if (errorMessage != null) { - {if (true) throw 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;} } label_18: @@ -1833,7 +1786,7 @@ Expression expr,expr2; ; break; default: - jj_la1[46] = jj_gen; + jj_la1[48] = jj_gen; break label_18; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1850,7 +1803,7 @@ Expression expr,expr2; operator = OperatorIds.REMAINDER; break; default: - jj_la1[47] = jj_gen; + jj_la1[49] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1865,7 +1818,7 @@ Expression expr,expr2; * An unary expression starting with @, & or nothing */ static final public Expression UnaryExpression() throws ParseException { - Expression expr; + final Expression expr; final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case BIT_AND: @@ -1881,8 +1834,8 @@ Expression expr,expr2; case AT: case DOLLAR: case BANG: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case PLUS: case MINUS: case INTEGER_LITERAL: @@ -1892,10 +1845,10 @@ Expression expr,expr2; case LPAREN: case DOLLAR_ID: expr = AtUnaryExpression(); - {if (true) return expr;} + {if (true) return expr;} break; default: - jj_la1[48] = jj_gen; + jj_la1[50] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1903,7 +1856,7 @@ Expression expr,expr2; } static final public Expression AtUnaryExpression() throws ParseException { - Expression expr; + final Expression expr; final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case AT: @@ -1918,8 +1871,8 @@ Expression expr,expr2; case FALSE: case DOLLAR: case BANG: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case PLUS: case MINUS: case INTEGER_LITERAL: @@ -1932,7 +1885,7 @@ Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[49] = jj_gen; + jj_la1[51] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1940,8 +1893,8 @@ Expression expr,expr2; } static final public Expression UnaryExpressionNoPrefix() throws ParseException { - Expression expr; - int operator; + final Expression expr; + final int operator; final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -1956,15 +1909,15 @@ Expression expr,expr2; operator = OperatorIds.MINUS; break; default: - jj_la1[50] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } expr = UnaryExpression(); {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; @@ -1985,7 +1938,7 @@ Expression expr,expr2; {if (true) return expr;} break; default: - jj_la1[51] = jj_gen; + jj_la1[53] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1997,16 +1950,16 @@ final Expression expr; final int operator; final int pos = SimpleCharStream.getPosition(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case INCR: - jj_consume_token(INCR); - operator = OperatorIds.PLUS_PLUS; + case PLUS_PLUS: + jj_consume_token(PLUS_PLUS); + operator = OperatorIds.PLUS_PLUS; break; - case DECR: - jj_consume_token(DECR); - operator = OperatorIds.MINUS_MINUS; + case MINUS_MINUS: + jj_consume_token(MINUS_MINUS); + operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[52] = jj_gen; + jj_la1[54] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2016,57 +1969,53 @@ final int operator; } static final public Expression UnaryExpressionNotPlusMinus() throws ParseException { - Expression expr; + final Expression expr; final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BANG: - jj_consume_token(BANG); - expr = UnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} - break; - default: - jj_la1[53] = jj_gen; - if (jj_2_4(2147483647)) { - expr = CastExpression(); + if (jj_2_3(2147483647)) { + expr = CastExpression(); {if (true) return expr;} - } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAY: - case NEW: - case DOLLAR: - case IDENTIFIER: - case DOLLAR_ID: - expr = PostfixExpression(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BANG: + jj_consume_token(BANG); + expr = UnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} + break; + case ARRAY: + case NEW: + case DOLLAR: + case IDENTIFIER: + case DOLLAR_ID: + expr = PostfixExpression(); {if (true) return expr;} - break; - case NULL: - case TRUE: - case FALSE: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - expr = Literal(); + break; + case NULL: + case TRUE: + case FALSE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + expr = Literal(); {if (true) return expr;} - break; - case LPAREN: - jj_consume_token(LPAREN); - expr = Expression(); - try { - jj_consume_token(RPAREN); - } catch (ParseException e) { + break; + case LPAREN: + jj_consume_token(LPAREN); + expr = Expression(); + try { + jj_consume_token(RPAREN); + } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; - errorStart = 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;} - break; - default: - jj_la1[54] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); } + {if (true) return expr;} + break; + default: + jj_la1[55] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } } throw new Error("Missing return statement in function"); @@ -2094,7 +2043,7 @@ final int pos = SimpleCharStream.getPosition(); type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition()); break; default: - jj_la1[55] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2105,30 +2054,30 @@ final int pos = SimpleCharStream.getPosition(); } static final public Expression PostfixExpression() throws ParseException { - Expression expr; + final 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: - jj_consume_token(INCR); - operator = OperatorIds.PLUS_PLUS; + case PLUS_PLUS: + jj_consume_token(PLUS_PLUS); + operator = OperatorIds.PLUS_PLUS; break; - case DECR: - jj_consume_token(DECR); - operator = OperatorIds.MINUS_MINUS; + case MINUS_MINUS: + jj_consume_token(MINUS_MINUS); + operator = OperatorIds.MINUS_MINUS; break; default: - jj_la1[56] = jj_gen; + jj_la1[57] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[57] = jj_gen; + jj_la1[58] = jj_gen; ; } if (operator == -1) { @@ -2139,79 +2088,36 @@ final int pos = SimpleCharStream.getPosition(); } static final public Expression PrimaryExpression() throws ParseException { - final Token identifier; Expression expr; - final StringBuffer buff = new StringBuffer(); - final int pos = SimpleCharStream.getPosition(); - if (jj_2_5(2)) { - identifier = jj_consume_token(IDENTIFIER); - jj_consume_token(STATICCLASSACCESS); - expr = ClassIdentifier(); - expr = new ClassAccess(new ConstantIdentifier(identifier.image.toCharArray(), - pos, - SimpleCharStream.getPosition()), - expr, - ClassAccess.STATIC); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case NEW: + case DOLLAR: + case IDENTIFIER: + case DOLLAR_ID: + expr = PrimaryPrefix(); label_19: while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CLASSACCESS: - case LPAREN: - case LBRACKET: + if (jj_2_4(2147483647)) { ; - break; - default: - jj_la1[58] = jj_gen; + } else { break label_19; } expr = PrimarySuffix(expr); } {if (true) return expr;} - } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case NEW: - case DOLLAR: - case IDENTIFIER: - case DOLLAR_ID: - expr = PrimaryPrefix(); - label_20: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CLASSACCESS: - case LPAREN: - case LBRACKET: - ; - break; - default: - jj_la1[59] = jj_gen; - break label_20; - } - expr = PrimarySuffix(expr); - } - {if (true) return expr;} - break; - case ARRAY: - expr = ArrayDeclarator(); + break; + case ARRAY: + expr = ArrayDeclarator(); {if (true) return expr;} - break; - default: - jj_la1[60] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[59] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public ArrayInitializer ArrayDeclarator() throws ParseException { - final ArrayVariableDeclaration[] vars; - final int pos = SimpleCharStream.getPosition(); - jj_consume_token(ARRAY); - vars = ArrayInitializer(); - {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());} - throw new Error("Missing return statement in function"); - } - static final public Expression PrimaryPrefix() throws ParseException { final Expression expr; final Token token; @@ -2234,9 +2140,39 @@ final int pos = SimpleCharStream.getPosition(); case DOLLAR: case DOLLAR_ID: var = VariableDeclaratorId(); - {if (true) return new ConstantIdentifier(var.toCharArray(), - pos, - SimpleCharStream.getPosition());} + {if (true) return new VariableDeclaration(currentSegment, + var.toCharArray(), + pos, + SimpleCharStream.getPosition());} + break; + default: + jj_la1[60] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + throw new Error("Missing return statement in function"); + } + + static final public AbstractSuffixExpression PrimarySuffix(final Expression prefix) throws ParseException { + final AbstractSuffixExpression suffix; + final Expression expr; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + suffix = Arguments(prefix); + {if (true) return suffix;} + break; + case CLASSACCESS: + case LBRACKET: + suffix = VariableSuffix(prefix); + {if (true) return suffix;} + break; + case STATICCLASSACCESS: + jj_consume_token(STATICCLASSACCESS); + expr = ClassIdentifier(); + suffix = new ClassAccess(prefix, + expr, + ClassAccess.STATIC); + {if (true) return suffix;} break; default: jj_la1[61] = jj_gen; @@ -2246,6 +2182,20 @@ final int pos = SimpleCharStream.getPosition(); throw new Error("Missing return statement in function"); } +/** + * 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); + vars = ArrayInitializer(); + {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());} + throw new Error("Missing return statement in function"); + } + static final public PrefixedUnaryExpression classInstantiation() throws ParseException { Expression expr; final StringBuffer buff; @@ -2279,6 +2229,7 @@ final int pos = SimpleCharStream.getPosition(); final String expr; final Token token; final int pos = SimpleCharStream.getPosition(); + final ConstantIdentifier type; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENTIFIER: token = jj_consume_token(IDENTIFIER); @@ -2286,6 +2237,18 @@ final int pos = SimpleCharStream.getPosition(); pos, SimpleCharStream.getPosition());} break; + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + type = Type(); + {if (true) return type;} + break; case DOLLAR: case DOLLAR_ID: expr = VariableDeclaratorId(); @@ -2301,27 +2264,7 @@ final int pos = SimpleCharStream.getPosition(); throw new Error("Missing return statement in function"); } - static final public AbstractSuffixExpression PrimarySuffix(Expression prefix) throws ParseException { - final AbstractSuffixExpression expr; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LPAREN: - expr = Arguments(prefix); - {if (true) return expr;} - break; - case CLASSACCESS: - case LBRACKET: - expr = VariableSuffix(prefix); - {if (true) return expr;} - break; - default: - jj_la1[64] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - throw new Error("Missing return statement in function"); - } - - static final public AbstractSuffixExpression VariableSuffix(Expression prefix) throws ParseException { + static final public AbstractSuffixExpression VariableSuffix(final Expression prefix) throws ParseException { String expr = null; final int pos = SimpleCharStream.getPosition(); Expression expression = null; @@ -2333,8 +2276,8 @@ final int pos = SimpleCharStream.getPosition(); } 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 new ClassAccess(prefix, @@ -2363,8 +2306,8 @@ final int pos = SimpleCharStream.getPosition(); case AT: case DOLLAR: case BANG: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case PLUS: case MINUS: case BIT_AND: @@ -2385,8 +2328,8 @@ final int pos = SimpleCharStream.getPosition(); case AT: case DOLLAR: case BANG: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case PLUS: case MINUS: case BIT_AND: @@ -2410,13 +2353,13 @@ final int pos = SimpleCharStream.getPosition(); expression = Type(); break; default: - jj_la1[65] = jj_gen; + jj_la1[64] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[66] = jj_gen; + jj_la1[65] = jj_gen; ; } try { @@ -2424,14 +2367,14 @@ final int pos = SimpleCharStream.getPosition(); } 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 new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());} break; default: - jj_la1[67] = jj_gen; + jj_la1[66] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2455,7 +2398,7 @@ final int pos = SimpleCharStream.getPosition(); case STRING_LITERAL: token = jj_consume_token(STRING_LITERAL); pos = SimpleCharStream.getPosition(); - {if (true) return new StringLiteral(token.image.toCharArray(),pos-token.image.length(),pos);} + {if (true) return new StringLiteral(token.image.toCharArray(),pos-token.image.length());} break; case TRUE: jj_consume_token(TRUE); @@ -2473,24 +2416,42 @@ final int pos = SimpleCharStream.getPosition(); {if (true) return new NullLiteral(pos-4,pos);} break; default: - jj_la1[68] = jj_gen; + jj_la1[67] = jj_gen; jj_consume_token(-1); throw new ParseException(); } throw new Error("Missing return statement in function"); } - static final public FunctionCall Arguments(Expression func) throws ParseException { -ArgumentDeclaration[] args = null; + static final public FunctionCall Arguments(final Expression func) throws ParseException { +Expression[] args = null; jj_consume_token(LPAREN); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: case 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: args = ArgumentList(); break; default: - jj_la1[69] = jj_gen; + jj_la1[68] = jj_gen; ; } try { @@ -2498,89 +2459,49 @@ ArgumentDeclaration[] args = 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 (true) return new FunctionCall(func,args,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } - static final public ArgumentDeclaration[] ArgumentList() throws ParseException { -ArgumentDeclaration arg; +/** + * 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(); -ArgumentDeclaration argument; - arg = argumentDeclaration(); + arg = Expression(); list.add(arg); - label_21: + label_20: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[70] = jj_gen; - break label_21; + jj_la1[69] = jj_gen; + break label_20; } jj_consume_token(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; {if (true) throw e;} } } - ArgumentDeclaration[] args = new ArgumentDeclaration[list.size()]; - list.toArray(args); - {if (true) return args;} - throw new Error("Missing return statement in function"); - } - - static final public ArgumentDeclaration argumentDeclaration() throws ParseException { - boolean reference = false; - String varName; - Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BIT_AND: - jj_consume_token(BIT_AND); - reference = true; - break; - default: - jj_la1[71] = jj_gen; - ; - } - varName = VariableDeclaratorId(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ASSIGN: - jj_consume_token(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; - {if (true) throw e;} - } - break; - default: - jj_la1[72] = jj_gen; - ; - } - if (initializer == null) { - {if (true) return new ArgumentDeclaration(varName.toCharArray(), - reference, - pos);} - } - {if (true) return new ArgumentDeclaration(varName.toCharArray(), - reference, - initializer, - pos);} + final Expression[] arguments = new Expression[list.size()]; + list.toArray(arguments); + {if (true) return arguments;} throw new Error("Missing return statement in function"); } @@ -2590,21 +2511,21 @@ ArgumentDeclaration argument; static final public Statement StatementNoBreak() throws ParseException { final Statement statement; Token token = null; - if (jj_2_6(2)) { + if (jj_2_5(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;} } } {if (true) return statement;} - } else if (jj_2_7(2)) { + } else if (jj_2_6(2)) { statement = LabeledStatement(); {if (true) return statement;} } else { @@ -2620,8 +2541,8 @@ ArgumentDeclaration argument; case ARRAY: case NEW: case DOLLAR: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case IDENTIFIER: case DOLLAR_ID: statement = StatementExpression(); @@ -2630,8 +2551,8 @@ ArgumentDeclaration argument; } 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;} @@ -2682,7 +2603,7 @@ ArgumentDeclaration argument; token = jj_consume_token(AT); break; default: - jj_la1[73] = jj_gen; + jj_la1[70] = jj_gen; ; } statement = IncludeStatement(); @@ -2699,8 +2620,12 @@ ArgumentDeclaration argument; statement = GlobalStatement(); {if (true) return statement;} break; + case DEFINE: + statement = defineStatement(); + currentSegment.add((Outlineable)statement);{if (true) return statement;} + break; default: - jj_la1[74] = jj_gen; + jj_la1[71] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2708,6 +2633,63 @@ ArgumentDeclaration argument; 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 { + 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; + {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. */ @@ -2724,6 +2706,7 @@ ArgumentDeclaration argument; case INCLUDE_ONCE: case REQUIRE_ONCE: case GLOBAL: + case DEFINE: case STATIC: case CONTINUE: case DO: @@ -2739,8 +2722,8 @@ ArgumentDeclaration argument; case AT: case DOLLAR: case BANG: - case INCR: - case DECR: + case PLUS_PLUS: + case MINUS_MINUS: case PLUS: case MINUS: case BIT_AND: @@ -2760,7 +2743,7 @@ ArgumentDeclaration argument; {if (true) return statement;} break; default: - jj_la1[75] = jj_gen; + jj_la1[72] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2772,18 +2755,18 @@ ArgumentDeclaration argument; */ static final public HTMLBlock htmlBlock() throws ParseException { final int startIndex = nodePtr; - AstNode[] blockNodes; - int nbNodes; + final AstNode[] blockNodes; + final int nbNodes; jj_consume_token(PHPEND); - label_22: + label_21: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PHPECHOSTART: ; break; default: - jj_la1[76] = jj_gen; - break label_22; + jj_la1[73] = jj_gen; + break label_21; } phpEchoBlock(); } @@ -2796,21 +2779,22 @@ ArgumentDeclaration argument; jj_consume_token(PHPSTARTSHORT); break; default: - jj_la1[77] = jj_gen; + jj_la1[74] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } catch (ParseException e) { - errorMessage = "End of file unexpected, '= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 125; 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) { @@ -7094,7 +7018,6 @@ final int startBlock, endBlock; case 4: jj_3_5(); break; case 5: jj_3_6(); break; case 6: jj_3_7(); break; - case 7: jj_3_8(); break; } } p = p.next;