You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2002/04/27 21:33:30 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/parser Parser.java ParserTokenManager.java
geirm 02/04/27 12:33:30
Modified: src/java/org/apache/velocity/runtime/parser Parser.java
ParserTokenManager.java
Log:
Parser.jjt followers
Revision Changes Path
1.74 +91 -111 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Parser.java 27 Mar 2002 15:59:21 -0000 1.73
+++ Parser.java 27 Apr 2002 19:33:30 -0000 1.74
@@ -22,7 +22,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: Parser.java,v 1.73 2002/03/27 15:59:21 geirm Exp $
+ * @version $Id: Parser.java,v 1.74 2002/04/27 19:33:30 geirm Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants {/*@bgen(jjtree)*/
protected JJTParserState jjtree = new JJTParserState();/**
@@ -1571,12 +1571,6 @@
jjtree.openNodeScope(jjtn000);
try {
jj_consume_token(SET_DIRECTIVE);
- if (jj_2_10(2)) {
- jj_consume_token(WHITESPACE);
- } else {
- ;
- }
- jj_consume_token(LPAREN);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WHITESPACE:
jj_consume_token(WHITESPACE);
@@ -2174,7 +2168,7 @@
}
final public void UnaryExpression() throws ParseException {
- if (jj_2_11(2)) {
+ if (jj_2_10(2)) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WHITESPACE:
jj_consume_token(WHITESPACE);
@@ -2251,7 +2245,7 @@
break;
default:
jj_la1[52] = jj_gen;
- if (jj_2_12(2147483647)) {
+ if (jj_2_11(2147483647)) {
IntegerRange();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2363,25 +2357,6 @@
return retval;
}
- final private boolean jj_2_12(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
- boolean retval = !jj_3_12();
- jj_save(11, xla);
- return retval;
- }
-
- final private boolean jj_3R_53() {
- if (jj_scan_token(WORD)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_50() {
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
final private boolean jj_3R_54() {
if (jj_scan_token(STRING_LITERAL)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -2410,12 +2385,6 @@
return false;
}
- final private boolean jj_3_10() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
final private boolean jj_3R_38() {
if (jj_scan_token(WHITESPACE)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -2434,14 +2403,14 @@
return false;
}
- final private boolean jj_3R_37() {
- if (jj_3R_41()) return true;
+ final private boolean jj_3R_30() {
+ if (jj_3R_50()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_30() {
- if (jj_3R_50()) return true;
+ final private boolean jj_3R_37() {
+ if (jj_3R_41()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
@@ -2452,14 +2421,14 @@
return false;
}
- final private boolean jj_3R_36() {
- if (jj_3R_19()) return true;
+ final private boolean jj_3R_28() {
+ if (jj_3R_41()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_28() {
- if (jj_3R_41()) return true;
+ final private boolean jj_3R_36() {
+ if (jj_3R_19()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
@@ -2552,27 +2521,6 @@
return false;
}
- final private boolean jj_3_12() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_35()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- xsp = jj_scanpos;
- if (jj_3R_36()) {
- jj_scanpos = xsp;
- if (jj_3R_37()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- xsp = jj_scanpos;
- if (jj_3R_38()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(DOUBLEDOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
final private boolean jj_3R_40() {
if (jj_scan_token(LCURLY)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -2595,6 +2543,27 @@
return false;
}
+ final private boolean jj_3_11() {
+ if (jj_scan_token(LBRACKET)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_35()) jj_scanpos = xsp;
+ else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ xsp = jj_scanpos;
+ if (jj_3R_36()) {
+ jj_scanpos = xsp;
+ if (jj_3R_37()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ xsp = jj_scanpos;
+ if (jj_3R_38()) jj_scanpos = xsp;
+ else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DOUBLEDOT)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
final private boolean jj_3R_26() {
if (jj_scan_token(WHITESPACE)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -2613,20 +2582,31 @@
return false;
}
+ final private boolean jj_3_1() {
+ if (jj_3R_19()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
final private boolean jj_3R_81() {
if (jj_scan_token(LPAREN)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_80() {
- if (jj_3R_58()) return true;
+ final private boolean jj_3R_19() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_39()) {
+ jj_scanpos = xsp;
+ if (jj_3R_40()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3_1() {
- if (jj_3R_19()) return true;
+ final private boolean jj_3R_80() {
+ if (jj_3R_58()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
@@ -2643,17 +2623,6 @@
return false;
}
- final private boolean jj_3R_19() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_39()) {
- jj_scanpos = xsp;
- if (jj_3R_40()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
final private boolean jj_3R_78() {
if (jj_3R_56()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -2672,12 +2641,6 @@
return false;
}
- final private boolean jj_3R_75() {
- if (jj_3R_41()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
final private boolean jj_3R_21() {
if (jj_3R_19()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -2705,8 +2668,8 @@
return false;
}
- final private boolean jj_3R_74() {
- if (jj_3R_54()) return true;
+ final private boolean jj_3R_75() {
+ if (jj_3R_41()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
@@ -2725,6 +2688,12 @@
return false;
}
+ final private boolean jj_3R_74() {
+ if (jj_3R_54()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
final private boolean jj_3R_73() {
if (jj_scan_token(WHITESPACE)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -2781,10 +2750,28 @@
return false;
}
+ final private boolean jj_3R_83() {
+ if (jj_scan_token(WHITESPACE)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_70() {
+ if (jj_3R_58()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_69() {
+ if (jj_3R_57()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
final private boolean jj_3R_34() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3_11()) {
+ if (jj_3_10()) {
jj_scanpos = xsp;
if (jj_3R_52()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -2792,7 +2779,7 @@
return false;
}
- final private boolean jj_3_11() {
+ final private boolean jj_3_10() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_33()) jj_scanpos = xsp;
@@ -2810,24 +2797,6 @@
return false;
}
- final private boolean jj_3R_83() {
- if (jj_scan_token(WHITESPACE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_70() {
- if (jj_3R_58()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_69() {
- if (jj_3R_57()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
final private boolean jj_3R_68() {
if (jj_3R_56()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -3062,6 +3031,12 @@
return false;
}
+ final private boolean jj_3R_42() {
+ if (jj_3R_19()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
final private boolean jj_3R_25() {
Token xsp;
xsp = jj_scanpos;
@@ -3091,8 +3066,14 @@
return false;
}
- final private boolean jj_3R_42() {
- if (jj_3R_19()) return true;
+ final private boolean jj_3R_53() {
+ if (jj_scan_token(WORD)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_50() {
+ if (jj_scan_token(IDENTIFIER)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
@@ -3108,7 +3089,7 @@
final private int[] jj_la1 = new int[55];
final private int[] jj_la1_0 = {0x13f0360,0x0,0x13f0360,0x380000,0x1000000,0x6000002,0x800000,0x800000,0x800000,0x13f0360,0x8,0x7800002,0x800000,0x0,0x800000,0x800000,0x0,0x800000,0x800000,0x1000000,0x6000002,0x800000,0x8,0x7800002,0x0,0x0,0x0,0x1060060,0x800000,0x13f0360,0x0,0x0,0x0,0x13f0360,0x800000,0x13f0360,0x800000,0x800000,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x30000000,0x30000000,0xc0000000,0xc0000000,0x800000,0x7800022,0x800000,0x1000000,0x6000022,0x800000,};
final private int[] jj_la1_1 = {0xf129000,0x9000,0xe120000,0x0,0x5120000,0x0,0x0,0x0,0x0,0xf129000,0x0,0x5020000,0x0,0x5020000,0x0,0x0,0x5020000,0x0,0x0,0x0,0x5020000,0x0,0x0,0x5020000,0x1000000,0x1000000,0x5000000,0xe020000,0x0,0xf129000,0x2000,0x2000,0x4000,0xf129000,0x0,0xf129000,0x0,0x0,0x0,0x4,0x2,0x180,0x180,0x78,0x78,0x0,0x0,0x1,0x1,0x0,0x5020000,0x0,0x5020000,0x0,0x0,};
- final private JJCalls[] jj_2_rtns = new JJCalls[12];
+ final private JJCalls[] jj_2_rtns = new JJCalls[11];
private boolean jj_rescan = false;
private int jj_gc = 0;
@@ -3298,7 +3279,7 @@
final private void jj_rescan_token() {
jj_rescan = true;
- for (int i = 0; i < 12; i++) {
+ for (int i = 0; i < 11; i++) {
JJCalls p = jj_2_rtns[i];
do {
if (p.gen > jj_gen) {
@@ -3315,7 +3296,6 @@
case 8: jj_3_9(); break;
case 9: jj_3_10(); break;
case 10: jj_3_11(); break;
- case 11: jj_3_12(); break;
}
}
p = p.next;
1.52 +118 -93 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
Index: ParserTokenManager.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ParserTokenManager.java 25 Mar 2002 00:37:45 -0000 1.51
+++ ParserTokenManager.java 27 Apr 2002 19:33:30 -0000 1.52
@@ -1442,9 +1442,9 @@
{
case 0:
if ((active0 & 0x30000L) != 0L)
- return 7;
+ return 9;
if ((active0 & 0xd000L) != 0L)
- return 14;
+ return 16;
return -1;
default :
return -1;
@@ -1473,7 +1473,7 @@
jjmatchedKind = 17;
return jjMoveStringLiteralDfa1_3(0x10000L);
default :
- return jjMoveNfa_3(11, 0);
+ return jjMoveNfa_3(13, 0);
}
}
private final int jjMoveStringLiteralDfa1_3(long active0)
@@ -1491,11 +1491,11 @@
break;
case 42:
if ((active0 & 0x4000L) != 0L)
- return jjStartNfaWithStates_3(1, 14, 12);
+ return jjStartNfaWithStates_3(1, 14, 14);
break;
case 92:
if ((active0 & 0x10000L) != 0L)
- return jjStartNfaWithStates_3(1, 16, 23);
+ return jjStartNfaWithStates_3(1, 16, 25);
break;
default :
break;
@@ -1506,7 +1506,7 @@
{
int[] nextStates;
int startsAt = 0;
- jjnewStateCnt = 23;
+ jjnewStateCnt = 25;
int i = 1;
jjstateSet[0] = startState;
int j, kind = 0x7fffffff;
@@ -1521,100 +1521,108 @@
{
switch(jjstateSet[--i])
{
- case 23:
- if (curChar == 36)
- jjCheckNAddTwoStates(20, 21);
- if (curChar == 36)
+ case 16:
+ if (curChar == 42)
+ jjstateSet[jjnewStateCnt++] = 14;
+ break;
+ case 13:
+ if ((0xffffffe7ffffffffL & l) != 0L)
+ {
+ if (kind > 18)
+ kind = 18;
+ jjCheckNAdd(7);
+ }
+ else if (curChar == 36)
{
if (kind > 10)
kind = 10;
+ jjCheckNAddTwoStates(22, 23);
}
+ else if (curChar == 35)
+ jjCheckNAddTwoStates(5, 16);
+ if ((0x100000200L & l) != 0L)
+ jjCheckNAddTwoStates(0, 6);
break;
- case 7:
+ case 25:
if (curChar == 36)
- jjCheckNAddTwoStates(20, 21);
- else if (curChar == 35)
- jjstateSet[jjnewStateCnt++] = 9;
+ jjCheckNAddTwoStates(22, 23);
if (curChar == 36)
{
if (kind > 10)
kind = 10;
}
break;
- case 14:
- if (curChar == 42)
- jjstateSet[jjnewStateCnt++] = 12;
- break;
- case 11:
- if ((0xffffffe7ffffffffL & l) != 0L)
- {
- if (kind > 18)
- kind = 18;
- jjCheckNAdd(5);
- }
- else if (curChar == 36)
+ case 9:
+ if (curChar == 36)
+ jjCheckNAddTwoStates(22, 23);
+ else if (curChar == 35)
+ jjstateSet[jjnewStateCnt++] = 11;
+ if (curChar == 36)
{
if (kind > 10)
kind = 10;
- jjCheckNAddTwoStates(20, 21);
}
- else if (curChar == 35)
- jjCheckNAddTwoStates(3, 14);
- if ((0x100000200L & l) != 0L)
- jjCheckNAddTwoStates(0, 4);
break;
case 0:
if ((0x100000200L & l) != 0L)
- jjCheckNAddTwoStates(0, 4);
+ jjCheckNAddTwoStates(0, 6);
break;
- case 4:
+ case 2:
+ if (curChar == 32)
+ jjAddStates(48, 49);
+ break;
+ case 3:
+ if (curChar == 40 && kind > 9)
+ kind = 9;
+ break;
+ case 6:
if (curChar == 35)
- jjCheckNAdd(3);
+ jjCheckNAdd(5);
break;
- case 5:
+ case 7:
if ((0xffffffe7ffffffffL & l) == 0L)
break;
if (kind > 18)
kind = 18;
- jjCheckNAdd(5);
+ jjCheckNAdd(7);
break;
- case 8:
+ case 10:
if (curChar == 35)
- jjstateSet[jjnewStateCnt++] = 9;
+ jjstateSet[jjnewStateCnt++] = 11;
break;
- case 10:
+ case 12:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 8)
kind = 8;
- jjstateSet[jjnewStateCnt++] = 10;
+ jjstateSet[jjnewStateCnt++] = 12;
break;
- case 12:
+ case 14:
if (curChar == 42)
- jjstateSet[jjnewStateCnt++] = 13;
+ jjstateSet[jjnewStateCnt++] = 15;
break;
- case 13:
+ case 15:
if ((0xfffffff7ffffffffL & l) != 0L && kind > 13)
kind = 13;
break;
- case 17:
+ case 19:
if (curChar == 36 && kind > 10)
kind = 10;
break;
- case 19:
+ case 21:
if (curChar == 36)
- jjCheckNAddTwoStates(20, 21);
+ jjCheckNAddTwoStates(22, 23);
break;
- case 21:
+ case 23:
if (curChar == 33 && kind > 11)
kind = 11;
break;
- case 22:
+ case 24:
if (curChar != 36)
break;
if (kind > 10)
kind = 10;
- jjCheckNAddTwoStates(20, 21);
+ jjCheckNAddTwoStates(22, 23);
break;
default : break;
}
@@ -1627,84 +1635,84 @@
{
switch(jjstateSet[--i])
{
- case 23:
- if (curChar == 92)
- jjAddStates(48, 49);
- if (curChar == 92)
- jjCheckNAddTwoStates(18, 19);
- if (curChar == 92)
- jjCheckNAddTwoStates(16, 17);
- break;
- case 7:
- if (curChar == 92)
- jjCheckNAddTwoStates(18, 19);
- if (curChar == 92)
- jjCheckNAddTwoStates(16, 17);
- if (curChar == 92)
- jjstateSet[jjnewStateCnt++] = 6;
- break;
- case 14:
- case 3:
+ case 16:
+ case 5:
if (curChar == 115)
- jjstateSet[jjnewStateCnt++] = 2;
+ jjstateSet[jjnewStateCnt++] = 4;
break;
- case 11:
+ case 13:
if ((0xffffffffefffffffL & l) != 0L)
{
if (kind > 18)
kind = 18;
- jjCheckNAdd(5);
+ jjCheckNAdd(7);
}
else if (curChar == 92)
jjCheckNAddStates(50, 53);
if (curChar == 92)
- jjAddStates(48, 49);
+ jjAddStates(32, 33);
+ break;
+ case 25:
+ if (curChar == 92)
+ jjAddStates(32, 33);
+ if (curChar == 92)
+ jjCheckNAddTwoStates(20, 21);
+ if (curChar == 92)
+ jjCheckNAddTwoStates(18, 19);
+ break;
+ case 9:
+ if (curChar == 92)
+ jjCheckNAddTwoStates(20, 21);
+ if (curChar == 92)
+ jjCheckNAddTwoStates(18, 19);
+ if (curChar == 92)
+ jjstateSet[jjnewStateCnt++] = 8;
break;
case 1:
- if (curChar == 116 && kind > 9)
- kind = 9;
+ if (curChar == 116)
+ jjAddStates(48, 49);
break;
- case 2:
+ case 4:
if (curChar == 101)
jjstateSet[jjnewStateCnt++] = 1;
break;
- case 5:
+ case 7:
if ((0xffffffffefffffffL & l) == 0L)
break;
if (kind > 18)
kind = 18;
- jjCheckNAdd(5);
+ jjCheckNAdd(7);
break;
- case 6:
+ case 8:
if (curChar == 92)
- jjAddStates(48, 49);
+ jjAddStates(32, 33);
break;
- case 9:
- case 10:
+ case 11:
+ case 12:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 8)
kind = 8;
- jjCheckNAdd(10);
+ jjCheckNAdd(12);
break;
- case 13:
+ case 15:
if (kind > 13)
kind = 13;
break;
- case 15:
+ case 17:
if (curChar == 92)
jjCheckNAddStates(50, 53);
break;
- case 16:
- if (curChar == 92)
- jjCheckNAddTwoStates(16, 17);
- break;
case 18:
if (curChar == 92)
jjCheckNAddTwoStates(18, 19);
break;
case 20:
if (curChar == 92)
+ jjCheckNAddTwoStates(20, 21);
+ break;
+ case 22:
+ if (curChar == 92)
jjAddStates(54, 55);
break;
default : break;
@@ -1722,15 +1730,15 @@
{
switch(jjstateSet[--i])
{
- case 11:
- case 5:
+ case 13:
+ case 7:
if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
break;
if (kind > 18)
kind = 18;
- jjCheckNAdd(5);
+ jjCheckNAdd(7);
break;
- case 13:
+ case 15:
if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 13)
kind = 13;
break;
@@ -1745,7 +1753,7 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 23 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 25 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
@@ -3265,7 +3273,7 @@
22, 23, 26, 11, 12, 13, 1, 2, 4, 11, 16, 12, 13, 19, 20, 24,
25, 35, 36, 37, 38, 14, 15, 17, 19, 20, 39, 40, 5, 6, 7, 8,
9, 10, 24, 25, 27, 18, 19, 21, 9, 10, 11, 12, 22, 29, 13, 14,
- 7, 8, 16, 17, 18, 19, 20, 21, 8, 9, 10, 11, 12, 13, 17, 18,
+ 2, 3, 18, 19, 20, 21, 22, 23, 8, 9, 10, 11, 12, 13, 17, 18,
21, 6, 7, 8, 6, 11, 7, 8, 14, 15, 29, 30, 31, 32, 9, 10,
12, 14, 15, 33, 34,
};
@@ -3776,6 +3784,23 @@
stateStackPush();
inSet = true;
SwitchTo(DIRECTIVE);
+ }
+
+ /*
+ * need the LPAREN action
+ */
+
+ if (!inComment)
+ {
+ lparen++;
+
+ /*
+ * If in REFERENCE and we have seen the dot, then move
+ * to REFMOD2 -> Modifier()
+ */
+
+ if (curLexState == REFMODIFIER )
+ SwitchTo( REFMOD2 );
}
break;
case 19 :
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>