[Jython-checkins] SF.net SVN: jython:[5879] branches/jy3k/grammar/Python.g

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

Revision: 5879
          http://jython.svn.sourceforge.net/jython/?rev=5879&view=rev
Author:   fwierzbicki
Date:     2009-01-08 15:52:56 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
Remove support for 'l'/'L' at the end of INT and 'u'/'U' at the beginning of
STRING

Modified Paths:
--------------
    branches/jy3k/grammar/Python.g

Modified: branches/jy3k/grammar/Python.g
===================================================================
--- branches/jy3k/grammar/Python.g	2009-01-08 15:45:27 UTC (rev 5878)
+++ branches/jy3k/grammar/Python.g	2009-01-08 15:52:56 UTC (rev 5879)
@@ -1239,8 +1239,6 @@
     -> ^(NAME<Name>[$NAME, $NAME.text, $expr::ctype])
      | INT
     -> ^(INT<Num>[$INT, actions.makeInt($INT)])
-     | LONGINT
-    -> ^(LONGINT<Num>[$LONGINT, actions.makeInt($LONGINT)])
      | FLOAT
     -> ^(FLOAT<Num>[$FLOAT, actions.makeFloat($FLOAT)])
      | COMPLEX
@@ -1697,10 +1695,6 @@
     |   DIGITS ('.' (DIGITS (Exponent)?)? | Exponent)
     ;
 
-LONGINT
-    :   INT ('l'|'L')
-    ;
-
 fragment
 Exponent
     :    ('e' | 'E') ( '+' | '-' )? DIGITS
@@ -1729,7 +1723,7 @@
  *  should make us exit loop not continue.
  */
 STRING
-    :   ('r'|'u'|'ur'|'R'|'U'|'UR'|'uR'|'Ur')?
+    :   ('r'|'R')?
         (   '\'\'\'' (options {greedy=false;}:TRIAPOS)* '\'\'\''
         |   '"""' (options {greedy=false;}:TRIQUOTE)* '"""'
         |   '"' (ESC|~('\\'|'\n'|'"'))* '"'
@@ -1743,7 +1737,7 @@
     ;
 
 STRINGPART
-    : {partial}?=> ('r'|'u'|'ur'|'R'|'U'|'UR'|'uR'|'Ur')?
+    : {partial}?=> ('r'|'R')?
         (   '\'\'\'' ~('\'\'\'')*
         |   '"""' ~('"""')*
         )


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