[Python-3000-checkins] r51640 - in python/branches/p3yk: Doc/lib/asttable.tex Include/token.h Lib/compiler/transformer.py Lib/pydoc.py Lib/token.py Modules/parsermodule.c

[neal.norwitz]

Author: neal.norwitz
Date: Tue Aug 29 06:40:24 2006
New Revision: 51640

Modified:
   python/branches/p3yk/Doc/lib/asttable.tex
   python/branches/p3yk/Include/token.h
   python/branches/p3yk/Lib/compiler/transformer.py
   python/branches/p3yk/Lib/pydoc.py
   python/branches/p3yk/Lib/token.py
   python/branches/p3yk/Modules/parsermodule.c
Log:
Get rid of some more cases of backquotes.  parsermodule.c doesn't compile
but looks like that was a problem before this change.


Modified: python/branches/p3yk/Doc/lib/asttable.tex
==============================================================================
--- python/branches/p3yk/Doc/lib/asttable.tex	(original)
+++ python/branches/p3yk/Doc/lib/asttable.tex	Tue Aug 29 06:40:24 2006
@@ -36,9 +36,6 @@
 \lineiii{}{\member{expr}}{}
 \hline 
 
-\lineiii{Backquote}{\member{expr}}{}
-\hline 
-
 \lineiii{Bitand}{\member{nodes}}{}
 \hline 
 

Modified: python/branches/p3yk/Include/token.h
==============================================================================
--- python/branches/p3yk/Include/token.h	(original)
+++ python/branches/p3yk/Include/token.h	Tue Aug 29 06:40:24 2006
@@ -32,7 +32,7 @@
 #define EQUAL		22
 #define DOT		23
 #define PERCENT		24
-#define BACKQUOTE	25
+/* #define BACKQUOTE	25 */
 #define LBRACE		26
 #define RBRACE		27
 #define EQEQUAL		28

Modified: python/branches/p3yk/Lib/compiler/transformer.py
==============================================================================
--- python/branches/p3yk/Lib/compiler/transformer.py	(original)
+++ python/branches/p3yk/Lib/compiler/transformer.py	Tue Aug 29 06:40:24 2006
@@ -111,7 +111,6 @@
         self._atom_dispatch = {token.LPAR: self.atom_lpar,
                                token.LSQB: self.atom_lsqb,
                                token.LBRACE: self.atom_lbrace,
-                               token.BACKQUOTE: self.atom_backquote,
                                token.NUMBER: self.atom_number,
                                token.STRING: self.atom_string,
                                token.NAME: self.atom_name,
@@ -740,9 +739,6 @@
             return Dict((), lineno=nodelist[0][2])
         return self.com_dictsetmaker(nodelist[1])
 
-    def atom_backquote(self, nodelist):
-        return Backquote(self.com_node(nodelist[1]))
-
     def atom_number(self, nodelist):
         ### need to verify this matches compile.c
         k = eval(nodelist[0][1])

Modified: python/branches/p3yk/Lib/pydoc.py
==============================================================================
--- python/branches/p3yk/Lib/pydoc.py	(original)
+++ python/branches/p3yk/Lib/pydoc.py	Tue Aug 29 06:40:24 2006
@@ -1564,7 +1564,7 @@
         'CLASSES': ('ref/types', 'class SPECIALMETHODS PRIVATENAMES'),
         'MODULES': ('lib/typesmodules', 'import'),
         'PACKAGES': 'import',
-        'EXPRESSIONS': ('ref/summary', 'lambda or and not in is BOOLEAN COMPARISON BITWISE SHIFTING BINARY FORMATTING POWER UNARY ATTRIBUTES SUBSCRIPTS SLICINGS CALLS TUPLES LISTS DICTIONARIES BACKQUOTES'),
+        'EXPRESSIONS': ('ref/summary', 'lambda or and not in is BOOLEAN COMPARISON BITWISE SHIFTING BINARY FORMATTING POWER UNARY ATTRIBUTES SUBSCRIPTS SLICINGS CALLS TUPLES LISTS DICTIONARIES'),
         'OPERATORS': 'EXPRESSIONS',
         'PRECEDENCE': 'EXPRESSIONS',
         'OBJECTS': ('ref/objects', 'TYPES'),
@@ -1587,14 +1587,13 @@
         'IDENTIFIERS': ('ref/identifiers', 'keywords SPECIALIDENTIFIERS'),
         'SPECIALIDENTIFIERS': ('ref/id-classes', ''),
         'PRIVATENAMES': ('ref/atom-identifiers', ''),
-        'LITERALS': ('ref/atom-literals', 'STRINGS BACKQUOTES NUMBERS TUPLELITERALS LISTLITERALS DICTIONARYLITERALS'),
+        'LITERALS': ('ref/atom-literals', 'STRINGS NUMBERS TUPLELITERALS LISTLITERALS DICTIONARYLITERALS'),
         'TUPLES': 'SEQUENCES',
         'TUPLELITERALS': ('ref/exprlists', 'TUPLES LITERALS'),
         'LISTS': ('lib/typesseq-mutable', 'LISTLITERALS'),
         'LISTLITERALS': ('ref/lists', 'LISTS LITERALS'),
         'DICTIONARIES': ('lib/typesmapping', 'DICTIONARYLITERALS'),
         'DICTIONARYLITERALS': ('ref/dict', 'DICTIONARIES LITERALS'),
-        'BACKQUOTES': ('ref/string-conversions', 'repr str STRINGS LITERALS'),
         'ATTRIBUTES': ('ref/attribute-references', 'getattr hasattr setattr ATTRIBUTEMETHODS'),
         'SUBSCRIPTS': ('ref/subscriptions', 'SEQUENCEMETHODS1'),
         'SLICINGS': ('ref/slicings', 'SEQUENCEMETHODS2'),

Modified: python/branches/p3yk/Lib/token.py
==============================================================================
--- python/branches/p3yk/Lib/token.py	(original)
+++ python/branches/p3yk/Lib/token.py	Tue Aug 29 06:40:24 2006
@@ -35,7 +35,6 @@
 EQUAL = 22
 DOT = 23
 PERCENT = 24
-BACKQUOTE = 25
 LBRACE = 26
 RBRACE = 27
 EQEQUAL = 28

Modified: python/branches/p3yk/Modules/parsermodule.c
==============================================================================
--- python/branches/p3yk/Modules/parsermodule.c	(original)
+++ python/branches/p3yk/Modules/parsermodule.c	Tue Aug 29 06:40:24 2006
@@ -2404,11 +2404,6 @@
             if (res && (nch == 3))
                 res = validate_dictmaker(CHILD(tree, 1));
             break;
-          case BACKQUOTE:
-            res = ((nch == 3)
-                   && validate_testlist1(CHILD(tree, 1))
-                   && validate_ntype(CHILD(tree, 2), BACKQUOTE));
-            break;
           case NAME:
           case NUMBER:
             res = (nch == 1);