[Jython-checkins] CVS: jython/org/python/parser python.jjt,2.16,2.17

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/parser
In directory usw-pr-cvs1:/tmp/cvs-serv22871

Modified Files:
	python.jjt 
Log Message:
Fix a bug introduced in version 2.16.
This restores the handling performed after a SINGLE_LINE_COMMENT.

Fixes bug "[ #489168 ] Parse error, java traceback".



Index: python.jjt
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/python.jjt,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -d -r2.16 -r2.17
*** python.jjt	2001/10/30 20:30:10	2.16
--- python.jjt	2001/12/20 17:15:01	2.17
***************
*** 218,223 ****
  <INDENTING, INDENTATION_UNCHANGED> SPECIAL_TOKEN: /* COMMENTS */
  {
!     <SINGLE_LINE_COMMENT: "#" (~["\n","\r"])* ("\r\n" | "\n" | "\r")>
!         { indent = 0; }
  }
  
--- 218,228 ----
  <INDENTING, INDENTATION_UNCHANGED> SPECIAL_TOKEN: /* COMMENTS */
  {
!     <SINGLE_LINE_COMMENT: "#" (~["\n","\r"])* ("\r\n" | "\n" | "\r")> {
!         indent = 0;
!         if (indent == indentation[level])
!             SwitchTo(INDENTATION_UNCHANGED);
!         else
!             SwitchTo(INDENTING);
!     }
  }