Get rid of some more cases of backquotes. parsermodule.c doesn't compile

but looks like that was a problem before this change.

diff --git a/Doc/lib/asttable.tex b/Doc/lib/asttable.tex
index abba0da12fb4cb4d15529e413eb3d2f0ed1abae2..326bbbbdee09743573bee79d08e35efa399ab133 100644 (file)
--- a/Doc/lib/asttable.tex
+++ b/Doc/lib/asttable.tex
@@ -36,9 +36,6 @@
 \lineiii{}{\member{expr}}{}
 \hline 
 
-\lineiii{Backquote}{\member{expr}}{}
-\hline 
-
 \lineiii{Bitand}{\member{nodes}}{}
 \hline 
 

diff --git a/Include/token.h b/Include/token.h
index 4250000d135103bf40c61229aa6018f583ac4ec6..5aedb695091b43faddf04c1f206a7779a2e8f853 100644 (file)
--- a/Include/token.h
+++ b/Include/token.h
@@ -32,7 +32,7 @@ extern "C" {
 #define EQUAL          22
 #define DOT            23
 #define PERCENT                24
-#define BACKQUOTE      25
+/* #define BACKQUOTE   25 */
 #define LBRACE         26
 #define RBRACE         27
 #define EQEQUAL                28

diff --git a/Lib/compiler/transformer.py b/Lib/compiler/transformer.py
index db571dbe04cf82112482343aee2cc14ea2d36def..a9b971a2557cbb4394551427518e4dd89bfe7589 100644 (file)
--- a/Lib/compiler/transformer.py
+++ b/Lib/compiler/transformer.py
@@ -111,7 +111,6 @@ class Transformer:
         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 @@ class Transformer:
             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])

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 29c6cc467ada34f92fd9a32caa487504ba0612df..3459fbe267c61c4e25283e8176681fa715f283b4 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1564,7 +1564,7 @@ class Helper:
         '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 @@ class Helper:
         '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'),

diff --git a/Lib/token.py b/Lib/token.py
index c4db6c511af0f490f1083de4dca2c39da665ae2c..5f8d53a88397250b81942d9478d1043f3ff6970c 100755 (executable)
--- a/Lib/token.py
+++ b/Lib/token.py
@@ -35,7 +35,6 @@ GREATER = 21
 EQUAL = 22
 DOT = 23
 PERCENT = 24
-BACKQUOTE = 25
 LBRACE = 26
 RBRACE = 27
 EQEQUAL = 28

diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index e33197e396e3a0ecf9c981f9c45d3cb104ca512d..3b94ca5194d04f42e7d717e783e8c6044b610f22 100644 (file)
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -2404,11 +2404,6 @@ validate_atom(node *tree)
             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);