1.1 --- a/simplify.py Sun Oct 22 00:19:39 2006 +0200
1.2 +++ b/simplify.py Sun Oct 22 00:23:03 2006 +0200
1.3 @@ -902,24 +902,40 @@
1.4
1.5 def _visitSlice(self, slice, expr, lower, upper, flags, value=None):
1.6 if flags == "OP_ASSIGN":
1.7 - args = [value]
1.8 - result = InvokeFunction(slice, 1, expr=LoadAttr(slice, expr=expr, name="__setslice__"), star=None, dstar=None, args=[])
1.9 + result = InvokeFunction(slice, 1,
1.10 + expr=LoadAttr(slice,
1.11 + expr=expr,
1.12 + name="__setslice__"
1.13 + ),
1.14 + star=None,
1.15 + dstar=None,
1.16 + args=[lower, upper, value]
1.17 + )
1.18 elif flags == "OP_APPLY":
1.19 args = []
1.20 - result = InvokeFunction(slice, 1, expr=LoadAttr(slice, expr=expr, name="__getslice__"), star=None, dstar=None, args=[])
1.21 + result = InvokeFunction(slice, 1,
1.22 + expr=LoadAttr(slice,
1.23 + expr=expr,
1.24 + name="__getslice__"
1.25 + ),
1.26 + star=None,
1.27 + dstar=None,
1.28 + args=[lower, upper]
1.29 + )
1.30 elif flags == "OP_DELETE":
1.31 args = []
1.32 - result = InvokeFunction(slice, 1, expr=LoadAttr(slice, expr=expr, name="__delslice__"), star=None, dstar=None, args=[])
1.33 + result = InvokeFunction(slice, 1,
1.34 + expr=LoadAttr(slice,
1.35 + expr=expr,
1.36 + name="__delslice__"
1.37 + ),
1.38 + star=None,
1.39 + dstar=None,
1.40 + args=[lower, upper]
1.41 + )
1.42 else:
1.43 raise NotImplementedError, flags
1.44
1.45 - # Add the dimensions.
1.46 -
1.47 - args.insert(0, lower)
1.48 - args.insert(1, upper)
1.49 -
1.50 - result.original = slice
1.51 - result.set_args(args)
1.52 return result
1.53
1.54 def visitSlice(self, slice, in_sequence=0):
1.55 @@ -928,23 +944,40 @@
1.56
1.57 def _visitSubscript(self, subscript, expr, subs, flags, value=None):
1.58 if flags == "OP_ASSIGN":
1.59 - args = [value]
1.60 - result = InvokeFunction(subscript, 1, expr=LoadAttr(subscript, expr=expr, name="__setitem__"), star=None, dstar=None, args=[])
1.61 + result = InvokeFunction(subscript, 1,
1.62 + expr=LoadAttr(subscript,
1.63 + expr=expr,
1.64 + name="__setitem__"
1.65 + ),
1.66 + star=None,
1.67 + dstar=None,
1.68 + args=[subs, value]
1.69 + )
1.70 elif flags == "OP_APPLY":
1.71 args = []
1.72 - result = InvokeFunction(subscript, 1, expr=LoadAttr(subscript, expr=expr, name="__getitem__"), star=None, dstar=None, args=[])
1.73 + result = InvokeFunction(subscript, 1,
1.74 + expr=LoadAttr(subscript,
1.75 + expr=expr,
1.76 + name="__getitem__"
1.77 + ),
1.78 + star=None,
1.79 + dstar=None,
1.80 + args=[subs]
1.81 + )
1.82 elif flags == "OP_DELETE":
1.83 args = []
1.84 - result = InvokeFunction(subscript, 1, expr=LoadAttr(subscript, expr=expr, name="__delitem__"), star=None, dstar=None, args=[])
1.85 + result = InvokeFunction(subscript, 1,
1.86 + expr=LoadAttr(subscript,
1.87 + expr=expr,
1.88 + name="__delitem__"
1.89 + ),
1.90 + star=None,
1.91 + dstar=None,
1.92 + args=[subs]
1.93 + )
1.94 else:
1.95 raise NotImplementedError, flags
1.96
1.97 - # Add the dimensions.
1.98 -
1.99 - args.insert(0, subs)
1.100 -
1.101 - result.original = subscript
1.102 - result.set_args(args)
1.103 return result
1.104
1.105 def _visitSubscriptSubs(self, node, subs):
1.106 @@ -955,7 +988,8 @@
1.107 expr=LoadName(node, name="tuple"),
1.108 args=self.dispatches(subs),
1.109 star=None,
1.110 - dstar=None)
1.111 + dstar=None
1.112 + )
1.113
1.114 def visitSubscript(self, subscript, in_sequence=0):
1.115 return self._visitSubscript(
1.116 @@ -1024,14 +1058,14 @@
1.117 if has_star:
1.118 star = (
1.119 function.argnames[npositional],
1.120 - InvokeFunction(function, expr=LoadName(function, name="list"), args=[], star=None, dstar=None)
1.121 + InvokeFunction(expr=LoadName(function, name="list"), args=[], star=None, dstar=None)
1.122 )
1.123 else:
1.124 star = None
1.125 if has_dstar:
1.126 dstar = (
1.127 function.argnames[npositional + has_star],
1.128 - InvokeFunction(function, expr=LoadName(function, name="dict"), args=[], star=None, dstar=None)
1.129 + InvokeFunction(expr=LoadName(function, name="dict"), args=[], star=None, dstar=None)
1.130 )
1.131 else:
1.132 dstar = None
1.133 @@ -1040,14 +1074,14 @@
1.134 for i in range(0, npositional - ndefaults):
1.135 params.append((function.argnames[i], None))
1.136
1.137 - # NOTE: Fix/process defaults.
1.138 + # Process defaults.
1.139
1.140 for i in range(0, ndefaults):
1.141 default = function.defaults[i]
1.142 if default is not None:
1.143 params.append((function.argnames[npositional - ndefaults + i], self.dispatch(default)))
1.144 else:
1.145 - params.append((function.argnames[npositional - ndefaults + i], default))
1.146 + params.append((function.argnames[npositional - ndefaults + i], None))
1.147
1.148 subprogram.params = params
1.149 subprogram.star = star