# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1486938282 -3600
# Node ID d7769551b05117c79acb90286edadbb5eda41c0a
# Parent  d015ced36450b1c4d3a8cd63dbb1c79bc42c4f66# Parent  7185fb95c3bc88f0eec78b978311eecf3fc26cbe
Merged changes from the default branch.

diff -r d015ced36450 -r d7769551b051 generator.py
--- a/generator.py	Sun Feb 12 01:22:58 2017 +0100
+++ b/generator.py	Sun Feb 12 23:24:42 2017 +0100
@@ -272,26 +272,8 @@
                 function_instance_attrs["__fn__"] = path
                 function_instance_attrs["__args__"] = encode_size("pmin", path)
 
-                # Produce two structures where a method is involved.
-
-                parent, name = path.rsplit(".", 1)
-                parent_ref = self.importer.get_object(parent)
-                parent_kind = parent_ref and parent_ref.get_kind()
-
-                # Populate and write each structure.
-
-                if parent_kind == "<class>":
-
-                    # A method.
-
-                    structure = self.populate_function(path, function_instance_attrs)
-                    self.write_structure(f_decls, f_defs, path, table_name, structure)
-
-                else:
-                    # A normal function.
-
-                    structure = self.populate_function(path, function_instance_attrs)
-                    self.write_structure(f_decls, f_defs, path, table_name, structure)
+                structure = self.populate_function(path, function_instance_attrs)
+                self.write_structure(f_decls, f_defs, path, table_name, structure)
 
                 # Functions with defaults need to declare instance structures.