[Jython-checkins] SF.net SVN: jython:[6396] trunk/jython

[<fwi...@us...>]

Revision: 6396
          http://jython.svn.sourceforge.net/jython/?rev=6396&view=rev
Author:   fwierzbicki
Date:     2009-05-27 14:38:04 +0000 (Wed, 27 May 2009)

Log Message:
-----------
fix for http://bugs.jython.org/issue1358: Simple pogram fails to parse in
Jython 2.5rc3, but parses OK with CPython.  Before this fix we failed to parse

1 \
#
2

Modified Paths:
--------------
    trunk/jython/NEWS
    trunk/jython/grammar/Python.g

Modified: trunk/jython/NEWS
===================================================================
--- trunk/jython/NEWS	2009-05-27 06:44:07 UTC (rev 6395)
+++ trunk/jython/NEWS	2009-05-27 14:38:04 UTC (rev 6396)
@@ -2,6 +2,7 @@
 
 Jython 2.5.0
   Bugs fixed
+    - [ 1358 ] Simple pogram fails to parse in Jython 2.5rc3, but parses OK with CPython
     - [ 1357 ] no sys.executable when script runner is a relative link
 
 Jython 2.5.0 rc3

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2009-05-27 06:44:07 UTC (rev 6395)
+++ trunk/jython/grammar/Python.g	2009-05-27 14:38:04 UTC (rev 6396)
@@ -1800,7 +1800,8 @@
  */
 CONTINUED_LINE
     :    '\\' ('\r')? '\n' (' '|'\t')*  { $channel=HIDDEN; }
-         ( nl=NEWLINE {
+         ( c1=COMMENT
+         | nl=NEWLINE {
                           if (!partial) {
                               emit(new CommonToken(NEWLINE,nl.getText()));
                           }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.