You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/03/16 13:17:42 UTC
[1/3] cayenne git commit: CAY-2270 Update function support in
expression parser
Repository: cayenne
Updated Branches:
refs/heads/master 8ef8f1221 -> e56a93f4f
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/main/jjtree/org/apache/cayenne/exp/parser/ExpressionParser.jjt
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/jjtree/org/apache/cayenne/exp/parser/ExpressionParser.jjt b/cayenne-server/src/main/jjtree/org/apache/cayenne/exp/parser/ExpressionParser.jjt
index ebc881b..f61c692 100644
--- a/cayenne-server/src/main/jjtree/org/apache/cayenne/exp/parser/ExpressionParser.jjt
+++ b/cayenne-server/src/main/jjtree/org/apache/cayenne/exp/parser/ExpressionParser.jjt
@@ -142,6 +142,8 @@ void conditionExpression() : {}
<NULL> #Scalar(0)
|
aggregateExpression()
+ |
+ dateTimeFunction()
}
void stringParameter() : {}
@@ -375,6 +377,26 @@ void sum() #Sum : { }
<SUM> "(" numericExpression() ")"
}
+void dateTimeFunction() : { }
+{
+ currentDate() | currentTime() | currentTimestamp()
+}
+
+void currentDate() #CurrentDate : {}
+{
+ <CURRENT_DATE> "(" ")"
+}
+
+void currentTime() #CurrentTime : {}
+{
+ <CURRENT_TIME> "(" ")"
+}
+
+void currentTimestamp() #CurrentTimestamp : {}
+{
+ <CURRENT_TIMESTAMP> "(" ")"
+}
+
TOKEN_MGR_DECLS:
{
@@ -465,38 +487,38 @@ TOKEN : {
| <FALSE: "false" | "FALSE" >
}
-TOKEN [ IGNORE_CASE ]: /* aggregates */
+TOKEN : /* aggregates */
{
- <AVG: "AVG" >
- | <MIN: "MIN" >
- | <MAX: "MAX" >
- | <SUM: "SUM" >
- | <COUNT: "COUNT" >
+ <AVG: "avg" >
+ | <MIN: "min" >
+ | <MAX: "max" >
+ | <SUM: "sum" >
+ | <COUNT: "count" >
}
-TOKEN [ IGNORE_CASE ]: /* functions returning strings */
+TOKEN : /* functions returning strings */
{
- <CONCAT: "CONCAT" >
- | <SUBSTRING: "SUBSTRING" >
- | <TRIM: "TRIM" >
- | <LOWER: "LOWER" >
- | <UPPER: "UPPER" >
+ <CONCAT: "concat" >
+ | <SUBSTRING: "substring" >
+ | <TRIM: "trim" >
+ | <LOWER: "lower" >
+ | <UPPER: "upper" >
}
-TOKEN [ IGNORE_CASE ]: /* functions returning numerics */
+TOKEN : /* functions returning numerics */
{
- <LENGTH: "LENGTH" >
- | <LOCATE: "LOCATE" >
- | <ABS: "ABS" >
- | <SQRT: "SQRT" >
- | <MOD: "MOD" >
+ <LENGTH: "length" >
+ | <LOCATE: "locate" >
+ | <ABS: "abs" >
+ | <SQRT: "sqrt" >
+ | <MOD: "mod" >
}
-TOKEN [ IGNORE_CASE ]: /* functions returning datetime */
+TOKEN : /* functions returning datetime */
{
- <CURRENT_DATE: "CURRENT_DATE" >
- | <CURRENT_TIME: "CURRENT_TIME" >
- | <CURRENT_TIMESTAMP: "CURRENT_TIMESTAMP" >
+ <CURRENT_DATE: "currentDate" >
+ | <CURRENT_TIME: "currentTime" >
+ | <CURRENT_TIMESTAMP: "currentTimestamp" | "now" >
}
void namedParameter() :
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactoryTest.java
index 9fc6ac2..5e541f0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionFactoryTest.java
@@ -475,7 +475,7 @@ public class ExpressionFactoryTest {
@Test
public void testFuncExp() {
- Expression e = ExpressionFactory.exp("TRIM(abc.xyz)");
+ Expression e = ExpressionFactory.exp("trim(abc.xyz)");
assertEquals(ASTTrim.class, e.getClass());
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java
index c5c88d1..8723a2b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAbsTest.java
@@ -46,7 +46,7 @@ public class ASTAbsTest {
@Test
public void parseTest() throws Exception {
- String expString = "ABS(xyz)";
+ String expString = "abs(xyz)";
Expression exp = ExpressionFactory.exp(expString);
assertTrue(exp instanceof ASTAbs);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAggregateTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAggregateTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAggregateTest.java
index 67ce3d0..f6e57c3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAggregateTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTAggregateTest.java
@@ -46,7 +46,7 @@ public class ASTAggregateTest {
@Test
public void testAvgParse() throws Exception {
- String expressionString = "AVG(artistName)";
+ String expressionString = "avg(artistName)";
Expression exp = ExpressionFactory.exp(expressionString);
assertTrue(exp instanceof ASTAvg);
assertEquals(1, exp.getOperandCount());
@@ -63,7 +63,7 @@ public class ASTAggregateTest {
@Test
public void testCountExpParse() throws Exception {
- String expressionString = "COUNT(artistName)";
+ String expressionString = "count(artistName)";
Expression exp = ExpressionFactory.exp(expressionString);
assertTrue(exp instanceof ASTCount);
assertEquals(1, exp.getOperandCount());
@@ -74,7 +74,7 @@ public class ASTAggregateTest {
@Test
public void testCountAsteriskParse() throws Exception {
- String expressionString = "COUNT(*)";
+ String expressionString = "count(*)";
Expression exp = ExpressionFactory.exp(expressionString);
assertTrue(exp instanceof ASTCount);
assertEquals(1, exp.getOperandCount());
@@ -91,7 +91,7 @@ public class ASTAggregateTest {
@Test
public void testMinParse() throws Exception {
- String expressionString = "MIN(artistName)";
+ String expressionString = "min(artistName)";
Expression exp = ExpressionFactory.exp(expressionString);
assertTrue(exp instanceof ASTMin);
assertEquals(1, exp.getOperandCount());
@@ -108,7 +108,7 @@ public class ASTAggregateTest {
@Test
public void testMaxParse() throws Exception {
- String expressionString = "MAX(artistName)";
+ String expressionString = "max(artistName)";
Expression exp = ExpressionFactory.exp(expressionString);
assertTrue(exp instanceof ASTMax);
assertEquals(1, exp.getOperandCount());
@@ -125,7 +125,7 @@ public class ASTAggregateTest {
@Test
public void testSumParse() throws Exception {
- String expressionString = "SUM(artistName)";
+ String expressionString = "sum(artistName)";
Expression exp = ExpressionFactory.exp(expressionString);
assertTrue(exp instanceof ASTSum);
assertEquals(1, exp.getOperandCount());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java
index d951327..f0c80eb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTConcatTest.java
@@ -51,7 +51,7 @@ public class ASTConcatTest {
@Test
public void testParseConcat() throws Exception {
- Expression exp = ExpressionFactory.exp("CONCAT(artistName, ' ', 'test')");
+ Expression exp = ExpressionFactory.exp("concat(artistName, ' ', 'test')");
assertEquals(ASTConcat.class, exp.getClass());
assertEquals(3, exp.getOperandCount());
@@ -65,7 +65,7 @@ public class ASTConcatTest {
@Test
public void parseTest() throws Exception {
- String expString = "CONCAT(xyz , \" \" , abc)";
+ String expString = "concat(xyz , \" \" , abc)";
Expression exp = ExpressionFactory.exp(expString);
assertTrue(exp instanceof ASTConcat);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
index 6110eb1..11a5687 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
@@ -125,4 +125,28 @@ public class ASTFunctionCallDateIT extends ServerCase {
assertNotEquals(res1, res2);
}
+
+ @Test
+ public void testASTCurrentDateParse() {
+ Expression exp = ExpressionFactory.exp("dateColumn > currentDate()");
+ DateTestEntity res = ObjectSelect.query(DateTestEntity.class, exp).selectOne(context);
+ assertNotNull(res);
+ }
+
+ @Test
+ public void testASTCurrentTimeParse() {
+ Expression exp = ExpressionFactory.exp("timeColumn > currentTime()");
+ DateTestEntity res = ObjectSelect.query(DateTestEntity.class, exp).selectOne(context);
+ if(!unitDbAdapter.supportsTimeSqlType()) {
+ return;
+ }
+ assertNotNull(res);
+ }
+
+ @Test
+ public void testASTCurrentTimestampParse() {
+ Expression exp = ExpressionFactory.exp("timestampColumn > now()");
+ DateTestEntity res = ObjectSelect.query(DateTestEntity.class, exp).selectOne(context);
+ assertNotNull(res);
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java
index 9033ab9..a5ab9fd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallMathIT.java
@@ -86,25 +86,25 @@ public class ASTFunctionCallMathIT extends ServerCase {
@Test
public void testASTAbsParse() {
- Expression exp = ExpressionFactory.exp("ABS(-3)");
+ Expression exp = ExpressionFactory.exp("abs(-3)");
assertEquals(3.0, exp.evaluate(new Object()));
}
@Test
public void testASTSqrtParse() {
- Expression exp = ExpressionFactory.exp("SQRT(16)");
+ Expression exp = ExpressionFactory.exp("sqrt(16)");
assertEquals(4.0, exp.evaluate(new Object()));
}
@Test
public void testASTModParse() {
- Expression exp = ExpressionFactory.exp("MOD(11,2)");
+ Expression exp = ExpressionFactory.exp("mod(11,2)");
assertEquals(1.0, exp.evaluate(new Object()));
}
@Test
public void testComplexParse() {
- Expression exp = ExpressionFactory.exp("10 - MOD(SQRT(ABS(-9)), 2)");
+ Expression exp = ExpressionFactory.exp("10 - mod(sqrt(abs(-9)), 2)");
assertEquals(BigDecimal.valueOf(9L), exp.evaluate(new Object()));
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java
index 47d6373..57e3254 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallStringIT.java
@@ -156,43 +156,43 @@ public class ASTFunctionCallStringIT extends ServerCase {
@Test
public void testASTConcatParse() {
- Expression exp = ExpressionFactory.exp("CONCAT('abc', 'def')");
+ Expression exp = ExpressionFactory.exp("concat('abc', 'def')");
assertEquals("abcdef", exp.evaluate(new Object()));
}
@Test
public void testASTSubstringParse() {
- Expression exp = ExpressionFactory.exp("SUBSTRING('123456789', 3, 2)");
+ Expression exp = ExpressionFactory.exp("substring('123456789', 3, 2)");
assertEquals("34", exp.evaluate(new Object()));
}
@Test
public void testASTTrimParse() {
- Expression exp = ExpressionFactory.exp("TRIM(' abc ')");
+ Expression exp = ExpressionFactory.exp("trim(' abc ')");
assertEquals("abc", exp.evaluate(new Object()));
}
@Test
public void testASTLowerParse() {
- Expression exp = ExpressionFactory.exp("LOWER('AbC')");
+ Expression exp = ExpressionFactory.exp("lower('AbC')");
assertEquals("abc", exp.evaluate(new Object()));
}
@Test
public void testASTUpperParse() {
- Expression exp = ExpressionFactory.exp("UPPER('aBc')");
+ Expression exp = ExpressionFactory.exp("upper('aBc')");
assertEquals("ABC", exp.evaluate(new Object()));
}
@Test
public void testASTLocateParse() {
- Expression exp = ExpressionFactory.exp("LOCATE('Bc', 'aBc')");
+ Expression exp = ExpressionFactory.exp("locate('Bc', 'aBc')");
assertEquals(2, exp.evaluate(new Object()));
}
@Test
public void testComplexParse() {
- Expression exp = ExpressionFactory.exp("LOCATE(UPPER('Bc'), UPPER('aBc')) = LENGTH(SUBSTRING(TRIM(LOWER(CONCAT(' abc', 'def '))), 3, 2))");
+ Expression exp = ExpressionFactory.exp("locate(upper('Bc'), upper('aBc')) = length(substring(trim(lower(concat(' abc', 'def '))), 3, 2))");
assertEquals(true, exp.evaluate(new Object()));
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java
index dde6dc0..4d21abb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLengthTest.java
@@ -19,6 +19,8 @@
package org.apache.cayenne.exp.parser;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.testdo.testmap.Artist;
import org.junit.Test;
@@ -42,4 +44,14 @@ public class ASTLengthTest {
assertEquals(9, res);
}
+ @Test
+ public void parseTest() throws Exception {
+ String expString = "length(xyz)";
+ Expression exp = ExpressionFactory.exp(expString);
+
+ assertTrue(exp instanceof ASTLength);
+ String toString = exp.toString();
+ assertEquals(expString, toString);
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java
index 9e1a0e8..5a58dd4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLocateTest.java
@@ -54,7 +54,7 @@ public class ASTLocateTest {
@Test
public void parseTest() throws Exception {
- String expString = "LOCATE(\"xyz\" , abc , 4)";
+ String expString = "locate(\"xyz\" , abc , 4)";
Expression exp = ExpressionFactory.exp(expString);
assertTrue(exp instanceof ASTLocate);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java
index 96a6671..a45dd00 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLowerTest.java
@@ -47,7 +47,7 @@ public class ASTLowerTest {
@Test
public void parseTest() throws Exception {
- String expString = "LOWER(xyz)";
+ String expString = "lower(xyz)";
Expression exp = ExpressionFactory.exp(expString);
assertTrue(exp instanceof ASTLower);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java
index 0f9febd..e25e93a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTModTest.java
@@ -46,7 +46,7 @@ public class ASTModTest {
@Test
public void parseTest() throws Exception {
- String expString = "MOD(xyz , 3)";
+ String expString = "mod(xyz , 3)";
Expression exp = ExpressionFactory.exp(expString);
assertTrue(exp instanceof ASTMod);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java
index 13c015b..7ed1b69 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSqrtTest.java
@@ -45,7 +45,7 @@ public class ASTSqrtTest {
@Test
public void parseTest() throws Exception {
- String expString = "SQRT(xyz)";
+ String expString = "sqrt(xyz)";
Expression exp = ExpressionFactory.exp(expString);
assertTrue(exp instanceof ASTSqrt);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSubstringTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSubstringTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSubstringTest.java
index 2b35ab0..2917c0c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSubstringTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTSubstringTest.java
@@ -49,7 +49,7 @@ public class ASTSubstringTest {
@Test
public void parseTest() throws Exception {
- String expString = "SUBSTRING(xyz , 2 , 3)";
+ String expString = "substring(xyz , 2 , 3)";
Expression exp = ExpressionFactory.exp(expString);
assertTrue(exp instanceof ASTSubstring);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java
index 65b94ea..b66ea6b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTTrimTest.java
@@ -46,7 +46,7 @@ public class ASTTrimTest {
@Test
public void parseTest() throws Exception {
- String expString = "TRIM(xyz)";
+ String expString = "trim(xyz)";
Expression exp = ExpressionFactory.exp(expString);
assertTrue(exp instanceof ASTTrim);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java
index 375fe8d..3a17731 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTUpperTest.java
@@ -47,7 +47,7 @@ public class ASTUpperTest {
@Test
public void parseTest() throws Exception {
- String expString = "UPPER(xyz)";
+ String expString = "upper(xyz)";
Expression exp = ExpressionFactory.exp(expString);
assertTrue(exp instanceof ASTUpper);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java
index 685a7d4..b788a27 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java
@@ -74,32 +74,32 @@ public class ExpressionCollectionEvaluationIT extends ServerCase {
@Test
public void testSubstringWithCollection() {
- testExpression("SUBSTRING(paintingArray.paintingTitle, 1, 1)", String.class);
+ testExpression("substring(paintingArray.paintingTitle, 1, 1)", String.class);
}
@Test
public void testTrimWithCollection() {
- testExpression("TRIM(paintingArray.paintingTitle)", String.class);
+ testExpression("trim(paintingArray.paintingTitle)", String.class);
}
@Test
public void testUpperWithCollection() {
- testExpression("UPPER(paintingArray.paintingTitle)", String.class);
+ testExpression("upper(paintingArray.paintingTitle)", String.class);
}
@Test
public void testLowerWithCollection() {
- testExpression("LOWER(paintingArray.paintingTitle)", String.class);
+ testExpression("lower(paintingArray.paintingTitle)", String.class);
}
@Test
public void testLengthWithCollection() {
- testExpression("LENGTH(paintingArray.paintingTitle)", Integer.class);
+ testExpression("length(paintingArray.paintingTitle)", Integer.class);
}
@Test
public void testConcatWithCollection() {
- testExpression("CONCAT(paintingArray.paintingTitle, ' ', 'xyz')", String.class);
+ testExpression("concat(paintingArray.paintingTitle, ' ', 'xyz')", String.class);
}
@Test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index e168b10..9f5e3c3 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -18,6 +18,7 @@ CAY-2258 DI: type-safe binding of List and Map
CAY-2266 Move EventBridge implementations into autoloadable modules
CAY-2267 Contribute lifecycle events listeners via DI
CAY-2259 QueryCache: support for referencing type-safe caches
+CAY-2270 Update function support in expression parser
Bug Fixes:
[3/3] cayenne git commit: CAY-2270 Update function support in
expression parser
Posted by nt...@apache.org.
CAY-2270 Update function support in expression parser
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e56a93f4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e56a93f4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e56a93f4
Branch: refs/heads/master
Commit: e56a93f4fd7514d267613edc85b85f5ca1e3ffc6
Parents: 8ef8f12
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Mar 16 16:09:38 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Mar 16 16:09:38 2017 +0300
----------------------------------------------------------------------
.../cayenne/exp/parser/ASTCurrentDate.java | 8 +-
.../cayenne/exp/parser/ASTCurrentTime.java | 8 +-
.../cayenne/exp/parser/ASTCurrentTimestamp.java | 8 +-
.../cayenne/exp/parser/ASTFunctionCall.java | 6 +-
.../cayenne/exp/parser/ExpressionParser.java | 136 +-
.../exp/parser/ExpressionParserConstants.java | 36 +-
.../parser/ExpressionParserTokenManager.java | 2007 +++++++++++-------
.../parser/ExpressionParserTreeConstants.java | 14 +-
.../cayenne/exp/parser/ExpressionParser.jjt | 66 +-
.../cayenne/exp/ExpressionFactoryTest.java | 2 +-
.../apache/cayenne/exp/parser/ASTAbsTest.java | 2 +-
.../cayenne/exp/parser/ASTAggregateTest.java | 12 +-
.../cayenne/exp/parser/ASTConcatTest.java | 4 +-
.../exp/parser/ASTFunctionCallDateIT.java | 24 +
.../exp/parser/ASTFunctionCallMathIT.java | 8 +-
.../exp/parser/ASTFunctionCallStringIT.java | 14 +-
.../cayenne/exp/parser/ASTLengthTest.java | 12 +
.../cayenne/exp/parser/ASTLocateTest.java | 2 +-
.../apache/cayenne/exp/parser/ASTLowerTest.java | 2 +-
.../apache/cayenne/exp/parser/ASTModTest.java | 2 +-
.../apache/cayenne/exp/parser/ASTSqrtTest.java | 2 +-
.../cayenne/exp/parser/ASTSubstringTest.java | 2 +-
.../apache/cayenne/exp/parser/ASTTrimTest.java | 2 +-
.../apache/cayenne/exp/parser/ASTUpperTest.java | 2 +-
.../ExpressionCollectionEvaluationIT.java | 12 +-
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
26 files changed, 1543 insertions(+), 851 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentDate.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentDate.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentDate.java
index e2b3df2..e453e8f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentDate.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentDate.java
@@ -19,6 +19,7 @@
package org.apache.cayenne.exp.parser;
+import java.io.IOException;
import java.util.Date;
import org.apache.cayenne.exp.Expression;
@@ -29,7 +30,7 @@ import org.apache.cayenne.exp.Expression;
public class ASTCurrentDate extends ASTFunctionCall {
public ASTCurrentDate() {
- this(0);
+ this(ExpressionParserTreeConstants.JJTCURRENTDATE);
}
ASTCurrentDate(int id) {
@@ -52,6 +53,11 @@ public class ASTCurrentDate extends ASTFunctionCall {
}
@Override
+ protected void appendFunctionNameAsString(Appendable out) throws IOException {
+ out.append("currentDate");
+ }
+
+ @Override
public Expression shallowCopy() {
return new ASTCurrentDate(id);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTime.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTime.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTime.java
index 292a264..feb9dfa 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTime.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTime.java
@@ -19,6 +19,7 @@
package org.apache.cayenne.exp.parser;
+import java.io.IOException;
import java.util.Date;
import org.apache.cayenne.exp.Expression;
@@ -29,7 +30,7 @@ import org.apache.cayenne.exp.Expression;
public class ASTCurrentTime extends ASTFunctionCall {
public ASTCurrentTime() {
- this(0);
+ this(ExpressionParserTreeConstants.JJTCURRENTTIME);
}
ASTCurrentTime(int id) {
@@ -52,6 +53,11 @@ public class ASTCurrentTime extends ASTFunctionCall {
}
@Override
+ protected void appendFunctionNameAsString(Appendable out) throws IOException {
+ out.append("currentTime");
+ }
+
+ @Override
public Expression shallowCopy() {
return new ASTCurrentTime(id);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTimestamp.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTimestamp.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTimestamp.java
index e14dd58..df55492 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTimestamp.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTCurrentTimestamp.java
@@ -19,6 +19,7 @@
package org.apache.cayenne.exp.parser;
+import java.io.IOException;
import java.util.Date;
import org.apache.cayenne.exp.Expression;
@@ -29,7 +30,7 @@ import org.apache.cayenne.exp.Expression;
public class ASTCurrentTimestamp extends ASTFunctionCall {
public ASTCurrentTimestamp() {
- this(0);
+ this(ExpressionParserTreeConstants.JJTCURRENTTIMESTAMP);
}
ASTCurrentTimestamp(int id) {
@@ -52,6 +53,11 @@ public class ASTCurrentTimestamp extends ASTFunctionCall {
}
@Override
+ protected void appendFunctionNameAsString(Appendable out) throws IOException {
+ out.append("currentTimestamp");
+ }
+
+ @Override
public Expression shallowCopy() {
return new ASTCurrentTimestamp(id);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFunctionCall.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFunctionCall.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFunctionCall.java
index 2902db3..d31c148 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFunctionCall.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTFunctionCall.java
@@ -79,9 +79,13 @@ public abstract class ASTFunctionCall extends EvaluatedNode {
return 31 * super.hashCode() + functionName.hashCode();
}
+ protected void appendFunctionNameAsString(Appendable out) throws IOException {
+ out.append(getFunctionName().toLowerCase());
+ }
+
@Override
public void appendAsString(Appendable out) throws IOException {
- out.append(getFunctionName());
+ appendFunctionNameAsString(out);
if(parent == null) {
// else call to super method will append parenthesis
out.append("(");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParser.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParser.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParser.java
index 555d239..732110d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParser.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParser.java
@@ -181,6 +181,9 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
case ABS:
case SQRT:
case MOD:
+ case CURRENT_DATE:
+ case CURRENT_TIME:
+ case CURRENT_TIMESTAMP:
case 54:
case 55:
case 56:
@@ -245,6 +248,9 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
case ABS:
case SQRT:
case MOD:
+ case CURRENT_DATE:
+ case CURRENT_TIME:
+ case CURRENT_TIMESTAMP:
case 54:
case 55:
case 56:
@@ -459,25 +465,25 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
break;
case 13:
jj_consume_token(13);
- ASTLike jjtn009 = new ASTLike(JJTLIKE);
- boolean jjtc009 = true;
- jjtree.openNodeScope(jjtn009);
+ ASTLike jjtn009 = new ASTLike(JJTLIKE);
+ boolean jjtc009 = true;
+ jjtree.openNodeScope(jjtn009);
try {
scalarExpression();
} catch (Throwable jjte009) {
- if (jjtc009) {
- jjtree.clearNodeScope(jjtn009);
- jjtc009 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte009 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte009;}
- }
- if (jjte009 instanceof ParseException) {
- {if (true) throw (ParseException)jjte009;}
- }
- {if (true) throw (Error)jjte009;}
+ if (jjtc009) {
+ jjtree.clearNodeScope(jjtn009);
+ jjtc009 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte009 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte009;}
+ }
+ if (jjte009 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte009;}
+ }
+ {if (true) throw (Error)jjte009;}
} finally {
if (jjtc009) {
jjtree.closeNodeScope(jjtn009, 2);
@@ -834,6 +840,11 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
case COUNT:
aggregateExpression();
break;
+ case CURRENT_DATE:
+ case CURRENT_TIME:
+ case CURRENT_TIMESTAMP:
+ dateTimeFunction();
+ break;
default:
jj_la1[14] = jj_gen;
jj_consume_token(-1);
@@ -933,6 +944,9 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
case ABS:
case SQRT:
case MOD:
+ case CURRENT_DATE:
+ case CURRENT_TIME:
+ case CURRENT_TIMESTAMP:
case 54:
case 55:
case 56:
@@ -2210,6 +2224,72 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
}
}
+ final public void dateTimeFunction() throws ParseException {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case CURRENT_DATE:
+ currentDate();
+ break;
+ case CURRENT_TIME:
+ currentTime();
+ break;
+ case CURRENT_TIMESTAMP:
+ currentTimestamp();
+ break;
+ default:
+ jj_la1[39] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ }
+
+ final public void currentDate() throws ParseException {
+ /*@bgen(jjtree) CurrentDate */
+ ASTCurrentDate jjtn000 = new ASTCurrentDate(JJTCURRENTDATE);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);
+ try {
+ jj_consume_token(CURRENT_DATE);
+ jj_consume_token(16);
+ jj_consume_token(17);
+ } finally {
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
+ }
+ }
+
+ final public void currentTime() throws ParseException {
+ /*@bgen(jjtree) CurrentTime */
+ ASTCurrentTime jjtn000 = new ASTCurrentTime(JJTCURRENTTIME);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);
+ try {
+ jj_consume_token(CURRENT_TIME);
+ jj_consume_token(16);
+ jj_consume_token(17);
+ } finally {
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
+ }
+ }
+
+ final public void currentTimestamp() throws ParseException {
+ /*@bgen(jjtree) CurrentTimestamp */
+ ASTCurrentTimestamp jjtn000 = new ASTCurrentTimestamp(JJTCURRENTTIMESTAMP);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);
+ try {
+ jj_consume_token(CURRENT_TIMESTAMP);
+ jj_consume_token(16);
+ jj_consume_token(17);
+ } finally {
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
+ }
+ }
+
final public void namedParameter() throws ParseException {
Token t;
jj_consume_token(54);
@@ -2295,7 +2375,7 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
}
break;
default:
- jj_la1[39] = jj_gen;
+ jj_la1[40] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2310,7 +2390,7 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
public Token jj_nt;
private int jj_ntk;
private int jj_gen;
- final private int[] jj_la1 = new int[40];
+ final private int[] jj_la1 = new int[41];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static private int[] jj_la1_2;
@@ -2320,13 +2400,13 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
jj_la1_init_2();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[] {0x2,0x4,0x18,0x16010018,0x60,0x180,0x10000,0x4fff8,0x4fff8,0x16010000,0x18,0x10000,0x4e000,0x80000,0x16010000,0x0,0x0,0x16010000,0x0,0x100000,0x200000,0x400000,0x1800000,0x1800000,0x6000000,0x6000000,0x8000000,0x8000000,0x16010000,0x2000000,0x6010000,0x10000,0x0,0x80000,0x80000,0x0,0x80000,0x0,0x0,0x0,};
+ jj_la1_0 = new int[] {0x2,0x4,0x18,0x16010018,0x60,0x180,0x10000,0x4fff8,0x4fff8,0x16010000,0x18,0x10000,0x4e000,0x80000,0x16010000,0x0,0x0,0x16010000,0x0,0x100000,0x200000,0x400000,0x1800000,0x1800000,0x6000000,0x6000000,0x8000000,0x8000000,0x16010000,0x2000000,0x6010000,0x10000,0x0,0x80000,0x80000,0x0,0x80000,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0xbc7fffe,0x0,0x0,0x400000,0x0,0x0,0xbc7fffe,0x0,0x400000,0x0,0x0,0xbc7fff2,0xb803e00,0x3e00,0xbc7fffe,0x40000c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x4000000,0xbc7c000,0x0,0xbc7c000,0xbc7c000,0x3e00,0x0,0x0,0x7c000,0x0,0x1f0,0xf800000,0xb800000,};
+ jj_la1_1 = new int[] {0x0,0x0,0x0,0xbfffffe,0x0,0x0,0x400000,0x0,0x0,0xbfffffe,0x0,0x400000,0x0,0x0,0xbfffff2,0xb803e00,0x3e00,0xbfffffe,0x40000c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x4000000,0xbc7c000,0x0,0xbc7c000,0xbc7c000,0x3e00,0x0,0x0,0x7c000,0x0,0x1f0,0xf800000,0x380000,0xb800000,};
}
private static void jj_la1_init_2() {
- jj_la1_2 = new int[] {0x0,0x0,0x0,0x1c8,0x0,0x0,0x0,0x0,0x0,0x1c8,0x0,0x0,0x0,0x0,0x1c8,0x48,0x48,0x1c8,0x1c8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_2 = new int[] {0x0,0x0,0x0,0x1c8,0x0,0x0,0x0,0x0,0x0,0x1c8,0x0,0x0,0x0,0x0,0x1c8,0x48,0x48,0x1c8,0x1c8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
}
/** Constructor with InputStream. */
@@ -2340,7 +2420,7 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 41; i++) jj_la1[i] = -1;
}
/** Reinitialise. */
@@ -2355,7 +2435,7 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 41; i++) jj_la1[i] = -1;
}
/** Constructor. */
@@ -2365,7 +2445,7 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 41; i++) jj_la1[i] = -1;
}
/** Reinitialise. */
@@ -2376,7 +2456,7 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 41; i++) jj_la1[i] = -1;
}
/** Constructor with generated Token Manager. */
@@ -2385,7 +2465,7 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 41; i++) jj_la1[i] = -1;
}
/** Reinitialise. */
@@ -2395,7 +2475,7 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 40; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 41; i++) jj_la1[i] = -1;
}
private Token jj_consume_token(int kind) throws ParseException {
@@ -2451,7 +2531,7 @@ public class ExpressionParser/*@bgen(jjtree)*/implements ExpressionParserTreeCon
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 40; i++) {
+ for (int i = 0; i < 41; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserConstants.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserConstants.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserConstants.java
index 8d368e5..a4c1a77 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserConstants.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserConstants.java
@@ -148,24 +148,24 @@ public interface ExpressionParserConstants {
"<NULL>",
"<TRUE>",
"<FALSE>",
- "\"AVG\"",
- "\"MIN\"",
- "\"MAX\"",
- "\"SUM\"",
- "\"COUNT\"",
- "\"CONCAT\"",
- "\"SUBSTRING\"",
- "\"TRIM\"",
- "\"LOWER\"",
- "\"UPPER\"",
- "\"LENGTH\"",
- "\"LOCATE\"",
- "\"ABS\"",
- "\"SQRT\"",
- "\"MOD\"",
- "\"CURRENT_DATE\"",
- "\"CURRENT_TIME\"",
- "\"CURRENT_TIMESTAMP\"",
+ "\"avg\"",
+ "\"min\"",
+ "\"max\"",
+ "\"sum\"",
+ "\"count\"",
+ "\"concat\"",
+ "\"substring\"",
+ "\"trim\"",
+ "\"lower\"",
+ "\"upper\"",
+ "\"length\"",
+ "\"locate\"",
+ "\"abs\"",
+ "\"sqrt\"",
+ "\"mod\"",
+ "\"currentDate\"",
+ "\"currentTime\"",
+ "<CURRENT_TIMESTAMP>",
"\"$\"",
"\"obj:\"",
"\"db:\"",
[2/3] cayenne git commit: CAY-2270 Update function support in
expression parser
Posted by nt...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java
index be7659e..a5b3d00 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTokenManager.java
@@ -103,6 +103,226 @@ public class ExpressionParserTokenManager implements ExpressionParserConstants
public java.io.PrintStream debugStream = System.out;
/** Set debug output. */
public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
+private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
+{
+ switch (pos)
+ {
+ case 0:
+ if ((active0 & 0x387f4f00004e006L) != 0L)
+ {
+ jjmatchedKind = 59;
+ return 74;
+ }
+ if ((active0 & 0x80000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ return 6;
+ }
+ if ((active0 & 0x8L) != 0L)
+ {
+ jjmatchedKind = 59;
+ return 63;
+ }
+ if ((active0 & 0x18030000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ return 36;
+ }
+ return -1;
+ case 1:
+ if ((active0 & 0x80000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 1;
+ return 5;
+ }
+ if ((active0 & 0x387f7f000046004L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 1;
+ return 74;
+ }
+ if ((active0 & 0x8L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 1;
+ return 64;
+ }
+ if ((active0 & 0x8002L) != 0L)
+ return 74;
+ if ((active0 & 0x18000000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 1;
+ return 35;
+ }
+ return -1;
+ case 2:
+ if ((active0 & 0x282ff0000046000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 2;
+ return 74;
+ }
+ if ((active0 & 0x18000000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 2;
+ return 34;
+ }
+ if ((active0 & 0x500f00000000cL) != 0L)
+ return 74;
+ return -1;
+ case 3:
+ if ((active0 & 0x200f70000040000L) != 0L)
+ {
+ if (jjmatchedPos != 3)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 3;
+ }
+ return 74;
+ }
+ if ((active0 & 0x18000000000000L) != 0L)
+ {
+ if (jjmatchedPos != 3)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 3;
+ }
+ return 33;
+ }
+ if ((active0 & 0x2080000006000L) != 0L)
+ return 74;
+ return -1;
+ case 4:
+ if ((active0 & 0x18000000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 4;
+ return 32;
+ }
+ if ((active0 & 0xc60000044000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 4;
+ return 74;
+ }
+ if ((active0 & 0x310000000000L) != 0L)
+ return 74;
+ return -1;
+ case 5:
+ if ((active0 & 0x40000044000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 5;
+ return 74;
+ }
+ if ((active0 & 0xc20000000000L) != 0L)
+ return 74;
+ if ((active0 & 0x18000000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 5;
+ return 31;
+ }
+ return -1;
+ case 6:
+ if ((active0 & 0x40000004000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 6;
+ return 74;
+ }
+ if ((active0 & 0x40000L) != 0L)
+ return 74;
+ if ((active0 & 0x18000000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 6;
+ return 30;
+ }
+ return -1;
+ case 7:
+ if ((active0 & 0x8040000004000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 7;
+ return 74;
+ }
+ if ((active0 & 0x10000000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 7;
+ return 29;
+ }
+ return -1;
+ case 8:
+ if ((active0 & 0x10000000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 8;
+ return 28;
+ }
+ if ((active0 & 0x8000000004000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 8;
+ return 74;
+ }
+ if ((active0 & 0x40000000000L) != 0L)
+ return 74;
+ return -1;
+ case 9:
+ if ((active0 & 0x10000000000000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 9;
+ return 27;
+ }
+ if ((active0 & 0x8000000004000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 9;
+ return 74;
+ }
+ return -1;
+ case 10:
+ if ((active0 & 0x10000000000000L) != 0L)
+ return 26;
+ if ((active0 & 0x4000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 10;
+ return 74;
+ }
+ if ((active0 & 0x8000000000000L) != 0L)
+ return 74;
+ return -1;
+ case 11:
+ if ((active0 & 0x4000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 11;
+ return 74;
+ }
+ return -1;
+ case 12:
+ if ((active0 & 0x4000L) != 0L)
+ {
+ jjmatchedKind = 59;
+ jjmatchedPos = 12;
+ return 74;
+ }
+ return -1;
+ default :
+ return -1;
+ }
+}
+private final int jjStartNfa_0(int pos, long active0, long active1)
+{
+ return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1), pos + 1);
+}
private int jjStopAtPos(int pos, int kind)
{
jjmatchedKind = kind;
@@ -113,54 +333,31 @@ private int jjMoveStringLiteralDfa0_0()
{
switch(curChar)
{
- case 9:
- jjmatchedKind = 30;
- return jjMoveNfa_0(3, 0);
- case 10:
- jjmatchedKind = 31;
- return jjMoveNfa_0(3, 0);
- case 13:
- jjmatchedKind = 32;
- return jjMoveNfa_0(3, 0);
- case 32:
- jjmatchedKind = 29;
- return jjMoveNfa_0(3, 0);
case 33:
jjmatchedKind = 4;
return jjMoveStringLiteralDfa1_0(0x80L);
case 34:
- jjmatchedKind = 64;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 64);
case 36:
- jjmatchedKind = 54;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 54);
case 38:
- jjmatchedKind = 22;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 22);
case 39:
- jjmatchedKind = 63;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 63);
case 40:
- jjmatchedKind = 16;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 16);
case 41:
- jjmatchedKind = 17;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 17);
case 42:
- jjmatchedKind = 58;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 58);
case 43:
- jjmatchedKind = 25;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 25);
case 44:
- jjmatchedKind = 19;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 19);
case 45:
- jjmatchedKind = 26;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 26);
case 47:
- jjmatchedKind = 27;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 27);
case 60:
jjmatchedKind = 10;
return jjMoveStringLiteralDfa1_0(0x800300L);
@@ -170,29 +367,14 @@ private int jjMoveStringLiteralDfa0_0()
case 62:
jjmatchedKind = 11;
return jjMoveStringLiteralDfa1_0(0x1001000L);
- case 65:
- return jjMoveStringLiteralDfa1_0(0x1001000000000L);
- case 67:
- return jjMoveStringLiteralDfa1_0(0x38030000000000L);
- case 76:
- return jjMoveStringLiteralDfa1_0(0xd00000000000L);
- case 77:
- return jjMoveStringLiteralDfa1_0(0x4006000000000L);
- case 83:
- return jjMoveStringLiteralDfa1_0(0x2048000000000L);
- case 84:
- return jjMoveStringLiteralDfa1_0(0x80000000000L);
- case 85:
- return jjMoveStringLiteralDfa1_0(0x200000000000L);
case 94:
- jjmatchedKind = 21;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 21);
case 97:
return jjMoveStringLiteralDfa1_0(0x1001000000004L);
case 98:
return jjMoveStringLiteralDfa1_0(0x40000L);
case 99:
- return jjMoveStringLiteralDfa1_0(0x38030000000000L);
+ return jjMoveStringLiteralDfa1_0(0x18030000000000L);
case 100:
return jjMoveStringLiteralDfa1_0(0x100000000000000L);
case 101:
@@ -214,11 +396,9 @@ private int jjMoveStringLiteralDfa0_0()
case 117:
return jjMoveStringLiteralDfa1_0(0x200000000000L);
case 124:
- jjmatchedKind = 20;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 20);
case 126:
- jjmatchedKind = 28;
- return jjMoveNfa_0(3, 0);
+ return jjStopAtPos(0, 28);
default :
return jjMoveNfa_0(3, 0);
}
@@ -227,71 +407,31 @@ private int jjMoveStringLiteralDfa1_0(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 0);
+ jjStopStringLiteralDfa_0(0, active0, 0L);
+ return 1;
}
switch(curChar)
{
case 60:
if ((active0 & 0x800000L) != 0L)
- {
- jjmatchedKind = 23;
- jjmatchedPos = 1;
- }
+ return jjStopAtPos(1, 23);
break;
case 61:
if ((active0 & 0x40L) != 0L)
- {
- jjmatchedKind = 6;
- jjmatchedPos = 1;
- }
+ return jjStopAtPos(1, 6);
else if ((active0 & 0x80L) != 0L)
- {
- jjmatchedKind = 7;
- jjmatchedPos = 1;
- }
+ return jjStopAtPos(1, 7);
else if ((active0 & 0x200L) != 0L)
- {
- jjmatchedKind = 9;
- jjmatchedPos = 1;
- }
+ return jjStopAtPos(1, 9);
else if ((active0 & 0x1000L) != 0L)
- {
- jjmatchedKind = 12;
- jjmatchedPos = 1;
- }
+ return jjStopAtPos(1, 12);
break;
case 62:
if ((active0 & 0x100L) != 0L)
- {
- jjmatchedKind = 8;
- jjmatchedPos = 1;
- }
+ return jjStopAtPos(1, 8);
else if ((active0 & 0x1000000L) != 0L)
- {
- jjmatchedKind = 24;
- jjmatchedPos = 1;
- }
+ return jjStopAtPos(1, 24);
break;
- case 65:
- return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L);
- case 66:
- return jjMoveStringLiteralDfa2_0(active0, 0x1000000000000L);
- case 69:
- return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L);
- case 73:
- return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L);
- case 79:
- return jjMoveStringLiteralDfa2_0(active0, 0x4930000000000L);
- case 80:
- return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L);
- case 81:
- return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L);
- case 82:
- return jjMoveStringLiteralDfa2_0(active0, 0x80000000000L);
- case 85:
- return jjMoveStringLiteralDfa2_0(active0, 0x38048000000000L);
- case 86:
- return jjMoveStringLiteralDfa2_0(active0, 0x1000000000L);
case 97:
return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L);
case 98:
@@ -302,10 +442,7 @@ private int jjMoveStringLiteralDfa1_0(long active0)
return jjMoveStringLiteralDfa2_0(active0, 0x2000006000L);
case 110:
if ((active0 & 0x8000L) != 0L)
- {
- jjmatchedKind = 15;
- jjmatchedPos = 1;
- }
+ return jjStartNfaWithStates_0(1, 15, 74);
return jjMoveStringLiteralDfa2_0(active0, 0x200000000000004L);
case 111:
return jjMoveStringLiteralDfa2_0(active0, 0x4930000000008L);
@@ -315,92 +452,31 @@ private int jjMoveStringLiteralDfa1_0(long active0)
return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L);
case 114:
if ((active0 & 0x2L) != 0L)
- {
- jjmatchedKind = 1;
- jjmatchedPos = 1;
- }
+ return jjStartNfaWithStates_0(1, 1, 74);
return jjMoveStringLiteralDfa2_0(active0, 0x80000000000L);
case 117:
- return jjMoveStringLiteralDfa2_0(active0, 0x38048000000000L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x18048000000000L);
case 118:
return jjMoveStringLiteralDfa2_0(active0, 0x1000000000L);
default :
break;
}
- return jjMoveNfa_0(3, 1);
+ return jjStartNfa_0(0, active0, 0L);
}
private int jjMoveStringLiteralDfa2_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 1);
+ return jjStartNfa_0(0, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 1);
+ jjStopStringLiteralDfa_0(1, active0, 0L);
+ return 2;
}
switch(curChar)
{
case 58:
if ((active0 & 0x100000000000000L) != 0L)
- {
- jjmatchedKind = 56;
- jjmatchedPos = 2;
- }
- break;
- case 66:
- return jjMoveStringLiteralDfa3_0(active0, 0x40000000000L);
- case 67:
- return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L);
- case 68:
- if ((active0 & 0x4000000000000L) != 0L)
- {
- jjmatchedKind = 50;
- jjmatchedPos = 2;
- }
- break;
- case 71:
- if ((active0 & 0x1000000000L) != 0L)
- {
- jjmatchedKind = 36;
- jjmatchedPos = 2;
- }
- break;
- case 73:
- return jjMoveStringLiteralDfa3_0(active0, 0x80000000000L);
- case 77:
- if ((active0 & 0x8000000000L) != 0L)
- {
- jjmatchedKind = 39;
- jjmatchedPos = 2;
- }
- break;
- case 78:
- if ((active0 & 0x2000000000L) != 0L)
- {
- jjmatchedKind = 37;
- jjmatchedPos = 2;
- }
- return jjMoveStringLiteralDfa3_0(active0, 0x420000000000L);
- case 80:
- return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L);
- case 82:
- return jjMoveStringLiteralDfa3_0(active0, 0x3a000000000000L);
- case 83:
- if ((active0 & 0x1000000000000L) != 0L)
- {
- jjmatchedKind = 48;
- jjmatchedPos = 2;
- }
- break;
- case 85:
- return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L);
- case 87:
- return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L);
- case 88:
- if ((active0 & 0x4000000000L) != 0L)
- {
- jjmatchedKind = 38;
- jjmatchedPos = 2;
- }
+ return jjStopAtPos(2, 56);
break;
case 98:
return jjMoveStringLiteralDfa3_0(active0, 0x40000000000L);
@@ -408,22 +484,13 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0)
return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L);
case 100:
if ((active0 & 0x4L) != 0L)
- {
- jjmatchedKind = 2;
- jjmatchedPos = 2;
- }
+ return jjStartNfaWithStates_0(2, 2, 74);
else if ((active0 & 0x4000000000000L) != 0L)
- {
- jjmatchedKind = 50;
- jjmatchedPos = 2;
- }
+ return jjStartNfaWithStates_0(2, 50, 74);
break;
case 103:
if ((active0 & 0x1000000000L) != 0L)
- {
- jjmatchedKind = 36;
- jjmatchedPos = 2;
- }
+ return jjStartNfaWithStates_0(2, 36, 74);
break;
case 105:
return jjMoveStringLiteralDfa3_0(active0, 0x80000000000L);
@@ -433,35 +500,23 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0)
return jjMoveStringLiteralDfa3_0(active0, 0x6000L);
case 109:
if ((active0 & 0x8000000000L) != 0L)
- {
- jjmatchedKind = 39;
- jjmatchedPos = 2;
- }
+ return jjStartNfaWithStates_0(2, 39, 74);
break;
case 110:
if ((active0 & 0x2000000000L) != 0L)
- {
- jjmatchedKind = 37;
- jjmatchedPos = 2;
- }
+ return jjStartNfaWithStates_0(2, 37, 74);
return jjMoveStringLiteralDfa3_0(active0, 0x420000000000L);
case 112:
return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L);
case 114:
- return jjMoveStringLiteralDfa3_0(active0, 0x3a000000000000L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1a000000000000L);
case 115:
if ((active0 & 0x1000000000000L) != 0L)
- {
- jjmatchedKind = 48;
- jjmatchedPos = 2;
- }
+ return jjStartNfaWithStates_0(2, 48, 74);
break;
case 116:
if ((active0 & 0x8L) != 0L)
- {
- jjmatchedKind = 3;
- jjmatchedPos = 2;
- }
+ return jjStartNfaWithStates_0(2, 3, 74);
return jjMoveStringLiteralDfa3_0(active0, 0x40000L);
case 117:
return jjMoveStringLiteralDfa3_0(active0, 0x200010000000000L);
@@ -469,60 +524,27 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0)
return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L);
case 120:
if ((active0 & 0x4000000000L) != 0L)
- {
- jjmatchedKind = 38;
- jjmatchedPos = 2;
- }
+ return jjStartNfaWithStates_0(2, 38, 74);
break;
default :
break;
}
- return jjMoveNfa_0(3, 2);
+ return jjStartNfa_0(1, active0, 0L);
}
private int jjMoveStringLiteralDfa3_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 2);
+ return jjStartNfa_0(1, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 2);
+ jjStopStringLiteralDfa_0(2, active0, 0L);
+ return 3;
}
switch(curChar)
{
case 58:
if ((active0 & 0x80000000000000L) != 0L)
- {
- jjmatchedKind = 55;
- jjmatchedPos = 3;
- }
- break;
- case 65:
- return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L);
- case 67:
- return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L);
- case 69:
- return jjMoveStringLiteralDfa4_0(active0, 0x300000000000L);
- case 71:
- return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L);
- case 77:
- if ((active0 & 0x80000000000L) != 0L)
- {
- jjmatchedKind = 43;
- jjmatchedPos = 3;
- }
- break;
- case 78:
- return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L);
- case 82:
- return jjMoveStringLiteralDfa4_0(active0, 0x38000000000000L);
- case 83:
- return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L);
- case 84:
- if ((active0 & 0x2000000000000L) != 0L)
- {
- jjmatchedKind = 49;
- jjmatchedPos = 3;
- }
+ return jjStopAtPos(3, 55);
break;
case 97:
return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L);
@@ -539,212 +561,134 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0)
return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L);
case 109:
if ((active0 & 0x80000000000L) != 0L)
- {
- jjmatchedKind = 43;
- jjmatchedPos = 3;
- }
+ return jjStartNfaWithStates_0(3, 43, 74);
return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L);
case 110:
return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L);
case 114:
- return jjMoveStringLiteralDfa4_0(active0, 0x38000000000000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x18000000000000L);
case 115:
return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L);
case 116:
if ((active0 & 0x2000000000000L) != 0L)
- {
- jjmatchedKind = 49;
- jjmatchedPos = 3;
- }
+ return jjStartNfaWithStates_0(3, 49, 74);
break;
case 119:
return jjMoveStringLiteralDfa4_0(active0, 0x40000L);
default :
break;
}
- return jjMoveNfa_0(3, 3);
+ return jjStartNfa_0(2, active0, 0L);
}
private int jjMoveStringLiteralDfa4_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 3);
+ return jjStartNfa_0(2, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 3);
+ jjStopStringLiteralDfa_0(3, active0, 0L);
+ return 4;
}
switch(curChar)
{
case 58:
if ((active0 & 0x200000000000000L) != 0L)
- {
- jjmatchedKind = 57;
- jjmatchedPos = 4;
- }
+ return jjStopAtPos(4, 57);
break;
- case 65:
- return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L);
- case 69:
- return jjMoveStringLiteralDfa5_0(active0, 0x38000000000000L);
case 73:
return jjMoveStringLiteralDfa5_0(active0, 0x4000L);
- case 82:
- if ((active0 & 0x100000000000L) != 0L)
- {
- jjmatchedKind = 44;
- jjmatchedPos = 4;
- }
- else if ((active0 & 0x200000000000L) != 0L)
- {
- jjmatchedKind = 45;
- jjmatchedPos = 4;
- }
- break;
- case 84:
- if ((active0 & 0x10000000000L) != 0L)
- {
- jjmatchedKind = 40;
- jjmatchedPos = 4;
- }
- return jjMoveStringLiteralDfa5_0(active0, 0xc40000000000L);
case 97:
return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L);
case 101:
- return jjMoveStringLiteralDfa5_0(active0, 0x38000000040000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x18000000040000L);
case 114:
if ((active0 & 0x100000000000L) != 0L)
- {
- jjmatchedKind = 44;
- jjmatchedPos = 4;
- }
+ return jjStartNfaWithStates_0(4, 44, 74);
else if ((active0 & 0x200000000000L) != 0L)
- {
- jjmatchedKind = 45;
- jjmatchedPos = 4;
- }
+ return jjStartNfaWithStates_0(4, 45, 74);
break;
case 116:
if ((active0 & 0x10000000000L) != 0L)
- {
- jjmatchedKind = 40;
- jjmatchedPos = 4;
- }
+ return jjStartNfaWithStates_0(4, 40, 74);
return jjMoveStringLiteralDfa5_0(active0, 0xc40000000000L);
default :
break;
}
- return jjMoveNfa_0(3, 4);
+ return jjStartNfa_0(3, active0, 0L);
}
private int jjMoveStringLiteralDfa5_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 4);
+ return jjStartNfa_0(3, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 4);
+ jjStopStringLiteralDfa_0(4, active0, 0L);
+ return 5;
}
switch(curChar)
{
- case 69:
- if ((active0 & 0x800000000000L) != 0L)
- {
- jjmatchedKind = 47;
- jjmatchedPos = 5;
- }
- break;
- case 72:
- if ((active0 & 0x400000000000L) != 0L)
- {
- jjmatchedKind = 46;
- jjmatchedPos = 5;
- }
- break;
- case 78:
- return jjMoveStringLiteralDfa6_0(active0, 0x38000000000000L);
- case 82:
- return jjMoveStringLiteralDfa6_0(active0, 0x40000000000L);
- case 84:
- if ((active0 & 0x20000000000L) != 0L)
- {
- jjmatchedKind = 41;
- jjmatchedPos = 5;
- }
- break;
case 101:
if ((active0 & 0x800000000000L) != 0L)
- {
- jjmatchedKind = 47;
- jjmatchedPos = 5;
- }
+ return jjStartNfaWithStates_0(5, 47, 74);
return jjMoveStringLiteralDfa6_0(active0, 0x40000L);
case 103:
return jjMoveStringLiteralDfa6_0(active0, 0x4000L);
case 104:
if ((active0 & 0x400000000000L) != 0L)
- {
- jjmatchedKind = 46;
- jjmatchedPos = 5;
- }
+ return jjStartNfaWithStates_0(5, 46, 74);
break;
case 110:
- return jjMoveStringLiteralDfa6_0(active0, 0x38000000000000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x18000000000000L);
case 114:
return jjMoveStringLiteralDfa6_0(active0, 0x40000000000L);
case 116:
if ((active0 & 0x20000000000L) != 0L)
- {
- jjmatchedKind = 41;
- jjmatchedPos = 5;
- }
+ return jjStartNfaWithStates_0(5, 41, 74);
break;
default :
break;
}
- return jjMoveNfa_0(3, 5);
+ return jjStartNfa_0(4, active0, 0L);
}
private int jjMoveStringLiteralDfa6_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 5);
+ return jjStartNfa_0(4, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 5);
+ jjStopStringLiteralDfa_0(5, active0, 0L);
+ return 6;
}
switch(curChar)
{
- case 73:
- return jjMoveStringLiteralDfa7_0(active0, 0x40000000000L);
- case 84:
- return jjMoveStringLiteralDfa7_0(active0, 0x38000000000000L);
case 105:
return jjMoveStringLiteralDfa7_0(active0, 0x40000000000L);
case 110:
if ((active0 & 0x40000L) != 0L)
- {
- jjmatchedKind = 18;
- jjmatchedPos = 6;
- }
+ return jjStartNfaWithStates_0(6, 18, 74);
return jjMoveStringLiteralDfa7_0(active0, 0x4000L);
case 116:
- return jjMoveStringLiteralDfa7_0(active0, 0x38000000000000L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x18000000000000L);
default :
break;
}
- return jjMoveNfa_0(3, 6);
+ return jjStartNfa_0(5, active0, 0L);
}
private int jjMoveStringLiteralDfa7_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 6);
+ return jjStartNfa_0(5, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 6);
+ jjStopStringLiteralDfa_0(6, active0, 0L);
+ return 7;
}
switch(curChar)
{
- case 78:
- return jjMoveStringLiteralDfa8_0(active0, 0x40000000000L);
- case 95:
- return jjMoveStringLiteralDfa8_0(active0, 0x38000000000000L);
+ case 68:
+ return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000L);
+ case 84:
+ return jjMoveStringLiteralDfa8_0(active0, 0x10000000000000L);
case 110:
return jjMoveStringLiteralDfa8_0(active0, 0x40000000000L);
case 111:
@@ -752,261 +696,148 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0)
default :
break;
}
- return jjMoveNfa_0(3, 7);
+ return jjStartNfa_0(6, active0, 0L);
}
private int jjMoveStringLiteralDfa8_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 7);
+ return jjStartNfa_0(6, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 7);
+ jjStopStringLiteralDfa_0(7, active0, 0L);
+ return 8;
}
switch(curChar)
{
- case 68:
- return jjMoveStringLiteralDfa9_0(active0, 0x8000000000000L);
- case 71:
- if ((active0 & 0x40000000000L) != 0L)
- {
- jjmatchedKind = 42;
- jjmatchedPos = 8;
- }
- break;
- case 84:
- return jjMoveStringLiteralDfa9_0(active0, 0x30000000000000L);
- case 100:
+ case 97:
return jjMoveStringLiteralDfa9_0(active0, 0x8000000000000L);
case 103:
if ((active0 & 0x40000000000L) != 0L)
- {
- jjmatchedKind = 42;
- jjmatchedPos = 8;
- }
+ return jjStartNfaWithStates_0(8, 42, 74);
break;
+ case 105:
+ return jjMoveStringLiteralDfa9_0(active0, 0x10000000000000L);
case 114:
return jjMoveStringLiteralDfa9_0(active0, 0x4000L);
- case 116:
- return jjMoveStringLiteralDfa9_0(active0, 0x30000000000000L);
default :
break;
}
- return jjMoveNfa_0(3, 8);
+ return jjStartNfa_0(7, active0, 0L);
}
private int jjMoveStringLiteralDfa9_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 8);
+ return jjStartNfa_0(7, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 8);
+ jjStopStringLiteralDfa_0(8, active0, 0L);
+ return 9;
}
switch(curChar)
{
- case 65:
- return jjMoveStringLiteralDfa10_0(active0, 0x8000000000000L);
- case 73:
- return jjMoveStringLiteralDfa10_0(active0, 0x30000000000000L);
- case 97:
- return jjMoveStringLiteralDfa10_0(active0, 0x8000000000000L);
case 101:
return jjMoveStringLiteralDfa10_0(active0, 0x4000L);
- case 105:
- return jjMoveStringLiteralDfa10_0(active0, 0x30000000000000L);
+ case 109:
+ return jjMoveStringLiteralDfa10_0(active0, 0x10000000000000L);
+ case 116:
+ return jjMoveStringLiteralDfa10_0(active0, 0x8000000000000L);
default :
break;
}
- return jjMoveNfa_0(3, 9);
+ return jjStartNfa_0(8, active0, 0L);
}
private int jjMoveStringLiteralDfa10_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 9);
+ return jjStartNfa_0(8, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 9);
+ jjStopStringLiteralDfa_0(9, active0, 0L);
+ return 10;
}
switch(curChar)
{
case 67:
return jjMoveStringLiteralDfa11_0(active0, 0x4000L);
- case 77:
- return jjMoveStringLiteralDfa11_0(active0, 0x30000000000000L);
- case 84:
- return jjMoveStringLiteralDfa11_0(active0, 0x8000000000000L);
- case 109:
- return jjMoveStringLiteralDfa11_0(active0, 0x30000000000000L);
- case 116:
- return jjMoveStringLiteralDfa11_0(active0, 0x8000000000000L);
+ case 101:
+ if ((active0 & 0x8000000000000L) != 0L)
+ return jjStartNfaWithStates_0(10, 51, 74);
+ else if ((active0 & 0x10000000000000L) != 0L)
+ return jjStartNfaWithStates_0(10, 52, 26);
+ break;
default :
break;
}
- return jjMoveNfa_0(3, 10);
+ return jjStartNfa_0(9, active0, 0L);
}
private int jjMoveStringLiteralDfa11_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 10);
+ return jjStartNfa_0(9, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 10);
+ jjStopStringLiteralDfa_0(10, active0, 0L);
+ return 11;
}
switch(curChar)
{
- case 69:
- if ((active0 & 0x8000000000000L) != 0L)
- {
- jjmatchedKind = 51;
- jjmatchedPos = 11;
- }
- else if ((active0 & 0x10000000000000L) != 0L)
- {
- jjmatchedKind = 52;
- jjmatchedPos = 11;
- }
- return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L);
case 97:
return jjMoveStringLiteralDfa12_0(active0, 0x4000L);
- case 101:
- if ((active0 & 0x8000000000000L) != 0L)
- {
- jjmatchedKind = 51;
- jjmatchedPos = 11;
- }
- else if ((active0 & 0x10000000000000L) != 0L)
- {
- jjmatchedKind = 52;
- jjmatchedPos = 11;
- }
- return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L);
default :
break;
}
- return jjMoveNfa_0(3, 11);
+ return jjStartNfa_0(10, active0, 0L);
}
private int jjMoveStringLiteralDfa12_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 11);
+ return jjStartNfa_0(10, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 11);
+ jjStopStringLiteralDfa_0(11, active0, 0L);
+ return 12;
}
switch(curChar)
{
- case 83:
- return jjMoveStringLiteralDfa13_0(active0, 0x20000000000000L);
case 115:
- return jjMoveStringLiteralDfa13_0(active0, 0x20000000004000L);
+ return jjMoveStringLiteralDfa13_0(active0, 0x4000L);
default :
break;
}
- return jjMoveNfa_0(3, 12);
+ return jjStartNfa_0(11, active0, 0L);
}
private int jjMoveStringLiteralDfa13_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 12);
+ return jjStartNfa_0(11, old0, 0L);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 12);
+ jjStopStringLiteralDfa_0(12, active0, 0L);
+ return 13;
}
switch(curChar)
{
- case 84:
- return jjMoveStringLiteralDfa14_0(active0, 0x20000000000000L);
case 101:
if ((active0 & 0x4000L) != 0L)
- {
- jjmatchedKind = 14;
- jjmatchedPos = 13;
- }
- break;
- case 116:
- return jjMoveStringLiteralDfa14_0(active0, 0x20000000000000L);
- default :
- break;
- }
- return jjMoveNfa_0(3, 13);
-}
-private int jjMoveStringLiteralDfa14_0(long old0, long active0)
-{
- if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 13);
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 13);
- }
- switch(curChar)
- {
- case 65:
- return jjMoveStringLiteralDfa15_0(active0, 0x20000000000000L);
- case 97:
- return jjMoveStringLiteralDfa15_0(active0, 0x20000000000000L);
- default :
+ return jjStartNfaWithStates_0(13, 14, 74);
break;
- }
- return jjMoveNfa_0(3, 14);
-}
-private int jjMoveStringLiteralDfa15_0(long old0, long active0)
-{
- if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 14);
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 14);
- }
- switch(curChar)
- {
- case 77:
- return jjMoveStringLiteralDfa16_0(active0, 0x20000000000000L);
- case 109:
- return jjMoveStringLiteralDfa16_0(active0, 0x20000000000000L);
default :
break;
}
- return jjMoveNfa_0(3, 15);
+ return jjStartNfa_0(12, active0, 0L);
}
-private int jjMoveStringLiteralDfa16_0(long old0, long active0)
+private int jjStartNfaWithStates_0(int pos, int kind, int state)
{
- if (((active0 &= old0)) == 0L)
- return jjMoveNfa_0(3, 15);
+ jjmatchedKind = kind;
+ jjmatchedPos = pos;
try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) {
- return jjMoveNfa_0(3, 15);
- }
- switch(curChar)
- {
- case 80:
- if ((active0 & 0x20000000000000L) != 0L)
- {
- jjmatchedKind = 53;
- jjmatchedPos = 16;
- }
- break;
- case 112:
- if ((active0 & 0x20000000000000L) != 0L)
- {
- jjmatchedKind = 53;
- jjmatchedPos = 16;
- }
- break;
- default :
- break;
- }
- return jjMoveNfa_0(3, 16);
+ catch(java.io.IOException e) { return pos + 1; }
+ return jjMoveNfa_0(state, pos + 1);
}
private int jjMoveNfa_0(int startState, int curPos)
{
- int strKind = jjmatchedKind;
- int strPos = jjmatchedPos;
- int seenUpto;
- input_stream.backup(seenUpto = curPos + 1);
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { throw new Error("Internal Error"); }
- curPos = 0;
int startsAt = 0;
- jjnewStateCnt = 56;
+ jjnewStateCnt = 74;
int i = 1;
jjstateSet[0] = startState;
int kind = 0x7fffffff;
@@ -1021,344 +852,1049 @@ private int jjMoveNfa_0(int startState, int curPos)
{
switch(jjstateSet[--i])
{
- case 3:
+ case 26:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddStates(0, 5);
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
else if (curChar == 46)
- jjCheckNAdd(30);
- if ((0x3fe000000000000L & l) != 0L)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
{
- if (kind > 71)
- kind = 71;
- jjCheckNAddTwoStates(27, 28);
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
}
- else if (curChar == 48)
+ else if (curChar == 43)
{
- if (kind > 71)
- kind = 71;
- jjCheckNAddStates(6, 8);
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
}
break;
- case 26:
- if ((0x3fe000000000000L & l) == 0L)
- break;
- if (kind > 71)
- kind = 71;
- jjCheckNAddTwoStates(27, 28);
- break;
- case 27:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 71)
- kind = 71;
- jjCheckNAddTwoStates(27, 28);
- break;
- case 29:
- if (curChar == 46)
- jjCheckNAdd(30);
- break;
- case 30:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 72)
- kind = 72;
- jjCheckNAddStates(9, 11);
- break;
case 32:
- if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(33);
- break;
- case 33:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 72)
- kind = 72;
- jjCheckNAddTwoStates(33, 34);
- break;
- case 35:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddStates(0, 5);
- break;
- case 36:
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(36, 37);
- break;
- case 37:
- if (curChar != 46)
- break;
- if (kind > 72)
- kind = 72;
- jjCheckNAddStates(12, 14);
- break;
- case 38:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 72)
- kind = 72;
- jjCheckNAddStates(12, 14);
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
break;
- case 39:
+ case 63:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(39, 40);
- break;
- case 41:
- if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(42);
- break;
- case 42:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 72)
- kind = 72;
- jjCheckNAddTwoStates(42, 34);
- break;
- case 43:
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(43, 34);
- break;
- case 44:
- if (curChar != 48)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 5:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 64:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 30:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 29:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 35:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 27:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 33:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 6:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 74:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 3:
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddStates(3, 8);
+ else if (curChar == 46)
+ jjCheckNAdd(42);
+ if ((0x3fe000000000000L & l) != 0L)
+ {
+ if (kind > 71)
+ kind = 71;
+ jjCheckNAddTwoStates(39, 40);
+ }
+ else if (curChar == 48)
+ {
+ if (kind > 71)
+ kind = 71;
+ jjCheckNAddStates(9, 11);
+ }
+ break;
+ case 31:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 36:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 28:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 34:
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 60)
+ kind = 60;
+ }
+ else if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ else if (curChar == 43)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ }
+ break;
+ case 38:
+ if ((0x3fe000000000000L & l) == 0L)
+ break;
+ if (kind > 71)
+ kind = 71;
+ jjCheckNAddTwoStates(39, 40);
+ break;
+ case 39:
+ if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 71)
kind = 71;
- jjCheckNAddStates(6, 8);
+ jjCheckNAddTwoStates(39, 40);
+ break;
+ case 41:
+ if (curChar == 46)
+ jjCheckNAdd(42);
+ break;
+ case 42:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 72)
+ kind = 72;
+ jjCheckNAddStates(12, 14);
+ break;
+ case 44:
+ if ((0x280000000000L & l) != 0L)
+ jjCheckNAdd(45);
break;
case 45:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 72)
+ kind = 72;
+ jjCheckNAddTwoStates(45, 46);
+ break;
+ case 47:
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddStates(3, 8);
+ break;
+ case 48:
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddTwoStates(48, 49);
+ break;
+ case 49:
+ if (curChar != 46)
+ break;
+ if (kind > 72)
+ kind = 72;
+ jjCheckNAddStates(15, 17);
+ break;
+ case 50:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 72)
+ kind = 72;
+ jjCheckNAddStates(15, 17);
+ break;
+ case 51:
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddTwoStates(51, 52);
+ break;
+ case 53:
+ if ((0x280000000000L & l) != 0L)
+ jjCheckNAdd(54);
+ break;
+ case 54:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 72)
+ kind = 72;
+ jjCheckNAddTwoStates(54, 46);
+ break;
+ case 55:
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddTwoStates(55, 46);
+ break;
+ case 56:
+ if (curChar != 48)
+ break;
+ if (kind > 71)
+ kind = 71;
+ jjCheckNAddStates(9, 11);
+ break;
+ case 57:
if ((0xff000000000000L & l) == 0L)
break;
if (kind > 71)
kind = 71;
- jjCheckNAddTwoStates(45, 28);
+ jjCheckNAddTwoStates(57, 40);
+ break;
+ case 59:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 71)
+ kind = 71;
+ jjCheckNAddTwoStates(59, 40);
+ break;
+ case 67:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ break;
+ case 68:
+ if (curChar != 43)
+ break;
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAdd(69);
+ break;
+ case 69:
+ if (curChar == 46)
+ jjstateSet[jjnewStateCnt++] = 70;
+ break;
+ case 71:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(18, 20);
+ break;
+ case 72:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ break;
+ case 73:
+ if (curChar == 43 && kind > 60)
+ kind = 60;
+ break;
+ default : break;
+ }
+ } while(i != startsAt);
+ }
+ else if (curChar < 128)
+ {
+ long l = 1L << (curChar & 077);
+ do
+ {
+ switch(jjstateSet[--i])
+ {
+ case 26:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 115)
+ jjstateSet[jjnewStateCnt++] = 25;
+ break;
+ case 32:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 110)
+ jjstateSet[jjnewStateCnt++] = 31;
+ break;
+ case 63:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 111)
+ jjstateSet[jjnewStateCnt++] = 64;
+ else if (curChar == 117)
+ jjstateSet[jjnewStateCnt++] = 62;
+ break;
+ case 5:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 117)
+ jjstateSet[jjnewStateCnt++] = 4;
+ break;
+ case 64:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 119)
+ {
+ if (kind > 53)
+ kind = 53;
+ }
break;
- case 47:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 71)
- kind = 71;
- jjCheckNAddTwoStates(47, 28);
+ case 30:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 84)
+ jjstateSet[jjnewStateCnt++] = 29;
break;
- case 49:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 59)
- kind = 59;
- jjCheckNAddStates(15, 17);
+ case 29:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 105)
+ jjstateSet[jjnewStateCnt++] = 28;
break;
- case 50:
- if (curChar != 43)
- break;
- if (kind > 59)
- kind = 59;
- jjCheckNAdd(51);
+ case 35:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 114)
+ jjstateSet[jjnewStateCnt++] = 34;
break;
- case 51:
- if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 52;
+ case 27:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 101)
+ jjstateSet[jjnewStateCnt++] = 26;
break;
- case 53:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 59)
- kind = 59;
- jjCheckNAddStates(18, 20);
+ case 33:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 101)
+ jjstateSet[jjnewStateCnt++] = 32;
break;
- case 54:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 60)
- kind = 60;
- jjAddStates(21, 22);
+ case 6:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 114)
+ jjstateSet[jjnewStateCnt++] = 5;
break;
- case 55:
- if (curChar == 43 && kind > 60)
- kind = 60;
+ case 74:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
break;
- default : break;
- }
- } while(i != startsAt);
- }
- else if (curChar < 128)
- {
- long l = 1L << (curChar & 077);
- do
- {
- switch(jjstateSet[--i])
- {
case 3:
if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 59)
kind = 59;
- jjCheckNAddStates(23, 27);
+ jjCheckNAddStates(21, 25);
}
- if (curChar == 70)
- jjstateSet[jjnewStateCnt++] = 24;
+ if (curChar == 110)
+ jjAddStates(26, 27);
+ else if (curChar == 99)
+ jjstateSet[jjnewStateCnt++] = 36;
+ else if (curChar == 70)
+ jjstateSet[jjnewStateCnt++] = 20;
else if (curChar == 102)
- jjstateSet[jjnewStateCnt++] = 19;
+ jjstateSet[jjnewStateCnt++] = 15;
else if (curChar == 84)
- jjstateSet[jjnewStateCnt++] = 14;
- else if (curChar == 116)
jjstateSet[jjnewStateCnt++] = 10;
- else if (curChar == 78)
+ else if (curChar == 116)
jjstateSet[jjnewStateCnt++] = 6;
- else if (curChar == 110)
+ else if (curChar == 78)
jjstateSet[jjnewStateCnt++] = 2;
break;
+ case 31:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 116)
+ jjstateSet[jjnewStateCnt++] = 30;
+ break;
+ case 36:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 117)
+ jjstateSet[jjnewStateCnt++] = 35;
+ break;
+ case 28:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 109)
+ jjstateSet[jjnewStateCnt++] = 27;
+ break;
+ case 34:
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 60)
+ kind = 60;
+ jjCheckNAddTwoStates(72, 73);
+ }
+ if ((0x7fffffe87fffffeL & l) != 0L)
+ {
+ if (kind > 59)
+ kind = 59;
+ jjCheckNAddStates(0, 2);
+ }
+ if (curChar == 114)
+ jjstateSet[jjnewStateCnt++] = 33;
+ break;
case 0:
- if (curChar == 108 && kind > 33)
+ if (curChar == 76 && kind > 33)
kind = 33;
break;
case 1:
- if (curChar == 108)
+ if (curChar == 76)
jjstateSet[jjnewStateCnt++] = 0;
break;
case 2:
- if (curChar == 117)
+ if (curChar == 85)
jjstateSet[jjnewStateCnt++] = 1;
break;
case 4:
- if (curChar == 76 && kind > 33)
- kind = 33;
- break;
- case 5:
- if (curChar == 76)
- jjstateSet[jjnewStateCnt++] = 4;
- break;
- case 6:
- if (curChar == 85)
- jjstateSet[jjnewStateCnt++] = 5;
+ if (curChar == 101 && kind > 34)
+ kind = 34;
break;
case 7:
- if (curChar == 78)
+ if (curChar == 116)
jjstateSet[jjnewStateCnt++] = 6;
break;
case 8:
- if (curChar == 101 && kind > 34)
+ if (curChar == 69 && kind > 34)
kind = 34;
break;
case 9:
- if (curChar == 117)
+ if (curChar == 85)
jjstateSet[jjnewStateCnt++] = 8;
break;
case 10:
- if (curChar == 114)
+ if (curChar == 82)
jjstateSet[jjnewStateCnt++] = 9;
break;
case 11:
- if (curChar == 116)
+ if (curChar == 84)
jjstateSet[jjnewStateCnt++] = 10;
break;
case 12:
- if (curChar == 69 && kind > 34)
- kind = 34;
+ if (curChar == 101 && kind > 35)
+ kind = 35;
break;
case 13:
- if (curChar == 85)
+ if (curChar == 115)
jjstateSet[jjnewStateCnt++] = 12;
break;
case 14:
- if (curChar == 82)
+ if (curChar == 108)
jjstateSet[jjnewStateCnt++] = 13;
break;
case 15:
- if (curChar == 84)
+ if (curChar == 97)
jjstateSet[jjnewStateCnt++] = 14;
break;
case 16:
- if (curChar == 101 && kind > 35)
- kind = 35;
+ if (curChar == 102)
+ jjstateSet[jjnewStateCnt++] = 15;
break;
case 17:
- if (curChar == 115)
- jjstateSet[jjnewStateCnt++] = 16;
+ if (curChar == 69 && kind > 35)
+ kind = 35;
break;
case 18:
- if (curChar == 108)
+ if (curChar == 83)
jjstateSet[jjnewStateCnt++] = 17;
break;
case 19:
- if (curChar == 97)
+ if (curChar == 76)
jjstateSet[jjnewStateCnt++] = 18;
break;
case 20:
- if (curChar == 102)
+ if (curChar == 65)
jjstateSet[jjnewStateCnt++] = 19;
break;
case 21:
- if (curChar == 69 && kind > 35)
- kind = 35;
+ if (curChar == 70)
+ jjstateSet[jjnewStateCnt++] = 20;
break;
case 22:
- if (curChar == 83)
- jjstateSet[jjnewStateCnt++] = 21;
+ if (curChar == 112 && kind > 53)
+ kind = 53;
break;
case 23:
- if (curChar == 76)
+ if (curChar == 109)
jjstateSet[jjnewStateCnt++] = 22;
break;
case 24:
- if (curChar == 65)
+ if (curChar == 97)
jjstateSet[jjnewStateCnt++] = 23;
break;
case 25:
- if (curChar == 70)
+ if (curChar == 116)
jjstateSet[jjnewStateCnt++] = 24;
break;
- case 28:
+ case 37:
+ if (curChar == 99)
+ jjstateSet[jjnewStateCnt++] = 36;
+ break;
+ case 40:
if ((0x110000001100L & l) != 0L && kind > 71)
kind = 71;
break;
- case 31:
+ case 43:
if ((0x2000000020L & l) != 0L)
jjAddStates(28, 29);
break;
- case 34:
+ case 46:
if ((0x5400000054L & l) != 0L && kind > 72)
kind = 72;
break;
- case 40:
+ case 52:
if ((0x2000000020L & l) != 0L)
jjAddStates(30, 31);
break;
- case 46:
+ case 58:
if ((0x100000001000000L & l) != 0L)
- jjCheckNAdd(47);
+ jjCheckNAdd(59);
break;
- case 47:
+ case 59:
if ((0x7e0000007eL & l) == 0L)
break;
if (kind > 71)
kind = 71;
- jjCheckNAddTwoStates(47, 28);
+ jjCheckNAddTwoStates(59, 40);
break;
- case 48:
+ case 60:
+ if (curChar == 110)
+ jjAddStates(26, 27);
+ break;
+ case 61:
+ if (curChar == 108 && kind > 33)
+ kind = 33;
+ break;
+ case 62:
+ if (curChar == 108)
+ jjstateSet[jjnewStateCnt++] = 61;
+ break;
+ case 65:
+ if (curChar == 111)
+ jjstateSet[jjnewStateCnt++] = 64;
+ break;
+ case 66:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 59)
kind = 59;
- jjCheckNAddStates(23, 27);
+ jjCheckNAddStates(21, 25);
break;
- case 49:
+ case 67:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 59)
kind = 59;
- jjCheckNAddStates(15, 17);
+ jjCheckNAddStates(0, 2);
break;
- case 52:
- case 53:
+ case 70:
+ case 71:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 59)
kind = 59;
jjCheckNAddStates(18, 20);
break;
- case 54:
+ case 72:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 60)
kind = 60;
- jjCheckNAddTwoStates(54, 55);
+ jjCheckNAddTwoStates(72, 73);
break;
default : break;
}
@@ -1386,30 +1922,11 @@ private int jjMoveNfa_0(int startState, int curPos)
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 56 - (jjnewStateCnt = startsAt)))
- break;
+ if ((i = jjnewStateCnt) == (startsAt = 74 - (jjnewStateCnt = startsAt)))
+ return curPos;
try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { break; }
- }
- if (jjmatchedPos > strPos)
- return curPos;
-
- int toRet = Math.max(curPos, seenUpto);
-
- if (curPos < toRet)
- for (i = toRet - Math.min(curPos, seenUpto); i-- > 0; )
- try { curChar = input_stream.readChar(); }
- catch(java.io.IOException e) { throw new Error("Internal Error : Please send a bug report."); }
-
- if (jjmatchedPos < strPos)
- {
- jjmatchedKind = strKind;
- jjmatchedPos = strPos;
+ catch(java.io.IOException e) { return curPos; }
}
- else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
- jjmatchedKind = strKind;
-
- return toRet;
}
private final int jjStopStringLiteralDfa_1(int pos, long active0, long active1)
{
@@ -1672,8 +2189,8 @@ private int jjMoveNfa_2(int startState, int curPos)
}
}
static final int[] jjnextStates = {
- 36, 37, 39, 40, 43, 34, 45, 46, 28, 30, 31, 34, 38, 31, 34, 49,
- 50, 51, 51, 53, 50, 54, 55, 49, 50, 51, 54, 55, 32, 33, 41, 42,
+ 67, 68, 69, 48, 49, 51, 52, 55, 46, 57, 58, 40, 42, 43, 46, 50,
+ 43, 46, 69, 71, 68, 67, 68, 69, 72, 73, 63, 65, 44, 45, 53, 54,
1, 2, 3,
};
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
@@ -1695,10 +2212,13 @@ public static final String[] jjstrLiteralImages = {
"\41\75", "\74\76", "\74\75", "\74", "\76", "\76\75", "\154\151\153\145",
"\154\151\153\145\111\147\156\157\162\145\103\141\163\145", "\151\156", "\50", "\51", "\142\145\164\167\145\145\156", "\54", "\174",
"\136", "\46", "\74\74", "\76\76", "\53", "\55", "\57", "\176", 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, "\44", "\157\142\152\72", "\144\142\72",
-"\145\156\165\155\72", "\52", null, null, null, null, null, null, null, null, null, null, null, null,
-null, null, null, null, null, null, };
+null, null, null, "\141\166\147", "\155\151\156", "\155\141\170", "\163\165\155",
+"\143\157\165\156\164", "\143\157\156\143\141\164", "\163\165\142\163\164\162\151\156\147",
+"\164\162\151\155", "\154\157\167\145\162", "\165\160\160\145\162", "\154\145\156\147\164\150",
+"\154\157\143\141\164\145", "\141\142\163", "\163\161\162\164", "\155\157\144",
+"\143\165\162\162\145\156\164\104\141\164\145", "\143\165\162\162\145\156\164\124\151\155\145", null, "\44",
+"\157\142\152\72", "\144\142\72", "\145\156\165\155\72", "\52", null, null, null, null, null,
+null, null, null, null, null, null, null, null, null, null, null, null, null, };
/** Lexer state names. */
public static final String[] lexStateNames = {
@@ -1724,8 +2244,8 @@ static final long[] jjtoMore = {
0x8000000000000000L, 0x37L,
};
protected JavaCharStream input_stream;
-private final int[] jjrounds = new int[56];
-private final int[] jjstateSet = new int[112];
+private final int[] jjrounds = new int[74];
+private final int[] jjstateSet = new int[148];
private final StringBuilder jjimage = new StringBuilder();
private StringBuilder image = jjimage;
private int jjimageLen;
@@ -1756,7 +2276,7 @@ private void ReInitRounds()
{
int i;
jjround = 0x80000001;
- for (i = 56; i-- > 0;)
+ for (i = 74; i-- > 0;)
jjrounds[i] = 0x80000000;
}
@@ -1835,6 +2355,11 @@ public Token getNextToken()
switch(curLexState)
{
case 0:
+ try { input_stream.backup(0);
+ while (curChar <= 32 && (0x100002600L & (1L << curChar)) != 0L)
+ curChar = input_stream.BeginToken();
+ }
+ catch (java.io.IOException e1) { continue EOFLoop; }
jjmatchedKind = 0x7fffffff;
jjmatchedPos = 0;
curPos = jjMoveStringLiteralDfa0_0();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e56a93f4/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
index 3de9230..b03d25e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ExpressionParserTreeConstants.java
@@ -71,9 +71,12 @@ public interface ExpressionParserTreeConstants
public int JJTMAX = 46;
public int JJTMIN = 47;
public int JJTSUM = 48;
- public int JJTNAMEDPARAMETER = 49;
- public int JJTOBJPATH = 50;
- public int JJTDBPATH = 51;
+ public int JJTCURRENTDATE = 49;
+ public int JJTCURRENTTIME = 50;
+ public int JJTCURRENTTIMESTAMP = 51;
+ public int JJTNAMEDPARAMETER = 52;
+ public int JJTOBJPATH = 53;
+ public int JJTDBPATH = 54;
public String[] jjtNodeName = {
@@ -126,9 +129,12 @@ public interface ExpressionParserTreeConstants
"Max",
"Min",
"Sum",
+ "CurrentDate",
+ "CurrentTime",
+ "CurrentTimestamp",
"NamedParameter",
"ObjPath",
"DbPath",
};
}
-/* JavaCC - OriginalChecksum=0fe59a033c5f411d1c7cc0cc441fabf6 (do not edit this line) */
+/* JavaCC - OriginalChecksum=7571de31b81c878cf4b5f52ebb555fb1 (do not edit this line) */