You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2024/09/26 15:54:09 UTC
(tomcat) 04/04: Update generated code after 'not empty' optimisations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 53f49059fbb49447b5bdb1903b5ed3eff5cc3fc2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 26 16:53:55 2024 +0100
Update generated code after 'not empty' optimisations
---
java/org/apache/el/parser/ELParser.java | 1472 +++++++++-----------
.../org/apache/el/parser/ELParserTokenManager.java | 701 ++++------
.../apache/el/parser/ELParserTreeConstants.java | 45 +-
3 files changed, 918 insertions(+), 1300 deletions(-)
diff --git a/java/org/apache/el/parser/ELParser.java b/java/org/apache/el/parser/ELParser.java
index 20275ba070..a64dde4daa 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -61,9 +61,8 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
jjtree.closeNodeScope(jjtn000, true);
jjtc000 = false;
{
- if ("" != null) {
+ if ("" != null)
return jjtn000;
- }
}
} catch (Throwable jjte000) {
if (jjtc000) {
@@ -74,22 +73,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -139,22 +135,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -183,22 +176,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -244,22 +234,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -313,22 +300,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -392,22 +376,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -470,22 +451,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -555,22 +533,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -607,22 +582,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -680,22 +652,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -758,22 +727,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -837,22 +803,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -891,22 +854,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte002 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte002;
- }
}
}
if (jjte002 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte002;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte002;
- }
}
} finally {
if (jjtc002) {
@@ -976,22 +936,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -1030,22 +987,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte002 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte002;
- }
}
}
if (jjte002 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte002;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte002;
- }
}
} finally {
if (jjtc002) {
@@ -1084,22 +1038,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte003 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte003;
- }
}
}
if (jjte003 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte003;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte003;
- }
}
} finally {
if (jjtc003) {
@@ -1138,22 +1089,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte004 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte004;
- }
}
}
if (jjte004 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte004;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte004;
- }
}
} finally {
if (jjtc004) {
@@ -1201,22 +1149,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -1259,22 +1204,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -1299,22 +1241,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte002 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte002;
- }
}
}
if (jjte002 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte002;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte002;
- }
}
} finally {
if (jjtc002) {
@@ -1367,22 +1306,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -1421,22 +1357,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte002 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte002;
- }
}
}
if (jjte002 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte002;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte002;
- }
}
} finally {
if (jjtc002) {
@@ -1475,22 +1408,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte003 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte003;
- }
}
}
if (jjte003 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte003;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte003;
- }
}
} finally {
if (jjtc003) {
@@ -1528,22 +1458,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -1552,117 +1479,166 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
break;
}
- case NOT0:
- case NOT1: {
- switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
- case NOT0: {
- jj_consume_token(NOT0);
- break;
- }
- case NOT1: {
- jj_consume_token(NOT1);
- break;
- }
- default:
- jj_la1[33] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- AstNot jjtn002 = new AstNot(JJTNOT);
- boolean jjtc002 = true;
- jjtree.openNodeScope(jjtn002);
- try {
- Unary();
- } catch (Throwable jjte002) {
- if (jjtc002) {
- jjtree.clearNodeScope(jjtn002);
- jjtc002 = false;
- } else {
- jjtree.popNode();
+ default:
+ jj_la1[35] = jj_gen;
+ if (jj_2_6(2)) {
+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT0: {
+ jj_consume_token(NOT0);
+ break;
+ }
+ case NOT1: {
+ jj_consume_token(NOT1);
+ break;
+ }
+ default:
+ jj_la1[33] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
- if (jjte002 instanceof RuntimeException) {
- {
- if (true) {
- throw (RuntimeException) jjte002;
+ jj_consume_token(EMPTY);
+ AstNotEmpty jjtn002 = new AstNotEmpty(JJTNOTEMPTY);
+ boolean jjtc002 = true;
+ jjtree.openNodeScope(jjtn002);
+ try {
+ Unary();
+ } catch (Throwable jjte002) {
+ if (jjtc002) {
+ jjtree.clearNodeScope(jjtn002);
+ jjtc002 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte002 instanceof RuntimeException) {
+ {
+ if (true)
+ throw (RuntimeException) jjte002;
}
}
- }
- if (jjte002 instanceof ParseException) {
- {
- if (true) {
- throw (ParseException) jjte002;
+ if (jjte002 instanceof ParseException) {
+ {
+ if (true)
+ throw (ParseException) jjte002;
}
}
- }
- {
- if (true) {
- throw (Error) jjte002;
+ {
+ if (true)
+ throw (Error) jjte002;
+ }
+ } finally {
+ if (jjtc002) {
+ jjtree.closeNodeScope(jjtn002, true);
}
}
- } finally {
- if (jjtc002) {
- jjtree.closeNodeScope(jjtn002, true);
- }
- }
- break;
- }
- case EMPTY: {
- jj_consume_token(EMPTY);
- AstEmpty jjtn003 = new AstEmpty(JJTEMPTY);
- boolean jjtc003 = true;
- jjtree.openNodeScope(jjtn003);
- try {
- Unary();
- } catch (Throwable jjte003) {
- if (jjtc003) {
- jjtree.clearNodeScope(jjtn003);
- jjtc003 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte003 instanceof RuntimeException) {
- {
- if (true) {
- throw (RuntimeException) jjte003;
+ } else {
+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT0:
+ case NOT1: {
+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT0: {
+ jj_consume_token(NOT0);
+ break;
+ }
+ case NOT1: {
+ jj_consume_token(NOT1);
+ break;
+ }
+ default:
+ jj_la1[34] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
+ }
+ AstNot jjtn003 = new AstNot(JJTNOT);
+ boolean jjtc003 = true;
+ jjtree.openNodeScope(jjtn003);
+ try {
+ Unary();
+ } catch (Throwable jjte003) {
+ if (jjtc003) {
+ jjtree.clearNodeScope(jjtn003);
+ jjtc003 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte003 instanceof RuntimeException) {
+ {
+ if (true)
+ throw (RuntimeException) jjte003;
+ }
+ }
+ if (jjte003 instanceof ParseException) {
+ {
+ if (true)
+ throw (ParseException) jjte003;
+ }
+ }
+ {
+ if (true)
+ throw (Error) jjte003;
+ }
+ } finally {
+ if (jjtc003) {
+ jjtree.closeNodeScope(jjtn003, true);
+ }
}
+ break;
}
- }
- if (jjte003 instanceof ParseException) {
- {
- if (true) {
- throw (ParseException) jjte003;
+ case EMPTY: {
+ jj_consume_token(EMPTY);
+ AstEmpty jjtn004 = new AstEmpty(JJTEMPTY);
+ boolean jjtc004 = true;
+ jjtree.openNodeScope(jjtn004);
+ try {
+ Unary();
+ } catch (Throwable jjte004) {
+ if (jjtc004) {
+ jjtree.clearNodeScope(jjtn004);
+ jjtc004 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte004 instanceof RuntimeException) {
+ {
+ if (true)
+ throw (RuntimeException) jjte004;
+ }
+ }
+ if (jjte004 instanceof ParseException) {
+ {
+ if (true)
+ throw (ParseException) jjte004;
+ }
+ }
+ {
+ if (true)
+ throw (Error) jjte004;
+ }
+ } finally {
+ if (jjtc004) {
+ jjtree.closeNodeScope(jjtn004, true);
+ }
}
+ break;
}
- }
- {
- if (true) {
- throw (Error) jjte003;
+ case START_SET_OR_MAP:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case TRUE:
+ case FALSE:
+ case NULL:
+ case LPAREN:
+ case LBRACK:
+ case IDENTIFIER: {
+ Value();
+ break;
}
- }
- } finally {
- if (jjtc003) {
- jjtree.closeNodeScope(jjtn003, true);
+ default:
+ jj_la1[36] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
}
- break;
- }
- case START_SET_OR_MAP:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case TRUE:
- case FALSE:
- case NULL:
- case LPAREN:
- case LBRACK:
- case IDENTIFIER: {
- Value();
- break;
- }
- default:
- jj_la1[34] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
}
}
@@ -1683,7 +1659,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[35] = jj_gen;
+ jj_la1[37] = jj_gen;
break label_14;
}
ValueSuffix();
@@ -1697,22 +1673,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte001 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte001;
- }
}
}
if (jjte001 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte001;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte001;
- }
}
} finally {
if (jjtc001) {
@@ -1743,7 +1716,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[36] = jj_gen;
+ jj_la1[38] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1763,7 +1736,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[37] = jj_gen;
+ jj_la1[39] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1773,7 +1746,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[38] = jj_gen;
+ jj_la1[40] = jj_gen;
;
}
}
@@ -1819,22 +1792,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -1875,7 +1845,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[39] = jj_gen;
+ jj_la1[41] = jj_gen;
break label_15;
}
jj_consume_token(COMMA);
@@ -1884,7 +1854,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[40] = jj_gen;
+ jj_la1[42] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -1897,22 +1867,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -1925,7 +1892,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
* NonLiteral For Grouped Operations, Identifiers, and Functions
*/
final public void NonLiteral() throws ParseException {
- if (jj_2_6(5)) {
+ if (jj_2_7(5)) {
LambdaExpressionOrInvocation();
} else {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
@@ -1936,8 +1903,8 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[41] = jj_gen;
- if (jj_2_7(2147483647)) {
+ jj_la1[43] = jj_gen;
+ if (jj_2_8(2147483647)) {
Function();
} else {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
@@ -1946,8 +1913,8 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[42] = jj_gen;
- if (jj_2_8(5)) {
+ jj_la1[44] = jj_gen;
+ if (jj_2_9(5)) {
SetData();
} else {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
@@ -1960,7 +1927,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[43] = jj_gen;
+ jj_la1[45] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2004,7 +1971,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[44] = jj_gen;
+ jj_la1[46] = jj_gen;
break label_16;
}
jj_consume_token(COMMA);
@@ -2013,7 +1980,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[45] = jj_gen;
+ jj_la1[47] = jj_gen;
;
}
jj_consume_token(RBRACE);
@@ -2026,22 +1993,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -2079,7 +2043,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[46] = jj_gen;
+ jj_la1[48] = jj_gen;
break label_17;
}
jj_consume_token(COMMA);
@@ -2088,7 +2052,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[47] = jj_gen;
+ jj_la1[49] = jj_gen;
;
}
jj_consume_token(RBRACK);
@@ -2101,22 +2065,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -2158,7 +2119,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[48] = jj_gen;
+ jj_la1[50] = jj_gen;
break label_18;
}
jj_consume_token(COMMA);
@@ -2167,7 +2128,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[49] = jj_gen;
+ jj_la1[51] = jj_gen;
;
}
jj_consume_token(RBRACE);
@@ -2180,22 +2141,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -2221,22 +2179,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -2283,7 +2238,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[50] = jj_gen;
+ jj_la1[52] = jj_gen;
;
}
if (t1 != null) {
@@ -2300,7 +2255,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[51] = jj_gen;
+ jj_la1[53] = jj_gen;
break label_19;
}
}
@@ -2313,22 +2268,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
if (jjte000 instanceof RuntimeException) {
{
- if (true) {
+ if (true)
throw (RuntimeException) jjte000;
- }
}
}
if (jjte000 instanceof ParseException) {
{
- if (true) {
+ if (true)
throw (ParseException) jjte000;
- }
}
}
{
- if (true) {
+ if (true)
throw (Error) jjte000;
- }
}
} finally {
if (jjtc000) {
@@ -2364,7 +2316,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[52] = jj_gen;
+ jj_la1[54] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2402,7 +2354,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[53] = jj_gen;
+ jj_la1[55] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2580,17 +2532,35 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
}
- private boolean jj_3R_LambdaExpressionOrInvocation_144_45_30() {
- if (jj_3R_Choice_155_5_22()) {
+ private boolean jj_2_9(int xla) {
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
+ try {
+ return (!jj_3_9());
+ } catch (LookaheadSuccess ls) {
return true;
+ } finally {
+ jj_save(8, xla);
}
+ }
+
+ private boolean jj_3R_LambdaExpressionOrInvocation_144_45_30() {
+ if (jj_3R_Choice_155_5_22())
+ return true;
+ return false;
+ }
+
+ private boolean jj_3R_ListData_353_26_111() {
+ if (jj_scan_token(COMMA))
+ return true;
+ if (jj_3R_Expression_99_5_36())
+ return true;
return false;
}
private boolean jj_3R_Equality_182_5_40() {
- if (jj_3R_Compare_196_5_45()) {
+ if (jj_3R_Compare_196_5_45())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -2602,65 +2572,57 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_ListData_350_26_111() {
- if (jj_scan_token(COMMA)) {
+ private boolean jj_3R_MapEntry_371_5_109() {
+ if (jj_3R_Expression_99_5_36())
return true;
- }
- if (jj_3R_Expression_99_5_36()) {
+ if (jj_scan_token(COLON))
+ return true;
+ if (jj_3R_Expression_99_5_36())
return true;
- }
return false;
}
- private boolean jj_3R_MapEntry_368_5_109() {
- if (jj_3R_Expression_99_5_36()) {
+ private boolean jj_3R_MapData_365_11_107() {
+ if (jj_3R_MapEntry_371_5_109())
return true;
- }
- if (jj_scan_token(COLON)) {
+ return false;
+ }
+
+ private boolean jj_3R_SetData_346_26_37() {
+ if (jj_scan_token(COMMA))
return true;
- }
- if (jj_3R_Expression_99_5_36()) {
+ if (jj_3R_Expression_99_5_36())
return true;
- }
return false;
}
- private boolean jj_3R_MapData_362_11_107() {
- if (jj_3R_MapEntry_368_5_109()) {
+ private boolean jj_3R_MapData_364_5_101() {
+ if (jj_scan_token(START_SET_OR_MAP))
+ return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_MapData_365_11_107())
+ jj_scanpos = xsp;
+ if (jj_scan_token(RBRACE))
return true;
- }
return false;
}
private boolean jj_3R_LambdaParameters_132_46_44() {
- if (jj_scan_token(COMMA)) {
+ if (jj_scan_token(COMMA))
return true;
- }
- if (jj_3R_Identifier_377_5_38()) {
+ if (jj_3R_Identifier_380_5_38())
return true;
- }
return false;
}
private boolean jj_3R_And_173_5_34() {
- if (jj_3R_Equality_182_5_40()) {
+ if (jj_3R_Equality_182_5_40())
return true;
- }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_And_174_17_41()) {
+ if (jj_3R_And_174_17_41())
jj_scanpos = xsp;
- }
- return false;
- }
-
- private boolean jj_3R_SetData_343_26_37() {
- if (jj_scan_token(COMMA)) {
- return true;
- }
- if (jj_3R_Expression_99_5_36()) {
- return true;
- }
return false;
}
@@ -2669,21 +2631,18 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(41)) {
jj_scanpos = xsp;
- if (jj_scan_token(42)) {
+ if (jj_scan_token(42))
return true;
- }
}
- if (jj_3R_And_173_5_34()) {
+ if (jj_3R_And_173_5_34())
return true;
- }
return false;
}
private boolean jj_3R_Or_165_12_35() {
Token xsp;
- if (jj_3R_Or_164_13_42()) {
+ if (jj_3R_Or_164_13_42())
return true;
- }
while (true) {
xsp = jj_scanpos;
if (jj_3R_Or_164_13_42()) {
@@ -2694,29 +2653,13 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_MapData_361_5_101() {
- if (jj_scan_token(START_SET_OR_MAP)) {
- return true;
- }
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_MapData_362_11_107()) {
- jj_scanpos = xsp;
- }
- if (jj_scan_token(RBRACE)) {
- return true;
- }
- return false;
- }
-
- private boolean jj_3R_ListData_350_11_106() {
- if (jj_3R_Expression_99_5_36()) {
+ private boolean jj_3R_ListData_353_11_106() {
+ if (jj_3R_Expression_99_5_36())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_ListData_350_26_111()) {
+ if (jj_3R_ListData_353_26_111()) {
jj_scanpos = xsp;
break;
}
@@ -2725,53 +2668,44 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
private boolean jj_3R_Or_164_5_29() {
- if (jj_3R_And_173_5_34()) {
+ if (jj_3R_And_173_5_34())
return true;
- }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_Or_165_12_35()) {
+ if (jj_3R_Or_165_12_35())
jj_scanpos = xsp;
- }
return false;
}
- private boolean jj_3_5() {
- if (jj_scan_token(QUESTIONMARK)) {
+ private boolean jj_3R_ListData_352_5_100() {
+ if (jj_scan_token(LBRACK))
return true;
- }
- if (jj_3R_Choice_155_5_22()) {
- return true;
- }
- if (jj_scan_token(COLON)) {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_ListData_353_11_106())
+ jj_scanpos = xsp;
+ if (jj_scan_token(RBRACK))
return true;
- }
return false;
}
- private boolean jj_3R_ListData_349_5_100() {
- if (jj_scan_token(LBRACK)) {
+ private boolean jj_3_5() {
+ if (jj_scan_token(QUESTIONMARK))
return true;
- }
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_ListData_350_11_106()) {
- jj_scanpos = xsp;
- }
- if (jj_scan_token(RBRACK)) {
+ if (jj_3R_Choice_155_5_22())
+ return true;
+ if (jj_scan_token(COLON))
return true;
- }
return false;
}
- private boolean jj_3R_LambdaParameters_132_31_39() {
- if (jj_3R_Identifier_377_5_38()) {
+ private boolean jj_3R_SetData_346_11_31() {
+ if (jj_3R_Expression_99_5_36())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_LambdaParameters_132_46_44()) {
+ if (jj_3R_SetData_346_26_37()) {
jj_scanpos = xsp;
break;
}
@@ -2779,14 +2713,13 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_SetData_343_11_31() {
- if (jj_3R_Expression_99_5_36()) {
+ private boolean jj_3R_LambdaParameters_132_31_39() {
+ if (jj_3R_Identifier_380_5_38())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_SetData_343_26_37()) {
+ if (jj_3R_LambdaParameters_132_46_44()) {
jj_scanpos = xsp;
break;
}
@@ -2794,10 +2727,15 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
+ private boolean jj_3R_MethodParameters_320_31_113() {
+ if (jj_scan_token(COMMA))
+ return true;
+ return false;
+ }
+
private boolean jj_3R_Choice_155_5_22() {
- if (jj_3R_Or_164_5_29()) {
+ if (jj_3R_Or_164_5_29())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -2809,162 +2747,128 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3_3() {
- if (jj_3R_LambdaExpression_124_5_21()) {
- return true;
- }
- return false;
- }
-
- private boolean jj_3R_MethodParameters_317_31_113() {
- if (jj_scan_token(COMMA)) {
- return true;
- }
- return false;
- }
-
- private boolean jj_3R_SetData_342_5_25() {
- if (jj_scan_token(START_SET_OR_MAP)) {
+ private boolean jj_3R_SetData_345_5_25() {
+ if (jj_scan_token(START_SET_OR_MAP))
return true;
- }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_SetData_343_11_31()) {
+ if (jj_3R_SetData_346_11_31())
jj_scanpos = xsp;
- }
- if (jj_scan_token(RBRACE)) {
+ if (jj_scan_token(RBRACE))
return true;
- }
return false;
}
- private boolean jj_3_4() {
- if (jj_3R_LambdaExpression_124_5_21()) {
+ private boolean jj_3_3() {
+ if (jj_3R_LambdaExpression_124_5_21())
return true;
- }
return false;
}
- private boolean jj_3R_null_328_18_24() {
- if (jj_scan_token(IDENTIFIER)) {
+ private boolean jj_3R_null_331_18_24() {
+ if (jj_scan_token(IDENTIFIER))
return true;
- }
- if (jj_scan_token(COLON)) {
+ if (jj_scan_token(COLON))
return true;
- }
return false;
}
- private boolean jj_3_7() {
+ private boolean jj_3_8() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_null_328_18_24()) {
+ if (jj_3R_null_331_18_24())
jj_scanpos = xsp;
- }
- if (jj_scan_token(IDENTIFIER)) {
+ if (jj_scan_token(IDENTIFIER))
return true;
- }
- if (jj_scan_token(LPAREN)) {
+ if (jj_scan_token(LPAREN))
+ return true;
+ return false;
+ }
+
+ private boolean jj_3_4() {
+ if (jj_3R_LambdaExpression_124_5_21())
return true;
- }
return false;
}
private boolean jj_3R_LambdaParameters_132_20_33() {
- if (jj_scan_token(LPAREN)) {
+ if (jj_scan_token(LPAREN))
return true;
- }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_LambdaParameters_132_31_39()) {
+ if (jj_3R_LambdaParameters_132_31_39())
jj_scanpos = xsp;
- }
- if (jj_scan_token(RPAREN)) {
+ if (jj_scan_token(RPAREN))
return true;
- }
return false;
}
- private boolean jj_3R_NonLiteral_332_7_91() {
- if (jj_3R_MapData_361_5_101()) {
+ private boolean jj_3R_NonLiteral_335_7_91() {
+ if (jj_3R_MapData_364_5_101())
return true;
- }
return false;
}
- private boolean jj_3R_NonLiteral_331_7_90() {
- if (jj_3R_ListData_349_5_100()) {
+ private boolean jj_3R_NonLiteral_334_7_90() {
+ if (jj_3R_ListData_352_5_100())
return true;
- }
return false;
}
- private boolean jj_3R_LambdaExpressionOrInvocation_141_5_23() {
- if (jj_scan_token(LPAREN)) {
+ private boolean jj_3_9() {
+ if (jj_3R_SetData_345_5_25())
return true;
- }
- if (jj_3R_LambdaParameters_132_5_27()) {
- return true;
- }
- if (jj_scan_token(ARROW)) {
- return true;
- }
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3_4()) {
- jj_scanpos = xsp;
- if (jj_3R_LambdaExpressionOrInvocation_144_45_30()) {
- return true;
- }
- }
- if (jj_scan_token(RPAREN)) {
- return true;
- }
return false;
}
- private boolean jj_3_8() {
- if (jj_3R_SetData_342_5_25()) {
+ private boolean jj_3R_NonLiteral_332_7_89() {
+ if (jj_3R_Identifier_380_5_38())
return true;
- }
return false;
}
- private boolean jj_3R_NonLiteral_329_7_89() {
- if (jj_3R_Identifier_377_5_38()) {
+ private boolean jj_3R_NonLiteral_331_7_88() {
+ if (jj_3R_Function_393_5_99())
return true;
- }
return false;
}
- private boolean jj_3R_NonLiteral_328_7_88() {
- if (jj_3R_Function_390_5_99()) {
+ private boolean jj_3R_NonLiteral_330_7_87() {
+ if (jj_scan_token(LPAREN))
+ return true;
+ if (jj_3R_Expression_99_5_36())
+ return true;
+ if (jj_scan_token(RPAREN))
return true;
- }
return false;
}
- private boolean jj_3R_NonLiteral_327_7_87() {
- if (jj_scan_token(LPAREN)) {
+ private boolean jj_3R_LambdaExpressionOrInvocation_141_5_23() {
+ if (jj_scan_token(LPAREN))
return true;
- }
- if (jj_3R_Expression_99_5_36()) {
+ if (jj_3R_LambdaParameters_132_5_27())
return true;
- }
- if (jj_scan_token(RPAREN)) {
+ if (jj_scan_token(ARROW))
return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3_4()) {
+ jj_scanpos = xsp;
+ if (jj_3R_LambdaExpressionOrInvocation_144_45_30())
+ return true;
}
+ if (jj_scan_token(RPAREN))
+ return true;
return false;
}
- private boolean jj_3R_MethodParameters_317_16_112() {
- if (jj_3R_Expression_99_5_36()) {
+ private boolean jj_3R_MethodParameters_320_16_112() {
+ if (jj_3R_Expression_99_5_36())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_MethodParameters_317_31_113()) {
+ if (jj_3R_MethodParameters_320_31_113()) {
jj_scanpos = xsp;
break;
}
@@ -2972,31 +2876,29 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_ValueSuffix_291_41_110() {
- if (jj_3R_MethodParameters_317_5_108()) {
+ private boolean jj_3R_ValueSuffix_294_41_110() {
+ if (jj_3R_MethodParameters_320_5_108())
return true;
- }
return false;
}
- private boolean jj_3R_NonLiteral_326_5_79() {
+ private boolean jj_3R_NonLiteral_329_5_79() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3_6()) {
+ if (jj_3_7()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_327_7_87()) {
+ if (jj_3R_NonLiteral_330_7_87()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_328_7_88()) {
+ if (jj_3R_NonLiteral_331_7_88()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_329_7_89()) {
+ if (jj_3R_NonLiteral_332_7_89()) {
jj_scanpos = xsp;
- if (jj_3_8()) {
+ if (jj_3_9()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_331_7_90()) {
+ if (jj_3R_NonLiteral_334_7_90()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_332_7_91()) {
+ if (jj_3R_NonLiteral_335_7_91())
return true;
- }
}
}
}
@@ -3006,17 +2908,15 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3_6() {
- if (jj_3R_LambdaExpressionOrInvocation_141_5_23()) {
+ private boolean jj_3_7() {
+ if (jj_3R_LambdaExpressionOrInvocation_141_5_23())
return true;
- }
return false;
}
private boolean jj_3R_LambdaParameters_132_5_32() {
- if (jj_3R_Identifier_377_5_38()) {
+ if (jj_3R_Identifier_380_5_38())
return true;
- }
return false;
}
@@ -3025,90 +2925,74 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_3R_LambdaParameters_132_5_32()) {
jj_scanpos = xsp;
- if (jj_3R_LambdaParameters_132_20_33()) {
+ if (jj_3R_LambdaParameters_132_20_33())
return true;
- }
}
return false;
}
- private boolean jj_3_1() {
- if (jj_scan_token(ASSIGN)) {
+ private boolean jj_3R_MethodParameters_320_5_108() {
+ if (jj_scan_token(LPAREN))
return true;
- }
- if (jj_3R_Assignment_115_5_20()) {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_MethodParameters_320_16_112())
+ jj_scanpos = xsp;
+ if (jj_scan_token(RPAREN))
return true;
- }
return false;
}
- private boolean jj_3R_MethodParameters_317_5_108() {
- if (jj_scan_token(LPAREN)) {
+ private boolean jj_3_1() {
+ if (jj_scan_token(ASSIGN))
return true;
- }
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_MethodParameters_317_16_112()) {
- jj_scanpos = xsp;
- }
- if (jj_scan_token(RPAREN)) {
+ if (jj_3R_Assignment_115_5_20())
return true;
- }
return false;
}
private boolean jj_3R_LambdaExpression_124_5_21() {
- if (jj_3R_LambdaParameters_132_5_27()) {
+ if (jj_3R_LambdaParameters_132_5_27())
return true;
- }
- if (jj_scan_token(ARROW)) {
+ if (jj_scan_token(ARROW))
return true;
- }
Token xsp;
xsp = jj_scanpos;
if (jj_3_3()) {
jj_scanpos = xsp;
- if (jj_3R_LambdaExpression_124_68_28()) {
+ if (jj_3R_LambdaExpression_124_68_28())
return true;
- }
}
return false;
}
private boolean jj_3R_Semicolon_107_20_48() {
- if (jj_scan_token(SEMICOLON)) {
+ if (jj_scan_token(SEMICOLON))
return true;
- }
- if (jj_3R_Assignment_115_5_20()) {
+ if (jj_3R_Assignment_115_5_20())
return true;
- }
return false;
}
- private boolean jj_3R_BracketSuffix_309_5_93() {
- if (jj_scan_token(LBRACK)) {
+ private boolean jj_3R_BracketSuffix_312_5_93() {
+ if (jj_scan_token(LBRACK))
return true;
- }
- if (jj_3R_Expression_99_5_36()) {
+ if (jj_3R_Expression_99_5_36())
return true;
- }
- if (jj_scan_token(RBRACK)) {
+ if (jj_scan_token(RBRACK))
return true;
- }
return false;
}
- private boolean jj_3R_ValueSuffix_291_21_81() {
- if (jj_3R_BracketSuffix_309_5_93()) {
+ private boolean jj_3R_ValueSuffix_294_21_81() {
+ if (jj_3R_BracketSuffix_312_5_93())
return true;
- }
return false;
}
private boolean jj_3R_Assignment_116_5_26() {
- if (jj_3R_Choice_155_5_22()) {
+ if (jj_3R_Choice_155_5_22())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -3121,9 +3005,8 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
private boolean jj_3_2() {
- if (jj_3R_LambdaExpression_124_5_21()) {
+ if (jj_3R_LambdaExpression_124_5_21())
return true;
- }
return false;
}
@@ -3132,27 +3015,23 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_3_2()) {
jj_scanpos = xsp;
- if (jj_3R_Assignment_116_5_26()) {
+ if (jj_3R_Assignment_116_5_26())
return true;
- }
}
return false;
}
- private boolean jj_3R_DotSuffix_300_5_92() {
- if (jj_scan_token(DOT)) {
+ private boolean jj_3R_DotSuffix_303_5_92() {
+ if (jj_scan_token(DOT))
return true;
- }
- if (jj_scan_token(IDENTIFIER)) {
+ if (jj_scan_token(IDENTIFIER))
return true;
- }
return false;
}
private boolean jj_3R_Semicolon_107_5_43() {
- if (jj_3R_Assignment_115_5_20()) {
+ if (jj_3R_Assignment_115_5_20())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -3164,77 +3043,68 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_ValueSuffix_291_7_80() {
- if (jj_3R_DotSuffix_300_5_92()) {
+ private boolean jj_3R_ValueSuffix_294_7_80() {
+ if (jj_3R_DotSuffix_303_5_92())
return true;
- }
return false;
}
- private boolean jj_3R_ValueSuffix_291_5_77() {
+ private boolean jj_3R_ValueSuffix_294_5_77() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_ValueSuffix_291_7_80()) {
+ if (jj_3R_ValueSuffix_294_7_80()) {
jj_scanpos = xsp;
- if (jj_3R_ValueSuffix_291_21_81()) {
+ if (jj_3R_ValueSuffix_294_21_81())
return true;
- }
}
xsp = jj_scanpos;
- if (jj_3R_ValueSuffix_291_41_110()) {
+ if (jj_3R_ValueSuffix_294_41_110())
jj_scanpos = xsp;
- }
return false;
}
- private boolean jj_3R_Expression_99_5_36() {
- if (jj_3R_Semicolon_107_5_43()) {
+ private boolean jj_3R_Value_275_21_74() {
+ if (jj_3R_ValueSuffix_294_5_77())
return true;
- }
return false;
}
- private boolean jj_3R_Value_272_21_74() {
- if (jj_3R_ValueSuffix_291_5_77()) {
+ private boolean jj_3R_Expression_99_5_36() {
+ if (jj_3R_Semicolon_107_5_43())
return true;
- }
return false;
}
- private boolean jj_3R_ValuePrefix_282_7_76() {
- if (jj_3R_NonLiteral_326_5_79()) {
+ private boolean jj_3R_ValuePrefix_285_7_76() {
+ if (jj_3R_NonLiteral_329_5_79())
return true;
- }
return false;
}
- private boolean jj_3R_ValuePrefix_281_5_73() {
+ private boolean jj_3R_ValuePrefix_284_5_73() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_ValuePrefix_281_5_75()) {
+ if (jj_3R_ValuePrefix_284_5_75()) {
jj_scanpos = xsp;
- if (jj_3R_ValuePrefix_282_7_76()) {
+ if (jj_3R_ValuePrefix_285_7_76())
return true;
- }
}
return false;
}
- private boolean jj_3R_ValuePrefix_281_5_75() {
- if (jj_3R_Literal_408_5_78()) {
+ private boolean jj_3R_ValuePrefix_284_5_75() {
+ if (jj_3R_Literal_411_5_78())
return true;
- }
return false;
}
- private boolean jj_3R_Value_272_5_72() {
- if (jj_3R_ValuePrefix_281_5_73()) {
+ private boolean jj_3R_Value_275_5_72() {
+ if (jj_3R_ValuePrefix_284_5_73())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_Value_272_21_74()) {
+ if (jj_3R_Value_275_21_74()) {
jj_scanpos = xsp;
break;
}
@@ -3242,42 +3112,57 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Null_458_5_98() {
- if (jj_scan_token(NULL)) {
+ private boolean jj_3R_Null_461_5_98() {
+ if (jj_scan_token(NULL))
return true;
- }
return false;
}
- private boolean jj_3R_Unary_263_9_68() {
- if (jj_3R_Value_272_5_72()) {
+ private boolean jj_3R_Unary_266_9_68() {
+ if (jj_3R_Value_275_5_72())
return true;
- }
return false;
}
- private boolean jj_3R_Unary_261_9_67() {
- if (jj_scan_token(EMPTY)) {
+ private boolean jj_3R_Unary_264_9_67() {
+ if (jj_scan_token(EMPTY))
return true;
- }
- if (jj_3R_Unary_257_9_61()) {
+ if (jj_3R_Unary_257_9_61())
return true;
- }
return false;
}
- private boolean jj_3R_Unary_259_9_66() {
+ private boolean jj_3R_Unary_262_9_66() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(37)) {
jj_scanpos = xsp;
- if (jj_scan_token(38)) {
+ if (jj_scan_token(38))
return true;
- }
}
- if (jj_3R_Unary_257_9_61()) {
+ if (jj_3R_Unary_257_9_61())
return true;
+ return false;
+ }
+
+ private boolean jj_3_6() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(37)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(38))
+ return true;
}
+ if (jj_scan_token(EMPTY))
+ return true;
+ if (jj_3R_Unary_257_9_61())
+ return true;
+ return false;
+ }
+
+ private boolean jj_3R_String_452_5_97() {
+ if (jj_scan_token(STRING_LITERAL))
+ return true;
return false;
}
@@ -3286,12 +3171,14 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_3R_Unary_257_9_65()) {
jj_scanpos = xsp;
- if (jj_3R_Unary_259_9_66()) {
+ if (jj_3_6()) {
jj_scanpos = xsp;
- if (jj_3R_Unary_261_9_67()) {
+ if (jj_3R_Unary_262_9_66()) {
jj_scanpos = xsp;
- if (jj_3R_Unary_263_9_68()) {
- return true;
+ if (jj_3R_Unary_264_9_67()) {
+ jj_scanpos = xsp;
+ if (jj_3R_Unary_266_9_68())
+ return true;
}
}
}
@@ -3300,19 +3187,16 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
private boolean jj_3R_Unary_257_9_65() {
- if (jj_scan_token(MINUS)) {
+ if (jj_scan_token(MINUS))
return true;
- }
- if (jj_3R_Unary_257_9_61()) {
+ if (jj_3R_Unary_257_9_61())
return true;
- }
return false;
}
- private boolean jj_3R_String_449_5_97() {
- if (jj_scan_token(STRING_LITERAL)) {
+ private boolean jj_3R_Integer_443_5_96() {
+ if (jj_scan_token(INTEGER_LITERAL))
return true;
- }
return false;
}
@@ -3321,20 +3205,11 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(51)) {
jj_scanpos = xsp;
- if (jj_scan_token(52)) {
+ if (jj_scan_token(52))
return true;
- }
}
- if (jj_3R_Unary_257_9_61()) {
+ if (jj_3R_Unary_257_9_61())
return true;
- }
- return false;
- }
-
- private boolean jj_3R_Integer_440_5_96() {
- if (jj_scan_token(INTEGER_LITERAL)) {
- return true;
- }
return false;
}
@@ -3343,13 +3218,11 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(49)) {
jj_scanpos = xsp;
- if (jj_scan_token(50)) {
+ if (jj_scan_token(50))
return true;
- }
}
- if (jj_3R_Unary_257_9_61()) {
+ if (jj_3R_Unary_257_9_61())
return true;
- }
return false;
}
@@ -3360,28 +3233,30 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
jj_scanpos = xsp;
if (jj_3R_Multiplication_245_9_70()) {
jj_scanpos = xsp;
- if (jj_3R_Multiplication_247_9_71()) {
+ if (jj_3R_Multiplication_247_9_71())
return true;
- }
}
}
return false;
}
private boolean jj_3R_Multiplication_243_9_69() {
- if (jj_scan_token(MULT)) {
+ if (jj_scan_token(MULT))
return true;
- }
- if (jj_3R_Unary_257_9_61()) {
+ if (jj_3R_Unary_257_9_61())
+ return true;
+ return false;
+ }
+
+ private boolean jj_3R_FloatingPoint_434_5_95() {
+ if (jj_scan_token(FLOATING_POINT_LITERAL))
return true;
- }
return false;
}
private boolean jj_3R_Multiplication_241_5_59() {
- if (jj_3R_Unary_257_9_61()) {
+ if (jj_3R_Unary_257_9_61())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -3393,26 +3268,33 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_FloatingPoint_431_5_95() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) {
+ private boolean jj_3R_Boolean_426_7_103() {
+ if (jj_scan_token(FALSE))
return true;
- }
return false;
}
private boolean jj_3R_Math_231_9_64() {
- if (jj_scan_token(MINUS)) {
+ if (jj_scan_token(MINUS))
return true;
- }
- if (jj_3R_Multiplication_241_5_59()) {
+ if (jj_3R_Multiplication_241_5_59())
return true;
- }
return false;
}
- private boolean jj_3R_Boolean_423_7_103() {
- if (jj_scan_token(FALSE)) {
+ private boolean jj_3R_Boolean_424_5_102() {
+ if (jj_scan_token(TRUE))
return true;
+ return false;
+ }
+
+ private boolean jj_3R_Boolean_424_5_94() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_Boolean_424_5_102()) {
+ jj_scanpos = xsp;
+ if (jj_3R_Boolean_426_7_103())
+ return true;
}
return false;
}
@@ -3422,46 +3304,23 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_3R_Math_229_9_63()) {
jj_scanpos = xsp;
- if (jj_3R_Math_231_9_64()) {
+ if (jj_3R_Math_231_9_64())
return true;
- }
}
return false;
}
private boolean jj_3R_Math_229_9_63() {
- if (jj_scan_token(PLUS)) {
+ if (jj_scan_token(PLUS))
return true;
- }
- if (jj_3R_Multiplication_241_5_59()) {
+ if (jj_3R_Multiplication_241_5_59())
return true;
- }
- return false;
- }
-
- private boolean jj_3R_Boolean_421_5_102() {
- if (jj_scan_token(TRUE)) {
- return true;
- }
- return false;
- }
-
- private boolean jj_3R_Boolean_421_5_94() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_Boolean_421_5_102()) {
- jj_scanpos = xsp;
- if (jj_3R_Boolean_423_7_103()) {
- return true;
- }
- }
return false;
}
private boolean jj_3R_Math_227_5_53() {
- if (jj_3R_Multiplication_241_5_59()) {
+ if (jj_3R_Multiplication_241_5_59())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -3473,75 +3332,65 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Literal_412_7_86() {
- if (jj_3R_Null_458_5_98()) {
+ private boolean jj_3R_Literal_415_7_86() {
+ if (jj_3R_Null_461_5_98())
return true;
- }
return false;
}
- private boolean jj_3R_Literal_411_7_85() {
- if (jj_3R_String_449_5_97()) {
+ private boolean jj_3R_Literal_414_7_85() {
+ if (jj_3R_String_452_5_97())
return true;
- }
return false;
}
- private boolean jj_3R_Concatenation_217_10_54() {
- if (jj_scan_token(CONCAT)) {
- return true;
- }
- if (jj_3R_Math_227_5_53()) {
+ private boolean jj_3R_Literal_413_7_84() {
+ if (jj_3R_Integer_443_5_96())
return true;
- }
return false;
}
- private boolean jj_3R_Literal_410_7_84() {
- if (jj_3R_Integer_440_5_96()) {
+ private boolean jj_3R_Literal_412_7_83() {
+ if (jj_3R_FloatingPoint_434_5_95())
return true;
- }
return false;
}
- private boolean jj_3R_Literal_409_7_83() {
- if (jj_3R_FloatingPoint_431_5_95()) {
+ private boolean jj_3R_Concatenation_217_10_54() {
+ if (jj_scan_token(CONCAT))
+ return true;
+ if (jj_3R_Math_227_5_53())
return true;
- }
return false;
}
- private boolean jj_3R_Function_390_24_104() {
- if (jj_scan_token(COLON)) {
+ private boolean jj_3R_Function_393_24_104() {
+ if (jj_scan_token(COLON))
return true;
- }
- if (jj_scan_token(IDENTIFIER)) {
+ if (jj_scan_token(IDENTIFIER))
return true;
- }
return false;
}
- private boolean jj_3R_Literal_408_5_82() {
- if (jj_3R_Boolean_421_5_94()) {
+ private boolean jj_3R_Literal_411_5_82() {
+ if (jj_3R_Boolean_424_5_94())
return true;
- }
return false;
}
- private boolean jj_3R_Literal_408_5_78() {
+ private boolean jj_3R_Literal_411_5_78() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_Literal_408_5_82()) {
+ if (jj_3R_Literal_411_5_82()) {
jj_scanpos = xsp;
- if (jj_3R_Literal_409_7_83()) {
+ if (jj_3R_Literal_412_7_83()) {
jj_scanpos = xsp;
- if (jj_3R_Literal_410_7_84()) {
+ if (jj_3R_Literal_413_7_84()) {
jj_scanpos = xsp;
- if (jj_3R_Literal_411_7_85()) {
+ if (jj_3R_Literal_414_7_85()) {
jj_scanpos = xsp;
- if (jj_3R_Literal_412_7_86()) {
+ if (jj_3R_Literal_415_7_86())
return true;
- }
}
}
}
@@ -3550,9 +3399,8 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
}
private boolean jj_3R_Concatenation_215_6_49() {
- if (jj_3R_Math_227_5_53()) {
+ if (jj_3R_Math_227_5_53())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -3564,10 +3412,9 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Function_399_7_105() {
- if (jj_3R_MethodParameters_317_5_108()) {
+ private boolean jj_3R_Function_402_7_105() {
+ if (jj_3R_MethodParameters_320_5_108())
return true;
- }
return false;
}
@@ -3576,13 +3423,11 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(29)) {
jj_scanpos = xsp;
- if (jj_scan_token(30)) {
+ if (jj_scan_token(30))
return true;
- }
}
- if (jj_3R_Concatenation_215_6_49()) {
+ if (jj_3R_Concatenation_215_6_49())
return true;
- }
return false;
}
@@ -3591,13 +3436,11 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(31)) {
jj_scanpos = xsp;
- if (jj_scan_token(32)) {
+ if (jj_scan_token(32))
return true;
- }
}
- if (jj_3R_Concatenation_215_6_49()) {
+ if (jj_3R_Concatenation_215_6_49())
return true;
- }
return false;
}
@@ -3606,12 +3449,29 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(25)) {
jj_scanpos = xsp;
- if (jj_scan_token(26)) {
+ if (jj_scan_token(26))
return true;
- }
}
- if (jj_3R_Concatenation_215_6_49()) {
+ if (jj_3R_Concatenation_215_6_49())
return true;
+ return false;
+ }
+
+ private boolean jj_3R_Function_393_5_99() {
+ if (jj_scan_token(IDENTIFIER))
+ return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_Function_393_24_104())
+ jj_scanpos = xsp;
+ if (jj_3R_Function_402_7_105())
+ return true;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_Function_402_7_105()) {
+ jj_scanpos = xsp;
+ break;
+ }
}
return false;
}
@@ -3625,9 +3485,8 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
jj_scanpos = xsp;
if (jj_3R_Compare_202_9_57()) {
jj_scanpos = xsp;
- if (jj_3R_Compare_204_9_58()) {
+ if (jj_3R_Compare_204_9_58())
return true;
- }
}
}
}
@@ -3639,42 +3498,17 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(27)) {
jj_scanpos = xsp;
- if (jj_scan_token(28)) {
+ if (jj_scan_token(28))
return true;
- }
}
- if (jj_3R_Concatenation_215_6_49()) {
+ if (jj_3R_Concatenation_215_6_49())
return true;
- }
- return false;
- }
-
- private boolean jj_3R_Function_390_5_99() {
- if (jj_scan_token(IDENTIFIER)) {
- return true;
- }
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_Function_390_24_104()) {
- jj_scanpos = xsp;
- }
- if (jj_3R_Function_399_7_105()) {
- return true;
- }
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_Function_399_7_105()) {
- jj_scanpos = xsp;
- break;
- }
- }
return false;
}
private boolean jj_3R_Compare_196_5_45() {
- if (jj_3R_Concatenation_215_6_49()) {
+ if (jj_3R_Concatenation_215_6_49())
return true;
- }
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -3691,13 +3525,17 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(35)) {
jj_scanpos = xsp;
- if (jj_scan_token(36)) {
+ if (jj_scan_token(36))
return true;
- }
}
- if (jj_3R_Compare_196_5_45()) {
+ if (jj_3R_Compare_196_5_45())
+ return true;
+ return false;
+ }
+
+ private boolean jj_3R_Identifier_380_5_38() {
+ if (jj_scan_token(IDENTIFIER))
return true;
- }
return false;
}
@@ -3706,9 +3544,8 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_3R_Equality_184_9_51()) {
jj_scanpos = xsp;
- if (jj_3R_Equality_186_9_52()) {
+ if (jj_3R_Equality_186_9_52())
return true;
- }
}
return false;
}
@@ -3718,28 +3555,24 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(33)) {
jj_scanpos = xsp;
- if (jj_scan_token(34)) {
+ if (jj_scan_token(34))
return true;
- }
}
- if (jj_3R_Compare_196_5_45()) {
+ if (jj_3R_Compare_196_5_45())
return true;
- }
return false;
}
private boolean jj_3R_LambdaExpression_124_68_28() {
- if (jj_3R_Choice_155_5_22()) {
+ if (jj_3R_Choice_155_5_22())
return true;
- }
return false;
}
private boolean jj_3R_And_174_17_41() {
Token xsp;
- if (jj_3R_And_173_18_47()) {
+ if (jj_3R_And_173_18_47())
return true;
- }
while (true) {
xsp = jj_scanpos;
if (jj_3R_And_173_18_47()) {
@@ -3755,20 +3588,11 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
xsp = jj_scanpos;
if (jj_scan_token(39)) {
jj_scanpos = xsp;
- if (jj_scan_token(40)) {
+ if (jj_scan_token(40))
return true;
- }
}
- if (jj_3R_Equality_182_5_40()) {
+ if (jj_3R_Equality_182_5_40())
return true;
- }
- return false;
- }
-
- private boolean jj_3R_Identifier_377_5_38() {
- if (jj_scan_token(IDENTIFIER)) {
- return true;
- }
return false;
}
@@ -3783,7 +3607,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
private Token jj_scanpos, jj_lastpos;
private int jj_la;
private int jj_gen;
- final private int[] jj_la1 = new int[54];
+ final private int[] jj_la1 = new int[56];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static {
@@ -3794,19 +3618,20 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
private static void jj_la1_init_0() {
jj_la1_0 = new int[] { 0xe, 0xe, 0x800000, 0x15ed00, 0x15ed00, 0x1000000, 0x0, 0x40000, 0x15ed00, 0x40000, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe000000, 0x18000000, 0x6000000, 0x80000000, 0x60000000,
- 0xfe000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x15ed00, 0x120000, 0x15ed00, 0x120000, 0x40000,
- 0x1000000, 0x15ed00, 0x40000, 0x0, 0x100100, 0x1000000, 0x15ed00, 0x1000000, 0x15ed00, 0x1000000,
- 0x15ed00, 0x400000, 0x40000, 0x1ec00, 0xc000, };
+ 0xfe000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x15ed00, 0x120000, 0x15ed00, 0x120000,
+ 0x40000, 0x1000000, 0x15ed00, 0x40000, 0x0, 0x100100, 0x1000000, 0x15ed00, 0x1000000, 0x15ed00,
+ 0x1000000, 0x15ed00, 0x400000, 0x40000, 0x1ec00, 0xc000, };
}
private static void jj_la1_init_1() {
jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x1008860, 0x1008860, 0x0, 0x1000000, 0x1000000, 0x1008860, 0x0, 0x600,
0x600, 0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 0x18, 0x1e, 0x1, 0x0, 0x0, 0x1, 0x0, 0x1, 0x200000,
- 0xc000, 0xc000, 0x1e2000, 0x60000, 0x180000, 0x1e2000, 0x60, 0x1008860, 0x0, 0x1000000, 0x0, 0x0, 0x0,
- 0x1008860, 0x0, 0x1000000, 0x0, 0x0, 0x1008860, 0x0, 0x1008860, 0x0, 0x1008860, 0x0, 0x0, 0x0, 0x0, };
+ 0xc000, 0xc000, 0x1e2000, 0x60000, 0x180000, 0x1e2000, 0x60, 0x60, 0x8000, 0x1000860, 0x0, 0x1000000,
+ 0x0, 0x0, 0x0, 0x1008860, 0x0, 0x1000000, 0x0, 0x0, 0x1008860, 0x0, 0x1008860, 0x0, 0x1008860, 0x0, 0x0,
+ 0x0, 0x0, };
}
- final private JJCalls[] jj_2_rtns = new JJCalls[8];
+ final private JJCalls[] jj_2_rtns = new JJCalls[9];
private boolean jj_rescan = false;
private int jj_gc = 0;
@@ -3826,12 +3651,10 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++)
jj_la1[i] = -1;
- }
- for (int i = 0; i < jj_2_rtns.length; i++) {
+ for (int i = 0; i < jj_2_rtns.length; i++)
jj_2_rtns[i] = new JJCalls();
- }
}
/** Reinitialise. */
@@ -3851,12 +3674,10 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++)
jj_la1[i] = -1;
- }
- for (int i = 0; i < jj_2_rtns.length; i++) {
+ for (int i = 0; i < jj_2_rtns.length; i++)
jj_2_rtns[i] = new JJCalls();
- }
}
/** Constructor. */
@@ -3866,12 +3687,10 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++)
jj_la1[i] = -1;
- }
- for (int i = 0; i < jj_2_rtns.length; i++) {
+ for (int i = 0; i < jj_2_rtns.length; i++)
jj_2_rtns[i] = new JJCalls();
- }
}
/** Reinitialise. */
@@ -3890,12 +3709,10 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++)
jj_la1[i] = -1;
- }
- for (int i = 0; i < jj_2_rtns.length; i++) {
+ for (int i = 0; i < jj_2_rtns.length; i++)
jj_2_rtns[i] = new JJCalls();
- }
}
/** Constructor with generated Token Manager. */
@@ -3904,12 +3721,10 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++)
jj_la1[i] = -1;
- }
- for (int i = 0; i < jj_2_rtns.length; i++) {
+ for (int i = 0; i < jj_2_rtns.length; i++)
jj_2_rtns[i] = new JJCalls();
- }
}
/** Reinitialise. */
@@ -3919,21 +3734,18 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++)
jj_la1[i] = -1;
- }
- for (int i = 0; i < jj_2_rtns.length; i++) {
+ for (int i = 0; i < jj_2_rtns.length; i++)
jj_2_rtns[i] = new JJCalls();
- }
}
private Token jj_consume_token(int kind) throws ParseException {
Token oldToken;
- if ((oldToken = token).next != null) {
+ if ((oldToken = token).next != null)
token = token.next;
- } else {
+ else
token = token.next = token_source.getNextToken();
- }
jj_ntk = -1;
if (token.kind == kind) {
jj_gen++;
@@ -3942,9 +3754,8 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
for (int i = 0; i < jj_2_rtns.length; i++) {
JJCalls c = jj_2_rtns[i];
while (c != null) {
- if (c.gen < jj_gen) {
+ if (c.gen < jj_gen)
c.first = null;
- }
c = c.next;
}
}
@@ -3984,27 +3795,23 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
i++;
tok = tok.next;
}
- if (tok != null) {
+ if (tok != null)
jj_add_error_token(kind, i);
- }
}
- if (jj_scanpos.kind != kind) {
+ if (jj_scanpos.kind != kind)
return true;
- }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ if (jj_la == 0 && jj_scanpos == jj_lastpos)
throw jj_ls;
- }
return false;
}
/** Get the next Token. */
final public Token getNextToken() {
- if (token.next != null) {
+ if (token.next != null)
token = token.next;
- } else {
+ else
token = token.next = token_source.getNextToken();
- }
jj_ntk = -1;
jj_gen++;
return token;
@@ -4014,21 +3821,19 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
final public Token getToken(int index) {
Token t = token;
for (int i = 0; i < index; i++) {
- if (t.next != null) {
+ if (t.next != null)
t = t.next;
- } else {
+ else
t = t.next = token_source.getNextToken();
- }
}
return t;
}
private int jj_ntk_f() {
- if ((jj_nt = token.next) == null) {
+ if ((jj_nt = token.next) == null)
return (jj_ntk = (token.next = token_source.getNextToken()).kind);
- } else {
+ else
return (jj_ntk = jj_nt.kind);
- }
}
private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
@@ -4083,7 +3888,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1 << j)) != 0) {
@@ -4129,7 +3934,7 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
private void jj_rescan_token() {
jj_rescan = true;
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
try {
JJCalls p = jj_2_rtns[i];
@@ -4162,6 +3967,9 @@ public class ELParser/* @bgen(jjtree) */ implements ELParserTreeConstants, ELPar
case 7:
jj_3_8();
break;
+ case 8:
+ jj_3_9();
+ break;
}
}
p = p.next;
diff --git a/java/org/apache/el/parser/ELParserTokenManager.java b/java/org/apache/el/parser/ELParserTokenManager.java
index cc51f5a573..2dd01d4680 100644
--- a/java/org/apache/el/parser/ELParserTokenManager.java
+++ b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -58,11 +58,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
switch (curChar) {
case 123:
- if ((active0 & 0x4L) != 0L) {
+ if ((active0 & 0x4L) != 0L)
return jjStopAtPos(1, 2);
- } else if ((active0 & 0x8L) != 0L) {
+ else if ((active0 & 0x8L) != 0L)
return jjStopAtPos(1, 3);
- }
break;
default:
break;
@@ -81,25 +80,22 @@ public class ELParserTokenManager implements ELParserConstants {
jjstateSet[0] = startState;
int kind = 0x7fffffff;
for (;;) {
- if (++jjround == 0x7fffffff) {
+ if (++jjround == 0x7fffffff)
ReInitRounds();
- }
if (curChar < 64) {
long l = 1L << curChar;
do {
switch (jjstateSet[--i]) {
case 7:
if ((0xffffffe7ffffffffL & l) != 0L) {
- if (kind > 1) {
+ if (kind > 1)
kind = 1;
- }
{
jjCheckNAddStates(0, 4);
}
} else if ((0x1800000000L & l) != 0L) {
- if (kind > 1) {
+ if (kind > 1)
kind = 1;
- }
{
jjCheckNAdd(5);
}
@@ -114,12 +110,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 2:
- if ((0xffffffe7ffffffffL & l) == 0L) {
+ if ((0xffffffe7ffffffffL & l) == 0L)
break;
- }
- if (kind > 1) {
- kind = 1;
- } {
+ if (kind > 1)
+ kind = 1; {
jjCheckNAddStates(0, 4);
}
break;
@@ -134,22 +128,18 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 5:
- if ((0xffffffe7ffffffffL & l) == 0L) {
+ if ((0xffffffe7ffffffffL & l) == 0L)
break;
- }
- if (kind > 1) {
- kind = 1;
- } {
+ if (kind > 1)
+ kind = 1; {
jjCheckNAddStates(5, 8);
}
break;
case 6:
- if ((0x1800000000L & l) == 0L) {
+ if ((0x1800000000L & l) == 0L)
break;
- }
- if (kind > 1) {
- kind = 1;
- } {
+ if (kind > 1)
+ kind = 1; {
jjCheckNAddStates(9, 13);
}
break;
@@ -162,17 +152,15 @@ public class ELParserTokenManager implements ELParserConstants {
do {
switch (jjstateSet[--i]) {
case 7:
- if (kind > 1) {
- kind = 1;
- } {
+ if (kind > 1)
+ kind = 1; {
jjCheckNAddStates(0, 4);
}
if ((0xffffffffefffffffL & l) != 0L) {
jjCheckNAddTwoStates(0, 1);
} else if (curChar == 92) {
- if (kind > 1) {
+ if (kind > 1)
kind = 1;
- }
{
jjCheckNAddStates(14, 17);
}
@@ -184,19 +172,16 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 1:
- if (curChar != 92) {
+ if (curChar != 92)
break;
- }
- if (kind > 1) {
- kind = 1;
- } {
+ if (kind > 1)
+ kind = 1; {
jjCheckNAddStates(14, 17);
}
break;
case 2:
- if (kind > 1) {
- kind = 1;
- } {
+ if (kind > 1)
+ kind = 1; {
jjCheckNAddStates(0, 4);
}
break;
@@ -205,12 +190,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 5:
- if ((0xf7ffffffefffffffL & l) == 0L) {
+ if ((0xf7ffffffefffffffL & l) == 0L)
break;
- }
- if (kind > 1) {
- kind = 1;
- } {
+ if (kind > 1)
+ kind = 1; {
jjCheckNAddStates(5, 8);
}
break;
@@ -231,9 +214,8 @@ public class ELParserTokenManager implements ELParserConstants {
jjCheckNAddTwoStates(0, 1);
}
if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
- if (kind > 1) {
+ if (kind > 1)
kind = 1;
- }
{
jjCheckNAddStates(0, 4);
}
@@ -245,12 +227,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 2:
- if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
break;
- }
- if (kind > 1) {
- kind = 1;
- } {
+ if (kind > 1)
+ kind = 1; {
jjCheckNAddStates(0, 4);
}
break;
@@ -260,21 +240,18 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 5:
- if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
break;
- }
- if (kind > 1) {
- kind = 1;
- } {
+ if (kind > 1)
+ kind = 1; {
jjCheckNAddStates(5, 8);
}
break;
default:
- if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) {
+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0)
break;
- } else {
+ else
break;
- }
}
} while (i != startsAt);
}
@@ -284,9 +261,8 @@ public class ELParserTokenManager implements ELParserConstants {
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 8 - (jjnewStateCnt = startsAt))) {
+ if ((i = jjnewStateCnt) == (startsAt = 8 - (jjnewStateCnt = startsAt)))
return curPos;
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -298,18 +274,16 @@ public class ELParserTokenManager implements ELParserConstants {
private final int jjStopStringLiteralDfa_2(int pos, long active0) {
switch (pos) {
case 0:
- if ((active0 & 0x20000L) != 0L) {
+ if ((active0 & 0x20000L) != 0L)
return 1;
- }
if ((active0 & 0x141d555401c000L) != 0L) {
jjmatchedKind = 56;
return 30;
}
return -1;
case 1:
- if ((active0 & 0x41554000000L) != 0L) {
+ if ((active0 & 0x41554000000L) != 0L)
return 30;
- }
if ((active0 & 0x1419400001c000L) != 0L) {
jjmatchedKind = 56;
jjmatchedPos = 1;
@@ -317,9 +291,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
return -1;
case 2:
- if ((active0 & 0x14014000000000L) != 0L) {
+ if ((active0 & 0x14014000000000L) != 0L)
return 30;
- }
if ((active0 & 0x18000001c000L) != 0L) {
jjmatchedKind = 56;
jjmatchedPos = 2;
@@ -327,9 +300,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
return -1;
case 3:
- if ((active0 & 0x14000L) != 0L) {
+ if ((active0 & 0x14000L) != 0L)
return 30;
- }
if ((active0 & 0x180000008000L) != 0L) {
jjmatchedKind = 56;
jjmatchedPos = 3;
@@ -337,9 +309,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
return -1;
case 4:
- if ((active0 & 0x80000008000L) != 0L) {
+ if ((active0 & 0x80000008000L) != 0L)
return 30;
- }
if ((active0 & 0x100000000000L) != 0L) {
jjmatchedKind = 56;
jjmatchedPos = 4;
@@ -471,38 +442,34 @@ public class ELParserTokenManager implements ELParserConstants {
}
switch (curChar) {
case 38:
- if ((active0 & 0x8000000000L) != 0L) {
+ if ((active0 & 0x8000000000L) != 0L)
return jjStopAtPos(1, 39);
- }
break;
case 61:
- if ((active0 & 0x20000000L) != 0L) {
+ if ((active0 & 0x20000000L) != 0L)
return jjStopAtPos(1, 29);
- } else if ((active0 & 0x80000000L) != 0L) {
+ else if ((active0 & 0x80000000L) != 0L)
return jjStopAtPos(1, 31);
- } else if ((active0 & 0x200000000L) != 0L) {
+ else if ((active0 & 0x200000000L) != 0L)
return jjStopAtPos(1, 33);
- } else if ((active0 & 0x800000000L) != 0L) {
+ else if ((active0 & 0x800000000L) != 0L)
return jjStopAtPos(1, 35);
- } else if ((active0 & 0x20000000000000L) != 0L) {
+ else if ((active0 & 0x20000000000000L) != 0L)
return jjStopAtPos(1, 53);
- }
break;
case 62:
- if ((active0 & 0x80000000000000L) != 0L) {
+ if ((active0 & 0x80000000000000L) != 0L)
return jjStopAtPos(1, 55);
- }
break;
case 97:
return jjMoveStringLiteralDfa2_2(active0, 0x8000L);
case 101:
- if ((active0 & 0x40000000L) != 0L) {
+ if ((active0 & 0x40000000L) != 0L)
return jjStartNfaWithStates_2(1, 30, 30);
- } else if ((active0 & 0x100000000L) != 0L) {
+ else if ((active0 & 0x100000000L) != 0L)
return jjStartNfaWithStates_2(1, 32, 30);
- } else if ((active0 & 0x1000000000L) != 0L) {
+ else if ((active0 & 0x1000000000L) != 0L)
return jjStartNfaWithStates_2(1, 36, 30);
- }
break;
case 105:
return jjMoveStringLiteralDfa2_2(active0, 0x4000000000000L);
@@ -513,28 +480,24 @@ public class ELParserTokenManager implements ELParserConstants {
case 111:
return jjMoveStringLiteralDfa2_2(active0, 0x10004000000000L);
case 113:
- if ((active0 & 0x400000000L) != 0L) {
+ if ((active0 & 0x400000000L) != 0L)
return jjStartNfaWithStates_2(1, 34, 30);
- }
break;
case 114:
- if ((active0 & 0x40000000000L) != 0L) {
+ if ((active0 & 0x40000000000L) != 0L)
return jjStartNfaWithStates_2(1, 42, 30);
- }
return jjMoveStringLiteralDfa2_2(active0, 0x4000L);
case 116:
- if ((active0 & 0x4000000L) != 0L) {
+ if ((active0 & 0x4000000L) != 0L)
return jjStartNfaWithStates_2(1, 26, 30);
- } else if ((active0 & 0x10000000L) != 0L) {
+ else if ((active0 & 0x10000000L) != 0L)
return jjStartNfaWithStates_2(1, 28, 30);
- }
break;
case 117:
return jjMoveStringLiteralDfa2_2(active0, 0x10000L);
case 124:
- if ((active0 & 0x20000000000L) != 0L) {
+ if ((active0 & 0x20000000000L) != 0L)
return jjStopAtPos(1, 41);
- }
break;
default:
break;
@@ -543,9 +506,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa2_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_2(0, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -554,11 +516,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
switch (curChar) {
case 100:
- if ((active0 & 0x10000000000L) != 0L) {
+ if ((active0 & 0x10000000000L) != 0L)
return jjStartNfaWithStates_2(2, 40, 30);
- } else if ((active0 & 0x10000000000000L) != 0L) {
+ else if ((active0 & 0x10000000000000L) != 0L)
return jjStartNfaWithStates_2(2, 52, 30);
- }
break;
case 108:
return jjMoveStringLiteralDfa3_2(active0, 0x18000L);
@@ -567,16 +528,14 @@ public class ELParserTokenManager implements ELParserConstants {
case 115:
return jjMoveStringLiteralDfa3_2(active0, 0x100000000000L);
case 116:
- if ((active0 & 0x4000000000L) != 0L) {
+ if ((active0 & 0x4000000000L) != 0L)
return jjStartNfaWithStates_2(2, 38, 30);
- }
break;
case 117:
return jjMoveStringLiteralDfa3_2(active0, 0x4000L);
case 118:
- if ((active0 & 0x4000000000000L) != 0L) {
+ if ((active0 & 0x4000000000000L) != 0L)
return jjStartNfaWithStates_2(2, 50, 30);
- }
break;
default:
break;
@@ -585,9 +544,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa3_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_2(1, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -596,14 +554,12 @@ public class ELParserTokenManager implements ELParserConstants {
}
switch (curChar) {
case 101:
- if ((active0 & 0x4000L) != 0L) {
+ if ((active0 & 0x4000L) != 0L)
return jjStartNfaWithStates_2(3, 14, 30);
- }
break;
case 108:
- if ((active0 & 0x10000L) != 0L) {
+ if ((active0 & 0x10000L) != 0L)
return jjStartNfaWithStates_2(3, 16, 30);
- }
break;
case 115:
return jjMoveStringLiteralDfa4_2(active0, 0x8000L);
@@ -616,9 +572,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa4_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_2(2, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -629,14 +584,12 @@ public class ELParserTokenManager implements ELParserConstants {
case 97:
return jjMoveStringLiteralDfa5_2(active0, 0x100000000000L);
case 101:
- if ((active0 & 0x8000L) != 0L) {
+ if ((active0 & 0x8000L) != 0L)
return jjStartNfaWithStates_2(4, 15, 30);
- }
break;
case 121:
- if ((active0 & 0x80000000000L) != 0L) {
+ if ((active0 & 0x80000000000L) != 0L)
return jjStartNfaWithStates_2(4, 43, 30);
- }
break;
default:
break;
@@ -645,9 +598,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa5_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_2(3, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -664,9 +616,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa6_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_2(4, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -683,9 +634,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa7_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_2(5, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -702,9 +652,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa8_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_2(6, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -721,9 +670,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa9_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_2(7, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -732,9 +680,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
switch (curChar) {
case 102:
- if ((active0 & 0x100000000000L) != 0L) {
+ if ((active0 & 0x100000000000L) != 0L)
return jjStartNfaWithStates_2(9, 44, 30);
- }
break;
default:
break;
@@ -767,25 +714,22 @@ public class ELParserTokenManager implements ELParserConstants {
jjstateSet[0] = startState;
int kind = 0x7fffffff;
for (;;) {
- if (++jjround == 0x7fffffff) {
+ if (++jjround == 0x7fffffff)
ReInitRounds();
- }
if (curChar < 64) {
long l = 1L << curChar;
do {
switch (jjstateSet[--i]) {
case 0:
if ((0x3ff000000000000L & l) != 0L) {
- if (kind > 10) {
+ if (kind > 10)
kind = 10;
- }
{
jjCheckNAddStates(18, 22);
}
} else if ((0x1800000000L & l) != 0L) {
- if (kind > 56) {
+ if (kind > 56)
kind = 56;
- }
{
jjCheckNAddTwoStates(28, 29);
}
@@ -799,29 +743,25 @@ public class ELParserTokenManager implements ELParserConstants {
break;
case 30:
if ((0x3ff001000000000L & l) != 0L) {
- if (kind > 57) {
+ if (kind > 57)
kind = 57;
- }
{
jjCheckNAdd(29);
}
}
if ((0x3ff001000000000L & l) != 0L) {
- if (kind > 56) {
+ if (kind > 56)
kind = 56;
- }
{
jjCheckNAdd(28);
}
}
break;
case 1:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAddTwoStates(1, 2);
}
break;
@@ -831,12 +771,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 4:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAdd(4);
}
break;
@@ -856,9 +794,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 9:
- if (curChar == 34 && kind > 13) {
+ if (curChar == 34 && kind > 13)
kind = 13;
- }
break;
case 10:
if (curChar == 39) {
@@ -876,27 +813,22 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 14:
- if (curChar == 39 && kind > 13) {
+ if (curChar == 39 && kind > 13)
kind = 13;
- }
break;
case 15:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 10) {
- kind = 10;
- } {
+ if (kind > 10)
+ kind = 10; {
jjCheckNAddStates(18, 22);
}
break;
case 16:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 10) {
- kind = 10;
- } {
+ if (kind > 10)
+ kind = 10; {
jjCheckNAdd(16);
}
break;
@@ -906,22 +838,18 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 18:
- if (curChar != 46) {
+ if (curChar != 46)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAddTwoStates(19, 20);
}
break;
case 19:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAddTwoStates(19, 20);
}
break;
@@ -931,12 +859,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 22:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAdd(22);
}
break;
@@ -951,42 +877,34 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 26:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAdd(26);
}
break;
case 27:
- if ((0x1800000000L & l) == 0L) {
+ if ((0x1800000000L & l) == 0L)
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAddTwoStates(28, 29);
}
break;
case 28:
- if ((0x3ff001000000000L & l) == 0L) {
+ if ((0x3ff001000000000L & l) == 0L)
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAdd(28);
}
break;
case 29:
- if ((0x3ff001000000000L & l) == 0L) {
+ if ((0x3ff001000000000L & l) == 0L)
break;
- }
- if (kind > 57) {
- kind = 57;
- } {
+ if (kind > 57)
+ kind = 57; {
jjCheckNAdd(29);
}
break;
@@ -999,28 +917,24 @@ public class ELParserTokenManager implements ELParserConstants {
do {
switch (jjstateSet[--i]) {
case 0:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x7fffffe87fffffeL & l) == 0L)
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAddTwoStates(28, 29);
}
break;
case 30:
if ((0x7fffffe87fffffeL & l) != 0L) {
- if (kind > 57) {
+ if (kind > 57)
kind = 57;
- }
{
jjCheckNAdd(29);
}
}
if ((0x7fffffe87fffffeL & l) != 0L) {
- if (kind > 56) {
+ if (kind > 56)
kind = 56;
- }
{
jjCheckNAdd(28);
}
@@ -1037,9 +951,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 7:
- if (curChar == 92) {
+ if (curChar == 92)
jjstateSet[jjnewStateCnt++] = 8;
- }
break;
case 8:
if (curChar == 92) {
@@ -1052,9 +965,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 12:
- if (curChar == 92) {
+ if (curChar == 92)
jjstateSet[jjnewStateCnt++] = 13;
- }
break;
case 13:
if (curChar == 92) {
@@ -1072,22 +984,18 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 28:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x7fffffe87fffffeL & l) == 0L)
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAdd(28);
}
break;
case 29:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x7fffffe87fffffeL & l) == 0L)
break;
- }
- if (kind > 57) {
- kind = 57;
- } {
+ if (kind > 57)
+ kind = 57; {
jjCheckNAdd(29);
}
break;
@@ -1104,28 +1012,24 @@ public class ELParserTokenManager implements ELParserConstants {
do {
switch (jjstateSet[--i]) {
case 0:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAddTwoStates(28, 29);
}
break;
case 30:
if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {
- if (kind > 56) {
+ if (kind > 56)
kind = 56;
- }
{
jjCheckNAdd(28);
}
}
if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {
- if (kind > 57) {
+ if (kind > 57)
kind = 57;
- }
{
jjCheckNAdd(29);
}
@@ -1142,31 +1046,26 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 28:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAdd(28);
}
break;
case 29:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- }
- if (kind > 57) {
- kind = 57;
- } {
+ if (kind > 57)
+ kind = 57; {
jjCheckNAdd(29);
}
break;
default:
- if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) {
+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0)
break;
- } else {
+ else
break;
- }
}
} while (i != startsAt);
}
@@ -1176,9 +1075,8 @@ public class ELParserTokenManager implements ELParserConstants {
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 30 - (jjnewStateCnt = startsAt))) {
+ if ((i = jjnewStateCnt) == (startsAt = 30 - (jjnewStateCnt = startsAt)))
return curPos;
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -1190,18 +1088,16 @@ public class ELParserTokenManager implements ELParserConstants {
private final int jjStopStringLiteralDfa_1(int pos, long active0) {
switch (pos) {
case 0:
- if ((active0 & 0x20000L) != 0L) {
+ if ((active0 & 0x20000L) != 0L)
return 1;
- }
if ((active0 & 0x141d555401c000L) != 0L) {
jjmatchedKind = 56;
return 30;
}
return -1;
case 1:
- if ((active0 & 0x41554000000L) != 0L) {
+ if ((active0 & 0x41554000000L) != 0L)
return 30;
- }
if ((active0 & 0x1419400001c000L) != 0L) {
jjmatchedKind = 56;
jjmatchedPos = 1;
@@ -1209,9 +1105,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
return -1;
case 2:
- if ((active0 & 0x14014000000000L) != 0L) {
+ if ((active0 & 0x14014000000000L) != 0L)
return 30;
- }
if ((active0 & 0x18000001c000L) != 0L) {
jjmatchedKind = 56;
jjmatchedPos = 2;
@@ -1219,9 +1114,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
return -1;
case 3:
- if ((active0 & 0x14000L) != 0L) {
+ if ((active0 & 0x14000L) != 0L)
return 30;
- }
if ((active0 & 0x180000008000L) != 0L) {
jjmatchedKind = 56;
jjmatchedPos = 3;
@@ -1229,9 +1123,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
return -1;
case 4:
- if ((active0 & 0x80000008000L) != 0L) {
+ if ((active0 & 0x80000008000L) != 0L)
return 30;
- }
if ((active0 & 0x100000000000L) != 0L) {
jjmatchedKind = 56;
jjmatchedPos = 4;
@@ -1363,38 +1256,34 @@ public class ELParserTokenManager implements ELParserConstants {
}
switch (curChar) {
case 38:
- if ((active0 & 0x8000000000L) != 0L) {
+ if ((active0 & 0x8000000000L) != 0L)
return jjStopAtPos(1, 39);
- }
break;
case 61:
- if ((active0 & 0x20000000L) != 0L) {
+ if ((active0 & 0x20000000L) != 0L)
return jjStopAtPos(1, 29);
- } else if ((active0 & 0x80000000L) != 0L) {
+ else if ((active0 & 0x80000000L) != 0L)
return jjStopAtPos(1, 31);
- } else if ((active0 & 0x200000000L) != 0L) {
+ else if ((active0 & 0x200000000L) != 0L)
return jjStopAtPos(1, 33);
- } else if ((active0 & 0x800000000L) != 0L) {
+ else if ((active0 & 0x800000000L) != 0L)
return jjStopAtPos(1, 35);
- } else if ((active0 & 0x20000000000000L) != 0L) {
+ else if ((active0 & 0x20000000000000L) != 0L)
return jjStopAtPos(1, 53);
- }
break;
case 62:
- if ((active0 & 0x80000000000000L) != 0L) {
+ if ((active0 & 0x80000000000000L) != 0L)
return jjStopAtPos(1, 55);
- }
break;
case 97:
return jjMoveStringLiteralDfa2_1(active0, 0x8000L);
case 101:
- if ((active0 & 0x40000000L) != 0L) {
+ if ((active0 & 0x40000000L) != 0L)
return jjStartNfaWithStates_1(1, 30, 30);
- } else if ((active0 & 0x100000000L) != 0L) {
+ else if ((active0 & 0x100000000L) != 0L)
return jjStartNfaWithStates_1(1, 32, 30);
- } else if ((active0 & 0x1000000000L) != 0L) {
+ else if ((active0 & 0x1000000000L) != 0L)
return jjStartNfaWithStates_1(1, 36, 30);
- }
break;
case 105:
return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000L);
@@ -1405,28 +1294,24 @@ public class ELParserTokenManager implements ELParserConstants {
case 111:
return jjMoveStringLiteralDfa2_1(active0, 0x10004000000000L);
case 113:
- if ((active0 & 0x400000000L) != 0L) {
+ if ((active0 & 0x400000000L) != 0L)
return jjStartNfaWithStates_1(1, 34, 30);
- }
break;
case 114:
- if ((active0 & 0x40000000000L) != 0L) {
+ if ((active0 & 0x40000000000L) != 0L)
return jjStartNfaWithStates_1(1, 42, 30);
- }
return jjMoveStringLiteralDfa2_1(active0, 0x4000L);
case 116:
- if ((active0 & 0x4000000L) != 0L) {
+ if ((active0 & 0x4000000L) != 0L)
return jjStartNfaWithStates_1(1, 26, 30);
- } else if ((active0 & 0x10000000L) != 0L) {
+ else if ((active0 & 0x10000000L) != 0L)
return jjStartNfaWithStates_1(1, 28, 30);
- }
break;
case 117:
return jjMoveStringLiteralDfa2_1(active0, 0x10000L);
case 124:
- if ((active0 & 0x20000000000L) != 0L) {
+ if ((active0 & 0x20000000000L) != 0L)
return jjStopAtPos(1, 41);
- }
break;
default:
break;
@@ -1435,9 +1320,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa2_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_1(0, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -1446,11 +1330,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
switch (curChar) {
case 100:
- if ((active0 & 0x10000000000L) != 0L) {
+ if ((active0 & 0x10000000000L) != 0L)
return jjStartNfaWithStates_1(2, 40, 30);
- } else if ((active0 & 0x10000000000000L) != 0L) {
+ else if ((active0 & 0x10000000000000L) != 0L)
return jjStartNfaWithStates_1(2, 52, 30);
- }
break;
case 108:
return jjMoveStringLiteralDfa3_1(active0, 0x18000L);
@@ -1459,16 +1342,14 @@ public class ELParserTokenManager implements ELParserConstants {
case 115:
return jjMoveStringLiteralDfa3_1(active0, 0x100000000000L);
case 116:
- if ((active0 & 0x4000000000L) != 0L) {
+ if ((active0 & 0x4000000000L) != 0L)
return jjStartNfaWithStates_1(2, 38, 30);
- }
break;
case 117:
return jjMoveStringLiteralDfa3_1(active0, 0x4000L);
case 118:
- if ((active0 & 0x4000000000000L) != 0L) {
+ if ((active0 & 0x4000000000000L) != 0L)
return jjStartNfaWithStates_1(2, 50, 30);
- }
break;
default:
break;
@@ -1477,9 +1358,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa3_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_1(1, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -1488,14 +1368,12 @@ public class ELParserTokenManager implements ELParserConstants {
}
switch (curChar) {
case 101:
- if ((active0 & 0x4000L) != 0L) {
+ if ((active0 & 0x4000L) != 0L)
return jjStartNfaWithStates_1(3, 14, 30);
- }
break;
case 108:
- if ((active0 & 0x10000L) != 0L) {
+ if ((active0 & 0x10000L) != 0L)
return jjStartNfaWithStates_1(3, 16, 30);
- }
break;
case 115:
return jjMoveStringLiteralDfa4_1(active0, 0x8000L);
@@ -1508,9 +1386,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa4_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_1(2, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -1521,14 +1398,12 @@ public class ELParserTokenManager implements ELParserConstants {
case 97:
return jjMoveStringLiteralDfa5_1(active0, 0x100000000000L);
case 101:
- if ((active0 & 0x8000L) != 0L) {
+ if ((active0 & 0x8000L) != 0L)
return jjStartNfaWithStates_1(4, 15, 30);
- }
break;
case 121:
- if ((active0 & 0x80000000000L) != 0L) {
+ if ((active0 & 0x80000000000L) != 0L)
return jjStartNfaWithStates_1(4, 43, 30);
- }
break;
default:
break;
@@ -1537,9 +1412,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa5_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_1(3, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -1556,9 +1430,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa6_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_1(4, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -1575,9 +1448,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa7_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_1(5, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -1594,9 +1466,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa8_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_1(6, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -1613,9 +1484,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
private int jjMoveStringLiteralDfa9_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
+ if (((active0 &= old0)) == 0L)
return jjStartNfa_1(7, old0);
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -1624,9 +1494,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
switch (curChar) {
case 102:
- if ((active0 & 0x100000000000L) != 0L) {
+ if ((active0 & 0x100000000000L) != 0L)
return jjStartNfaWithStates_1(9, 44, 30);
- }
break;
default:
break;
@@ -1652,25 +1521,22 @@ public class ELParserTokenManager implements ELParserConstants {
jjstateSet[0] = startState;
int kind = 0x7fffffff;
for (;;) {
- if (++jjround == 0x7fffffff) {
+ if (++jjround == 0x7fffffff)
ReInitRounds();
- }
if (curChar < 64) {
long l = 1L << curChar;
do {
switch (jjstateSet[--i]) {
case 0:
if ((0x3ff000000000000L & l) != 0L) {
- if (kind > 10) {
+ if (kind > 10)
kind = 10;
- }
{
jjCheckNAddStates(18, 22);
}
} else if ((0x1800000000L & l) != 0L) {
- if (kind > 56) {
+ if (kind > 56)
kind = 56;
- }
{
jjCheckNAddTwoStates(28, 29);
}
@@ -1684,29 +1550,25 @@ public class ELParserTokenManager implements ELParserConstants {
break;
case 30:
if ((0x3ff001000000000L & l) != 0L) {
- if (kind > 57) {
+ if (kind > 57)
kind = 57;
- }
{
jjCheckNAdd(29);
}
}
if ((0x3ff001000000000L & l) != 0L) {
- if (kind > 56) {
+ if (kind > 56)
kind = 56;
- }
{
jjCheckNAdd(28);
}
}
break;
case 1:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAddTwoStates(1, 2);
}
break;
@@ -1716,12 +1578,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 4:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAdd(4);
}
break;
@@ -1741,9 +1601,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 9:
- if (curChar == 34 && kind > 13) {
+ if (curChar == 34 && kind > 13)
kind = 13;
- }
break;
case 10:
if (curChar == 39) {
@@ -1761,27 +1620,22 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 14:
- if (curChar == 39 && kind > 13) {
+ if (curChar == 39 && kind > 13)
kind = 13;
- }
break;
case 15:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 10) {
- kind = 10;
- } {
+ if (kind > 10)
+ kind = 10; {
jjCheckNAddStates(18, 22);
}
break;
case 16:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 10) {
- kind = 10;
- } {
+ if (kind > 10)
+ kind = 10; {
jjCheckNAdd(16);
}
break;
@@ -1791,22 +1645,18 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 18:
- if (curChar != 46) {
+ if (curChar != 46)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAddTwoStates(19, 20);
}
break;
case 19:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAddTwoStates(19, 20);
}
break;
@@ -1816,12 +1666,10 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 22:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAdd(22);
}
break;
@@ -1836,42 +1684,34 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 26:
- if ((0x3ff000000000000L & l) == 0L) {
+ if ((0x3ff000000000000L & l) == 0L)
break;
- }
- if (kind > 11) {
- kind = 11;
- } {
+ if (kind > 11)
+ kind = 11; {
jjCheckNAdd(26);
}
break;
case 27:
- if ((0x1800000000L & l) == 0L) {
+ if ((0x1800000000L & l) == 0L)
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAddTwoStates(28, 29);
}
break;
case 28:
- if ((0x3ff001000000000L & l) == 0L) {
+ if ((0x3ff001000000000L & l) == 0L)
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAdd(28);
}
break;
case 29:
- if ((0x3ff001000000000L & l) == 0L) {
+ if ((0x3ff001000000000L & l) == 0L)
break;
- }
- if (kind > 57) {
- kind = 57;
- } {
+ if (kind > 57)
+ kind = 57; {
jjCheckNAdd(29);
}
break;
@@ -1884,28 +1724,24 @@ public class ELParserTokenManager implements ELParserConstants {
do {
switch (jjstateSet[--i]) {
case 0:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x7fffffe87fffffeL & l) == 0L)
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAddTwoStates(28, 29);
}
break;
case 30:
if ((0x7fffffe87fffffeL & l) != 0L) {
- if (kind > 57) {
+ if (kind > 57)
kind = 57;
- }
{
jjCheckNAdd(29);
}
}
if ((0x7fffffe87fffffeL & l) != 0L) {
- if (kind > 56) {
+ if (kind > 56)
kind = 56;
- }
{
jjCheckNAdd(28);
}
@@ -1922,9 +1758,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 7:
- if (curChar == 92) {
+ if (curChar == 92)
jjstateSet[jjnewStateCnt++] = 8;
- }
break;
case 8:
if (curChar == 92) {
@@ -1937,9 +1772,8 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 12:
- if (curChar == 92) {
+ if (curChar == 92)
jjstateSet[jjnewStateCnt++] = 13;
- }
break;
case 13:
if (curChar == 92) {
@@ -1957,22 +1791,18 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 28:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x7fffffe87fffffeL & l) == 0L)
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAdd(28);
}
break;
case 29:
- if ((0x7fffffe87fffffeL & l) == 0L) {
+ if ((0x7fffffe87fffffeL & l) == 0L)
break;
- }
- if (kind > 57) {
- kind = 57;
- } {
+ if (kind > 57)
+ kind = 57; {
jjCheckNAdd(29);
}
break;
@@ -1989,28 +1819,24 @@ public class ELParserTokenManager implements ELParserConstants {
do {
switch (jjstateSet[--i]) {
case 0:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAddTwoStates(28, 29);
}
break;
case 30:
if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {
- if (kind > 56) {
+ if (kind > 56)
kind = 56;
- }
{
jjCheckNAdd(28);
}
}
if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {
- if (kind > 57) {
+ if (kind > 57)
kind = 57;
- }
{
jjCheckNAdd(29);
}
@@ -2027,31 +1853,26 @@ public class ELParserTokenManager implements ELParserConstants {
}
break;
case 28:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- }
- if (kind > 56) {
- kind = 56;
- } {
+ if (kind > 56)
+ kind = 56; {
jjCheckNAdd(28);
}
break;
case 29:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
break;
- }
- if (kind > 57) {
- kind = 57;
- } {
+ if (kind > 57)
+ kind = 57; {
jjCheckNAdd(29);
}
break;
default:
- if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) {
+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0)
break;
- } else {
+ else
break;
- }
}
} while (i != startsAt);
}
@@ -2061,9 +1882,8 @@ public class ELParserTokenManager implements ELParserConstants {
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 30 - (jjnewStateCnt = startsAt))) {
+ if ((i = jjnewStateCnt) == (startsAt = 30 - (jjnewStateCnt = startsAt)))
return curPos;
- }
try {
curChar = input_stream.readChar();
} catch (java.io.IOException e) {
@@ -2112,9 +1932,8 @@ public class ELParserTokenManager implements ELParserConstants {
case 0:
return ((jjbitVec2[i2] & l2) != 0L);
default:
- if ((jjbitVec0[i1] & l1) != 0L) {
+ if ((jjbitVec0[i1] & l1) != 0L)
return true;
- }
return false;
}
}
@@ -2132,9 +1951,8 @@ public class ELParserTokenManager implements ELParserConstants {
case 61:
return ((jjbitVec8[i2] & l2) != 0L);
default:
- if ((jjbitVec3[i1] & l1) != 0L) {
+ if ((jjbitVec3[i1] & l1) != 0L)
return true;
- }
return false;
}
}
@@ -2173,9 +1991,8 @@ public class ELParserTokenManager implements ELParserConstants {
case 1:
try {
input_stream.backup(0);
- while (curChar <= 32 && (0x100002600L & (1L << curChar)) != 0L) {
+ while (curChar <= 32 && (0x100002600L & (1L << curChar)) != 0L)
curChar = input_stream.BeginToken();
- }
} catch (java.io.IOException e1) {
continue EOFLoop;
}
@@ -2189,9 +2006,8 @@ public class ELParserTokenManager implements ELParserConstants {
case 2:
try {
input_stream.backup(0);
- while (curChar <= 32 && (0x100002600L & (1L << curChar)) != 0L) {
+ while (curChar <= 32 && (0x100002600L & (1L << curChar)) != 0L)
curChar = input_stream.BeginToken();
- }
} catch (java.io.IOException e1) {
continue EOFLoop;
}
@@ -2204,20 +2020,17 @@ public class ELParserTokenManager implements ELParserConstants {
break;
}
if (jjmatchedKind != 0x7fffffff) {
- if (jjmatchedPos + 1 < curPos) {
+ if (jjmatchedPos + 1 < curPos)
input_stream.backup(curPos - jjmatchedPos - 1);
- }
if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {
matchedToken = jjFillToken();
TokenLexicalActions(matchedToken);
- if (jjnewLexState[jjmatchedKind] != -1) {
+ if (jjnewLexState[jjmatchedKind] != -1)
curLexState = jjnewLexState[jjmatchedKind];
- }
return matchedToken;
} else {
- if (jjnewLexState[jjmatchedKind] != -1) {
+ if (jjnewLexState[jjmatchedKind] != -1)
curLexState = jjnewLexState[jjmatchedKind];
- }
continue EOFLoop;
}
}
@@ -2234,9 +2047,8 @@ public class ELParserTokenManager implements ELParserConstants {
if (curChar == '\n' || curChar == '\r') {
error_line++;
error_column = 0;
- } else {
+ } else
error_column++;
- }
}
if (!EOFSeen) {
input_stream.backup(1);
@@ -2316,9 +2128,8 @@ public class ELParserTokenManager implements ELParserConstants {
/** Constructor. */
public ELParserTokenManager(SimpleCharStream stream) {
- if (SimpleCharStream.staticFlag) {
+ if (SimpleCharStream.staticFlag)
throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
- }
input_stream = stream;
}
@@ -2343,9 +2154,8 @@ public class ELParserTokenManager implements ELParserConstants {
private void ReInitRounds() {
int i;
jjround = 0x80000001;
- for (i = 30; i-- > 0;) {
+ for (i = 30; i-- > 0;)
jjrounds[i] = 0x80000000;
- }
}
/** Reinitialise parser. */
@@ -2358,12 +2168,11 @@ public class ELParserTokenManager implements ELParserConstants {
/** Switch to specified lex state. */
public void SwitchTo(int lexState) {
- if (lexState >= 3 || lexState < 0) {
+ if (lexState >= 3 || lexState < 0)
throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.",
TokenMgrError.INVALID_LEXICAL_STATE);
- } else {
+ else
curLexState = lexState;
- }
}
diff --git a/java/org/apache/el/parser/ELParserTreeConstants.java b/java/org/apache/el/parser/ELParserTreeConstants.java
index 240eaf2c90..f126b97391 100644
--- a/java/org/apache/el/parser/ELParserTreeConstants.java
+++ b/java/org/apache/el/parser/ELParserTreeConstants.java
@@ -27,31 +27,32 @@ public interface ELParserTreeConstants {
int JJTDIV = 22;
int JJTMOD = 23;
int JJTNEGATIVE = 24;
- int JJTNOT = 25;
- int JJTEMPTY = 26;
- int JJTVALUE = 27;
- int JJTDOTSUFFIX = 28;
- int JJTBRACKETSUFFIX = 29;
- int JJTMETHODPARAMETERS = 30;
- int JJTSETDATA = 31;
- int JJTLISTDATA = 32;
- int JJTMAPDATA = 33;
- int JJTMAPENTRY = 34;
- int JJTIDENTIFIER = 35;
- int JJTFUNCTION = 36;
- int JJTTRUE = 37;
- int JJTFALSE = 38;
- int JJTFLOATINGPOINT = 39;
- int JJTINTEGER = 40;
- int JJTSTRING = 41;
- int JJTNULL = 42;
+ int JJTNOTEMPTY = 25;
+ int JJTNOT = 26;
+ int JJTEMPTY = 27;
+ int JJTVALUE = 28;
+ int JJTDOTSUFFIX = 29;
+ int JJTBRACKETSUFFIX = 30;
+ int JJTMETHODPARAMETERS = 31;
+ int JJTSETDATA = 32;
+ int JJTLISTDATA = 33;
+ int JJTMAPDATA = 34;
+ int JJTMAPENTRY = 35;
+ int JJTIDENTIFIER = 36;
+ int JJTFUNCTION = 37;
+ int JJTTRUE = 38;
+ int JJTFALSE = 39;
+ int JJTFLOATINGPOINT = 40;
+ int JJTINTEGER = 41;
+ int JJTSTRING = 42;
+ int JJTNULL = 43;
String[] jjtNodeName = { "CompositeExpression", "LiteralExpression", "DeferredExpression", "DynamicExpression",
"void", "Semicolon", "Assign", "LambdaExpression", "LambdaParameters", "Choice", "Or", "And", "Equal",
"NotEqual", "LessThan", "GreaterThan", "LessThanEqual", "GreaterThanEqual", "Concatenation", "Plus",
- "Minus", "Mult", "Div", "Mod", "Negative", "Not", "Empty", "Value", "DotSuffix", "BracketSuffix",
- "MethodParameters", "SetData", "ListData", "MapData", "MapEntry", "Identifier", "Function", "True", "False",
- "FloatingPoint", "Integer", "String", "Null", };
+ "Minus", "Mult", "Div", "Mod", "Negative", "NotEmpty", "Not", "Empty", "Value", "DotSuffix",
+ "BracketSuffix", "MethodParameters", "SetData", "ListData", "MapData", "MapEntry", "Identifier", "Function",
+ "True", "False", "FloatingPoint", "Integer", "String", "Null", };
}
-/* JavaCC - OriginalChecksum=40650ef76eedbdb11f7d9a6683a802ca (do not edit this line) */
+/* JavaCC - OriginalChecksum=58426e2a94f76068fe7c0861a913f9a5 (do not edit this line) */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org