[WebMacro-cvs] wiki/src/org/tcdi/opensource/wiki/parser WikiParserTokenManager.java,1.4,1.5 wiki.jj,1.7,1.8

[<dr...@us...>]

Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv23867/src/org/tcdi/opensource/wiki/parser

Modified Files:
	WikiParserTokenManager.java wiki.jj 
Log Message:
- parser fix to allow *'s and +'s in URL's
- fix potential NPE's in HTMLURLRenderer when there is no _wiki



Index: WikiParserTokenManager.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser/WikiParserTokenManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WikiParserTokenManager.java	27 Nov 2002 07:06:32 -0000	1.4
--- WikiParserTokenManager.java	12 Mar 2003 17:53:33 -0000	1.5
***************
*** 487,491 ****
                    break;
                 case 38:
!                   if ((0xa7ffe06000000000L & l) == 0L)
                       break;
                    if (kind > 22)
--- 487,491 ----
                    break;
                 case 38:
!                   if ((0xa7ffec6000000000L & l) == 0L)
                       break;
                    if (kind > 22)
***************
*** 494,498 ****
                    break;
                 case 39:
!                   if ((0xa7ffe06000000000L & l) == 0L)
                       break;
                    if (kind > 22)
--- 494,498 ----
                    break;
                 case 39:
!                   if ((0xa7ffec6000000000L & l) == 0L)
                       break;
                    if (kind > 22)
***************
*** 501,505 ****
                    break;
                 case 40:
!                   if ((0xa7ffe06000000000L & l) != 0L)
                       jjCheckNAddTwoStates(40, 41);
                    break;
--- 501,505 ----
                    break;
                 case 40:
!                   if ((0xa7ffec6000000000L & l) != 0L)
                       jjCheckNAddTwoStates(40, 41);
                    break;

Index: wiki.jj
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser/wiki.jj,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wiki.jj	27 Nov 2002 07:06:32 -0000	1.7
--- wiki.jj	12 Mar 2003 17:53:33 -0000	1.8
***************
*** 68,72 ****
     | < #ALPHANUM: ["a"-"z", "A"-"Z", "0"-"9"] >
     | < #MAILCHARS: <ALPHANUM> | [".", "_", "-"] >
!    | < #URLCHARS: <ALPHANUM> | ["/", ".", "?", "&", "%", "~", ":", "_", "-", "@", "=" ] >
     | < #UCASE_ALPHANUM: ["A"-"Z", "0"-"9"] >
     | < #LCASE_ALPHANUM: ["a"-"z", "0"-"9"] >
--- 68,72 ----
     | < #ALPHANUM: ["a"-"z", "A"-"Z", "0"-"9"] >
     | < #MAILCHARS: <ALPHANUM> | [".", "_", "-"] >
!    | < #URLCHARS: <ALPHANUM> | ["/", ".", "?", "&", "%", "~", ":", "_", "-", "@", "=", "+", "*" ] >
     | < #UCASE_ALPHANUM: ["A"-"Z", "0"-"9"] >
     | < #LCASE_ALPHANUM: ["a"-"z", "0"-"9"] >