luehe 2002/12/16 15:02:39
Modified: jasper2/src/share/org/apache/jasper/compiler Parser.java
Log:
updated productions of jsp:params and jsp:fallback so that they accept jsp:body
Revision Changes Path
1.50 +25 -9
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Parser.java 16 Dec 2002 22:21:15 -0000 1.49
+++ Parser.java 16 Dec 2002 23:02:39 -0000 1.50
@@ -1064,8 +1064,15 @@
}
/*
- * Params ::= '/>'
- * | ( '>' S? Param* '</jsp:params>' )
+ * Params ::= `>' S?
+ * ( ( `<jsp:body>'
+ * ( ( S? Param+ S? `</jsp:body>' )
+ * | <TRANSLATION_ERROR>
+ * )
+ * )
+ * | Param+
+ * )
+ * '</jsp:params>'
*/
private void parseJspParams(Node parent) throws JasperException {
Node jspParamsNode = new Node.ParamsAction(start, parent);
@@ -1075,10 +1082,19 @@
/*
* Fallback ::= '/>'
- * | ( '>'
- * ( Char* - ( Char* '</jsp:fallback>' ) )
- * '</jsp:fallback>'
- * )
+ * | ( `>' S? `<jsp:body>'
+ * ( ( S?
+ * ( Char* - ( Char* `</jsp:body>' ) )
+ * `</jsp:body>' S?
+ * )
+ * | <TRANSLATION_ERROR>
+ * )
+ * `</jsp:fallback>'
+ * )
+ * | ( '>'
+ * ( Char* - ( Char* '</jsp:fallback>' ) )
+ * '</jsp:fallback>'
+ * )
*/
private void parseFallBack(Node parent) throws JasperException {
Node fallBackNode = new Node.FallBackAction(start, parent);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
