# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1477347121 -7200
# Node ID 331aa7c1517856cfc7be24095645a2f59b136bd1
# Parent  6750513b781b06c976025386439510f1edaf1db1
More elegantly allocated the context parameter for all callables.
Rewrote the list comprehension result in get_allocated_locations.

diff -r 6750513b781b -r 331aa7c15178 optimiser.py
--- a/optimiser.py	Mon Oct 24 23:05:37 2016 +0200
+++ b/optimiser.py	Tue Oct 25 00:12:01 2016 +0200
@@ -304,7 +304,7 @@
 
         "Populate parameter tables using parameter information."
 
-        self.arg_locations = get_allocated_locations(self.importer.function_parameters, get_parameters_and_sizes)
+        self.arg_locations = [set()] + get_allocated_locations(self.importer.function_parameters, get_parameters_and_sizes)
 
     def position_attributes(self):
 
@@ -568,16 +568,16 @@
 
         for i, argnames in enumerate(self.arg_locations):
 
-            # Position the arguments after the first context argument.
+            # Position the arguments.
 
             for argname in argnames:
-                param_locations[argname] = i + 1
+                param_locations[argname] = i
 
         for name, argnames in self.importer.function_parameters.items():
 
             # Allocate an extra context parameter in the table.
 
-            l = self.parameters[name] = [None] + [None] * len(argnames)
+            l = self.parameters[name] = [None] * len(argnames)
 
             # Store an entry for the name along with the name's position in the
             # parameter list.
@@ -593,7 +593,7 @@
                 # Indicate an argument list position starting from 1 (after the
                 # initial context argument).
 
-                l[position] = (argname, pos + 1)
+                l[position] = (argname, pos)
 
     def populate_tables(self):
 
@@ -832,6 +832,13 @@
     # Return the list of attribute names from each row of the allocated
     # attributes table.
 
-    return [set([attrname for attrname in attrnames if attrname]) for attrnames in allocated]
+    locations = []
+    for attrnames in allocated:
+        l = set()
+        for attrname in attrnames:
+            if attrname:
+                l.add(attrname)
+        locations.append(l)
+    return locations
 
 # vim: tabstop=4 expandtab shiftwidth=4