[Htmlparser-cvs] htmlparser/src/org/htmlparser/lexer Lexer.java,1.42,1.43

[Derrick O. <der...@us...>]

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25673

Modified Files:
	Lexer.java 
Log Message:
Fix bug #1445795 return as TextNode when processing jsp
Handle single and double line comments within jsp nodes.
Suggested alteration to handle jsp tags within tag attributes wasn't implemented.

Index: Lexer.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/Lexer.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Lexer.java	19 Mar 2006 15:01:25 -0000	1.42
--- Lexer.java	19 Mar 2006 16:11:18 -0000	1.43
***************
*** 1075,1078 ****
--- 1075,1114 ----
                              state = 3;
                              break;
+                         case '/': // // or /*
+                             ch = mPage.getCharacter (mCursor);
+                             if (ch == '/') 
+                             {   // find the \n or \r
+                                 while(true)
+                                 {
+                                     ch = mPage.getCharacter (mCursor);
+                                     if (ch == Page.EOF)
+                                     {
+                                         done = true;
+                                         break;
+                                     }
+                                     else if (ch == '\n' || ch == '\r')
+                                     {
+                                         break;
+                                     }
+                                 }
+                             }
+                             else if (ch == '*')
+                             {
+                                 do
+                                 {
+                                     do
+                                         ch = mPage.getCharacter (mCursor);
+                                     while ((Page.EOF != ch) && ('*' != ch));
+                                     ch = mPage.getCharacter (mCursor);
+                                     if (ch == '*')
+                                         mCursor.retreat ();
+                                 }
+                                 while ((Page.EOF != ch) && ('/' != ch));
+                             }
+                             else
+                             {
+                                 mCursor.retreat ();
+                             }
+                             break;
                          default:  // <%???x
                              break;