# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1481327777 -3600
# Node ID 5e5de08b522bb4cc088130b29c75a3e9a5ecf7c6
# Parent  839097666c7d38c1ca95d3ae8829440b9a707d76
Use path-based constants and definitions for the minimum number of parameters.
Retain signature-based constants and definitions for the maximum number, since
this number is equivalent to the number of parameters recorded in each distinct
parameter table.

diff -r 839097666c7d -r 5e5de08b522b generator.py
--- a/generator.py	Sat Dec 10 00:11:49 2016 +0100
+++ b/generator.py	Sat Dec 10 00:56:17 2016 +0100
@@ -224,9 +224,8 @@
 
                         # Define special attributes.
 
-                        signature = self.get_signature_for_callable(path)
                         attrs["__fn__"] = path
-                        attrs["__args__"] = encode_size("pmin", signature)
+                        attrs["__args__"] = encode_size("pmin", path)
 
                     self.populate_structure(Reference(kind, path), attrs, kind, structure)
 
@@ -278,9 +277,8 @@
 
                 # Set a special callable attribute on the instance.
 
-                signature = self.get_signature_for_callable(path)
                 function_instance_attrs["__fn__"] = path
-                function_instance_attrs["__args__"] = encode_size("pmin", signature)
+                function_instance_attrs["__args__"] = encode_size("pmin", path)
 
                 # Produce two structures where a method is involved.
 
@@ -378,19 +376,18 @@
             min_sizes = {}
             max_sizes = {}
 
-            for path, parameters in self.optimiser.parameters.items():
-                argmin, argmax = self.get_argument_limits(path)
+            # Determine the minimum number of parameters for each 
 
-                # Use the parameter signature in the constant names.
+            for path in self.optimiser.parameters.keys():
+                argmin, argmax = self.get_argument_limits(path)
+                min_sizes[path] = argmin
 
+            # Use the parameter table details to define the maximum number.
+            # The context is already present in the collection.
+
+            for parameters in parameter_tables:
                 signature = self.get_parameter_signature(parameters)
-                min_sizes[signature] = argmin
-                max_sizes[signature] = argmax
-
-                # Record instantiator limits.
-
-                if path.endswith(".__init__"):
-                    path = path[:-len(".__init__")]
+                max_sizes[signature] = len(parameters)
 
             self.write_size_constants(f_consts, "pmin", min_sizes, 0)
             self.write_size_constants(f_consts, "pmax", max_sizes, 0)