Menu
▾
▴
[jboss-cvs] jboss-aop/src/main/org/jboss/aop/pointcut/ast TypeExpressionParser.java TypeExpressionParserConstants.java TypeExpressionParserTokenManager.java typeExpression.jjt
|
From: Bill B. <pat...@us...> - 2004-05-05 19:03:43
|
User: patriot1burke
Date: 04/05/05 12:03:36
Modified: src/main/org/jboss/aop/pointcut/ast
TypeExpressionParser.java
TypeExpressionParserConstants.java
TypeExpressionParserTokenManager.java
typeExpression.jjt
Log:
added annotation introductions
Revision Changes Path
1.2 +293 -197 jboss-aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParser.java
Index: TypeExpressionParser.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeExpressionParser.java 3 May 2004 23:05:20 -0000 1.1
+++ TypeExpressionParser.java 5 May 2004 19:03:35 -0000 1.2
@@ -46,7 +46,10 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case HAS:
case HAS_FIELD:
+ case FIELD:
case CLASS_EXPR:
+ case METHOD_EXPR:
+ case CONSTRUCTOR_EXPR:
Concrete();
break;
case NOT:
@@ -101,9 +104,9 @@
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);
try {
- jj_consume_token(66);
+ jj_consume_token(69);
SubExpression();
- jj_consume_token(67);
+ jj_consume_token(70);
} catch (Throwable jjte000) {
if (jjtc000) {
jjtree.clearNodeScope(jjtn000);
@@ -306,8 +309,14 @@
if (jj_2_15(4)) {
Class();
} else if (jj_2_16(4)) {
- Has();
+ MethodWrapper();
} else if (jj_2_17(4)) {
+ FieldWrapper();
+ } else if (jj_2_18(4)) {
+ ConstructorWrapper();
+ } else if (jj_2_19(4)) {
+ Has();
+ } else if (jj_2_20(4)) {
HasField();
} else {
jj_consume_token(-1);
@@ -322,9 +331,9 @@
jjtree.openNodeScope(jjtn000);
try {
jj_consume_token(HAS);
- if (jj_2_18(4)) {
+ if (jj_2_21(4)) {
Method();
- } else if (jj_2_19(4)) {
+ } else if (jj_2_22(4)) {
Constructor();
} else {
jj_consume_token(-1);
@@ -382,6 +391,24 @@
}
}
+ final public void FieldWrapper() throws ParseException {
+ jj_consume_token(FIELD);
+ Field();
+ jj_consume_token(FIELD_CLOSE);
+ }
+
+ final public void MethodWrapper() throws ParseException {
+ jj_consume_token(METHOD_EXPR);
+ Method();
+ jj_consume_token(BEHAVIOR_CLOSE);
+ }
+
+ final public void ConstructorWrapper() throws ParseException {
+ jj_consume_token(CONSTRUCTOR_EXPR);
+ Constructor();
+ jj_consume_token(BEHAVIOR_CLOSE);
+ }
+
final public void Method() throws ParseException {
/*@bgen(jjtree) Method */
ASTMethod jjtn000 = new ASTMethod(JJTMETHOD);
@@ -1088,18 +1115,29 @@
finally { jj_save(18, xla); }
}
- final private boolean jj_3_3() {
- if (jj_3R_8()) return true;
- return false;
+ final private boolean jj_2_20(int xla) {
+ jj_la = xla; jj_lastpos = jj_scanpos = token;
+ try { return !jj_3_20(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(19, xla); }
}
- final private boolean jj_3_12() {
- if (jj_3R_9()) return true;
- return false;
+ final private boolean jj_2_21(int xla) {
+ jj_la = xla; jj_lastpos = jj_scanpos = token;
+ try { return !jj_3_21(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(20, xla); }
+ }
+
+ final private boolean jj_2_22(int xla) {
+ jj_la = xla; jj_lastpos = jj_scanpos = token;
+ try { return !jj_3_22(); }
+ catch(LookaheadSuccess ls) { return true; }
+ finally { jj_save(21, xla); }
}
final private boolean jj_3R_9() {
- if (jj_3R_16()) return true;
+ if (jj_3R_19()) return true;
return false;
}
@@ -1108,7 +1146,7 @@
return false;
}
- final private boolean jj_3R_48() {
+ final private boolean jj_3R_51() {
if (jj_scan_token(OR)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -1122,7 +1160,12 @@
return false;
}
- final private boolean jj_3R_47() {
+ final private boolean jj_3R_45() {
+ if (jj_scan_token(FIELD_PROTECTED)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_50() {
if (jj_scan_token(AND)) return true;
Token xsp;
xsp = jj_scanpos;
@@ -1141,6 +1184,11 @@
return false;
}
+ final private boolean jj_3R_40() {
+ if (jj_scan_token(PRIVATE)) return true;
+ return false;
+ }
+
final private boolean jj_3_6() {
if (jj_3R_10()) return true;
return false;
@@ -1156,10 +1204,10 @@
if (jj_3_8()) return true;
}
}
- if (jj_3R_24()) return true;
+ if (jj_3R_27()) return true;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_24()) { jj_scanpos = xsp; break; }
+ if (jj_3R_27()) { jj_scanpos = xsp; break; }
}
return false;
}
@@ -1175,20 +1223,20 @@
return false;
}
- final private boolean jj_3R_42() {
- if (jj_scan_token(FIELD_PROTECTED)) return true;
+ final private boolean jj_3R_36() {
+ if (jj_scan_token(NATIVE)) return true;
return false;
}
- final private boolean jj_3R_8() {
- if (jj_scan_token(66)) return true;
- if (jj_3R_7()) return true;
- if (jj_scan_token(67)) return true;
+ final private boolean jj_3R_48() {
+ if (jj_scan_token(FIELD_FINAL)) return true;
return false;
}
- final private boolean jj_3R_37() {
- if (jj_scan_token(PRIVATE)) return true;
+ final private boolean jj_3R_8() {
+ if (jj_scan_token(69)) return true;
+ if (jj_3R_7()) return true;
+ if (jj_scan_token(70)) return true;
return false;
}
@@ -1207,23 +1255,18 @@
return false;
}
- final private boolean jj_3_1() {
- if (jj_3R_6()) return true;
- return false;
- }
-
- final private boolean jj_3R_33() {
- if (jj_scan_token(NATIVE)) return true;
+ final private boolean jj_3R_32() {
+ if (jj_scan_token(PRIVATE)) return true;
return false;
}
- final private boolean jj_3R_45() {
- if (jj_scan_token(FIELD_FINAL)) return true;
+ final private boolean jj_3_1() {
+ if (jj_3R_6()) return true;
return false;
}
- final private boolean jj_3R_29() {
- if (jj_scan_token(PRIVATE)) return true;
+ final private boolean jj_3_20() {
+ if (jj_3R_16()) return true;
return false;
}
@@ -1231,13 +1274,13 @@
if (jj_scan_token(CLASS_EXPR)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(56)) {
- jj_scanpos = xsp;
if (jj_scan_token(59)) {
jj_scanpos = xsp;
- if (jj_scan_token(58)) {
+ if (jj_scan_token(62)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(61)) {
jj_scanpos = xsp;
- if (jj_scan_token(55)) return true;
+ if (jj_scan_token(58)) return true;
}
}
}
@@ -1245,32 +1288,37 @@
return false;
}
- final private boolean jj_3R_41() {
+ final private boolean jj_3R_44() {
if (jj_scan_token(FIELD_PUBLIC)) return true;
return false;
}
- final private boolean jj_3R_40() {
+ final private boolean jj_3R_43() {
if (jj_scan_token(FIELD_NOT)) return true;
return false;
}
- final private boolean jj_3R_25() {
+ final private boolean jj_3_19() {
+ if (jj_3R_15()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_28() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_40()) jj_scanpos = xsp;
+ if (jj_3R_43()) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_41()) {
+ if (jj_3R_44()) {
jj_scanpos = xsp;
- if (jj_3R_42()) {
+ if (jj_3R_45()) {
jj_scanpos = xsp;
- if (jj_3R_43()) {
+ if (jj_3R_46()) {
jj_scanpos = xsp;
- if (jj_3R_44()) {
+ if (jj_3R_47()) {
jj_scanpos = xsp;
- if (jj_3R_45()) {
+ if (jj_3R_48()) {
jj_scanpos = xsp;
- if (jj_3R_46()) return true;
+ if (jj_3R_49()) return true;
}
}
}
@@ -1279,178 +1327,183 @@
return false;
}
- final private boolean jj_3R_54() {
+ final private boolean jj_3R_57() {
if (jj_scan_token(COMMA)) return true;
- if (jj_3R_53()) return true;
+ if (jj_3R_56()) return true;
return false;
}
- final private boolean jj_3R_36() {
+ final private boolean jj_3R_39() {
if (jj_scan_token(PROTECTED)) return true;
return false;
}
- final private boolean jj_3R_32() {
+ final private boolean jj_3R_35() {
if (jj_scan_token(FINAL)) return true;
return false;
}
- final private boolean jj_3R_44() {
+ final private boolean jj_3R_47() {
if (jj_scan_token(FIELD_STATIC)) return true;
return false;
}
- final private boolean jj_3R_52() {
- if (jj_3R_53()) return true;
+ final private boolean jj_3R_55() {
+ if (jj_3R_56()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_54()) { jj_scanpos = xsp; break; }
+ if (jj_3R_57()) { jj_scanpos = xsp; break; }
}
return false;
}
- final private boolean jj_3R_50() {
+ final private boolean jj_3R_53() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_52()) jj_scanpos = xsp;
+ if (jj_3R_55()) jj_scanpos = xsp;
return false;
}
- final private boolean jj_3R_21() {
- if (jj_3R_25()) return true;
+ final private boolean jj_3R_24() {
+ if (jj_3R_28()) return true;
return false;
}
- final private boolean jj_3R_17() {
+ final private boolean jj_3R_20() {
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_21()) { jj_scanpos = xsp; break; }
+ if (jj_3R_24()) { jj_scanpos = xsp; break; }
}
xsp = jj_scanpos;
- if (jj_scan_token(56)) {
- jj_scanpos = xsp;
if (jj_scan_token(59)) {
jj_scanpos = xsp;
- if (jj_scan_token(58)) {
+ if (jj_scan_token(62)) {
jj_scanpos = xsp;
- if (jj_scan_token(57)) return true;
+ if (jj_scan_token(61)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(60)) return true;
}
}
}
xsp = jj_scanpos;
- if (jj_scan_token(56)) {
- jj_scanpos = xsp;
if (jj_scan_token(59)) {
jj_scanpos = xsp;
- if (jj_scan_token(58)) {
+ if (jj_scan_token(62)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(61)) {
jj_scanpos = xsp;
- if (jj_scan_token(55)) return true;
+ if (jj_scan_token(58)) return true;
}
}
}
if (jj_scan_token(FIELD_SEPARATOR)) return true;
xsp = jj_scanpos;
- if (jj_scan_token(59)) {
+ if (jj_scan_token(62)) {
jj_scanpos = xsp;
- if (jj_scan_token(58)) return true;
+ if (jj_scan_token(61)) return true;
}
return false;
}
- final private boolean jj_3R_39() {
- if (jj_3R_48()) return true;
- return false;
- }
-
- final private boolean jj_3R_28() {
+ final private boolean jj_3R_31() {
if (jj_scan_token(PROTECTED)) return true;
return false;
}
- final private boolean jj_3R_51() {
+ final private boolean jj_3R_54() {
if (jj_scan_token(ALL_PARAMS)) return true;
return false;
}
- final private boolean jj_3R_49() {
- if (jj_3R_51()) return true;
+ final private boolean jj_3R_52() {
+ if (jj_3R_54()) return true;
return false;
}
- final private boolean jj_3R_24() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_38()) {
- jj_scanpos = xsp;
- if (jj_3R_39()) return true;
- }
+ final private boolean jj_3_18() {
+ if (jj_3R_14()) return true;
return false;
}
- final private boolean jj_3R_38() {
- if (jj_3R_47()) return true;
+ final private boolean jj_3R_42() {
+ if (jj_3R_51()) return true;
return false;
}
- final private boolean jj_3R_53() {
+ final private boolean jj_3R_56() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(12)) {
- jj_scanpos = xsp;
if (jj_scan_token(15)) {
jj_scanpos = xsp;
- if (jj_scan_token(13)) {
+ if (jj_scan_token(18)) {
jj_scanpos = xsp;
- if (jj_scan_token(14)) return true;
+ if (jj_scan_token(16)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(17)) return true;
}
}
}
return false;
}
- final private boolean jj_3_14() {
- if (jj_3R_10()) return true;
- return false;
- }
-
- final private boolean jj_3_11() {
- if (jj_3R_10()) return true;
+ final private boolean jj_3R_23() {
+ if (jj_scan_token(PARAMS_OPEN)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_52()) {
+ jj_scanpos = xsp;
+ if (jj_3R_53()) return true;
+ }
+ if (jj_scan_token(PARAMS_CLOSE)) return true;
return false;
}
- final private boolean jj_3R_20() {
- if (jj_scan_token(PARAMS_OPEN)) return true;
+ final private boolean jj_3R_27() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_49()) {
+ if (jj_3R_41()) {
jj_scanpos = xsp;
- if (jj_3R_50()) return true;
+ if (jj_3R_42()) return true;
}
- if (jj_scan_token(PARAMS_CLOSE)) return true;
return false;
}
- final private boolean jj_3R_23() {
+ final private boolean jj_3R_41() {
+ if (jj_3R_50()) return true;
+ return false;
+ }
+
+ final private boolean jj_3_14() {
+ if (jj_3R_10()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_26() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_35()) {
+ if (jj_3R_38()) {
jj_scanpos = xsp;
- if (jj_3R_36()) {
+ if (jj_3R_39()) {
jj_scanpos = xsp;
- if (jj_3R_37()) return true;
+ if (jj_3R_40()) return true;
}
}
return false;
}
- final private boolean jj_3R_35() {
+ final private boolean jj_3R_38() {
if (jj_scan_token(PUBLIC)) return true;
return false;
}
- final private boolean jj_3R_31() {
+ final private boolean jj_3_11() {
+ if (jj_3R_10()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_34() {
if (jj_scan_token(ABSTRACT)) return true;
return false;
}
@@ -1460,79 +1513,58 @@
return false;
}
- final private boolean jj_3R_19() {
- if (jj_3R_23()) return true;
+ final private boolean jj_3R_22() {
+ if (jj_3R_26()) return true;
return false;
}
- final private boolean jj_3R_15() {
+ final private boolean jj_3R_18() {
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_19()) { jj_scanpos = xsp; break; }
+ if (jj_3R_22()) { jj_scanpos = xsp; break; }
}
xsp = jj_scanpos;
- if (jj_scan_token(33)) {
- jj_scanpos = xsp;
if (jj_scan_token(36)) {
jj_scanpos = xsp;
- if (jj_scan_token(35)) {
+ if (jj_scan_token(39)) {
jj_scanpos = xsp;
- if (jj_scan_token(32)) return true;
+ if (jj_scan_token(38)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(35)) return true;
}
}
}
if (jj_scan_token(SEPARATOR)) return true;
xsp = jj_scanpos;
- if (jj_scan_token(31)) {
+ if (jj_scan_token(34)) {
jj_scanpos = xsp;
- if (jj_scan_token(35)) return true;
+ if (jj_scan_token(38)) return true;
}
- if (jj_3R_20()) return true;
- return false;
- }
-
- final private boolean jj_3_8() {
- if (jj_3R_8()) return true;
- return false;
- }
-
- final private boolean jj_3_19() {
- if (jj_3R_15()) return true;
+ if (jj_3R_23()) return true;
return false;
}
- final private boolean jj_3R_43() {
+ final private boolean jj_3R_46() {
if (jj_scan_token(FIELD_PRIVATE)) return true;
return false;
}
- final private boolean jj_3_13() {
- if (jj_3R_8()) return true;
- return false;
- }
-
- final private boolean jj_3R_27() {
+ final private boolean jj_3R_30() {
if (jj_scan_token(PUBLIC)) return true;
return false;
}
- final private boolean jj_3R_26() {
+ final private boolean jj_3R_29() {
if (jj_scan_token(BEHAVIOR_NOT)) return true;
return false;
}
- final private boolean jj_3R_22() {
+ final private boolean jj_3R_25() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_26()) jj_scanpos = xsp;
+ if (jj_3R_29()) jj_scanpos = xsp;
xsp = jj_scanpos;
- if (jj_3R_27()) {
- jj_scanpos = xsp;
- if (jj_3R_28()) {
- jj_scanpos = xsp;
- if (jj_3R_29()) {
- jj_scanpos = xsp;
if (jj_3R_30()) {
jj_scanpos = xsp;
if (jj_3R_31()) {
@@ -1541,7 +1573,13 @@
jj_scanpos = xsp;
if (jj_3R_33()) {
jj_scanpos = xsp;
- if (jj_3R_34()) return true;
+ if (jj_3R_34()) {
+ jj_scanpos = xsp;
+ if (jj_3R_35()) {
+ jj_scanpos = xsp;
+ if (jj_3R_36()) {
+ jj_scanpos = xsp;
+ if (jj_3R_37()) return true;
}
}
}
@@ -1552,93 +1590,134 @@
return false;
}
- final private boolean jj_3_10() {
+ final private boolean jj_3_8() {
if (jj_3R_8()) return true;
return false;
}
- final private boolean jj_3_16() {
- if (jj_3R_12()) return true;
- return false;
- }
-
- final private boolean jj_3R_18() {
- if (jj_3R_22()) return true;
+ final private boolean jj_3_22() {
+ if (jj_3R_18()) return true;
return false;
}
- final private boolean jj_3_5() {
- if (jj_3R_8()) return true;
+ final private boolean jj_3R_21() {
+ if (jj_3R_25()) return true;
return false;
}
- final private boolean jj_3R_14() {
+ final private boolean jj_3R_17() {
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_18()) { jj_scanpos = xsp; break; }
+ if (jj_3R_21()) { jj_scanpos = xsp; break; }
}
xsp = jj_scanpos;
- if (jj_scan_token(33)) {
- jj_scanpos = xsp;
if (jj_scan_token(36)) {
jj_scanpos = xsp;
- if (jj_scan_token(35)) {
+ if (jj_scan_token(39)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(38)) {
jj_scanpos = xsp;
- if (jj_scan_token(34)) return true;
+ if (jj_scan_token(37)) return true;
}
}
}
xsp = jj_scanpos;
- if (jj_scan_token(33)) {
- jj_scanpos = xsp;
if (jj_scan_token(36)) {
jj_scanpos = xsp;
- if (jj_scan_token(35)) {
+ if (jj_scan_token(39)) {
jj_scanpos = xsp;
- if (jj_scan_token(32)) return true;
+ if (jj_scan_token(38)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(35)) return true;
}
}
}
if (jj_scan_token(SEPARATOR)) return true;
xsp = jj_scanpos;
- if (jj_scan_token(36)) {
+ if (jj_scan_token(39)) {
jj_scanpos = xsp;
- if (jj_scan_token(35)) return true;
+ if (jj_scan_token(38)) return true;
}
- if (jj_3R_20()) return true;
+ if (jj_3R_23()) return true;
return false;
}
- final private boolean jj_3_18() {
- if (jj_3R_14()) return true;
+ final private boolean jj_3_13() {
+ if (jj_3R_8()) return true;
return false;
}
- final private boolean jj_3R_46() {
+ final private boolean jj_3_10() {
+ if (jj_3R_8()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_49() {
if (jj_scan_token(FIELD_TRANSIENT)) return true;
return false;
}
- final private boolean jj_3R_13() {
- if (jj_scan_token(HAS_FIELD)) return true;
- if (jj_3R_17()) return true;
- if (jj_scan_token(FIELD_CLOSE)) return true;
+ final private boolean jj_3R_14() {
+ if (jj_scan_token(CONSTRUCTOR_EXPR)) return true;
+ if (jj_3R_18()) return true;
+ if (jj_scan_token(BEHAVIOR_CLOSE)) return true;
return false;
}
- final private boolean jj_3R_34() {
+ final private boolean jj_3_16() {
+ if (jj_3R_12()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_37() {
if (jj_scan_token(SYNCHRONIZED)) return true;
return false;
}
final private boolean jj_3R_12() {
+ if (jj_scan_token(METHOD_EXPR)) return true;
+ if (jj_3R_17()) return true;
+ if (jj_scan_token(BEHAVIOR_CLOSE)) return true;
+ return false;
+ }
+
+ final private boolean jj_3_5() {
+ if (jj_3R_8()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_13() {
+ if (jj_scan_token(FIELD)) return true;
+ if (jj_3R_20()) return true;
+ if (jj_scan_token(FIELD_CLOSE)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_33() {
+ if (jj_scan_token(STATIC)) return true;
+ return false;
+ }
+
+ final private boolean jj_3_21() {
+ if (jj_3R_17()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_16() {
+ if (jj_scan_token(HAS_FIELD)) return true;
+ if (jj_3R_20()) return true;
+ if (jj_scan_token(FIELD_CLOSE)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_15() {
if (jj_scan_token(HAS)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3_18()) {
+ if (jj_3_21()) {
jj_scanpos = xsp;
- if (jj_3_19()) return true;
+ if (jj_3_22()) return true;
}
if (jj_scan_token(BEHAVIOR_CLOSE)) return true;
return false;
@@ -1654,21 +1733,35 @@
return false;
}
- final private boolean jj_3R_16() {
+ final private boolean jj_3R_19() {
Token xsp;
xsp = jj_scanpos;
if (jj_3_15()) {
jj_scanpos = xsp;
if (jj_3_16()) {
jj_scanpos = xsp;
- if (jj_3_17()) return true;
+ if (jj_3_17()) {
+ jj_scanpos = xsp;
+ if (jj_3_18()) {
+ jj_scanpos = xsp;
+ if (jj_3_19()) {
+ jj_scanpos = xsp;
+ if (jj_3_20()) return true;
+ }
+ }
+ }
}
}
return false;
}
- final private boolean jj_3R_30() {
- if (jj_scan_token(STATIC)) return true;
+ final private boolean jj_3_3() {
+ if (jj_3R_8()) return true;
+ return false;
+ }
+
+ final private boolean jj_3_12() {
+ if (jj_3R_9()) return true;
return false;
}
@@ -1691,15 +1784,15 @@
jj_la1_2();
}
private static void jj_la1_0() {
- jj_la1_0 = new int[] {0x1e0,0x18,0x18,0x7f800000,0x0,0x0,0x0,0x0,0x7f800000,0xe000000,0x0,0x80000000,0xe000000,0x10000,0xf000,0x800,0xf000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_0 = new int[] {0xfe0,0x18,0x18,0xfc000000,0x0,0x0,0x0,0x0,0xfc000000,0x70000000,0x0,0x0,0x70000000,0x80000,0x78000,0x4000,0x78000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0x200,0x1e,0x1b,0x18,0x200,0x0,0x0,0x1b,0x8,0x0,0x0,0x0,0x0,0x0,0x1f8000,0xf000000,0xd800000,0xc000000,0x0,0x1f8000,0xd800000,};
+ jj_la1_1 = new int[] {0x0,0x0,0x0,0x1003,0xf0,0xd8,0xc0,0x1000,0x3,0x0,0xd8,0x44,0x0,0x0,0x0,0x0,0x0,0xfc0000,0x78000000,0x6c000000,0x60000000,0x0,0xfc0000,0x6c000000,};
}
private static void jj_la1_2() {
- jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,};
+ jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x0,0x0,};
}
- final private JJCalls[] jj_2_rtns = new JJCalls[19];
+ final private JJCalls[] jj_2_rtns = new JJCalls[22];
private boolean jj_rescan = false;
private int jj_gc = 0;
@@ -1871,8 +1964,8 @@
public ParseException generateParseException() {
jj_expentries.removeAllElements();
- boolean[] la1tokens = new boolean[68];
- for (int i = 0; i < 68; i++) {
+ boolean[] la1tokens = new boolean[71];
+ for (int i = 0; i < 71; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
@@ -1894,7 +1987,7 @@
}
}
}
- for (int i = 0; i < 68; i++) {
+ for (int i = 0; i < 71; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
@@ -1919,7 +2012,7 @@
final private void jj_rescan_token() {
jj_rescan = true;
- for (int i = 0; i < 19; i++) {
+ for (int i = 0; i < 22; i++) {
JJCalls p = jj_2_rtns[i];
do {
if (p.gen > jj_gen) {
@@ -1944,6 +2037,9 @@
case 16: jj_3_17(); break;
case 17: jj_3_18(); break;
case 18: jj_3_19(); break;
+ case 19: jj_3_20(); break;
+ case 20: jj_3_21(); break;
+ case 21: jj_3_22(); break;
}
}
p = p.next;
1.2 +59 -53 jboss-aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParserConstants.java
Index: TypeExpressionParserConstants.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParserConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeExpressionParserConstants.java 3 May 2004 23:05:20 -0000 1.1
+++ TypeExpressionParserConstants.java 5 May 2004 19:03:35 -0000 1.2
@@ -8,59 +8,62 @@
int OR = 4;
int HAS = 5;
int HAS_FIELD = 6;
- int CLASS_EXPR = 7;
- int NOT = 8;
- int ALL_PARAMS = 11;
- int PARAM_CLASS = 12;
- int PARAM_ARRAY_CLASS = 13;
- int PARAM_ANNOTATION = 14;
- int PARAM_IDENTIFIER = 15;
- int COMMA = 16;
- int PARAM_WILD_LETTER = 17;
- int PARAM_DOT = 18;
- int PARAM_ARRAY = 19;
- int PARAMS_CLOSE = 20;
- int ABSTRACT = 23;
- int FINAL = 24;
- int PRIVATE = 25;
- int PROTECTED = 26;
- int PUBLIC = 27;
- int STATIC = 28;
- int NATIVE = 29;
- int SYNCHRONIZED = 30;
- int NEW = 31;
- int INSTANCEOF = 32;
- int CLASS = 33;
- int ARRAY_CLASS = 34;
- int ANNOTATION = 35;
- int IDENTIFIER = 36;
- int WILD_LETTER = 37;
- int DOT = 38;
- int ARRAY = 39;
- int SEPARATOR = 40;
- int BEHAVIOR_NOT = 41;
- int PARAMS_OPEN = 42;
- int BEHAVIOR_CLOSE = 43;
- int FIELD_ABSTRACT = 46;
- int FIELD_FINAL = 47;
- int FIELD_PRIVATE = 48;
- int FIELD_PROTECTED = 49;
- int FIELD_PUBLIC = 50;
- int FIELD_STATIC = 51;
- int FIELD_TRANSIENT = 52;
- int FIELD_NATIVE = 53;
- int FIELD_SYNCHRONIZED = 54;
- int FIELD_INSTANCEOF = 55;
- int FIELD_CLASS = 56;
- int FIELD_ARRAY_CLASS = 57;
- int FIELD_ANNOTATION = 58;
- int FIELD_IDENTIFIER = 59;
- int FIELD_WILD_LETTER = 60;
- int FIELD_DOT = 61;
- int FIELD_ARRAY = 62;
- int FIELD_SEPARATOR = 63;
- int FIELD_NOT = 64;
- int FIELD_CLOSE = 65;
+ int FIELD = 7;
+ int CLASS_EXPR = 8;
+ int METHOD_EXPR = 9;
+ int CONSTRUCTOR_EXPR = 10;
+ int NOT = 11;
+ int ALL_PARAMS = 14;
+ int PARAM_CLASS = 15;
+ int PARAM_ARRAY_CLASS = 16;
+ int PARAM_ANNOTATION = 17;
+ int PARAM_IDENTIFIER = 18;
+ int COMMA = 19;
+ int PARAM_WILD_LETTER = 20;
+ int PARAM_DOT = 21;
+ int PARAM_ARRAY = 22;
+ int PARAMS_CLOSE = 23;
+ int ABSTRACT = 26;
+ int FINAL = 27;
+ int PRIVATE = 28;
+ int PROTECTED = 29;
+ int PUBLIC = 30;
+ int STATIC = 31;
+ int NATIVE = 32;
+ int SYNCHRONIZED = 33;
+ int NEW = 34;
+ int INSTANCEOF = 35;
+ int CLASS = 36;
+ int ARRAY_CLASS = 37;
+ int ANNOTATION = 38;
+ int IDENTIFIER = 39;
+ int WILD_LETTER = 40;
+ int DOT = 41;
+ int ARRAY = 42;
+ int SEPARATOR = 43;
+ int BEHAVIOR_NOT = 44;
+ int PARAMS_OPEN = 45;
+ int BEHAVIOR_CLOSE = 46;
+ int FIELD_ABSTRACT = 49;
+ int FIELD_FINAL = 50;
+ int FIELD_PRIVATE = 51;
+ int FIELD_PROTECTED = 52;
+ int FIELD_PUBLIC = 53;
+ int FIELD_STATIC = 54;
+ int FIELD_TRANSIENT = 55;
+ int FIELD_NATIVE = 56;
+ int FIELD_SYNCHRONIZED = 57;
+ int FIELD_INSTANCEOF = 58;
+ int FIELD_CLASS = 59;
+ int FIELD_ARRAY_CLASS = 60;
+ int FIELD_ANNOTATION = 61;
+ int FIELD_IDENTIFIER = 62;
+ int FIELD_WILD_LETTER = 63;
+ int FIELD_DOT = 64;
+ int FIELD_ARRAY = 65;
+ int FIELD_SEPARATOR = 66;
+ int FIELD_NOT = 67;
+ int FIELD_CLOSE = 68;
int DEFAULT = 0;
int PARAMS = 1;
@@ -75,7 +78,10 @@
"<OR>",
"\"has(\"",
"\"hasfield(\"",
+ "\"field(\"",
"\"class(\"",
+ "\"method(\"",
+ "\"constructor(\"",
"\"!\"",
"\" \"",
"\"\\t\"",
1.2 +420 -320 jboss-aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParserTokenManager.java
Index: TypeExpressionParserTokenManager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParserTokenManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeExpressionParserTokenManager.java 3 May 2004 23:05:20 -0000 1.1
+++ TypeExpressionParserTokenManager.java 5 May 2004 19:03:35 -0000 1.2
@@ -37,15 +37,19 @@
switch(curChar)
{
case 33:
- return jjStopAtPos(0, 8);
+ return jjStopAtPos(0, 11);
case 40:
- return jjStopAtPos(0, 66);
+ return jjStopAtPos(0, 69);
case 41:
- return jjStopAtPos(0, 67);
+ return jjStopAtPos(0, 70);
case 99:
+ return jjMoveStringLiteralDfa1_0(0x500L);
+ case 102:
return jjMoveStringLiteralDfa1_0(0x80L);
case 104:
return jjMoveStringLiteralDfa1_0(0x60L);
+ case 109:
+ return jjMoveStringLiteralDfa1_0(0x200L);
default :
return jjMoveNfa_0(0, 0);
}
@@ -61,8 +65,14 @@
{
case 97:
return jjMoveStringLiteralDfa2_0(active0, 0x60L);
- case 108:
+ case 101:
+ return jjMoveStringLiteralDfa2_0(active0, 0x200L);
+ case 105:
return jjMoveStringLiteralDfa2_0(active0, 0x80L);
+ case 108:
+ return jjMoveStringLiteralDfa2_0(active0, 0x100L);
+ case 111:
+ return jjMoveStringLiteralDfa2_0(active0, 0x400L);
default :
break;
}
@@ -80,9 +90,15 @@
switch(curChar)
{
case 97:
+ return jjMoveStringLiteralDfa3_0(active0, 0x100L);
+ case 101:
return jjMoveStringLiteralDfa3_0(active0, 0x80L);
+ case 110:
+ return jjMoveStringLiteralDfa3_0(active0, 0x400L);
case 115:
return jjMoveStringLiteralDfa3_0(active0, 0x60L);
+ case 116:
+ return jjMoveStringLiteralDfa3_0(active0, 0x200L);
default :
break;
}
@@ -105,8 +121,12 @@
break;
case 102:
return jjMoveStringLiteralDfa4_0(active0, 0x40L);
- case 115:
+ case 104:
+ return jjMoveStringLiteralDfa4_0(active0, 0x200L);
+ case 108:
return jjMoveStringLiteralDfa4_0(active0, 0x80L);
+ case 115:
+ return jjMoveStringLiteralDfa4_0(active0, 0x500L);
default :
break;
}
@@ -123,10 +143,16 @@
}
switch(curChar)
{
+ case 100:
+ return jjMoveStringLiteralDfa5_0(active0, 0x80L);
case 105:
return jjMoveStringLiteralDfa5_0(active0, 0x40L);
+ case 111:
+ return jjMoveStringLiteralDfa5_0(active0, 0x200L);
case 115:
- return jjMoveStringLiteralDfa5_0(active0, 0x80L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x100L);
+ case 116:
+ return jjMoveStringLiteralDfa5_0(active0, 0x400L);
default :
break;
}
@@ -146,9 +172,15 @@
case 40:
if ((active0 & 0x80L) != 0L)
return jjStopAtPos(5, 7);
+ else if ((active0 & 0x100L) != 0L)
+ return jjStopAtPos(5, 8);
break;
+ case 100:
+ return jjMoveStringLiteralDfa6_0(active0, 0x200L);
case 101:
return jjMoveStringLiteralDfa6_0(active0, 0x40L);
+ case 114:
+ return jjMoveStringLiteralDfa6_0(active0, 0x400L);
default :
break;
}
@@ -165,8 +197,14 @@
}
switch(curChar)
{
+ case 40:
+ if ((active0 & 0x200L) != 0L)
+ return jjStopAtPos(6, 9);
+ break;
case 108:
return jjMoveStringLiteralDfa7_0(active0, 0x40L);
+ case 117:
+ return jjMoveStringLiteralDfa7_0(active0, 0x400L);
default :
break;
}
@@ -183,6 +221,8 @@
}
switch(curChar)
{
+ case 99:
+ return jjMoveStringLiteralDfa8_0(active0, 0x400L);
case 100:
return jjMoveStringLiteralDfa8_0(active0, 0x40L);
default :
@@ -205,11 +245,69 @@
if ((active0 & 0x40L) != 0L)
return jjStopAtPos(8, 6);
break;
+ case 116:
+ return jjMoveStringLiteralDfa9_0(active0, 0x400L);
default :
break;
}
return jjStartNfa_0(7, active0, 0L);
}
+private final int jjMoveStringLiteralDfa9_0(long old0, long active0)
+{
+ if (((active0 &= old0)) == 0L)
+ return jjStartNfa_0(7, old0, 0L);
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) {
+ jjStopStringLiteralDfa_0(8, active0, 0L);
+ return 9;
+ }
+ switch(curChar)
+ {
+ case 111:
+ return jjMoveStringLiteralDfa10_0(active0, 0x400L);
+ default :
+ break;
+ }
+ return jjStartNfa_0(8, active0, 0L);
+}
+private final int jjMoveStringLiteralDfa10_0(long old0, long active0)
+{
+ if (((active0 &= old0)) == 0L)
+ return jjStartNfa_0(8, old0, 0L);
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) {
+ jjStopStringLiteralDfa_0(9, active0, 0L);
+ return 10;
+ }
+ switch(curChar)
+ {
+ case 114:
+ return jjMoveStringLiteralDfa11_0(active0, 0x400L);
+ default :
+ break;
+ }
+ return jjStartNfa_0(9, active0, 0L);
+}
+private final int jjMoveStringLiteralDfa11_0(long old0, long active0)
+{
+ if (((active0 &= old0)) == 0L)
+ return jjStartNfa_0(9, old0, 0L);
+ try { curChar = input_stream.readChar(); }
+ catch(java.io.IOException e) {
+ jjStopStringLiteralDfa_0(10, active0, 0L);
+ return 11;
+ }
+ switch(curChar)
+ {
+ case 40:
+ if ((active0 & 0x400L) != 0L)
+ return jjStopAtPos(11, 10);
+ break;
+ default :
+ break;
+ }
+ return jjStartNfa_0(10, active0, 0L);
+}
private final void jjCheckNAdd(int state)
{
if (jjrounds[state] != jjround)
@@ -326,100 +424,100 @@
switch (pos)
{
case 0:
- if ((active0 & 0xff800000L) != 0L)
+ if ((active0 & 0x7fc000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
return 34;
}
return -1;
case 1:
- if ((active0 & 0xff800000L) != 0L)
+ if ((active0 & 0x7fc000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 1;
return 34;
}
return -1;
case 2:
- if ((active0 & 0x7f800000L) != 0L)
+ if ((active0 & 0x3fc000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 2;
return 34;
}
- if ((active0 & 0x80000000L) != 0L)
+ if ((active0 & 0x400000000L) != 0L)
return 34;
return -1;
case 3:
- if ((active0 & 0x7f800000L) != 0L)
+ if ((active0 & 0x3fc000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 3;
return 34;
}
return -1;
case 4:
- if ((active0 & 0x7e800000L) != 0L)
+ if ((active0 & 0x3f4000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 4;
return 34;
}
- if ((active0 & 0x1000000L) != 0L)
+ if ((active0 & 0x8000000L) != 0L)
return 34;
return -1;
case 5:
- if ((active0 & 0x46800000L) != 0L)
+ if ((active0 & 0x1c0000000L) != 0L)
+ return 34;
+ if ((active0 & 0x234000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 5;
return 34;
}
- if ((active0 & 0x38000000L) != 0L)
- return 34;
return -1;
case 6:
- if ((active0 & 0x44800000L) != 0L)
+ if ((active0 & 0x224000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 6;
return 34;
}
- if ((active0 & 0x2000000L) != 0L)
+ if ((active0 & 0x10000000L) != 0L)
return 34;
return -1;
case 7:
- if ((active0 & 0x44000000L) != 0L)
+ if ((active0 & 0x4000000L) != 0L)
+ return 34;
+ if ((active0 & 0x220000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 7;
return 34;
}
- if ((active0 & 0x800000L) != 0L)
- return 34;
return -1;
case 8:
- if ((active0 & 0x40000000L) != 0L)
+ if ((active0 & 0x200000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 8;
return 34;
}
- if ((active0 & 0x4000000L) != 0L)
+ if ((active0 & 0x20000000L) != 0L)
return 34;
return -1;
case 9:
- if ((active0 & 0x40000000L) != 0L)
+ if ((active0 & 0x200000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 9;
return 34;
}
return -1;
case 10:
- if ((active0 & 0x40000000L) != 0L)
+ if ((active0 & 0x200000000L) != 0L)
{
- jjmatchedKind = 36;
+ jjmatchedKind = 39;
jjmatchedPos = 10;
return 34;
}
@@ -445,23 +543,23 @@
switch(curChar)
{
case 33:
- return jjStopAtPos(0, 41);
+ return jjStopAtPos(0, 44);
case 40:
- return jjStopAtPos(0, 42);
+ return jjStopAtPos(0, 45);
case 41:
- return jjStopAtPos(0, 43);
+ return jjStopAtPos(0, 46);
case 45:
- return jjMoveStringLiteralDfa1_2(0x10000000000L);
+ return jjMoveStringLiteralDfa1_2(0x80000000000L);
case 97:
- return jjMoveStringLiteralDfa1_2(0x800000L);
+ return jjMoveStringLiteralDfa1_2(0x4000000L);
case 102:
- return jjMoveStringLiteralDfa1_2(0x1000000L);
+ return jjMoveStringLiteralDfa1_2(0x8000000L);
case 110:
- return jjMoveStringLiteralDfa1_2(0xa0000000L);
+ return jjMoveStringLiteralDfa1_2(0x500000000L);
case 112:
- return jjMoveStringLiteralDfa1_2(0xe000000L);
+ return jjMoveStringLiteralDfa1_2(0x70000000L);
case 115:
- return jjMoveStringLiteralDfa1_2(0x50000000L);
+ return jjMoveStringLiteralDfa1_2(0x280000000L);
default :
return jjMoveNfa_2(19, 0);
}
@@ -476,25 +574,25 @@
switch(curChar)
{
case 62:
- if ((active0 & 0x10000000000L) != 0L)
- return jjStopAtPos(1, 40);
+ if ((active0 & 0x80000000000L) != 0L)
+ return jjStopAtPos(1, 43);
break;
case 97:
- return jjMoveStringLiteralDfa2_2(active0, 0x20000000L);
+ return jjMoveStringLiteralDfa2_2(active0, 0x100000000L);
case 98:
- return jjMoveStringLiteralDfa2_2(active0, 0x800000L);
+ return jjMoveStringLiteralDfa2_2(active0, 0x4000000L);
case 101:
- return jjMoveStringLiteralDfa2_2(active0, 0x80000000L);
+ return jjMoveStringLiteralDfa2_2(active0, 0x400000000L);
case 105:
- return jjMoveStringLiteralDfa2_2(active0, 0x1000000L);
+ return jjMoveStringLiteralDfa2_2(active0, 0x8000000L);
case 114:
- return jjMoveStringLiteralDfa2_2(active0, 0x6000000L);
+ return jjMoveStringLiteralDfa2_2(active0, 0x30000000L);
case 116:
- return jjMoveStringLiteralDfa2_2(active0, 0x10000000L);
+ return jjMoveStringLiteralDfa2_2(active0, 0x80000000L);
case 117:
- return jjMoveStringLiteralDfa2_2(active0, 0x8000000L);
- case 121:
return jjMoveStringLiteralDfa2_2(active0, 0x40000000L);
+ case 121:
+ return jjMoveStringLiteralDfa2_2(active0, 0x200000000L);
default :
break;
}
@@ -512,22 +610,22 @@
switch(curChar)
{
case 97:
- return jjMoveStringLiteralDfa3_2(active0, 0x10000000L);
+ return jjMoveStringLiteralDfa3_2(active0, 0x80000000L);
case 98:
- return jjMoveStringLiteralDfa3_2(active0, 0x8000000L);
+ return jjMoveStringLiteralDfa3_2(active0, 0x40000000L);
case 105:
- return jjMoveStringLiteralDfa3_2(active0, 0x2000000L);
+ return jjMoveStringLiteralDfa3_2(active0, 0x10000000L);
case 110:
- return jjMoveStringLiteralDfa3_2(active0, 0x41000000L);
+ return jjMoveStringLiteralDfa3_2(active0, 0x208000000L);
case 111:
- return jjMoveStringLiteralDfa3_2(active0, 0x4000000L);
+ return jjMoveStringLiteralDfa3_2(active0, 0x20000000L);
case 115:
- return jjMoveStringLiteralDfa3_2(active0, 0x800000L);
+ return jjMoveStringLiteralDfa3_2(active0, 0x4000000L);
case 116:
- return jjMoveStringLiteralDfa3_2(active0, 0x20000000L);
+ return jjMoveStringLiteralDfa3_2(active0, 0x100000000L);
case 119:
- if ((active0 & 0x80000000L) != 0L)
- return jjStartNfaWithStates_2(2, 31, 34);
+ if ((active0 & 0x400000000L) != 0L)
+ return jjStartNfaWithStates_2(2, 34, 34);
break;
default :
break;
@@ -546,17 +644,17 @@
switch(curChar)
{
case 97:
- return jjMoveStringLiteralDfa4_2(active0, 0x1000000L);
+ return jjMoveStringLiteralDfa4_2(active0, 0x8000000L);
case 99:
- return jjMoveStringLiteralDfa4_2(active0, 0x40000000L);
+ return jjMoveStringLiteralDfa4_2(active0, 0x200000000L);
case 105:
- return jjMoveStringLiteralDfa4_2(active0, 0x20000000L);
+ return jjMoveStringLiteralDfa4_2(active0, 0x100000000L);
case 108:
- return jjMoveStringLiteralDfa4_2(active0, 0x8000000L);
+ return jjMoveStringLiteralDfa4_2(active0, 0x40000000L);
case 116:
- return jjMoveStringLiteralDfa4_2(active0, 0x14800000L);
+ return jjMoveStringLiteralDfa4_2(active0, 0xa4000000L);
case 118:
- return jjMoveStringLiteralDfa4_2(active0, 0x2000000L);
+ return jjMoveStringLiteralDfa4_2(active0, 0x10000000L);
default :
break;
}
@@ -574,21 +672,21 @@
switch(curChar)
{
case 97:
- return jjMoveStringLiteralDfa5_2(active0, 0x2000000L);
+ return jjMoveStringLiteralDfa5_2(active0, 0x10000000L);
case 101:
- return jjMoveStringLiteralDfa5_2(active0, 0x4000000L);
+ return jjMoveStringLiteralDfa5_2(active0, 0x20000000L);
case 104:
- return jjMoveStringLiteralDfa5_2(active0, 0x40000000L);
+ return jjMoveStringLiteralDfa5_2(active0, 0x200000000L);
case 105:
- return jjMoveStringLiteralDfa5_2(active0, 0x18000000L);
+ return jjMoveStringLiteralDfa5_2(active0, 0xc0000000L);
case 108:
- if ((active0 & 0x1000000L) != 0L)
- return jjStartNfaWithStates_2(4, 24, 34);
+ if ((active0 & 0x8000000L) != 0L)
+ return jjStartNfaWithStates_2(4, 27, 34);
break;
case 114:
- return jjMoveStringLiteralDfa5_2(active0, 0x800000L);
+ return jjMoveStringLiteralDfa5_2(active0, 0x4000000L);
case 118:
- return jjMoveStringLiteralDfa5_2(active0, 0x20000000L);
+ return jjMoveStringLiteralDfa5_2(active0, 0x100000000L);
default :
break;
}
@@ -606,21 +704,21 @@
switch(curChar)
{
case 97:
- return jjMoveStringLiteralDfa6_2(active0, 0x800000L);
- case 99:
- if ((active0 & 0x8000000L) != 0L)
- return jjStartNfaWithStates_2(5, 27, 34);
- else if ((active0 & 0x10000000L) != 0L)
- return jjStartNfaWithStates_2(5, 28, 34);
return jjMoveStringLiteralDfa6_2(active0, 0x4000000L);
+ case 99:
+ if ((active0 & 0x40000000L) != 0L)
+ return jjStartNfaWithStates_2(5, 30, 34);
+ else if ((active0 & 0x80000000L) != 0L)
+ return jjStartNfaWithStates_2(5, 31, 34);
+ return jjMoveStringLiteralDfa6_2(active0, 0x20000000L);
case 101:
- if ((active0 & 0x20000000L) != 0L)
- return jjStartNfaWithStates_2(5, 29, 34);
+ if ((active0 & 0x100000000L) != 0L)
+ return jjStartNfaWithStates_2(5, 32, 34);
break;
case 114:
- return jjMoveStringLiteralDfa6_2(active0, 0x40000000L);
+ return jjMoveStringLiteralDfa6_2(active0, 0x200000000L);
case 116:
- return jjMoveStringLiteralDfa6_2(active0, 0x2000000L);
+ return jjMoveStringLiteralDfa6_2(active0, 0x10000000L);
default :
break;
}
@@ -638,15 +736,15 @@
switch(curChar)
{
case 99:
- return jjMoveStringLiteralDfa7_2(active0, 0x800000L);
+ return jjMoveStringLiteralDfa7_2(active0, 0x4000000L);
case 101:
- if ((active0 & 0x2000000L) != 0L)
- return jjStartNfaWithStates_2(6, 25, 34);
+ if ((active0 & 0x10000000L) != 0L)
+ return jjStartNfaWithStates_2(6, 28, 34);
break;
case 111:
- return jjMoveStringLiteralDfa7_2(active0, 0x40000000L);
+ return jjMoveStringLiteralDfa7_2(active0, 0x200000000L);
case 116:
- return jjMoveStringLiteralDfa7_2(active0, 0x4000000L);
+ return jjMoveStringLiteralDfa7_2(active0, 0x20000000L);
default :
break;
}
@@ -664,12 +762,12 @@
switch(curChar)
{
case 101:
- return jjMoveStringLiteralDfa8_2(active0, 0x4000000L);
+ return jjMoveStringLiteralDfa8_2(active0, 0x20000000L);
case 110:
- return jjMoveStringLiteralDfa8_2(active0, 0x40000000L);
+ return jjMoveStringLiteralDfa8_2(active0, 0x200000000L);
case 116:
- if ((active0 & 0x800000L) != 0L)
- return jjStartNfaWithStates_2(7, 23, 34);
+ if ((active0 & 0x4000000L) != 0L)
+ return jjStartNfaWithStates_2(7, 26, 34);
break;
default :
break;
@@ -688,11 +786,11 @@
switch(curChar)
{
case 100:
- if ((active0 & 0x4000000L) != 0L)
- return jjStartNfaWithStates_2(8, 26, 34);
+ if ((active0 & 0x20000000L) != 0L)
+ return jjStartNfaWithStates_2(8, 29, 34);
break;
case 105:
- return jjMoveStringLiteralDfa9_2(active0, 0x40000000L);
+ return jjMoveStringLiteralDfa9_2(active0, 0x200000000L);
default :
break;
}
@@ -710,7 +808,7 @@
switch(curChar)
{
case 122:
- return jjMoveStringLiteralDfa10_2(active0, 0x40000000L);
+ return jjMoveStringLiteralDfa10_2(active0, 0x200000000L);
default :
break;
}
@@ -728,7 +826,7 @@
switch(curChar)
{
case 101:
- return jjMoveStringLiteralDfa11_2(active0, 0x40000000L);
+ return jjMoveStringLiteralDfa11_2(active0, 0x200000000L);
default :
break;
}
@@ -746,8 +844,8 @@
switch(curChar)
{
case 100:
- if ((active0 & 0x40000000L) != 0L)
- return jjStartNfaWithStates_2(11, 30, 34);
+ if ((active0 & 0x200000000L) != 0L)
+ return jjStartNfaWithStates_2(11, 33, 34);
break;
default :
break;
@@ -776,8 +874,8 @@
case 34:
if ((0x3ff041000000000L & l) != 0L)
{
- if (kind > 36)
- kind = 36;
+ if (kind > 39)
+ kind = 39;
jjCheckNAdd(33);
}
else if (curChar == 46)
@@ -790,8 +888,8 @@
case 19:
if ((0x3ff041000000000L & l) != 0L)
{
- if (kind > 36)
- kind = 36;
+ if (kind > 39)
+ kind = 39;
jjCheckNAddStates(0, 4);
}
if (curChar == 36)
@@ -820,8 +918,8 @@
case 21:
if ((0x3ff041000000000L & l) == 0L)
break;
- if (kind > 35)
- kind = 35;
+ if (kind > 38)
+ kind = 38;
jjCheckNAddTwoStates(21, 22);
break;
case 22:
@@ -831,15 +929,15 @@
case 23:
if ((0x3ff041000000000L & l) == 0L)
break;
- if (kind > 35)
- kind = 35;
+ if (kind > 38)
+ kind = 38;
jjCheckNAddTwoStates(22, 23);
break;
case 24:
if ((0x3ff041000000000L & l) == 0L)
break;
- if (kind > 36)
- kind = 36;
+ if (kind > 39)
+ kind = 39;
jjCheckNAddStates(0, 4);
break;
case 25:
@@ -853,8 +951,8 @@
case 27:
if ((0x3ff041000000000L & l) == 0L)
break;
- if (kind > 33)
- kind = 33;
+ if (kind > 36)
+ kind = 36;
jjCheckNAddStates(13, 15);
break;
case 30:
@@ -864,8 +962,8 @@
case 33:
if ((0x3ff041000000000L & l) == 0L)
break;
- if (kind > 36)
- kind = 36;
+ if (kind > 39)
+ kind = 39;
jjCheckNAdd(33);
break;
default : break;
@@ -882,8 +980,8 @@
case 34:
if ((0x7fffffe87fffffeL & l) != 0L)
{
- if (kind > 36)
- kind = 36;
+ if (kind > 39)
+ kind = 39;
jjCheckNAdd(33);
}
else if (curChar == 91)
@@ -896,8 +994,8 @@
case 19:
if ((0x7fffffe87fffffeL & l) != 0L)
{
- if (kind > 36)
- kind = 36;
+ if (kind > 39)
+ kind = 39;
jjCheckNAddStates(0, 4);
}
else if (curChar == 64)
@@ -917,7 +1015,7 @@
break;
case 3:
if (curChar == 125)
- kind = 32;
+ kind = 35;
break;
case 4:
if ((0x7fffffe87fffffeL & l) != 0L)
@@ -982,22 +1080,22 @@
case 21:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 35)
- kind = 35;
+ if (kind > 38)
+ kind = 38;
jjCheckNAddTwoStates(21, 22);
break;
case 23:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 35)
- kind = 35;
+ if (kind > 38)
+ kind = 38;
jjCheckNAddTwoStates(22, 23);
break;
case 24:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 36)
- kind = 36;
+ if (kind > 39)
+ kind = 39;
jjCheckNAddStates(0, 4);
break;
case 25:
@@ -1007,15 +1105,15 @@
case 27:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 33)
- kind = 33;
+ if (kind > 36)
+ kind = 36;
jjCheckNAddStates(13, 15);
break;
case 28:
if (curChar != 93)
break;
- if (kind > 33)
- kind = 33;
+ if (kind > 36)
+ kind = 36;
jjCheckNAdd(29);
break;
case 29:
@@ -1029,8 +1127,8 @@
case 31:
if (curChar != 93)
break;
- if (kind > 34)
- kind = 34;
+ if (kind > 37)
+ kind = 37;
jjCheckNAdd(32);
break;
case 32:
@@ -1040,8 +1138,8 @@
case 33:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 36)
- kind = 36;
+ if (kind > 39)
+ kind = 39;
jjCheckNAdd(33);
break;
default : break;
@@ -1098,11 +1196,11 @@
switch(curChar)
{
case 41:
- return jjStopAtPos(0, 20);
+ return jjStopAtPos(0, 23);
case 44:
- return jjStopAtPos(0, 16);
+ return jjStopAtPos(0, 19);
case 46:
- return jjMoveStringLiteralDfa1_1(0x800L);
+ return jjMoveStringLiteralDfa1_1(0x4000L);
default :
return jjMoveNfa_1(0, 0);
}
@@ -1117,8 +1215,8 @@
switch(curChar)
{
case 46:
- if ((active0 & 0x800L) != 0L)
- return jjStopAtPos(1, 11);
+ if ((active0 & 0x4000L) != 0L)
+ return jjStopAtPos(1, 14);
break;
default :
break;
@@ -1147,15 +1245,15 @@
case 0:
if ((0x3ff040000000000L & l) == 0L)
break;
- if (kind > 15)
- kind = 15;
+ if (kind > 18)
+ kind = 18;
jjCheckNAddStates(16, 20);
break;
case 1:
if ((0x3ff040000000000L & l) == 0L)
break;
- if (kind > 14)
- kind = 14;
+ if (kind > 17)
+ kind = 17;
jjstateSet[jjnewStateCnt++] = 1;
break;
case 3:
@@ -1169,8 +1267,8 @@
case 5:
if ((0x3ff040000000000L & l) == 0L)
break;
- if (kind > 12)
- kind = 12;
+ if (kind > 15)
+ kind = 15;
jjCheckNAddStates(21, 23);
break;
case 8:
@@ -1180,8 +1278,8 @@
case 11:
if ((0x3ff040000000000L & l) == 0L)
break;
- if (kind > 15)
- kind = 15;
+ if (kind > 18)
+ kind = 18;
jjCheckNAdd(11);
break;
default : break;
@@ -1198,8 +1296,8 @@
case 0:
if ((0x7fffffe87fffffeL & l) != 0L)
{
- if (kind > 15)
- kind = 15;
+ if (kind > 18)
+ kind = 18;
jjCheckNAddStates(16, 20);
}
else if (curChar == 64)
@@ -1208,15 +1306,15 @@
case 1:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 14)
- kind = 14;
+ if (kind > 17)
+ kind = 17;
jjCheckNAdd(1);
break;
case 2:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 15)
- kind = 15;
+ if (kind > 18)
+ kind = 18;
jjCheckNAddStates(16, 20);
break;
case 3:
@@ -1226,15 +1324,15 @@
case 5:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 12)
- kind = 12;
+ if (kind > 15)
+ kind = 15;
jjCheckNAddStates(21, 23);
break;
case 6:
if (curChar != 93)
break;
- if (kind > 12)
...
[truncated message content] |