1.1 --- a/compiler/ast.py Mon Jan 09 20:01:19 2017 +0100
1.2 +++ b/compiler/ast.py Mon Jan 09 20:01:53 2017 +0100
1.3 @@ -931,25 +931,6 @@
1.4 self.else_ and "\nelse:%s" % indent("\n%s" % self.else_) or ""
1.5 )
1.6
1.7 -class IfExp(Node):
1.8 - def __init__(self, test, then, else_, lineno=None):
1.9 - self.test = test
1.10 - self.then = then
1.11 - self.else_ = else_
1.12 - self.lineno = lineno
1.13 -
1.14 - def getChildren(self):
1.15 - return self.test, self.then, self.else_
1.16 -
1.17 - def getChildNodes(self):
1.18 - return self.test, self.then, self.else_
1.19 -
1.20 - def __repr__(self):
1.21 - return "IfExp(%r, %r, %r)" % (self.test, self.then, self.else_)
1.22 -
1.23 - def __str__(self):
1.24 - return "%s if %s else %s" % (self.then, self.test, self.else_)
1.25 -
1.26 class Import(Node):
1.27 def __init__(self, names, lineno=None):
1.28 self.names = names
1.29 @@ -1074,128 +1055,6 @@
1.30 def __str__(self):
1.31 return "[%s]" % ", ".join(map(str, self.nodes))
1.32
1.33 -class ListComp(Node):
1.34 - def __init__(self, expr, quals, lineno=None):
1.35 - self.expr = expr
1.36 - self.quals = quals
1.37 - self.lineno = lineno
1.38 -
1.39 - def getChildren(self):
1.40 - children = []
1.41 - children.append(self.expr)
1.42 - children.extend(flatten(self.quals))
1.43 - return tuple(children)
1.44 -
1.45 - def getChildNodes(self):
1.46 - nodelist = []
1.47 - nodelist.append(self.expr)
1.48 - nodelist.extend(flatten_nodes(self.quals))
1.49 - return tuple(nodelist)
1.50 -
1.51 - def __repr__(self):
1.52 - return "ListComp(%r, %r)" % (self.expr, self.quals)
1.53 -
1.54 - def __str__(self):
1.55 - return "[%s %s]" % (self.expr, " ".join(map(str, self.quals)))
1.56 -
1.57 -class ListCompFor(Node):
1.58 - def __init__(self, assign, list, ifs, lineno=None):
1.59 - self.assign = assign
1.60 - self.list = list
1.61 - self.ifs = ifs
1.62 - self.lineno = lineno
1.63 -
1.64 - def getChildren(self):
1.65 - children = []
1.66 - children.append(self.assign)
1.67 - children.append(self.list)
1.68 - children.extend(flatten(self.ifs))
1.69 - return tuple(children)
1.70 -
1.71 - def getChildNodes(self):
1.72 - nodelist = []
1.73 - nodelist.append(self.assign)
1.74 - nodelist.append(self.list)
1.75 - nodelist.extend(flatten_nodes(self.ifs))
1.76 - return tuple(nodelist)
1.77 -
1.78 - def __repr__(self):
1.79 - return "ListCompFor(%r, %r, %r)" % (self.assign, self.list, self.ifs)
1.80 -
1.81 - def __str__(self):
1.82 - return "for %s in %s%s" % (
1.83 - self.assign, self.list,
1.84 - self.ifs and " ".join(map(str, self.ifs)) or ""
1.85 - )
1.86 -
1.87 -class ListCompIf(Node):
1.88 - def __init__(self, test, lineno=None):
1.89 - self.test = test
1.90 - self.lineno = lineno
1.91 -
1.92 - def getChildren(self):
1.93 - return self.test,
1.94 -
1.95 - def getChildNodes(self):
1.96 - return self.test,
1.97 -
1.98 - def __repr__(self):
1.99 - return "ListCompIf(%r)" % (self.test,)
1.100 -
1.101 - def __str__(self):
1.102 - return " if %s" % self.test
1.103 -
1.104 -class SetComp(Node):
1.105 - def __init__(self, expr, quals, lineno=None):
1.106 - self.expr = expr
1.107 - self.quals = quals
1.108 - self.lineno = lineno
1.109 -
1.110 - def getChildren(self):
1.111 - children = []
1.112 - children.append(self.expr)
1.113 - children.extend(flatten(self.quals))
1.114 - return tuple(children)
1.115 -
1.116 - def getChildNodes(self):
1.117 - nodelist = []
1.118 - nodelist.append(self.expr)
1.119 - nodelist.extend(flatten_nodes(self.quals))
1.120 - return tuple(nodelist)
1.121 -
1.122 - def __repr__(self):
1.123 - return "SetComp(%r, %r)" % (self.expr, self.quals)
1.124 -
1.125 - def __str__(self):
1.126 - return "{%s %s}" % (self.expr, " ".join(map(str, self.quals)))
1.127 -
1.128 -class DictComp(Node):
1.129 - def __init__(self, key, value, quals, lineno=None):
1.130 - self.key = key
1.131 - self.value = value
1.132 - self.quals = quals
1.133 - self.lineno = lineno
1.134 -
1.135 - def getChildren(self):
1.136 - children = []
1.137 - children.append(self.key)
1.138 - children.append(self.value)
1.139 - children.extend(flatten(self.quals))
1.140 - return tuple(children)
1.141 -
1.142 - def getChildNodes(self):
1.143 - nodelist = []
1.144 - nodelist.append(self.key)
1.145 - nodelist.append(self.value)
1.146 - nodelist.extend(flatten_nodes(self.quals))
1.147 - return tuple(nodelist)
1.148 -
1.149 - def __repr__(self):
1.150 - return "DictComp(%r, %r, %r)" % (self.key, self.value, self.quals)
1.151 -
1.152 - def __str__(self):
1.153 - return "{%s : %s %s}" % (self.key, self.value, " ".join(map(str, self.quals)))
1.154 -
1.155 class Mod(Node, Operator):
1.156 def __init__(self, leftright, lineno=None):
1.157 self.left = leftright[0]
1.158 @@ -1765,23 +1624,6 @@
1.159 indent("\n%s" % self.body),
1.160 )
1.161
1.162 -class Yield(Node):
1.163 - def __init__(self, value, lineno=None):
1.164 - self.value = value
1.165 - self.lineno = lineno
1.166 -
1.167 - def getChildren(self):
1.168 - return self.value,
1.169 -
1.170 - def getChildNodes(self):
1.171 - return self.value,
1.172 -
1.173 - def __repr__(self):
1.174 - return "Yield(%r)" % (self.value,)
1.175 -
1.176 - def __str__(self):
1.177 - return "yield %s" % self.value
1.178 -
1.179 for name, obj in globals().items():
1.180 if isinstance(obj, type) and issubclass(obj, Node):
1.181 nodes[name.lower()] = obj