# HG changeset patch # User Paul Boddie # Date 1310847356 -7200 # Node ID a1d9f82cb804a7dd4c061b2a586b6f2899a8d43e # Parent a1aa6fb9965fe8a110e8cd2d0770598cacaa3590 Removed the redundant node parameter from various methods. diff -r a1aa6fb9965f -r a1d9f82cb804 micropython/trans.py --- a/micropython/trans.py Tue Jul 05 00:40:32 2011 +0200 +++ b/micropython/trans.py Sat Jul 16 22:15:56 2011 +0200 @@ -45,13 +45,13 @@ self.new_op(MakeInstance(n + 1)) - def make_exception(self, name, node): + def make_exception(self, name): "Make an exception of the given 'name' using 'node'." # NOTE: Reserving an attribute. - self.make_instance(self.get_builtin_class(name, node), 1) + self.make_instance(self.get_builtin_class(name), 1) # Name-related methods. @@ -66,20 +66,17 @@ "Generate an instruction loading 'name' for the given 'node'." - self.new_op(LoadAddress(self.get_builtin(name, node))) + self.new_op(LoadAddress(self.get_builtin(name))) - def get_builtin_class(self, name, node): + def get_builtin_class(self, name): - "Return the built-in class with the given 'name' for the given 'node'." + "Return the built-in class with the given 'name'." - return self.get_builtin(name, node).get_value() + return self.get_builtin(name).get_value() def get_builtin(self, name, node): - """ - Return the built-in module definition for the given 'name', used by the - given 'node'. - """ + "Return the built-in module definition for the given 'name'." if self.builtins is not None: try: @@ -165,7 +162,7 @@ # Where the type is inappropriate, raise an exception. - self.make_exception("TypeError", node) + self.make_exception("TypeError") self.new_op(StoreException()) self.new_op(RaiseException()) @@ -210,7 +207,7 @@ if attrname == "__class__": if isinstance(target, Class): if AddressInstruction is LoadAddress: - self.replace_active_value(LoadAddress(self.get_builtin("type", node))) + self.replace_active_value(LoadAddress(self.get_builtin("type"))) return else: raise TranslateError("Assigning to __class__ is not permitted.") @@ -791,7 +788,7 @@ self.new_op(DropFrame()) self.new_op(LoadResultIntoValue()) - self.make_exception("TypeError", node) + self.make_exception("TypeError") self.new_op(StoreException()) self.new_op(RaiseException()) @@ -1003,7 +1000,7 @@ dynamic = function.is_dynamic() if dynamic: - self.make_instance(self.get_builtin_class("function", function), len(attr_to_default)) + self.make_instance(self.get_builtin_class("function"), len(attr_to_default)) temp = self.get_temp() for attr, default in attr_to_default: @@ -1077,7 +1074,7 @@ raise TranslateError("Module has no attribute %r." % name) elif scope == "builtins": - self.new_op(AddressInstruction(self.get_builtin(name, node))) + self.new_op(AddressInstruction(self.get_builtin(name))) else: # NOTE: This may happen because a class attribute is optimised away. @@ -1212,7 +1209,7 @@ # Reserve space for the elements themselves. - self.make_instance(self.get_builtin_class("tuple", node), len(node.nodes)) + self.make_instance(self.get_builtin_class("tuple"), len(node.nodes)) temp = self.get_temp() # Store using 0-based index values. @@ -1236,7 +1233,7 @@ # Reserve space for _elements (the fragment reference). - self.make_instance(self.get_builtin_class("list", node), 1) + self.make_instance(self.get_builtin_class("list"), 1) list_temp = self.get_temp() self.new_op(list_temp) self.new_op(StoreAttr(Attr(0, None, None))) # _elements is at position 0