make all unary operators have a single child node called expr

diff --git a/Lib/compiler/ast.py b/Lib/compiler/ast.py
index 1715a7f65c4918d2fd2ef781f5cee33eae01df09..b6744b67f72af7c4255e44247af3e4c6cd70df78 100644 (file)
--- a/Lib/compiler/ast.py
+++ b/Lib/compiler/ast.py
@@ -414,7 +414,7 @@ class Backquote(Node):
   nodes['backquote'] = 'Backquote'
 
   def __init__(self, node):
-    self.node = node
+    self.expr = node
     self._children = ('backquote', node)
 
   def __repr__(self):
@@ -657,7 +657,7 @@ class UnaryAdd(Node):
   nodes['unary+'] = 'UnaryAdd'
 
   def __init__(self, node):
-    self.node = node
+    self.expr = node
     self._children = ('unary+', node)
 
   def __repr__(self):
@@ -667,7 +667,7 @@ class UnarySub(Node):
   nodes['unary-'] = 'UnarySub'
 
   def __init__(self, node):
-    self.node = node
+    self.expr = node
     self._children = ('unary-', node)
 
   def __repr__(self):
@@ -677,7 +677,7 @@ class Invert(Node):
   nodes['invert'] = 'Invert'
 
   def __init__(self, node):
-    self.node = node
+    self.expr = node
     self._children = ('invert', node)
 
   def __repr__(self):

diff --git a/Tools/compiler/compiler/ast.py b/Tools/compiler/compiler/ast.py
index 1715a7f65c4918d2fd2ef781f5cee33eae01df09..b6744b67f72af7c4255e44247af3e4c6cd70df78 100644 (file)
--- a/Tools/compiler/compiler/ast.py
+++ b/Tools/compiler/compiler/ast.py
@@ -414,7 +414,7 @@ class Backquote(Node):
   nodes['backquote'] = 'Backquote'
 
   def __init__(self, node):
-    self.node = node
+    self.expr = node
     self._children = ('backquote', node)
 
   def __repr__(self):
@@ -657,7 +657,7 @@ class UnaryAdd(Node):
   nodes['unary+'] = 'UnaryAdd'
 
   def __init__(self, node):
-    self.node = node
+    self.expr = node
     self._children = ('unary+', node)
 
   def __repr__(self):
@@ -667,7 +667,7 @@ class UnarySub(Node):
   nodes['unary-'] = 'UnarySub'
 
   def __init__(self, node):
-    self.node = node
+    self.expr = node
     self._children = ('unary-', node)
 
   def __repr__(self):
@@ -677,7 +677,7 @@ class Invert(Node):
   nodes['invert'] = 'Invert'
 
   def __init__(self, node):
-    self.node = node
+    self.expr = node
     self._children = ('invert', node)
 
   def __repr__(self):