1.1 --- a/micropython/__init__.py Thu Jan 13 23:58:12 2011 +0100
1.2 +++ b/micropython/__init__.py Sat Jan 29 21:07:27 2011 +0100
1.3 @@ -5,7 +5,7 @@
1.4 from the simplify package but has had various details related to that package
1.5 removed.
1.6
1.7 -Copyright (C) 2006, 2007, 2008, 2009, 2010 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
1.12 @@ -142,7 +142,7 @@
1.13 # Append classes and functions to the image.
1.14
1.15 for obj in module.all_objects:
1.16 - if isinstance(obj, micropython.inspect.Class):
1.17 + if isinstance(obj, micropython.data.Class):
1.18
1.19 # Add header details.
1.20
1.21 @@ -168,7 +168,7 @@
1.22 # level, and the code location is set within the code
1.23 # generation process for the module.
1.24
1.25 - elif isinstance(obj, micropython.inspect.Function):
1.26 + elif isinstance(obj, micropython.data.Function):
1.27
1.28 # Add header details.
1.29
1.30 @@ -270,7 +270,7 @@
1.31 # with descendant information.
1.32
1.33 for obj in module.all_objects:
1.34 - if isinstance(obj, micropython.inspect.Class):
1.35 + if isinstance(obj, micropython.data.Class):
1.36
1.37 # Prevent ambiguous classes.
1.38
1.39 @@ -302,14 +302,14 @@
1.40
1.41 for module in self.importer.get_modules():
1.42 for obj in module.all_objects:
1.43 - if isinstance(obj, micropython.inspect.Function):
1.44 + if isinstance(obj, micropython.data.Function):
1.45 t.add(obj.full_name(), obj.parameters())
1.46
1.47 # Classes are callable, too.
1.48 # Take details of the appropriate __init__ method to make an
1.49 # entry for an instantiation function for the class.
1.50
1.51 - elif isinstance(obj, micropython.inspect.Class):
1.52 + elif isinstance(obj, micropython.data.Class):
1.53 t.add(obj.get_instantiator().full_name(), obj.get_instantiator().parameters())
1.54
1.55 # Filter out all parameter table entries not referenced by keyword