Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv17275
Modified Files:
ParserBlockBuilder.java
Log Message:
Work-around for parser problem with explicit begin followed by a directive.
Eg, #if ($x) #begin #set $y=0 #end
Index: ParserBlockBuilder.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/ParserBlockBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ParserBlockBuilder.java 12 Jun 2003 00:47:46 -0000 1.11
--- ParserBlockBuilder.java 8 Aug 2003 22:32:33 -0000 1.12
***************
*** 226,230 ****
{
Object o = elementAt(size() - 1);
! if (!(o instanceof String))
return true;
else
--- 226,237 ----
{
Object o = elementAt(size() - 1);
!
! // NOTE: the test for a zero length string in the following 'if' is
! // a work-around for a bug parsing an explicit #begin followed
! // immediately by another directive, eg,
! // #if ($x) #begin #set $y=0 #end
! // This can be removed when/if this bug is fixed
! // Keats 8-Aug-2003
! if (!(o instanceof String) || (((String)o).length() == 0))
return true;
else
|
