# HG changeset patch
# User paulb@jeremy
# Date 1161469383 -7200
# Node ID d5be469d8c12e0558ba21a92808de0211c972389
# Parent  46a34d94ef21582f96513655531690eb8092111a
Tidied argument initialisation.
Removed original node assignments that confuse the viewer functionality.


diff -r 46a34d94ef21 -r d5be469d8c12 simplify.py
--- a/simplify.py	Sun Oct 22 00:19:39 2006 +0200
+++ b/simplify.py	Sun Oct 22 00:23:03 2006 +0200
@@ -902,24 +902,40 @@
 
     def _visitSlice(self, slice, expr, lower, upper, flags, value=None):
         if flags == "OP_ASSIGN":
-            args = [value]
-            result = InvokeFunction(slice, 1, expr=LoadAttr(slice, expr=expr, name="__setslice__"), star=None, dstar=None, args=[])
+            result = InvokeFunction(slice, 1,
+                expr=LoadAttr(slice,
+                    expr=expr,
+                    name="__setslice__"
+                    ),
+                star=None,
+                dstar=None,
+                args=[lower, upper, value]
+                )
         elif flags == "OP_APPLY":
             args = []
-            result = InvokeFunction(slice, 1, expr=LoadAttr(slice, expr=expr, name="__getslice__"), star=None, dstar=None, args=[])
+            result = InvokeFunction(slice, 1,
+                expr=LoadAttr(slice,
+                    expr=expr,
+                    name="__getslice__"
+                    ),
+                star=None,
+                dstar=None,
+                args=[lower, upper]
+                )
         elif flags == "OP_DELETE":
             args = []
-            result = InvokeFunction(slice, 1, expr=LoadAttr(slice, expr=expr, name="__delslice__"), star=None, dstar=None, args=[])
+            result = InvokeFunction(slice, 1,
+                expr=LoadAttr(slice,
+                    expr=expr,
+                    name="__delslice__"
+                    ),
+                star=None,
+                dstar=None,
+                args=[lower, upper]
+                )
         else:
             raise NotImplementedError, flags
 
-        # Add the dimensions.
-
-        args.insert(0, lower)
-        args.insert(1, upper)
-
-        result.original = slice
-        result.set_args(args)
         return result
 
     def visitSlice(self, slice, in_sequence=0):
@@ -928,23 +944,40 @@
 
     def _visitSubscript(self, subscript, expr, subs, flags, value=None):
         if flags == "OP_ASSIGN":
-            args = [value]
-            result = InvokeFunction(subscript, 1, expr=LoadAttr(subscript, expr=expr, name="__setitem__"), star=None, dstar=None, args=[])
+            result = InvokeFunction(subscript, 1,
+                expr=LoadAttr(subscript,
+                    expr=expr,
+                    name="__setitem__"
+                    ),
+                star=None,
+                dstar=None,
+                args=[subs, value]
+                )
         elif flags == "OP_APPLY":
             args = []
-            result = InvokeFunction(subscript, 1, expr=LoadAttr(subscript, expr=expr, name="__getitem__"), star=None, dstar=None, args=[])
+            result = InvokeFunction(subscript, 1,
+                expr=LoadAttr(subscript,
+                    expr=expr,
+                    name="__getitem__"
+                    ),
+                star=None,
+                dstar=None,
+                args=[subs]
+                )
         elif flags == "OP_DELETE":
             args = []
-            result = InvokeFunction(subscript, 1, expr=LoadAttr(subscript, expr=expr, name="__delitem__"), star=None, dstar=None, args=[])
+            result = InvokeFunction(subscript, 1,
+                expr=LoadAttr(subscript,
+                    expr=expr,
+                    name="__delitem__"
+                    ),
+                star=None,
+                dstar=None,
+                args=[subs]
+                )
         else:
             raise NotImplementedError, flags
 
-        # Add the dimensions.
-
-        args.insert(0, subs)
-
-        result.original = subscript
-        result.set_args(args)
         return result
 
     def _visitSubscriptSubs(self, node, subs):
@@ -955,7 +988,8 @@
                 expr=LoadName(node, name="tuple"),
                 args=self.dispatches(subs),
                 star=None,
-                dstar=None)
+                dstar=None
+                )
 
     def visitSubscript(self, subscript, in_sequence=0):
         return self._visitSubscript(
@@ -1024,14 +1058,14 @@
         if has_star:
             star = (
                 function.argnames[npositional],
-                InvokeFunction(function, expr=LoadName(function, name="list"), args=[], star=None, dstar=None)
+                InvokeFunction(expr=LoadName(function, name="list"), args=[], star=None, dstar=None)
                 )
         else:
             star = None
         if has_dstar:
             dstar = (
                 function.argnames[npositional + has_star],
-                InvokeFunction(function, expr=LoadName(function, name="dict"), args=[], star=None, dstar=None)
+                InvokeFunction(expr=LoadName(function, name="dict"), args=[], star=None, dstar=None)
                 )
         else:
             dstar = None
@@ -1040,14 +1074,14 @@
         for i in range(0, npositional - ndefaults):
             params.append((function.argnames[i], None))
 
-        # NOTE: Fix/process defaults.
+        # Process defaults.
 
         for i in range(0, ndefaults):
             default = function.defaults[i]
             if default is not None:
                 params.append((function.argnames[npositional - ndefaults + i], self.dispatch(default)))
             else:
-                params.append((function.argnames[npositional - ndefaults + i], default))
+                params.append((function.argnames[npositional - ndefaults + i], None))
 
         subprogram.params = params
         subprogram.star = star