[prev in list] [next in list] [prev in thread] [next in thread]
List: velocity-dev
Subject: cvs commit: jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity Parser.ja
From: jvanzyl () locus ! apache ! org
Date: 2000-09-21 23:37:28
[Download RAW message or body]
jvanzyl 00/09/21 16:37:28
Modified: src/java/org/apache/velocity/processor/javacc/parser/velocity
Parser.java Parser.jj Parser.jjt
ParserConstants.java ParserTokenManager.java build
Log:
- added multiline comment support in the form.
#comment
this is a multiline
comment
#end
I am working on allowing code to be commented out aswell.
But I think I'm going stop supporting multiple syntaxes,
it's becoming a PITA. It will become a maintenance problem
because JavaCC is no good at subclassing grammars.
Revision Changes Path
1.4 +265 -181 \
jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/Parser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Parser.java 2000/09/19 19:49:56 1.3
+++ Parser.java 2000/09/21 23:37:25 1.4
@@ -16,7 +16,7 @@
* what controls the generation of this class.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Parser.java,v 1.3 2000/09/19 19:49:56 jvanzyl Exp $
+ * @version $Id: Parser.java,v 1.4 2000/09/21 23:37:25 jvanzyl Exp $
*/
public class Parser implements/*@bgen(jjtree)*/ \
ParserTreeConstants,org.apache.velocity.processor.javacc.parser.Parser, \
ParserConstants {/*@bgen(jjtree)*/ protected JJTParserState jjtree = new \
JJTParserState(); @@ -80,6 +80,7 @@
case EQUALS:
case INCLUDE_DIRECTIVE:
case PARSE_DIRECTIVE:
+ case COMMENT_DIRECTIVE:
case IF_DIRECTIVE:
case FOREACH_DIRECTIVE:
case SET_DIRECTIVE:
@@ -161,6 +162,9 @@
case STOP_DIRECTIVE:
StopStatement();
break;
+ case COMMENT_DIRECTIVE:
+ CommentBlock();
+ break;
case IDENTIFIER:
case DIDENTIFIER:
Reference();
@@ -454,6 +458,7 @@
case EQUALS:
case INCLUDE_DIRECTIVE:
case PARSE_DIRECTIVE:
+ case COMMENT_DIRECTIVE:
case IF_DIRECTIVE:
case FOREACH_DIRECTIVE:
case SET_DIRECTIVE:
@@ -556,6 +561,7 @@
case EQUALS:
case INCLUDE_DIRECTIVE:
case PARSE_DIRECTIVE:
+ case COMMENT_DIRECTIVE:
case IF_DIRECTIVE:
case FOREACH_DIRECTIVE:
case SET_DIRECTIVE:
@@ -633,6 +639,7 @@
case EQUALS:
case INCLUDE_DIRECTIVE:
case PARSE_DIRECTIVE:
+ case COMMENT_DIRECTIVE:
case IF_DIRECTIVE:
case FOREACH_DIRECTIVE:
case SET_DIRECTIVE:
@@ -710,6 +717,7 @@
case EQUALS:
case INCLUDE_DIRECTIVE:
case PARSE_DIRECTIVE:
+ case COMMENT_DIRECTIVE:
case IF_DIRECTIVE:
case FOREACH_DIRECTIVE:
case SET_DIRECTIVE:
@@ -1511,6 +1519,82 @@
}
}
+ final public void CommentBlock() throws ParseException {
+ /*@bgen(jjtree) CommentBlock */
+ ASTCommentBlock jjtn000 = new ASTCommentBlock(this, JJTCOMMENTBLOCK);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);
+ try {
+ jj_consume_token(COMMENT_DIRECTIVE);
+ ASTBlock jjtn001 = new ASTBlock(this, JJTBLOCK);
+ boolean jjtc001 = true;
+ jjtree.openNodeScope(jjtn001);
+ try {
+ label_15:
+ while (true) {
+ Statement();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case EQUALS:
+ case INCLUDE_DIRECTIVE:
+ case PARSE_DIRECTIVE:
+ case COMMENT_DIRECTIVE:
+ case IF_DIRECTIVE:
+ case FOREACH_DIRECTIVE:
+ case SET_DIRECTIVE:
+ case STOP_DIRECTIVE:
+ case NUMBER_LITERAL:
+ case IDENTIFIER:
+ case DIDENTIFIER:
+ case DOT:
+ case TEXT:
+ ;
+ break;
+ default:
+ jj_la1[29] = jj_gen;
+ break label_15;
+ }
+ }
+ } catch (Throwable jjte001) {
+ if (jjtc001) {
+ jjtree.clearNodeScope(jjtn001);
+ jjtc001 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte001 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte001;}
+ }
+ if (jjte001 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte001;}
+ }
+ {if (true) throw (Error)jjte001;}
+ } finally {
+ if (jjtc001) {
+ jjtree.closeNodeScope(jjtn001, true);
+ }
+ }
+ jj_consume_token(END);
+ } catch (Throwable jjte000) {
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
+ } finally {
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
+ }
+ }
+
final private boolean jj_2_1(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_1();
@@ -1532,99 +1616,160 @@
return retval;
}
- final private boolean jj_3R_19() {
- if (jj_3R_24()) return true;
+ final private boolean jj_3R_58() {
+ if (jj_scan_token(LOGICAL_GE)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_49()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_49() {
+ if (jj_3R_53()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_45()) { jj_scanpos = xsp; break; }
+ if (jj_3R_54()) { jj_scanpos = xsp; break; }
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
}
return false;
}
- final private boolean jj_3R_51() {
+ final private boolean jj_3R_57() {
+ if (jj_scan_token(LOGICAL_LE)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_49()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_56() {
+ if (jj_scan_token(LOGICAL_GT)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_49()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_55() {
+ if (jj_scan_token(LOGICAL_LT)) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_49()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_50() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_55()) {
+ jj_scanpos = xsp;
+ if (jj_3R_56()) {
+ jj_scanpos = xsp;
+ if (jj_3R_57()) {
+ jj_scanpos = xsp;
+ if (jj_3R_58()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ } else 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_20() {
+ if (jj_3R_25()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_46()) { jj_scanpos = xsp; break; }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ }
+ return false;
+ }
+
+ final private boolean jj_3R_52() {
if (jj_scan_token(LOGICAL_NOT_EQUALS)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_46()) return true;
+ if (jj_3R_47()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_46() {
- if (jj_3R_48()) return true;
+ final private boolean jj_3R_47() {
+ if (jj_3R_49()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_49()) { jj_scanpos = xsp; break; }
+ if (jj_3R_50()) { jj_scanpos = xsp; break; }
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
}
return false;
}
- final private boolean jj_3R_50() {
+ final private boolean jj_3R_51() {
if (jj_scan_token(LOGICAL_EQUALS)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_46()) return true;
+ if (jj_3R_47()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_47() {
+ final private boolean jj_3R_48() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_50()) {
+ if (jj_3R_51()) {
jj_scanpos = xsp;
- if (jj_3R_51()) return true;
+ if (jj_3R_52()) 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_32() {
+ final private boolean jj_3R_33() {
if (jj_scan_token(DIDENTIFIER)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_38() {
+ final private boolean jj_3R_39() {
if (jj_scan_token(FALSE)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_43() {
- if (jj_3R_46()) return true;
+ final private boolean jj_3R_44() {
+ if (jj_3R_47()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_47()) { jj_scanpos = xsp; break; }
+ if (jj_3R_48()) { jj_scanpos = xsp; break; }
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
}
return false;
}
- final private boolean jj_3R_37() {
+ final private boolean jj_3R_38() {
if (jj_scan_token(TRUE)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_31() {
+ final private boolean jj_3R_32() {
if (jj_scan_token(IDENTIFIER)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_27() {
+ final private boolean jj_3R_28() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_31()) {
+ if (jj_3R_32()) {
jj_scanpos = xsp;
- if (jj_3R_32()) return true;
+ if (jj_3R_33()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
} else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
while (true) {
@@ -1635,110 +1780,116 @@
return false;
}
- final private boolean jj_3R_30() {
- if (jj_3R_25()) return true;
+ final private boolean jj_3R_31() {
+ if (jj_3R_26()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_16() {
- if (jj_3R_18()) return true;
+ final private boolean jj_3R_17() {
+ if (jj_3R_19()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
if (jj_scan_token(LPAREN)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_19()) jj_scanpos = xsp;
+ if (jj_3R_20()) jj_scanpos = xsp;
else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
if (jj_scan_token(RPAREN)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_24() {
+ final private boolean jj_3R_25() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_29()) {
+ if (jj_3R_30()) {
jj_scanpos = xsp;
- if (jj_3R_30()) return true;
+ if (jj_3R_31()) 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_29() {
- if (jj_3R_27()) return true;
+ final private boolean jj_3R_30() {
+ if (jj_3R_28()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_15() {
- if (jj_3R_18()) return true;
+ final private boolean jj_3R_16() {
+ if (jj_3R_19()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_18() {
+ final private boolean jj_3R_19() {
if (jj_scan_token(IDENTIFIER)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_44() {
+ final private boolean jj_3R_45() {
if (jj_scan_token(LOGICAL_AND)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_43()) return true;
+ if (jj_3R_44()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_41() {
- if (jj_3R_43()) return true;
+ final private boolean jj_3R_42() {
+ if (jj_3R_44()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_44()) { jj_scanpos = xsp; break; }
+ if (jj_3R_45()) { jj_scanpos = xsp; break; }
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
}
return false;
}
- final private boolean jj_3R_42() {
+ final private boolean jj_3R_43() {
if (jj_scan_token(LOGICAL_OR)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_41()) return true;
+ if (jj_3R_42()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_40() {
- if (jj_3R_41()) return true;
+ final private boolean jj_3R_41() {
+ if (jj_3R_42()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_42()) { jj_scanpos = xsp; break; }
+ if (jj_3R_43()) { jj_scanpos = xsp; break; }
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
}
return false;
}
- final private boolean jj_3R_23() {
+ final private boolean jj_3R_24() {
if (jj_scan_token(LPAREN)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_28()) return true;
+ if (jj_3R_29()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
if (jj_scan_token(RPAREN)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_39() {
- if (jj_3R_17()) return true;
+ final private boolean jj_3R_40() {
+ if (jj_3R_18()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
if (jj_scan_token(EQUALS)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_29()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3R_23() {
if (jj_3R_28()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
@@ -1755,23 +1906,17 @@
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
-
- final private boolean jj_3R_20() {
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
- final private boolean jj_3R_17() {
+ final private boolean jj_3R_18() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_20()) {
- jj_scanpos = xsp;
if (jj_3R_21()) {
jj_scanpos = xsp;
if (jj_3R_22()) {
jj_scanpos = xsp;
- if (jj_3R_23()) return true;
+ if (jj_3R_23()) {
+ jj_scanpos = xsp;
+ if (jj_3R_24()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
} else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
} else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -1779,131 +1924,131 @@
return false;
}
- final private boolean jj_3R_25() {
+ final private boolean jj_3R_26() {
if (jj_scan_token(STRING_LITERAL)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
final private boolean jj_3_2() {
- if (jj_3R_16()) return true;
+ if (jj_3R_17()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
final private boolean jj_3_3() {
- if (jj_3R_17()) return true;
+ if (jj_3R_18()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
if (jj_scan_token(EQUALS)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_63() {
- if (jj_3R_17()) return true;
+ final private boolean jj_3R_64() {
+ if (jj_3R_18()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_62() {
+ final private boolean jj_3R_63() {
if (jj_scan_token(LOGICAL_NOT)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_58()) return true;
+ if (jj_3R_59()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_58() {
+ final private boolean jj_3R_59() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_62()) {
+ if (jj_3R_63()) {
jj_scanpos = xsp;
- if (jj_3R_63()) return true;
+ if (jj_3R_64()) 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_26() {
+ final private boolean jj_3R_27() {
if (jj_scan_token(NUMBER_LITERAL)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_66() {
+ final private boolean jj_3R_67() {
if (jj_scan_token(MODULUS)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_58()) return true;
+ if (jj_3R_59()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_65() {
+ final private boolean jj_3R_66() {
if (jj_scan_token(DIVIDE)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_58()) return true;
+ if (jj_3R_59()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_64() {
+ final private boolean jj_3R_65() {
if (jj_scan_token(MULTIPLY)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_58()) return true;
+ if (jj_3R_59()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_59() {
+ final private boolean jj_3R_60() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_64()) {
- jj_scanpos = xsp;
if (jj_3R_65()) {
jj_scanpos = xsp;
- if (jj_3R_66()) return true;
+ if (jj_3R_66()) {
+ jj_scanpos = xsp;
+ if (jj_3R_67()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
} else 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_36() {
- if (jj_3R_40()) 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;
}
- final private boolean jj_3R_35() {
- if (jj_3R_39()) return true;
+ final private boolean jj_3R_36() {
+ if (jj_3R_40()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_34() {
- if (jj_3R_38()) return true;
+ final private boolean jj_3R_35() {
+ if (jj_3R_39()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_61() {
+ final private boolean jj_3R_62() {
if (jj_scan_token(MINUS)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_52()) return true;
+ if (jj_3R_53()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_28() {
+ final private boolean jj_3R_29() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_33()) {
- jj_scanpos = xsp;
if (jj_3R_34()) {
jj_scanpos = xsp;
if (jj_3R_35()) {
+ jj_scanpos = xsp;
+ if (jj_3R_36()) {
jj_scanpos = xsp;
- if (jj_3R_36()) return true;
+ 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;
} else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
@@ -1911,38 +2056,38 @@
return false;
}
- final private boolean jj_3R_33() {
- if (jj_3R_37()) return true;
+ final private boolean jj_3R_34() {
+ if (jj_3R_38()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_60() {
+ final private boolean jj_3R_61() {
if (jj_scan_token(PLUS)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_52()) return true;
+ if (jj_3R_53()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_53() {
+ final private boolean jj_3R_54() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_60()) {
+ if (jj_3R_61()) {
jj_scanpos = xsp;
- if (jj_3R_61()) return true;
+ if (jj_3R_62()) 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_52() {
- if (jj_3R_58()) return true;
+ final private boolean jj_3R_53() {
+ if (jj_3R_59()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_59()) { jj_scanpos = xsp; break; }
+ if (jj_3R_60()) { jj_scanpos = xsp; break; }
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
}
return false;
@@ -1955,78 +2100,17 @@
xsp = jj_scanpos;
if (jj_3_2()) {
jj_scanpos = xsp;
- if (jj_3R_15()) return true;
+ if (jj_3R_16()) 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_45() {
+ final private boolean jj_3R_46() {
if (jj_scan_token(COMMA)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_57() {
- if (jj_scan_token(LOGICAL_GE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_48()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_48() {
- if (jj_3R_52()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_53()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- }
- return false;
- }
-
- final private boolean jj_3R_56() {
- if (jj_scan_token(LOGICAL_LE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_48()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_55() {
- if (jj_scan_token(LOGICAL_GT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_48()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_54() {
- if (jj_scan_token(LOGICAL_LT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_48()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3R_49() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_54()) {
- jj_scanpos = xsp;
- if (jj_3R_55()) {
- jj_scanpos = xsp;
- if (jj_3R_56()) {
- jj_scanpos = xsp;
- if (jj_3R_57()) return true;
+ if (jj_3R_25()) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
@@ -2039,9 +2123,9 @@
public boolean lookingAhead = false;
private boolean jj_semLA;
private int jj_gen;
- final private int[] jj_la1 = new int[29];
- final private int[] jj_la1_0 = \
{0xf0000000,0xf0000000,0x0,0x0,0x0,0x0,0x0,0x10000000,0xf0000000,0x0,0x0,0x0,0xf000000 \
0,0xf0000000,0xf0000000,0x6000000,0x800002,0x10000,0x8000,0x600000,0x600000,0x1e0000,0x1e0000,0xc00,0xc00,0x7000,0x7000,0x800002,0x2,};
- final private int[] jj_la1_1 = \
{0x2705c,0x2705c,0x3080,0x8000,0x3080,0x3000,0x1000,0x24040,0x2705c,0x1,0x1,0x2,0x2705 \
c,0x2705c,0x2705c,0x0,0x30c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30c0,0x30c0,}; \
+ final private int[] jj_la1 = new int[30]; + final private int[] jj_la1_0 = \
{0xf0000000,0xf0000000,0x0,0x0,0x0,0x0,0x0,0x10000000,0xf0000000,0x0,0x0,0x0,0xf000000 \
0,0xf0000000,0xf0000000,0x6000000,0x800004,0x10000,0x8000,0x600000,0x600000,0x1e0000,0x1e0000,0xc00,0xc00,0x7000,0x7000,0x800004,0x4,0xf0000000,};
+ final private int[] jj_la1_1 = \
{0x4e0b9,0x4e0b9,0x6100,0x10000,0x6100,0x6000,0x2000,0x48080,0x4e0b9,0x2,0x2,0x4,0x4e0 \
b9,0x4e0b9,0x4e0b9,0x0,0x6180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6180,0x6180,0x4e0b9,};
final private JJCalls[] jj_2_rtns = new JJCalls[3];
private boolean jj_rescan = false;
private int jj_gc = 0;
@@ -2052,7 +2136,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 30; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2063,7 +2147,7 @@
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 30; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2073,7 +2157,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 30; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2084,7 +2168,7 @@
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 30; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2093,7 +2177,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 30; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2103,7 +2187,7 @@
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 29; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 30; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2210,15 +2294,15 @@
final public ParseException generateParseException() {
jj_expentries.removeAllElements();
- boolean[] la1tokens = new boolean[50];
- for (int i = 0; i < 50; i++) {
+ boolean[] la1tokens = new boolean[51];
+ for (int i = 0; i < 51; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 29; i++) {
+ for (int i = 0; i < 30; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -2230,7 +2314,7 @@
}
}
}
- for (int i = 0; i < 50; i++) {
+ for (int i = 0; i < 51; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
1.4 +71 -17 \
jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/Parser.jj
Index: Parser.jj
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/Parser.jj,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Parser.jj 2000/09/19 19:49:57 1.3
+++ Parser.jj 2000/09/21 23:37:26 1.4
@@ -99,7 +99,7 @@
* what controls the generation of this class.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Parser.jj,v 1.3 2000/09/19 19:49:57 jvanzyl Exp $
+ * @version $Id: Parser.jj,v 1.4 2000/09/21 23:37:26 jvanzyl Exp $
*/
public class Parser implements/*@bgen(jjtree)*/ ParserTreeConstants, /*@egen*/ \
org.apache.velocity.processor.javacc.parser.Parser {/*@bgen(jjtree)*/
@@ -155,6 +155,13 @@
*
* ------------------------------------------------------------------------- */
+/* COMMENTS */
+
+<DEFAULT> SPECIAL_TOKEN :
+{
+ <COMMENT: "##" (~["\n","\r"])* ("\n"|"\r"|"\r\n")>
+}
+
<*>
TOKEN :
{
@@ -175,8 +182,7 @@
}
}
-<*>
-MORE :
+<*>MORE :
{
<DOLLAR: "$">
{
@@ -192,20 +198,6 @@
}
-<DEFAULT> SPECIAL_TOKEN :
-{
- <COMMENT: "##" (~["\n","\r"])* ("\n"|"\r"|"\r\n")>
-}
-
-/*
-TOKEN :
-{
- <QUOTE: "\"">
-}
-*/
-
-// Arithmetic operators
-
<DIRECTIVE> SKIP:
{
" "
@@ -266,6 +258,7 @@
{
incMode = true;
}
+| <COMMENT_DIRECTIVE: "comment"> : DEFAULT
| <IF_DIRECTIVE: "if">
| <ELSEIF_DIRECTIVE: "elseif">
| <ELSE_DIRECTIVE: "else"> : DEFAULT
@@ -520,6 +513,7 @@
| SetStatement()
| ParseStatement()
| StopStatement()
+| CommentBlock()
| Reference()
}
@@ -1612,4 +1606,64 @@
| NumberLiteral()
| Reference()
| <LPAREN> Expression() <RPAREN>
+}
+
+void CommentBlock() : {/*@bgen(jjtree) CommentBlock */
+ ASTCommentBlock jjtn000 = new ASTCommentBlock(this, JJTCOMMENTBLOCK);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) CommentBlock */
+ try {
+/*@egen*/
+ <COMMENT_DIRECTIVE>/*@bgen(jjtree) Block */
+ {
+ ASTBlock jjtn001 = new ASTBlock(this, JJTBLOCK);
+ boolean jjtc001 = true;
+ jjtree.openNodeScope(jjtn001);
+ }
+ try {
+/*@egen*/
+ ( Statement() )+/*@bgen(jjtree)*/
+ } catch (Throwable jjte001) {
+ if (jjtc001) {
+ jjtree.clearNodeScope(jjtn001);
+ jjtc001 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte001 instanceof RuntimeException) {
+ throw (RuntimeException)jjte001;
+ }
+ if (jjte001 instanceof ParseException) {
+ throw (ParseException)jjte001;
+ }
+ throw (Error)jjte001;
+ } finally {
+ if (jjtc001) {
+ jjtree.closeNodeScope(jjtn001, true);
+ }
+ }
+/*@egen*/
+ <END>/*@bgen(jjtree)*/
+ } catch (Throwable jjte000) {
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ throw (RuntimeException)jjte000;
+ }
+ if (jjte000 instanceof ParseException) {
+ throw (ParseException)jjte000;
+ }
+ throw (Error)jjte000;
+ } finally {
+ if (jjtc000) {
+ jjtree.closeNodeScope(jjtn000, true);
+ }
+ }
+/*@egen*/
}
1.5 +18 -17 \
jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/Parser.jjt
Index: Parser.jjt
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/Parser.jjt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Parser.jjt 2000/09/19 19:49:57 1.4
+++ Parser.jjt 2000/09/21 23:37:26 1.5
@@ -123,7 +123,7 @@
* what controls the generation of this class.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Parser.jjt,v 1.4 2000/09/19 19:49:57 jvanzyl Exp $
+ * @version $Id: Parser.jjt,v 1.5 2000/09/21 23:37:26 jvanzyl Exp $
*/
public class Parser implements org.apache.velocity.processor.javacc.parser.Parser
{
@@ -176,6 +176,13 @@
*
* ------------------------------------------------------------------------- */
+/* COMMENTS */
+
+<DEFAULT> SPECIAL_TOKEN :
+{
+ <COMMENT: "##" (~["\n","\r"])* ("\n"|"\r"|"\r\n")>
+}
+
<*>
TOKEN :
{
@@ -196,8 +203,7 @@
}
}
-<*>
-MORE :
+<*>MORE :
{
<DOLLAR: "$">
{
@@ -213,20 +219,6 @@
}
-<DEFAULT> SPECIAL_TOKEN :
-{
- <COMMENT: "##" (~["\n","\r"])* ("\n"|"\r"|"\r\n")>
-}
-
-/*
-TOKEN :
-{
- <QUOTE: "\"">
-}
-*/
-
-// Arithmetic operators
-
<DIRECTIVE> SKIP:
{
" "
@@ -287,6 +279,7 @@
{
incMode = true;
}
+| <COMMENT_DIRECTIVE: "comment"> : DEFAULT
| <IF_DIRECTIVE: "if">
| <ELSEIF_DIRECTIVE: "elseif">
| <ELSE_DIRECTIVE: "else"> : DEFAULT
@@ -510,6 +503,7 @@
| SetStatement()
| ParseStatement()
| StopStatement()
+| CommentBlock()
| Reference()
}
@@ -810,4 +804,11 @@
| NumberLiteral()
| Reference()
| <LPAREN> Expression() <RPAREN>
+}
+
+void CommentBlock() : {}
+{
+ <COMMENT_DIRECTIVE>
+ ( Statement() )+ #Block
+ <END>
}
1.3 +31 -29 \
jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/ParserConstants.java
Index: ParserConstants.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/ParserConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParserConstants.java 2000/09/19 06:58:55 1.2
+++ ParserConstants.java 2000/09/21 23:37:27 1.3
@@ -4,11 +4,11 @@
public interface ParserConstants {
int EOF = 0;
- int LPAREN = 1;
- int RPAREN = 2;
- int DOLLAR = 3;
- int HASH = 4;
- int COMMENT = 5;
+ int COMMENT = 1;
+ int LPAREN = 2;
+ int RPAREN = 3;
+ int DOLLAR = 4;
+ int HASH = 5;
int MINUS = 10;
int PLUS = 11;
int MULTIPLY = 12;
@@ -30,38 +30,39 @@
int EQUALS = 28;
int INCLUDE_DIRECTIVE = 29;
int PARSE_DIRECTIVE = 30;
- int IF_DIRECTIVE = 31;
- int ELSEIF_DIRECTIVE = 32;
- int ELSE_DIRECTIVE = 33;
- int FOREACH_DIRECTIVE = 34;
- int SET_DIRECTIVE = 35;
- int STOP_DIRECTIVE = 36;
- int DIGIT = 37;
- int NUMBER_LITERAL = 38;
- int STRING_LITERAL = 39;
- int DT = 40;
- int ALPHA_CHAR = 41;
- int ALPHANUM_CHAR = 42;
- int IDENTIFIER_CHAR = 43;
- int IDENTIFIER = 44;
- int DIDENTIFIER = 45;
- int DOT = 46;
- int COMMA = 47;
- int REFERENCE_TERMINATOR = 48;
- int TEXT = 49;
+ int COMMENT_DIRECTIVE = 31;
+ int IF_DIRECTIVE = 32;
+ int ELSEIF_DIRECTIVE = 33;
+ int ELSE_DIRECTIVE = 34;
+ int FOREACH_DIRECTIVE = 35;
+ int SET_DIRECTIVE = 36;
+ int STOP_DIRECTIVE = 37;
+ int DIGIT = 38;
+ int NUMBER_LITERAL = 39;
+ int STRING_LITERAL = 40;
+ int DT = 41;
+ int ALPHA_CHAR = 42;
+ int ALPHANUM_CHAR = 43;
+ int IDENTIFIER_CHAR = 44;
+ int IDENTIFIER = 45;
+ int DIDENTIFIER = 46;
+ int DOT = 47;
+ int COMMA = 48;
+ int REFERENCE_TERMINATOR = 49;
+ int TEXT = 50;
- int REFERENCE = 0;
- int EXPRESSION = 1;
- int DIRECTIVE = 2;
- int DEFAULT = 3;
+ int DEFAULT = 0;
+ int REFERENCE = 1;
+ int EXPRESSION = 2;
+ int DIRECTIVE = 3;
String[] tokenImage = {
"<EOF>",
+ "<COMMENT>",
"\"(\"",
"\")\"",
"\"$\"",
"\"#\"",
- "<COMMENT>",
"\" \"",
"\"\\t\"",
"\"\\r\"",
@@ -87,6 +88,7 @@
"\"=\"",
"\"include\"",
"\"parse\"",
+ "\"comment\"",
"\"if\"",
"\"elseif\"",
"\"else\"",
1.3 +189 -176 \
jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/ParserTokenManager.java
Index: ParserTokenManager.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/processor/javacc/parser/velocity/ParserTokenManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParserTokenManager.java 2000/09/19 06:58:55 1.2
+++ ParserTokenManager.java 2000/09/21 23:37:27 1.3
@@ -95,7 +95,7 @@
t.endLine += documentLine;
}
}
-private final int jjStopStringLiteralDfa_3(int pos, long active0)
+private final int jjStopStringLiteralDfa_0(int pos, long active0)
{
switch (pos)
{
@@ -103,9 +103,9 @@
return -1;
}
}
-private final int jjStartNfa_3(int pos, long active0)
+private final int jjStartNfa_0(int pos, long active0)
{
- return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
+ return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
}
private final int jjStopAtPos(int pos, int kind)
{
@@ -113,28 +113,28 @@
jjmatchedPos = pos;
return pos + 1;
}
-private final int jjStartNfaWithStates_3(int pos, int kind, int state)
+private final int jjStartNfaWithStates_0(int pos, int kind, int state)
{
jjmatchedKind = kind;
jjmatchedPos = pos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_3(state, pos + 1);
+ return jjMoveNfa_0(state, pos + 1);
}
-private final int jjMoveStringLiteralDfa0_3()
+private final int jjMoveStringLiteralDfa0_0()
{
switch(curChar)
{
case 35:
- return jjStartNfaWithStates_3(0, 4, 0);
+ return jjStartNfaWithStates_0(0, 5, 0);
case 36:
- return jjStopAtPos(0, 3);
+ return jjStopAtPos(0, 4);
case 40:
- return jjStartNfaWithStates_3(0, 1, 6);
+ return jjStartNfaWithStates_0(0, 2, 6);
case 41:
- return jjStartNfaWithStates_3(0, 2, 6);
+ return jjStartNfaWithStates_0(0, 3, 6);
default :
- return jjMoveNfa_3(5, 0);
+ return jjMoveNfa_0(5, 0);
}
}
private final void jjCheckNAdd(int state)
@@ -170,7 +170,7 @@
static final long[] jjbitVec0 = {
0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
};
-private final int jjMoveNfa_3(int startState, int curPos)
+private final int jjMoveNfa_0(int startState, int curPos)
{
int[] nextStates;
int startsAt = 0;
@@ -192,8 +192,8 @@
case 5:
if ((0xffffffe7ffffffffL & l) != 0L)
{
- if (kind > 49)
- kind = 49;
+ if (kind > 50)
+ kind = 50;
jjCheckNAdd(6);
}
else if (curChar == 35)
@@ -208,12 +208,12 @@
jjCheckNAddStates(0, 2);
break;
case 2:
- if ((0x2400L & l) != 0L && kind > 5)
- kind = 5;
+ if ((0x2400L & l) != 0L && kind > 1)
+ kind = 1;
break;
case 3:
- if (curChar == 10 && kind > 5)
- kind = 5;
+ if (curChar == 10 && kind > 1)
+ kind = 1;
break;
case 4:
if (curChar == 13)
@@ -222,8 +222,8 @@
case 6:
if ((0xffffffe7ffffffffL & l) == 0L)
break;
- if (kind > 49)
- kind = 49;
+ if (kind > 50)
+ kind = 50;
jjCheckNAdd(6);
break;
default : break;
@@ -239,8 +239,8 @@
{
case 5:
case 6:
- if (kind > 49)
- kind = 49;
+ if (kind > 50)
+ kind = 50;
jjCheckNAdd(6);
break;
case 1:
@@ -262,8 +262,8 @@
case 6:
if ((jjbitVec0[i2] & l2) == 0L)
break;
- if (kind > 49)
- kind = 49;
+ if (kind > 50)
+ kind = 50;
jjCheckNAdd(6);
break;
case 1:
@@ -287,25 +287,25 @@
catch(java.io.IOException e) { return curPos; }
}
}
-private final int jjMoveStringLiteralDfa0_1()
+private final int jjMoveStringLiteralDfa0_2()
{
switch(curChar)
{
case 33:
jjmatchedKind = 23;
- return jjMoveStringLiteralDfa1_1(0x400000L);
+ return jjMoveStringLiteralDfa1_2(0x400000L);
case 35:
- return jjStopAtPos(0, 4);
+ return jjStopAtPos(0, 5);
case 36:
- return jjStopAtPos(0, 3);
+ return jjStopAtPos(0, 4);
case 37:
return jjStopAtPos(0, 14);
case 38:
- return jjMoveStringLiteralDfa1_1(0x8000L);
+ return jjMoveStringLiteralDfa1_2(0x8000L);
case 40:
- return jjStopAtPos(0, 1);
- case 41:
return jjStopAtPos(0, 2);
+ case 41:
+ return jjStopAtPos(0, 3);
case 42:
return jjStopAtPos(0, 12);
case 43:
@@ -316,19 +316,19 @@
return jjStopAtPos(0, 13);
case 60:
jjmatchedKind = 17;
- return jjMoveStringLiteralDfa1_1(0x40000L);
+ return jjMoveStringLiteralDfa1_2(0x40000L);
case 61:
- return jjMoveStringLiteralDfa1_1(0x200000L);
+ return jjMoveStringLiteralDfa1_2(0x200000L);
case 62:
jjmatchedKind = 19;
- return jjMoveStringLiteralDfa1_1(0x100000L);
+ return jjMoveStringLiteralDfa1_2(0x100000L);
case 124:
- return jjMoveStringLiteralDfa1_1(0x10000L);
+ return jjMoveStringLiteralDfa1_2(0x10000L);
default :
return 1;
}
}
-private final int jjMoveStringLiteralDfa1_1(long active0)
+private final int jjMoveStringLiteralDfa1_2(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -359,7 +359,7 @@
}
return 2;
}
-private final int jjStopStringLiteralDfa_2(int pos, long active0)
+private final int jjStopStringLiteralDfa_3(int pos, long active0)
{
switch (pos)
{
@@ -367,128 +367,132 @@
return -1;
}
}
-private final int jjStartNfa_2(int pos, long active0)
+private final int jjStartNfa_3(int pos, long active0)
{
- return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
+ return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
}
-private final int jjStartNfaWithStates_2(int pos, int kind, int state)
+private final int jjStartNfaWithStates_3(int pos, int kind, int state)
{
jjmatchedKind = kind;
jjmatchedPos = pos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_2(state, pos + 1);
+ return jjMoveNfa_3(state, pos + 1);
}
-private final int jjMoveStringLiteralDfa0_2()
+private final int jjMoveStringLiteralDfa0_3()
{
switch(curChar)
{
case 35:
- return jjStopAtPos(0, 4);
+ return jjStopAtPos(0, 5);
case 36:
- return jjStopAtPos(0, 3);
+ return jjStopAtPos(0, 4);
case 40:
- return jjStopAtPos(0, 1);
- case 41:
return jjStopAtPos(0, 2);
+ case 41:
+ return jjStopAtPos(0, 3);
case 61:
return jjStopAtPos(0, 28);
+ case 99:
+ return jjMoveStringLiteralDfa1_3(0x80000000L);
case 101:
- return jjMoveStringLiteralDfa1_2(0x308000000L);
+ return jjMoveStringLiteralDfa1_3(0x608000000L);
case 102:
- return jjMoveStringLiteralDfa1_2(0x404000000L);
+ return jjMoveStringLiteralDfa1_3(0x804000000L);
case 105:
- return jjMoveStringLiteralDfa1_2(0xa1000000L);
+ return jjMoveStringLiteralDfa1_3(0x121000000L);
case 112:
- return jjMoveStringLiteralDfa1_2(0x40000000L);
+ return jjMoveStringLiteralDfa1_3(0x40000000L);
case 115:
- return jjMoveStringLiteralDfa1_2(0x1800000000L);
+ return jjMoveStringLiteralDfa1_3(0x3000000000L);
case 116:
- return jjMoveStringLiteralDfa1_2(0x2000000L);
+ return jjMoveStringLiteralDfa1_3(0x2000000L);
default :
- return jjMoveNfa_2(1, 0);
+ return jjMoveNfa_3(1, 0);
}
}
-private final int jjMoveStringLiteralDfa1_2(long active0)
+private final int jjMoveStringLiteralDfa1_3(long active0)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_2(0, active0);
+ jjStopStringLiteralDfa_3(0, active0);
return 1;
}
switch(curChar)
{
case 97:
- return jjMoveStringLiteralDfa2_2(active0, 0x44000000L);
+ return jjMoveStringLiteralDfa2_3(active0, 0x44000000L);
case 101:
- return jjMoveStringLiteralDfa2_2(active0, 0x800000000L);
+ return jjMoveStringLiteralDfa2_3(active0, 0x1000000000L);
case 102:
- if ((active0 & 0x80000000L) != 0L)
- return jjStopAtPos(1, 31);
+ if ((active0 & 0x100000000L) != 0L)
+ return jjStopAtPos(1, 32);
break;
case 108:
- return jjMoveStringLiteralDfa2_2(active0, 0x300000000L);
+ return jjMoveStringLiteralDfa2_3(active0, 0x600000000L);
case 110:
if ((active0 & 0x1000000L) != 0L)
{
jjmatchedKind = 24;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_2(active0, 0x28000000L);
+ return jjMoveStringLiteralDfa2_3(active0, 0x28000000L);
case 111:
- return jjMoveStringLiteralDfa2_2(active0, 0x400000000L);
+ return jjMoveStringLiteralDfa2_3(active0, 0x880000000L);
case 114:
- return jjMoveStringLiteralDfa2_2(active0, 0x2000000L);
+ return jjMoveStringLiteralDfa2_3(active0, 0x2000000L);
case 116:
- return jjMoveStringLiteralDfa2_2(active0, 0x1000000000L);
+ return jjMoveStringLiteralDfa2_3(active0, 0x2000000000L);
default :
break;
}
- return jjStartNfa_2(0, active0);
+ return jjStartNfa_3(0, active0);
}
-private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_3(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_2(0, old0);
+ return jjStartNfa_3(0, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_2(1, active0);
+ jjStopStringLiteralDfa_3(1, active0);
return 2;
}
switch(curChar)
{
case 99:
- return jjMoveStringLiteralDfa3_2(active0, 0x20000000L);
+ return jjMoveStringLiteralDfa3_3(active0, 0x20000000L);
case 100:
if ((active0 & 0x8000000L) != 0L)
return jjStopAtPos(2, 27);
break;
case 108:
- return jjMoveStringLiteralDfa3_2(active0, 0x4000000L);
+ return jjMoveStringLiteralDfa3_3(active0, 0x4000000L);
+ case 109:
+ return jjMoveStringLiteralDfa3_3(active0, 0x80000000L);
case 111:
- return jjMoveStringLiteralDfa3_2(active0, 0x1000000000L);
+ return jjMoveStringLiteralDfa3_3(active0, 0x2000000000L);
case 114:
- return jjMoveStringLiteralDfa3_2(active0, 0x440000000L);
+ return jjMoveStringLiteralDfa3_3(active0, 0x840000000L);
case 115:
- return jjMoveStringLiteralDfa3_2(active0, 0x300000000L);
+ return jjMoveStringLiteralDfa3_3(active0, 0x600000000L);
case 116:
- if ((active0 & 0x800000000L) != 0L)
- return jjStopAtPos(2, 35);
+ if ((active0 & 0x1000000000L) != 0L)
+ return jjStopAtPos(2, 36);
break;
case 117:
- return jjMoveStringLiteralDfa3_2(active0, 0x2000000L);
+ return jjMoveStringLiteralDfa3_3(active0, 0x2000000L);
default :
break;
}
- return jjStartNfa_2(1, active0);
+ return jjStartNfa_3(1, active0);
}
-private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa3_3(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_2(1, old0);
+ return jjStartNfa_3(1, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_2(2, active0);
+ jjStopStringLiteralDfa_3(2, active0);
return 3;
}
switch(curChar)
@@ -496,84 +500,88 @@
case 101:
if ((active0 & 0x2000000L) != 0L)
return jjStopAtPos(3, 25);
- else if ((active0 & 0x200000000L) != 0L)
+ else if ((active0 & 0x400000000L) != 0L)
{
- jjmatchedKind = 33;
+ jjmatchedKind = 34;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_2(active0, 0x500000000L);
+ return jjMoveStringLiteralDfa4_3(active0, 0xa00000000L);
case 108:
- return jjMoveStringLiteralDfa4_2(active0, 0x20000000L);
+ return jjMoveStringLiteralDfa4_3(active0, 0x20000000L);
+ case 109:
+ return jjMoveStringLiteralDfa4_3(active0, 0x80000000L);
case 112:
- if ((active0 & 0x1000000000L) != 0L)
- return jjStopAtPos(3, 36);
+ if ((active0 & 0x2000000000L) != 0L)
+ return jjStopAtPos(3, 37);
break;
case 115:
- return jjMoveStringLiteralDfa4_2(active0, 0x44000000L);
+ return jjMoveStringLiteralDfa4_3(active0, 0x44000000L);
default :
break;
}
- return jjStartNfa_2(2, active0);
+ return jjStartNfa_3(2, active0);
}
-private final int jjMoveStringLiteralDfa4_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa4_3(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_2(2, old0);
+ return jjStartNfa_3(2, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_2(3, active0);
+ jjStopStringLiteralDfa_3(3, active0);
return 4;
}
switch(curChar)
{
case 97:
- return jjMoveStringLiteralDfa5_2(active0, 0x400000000L);
+ return jjMoveStringLiteralDfa5_3(active0, 0x800000000L);
case 101:
if ((active0 & 0x4000000L) != 0L)
return jjStopAtPos(4, 26);
else if ((active0 & 0x40000000L) != 0L)
return jjStopAtPos(4, 30);
- break;
+ return jjMoveStringLiteralDfa5_3(active0, 0x80000000L);
case 105:
- return jjMoveStringLiteralDfa5_2(active0, 0x100000000L);
+ return jjMoveStringLiteralDfa5_3(active0, 0x200000000L);
case 117:
- return jjMoveStringLiteralDfa5_2(active0, 0x20000000L);
+ return jjMoveStringLiteralDfa5_3(active0, 0x20000000L);
default :
break;
}
- return jjStartNfa_2(3, active0);
+ return jjStartNfa_3(3, active0);
}
-private final int jjMoveStringLiteralDfa5_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa5_3(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_2(3, old0);
+ return jjStartNfa_3(3, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_2(4, active0);
+ jjStopStringLiteralDfa_3(4, active0);
return 5;
}
switch(curChar)
{
case 99:
- return jjMoveStringLiteralDfa6_2(active0, 0x400000000L);
+ return jjMoveStringLiteralDfa6_3(active0, 0x800000000L);
case 100:
- return jjMoveStringLiteralDfa6_2(active0, 0x20000000L);
+ return jjMoveStringLiteralDfa6_3(active0, 0x20000000L);
case 102:
- if ((active0 & 0x100000000L) != 0L)
- return jjStopAtPos(5, 32);
+ if ((active0 & 0x200000000L) != 0L)
+ return jjStopAtPos(5, 33);
break;
+ case 110:
+ return jjMoveStringLiteralDfa6_3(active0, 0x80000000L);
default :
break;
}
- return jjStartNfa_2(4, active0);
+ return jjStartNfa_3(4, active0);
}
-private final int jjMoveStringLiteralDfa6_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa6_3(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
- return jjStartNfa_2(4, old0);
+ return jjStartNfa_3(4, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
- jjStopStringLiteralDfa_2(5, active0);
+ jjStopStringLiteralDfa_3(5, active0);
return 6;
}
switch(curChar)
@@ -583,15 +591,19 @@
return jjStopAtPos(6, 29);
break;
case 104:
- if ((active0 & 0x400000000L) != 0L)
- return jjStopAtPos(6, 34);
+ if ((active0 & 0x800000000L) != 0L)
+ return jjStopAtPos(6, 35);
+ break;
+ case 116:
+ if ((active0 & 0x80000000L) != 0L)
+ return jjStopAtPos(6, 31);
break;
default :
break;
}
- return jjStartNfa_2(5, active0);
+ return jjStartNfa_3(5, active0);
}
-private final int jjMoveNfa_2(int startState, int curPos)
+private final int jjMoveNfa_3(int startState, int curPos)
{
int[] nextStates;
int startsAt = 0;
@@ -613,8 +625,8 @@
case 1:
if ((0x3ff000000000000L & l) != 0L)
{
- if (kind > 38)
- kind = 38;
+ if (kind > 39)
+ kind = 39;
jjCheckNAdd(0);
}
else if (curChar == 34)
@@ -623,8 +635,8 @@
case 0:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 38)
- kind = 38;
+ if (kind > 39)
+ kind = 39;
jjCheckNAdd(0);
break;
case 2:
@@ -632,8 +644,8 @@
jjCheckNAddTwoStates(2, 3);
break;
case 3:
- if (curChar == 34 && kind > 39)
- kind = 39;
+ if (curChar == 34 && kind > 40)
+ kind = 40;
break;
default : break;
}
@@ -682,7 +694,7 @@
catch(java.io.IOException e) { return curPos; }
}
}
-private final int jjStopStringLiteralDfa_0(int pos, long active0)
+private final int jjStopStringLiteralDfa_1(int pos, long active0)
{
switch (pos)
{
@@ -690,39 +702,39 @@
return -1;
}
}
-private final int jjStartNfa_0(int pos, long active0)
+private final int jjStartNfa_1(int pos, long active0)
{
- return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
+ return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
}
-private final int jjStartNfaWithStates_0(int pos, int kind, int state)
+private final int jjStartNfaWithStates_1(int pos, int kind, int state)
{
jjmatchedKind = kind;
jjmatchedPos = pos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return pos + 1; }
- return jjMoveNfa_0(state, pos + 1);
+ return jjMoveNfa_1(state, pos + 1);
}
-private final int jjMoveStringLiteralDfa0_0()
+private final int jjMoveStringLiteralDfa0_1()
{
switch(curChar)
{
case 35:
- return jjStopAtPos(0, 4);
+ return jjStopAtPos(0, 5);
case 36:
- return jjStartNfaWithStates_0(0, 3, 3);
+ return jjStartNfaWithStates_1(0, 4, 3);
case 40:
- return jjStopAtPos(0, 1);
- case 41:
return jjStopAtPos(0, 2);
+ case 41:
+ return jjStopAtPos(0, 3);
case 44:
- return jjStopAtPos(0, 47);
+ return jjStopAtPos(0, 48);
case 46:
- return jjStopAtPos(0, 46);
+ return jjStopAtPos(0, 47);
default :
- return jjMoveNfa_0(0, 0);
+ return jjMoveNfa_1(0, 0);
}
}
-private final int jjMoveNfa_0(int startState, int curPos)
+private final int jjMoveNfa_1(int startState, int curPos)
{
int[] nextStates;
int startsAt = 0;
@@ -748,15 +760,15 @@
case 1:
if ((0x3ff200000000000L & l) == 0L)
break;
- if (kind > 44)
- kind = 44;
+ if (kind > 45)
+ kind = 45;
jjstateSet[jjnewStateCnt++] = 1;
break;
case 4:
if ((0x3ff200000000000L & l) == 0L)
break;
- if (kind > 45)
- kind = 45;
+ if (kind > 46)
+ kind = 46;
jjstateSet[jjnewStateCnt++] = 4;
break;
default : break;
@@ -773,29 +785,29 @@
case 0:
if ((0x7fffffe07fffffeL & l) == 0L)
break;
- if (kind > 44)
- kind = 44;
+ if (kind > 45)
+ kind = 45;
jjCheckNAdd(1);
break;
case 1:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 44)
- kind = 44;
+ if (kind > 45)
+ kind = 45;
jjCheckNAdd(1);
break;
case 3:
if ((0x7fffffe07fffffeL & l) == 0L)
break;
- if (kind > 45)
- kind = 45;
+ if (kind > 46)
+ kind = 46;
jjCheckNAdd(4);
break;
case 4:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
- if (kind > 45)
- kind = 45;
+ if (kind > 46)
+ kind = 46;
jjCheckNAdd(4);
break;
default : break;
@@ -831,32 +843,33 @@
1, 2, 4, 2, 3,
};
public static final String[] jjstrLiteralImages = {
-null, null, null, null, null, null, null, null, null, null, "\55", "\53",
-"\52", "\57", "\45", "\46\46", "\174\174", "\74", "\74\75", "\76", "\76\75",
-"\75\75", "\41\75", "\41", null, null, null, null, null, null, null, null, null, \
null, +"", null, null, null, null, null, null, null, null, null, "\55", "\53", \
"\52", +"\57", "\45", "\46\46", "\174\174", "\74", "\74\75", "\76", "\76\75", \
"\75\75", +"\41\75", "\41", null, null, null, null, null, null, null, null, null, \
null, null, null, null, null, null, null, null, null, null, null, null, null, null, \
null, null, null,
-null, null, };
+null, };
public static final String[] lexStateNames = {
+ "DEFAULT",
"REFERENCE",
"EXPRESSION",
"DIRECTIVE",
- "DEFAULT",
};
public static final int[] jjnewLexState = {
- -1, -1, -1, 0, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1,
- -1, -1, 3, -1, -1, -1, -1, -1, 3, -1, -1, -1, -1, 3, -1, 3, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, + -1, -1, -1, -1, 1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 0, -1, -1, -1, 0, -1, -1, 0, -1, \
-1, -1, -1, 0, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, + -1,
};
static final long[] jjtoToken = {
- 0x2f0dffffffc07L,
+ 0x5e1bffffffc0dL,
};
static final long[] jjtoSkip = {
- 0x10100000003e0L,
+ 0x20200000003c2L,
};
static fi
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic