From 6391fca5ccdfbefc8cb3ad15dbaadf40d2e0fd54 Mon Sep 17 00:00:00 2001 From: kpouer Date: Sun, 15 Jun 2003 14:53:57 +0000 Subject: [PATCH] *** empty log message *** --- .../phpdt/internal/compiler/ast/Block.java | 3 +- .../internal/compiler/ast/ClassDeclaration.java | 4 +- .../phpdt/internal/compiler/ast/IfStatement.java | 6 +- .../phpdt/internal/compiler/ast/PHPDocument.java | 7 +- .../internal/compiler/ast/VarAssignation.java | 47 +- .../phpeclipse/phpeditor/PHPParserAction.java | 3 + net.sourceforge.phpeclipse/src/test/PHPParser.java | 622 +++++++------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 146 ++-- .../src/test/PHPParserConstants.java | 248 +++--- .../src/test/PHPParserSuperclass.java | 69 +- .../src/test/PHPParserTokenManager.java | 900 +++++++++++--------- 11 files changed, 1105 insertions(+), 950 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Block.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Block.java index 145fb87..b3ef5d1 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Block.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Block.java @@ -36,10 +36,9 @@ public class Block extends Statement { final String s = AstNode.tabString(tab); final StringBuffer buff = new StringBuffer(s); buff.append("{\n"); //$NON-NLS-1$ - if (this.statements == null) { + if (this.statements != null) { for (int i = 0; i < statements.length; i++) { buff.append(statements[i].toString(tab+1)).append(";\n");//$NON-NLS-1$ - buff.append(statements[i].getClass().getName()).append(";\n");//$NON-NLS-1$ } } buff.append("}\n"); //$NON-NLS-1$ diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ClassDeclaration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ClassDeclaration.java index 9c5bf07..62420f4 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ClassDeclaration.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ClassDeclaration.java @@ -72,7 +72,7 @@ public class ClassDeclaration extends Statement implements OutlineableWithChildr position = new Position(sourceStart, name.length); } - public void add(MethodDeclaration method) { + public void addMethod(MethodDeclaration method) { methods.add(method); add(method); if (method.name.equals(name)) { @@ -80,7 +80,7 @@ public class ClassDeclaration extends Statement implements OutlineableWithChildr } } - public void add(FieldDeclaration var) { + public void addField(FieldDeclaration var) { for (int i = 0; i < var.vars.length; i++) { VariableDeclaration c = var.vars[i]; children.add(c); diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IfStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IfStatement.java index aebef7b..e424d23 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IfStatement.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IfStatement.java @@ -16,7 +16,7 @@ public class IfStatement extends Statement { public Else els; /** - * Create a new If statement + * Create a new If statement. * @param condition the condition * @param statement a statement or a block of statements * @param elseifs the elseifs @@ -46,11 +46,9 @@ public class IfStatement extends Statement { final StringBuffer buff = new StringBuffer(tabString(tab)); buff.append("if ("); buff.append(condition.toStringExpression()).append(") "); - buff.append("\n"); buff.append(statement.toString(tab+1)); for (int i = 0; i < elseifs.length; i++) { - ElseIf elseif = elseifs[i]; - buff.append(elseif.toString(tab+1)); + buff.append(elseifs[i].toString(tab+1)); buff.append("\n"); } if (els != null) { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PHPDocument.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PHPDocument.java index e2d2fc5..d6a394d 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PHPDocument.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PHPDocument.java @@ -24,6 +24,7 @@ public class PHPDocument implements OutlineableWithChildren { public AstNode[] nodes; public char[] name; + /** The parent of the object. */ public Object parent; @@ -56,7 +57,11 @@ public class PHPDocument implements OutlineableWithChildren { break; } buff.append(node.toString(0)); - buff.append(";\n"); + if (node instanceof HTMLCode) { + buff.append("\n"); + } else { + buff.append(";\n"); + } } } return buff.toString(); diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VarAssignation.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VarAssignation.java index dc08043..e54de47 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VarAssignation.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VarAssignation.java @@ -1,6 +1,8 @@ package net.sourceforge.phpdt.internal.compiler.ast; /** + * A Variable assignation. + * $varname = initializer * @author Matthieu Casanova */ public class VarAssignation extends Expression { @@ -19,23 +21,34 @@ public class VarAssignation extends Expression { public static final int LSHIFT_EQUAL = 11; public static final int RSIGNEDSHIFT_EQUAL = 12; - public char[] variable; - public Expression expression; + public char[] variableName; + public Expression initializer; public int operator; - - public VarAssignation(char[] variable, - Expression expression, - int operator, - int sourceStart, - int sourceEnd) { + /** + * Create a new variable assignation. + * @param variableName the name of the variable + * @param initializer the expression in initializer + * @param operator the operator of assignation + * @param sourceStart the sourceStart + * @param sourceEnd the sourceEnd + */ + public VarAssignation(final char[] variableName, + final Expression initializer, + final int operator, + final int sourceStart, + final int sourceEnd) { super(sourceStart, sourceEnd); - this.variable = variable; - this.expression = expression; + this.variableName = variableName; + this.initializer = initializer; this.operator = operator; } - public String operatorToString() { + /** + * Return the operator as String. + * @return the operator + */ + public final String operatorToString() { switch (operator) { case EQUAL: return "="; //$NON-NLS-1$ @@ -64,7 +77,7 @@ public class VarAssignation extends Expression { case RSIGNEDSHIFT_EQUAL: return ">>="; //$NON-NLS-1$ } - return " unknown operator "; + return " unknown operator ";//$NON-NLS-1$ } /** @@ -72,12 +85,12 @@ public class VarAssignation extends Expression { * @return the expression */ public String toStringExpression() { - final StringBuffer buff = new StringBuffer(); - buff.append(variable); - buff.append(" "); + final StringBuffer buff = new StringBuffer("$"); + buff.append(variableName); + buff.append(" ");//$NON-NLS-1$ buff.append(operatorToString()); - buff.append(" "); - buff.append(expression.toStringExpression()); + buff.append(" ");//$NON-NLS-1$ + buff.append(initializer.toStringExpression()); return buff.toString(); } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java index 7dc47c4..32015b0 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java @@ -79,6 +79,9 @@ public class PHPParserAction extends TextEditorAction { // first delete all the previous markers fileToParse.deleteMarkers(IMarker.PROBLEM, false, 0); + //the tasks are removed here + fileToParse.deleteMarkers(IMarker.TASK, false, 0); + try { InputStream iStream = fileToParse.getContents(); // int c = iStream.read(); diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index aba9b11..8b59f42 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.*; @@ -167,31 +166,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, @@ -281,6 +255,25 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); } + /** + * Create a new task. + */ + public static final void createNewTask() { + final int currentPosition = SimpleCharStream.getPosition(); + final String todo = SimpleCharStream.currentBuffer.substring(currentPosition+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(); } @@ -343,7 +336,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(); @@ -638,10 +631,11 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case FUNCTION: method = MethodDeclaration(); - method.setParent(classDeclaration); + classDeclaration.addMethod(method); break; case VAR: field = FieldDeclaration(); + classDeclaration.addField(field); break; default: jj_la1[8] = jj_gen; @@ -662,7 +656,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon 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) { @@ -677,7 +670,6 @@ 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); @@ -738,13 +730,12 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon */ static final public String VariableDeclaratorId() throws ParseException { String expr; - Expression expression; + 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)) { @@ -756,9 +747,11 @@ 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; @@ -769,6 +762,10 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon 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; @@ -799,7 +796,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case DOLLAR: jj_consume_token(DOLLAR); expr = VariableName(); - {if (true) return "$" + expr;} + {if (true) return expr;} break; default: jj_la1[12] = jj_gen; @@ -1022,6 +1019,7 @@ Expression expr,expr2; static final public MethodDeclaration MethodDeclaration() throws ParseException { final MethodDeclaration functionDeclaration; final Block block; + final OutlineableWithChildren seg = currentSegment; jj_consume_token(FUNCTION); try { functionDeclaration = MethodDeclarator(); @@ -1034,16 +1032,11 @@ Expression expr,expr2; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} } - if (currentSegment != null) { - currentSegment.add(functionDeclaration); - currentSegment = functionDeclaration; - } + currentSegment = functionDeclaration; block = Block(); - functionDeclaration.statements = block.statements; - if (currentSegment != null) { - currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - } - {if (true) return functionDeclaration;} + functionDeclaration.statements = block.statements; + currentSegment = seg; + {if (true) return functionDeclaration;} throw new Error("Missing return statement in function"); } @@ -1078,11 +1071,11 @@ Expression expr,expr2; } formalParameters = FormalParameters(); {if (true) return new MethodDeclaration(currentSegment, - identifierChar, - formalParameters, - reference != null, - pos, - SimpleCharStream.getPosition());} + identifierChar, + formalParameters, + reference != null, + pos, + SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); } @@ -1100,7 +1093,7 @@ Expression expr,expr2; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + processParseException(e); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOLLAR: @@ -1134,7 +1127,7 @@ Expression expr,expr2; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} + processParseException(e); } {if (true) return parameters;} throw new Error("Missing return statement in function"); @@ -1275,13 +1268,13 @@ Expression expr,expr2; */ static final public VarAssignation varAssignation() throws ParseException { String varName; - final Expression expression; + final Expression initializer; final int assignOperator; final int pos = SimpleCharStream.getPosition(); varName = VariableDeclaratorId(); assignOperator = AssignmentOperator(); try { - expression = Expression(); + initializer = Expression(); } catch (ParseException e) { if (errorMessage != null) { {if (true) throw e;} @@ -1293,7 +1286,7 @@ Expression expr,expr2; {if (true) throw e;} } {if (true) return new VarAssignation(varName.toCharArray(), - expression, + initializer, assignOperator, pos, SimpleCharStream.getPosition());} @@ -2693,7 +2686,7 @@ final ArrayList list = new ArrayList(); throw new ParseException(); } } catch (ParseException e) { - errorMessage = "End of file unexpected, '= 0) { @@ -6841,7 +6837,7 @@ final int startBlock, endBlock; } } } - for (int i = 0; i < 141; i++) { + for (int i = 0; i < 142; i++) { if (la1tokens[i]) { jj_expentry = new int[1]; jj_expentry[0] = i; diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj index 2b4a1e9..c348a5e 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -29,7 +29,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.*; @@ -188,31 +187,6 @@ public final class PHPParser extends PHPParserSuperclass { } } - /** - * 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, @@ -302,6 +276,25 @@ public final class PHPParser extends PHPParserSuperclass { pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition)); } + /** + * Create a new task. + */ + public static final void createNewTask() { + final int currentPosition = SimpleCharStream.getPosition(); + final String todo = SimpleCharStream.currentBuffer.substring(currentPosition+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(); } @@ -342,34 +335,30 @@ PARSER_END(PHPParser) SPECIAL_TOKEN : { "//" : IN_SINGLE_LINE_COMMENT -| - "#" : IN_SINGLE_LINE_COMMENT -| - <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT -| - "/*" : IN_MULTI_LINE_COMMENT +| "#" : IN_SINGLE_LINE_COMMENT +| <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT +| "/*" : IN_MULTI_LINE_COMMENT } SPECIAL_TOKEN : { : PHPPARSING +| "?>" : DEFAULT } - SPECIAL_TOKEN : + SPECIAL_TOKEN : { - " > : DEFAULT + "todo" {PHPParser.createNewTask();} } - -SPECIAL_TOKEN : + SPECIAL_TOKEN : { - : PHPPARSING + "*/" : PHPPARSING } - -SPECIAL_TOKEN : + SPECIAL_TOKEN : { - : PHPPARSING + "*/" : PHPPARSING } @@ -606,7 +595,7 @@ MORE : TOKEN : { - < DOLLAR_ID: > + > } void phpFile() : @@ -614,7 +603,7 @@ void phpFile() : { try { (PhpBlock())* - + {PHPParser.createNewHTMLCode();} } catch (TokenMgrError e) { PHPeclipsePlugin.log(e); errorStart = SimpleCharStream.getPosition(); @@ -776,8 +765,8 @@ void ClassBodyDeclaration(ClassDeclaration classDeclaration) : FieldDeclaration field; } { - method = MethodDeclaration() {method.setParent(classDeclaration);} -| field = FieldDeclaration() + method = MethodDeclaration() {classDeclaration.addMethod(method);} +| field = FieldDeclaration() {classDeclaration.addField(field);} } /** @@ -793,12 +782,10 @@ FieldDeclaration FieldDeclaration() : { variableDeclaration = VariableDeclarator() {arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name)); - currentSegment.add(variableDeclaration);} + outlineInfo.addVariable(new String(variableDeclaration.name));} ( variableDeclaration = VariableDeclarator() {arrayList.add(variableDeclaration); - outlineInfo.addVariable(new String(variableDeclaration.name)); - currentSegment.add(variableDeclaration);} + outlineInfo.addVariable(new String(variableDeclaration.name));} )* try { @@ -859,22 +846,26 @@ VariableDeclaration VariableDeclarator() : String VariableDeclaratorId() : { String expr; - Expression expression; + Expression expression = null; final StringBuffer buff = new StringBuffer(); final int pos = SimpleCharStream.getPosition(); ConstantIdentifier ex; } { try { - expr = Variable() {buff.append(expr);} + expr = Variable() ( LOOKAHEAD(2) {ex = new ConstantIdentifier(expr.toCharArray(), pos, SimpleCharStream.getPosition());} expression = VariableSuffix(ex) - {buff.append(expression.toStringExpression());} )* - {return buff.toString();} + { + if (expression == null) { + return expr; + } + return expression.toStringExpression(); + } } catch (ParseException e) { errorMessage = "'$' expected for variable identifier"; errorLevel = ERROR; @@ -884,6 +875,10 @@ String VariableDeclaratorId() : } } +/** + * Return a variablename without the $. + * @return a variable name + */ String Variable(): { final StringBuffer buff; @@ -905,7 +900,7 @@ String Variable(): } | expr = VariableName() - {return "$" + expr;} + {return expr;} } /** @@ -1019,6 +1014,7 @@ MethodDeclaration MethodDeclaration() : { final MethodDeclaration functionDeclaration; final Block block; + final OutlineableWithChildren seg = currentSegment; } { @@ -1033,20 +1029,11 @@ MethodDeclaration MethodDeclaration() : errorEnd = SimpleCharStream.getPosition() + 1; throw e; } - { - if (currentSegment != null) { - currentSegment.add(functionDeclaration); - currentSegment = functionDeclaration; - } - } + {currentSegment = functionDeclaration;} block = Block() - { - functionDeclaration.statements = block.statements; - if (currentSegment != null) { - currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - } - return functionDeclaration; - } + {functionDeclaration.statements = block.statements; + currentSegment = seg; + return functionDeclaration;} } /** @@ -1076,11 +1063,11 @@ MethodDeclaration MethodDeclarator() : } formalParameters = FormalParameters() {return new MethodDeclaration(currentSegment, - identifierChar, - formalParameters, - reference != null, - pos, - SimpleCharStream.getPosition());} + identifierChar, + formalParameters, + reference != null, + pos, + SimpleCharStream.getPosition());} } /** @@ -1100,7 +1087,7 @@ Hashtable FormalParameters() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + processParseException(e); } [ var = FormalParameter() {parameters.put(new String(var.name),var);} @@ -1116,7 +1103,7 @@ Hashtable FormalParameters() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - throw e; + processParseException(e); } {return parameters;} } @@ -1181,7 +1168,7 @@ Expression Expression() : VarAssignation varAssignation() : { String varName; - final Expression expression; + final Expression initializer; final int assignOperator; final int pos = SimpleCharStream.getPosition(); } @@ -1189,7 +1176,7 @@ VarAssignation varAssignation() : varName = VariableDeclaratorId() assignOperator = AssignmentOperator() try { - expression = Expression() + initializer = Expression() } catch (ParseException e) { if (errorMessage != null) { throw e; @@ -1201,7 +1188,7 @@ VarAssignation varAssignation() : throw e; } {return new VarAssignation(varName.toCharArray(), - expression, + initializer, assignOperator, pos, SimpleCharStream.getPosition());} @@ -1839,7 +1826,7 @@ HTMLBlock htmlBlock() : try { ( | ) } catch (ParseException e) { - errorMessage = "End of file unexpected, '", "\"?>\"", + "\"todo\"", "\"*/\"", "\"*/\"", - "", + "", "\"class\"", "\"function\"", "\"var\"", diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java index 1dee6aa..c1bf446 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserSuperclass.java @@ -24,6 +24,7 @@ public abstract class PHPParserSuperclass { public static final int ERROR = 2; public static final int WARNING = 1; public static final int INFO = 0; + public static final int TASK = 3; /** * Call the php parse command ( php -l -f <filename> ) @@ -32,17 +33,17 @@ public abstract class PHPParserSuperclass { */ public static void phpExternalParse(final IFile file) { //IFile file = (IFile) resource; - // final IPath path = file.getFullPath(); + // final IPath path = file.getFullPath(); final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); final String filename = file.getLocation().toString(); - final String[] arguments = { filename }; + final String[] arguments = {filename}; final MessageFormat form = - new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); + new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); final String command = form.format(arguments); final String parserResult = - PHPStartApacheAction.getParserOutput(command, "External parser: "); + PHPStartApacheAction.getParserOutput(command, "External parser: "); try { // parse the buffer to find the errors and warnings @@ -53,9 +54,11 @@ public abstract class PHPParserSuperclass { /** * Create markers according to the external parser output. + * @param output the external parser output + * @param file the file that was parsed. */ - private static void createMarkers(final String output, final IFile file) - throws CoreException { + protected static void createMarkers(final String output, final IFile file) + throws CoreException { // delete all markers file.deleteMarkers(IMarker.PROBLEM, false, 0); @@ -78,15 +81,15 @@ public abstract class PHPParserSuperclass { } private static void scanLine(final String output, final IFile file, final int indx, final int brIndx) - throws CoreException { + throws CoreException { String current; - // String outLineNumberString; never used + // String outLineNumberString; never used 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) { + || current.indexOf(PARSE_ERROR_STRING) != -1) { final int onLine = current.indexOf("on line "); if (onLine != -1) { lineNumberBuffer.delete(0, lineNumberBuffer.length()); @@ -110,8 +113,8 @@ public abstract class PHPParserSuperclass { attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); else if (current.indexOf(PARSE_WARNING_STRING) != -1) attributes.put( - IMarker.SEVERITY, - new Integer(IMarker.SEVERITY_WARNING)); + IMarker.SEVERITY, + new Integer(IMarker.SEVERITY_WARNING)); else attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); MarkerUtilities.setLineNumber(attributes, lineNumber); @@ -148,7 +151,7 @@ public abstract class PHPParserSuperclass { * @param charStart the starting character * @param charEnd the end character * @param errorLevel the error level ({@link PHPParserSuperclass#ERROR}, - * {@link PHPParserSuperclass#INFO},{@link PHPParserSuperclass#WARNING}) + * {@link PHPParserSuperclass#INFO},{@link PHPParserSuperclass#WARNING}),{@link PHPParserSuperclass#TASK}) * @throws CoreException an exception throwed by the MarkerUtilities */ public static void setMarker(final IFile file, @@ -156,20 +159,23 @@ public abstract class PHPParserSuperclass { final int charStart, final int charEnd, final int errorLevel) - throws CoreException { + throws CoreException { if (file != null) { final Hashtable attributes = new Hashtable(); MarkerUtilities.setMessage(attributes, message); switch (errorLevel) { - case Parser.ERROR : + case ERROR: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); break; - case Parser.WARNING : + case WARNING: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); break; - case Parser.INFO : + case INFO: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); break; + case TASK: + attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK)); + break; } MarkerUtilities.setCharStart(attributes, charStart); MarkerUtilities.setCharEnd(attributes, charEnd); @@ -191,26 +197,32 @@ public abstract class PHPParserSuperclass { final int line, final int errorLevel, final String location) - throws CoreException { + throws CoreException { if (file != null) { + String markerKind = IMarker.PROBLEM; final Hashtable attributes = new Hashtable(); MarkerUtilities.setMessage(attributes, message); switch (errorLevel) { - case Parser.ERROR : + case ERROR: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); break; - case Parser.WARNING : + case WARNING: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); break; - case Parser.INFO : + case INFO: + attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); + break; + case TASK: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); + markerKind = IMarker.TASK; break; } - attributes.put(IMarker.LOCATION,location); + attributes.put(IMarker.LOCATION, location); MarkerUtilities.setLineNumber(attributes, line); - MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); + MarkerUtilities.createMarker(file, attributes, markerKind); } } + /** * This will set a marker. * @param file the file that generated the marker @@ -228,22 +240,25 @@ public abstract class PHPParserSuperclass { final int charEnd, final int errorLevel, final String location) - throws CoreException { + throws CoreException { if (file != null) { final Hashtable attributes = new Hashtable(); MarkerUtilities.setMessage(attributes, message); switch (errorLevel) { - case Parser.ERROR : + case ERROR: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); break; - case Parser.WARNING : + case WARNING: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); break; - case Parser.INFO : + case INFO: attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); break; + case TASK: + attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK)); + break; } - attributes.put(IMarker.LOCATION,location); + attributes.put(IMarker.LOCATION, location); MarkerUtilities.setCharStart(attributes, charStart); MarkerUtilities.setCharEnd(attributes, charEnd); MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index be6ded1..b7f86bf 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -6,7 +6,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.jface.preference.IPreferenceStore; import java.util.Hashtable; -import java.util.Enumeration; import java.util.ArrayList; import java.io.StringReader; import java.io.*; @@ -120,7 +119,10 @@ static private final int jjMoveStringLiteralDfa0_4() switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_4(0x40000L); + return jjMoveStringLiteralDfa1_4(0x80000L); + case 84: + case 116: + return jjMoveStringLiteralDfa1_4(0x20000L); default : return 1; } @@ -134,14 +136,54 @@ static private final int jjMoveStringLiteralDfa1_4(long active0) switch(curChar) { case 47: - if ((active0 & 0x40000L) != 0L) - return jjStopAtPos(1, 18); + if ((active0 & 0x80000L) != 0L) + return jjStopAtPos(1, 19); break; + case 79: + case 111: + return jjMoveStringLiteralDfa2_4(active0, 0x20000L); default : return 2; } return 2; } +static private final int jjMoveStringLiteralDfa2_4(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return 2; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 2; + } + switch(curChar) + { + case 68: + case 100: + return jjMoveStringLiteralDfa3_4(active0, 0x20000L); + default : + return 3; + } +} +static private final int jjMoveStringLiteralDfa3_4(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return 3; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 3; + } + switch(curChar) + { + case 79: + case 111: + if ((active0 & 0x20000L) != 0L) + return jjStopAtPos(3, 17); + break; + default : + return 4; + } + return 4; +} private static final int jjStopStringLiteralDfa_2(int pos, long active0) { switch (pos) @@ -168,6 +210,9 @@ static private final int jjMoveStringLiteralDfa0_2() { case 63: return jjMoveStringLiteralDfa1_2(0x10000L); + case 84: + case 116: + return jjMoveStringLiteralDfa1_2(0x20000L); default : return jjMoveNfa_2(0, 0); } @@ -185,11 +230,54 @@ static private final int jjMoveStringLiteralDfa1_2(long active0) if ((active0 & 0x10000L) != 0L) return jjStopAtPos(1, 16); break; + case 79: + case 111: + return jjMoveStringLiteralDfa2_2(active0, 0x20000L); default : break; } return jjStartNfa_2(0, active0); } +static private final int jjMoveStringLiteralDfa2_2(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return jjStartNfa_2(0, old0); + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + jjStopStringLiteralDfa_2(1, active0); + return 2; + } + switch(curChar) + { + case 68: + case 100: + return jjMoveStringLiteralDfa3_2(active0, 0x20000L); + default : + break; + } + return jjStartNfa_2(1, active0); +} +static private final int jjMoveStringLiteralDfa3_2(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return jjStartNfa_2(1, old0); + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + jjStopStringLiteralDfa_2(2, active0); + return 3; + } + switch(curChar) + { + case 79: + case 111: + if ((active0 & 0x20000L) != 0L) + return jjStopAtPos(3, 17); + break; + default : + break; + } + return jjStartNfa_2(2, active0); +} static private final void jjCheckNAdd(int state) { if (jjrounds[state] != jjround) @@ -301,124 +389,124 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x4800L) != 0L || (active1 & 0x200000L) != 0L || (active2 & 0x8L) != 0L) + if ((active0 & 0x4800L) != 0L || (active1 & 0x400000L) != 0L || (active2 & 0x10L) != 0L) return 2; - if ((active1 & 0x200L) != 0L) + if ((active1 & 0x400L) != 0L) return 16; - if ((active1 & 0x20000000000000L) != 0L || (active2 & 0x80L) != 0L) + if ((active1 & 0x40000000000000L) != 0L || (active2 & 0x100L) != 0L) return 8; - if ((active0 & 0xffffff1ffff00000L) != 0L || (active1 & 0x600000ffL) != 0L) + if ((active0 & 0xfffffe3fffe00000L) != 0L || (active1 & 0xc00001ffL) != 0L) { - jjmatchedKind = 105; + jjmatchedKind = 106; return 14; } return -1; case 1: if ((active0 & 0x4000L) != 0L) return 0; - if ((active0 & 0xbfffef1fff700000L) != 0L || (active1 & 0x400000efL) != 0L) + if ((active0 & 0x7fffde3ffee00000L) != 0L || (active1 & 0x800001dfL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 1; } return 14; } - if ((active0 & 0x4000100000800000L) != 0L || (active1 & 0x20000010L) != 0L) + if ((active0 & 0x8000200001000000L) != 0L || (active1 & 0x40000020L) != 0L) return 14; return -1; case 2: - if ((active0 & 0x2001400000400000L) != 0L || (active1 & 0x400000c0L) != 0L) + if ((active0 & 0x4002800000800000L) != 0L || (active1 & 0x80000180L) != 0L) return 14; - if ((active0 & 0x9ffeaf1fff300000L) != 0L || (active1 & 0x3fL) != 0L) + if ((active0 & 0x3ffd5e3ffe600000L) != 0L || (active1 & 0x7fL) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 2; } return 14; } return -1; case 3: - if ((active0 & 0x62810053000000L) != 0L || (active1 & 0xeL) != 0L) + if ((active0 & 0xc50200a6000000L) != 0L || (active1 & 0x1cL) != 0L) return 14; - if ((active0 & 0xbf9c2e1fac300000L) != 0L || (active1 & 0xb1L) != 0L) + if ((active0 & 0x7f385c3f58600000L) != 0L || (active1 & 0x163L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0x98802002c100000L) != 0L || (active1 & 0x20L) != 0L) + if ((active0 & 0x1310040058200000L) != 0L || (active1 & 0x40L) != 0L) return 14; - if ((active0 & 0xb6142c1f81200000L) != 0L || (active1 & 0x95L) != 0L) + if ((active0 & 0x6c28583f02400000L) != 0L || (active1 & 0x12bL) != 0L) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 4; return 14; } return -1; case 5: - if ((active0 & 0x9014001801000000L) != 0L || (active1 & 0x11L) != 0L) + if ((active0 & 0x2028003002000000L) != 0L || (active1 & 0x23L) != 0L) return 14; - if ((active0 & 0x26002c0780200000L) != 0L || (active1 & 0x84L) != 0L) + if ((active0 & 0x4c00580f00400000L) != 0L || (active1 & 0x108L) != 0L) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 5; return 14; } return -1; case 6: - if ((active0 & 0x2000280780000000L) != 0L || (active1 & 0x84L) != 0L) + if ((active0 & 0x4000500f00000000L) != 0L || (active1 & 0x108L) != 0L) return 14; - if ((active0 & 0x600040000200000L) != 0L) + if ((active0 & 0xc00080000400000L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 6; } return 14; } return -1; case 7: - if ((active0 & 0x200040000200000L) != 0L) + if ((active0 & 0x400080000400000L) != 0L) return 14; - if ((active0 & 0x400000600000000L) != 0L) + if ((active0 & 0x800000c00000000L) != 0L) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 7; return 14; } return -1; case 8: - if ((active0 & 0x400000000000000L) != 0L) + if ((active0 & 0x800000000000000L) != 0L) return 14; - if ((active0 & 0x600000000L) != 0L) + if ((active0 & 0xc00000000L) != 0L) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 8; return 14; } return -1; case 9: - if ((active0 & 0x600000000L) != 0L) + if ((active0 & 0xc00000000L) != 0L) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 9; return 14; } return -1; case 10: - if ((active0 & 0x600000000L) != 0L) + if ((active0 & 0xc00000000L) != 0L) { - jjmatchedKind = 105; + jjmatchedKind = 106; jjmatchedPos = 10; return 14; } @@ -444,126 +532,126 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 74; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2800000000000000L, 0x0L); + jjmatchedKind = 75; + return jjMoveStringLiteralDfa1_1(0x0L, 0x5000000000000000L, 0x0L); case 35: return jjStopAtPos(0, 12); case 36: - return jjStartNfaWithStates_1(0, 73, 16); + return jjStartNfaWithStates_1(0, 74, 16); case 37: - jjmatchedKind = 89; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L); + jjmatchedKind = 90; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L); case 38: - jjmatchedKind = 86; - return jjMoveStringLiteralDfa1_1(0x0L, 0x8000L, 0x10L); + jjmatchedKind = 87; + return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x20L); case 40: - return jjStopAtPos(0, 109); - case 41: return jjStopAtPos(0, 110); + case 41: + return jjStopAtPos(0, 111); case 42: - jjmatchedKind = 84; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4L); + jjmatchedKind = 85; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x8L); case 43: - jjmatchedKind = 82; - return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x1L); + jjmatchedKind = 83; + return jjMoveStringLiteralDfa1_1(0x0L, 0x20000L, 0x2L); case 44: - return jjStopAtPos(0, 116); + return jjStopAtPos(0, 117); case 45: - jjmatchedKind = 83; - return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x20000L, 0x2L); + jjmatchedKind = 84; + return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x40000L, 0x4L); case 46: - jjmatchedKind = 117; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x80L); + jjmatchedKind = 118; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L); case 47: - jjmatchedKind = 85; - return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x8L); + jjmatchedKind = 86; + return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x10L); case 58: - jjmatchedKind = 77; - return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L); + jjmatchedKind = 78; + return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 115); + return jjStopAtPos(0, 116); case 60: - jjmatchedKind = 119; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1200000004000000L, 0x400L); + jjmatchedKind = 120; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2400000008000000L, 0x800L); case 61: - jjmatchedKind = 127; - return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x4100000000000000L, 0x0L); + jjmatchedKind = 128; + return jjMoveStringLiteralDfa1_1(0x10000000000L, 0x8200000000000000L, 0x0L); case 62: - jjmatchedKind = 118; - return jjMoveStringLiteralDfa1_1(0x0L, 0x400000018000000L, 0x800L); + jjmatchedKind = 119; + return jjMoveStringLiteralDfa1_1(0x0L, 0x800000030000000L, 0x1000L); case 63: - jjmatchedKind = 76; + jjmatchedKind = 77; return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 72); + return jjStopAtPos(0, 73); case 91: - return jjStopAtPos(0, 113); - case 93: return jjStopAtPos(0, 114); + case 93: + return jjStopAtPos(0, 115); case 94: - jjmatchedKind = 88; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x40L); + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x80L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x4000000004000000L, 0x40000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000000008000000L, 0x80000000L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0x8000000L, 0x6L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x10000000L, 0xcL, 0x0L); case 67: case 99: - return jjMoveStringLiteralDfa1_1(0x70000100000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xe0000200000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x180000000000L, 0x10L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x300000000000L, 0x20L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0x1e00200043000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x3c00400086000000L, 0x0L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x2080400000200000L, 0x20L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4100800000400000L, 0x40L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x800800000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1001000000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0x280800000L, 0xc0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x501000000L, 0x180L, 0x0L); case 76: case 108: - return jjMoveStringLiteralDfa1_1(0x10000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_1(0x3000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x6000000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x0L, 0x20000001L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x40000002L, 0x0L); case 80: case 112: - return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x40000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x4000500000000L, 0x8L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000a00000000L, 0x10L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x8018001000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x30002000000000L, 0x1L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_1(0x60000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xc0000000000000L, 0x0L, 0x0L); case 86: case 118: - return jjMoveStringLiteralDfa1_1(0x400000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_1(0x100000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x200000000000000L, 0x0L, 0x0L); case 123: - return jjStopAtPos(0, 111); + return jjStopAtPos(0, 112); case 124: - jjmatchedKind = 87; - return jjMoveStringLiteralDfa1_1(0x0L, 0x4000L, 0x20L); + jjmatchedKind = 88; + return jjMoveStringLiteralDfa1_1(0x0L, 0x8000L, 0x40L); case 125: - return jjStopAtPos(0, 112); + return jjStopAtPos(0, 113); case 126: - jjmatchedKind = 75; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L); + jjmatchedKind = 76; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L); default : return jjMoveNfa_1(3, 0); } @@ -578,53 +666,51 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x8000L) != 0L) - return jjStopAtPos(1, 79); + if ((active1 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; case 42: if ((active0 & 0x4000L) != 0L) return jjStartNfaWithStates_1(1, 14, 0); break; case 43: - if ((active1 & 0x10000L) != 0L) - return jjStopAtPos(1, 80); - break; - case 45: if ((active1 & 0x20000L) != 0L) return jjStopAtPos(1, 81); break; + case 45: + if ((active1 & 0x40000L) != 0L) + return jjStopAtPos(1, 82); + break; case 47: if ((active0 & 0x800L) != 0L) return jjStopAtPos(1, 11); break; case 58: - if ((active0 & 0x4000000000L) != 0L) - return jjStopAtPos(1, 38); + if ((active0 & 0x8000000000L) != 0L) + return jjStopAtPos(1, 39); break; case 60: - if ((active1 & 0x4000000L) != 0L) + if ((active1 & 0x8000000L) != 0L) { - jjmatchedKind = 90; + jjmatchedKind = 91; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x400L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x800L); case 61: - if ((active1 & 0x100000000000000L) != 0L) + if ((active1 & 0x200000000000000L) != 0L) { - jjmatchedKind = 120; + jjmatchedKind = 121; jjmatchedPos = 1; } - else if ((active1 & 0x200000000000000L) != 0L) - return jjStopAtPos(1, 121); else if ((active1 & 0x400000000000000L) != 0L) return jjStopAtPos(1, 122); else if ((active1 & 0x800000000000000L) != 0L) + return jjStopAtPos(1, 123); + else if ((active1 & 0x1000000000000000L) != 0L) { - jjmatchedKind = 123; + jjmatchedKind = 124; jjmatchedPos = 1; } - else if ((active2 & 0x1L) != 0L) - return jjStopAtPos(1, 128); else if ((active2 & 0x2L) != 0L) return jjStopAtPos(1, 129); else if ((active2 & 0x4L) != 0L) @@ -643,84 +729,86 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 136); else if ((active2 & 0x200L) != 0L) return jjStopAtPos(1, 137); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000000000L, active2, 0L); + else if ((active2 & 0x400L) != 0L) + return jjStopAtPos(1, 138); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0xc000000000000000L, active2, 0L); case 62: if ((active0 & 0x10L) != 0L) return jjStopAtPos(1, 4); - else if ((active0 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 37); - else if ((active0 & 0x8000000000L) != 0L) - return jjStopAtPos(1, 39); - else if ((active1 & 0x8000000L) != 0L) + else if ((active0 & 0x4000000000L) != 0L) + return jjStopAtPos(1, 38); + else if ((active0 & 0x10000000000L) != 0L) + return jjStopAtPos(1, 40); + else if ((active1 & 0x10000000L) != 0L) { - jjmatchedKind = 91; + jjmatchedKind = 92; jjmatchedPos = 1; } - else if ((active1 & 0x1000000000000000L) != 0L) - return jjStopAtPos(1, 124); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x10000000L, active2, 0x800L); + else if ((active1 & 0x2000000000000000L) != 0L) + return jjStopAtPos(1, 125); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x20000000L, active2, 0x1000L); case 65: case 97: - return jjMoveStringLiteralDfa2_1(active0, 0x80010000400000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x100020000800000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x2L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa2_1(active0, 0x40000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x80000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x5080500000000L, active1, 0x8L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xa100a00000000L, active1, 0x10L, active2, 0L); case 70: case 102: - if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_1(1, 23, 14); + if ((active0 & 0x1000000L) != 0L) + return jjStartNfaWithStates_1(1, 24, 14); break; case 72: case 104: - return jjMoveStringLiteralDfa2_1(active0, 0x120000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x240000000000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x20000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x803100000L, active1, 0x20L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1006200000L, active1, 0x40L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x1e00000280000000L, active1, 0x400000c0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x3c00000500000000L, active1, 0x80000180L, active2, 0L); case 79: case 111: - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0x200000000000L) != 0L) { - jjmatchedKind = 44; + jjmatchedKind = 45; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0x2000c60000000000L, active1, 0x16L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40018c0000000000L, active1, 0x2cL, active2, 0L); case 82: case 114: - if ((active1 & 0x20000000L) != 0L) - return jjStartNfaWithStates_1(1, 93, 14); - return jjMoveStringLiteralDfa2_1(active0, 0x4000002c000000L, active1, 0L, active2, 0L); + if ((active1 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(1, 94, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x80000058000000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 62, 14); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(1, 63, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x8000001000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000000000L, active1, 0x1L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_1(active0, 0xa000000200000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x14000000400000L, active1, 0L, active2, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_1(active0, 0x10000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x20000000000000L, active1, 0L, active2, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_1(active0, 0x200000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x400000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x4000L) != 0L) - return jjStopAtPos(1, 78); + if ((active1 & 0x8000L) != 0L) + return jjStopAtPos(1, 79); break; default : break; @@ -739,88 +827,88 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active1 & 0x2000000000000000L) != 0L) - return jjStopAtPos(2, 125); - else if ((active1 & 0x4000000000000000L) != 0L) + if ((active1 & 0x4000000000000000L) != 0L) return jjStopAtPos(2, 126); - else if ((active2 & 0x400L) != 0L) - return jjStopAtPos(2, 138); + else if ((active1 & 0x8000000000000000L) != 0L) + return jjStopAtPos(2, 127); else if ((active2 & 0x800L) != 0L) return jjStopAtPos(2, 139); + else if ((active2 & 0x1000L) != 0L) + return jjStopAtPos(2, 140); break; case 62: - if ((active1 & 0x10000000L) != 0L) - return jjStopAtPos(2, 92); + if ((active1 & 0x20000000L) != 0L) + return jjStopAtPos(2, 93); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x1000100000L, active1, 0x8L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x2000200000L, active1, 0x10L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x40000000L) != 0L) - return jjStartNfaWithStates_1(2, 94, 14); - return jjMoveStringLiteralDfa3_1(active0, 0x1e00000000000000L, active1, 0L, active2, 0L); + if ((active1 & 0x80000000L) != 0L) + return jjStartNfaWithStates_1(2, 95, 14); + return jjMoveStringLiteralDfa3_1(active0, 0x3c00000000000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L); case 70: case 102: - return jjMoveStringLiteralDfa3_1(active0, 0x80000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x100000000000L, active1, 0L, active2, 0L); case 72: case 104: - return jjMoveStringLiteralDfa3_1(active0, 0x40000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x80000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x130000020000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x260000040000000L, active1, 0L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x2L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_1(active0, 0x82000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x104000000000000L, active1, 0L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_1(active0, 0x60000200000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xc0000400000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0x26L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1000000000L, active1, 0x4cL, active2, 0L); case 80: case 112: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x10000000000000L, active1, 0L, active2, 0L); case 81: case 113: - return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xa00000000L, active1, 0L, active2, 0L); case 82: case 114: - if ((active0 & 0x400000L) != 0L) - return jjStartNfaWithStates_1(2, 22, 14); - else if ((active0 & 0x400000000000L) != 0L) + if ((active0 & 0x800000L) != 0L) + return jjStartNfaWithStates_1(2, 23, 14); + else if ((active0 & 0x800000000000L) != 0L) { - jjmatchedKind = 46; + jjmatchedKind = 47; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0xa000000004000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000000008000000L, active1, 0x1L, active2, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0x10013000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x20026000000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 71; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x4a00000000000L, active1, 0x80L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x9400000000000L, active1, 0x100L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0x10L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x80000000000000L, active1, 0x20L, active2, 0L); case 87: case 119: - if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_1(2, 48, 14); + if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_1(2, 49, 14); break; default : break; @@ -840,69 +928,69 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x8000c000000L, active1, 0x20L); + return jjMoveStringLiteralDfa4_1(active0, 0x100018000000L, active1, 0x40L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x800000000L, active1, 0x10L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0x20L); case 67: case 99: - return jjMoveStringLiteralDfa4_1(active0, 0x200000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400000L, active1, 0L); case 69: case 101: - if ((active0 & 0x2000000L) != 0L) + if ((active0 & 0x4000000L) != 0L) { - jjmatchedKind = 25; + jjmatchedKind = 26; jjmatchedPos = 3; } - else if ((active0 & 0x10000000000L) != 0L) - return jjStartNfaWithStates_1(3, 40, 14); - else if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 54, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x2008200001000000L, active1, 0x81L); + else if ((active0 & 0x20000000000L) != 0L) + return jjStartNfaWithStates_1(3, 41, 14); + else if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 55, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x4010400002000000L, active1, 0x102L); case 70: case 102: - return jjMoveStringLiteralDfa4_1(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x2000000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x8800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000000000000000L, active1, 0x1L); case 76: case 108: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 49, 14); - else if ((active1 & 0x2L) != 0L) + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 50, 14); + else if ((active1 & 0x4L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 3; } - else if ((active1 & 0x8L) != 0L) - return jjStartNfaWithStates_1(3, 67, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x100000280000000L, active1, 0x4L); + else if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_1(3, 68, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x200000500000000L, active1, 0x8L); case 78: case 110: - return jjMoveStringLiteralDfa4_1(active0, 0x20000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x40000000L, active1, 0L); case 79: case 111: - if ((active0 & 0x40000000L) != 0L) - return jjStartNfaWithStates_1(3, 30, 14); - else if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_1(3, 47, 14); + if ((active0 & 0x80000000L) != 0L) + return jjStartNfaWithStates_1(3, 31, 14); + else if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 48, 14); break; case 83: case 115: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 53, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x480020000100000L, active1, 0L); + if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 54, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x900040000200000L, active1, 0L); case 84: case 116: - if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_1(3, 28, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x10041000000000L, active1, 0L); + if ((active0 & 0x20000000L) != 0L) + return jjStartNfaWithStates_1(3, 29, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x20082000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x4000500000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x8000a00000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400000000000000L, active1, 0L); default : break; } @@ -921,74 +1009,74 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x2000000800000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x4000001000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa5_1(active0, 0x20000000000000L, active1, 0x2L); case 69: case 101: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 55, 14); - else if ((active0 & 0x100000000000000L) != 0L) + if ((active0 & 0x100000000000000L) != 0L) return jjStartNfaWithStates_1(4, 56, 14); - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); + else if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 57, 14); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x8L); case 70: case 102: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 59, 14); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 60, 14); break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x80L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x100L); case 72: case 104: - return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x41501000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x82a02000000L, active1, 0L); case 75: case 107: - if ((active0 & 0x8000000L) != 0L) - return jjStartNfaWithStates_1(4, 27, 14); + if ((active0 & 0x10000000L) != 0L) + return jjStartNfaWithStates_1(4, 28, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x20L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x8000200000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000L, active1, 0x1L); case 79: case 111: - return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 51, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000L, active1, 0L); + if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 52, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x8000000000000L, active1, 0L); case 83: case 115: - if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_1(4, 20, 14); + if ((active0 & 0x200000L) != 0L) + return jjStartNfaWithStates_1(4, 21, 14); break; case 84: case 116: - if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_1(4, 29, 14); - else if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_1(4, 41, 14); - else if ((active1 & 0x20L) != 0L) - return jjStartNfaWithStates_1(4, 69, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x200000L, active1, 0L); + if ((active0 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(4, 30, 14); + else if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_1(4, 42, 14); + else if ((active1 & 0x40L) != 0L) + return jjStartNfaWithStates_1(4, 70, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x400000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x80280000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x100500000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L); case 89: case 121: - if ((active0 & 0x4000000L) != 0L) - return jjStartNfaWithStates_1(4, 26, 14); + if ((active0 & 0x8000000L) != 0L) + return jjStartNfaWithStates_1(4, 27, 14); break; default : break; @@ -1008,57 +1096,57 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x4L); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x8L); case 67: case 99: - if ((active0 & 0x1000000000L) != 0L) - return jjStartNfaWithStates_1(5, 36, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L, active1, 0L); + if ((active0 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_1(5, 37, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x4000000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x200280000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x400500000000L, active1, 0L); case 69: case 101: - if ((active1 & 0x10L) != 0L) - return jjStartNfaWithStates_1(5, 68, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x80L); + if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_1(5, 69, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x100L); case 70: case 102: - if ((active0 & 0x1000000L) != 0L) - return jjStartNfaWithStates_1(5, 24, 14); + if ((active0 & 0x2000000L) != 0L) + return jjStartNfaWithStates_1(5, 25, 14); break; case 71: case 103: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 63, 14); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(5, 64, 14); break; case 72: case 104: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 52, 14); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 53, 14); break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0x600000000200000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0xc00000000400000L, active1, 0L); case 76: case 108: - if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_1(5, 35, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L); + if ((active0 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_1(5, 36, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x100000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 50, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 51, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 60, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x500000000L, active1, 0L); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 61, 14); + return jjMoveStringLiteralDfa6_1(active0, 0xa00000000L, active1, 0L); case 84: case 116: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(5, 64, 14); + if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_1(5, 65, 14); break; default : break; @@ -1078,51 +1166,51 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long { case 69: case 101: - if ((active0 & 0x80000000L) != 0L) + if ((active0 & 0x100000000L) != 0L) { - jjmatchedKind = 31; + jjmatchedKind = 32; jjmatchedPos = 6; } - else if ((active0 & 0x100000000L) != 0L) + else if ((active0 & 0x200000000L) != 0L) { - jjmatchedKind = 32; + jjmatchedKind = 33; jjmatchedPos = 6; } - return jjMoveStringLiteralDfa7_1(active0, 0x600000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0xc00000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 61, 14); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 62, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa7_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x400000000000000L, active1, 0L); case 78: case 110: - if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_1(6, 66, 14); + if ((active1 & 0x8L) != 0L) + return jjStartNfaWithStates_1(6, 67, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa7_1(active0, 0x200000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x400000L, active1, 0L); case 82: case 114: - if ((active1 & 0x80L) != 0L) - return jjStartNfaWithStates_1(6, 71, 14); + if ((active1 & 0x100L) != 0L) + return jjStartNfaWithStates_1(6, 72, 14); break; case 83: case 115: - if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_1(6, 45, 14); + if ((active0 & 0x400000000000L) != 0L) + return jjStartNfaWithStates_1(6, 46, 14); break; case 84: case 116: - if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_1(6, 43, 14); - return jjMoveStringLiteralDfa7_1(active0, 0x400000000000000L, active1, 0L); + if ((active0 & 0x100000000000L) != 0L) + return jjStartNfaWithStates_1(6, 44, 14); + return jjMoveStringLiteralDfa7_1(active0, 0x800000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa7_1(active0, 0x40000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x80000000000L, active1, 0L); default : break; } @@ -1140,21 +1228,21 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long switch(curChar) { case 95: - return jjMoveStringLiteralDfa8_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa8_1(active0, 0xc00000000L); case 67: case 99: - return jjMoveStringLiteralDfa8_1(active0, 0x400000000000000L); + return jjMoveStringLiteralDfa8_1(active0, 0x800000000000000L); case 69: case 101: - if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_1(7, 42, 14); - else if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_1(7, 57, 14); + if ((active0 & 0x80000000000L) != 0L) + return jjStartNfaWithStates_1(7, 43, 14); + else if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(7, 58, 14); break; case 78: case 110: - if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_1(7, 21, 14); + if ((active0 & 0x400000L) != 0L) + return jjStartNfaWithStates_1(7, 22, 14); break; default : break; @@ -1174,12 +1262,12 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) { case 72: case 104: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(8, 58, 14); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(8, 59, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa9_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa9_1(active0, 0xc00000000L); default : break; } @@ -1198,7 +1286,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) { case 78: case 110: - return jjMoveStringLiteralDfa10_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa10_1(active0, 0xc00000000L); default : break; } @@ -1217,7 +1305,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0) { case 67: case 99: - return jjMoveStringLiteralDfa11_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa11_1(active0, 0xc00000000L); default : break; } @@ -1236,10 +1324,10 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0) { case 69: case 101: - if ((active0 & 0x200000000L) != 0L) - return jjStartNfaWithStates_1(11, 33, 14); - else if ((active0 & 0x400000000L) != 0L) + if ((active0 & 0x400000000L) != 0L) return jjStartNfaWithStates_1(11, 34, 14); + else if ((active0 & 0x800000000L) != 0L) + return jjStartNfaWithStates_1(11, 35, 14); break; default : break; @@ -1283,14 +1371,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 95) - kind = 95; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 95) - kind = 95; + if (kind > 96) + kind = 96; jjCheckNAddStates(19, 21); } break; @@ -1309,15 +1397,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 95) - kind = 95; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 95) - kind = 95; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1327,8 +1415,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 100) + kind = 100; jjCheckNAddStates(22, 24); break; case 10: @@ -1338,15 +1426,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 100) + kind = 100; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 105) - kind = 105; + if (kind > 106) + kind = 106; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1356,8 +1444,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 140) - kind = 140; + if (kind > 141) + kind = 141; jjstateSet[jjnewStateCnt++] = 17; break; case 18: @@ -1371,15 +1459,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 99) - kind = 99; + if (kind > 100) + kind = 100; jjCheckNAddStates(25, 27); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 100) + kind = 100; jjCheckNAddStates(25, 27); break; case 23: @@ -1389,8 +1477,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 100) + kind = 100; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1404,8 +1492,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 100) + kind = 100; jjCheckNAddTwoStates(28, 12); break; case 29: @@ -1423,22 +1511,22 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 95) - kind = 95; + if (kind > 96) + kind = 96; jjCheckNAddStates(19, 21); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 95) - kind = 95; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 95) - kind = 95; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(36, 6); break; case 37: @@ -1454,8 +1542,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(31, 33); break; case 41: - if (curChar == 34 && kind > 101) - kind = 101; + if (curChar == 34 && kind > 102) + kind = 102; break; case 42: if ((0xfffffffbffffffffL & l) != 0L) @@ -1466,8 +1554,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(34, 36); break; case 45: - if (curChar == 34 && kind > 102) - kind = 102; + if (curChar == 34 && kind > 103) + kind = 103; break; case 46: if (curChar == 39) @@ -1482,8 +1570,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(37, 39); break; case 50: - if (curChar == 39 && kind > 101) - kind = 101; + if (curChar == 39 && kind > 102) + kind = 102; break; case 51: if ((0xffffff7fffffffffL & l) != 0L) @@ -1494,8 +1582,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(40, 42); break; case 54: - if (curChar == 39 && kind > 103) - kind = 103; + if (curChar == 39 && kind > 104) + kind = 104; break; case 56: jjAddStates(43, 45); @@ -1517,8 +1605,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 105) - kind = 105; + if (kind > 106) + kind = 106; jjCheckNAdd(14); } else if (curChar == 96) @@ -1529,31 +1617,31 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 13; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 95) - kind = 95; + if ((0x100000001000L & l) != 0L && kind > 96) + kind = 96; break; case 9: if ((0x2000000020L & l) != 0L) jjAddStates(55, 56); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 99) - kind = 99; + if ((0x5000000050L & l) != 0L && kind > 100) + kind = 100; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 105) - kind = 105; + if (kind > 106) + kind = 106; jjCheckNAdd(14); break; case 16: case 17: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 140) - kind = 140; + if (kind > 141) + kind = 141; jjCheckNAdd(17); break; case 22: @@ -1575,8 +1663,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 95) - kind = 95; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(35, 6); break; case 38: @@ -1624,8 +1712,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 57; break; case 59: - if (curChar == 96 && kind > 101) - kind = 101; + if (curChar == 96 && kind > 102) + kind = 102; break; case 60: if ((0xfffffffeffffffffL & l) != 0L) @@ -1640,8 +1728,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 61; break; case 63: - if (curChar == 96 && kind > 104) - kind = 104; + if (curChar == 96 && kind > 105) + kind = 105; break; default : break; } @@ -1659,8 +1747,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 105) - kind = 105; + if (kind > 106) + kind = 106; jjCheckNAdd(14); break; case 1: @@ -1671,8 +1759,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 140) - kind = 140; + if (kind > 141) + kind = 141; jjCheckNAdd(17); break; case 38: @@ -1721,6 +1809,9 @@ static private final int jjMoveStringLiteralDfa0_3() switch(curChar) { case 42: + return jjMoveStringLiteralDfa1_3(0x40000L); + case 84: + case 116: return jjMoveStringLiteralDfa1_3(0x20000L); default : return 1; @@ -1735,14 +1826,54 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) switch(curChar) { case 47: - if ((active0 & 0x20000L) != 0L) - return jjStopAtPos(1, 17); + if ((active0 & 0x40000L) != 0L) + return jjStopAtPos(1, 18); break; + case 79: + case 111: + return jjMoveStringLiteralDfa2_3(active0, 0x20000L); default : return 2; } return 2; } +static private final int jjMoveStringLiteralDfa2_3(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return 2; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 2; + } + switch(curChar) + { + case 68: + case 100: + return jjMoveStringLiteralDfa3_3(active0, 0x20000L); + default : + return 3; + } +} +static private final int jjMoveStringLiteralDfa3_3(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return 3; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 3; + } + switch(curChar) + { + case 79: + case 111: + if ((active0 & 0x20000L) != 0L) + return jjStopAtPos(3, 17); + break; + default : + return 4; + } + return 4; +} static final int[] jjnextStates = { 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, 40, 41, 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, @@ -1752,10 +1883,10 @@ static final int[] jjnextStates = { public static final String[] jjstrLiteralImages = { "", "\74\77", null, "\74\77\75", "\77\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, null, null, null, null, null, null, "\55\76", -"\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, null, +null, null, null, null, null, null, null, null, null, null, null, null, null, +"\55\76", "\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, null, "\100", "\44", "\41", "\176", "\77", +null, null, null, null, null, null, null, null, "\100", "\44", "\41", "\176", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "\50", "\51", @@ -1771,24 +1902,24 @@ public static final String[] lexStateNames = { "IN_MULTI_LINE_COMMENT", }; public static final int[] jjnewLexState = { - -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 2, 3, 4, 1, 0, 1, 1, -1, -1, -1, -1, -1, -1, + -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 2, 3, 4, 1, 0, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffffffffff0001fL, 0xffffe3e8ffffffffL, 0x1fffL, + 0xffffffffffe0001fL, 0xffffc7d1ffffffffL, 0x3fffL, }; static final long[] jjtoSkip = { - 0x7ffe0L, 0x0L, 0x0L, + 0xfffe0L, 0x0L, 0x0L, }; static final long[] jjtoSpecial = { - 0x7f800L, 0x0L, 0x0L, + 0xff800L, 0x0L, 0x0L, }; static final long[] jjtoMore = { - 0x80000L, 0x0L, 0x0L, + 0x100000L, 0x0L, 0x0L, }; static protected SimpleCharStream input_stream; static private final int[] jjrounds = new int[64]; @@ -1906,27 +2037,27 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_2(); - if (jjmatchedPos == 0 && jjmatchedKind > 19) + if (jjmatchedPos == 0 && jjmatchedKind > 20) { - jjmatchedKind = 19; + jjmatchedKind = 20; } break; case 3: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_3(); - if (jjmatchedPos == 0 && jjmatchedKind > 19) + if (jjmatchedPos == 0 && jjmatchedKind > 20) { - jjmatchedKind = 19; + jjmatchedKind = 20; } break; case 4: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_4(); - if (jjmatchedPos == 0 && jjmatchedKind > 19) + if (jjmatchedPos == 0 && jjmatchedKind > 20) { - jjmatchedKind = 19; + jjmatchedKind = 20; } break; } @@ -2009,6 +2140,13 @@ static void SkipLexicalActions(Token matchedToken) image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); input_stream.backup(1); break; + case 17 : + if (image == null) + image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + else + image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + PHPParser.createNewTask(); + break; default : break; } -- 1.7.1