You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by pr...@apache.org on 2007/06/03 18:38:47 UTC
svn commit: r543936 - in
/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl: ./
parser/
Author: proyal
Date: Sun Jun 3 09:38:45 2007
New Revision: 543936
URL: http://svn.apache.org/viewvc?view=rev&rev=543936
Log:
fixup so thing actually compiles. initial merge went awry
Modified:
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.jj
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTreeConstants.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserVisitor.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleCharStream.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Token.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/TokenMgrError.java
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/ScriptFactory.java Sun Jun 3 09:38:45 2007
@@ -31,6 +31,7 @@
import org.apache.commons.jexl.parser.SimpleNode;
import org.apache.commons.jexl.parser.TokenMgrError;
import org.apache.commons.jexl.util.Introspector;
+import org.apache.commons.jexl.util.introspection.Uberspect;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -63,7 +64,7 @@
* {@link Parser}. When parsing expressions, ScriptFactory
* synchronizes on Parser.
*/
- protected static Parser parser = new Parser(new StringReader(";"), Introspector.getUberspect() );
+ protected static Parser parser = new Parser(new StringReader(";"));
/**
* ScriptFactory is a singleton and this is the private
@@ -76,7 +77,11 @@
* with a call to getInstance().
*/
private ScriptFactory() {
- parser.setUberspect( Introspector.getUberspect());
+ this( Introspector.getUberspect());
+ }
+
+ public ScriptFactory( Uberspect uberspect ) {
+ parser.setUberspect( uberspect );
}
/**
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParseException.java Sun Jun 3 09:38:45 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */
+ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */
package org.apache.commons.jexl.parser;
/**
@@ -114,19 +114,19 @@
if (!specialConstructor) {
return super.getMessage();
}
- StringBuffer expected = new StringBuffer();
+ String expected = "";
int maxSize = 0;
for (int i = 0; i < expectedTokenSequences.length; i++) {
if (maxSize < expectedTokenSequences[i].length) {
maxSize = expectedTokenSequences[i].length;
}
for (int j = 0; j < expectedTokenSequences[i].length; j++) {
- expected.append(tokenImage[expectedTokenSequences[i][j]]).append(" ");
+ expected += tokenImage[expectedTokenSequences[i][j]] + " ";
}
if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
- expected.append("...");
+ expected += "...";
}
- expected.append(eol).append(" ");
+ expected += eol + " ";
}
String retval = "Encountered \"";
Token tok = currentToken.next;
@@ -146,7 +146,7 @@
} else {
retval += "Was expecting one of:" + eol + " ";
}
- retval += expected.toString();
+ retval += expected;
return retval;
}
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.java Sun Jun 3 09:38:45 2007
@@ -14,106 +14,107 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/* Generated By:JavaCC: Do not edit this line. Parser.java */
+ /* Generated By:JJTree&JavaCC: Do not edit this line. Parser.java */
package org.apache.commons.jexl.parser;
import java.io.Reader;
+import java.io.ByteArrayInputStream;
import org.apache.commons.jexl.util.introspection.Uberspect;
-import org.apache.commons.jexl.util.Introspector;
-public class Parser/* @bgen(jjtree) */implements ParserTreeConstants, ParserConstants { /* @bgen(jjtree) */
- protected JJTParserState jjtree = new JJTParserState();
- private final Uberspect uberspect;
+public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants {/*@bgen(jjtree)*/
+ protected JJTParserState jjtree = new JJTParserState();
+ private Uberspect uberspect;
- public SimpleNode parse(Reader reader) throws Exception {
+ public void setUberspect(Uberspect uberspect)
+ {
+ this.uberspect = uberspect;
+ }
+
+ protected Uberspect getUberspect()
+ {
+ return uberspect;
+ }
+
+ public SimpleNode parse(Reader reader)
+ throws Exception
+ {
ReInit(reader);
/*
- * lets do the 'Unique Init' in here to be safe - it's a pain to
- * remember
+ * lets do the 'Unique Init' in here to be
+ * safe - it's a pain to remember
*/
SimpleNode tree = JexlScript();
return tree;
}
- /*
- * Program structuring syntax follows.
- */
- public final SimpleNode JexlScript() throws ParseException {
- /* @bgen(jjtree) JexlScript */
- ASTJexlScript jjtn000 = new ASTJexlScript(this, JJTJEXLSCRIPT);
- boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);
- String name;
- try {
- label_1: while (true) {
- switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
- case INTEGER_LITERAL:
- case FLOAT_LITERAL:
- case 9:
- case 11:
- case 12:
- case 14:
- case 36:
- case 42:
- case 43:
- case 44:
- case 45:
- case 46:
- case 47:
- case 48:
- case 49:
- case 51:
- case 52:
- case IDENTIFIER:
- case STRING_LITERAL:
- ;
- break;
- default:
- jj_la1[0] = jj_gen;
- break label_1;
- }
- Statement();
- }
- jj_consume_token(0);
- jjtree.closeNodeScope(jjtn000, true);
- jjtc000 = false;
- {
- if (true)
- return jjtn000;
- }
- } catch (Throwable jjte000) {
- if (jjtc000) {
- jjtree.clearNodeScope(jjtn000);
- jjtc000 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte000 instanceof RuntimeException) {
- {
- if (true)
- throw (RuntimeException) jjte000;
- }
- }
- if (jjte000 instanceof ParseException) {
- {
- if (true)
- throw (ParseException) jjte000;
- }
- }
- {
- if (true)
- throw (Error) jjte000;
- }
- } finally {
- if (jjtc000) {
- jjtree.closeNodeScope(jjtn000, true);
- }
+/*
+ * Program structuring syntax follows.
+ */
+ final public SimpleNode JexlScript() throws ParseException {
+ /*@bgen(jjtree) JexlScript */
+ ASTJexlScript jjtn000 = new ASTJexlScript(this, JJTJEXLSCRIPT);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);String name;
+ try {
+ label_1:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case INTEGER_LITERAL:
+ case FLOAT_LITERAL:
+ case 9:
+ case 11:
+ case 12:
+ case 14:
+ case 36:
+ case 42:
+ case 43:
+ case 44:
+ case 45:
+ case 46:
+ case 47:
+ case 48:
+ case 49:
+ case 51:
+ case 52:
+ case 54:
+ case IDENTIFIER:
+ case STRING_LITERAL:
+ ;
+ break;
+ default:
+ jj_la1[0] = jj_gen;
+ break label_1;
}
- throw new Error("Missing return statement in function");
+ Statement();
+ }
+ jj_consume_token(0);
+ jjtree.closeNodeScope(jjtn000, true);
+ jjtc000 = false;
+ {if (true) return jjtn000;}
+ } catch (Throwable jjte000) {
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
+ } finally {
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
}
+ throw new Error("Missing return statement in function");
+ }
final public void Block() throws ParseException {
/*@bgen(jjtree) Block */
@@ -142,6 +143,7 @@
case 49:
case 51:
case 52:
+ case 54:
case IDENTIFIER:
case STRING_LITERAL:
;
@@ -182,6 +184,7 @@
try {
jj_consume_token(11);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case 54:
case IDENTIFIER:
Reference();
break;
@@ -289,6 +292,7 @@
case 45:
case 46:
case 47:
+ case 54:
case IDENTIFIER:
case STRING_LITERAL:
ConditionalOrExpression();
@@ -1352,6 +1356,7 @@
case 45:
case 46:
case 47:
+ case 54:
case IDENTIFIER:
case STRING_LITERAL:
PrimaryExpression();
@@ -1373,24 +1378,32 @@
case STRING_LITERAL:
Literal();
break;
- case IDENTIFIER:
- Reference();
- break;
- case 12:
- jj_consume_token(12);
- Expression();
- jj_consume_token(13);
- break;
- case 11:
- EmptyFunction();
- break;
- case 14:
- SizeFunction();
- break;
default:
jj_la1[20] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
+ if (jj_2_2(3)) {
+ Reference();
+ } else {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case 12:
+ jj_consume_token(12);
+ Expression();
+ jj_consume_token(13);
+ break;
+ case 11:
+ EmptyFunction();
+ break;
+ case 14:
+ SizeFunction();
+ break;
+ case 54:
+ MapLiteral();
+ break;
+ default:
+ jj_la1[21] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ }
}
}
@@ -1414,7 +1427,7 @@
NullLiteral();
break;
default:
- jj_la1[21] = jj_gen;
+ jj_la1[22] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1461,7 +1474,7 @@
}
break;
default:
- jj_la1[22] = jj_gen;
+ jj_la1[23] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1526,14 +1539,13 @@
case 48:
jj_consume_token(48);
break;
- case 9:
- Block();
- break;
default:
- jj_la1[23] = jj_gen;
- if (jj_2_2(2147483647)) {
+ jj_la1[24] = jj_gen;
+ if (jj_2_3(3)) {
+ Block();
+ } else if (jj_2_4(2147483647)) {
ReferenceExpression();
- } else if (jj_2_3(2147483647)) {
+ } else if (jj_2_5(2147483647)) {
StatementExpression();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1549,6 +1561,7 @@
case 45:
case 46:
case 47:
+ case 54:
case IDENTIFIER:
case STRING_LITERAL:
ExpressionExpression();
@@ -1563,7 +1576,7 @@
WhileStatement();
break;
default:
- jj_la1[24] = jj_gen;
+ jj_la1[25] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1675,7 +1688,7 @@
Statement();
break;
default:
- jj_la1[25] = jj_gen;
+ jj_la1[26] = jj_gen;
;
}
} catch (Throwable jjte000) {
@@ -1765,6 +1778,79 @@
}
}
+ final public void MapLiteral() throws ParseException {
+ /*@bgen(jjtree) MapLiteral */
+ ASTMapLiteral jjtn000 = new ASTMapLiteral(this, JJTMAPLITERAL);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);
+ try {
+ jj_consume_token(54);
+ MapEntry();
+ label_12:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case 55:
+ ;
+ break;
+ default:
+ jj_la1[27] = jj_gen;
+ break label_12;
+ }
+ jj_consume_token(55);
+ MapEntry();
+ }
+ jj_consume_token(56);
+ } catch (Throwable jjte000) {
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
+ } finally {
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
+ }
+ }
+
+ final public void MapEntry() throws ParseException {
+ /*@bgen(jjtree) MapEntry */
+ ASTMapEntry jjtn000 = new ASTMapEntry(this, JJTMAPENTRY);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);
+ try {
+ Parameter();
+ jj_consume_token(57);
+ Parameter();
+ } catch (Throwable jjte000) {
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
+ } finally {
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
+ }
+ }
+
final public void Method() throws ParseException {
/*@bgen(jjtree) Method */
ASTMethod jjtn000 = new ASTMethod(this, JJTMETHOD);
@@ -1786,25 +1872,26 @@
case 45:
case 46:
case 47:
+ case 54:
case IDENTIFIER:
case STRING_LITERAL:
Parameter();
- label_12:
+ label_13:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 54:
+ case 55:
;
break;
default:
- jj_la1[26] = jj_gen;
- break label_12;
+ jj_la1[28] = jj_gen;
+ break label_13;
}
- jj_consume_token(54);
+ jj_consume_token(55);
Parameter();
}
break;
default:
- jj_la1[27] = jj_gen;
+ jj_la1[29] = jj_gen;
;
}
jj_consume_token(13);
@@ -1836,33 +1923,34 @@
jjtree.openNodeScope(jjtn000);
try {
Identifier();
- label_13:
+ label_14:
while (true) {
- jj_consume_token(55);
- if (jj_2_4(3)) {
+ jj_consume_token(54);
+ if (jj_2_6(3)) {
Expression();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTEGER_LITERAL:
IntegerLiteral();
break;
+ case 54:
case IDENTIFIER:
Reference();
break;
default:
- jj_la1[28] = jj_gen;
+ jj_la1[30] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
jj_consume_token(56);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case 55:
+ case 54:
;
break;
default:
- jj_la1[29] = jj_gen;
- break label_13;
+ jj_la1[31] = jj_gen;
+ break label_14;
}
}
} catch (Throwable jjte000) {
@@ -1908,35 +1996,38 @@
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);
try {
- if (jj_2_5(2147483647)) {
+ if (jj_2_7(2147483647)) {
ArrayAccess();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
Identifier();
break;
+ case 54:
+ MapLiteral();
+ break;
default:
- jj_la1[30] = jj_gen;
+ jj_la1[32] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
- label_14:
+ label_15:
while (true) {
- if (jj_2_6(2)) {
+ if (jj_2_8(2)) {
;
} else {
- break label_14;
+ break label_15;
}
- jj_consume_token(57);
- if (jj_2_8(2147483647)) {
+ jj_consume_token(58);
+ if (jj_2_10(2147483647)) {
ArrayAccess();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTEGER_LITERAL:
case 14:
case IDENTIFIER:
- if (jj_2_7(3)) {
+ if (jj_2_9(3)) {
Method();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1950,14 +2041,14 @@
IntegerLiteral();
break;
default:
- jj_la1[31] = jj_gen;
+ jj_la1[33] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
break;
default:
- jj_la1[32] = jj_gen;
+ jj_la1[34] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1985,7 +2076,7 @@
}
final public void Parameter() throws ParseException {
- if (jj_2_9(3)) {
+ if (jj_2_11(3)) {
Expression();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1997,11 +2088,12 @@
case STRING_LITERAL:
Literal();
break;
+ case 54:
case IDENTIFIER:
Reference();
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[35] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2071,311 +2163,350 @@
finally { jj_save(8, xla); }
}
- final private boolean jj_3R_81() {
- if (jj_3R_83()) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_84()) { jj_scanpos = xsp; break; }
- }
- return false;
+ final private boolean jj_2_10(int xla) {
+ jj_la = xla; jj_lastpos = jj_scanpos = token;
+ try { return !jj_3_10(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(9, xla); }
}
- final private boolean jj_3R_82() {
- if (jj_scan_token(22)) return true;
- if (jj_3R_81()) return true;
- return false;
+ final private boolean jj_2_11(int xla) {
+ jj_la = xla; jj_lastpos = jj_scanpos = token;
+ try { return !jj_3_11(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(10, xla); }
}
- final private boolean jj_3R_79() {
- if (jj_3R_81()) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_82()) { jj_scanpos = xsp; break; }
- }
+ final private boolean jj_3R_66() {
+ if (jj_3R_82()) return true;
return false;
}
- final private boolean jj_3_3() {
- if (jj_3R_15()) return true;
- if (jj_scan_token(15)) return true;
+ final private boolean jj_3R_95() {
+ if (jj_scan_token(20)) return true;
+ if (jj_3R_94()) return true;
return false;
}
- final private boolean jj_3_2() {
- if (jj_3R_16()) return true;
- if (jj_scan_token(48)) return true;
+ final private boolean jj_3_3() {
+ if (jj_3R_18()) return true;
return false;
}
- final private boolean jj_3R_80() {
- if (jj_scan_token(21)) return true;
- if (jj_3R_79()) return true;
+ final private boolean jj_3R_37() {
+ if (jj_3R_50()) return true;
return false;
}
- final private boolean jj_3R_74() {
- if (jj_3R_79()) return true;
+ final private boolean jj_3R_88() {
+ if (jj_3R_94()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_80()) { jj_scanpos = xsp; break; }
+ if (jj_3R_95()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_75() {
- if (jj_scan_token(20)) return true;
- if (jj_3R_74()) return true;
- return false;
- }
-
- final private boolean jj_3R_68() {
- if (jj_3R_74()) return true;
+ final private boolean jj_3R_51() {
Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_75()) { jj_scanpos = xsp; break; }
+ xsp = jj_scanpos;
+ if (jj_scan_token(48)) {
+ jj_scanpos = xsp;
+ if (jj_3_3()) {
+ jj_scanpos = xsp;
+ if (jj_3R_66()) {
+ jj_scanpos = xsp;
+ if (jj_3R_67()) {
+ jj_scanpos = xsp;
+ if (jj_3R_68()) {
+ jj_scanpos = xsp;
+ if (jj_3R_69()) {
+ jj_scanpos = xsp;
+ if (jj_3R_70()) {
+ jj_scanpos = xsp;
+ if (jj_3R_71()) return true;
+ }
+ }
+ }
+ }
+ }
+ }
}
return false;
}
- final private boolean jj_3R_77() {
+ final private boolean jj_3R_97() {
if (jj_scan_token(19)) return true;
- if (jj_3R_68()) return true;
+ if (jj_3R_88()) return true;
return false;
}
- final private boolean jj_3R_69() {
+ final private boolean jj_3R_96() {
+ if (jj_scan_token(18)) return true;
+ if (jj_3R_88()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_89() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_76()) {
+ if (jj_3R_96()) {
jj_scanpos = xsp;
- if (jj_3R_77()) return true;
+ if (jj_3R_97()) return true;
}
return false;
}
- final private boolean jj_3R_76() {
- if (jj_scan_token(18)) return true;
- if (jj_3R_68()) return true;
- return false;
- }
-
- final private boolean jj_3R_58() {
- if (jj_3R_68()) return true;
+ final private boolean jj_3R_72() {
+ if (jj_3R_88()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_69()) { jj_scanpos = xsp; break; }
+ if (jj_3R_89()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_71() {
+ final private boolean jj_3R_36() {
+ if (jj_3R_20()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_91() {
if (jj_scan_token(17)) return true;
- if (jj_3R_58()) return true;
+ if (jj_3R_72()) return true;
return false;
}
- final private boolean jj_3R_59() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_70()) {
- jj_scanpos = xsp;
- if (jj_3R_71()) return true;
- }
+ final private boolean jj_3R_78() {
+ if (jj_scan_token(STRING_LITERAL)) return true;
return false;
}
- final private boolean jj_3R_70() {
+ final private boolean jj_3R_90() {
if (jj_scan_token(16)) return true;
- if (jj_3R_58()) return true;
+ if (jj_3R_72()) return true;
return false;
}
- final private boolean jj_3R_64() {
- if (jj_scan_token(STRING_LITERAL)) return true;
+ final private boolean jj_3R_73() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_90()) {
+ jj_scanpos = xsp;
+ if (jj_3R_91()) return true;
+ }
return false;
}
- final private boolean jj_3R_47() {
- if (jj_3R_58()) return true;
+ final private boolean jj_3R_53() {
+ if (jj_3R_72()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_59()) { jj_scanpos = xsp; break; }
+ if (jj_3R_73()) { jj_scanpos = xsp; break; }
}
return false;
}
final private boolean jj_3_1() {
- if (jj_3R_15()) return true;
+ if (jj_3R_16()) return true;
if (jj_scan_token(15)) return true;
return false;
}
- final private boolean jj_3R_46() {
- if (jj_3R_15()) return true;
+ final private boolean jj_3R_52() {
+ if (jj_3R_16()) return true;
if (jj_scan_token(15)) return true;
- if (jj_3R_17()) return true;
+ if (jj_3R_19()) return true;
return false;
}
- final private boolean jj_3R_34() {
- if (jj_3R_18()) return true;
- return false;
- }
-
- final private boolean jj_3R_62() {
+ final private boolean jj_3R_76() {
if (jj_scan_token(FLOAT_LITERAL)) return true;
return false;
}
- final private boolean jj_3R_36() {
- if (jj_3R_47()) return true;
+ final private boolean jj_3R_40() {
+ if (jj_3R_53()) return true;
return false;
}
- final private boolean jj_3R_35() {
- if (jj_3R_46()) return true;
+ final private boolean jj_3R_39() {
+ if (jj_3R_52()) return true;
return false;
}
- final private boolean jj_3R_17() {
+ final private boolean jj_3R_19() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_35()) {
+ if (jj_3R_39()) {
jj_scanpos = xsp;
- if (jj_3R_36()) return true;
+ if (jj_3R_40()) return true;
}
return false;
}
- final private boolean jj_3R_56() {
+ final private boolean jj_3R_41() {
+ if (jj_scan_token(INTEGER_LITERAL)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_29() {
+ if (jj_3R_17()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_62() {
if (jj_scan_token(12)) return true;
- if (jj_3R_16()) return true;
+ if (jj_3R_17()) return true;
if (jj_scan_token(13)) return true;
return false;
}
- final private boolean jj_3R_37() {
- if (jj_scan_token(INTEGER_LITERAL)) return true;
+ final private boolean jj_3R_45() {
+ if (jj_3R_41()) return true;
return false;
}
- final private boolean jj_3R_18() {
+ final private boolean jj_3R_20() {
if (jj_scan_token(IDENTIFIER)) return true;
return false;
}
- final private boolean jj_3R_73() {
+ final private boolean jj_3R_23() {
+ if (jj_3R_17()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_93() {
if (jj_scan_token(47)) return true;
return false;
}
- final private boolean jj_3R_63() {
+ final private boolean jj_3R_92() {
+ if (jj_scan_token(46)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_77() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_72()) {
+ if (jj_3R_92()) {
jj_scanpos = xsp;
- if (jj_3R_73()) return true;
+ if (jj_3R_93()) return true;
}
return false;
}
- final private boolean jj_3R_72() {
- if (jj_scan_token(46)) return true;
+ final private boolean jj_3R_81() {
+ if (jj_3R_17()) return true;
return false;
}
- final private boolean jj_3R_45() {
- if (jj_scan_token(14)) return true;
- if (jj_scan_token(12)) return true;
- if (jj_3R_16()) return true;
- if (jj_scan_token(13)) return true;
+ final private boolean jj_3R_79() {
+ if (jj_scan_token(45)) return true;
return false;
}
- final private boolean jj_3R_27() {
- if (jj_3R_16()) return true;
+ final private boolean jj_3R_49() {
+ if (jj_scan_token(14)) return true;
+ if (jj_scan_token(12)) return true;
+ if (jj_3R_17()) return true;
+ if (jj_scan_token(13)) return true;
return false;
}
- final private boolean jj_3R_65() {
- if (jj_scan_token(45)) return true;
+ final private boolean jj_3R_75() {
+ if (jj_3R_17()) return true;
return false;
}
- final private boolean jj_3R_55() {
- if (jj_3R_16()) return true;
+ final private boolean jj_3R_61() {
+ if (jj_3R_17()) return true;
return false;
}
- final private boolean jj_3R_41() {
- if (jj_3R_37()) return true;
+ final private boolean jj_3R_28() {
+ if (jj_3R_41()) return true;
return false;
}
- final private boolean jj_3R_44() {
+ final private boolean jj_3R_48() {
if (jj_scan_token(11)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_55()) {
+ if (jj_3R_61()) {
jj_scanpos = xsp;
- if (jj_3R_56()) return true;
+ if (jj_3R_62()) return true;
}
return false;
}
- final private boolean jj_3R_21() {
- if (jj_3R_16()) return true;
+ final private boolean jj_3R_60() {
+ if (jj_3R_79()) return true;
return false;
}
- final private boolean jj_3R_54() {
- if (jj_3R_65()) return true;
+ final private boolean jj_3R_38() {
+ if (jj_3R_51()) return true;
return false;
}
- final private boolean jj_3R_53() {
- if (jj_3R_64()) return true;
+ final private boolean jj_3R_44() {
+ if (jj_3R_20()) return true;
return false;
}
- final private boolean jj_3R_67() {
- if (jj_3R_16()) return true;
+ final private boolean jj_3R_59() {
+ if (jj_3R_78()) return true;
return false;
}
- final private boolean jj_3R_52() {
- if (jj_3R_63()) return true;
+ final private boolean jj_3R_58() {
+ if (jj_3R_77()) return true;
return false;
}
- final private boolean jj_3R_61() {
- if (jj_3R_16()) return true;
+ final private boolean jj_3R_22() {
+ if (jj_3R_41()) return true;
return false;
}
- final private boolean jj_3R_51() {
- if (jj_3R_62()) return true;
+ final private boolean jj_3R_57() {
+ if (jj_3R_76()) return true;
return false;
}
- final private boolean jj_3R_43() {
+ final private boolean jj_3R_74() {
+ if (jj_3R_47()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_18() {
+ if (jj_scan_token(9)) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_38()) { jj_scanpos = xsp; break; }
+ }
+ if (jj_scan_token(10)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_47() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_50()) {
+ if (jj_3R_56()) {
jj_scanpos = xsp;
- if (jj_3R_51()) {
+ if (jj_3R_57()) {
jj_scanpos = xsp;
- if (jj_3R_52()) {
+ if (jj_3R_58()) {
jj_scanpos = xsp;
- if (jj_3R_53()) {
+ if (jj_3R_59()) {
jj_scanpos = xsp;
- if (jj_3R_54()) return true;
+ if (jj_3R_60()) return true;
}
}
}
@@ -2383,75 +2514,78 @@
return false;
}
- final private boolean jj_3R_50() {
- if (jj_3R_37()) return true;
+ final private boolean jj_3R_56() {
+ if (jj_3R_41()) return true;
return false;
}
- final private boolean jj_3R_26() {
- if (jj_3R_37()) return true;
+ final private boolean jj_3R_80() {
+ if (jj_3R_41()) return true;
return false;
}
- final private boolean jj_3R_40() {
- if (jj_3R_18()) return true;
+ final private boolean jj_3R_27() {
+ if (jj_3R_19()) return true;
return false;
}
- final private boolean jj_3R_20() {
- if (jj_3R_37()) return true;
+ final private boolean jj_3R_43() {
+ if (jj_3R_54()) return true;
return false;
}
- final private boolean jj_3R_32() {
- if (jj_3R_45()) return true;
+ final private boolean jj_3R_34() {
+ if (jj_3R_50()) return true;
return false;
}
- final private boolean jj_3R_60() {
- if (jj_3R_43()) return true;
+ final private boolean jj_3R_33() {
+ if (jj_3R_49()) return true;
return false;
}
- final private boolean jj_3R_31() {
- if (jj_3R_44()) return true;
+ final private boolean jj_3R_21() {
+ if (jj_3R_19()) return true;
return false;
}
- final private boolean jj_3R_30() {
- if (jj_scan_token(12)) return true;
- if (jj_3R_17()) return true;
- if (jj_scan_token(13)) return true;
+ final private boolean jj_3R_32() {
+ if (jj_3R_48()) return true;
return false;
}
- final private boolean jj_3R_66() {
- if (jj_3R_37()) return true;
+ final private boolean jj_3R_31() {
+ if (jj_scan_token(12)) return true;
+ if (jj_3R_19()) return true;
+ if (jj_scan_token(13)) return true;
return false;
}
- final private boolean jj_3R_29() {
- if (jj_3R_16()) return true;
+ final private boolean jj_3_2() {
+ if (jj_3R_17()) return true;
return false;
}
- final private boolean jj_3R_28() {
- if (jj_3R_43()) return true;
+ final private boolean jj_3R_30() {
+ if (jj_3R_47()) return true;
return false;
}
- final private boolean jj_3R_15() {
+ final private boolean jj_3R_16() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_28()) {
- jj_scanpos = xsp;
- if (jj_3R_29()) {
- jj_scanpos = xsp;
if (jj_3R_30()) {
jj_scanpos = xsp;
+ if (jj_3_2()) {
+ jj_scanpos = xsp;
if (jj_3R_31()) {
jj_scanpos = xsp;
- if (jj_3R_32()) return true;
+ if (jj_3R_32()) {
+ jj_scanpos = xsp;
+ if (jj_3R_33()) {
+ jj_scanpos = xsp;
+ if (jj_3R_34()) return true;
+ }
}
}
}
@@ -2459,396 +2593,421 @@
return false;
}
- final private boolean jj_3R_25() {
- if (jj_3R_17()) return true;
- return false;
- }
-
- final private boolean jj_3R_39() {
- if (jj_3R_48()) return true;
- return false;
- }
-
- final private boolean jj_3R_109() {
- if (jj_3R_15()) return true;
- return false;
- }
-
- final private boolean jj_3R_19() {
- if (jj_3R_17()) return true;
- return false;
- }
-
- final private boolean jj_3R_108() {
- if (jj_scan_token(44)) return true;
- if (jj_3R_101()) return true;
+ final private boolean jj_3R_98() {
+ if (jj_scan_token(55)) return true;
+ if (jj_3R_55()) return true;
return false;
}
- final private boolean jj_3R_107() {
- if (jj_scan_token(43)) return true;
- if (jj_3R_101()) return true;
+ final private boolean jj_3_10() {
+ if (jj_3R_20()) return true;
+ if (jj_scan_token(54)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_27()) {
+ jj_scanpos = xsp;
+ if (jj_3R_28()) {
+ jj_scanpos = xsp;
+ if (jj_3R_29()) return true;
+ }
+ }
+ if (jj_scan_token(56)) return true;
return false;
}
- final private boolean jj_3R_106() {
- if (jj_scan_token(42)) return true;
- if (jj_3R_101()) return true;
+ final private boolean jj_3R_129() {
+ if (jj_3R_16()) return true;
return false;
}
- final private boolean jj_3R_105() {
- if (jj_scan_token(36)) return true;
- if (jj_3R_101()) return true;
+ final private boolean jj_3_11() {
+ if (jj_3R_19()) return true;
return false;
}
- final private boolean jj_3R_101() {
+ final private boolean jj_3R_55() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_105()) {
- jj_scanpos = xsp;
- if (jj_3R_106()) {
- jj_scanpos = xsp;
- if (jj_3R_107()) {
+ if (jj_3_11()) {
jj_scanpos = xsp;
- if (jj_3R_108()) {
+ if (jj_3R_74()) {
jj_scanpos = xsp;
- if (jj_3R_109()) return true;
- }
- }
+ if (jj_3R_75()) return true;
}
}
return false;
}
- final private boolean jj_3R_78() {
- if (jj_scan_token(54)) return true;
- if (jj_3R_49()) return true;
+ final private boolean jj_3R_128() {
+ if (jj_scan_token(44)) return true;
+ if (jj_3R_121()) return true;
return false;
}
- final private boolean jj_3R_114() {
- if (jj_scan_token(41)) return true;
- if (jj_3R_101()) return true;
+ final private boolean jj_3R_127() {
+ if (jj_scan_token(43)) return true;
+ if (jj_3R_121()) return true;
return false;
}
- final private boolean jj_3_8() {
- if (jj_3R_18()) return true;
- if (jj_scan_token(55)) return true;
+ final private boolean jj_3_6() {
+ if (jj_3R_19()) return true;
+ return false;
+ }
+
+ final private boolean jj_3_7() {
+ if (jj_3R_20()) return true;
+ if (jj_scan_token(54)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_25()) {
+ if (jj_3R_21()) {
jj_scanpos = xsp;
- if (jj_3R_26()) {
+ if (jj_3R_22()) {
jj_scanpos = xsp;
- if (jj_3R_27()) return true;
+ if (jj_3R_23()) return true;
}
}
if (jj_scan_token(56)) return true;
return false;
}
- final private boolean jj_3R_113() {
- if (jj_scan_token(40)) return true;
- if (jj_3R_101()) return true;
+ final private boolean jj_3R_126() {
+ if (jj_scan_token(42)) return true;
+ if (jj_3R_121()) return true;
return false;
}
final private boolean jj_3_9() {
- if (jj_3R_17()) return true;
+ if (jj_3R_26()) return true;
return false;
}
- final private boolean jj_3R_49() {
+ final private boolean jj_3R_25() {
Token xsp;
xsp = jj_scanpos;
if (jj_3_9()) {
jj_scanpos = xsp;
- if (jj_3R_60()) {
+ if (jj_3R_43()) {
+ jj_scanpos = xsp;
+ if (jj_3R_44()) {
jj_scanpos = xsp;
- if (jj_3R_61()) return true;
+ if (jj_3R_45()) return true;
+ }
}
}
return false;
}
- final private boolean jj_3R_112() {
- if (jj_scan_token(39)) return true;
- if (jj_3R_101()) return true;
+ final private boolean jj_3R_125() {
+ if (jj_scan_token(36)) return true;
+ if (jj_3R_121()) return true;
return false;
}
- final private boolean jj_3_4() {
- if (jj_3R_17()) return true;
+ final private boolean jj_3R_121() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_125()) {
+ jj_scanpos = xsp;
+ if (jj_3R_126()) {
+ jj_scanpos = xsp;
+ if (jj_3R_127()) {
+ jj_scanpos = xsp;
+ if (jj_3R_128()) {
+ jj_scanpos = xsp;
+ if (jj_3R_129()) return true;
+ }
+ }
+ }
+ }
return false;
}
- final private boolean jj_3R_111() {
- if (jj_scan_token(38)) return true;
- if (jj_3R_101()) return true;
+ final private boolean jj_3R_24() {
+ if (jj_3R_42()) return true;
return false;
}
- final private boolean jj_3_5() {
- if (jj_3R_18()) return true;
- if (jj_scan_token(55)) return true;
+ final private boolean jj_3R_65() {
+ if (jj_scan_token(54)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_19()) {
+ if (jj_3_6()) {
jj_scanpos = xsp;
- if (jj_3R_20()) {
+ if (jj_3R_80()) {
jj_scanpos = xsp;
- if (jj_3R_21()) return true;
+ if (jj_3R_81()) return true;
}
}
if (jj_scan_token(56)) return true;
return false;
}
- final private boolean jj_3_7() {
- if (jj_3R_24()) return true;
+ final private boolean jj_3R_46() {
+ if (jj_3R_55()) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_98()) { jj_scanpos = xsp; break; }
+ }
return false;
}
- final private boolean jj_3R_110() {
- if (jj_scan_token(37)) return true;
- if (jj_3R_101()) return true;
+ final private boolean jj_3R_134() {
+ if (jj_scan_token(41)) return true;
+ if (jj_3R_121()) return true;
return false;
}
- final private boolean jj_3R_102() {
+ final private boolean jj_3_8() {
+ if (jj_scan_token(58)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_110()) {
- jj_scanpos = xsp;
- if (jj_3R_111()) {
- jj_scanpos = xsp;
- if (jj_3R_112()) {
+ if (jj_3R_24()) {
jj_scanpos = xsp;
- if (jj_3R_113()) {
- jj_scanpos = xsp;
- if (jj_3R_114()) return true;
- }
- }
- }
+ if (jj_3R_25()) return true;
}
return false;
}
- final private boolean jj_3R_23() {
+ final private boolean jj_3R_133() {
+ if (jj_scan_token(40)) return true;
+ if (jj_3R_121()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_35() {
+ if (jj_3R_42()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_54() {
+ if (jj_scan_token(14)) return true;
+ if (jj_scan_token(12)) return true;
+ if (jj_scan_token(13)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_17() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3_7()) {
- jj_scanpos = xsp;
- if (jj_3R_39()) {
+ if (jj_3R_35()) {
jj_scanpos = xsp;
- if (jj_3R_40()) {
+ if (jj_3R_36()) {
jj_scanpos = xsp;
- if (jj_3R_41()) return true;
+ if (jj_3R_37()) return true;
}
}
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3_8()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_22() {
- if (jj_3R_38()) return true;
+ final private boolean jj_3R_132() {
+ if (jj_scan_token(39)) return true;
+ if (jj_3R_121()) return true;
return false;
}
- final private boolean jj_3R_57() {
- if (jj_scan_token(55)) return true;
+ final private boolean jj_3R_131() {
+ if (jj_scan_token(38)) return true;
+ if (jj_3R_121()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_130() {
+ if (jj_scan_token(37)) return true;
+ if (jj_3R_121()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_122() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3_4()) {
+ if (jj_3R_130()) {
jj_scanpos = xsp;
- if (jj_3R_66()) {
+ if (jj_3R_131()) {
+ jj_scanpos = xsp;
+ if (jj_3R_132()) {
jj_scanpos = xsp;
- if (jj_3R_67()) return true;
+ if (jj_3R_133()) {
+ jj_scanpos = xsp;
+ if (jj_3R_134()) return true;
+ }
+ }
}
}
- if (jj_scan_token(56)) return true;
return false;
}
- final private boolean jj_3R_91() {
- if (jj_3R_101()) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_102()) { jj_scanpos = xsp; break; }
- }
+ final private boolean jj_3R_64() {
+ if (jj_scan_token(55)) return true;
+ if (jj_3R_63()) return true;
return false;
}
final private boolean jj_3R_42() {
- if (jj_3R_49()) return true;
+ if (jj_3R_20()) return true;
Token xsp;
+ if (jj_3R_65()) return true;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_78()) { jj_scanpos = xsp; break; }
+ if (jj_3R_65()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3_6() {
- if (jj_scan_token(57)) return true;
+ final private boolean jj_3R_111() {
+ if (jj_3R_121()) return true;
Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_22()) {
- jj_scanpos = xsp;
- if (jj_3R_23()) return true;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_122()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_33() {
- if (jj_3R_38()) return true;
+ final private boolean jj_3R_124() {
+ if (jj_scan_token(36)) return true;
+ if (jj_3R_111()) return true;
return false;
}
- final private boolean jj_3R_48() {
- if (jj_scan_token(14)) return true;
+ final private boolean jj_3R_26() {
+ if (jj_3R_20()) return true;
if (jj_scan_token(12)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_46()) jj_scanpos = xsp;
if (jj_scan_token(13)) return true;
return false;
}
- final private boolean jj_3R_104() {
- if (jj_scan_token(36)) return true;
- if (jj_3R_91()) return true;
+ final private boolean jj_3R_123() {
+ if (jj_scan_token(35)) return true;
+ if (jj_3R_111()) return true;
return false;
}
- final private boolean jj_3R_16() {
+ final private boolean jj_3R_112() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_33()) {
+ if (jj_3R_123()) {
jj_scanpos = xsp;
- if (jj_3R_34()) return true;
- }
- while (true) {
- xsp = jj_scanpos;
- if (jj_3_6()) { jj_scanpos = xsp; break; }
+ if (jj_3R_124()) return true;
}
return false;
}
- final private boolean jj_3R_103() {
- if (jj_scan_token(35)) return true;
- if (jj_3R_91()) return true;
+ final private boolean jj_3R_63() {
+ if (jj_3R_55()) return true;
+ if (jj_scan_token(57)) return true;
+ if (jj_3R_55()) return true;
return false;
}
- final private boolean jj_3R_92() {
+ final private boolean jj_3R_105() {
+ if (jj_3R_111()) return true;
Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_103()) {
- jj_scanpos = xsp;
- if (jj_3R_104()) return true;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_112()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_85() {
- if (jj_3R_91()) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_92()) { jj_scanpos = xsp; break; }
- }
+ final private boolean jj_3R_120() {
+ if (jj_scan_token(34)) return true;
+ if (jj_3R_105()) return true;
return false;
}
- final private boolean jj_3R_38() {
- if (jj_3R_18()) return true;
+ final private boolean jj_3R_50() {
+ if (jj_scan_token(54)) return true;
+ if (jj_3R_63()) return true;
Token xsp;
- if (jj_3R_57()) return true;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_57()) { jj_scanpos = xsp; break; }
+ if (jj_3R_64()) { jj_scanpos = xsp; break; }
}
+ if (jj_scan_token(56)) return true;
return false;
}
- final private boolean jj_3R_100() {
- if (jj_scan_token(34)) return true;
- if (jj_3R_85()) return true;
- return false;
- }
-
- final private boolean jj_3R_99() {
+ final private boolean jj_3R_119() {
if (jj_scan_token(33)) return true;
- if (jj_3R_85()) return true;
+ if (jj_3R_105()) return true;
return false;
}
- final private boolean jj_3R_24() {
- if (jj_3R_18()) return true;
- if (jj_scan_token(12)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_42()) jj_scanpos = xsp;
- if (jj_scan_token(13)) return true;
+ final private boolean jj_3R_118() {
+ if (jj_scan_token(32)) return true;
+ if (jj_3R_105()) return true;
return false;
}
- final private boolean jj_3R_98() {
- if (jj_scan_token(32)) return true;
- if (jj_3R_85()) return true;
+ final private boolean jj_3R_86() {
+ if (jj_scan_token(52)) return true;
+ if (jj_scan_token(12)) return true;
return false;
}
- final private boolean jj_3R_97() {
+ final private boolean jj_3R_117() {
if (jj_scan_token(31)) return true;
- if (jj_3R_85()) return true;
+ if (jj_3R_105()) return true;
return false;
}
- final private boolean jj_3R_96() {
+ final private boolean jj_3R_116() {
if (jj_scan_token(30)) return true;
- if (jj_3R_85()) return true;
+ if (jj_3R_105()) return true;
return false;
}
- final private boolean jj_3R_95() {
+ final private boolean jj_3R_115() {
if (jj_scan_token(29)) return true;
- if (jj_3R_85()) return true;
+ if (jj_3R_105()) return true;
return false;
}
- final private boolean jj_3R_94() {
+ final private boolean jj_3R_87() {
+ if (jj_scan_token(51)) return true;
+ if (jj_scan_token(12)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_114() {
if (jj_scan_token(28)) return true;
- if (jj_3R_85()) return true;
+ if (jj_3R_105()) return true;
return false;
}
- final private boolean jj_3R_93() {
+ final private boolean jj_3R_113() {
if (jj_scan_token(27)) return true;
- if (jj_3R_85()) return true;
+ if (jj_3R_105()) return true;
return false;
}
- final private boolean jj_3R_86() {
+ final private boolean jj_3R_106() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_93()) {
+ if (jj_3R_113()) {
jj_scanpos = xsp;
- if (jj_3R_94()) {
+ if (jj_3R_114()) {
jj_scanpos = xsp;
- if (jj_3R_95()) {
+ if (jj_3R_115()) {
jj_scanpos = xsp;
- if (jj_3R_96()) {
+ if (jj_3R_116()) {
jj_scanpos = xsp;
- if (jj_3R_97()) {
+ if (jj_3R_117()) {
jj_scanpos = xsp;
- if (jj_3R_98()) {
+ if (jj_3R_118()) {
jj_scanpos = xsp;
- if (jj_3R_99()) {
+ if (jj_3R_119()) {
jj_scanpos = xsp;
- if (jj_3R_100()) return true;
+ if (jj_3R_120()) return true;
}
}
}
@@ -2859,56 +3018,158 @@
return false;
}
- final private boolean jj_3R_83() {
- if (jj_3R_85()) return true;
+ final private boolean jj_3R_103() {
+ if (jj_3R_105()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_86()) { jj_scanpos = xsp; break; }
+ if (jj_3R_106()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_90() {
+ final private boolean jj_3R_85() {
+ if (jj_scan_token(49)) return true;
+ if (jj_scan_token(12)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_110() {
if (jj_scan_token(26)) return true;
- if (jj_3R_83()) return true;
+ if (jj_3R_103()) return true;
return false;
}
- final private boolean jj_3R_89() {
+ final private boolean jj_3R_82() {
+ if (jj_3R_17()) return true;
+ if (jj_scan_token(48)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_109() {
if (jj_scan_token(25)) return true;
- if (jj_3R_83()) return true;
+ if (jj_3R_103()) return true;
return false;
}
- final private boolean jj_3R_88() {
+ final private boolean jj_3R_108() {
if (jj_scan_token(24)) return true;
- if (jj_3R_83()) return true;
+ if (jj_3R_103()) return true;
return false;
}
- final private boolean jj_3R_87() {
+ final private boolean jj_3R_107() {
if (jj_scan_token(23)) return true;
- if (jj_3R_83()) return true;
+ if (jj_3R_103()) return true;
return false;
}
- final private boolean jj_3R_84() {
+ final private boolean jj_3R_104() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_87()) {
+ if (jj_3R_107()) {
jj_scanpos = xsp;
- if (jj_3R_88()) {
+ if (jj_3R_108()) {
jj_scanpos = xsp;
- if (jj_3R_89()) {
+ if (jj_3R_109()) {
jj_scanpos = xsp;
- if (jj_3R_90()) return true;
+ if (jj_3R_110()) return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ final private boolean jj_3R_83() {
+ if (jj_3R_52()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_84() {
+ if (jj_3R_19()) return true;
+ if (jj_scan_token(48)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_101() {
+ if (jj_3R_103()) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_104()) { jj_scanpos = xsp; break; }
}
+ return false;
+ }
+
+ final private boolean jj_3_5() {
+ if (jj_3R_16()) return true;
+ if (jj_scan_token(15)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_102() {
+ if (jj_scan_token(22)) return true;
+ if (jj_3R_101()) return true;
+ return false;
+ }
+
+ final private boolean jj_3_4() {
+ if (jj_3R_17()) return true;
+ if (jj_scan_token(48)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_71() {
+ if (jj_3R_87()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_99() {
+ if (jj_3R_101()) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_102()) { jj_scanpos = xsp; break; }
}
+ return false;
+ }
+
+ final private boolean jj_3R_70() {
+ if (jj_3R_86()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_69() {
+ if (jj_3R_85()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_100() {
+ if (jj_scan_token(21)) return true;
+ if (jj_3R_99()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_68() {
+ if (jj_3R_84()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_94() {
+ if (jj_3R_99()) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_100()) { jj_scanpos = xsp; break; }
}
return false;
}
+ final private boolean jj_3R_67() {
+ if (jj_3R_83()) return true;
+ return false;
+ }
+
public ParserTokenManager token_source;
SimpleCharStream jj_input_stream;
public Token token, jj_nt;
@@ -2918,7 +3179,7 @@
public boolean lookingAhead = false;
private boolean jj_semLA;
private int jj_gen;
- final private int[] jj_la1 = new int[34];
+ final private int[] jj_la1 = new int[36];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static {
@@ -2926,54 +3187,43 @@
jj_la1_1();
}
private static void jj_la1_0() {
- jj_la1_0 = new int[] {0x5b80,0x5b80,0x1000,0x5980,0x30000,0x30000,0xc0000,0xc0000,0x100000,0x200000,0x400000,0x7800000,0x7800000,0xf8000000,0xf8000000,0x0,0x0,0x0,0x0,0x5980,0x5980,0x180,0x0,0x200,0x5980,0x0,0x0,0x5980,0x80,0x0,0x0,0x4080,0x4080,0x180,};
+ jj_la1_0 = new int[] {0x5b80,0x5b80,0x1000,0x5980,0x30000,0x30000,0xc0000,0xc0000,0x100000,0x200000,0x400000,0x7800000,0x7800000,0xf8000000,0xf8000000,0x0,0x0,0x0,0x0,0x5980,0x180,0x5800,0x180,0x0,0x0,0x5980,0x0,0x0,0x0,0x5980,0x80,0x0,0x0,0x4080,0x4080,0x180,};
}
private static void jj_la1_1() {
- jj_la1_1 = new int[] {0x241bfc10,0x241bfc10,0x4000000,0x2400fc10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x7,0x18,0x18,0x3e0,0x3e0,0x2400fc10,0x2400e000,0x2000e000,0xc000,0x10000,0x241afc10,0x40000,0x400000,0x2400fc10,0x4000000,0x800000,0x4000000,0x4000000,0x4000000,0x2400e000,};
+ jj_la1_1 = new int[] {0x485bfc10,0x485bfc10,0x8400000,0x4840fc10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x7,0x18,0x18,0x3e0,0x3e0,0x4840fc10,0x4000e000,0x400000,0x4000e000,0xc000,0x10000,0x485afc10,0x40000,0x800000,0x800000,0x4840fc10,0x8400000,0x400000,0x8400000,0x8000000,0x8000000,0x4840e000,};
}
- final private JJCalls[] jj_2_rtns = new JJCalls[9];
+ final private JJCalls[] jj_2_rtns = new JJCalls[11];
private boolean jj_rescan = false;
private int jj_gc = 0;
- public Parser( java.io.InputStream stream, Uberspect uberspect ) {
- this(stream, null, uberspect);
- }
- public Parser( java.io.InputStream stream, String encoding, Uberspect uberspect ) {
- this.uberspect = uberspect;
- try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e.getMessage()); }
+ public Parser(java.io.InputStream stream) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
token_source = new ParserTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
public void ReInit(java.io.InputStream stream) {
- ReInit(stream, null);
- }
- public void ReInit(java.io.InputStream stream, String encoding) {
- try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e.getMessage()); }
+ jj_input_stream.ReInit(stream, 1, 1);
token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
+ jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
- public Parser( java.io.Reader stream ) {
- this( stream, Introspector.getUberspect());
- }
-
- public Parser( java.io.Reader stream, Uberspect uberspect ) {
- this.uberspect = uberspect;
- jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ public Parser(java.io.Reader stream) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
token_source = new ParserTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2982,18 +3232,18 @@
token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
+ jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
- public Parser( ParserTokenManager tm, Uberspect uberspect ) {
- this.uberspect = uberspect;
- token_source = tm;
+ public Parser(ParserTokenManager tm) {
+ token_source = tm;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -3001,8 +3251,9 @@
token_source = tm;
token = new Token();
jj_ntk = -1;
+ jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 34; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -3030,11 +3281,7 @@
throw generateParseException();
}
- public Uberspect getUberspect() {
- return uberspect;
- }
-
- static private final class LookaheadSuccess extends java.lang.Error { }
+ static private final class LookaheadSuccess extends java.lang.Error { }
final private LookaheadSuccess jj_ls = new LookaheadSuccess();
final private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) {
@@ -3117,15 +3364,15 @@
public ParseException generateParseException() {
jj_expentries.removeAllElements();
- boolean[] la1tokens = new boolean[62];
- for (int i = 0; i < 62; i++) {
+ boolean[] la1tokens = new boolean[63];
+ for (int i = 0; i < 63; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 34; i++) {
+ for (int i = 0; i < 36; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -3137,7 +3384,7 @@
}
}
}
- for (int i = 0; i < 62; i++) {
+ for (int i = 0; i < 63; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
@@ -3162,8 +3409,7 @@
final private void jj_rescan_token() {
jj_rescan = true;
- for (int i = 0; i < 9; i++) {
- try {
+ for (int i = 0; i < 11; i++) {
JJCalls p = jj_2_rtns[i];
do {
if (p.gen > jj_gen) {
@@ -3178,11 +3424,12 @@
case 6: jj_3_7(); break;
case 7: jj_3_8(); break;
case 8: jj_3_9(); break;
+ case 9: jj_3_10(); break;
+ case 10: jj_3_11(); break;
}
}
p = p.next;
} while (p != null);
- } catch(LookaheadSuccess ls) { }
}
jj_rescan = false;
}
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.jj
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.jj?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.jj (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Parser.jj Sun Jun 3 09:38:45 2007
@@ -1,4 +1,4 @@
-/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. ./Parser.jj */
+/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. Parser.jj */
/*@egen*//*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTokenManager.java Sun Jun 3 09:38:45 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/* Generated By:JJTree&JavaCC: Do not edit this line. ParserTokenManager.java */
+ /* Generated By:JJTree&JavaCC: Do not edit this line. ParserTokenManager.java */
package org.apache.commons.jexl.parser;
import java.io.Reader;
import java.io.ByteArrayInputStream;
@@ -674,12 +674,14 @@
private final int[] jjrounds = new int[17];
private final int[] jjstateSet = new int[34];
protected char curChar;
-public ParserTokenManager(SimpleCharStream stream){
+public ParserTokenManager(SimpleCharStream stream)
+{
if (SimpleCharStream.staticFlag)
throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
input_stream = stream;
}
-public ParserTokenManager(SimpleCharStream stream, int lexState){
+public ParserTokenManager(SimpleCharStream stream, int lexState)
+{
this(stream);
SwitchTo(lexState);
}
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTreeConstants.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTreeConstants.java?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTreeConstants.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserTreeConstants.java Sun Jun 3 09:38:45 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/* Generated By:JJTree: Do not edit this line. ./ParserTreeConstants.java */
+/* Generated By:JJTree: Do not edit this line. ParserTreeConstants.java */
package org.apache.commons.jexl.parser;
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserVisitor.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserVisitor.java?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserVisitor.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ParserVisitor.java Sun Jun 3 09:38:45 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/* Generated By:JJTree: Do not edit this line. ./ParserVisitor.java */
+ /* Generated By:JJTree: Do not edit this line. ParserVisitor.java */
package org.apache.commons.jexl.parser;
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleCharStream.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleCharStream.java?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleCharStream.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/SimpleCharStream.java Sun Jun 3 09:38:45 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.0 */
+ /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 3.0 */
package org.apache.commons.jexl.parser;
/**
@@ -43,11 +43,6 @@
protected char[] buffer;
protected int maxNextCharInd = 0;
protected int inBuf = 0;
- protected int tabSize = 8;
-
- protected void setTabSize(int i) { tabSize = i; }
- protected int getTabSize(int i) { return tabSize; }
-
protected void ExpandBuff(boolean wrapAround)
{
@@ -183,7 +178,7 @@
break;
case '\t' :
column--;
- column += (tabSize - (column % tabSize));
+ column += (8 - (column & 07));
break;
default :
break;
@@ -269,7 +264,7 @@
}
public SimpleCharStream(java.io.Reader dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
this(dstream, startline, startcolumn, 4096);
}
@@ -298,7 +293,7 @@
}
public void ReInit(java.io.Reader dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
ReInit(dstream, startline, startcolumn, 4096);
}
@@ -307,68 +302,35 @@
{
ReInit(dstream, 1, 1, 4096);
}
- public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
- int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
- {
- this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
- }
-
public SimpleCharStream(java.io.InputStream dstream, int startline,
int startcolumn, int buffersize)
{
- this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
- }
-
- public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
- int startcolumn) throws java.io.UnsupportedEncodingException
- {
- this(dstream, encoding, startline, startcolumn, 4096);
+ this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
}
public SimpleCharStream(java.io.InputStream dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
this(dstream, startline, startcolumn, 4096);
}
- public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
- {
- this(dstream, encoding, 1, 1, 4096);
- }
-
public SimpleCharStream(java.io.InputStream dstream)
{
this(dstream, 1, 1, 4096);
}
- public void ReInit(java.io.InputStream dstream, String encoding, int startline,
- int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
- {
- ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
- }
-
public void ReInit(java.io.InputStream dstream, int startline,
int startcolumn, int buffersize)
{
- ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
- }
-
- public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
- {
- ReInit(dstream, encoding, 1, 1, 4096);
+ ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
}
public void ReInit(java.io.InputStream dstream)
{
ReInit(dstream, 1, 1, 4096);
}
- public void ReInit(java.io.InputStream dstream, String encoding, int startline,
- int startcolumn) throws java.io.UnsupportedEncodingException
- {
- ReInit(dstream, encoding, startline, startcolumn, 4096);
- }
public void ReInit(java.io.InputStream dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
ReInit(dstream, startline, startcolumn, 4096);
}
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Token.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Token.java?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Token.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/Token.java Sun Jun 3 09:38:45 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
+ /* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
package org.apache.commons.jexl.parser;
/**
Modified: jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/TokenMgrError.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/TokenMgrError.java?view=diff&rev=543936&r1=543935&r2=543936
==============================================================================
--- jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/TokenMgrError.java (original)
+++ jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/TokenMgrError.java Sun Jun 3 09:38:45 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
+ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
package org.apache.commons.jexl.parser;
public class TokenMgrError extends Error
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org