1.1 --- a/rsvplib.py Wed Aug 24 01:01:24 2011 +0200
1.2 +++ b/rsvplib.py Wed Aug 24 01:05:46 2011 +0200
1.3 @@ -92,8 +92,8 @@
1.4 # Return the new object.
1.5 # Introduce object as context for the new object.
1.6
1.7 - self.machine.LoadImmediate(addr, "result_context")
1.8 - self.machine.LoadImmediate(addr, "result")
1.9 + self.machine.LoadImmediate(addr, "working_context")
1.10 + self.machine.LoadImmediate(addr, "working")
1.11
1.12 def native_logical_op(self, op):
1.13 left = self.machine.load_from_frame(0)
1.14 @@ -105,11 +105,11 @@
1.15 # NOTE: The data is considered ready to use.
1.16
1.17 if op(self.machine.load(left_data), self.machine.load(right_data)):
1.18 - self.machine.LoadImmediate(self.constants[True], "result_context")
1.19 - self.machine.LoadImmediate(self.constants[True], "result")
1.20 + self.machine.LoadImmediate(self.constants[True], "working_context")
1.21 + self.machine.LoadImmediate(self.constants[True], "working")
1.22 else:
1.23 - self.machine.LoadImmediate(self.constants[False], "result_context")
1.24 - self.machine.LoadImmediate(self.constants[False], "result")
1.25 + self.machine.LoadImmediate(self.constants[False], "working_context")
1.26 + self.machine.LoadImmediate(self.constants[False], "working")
1.27
1.28 # Operators.
1.29 # Although this takes a short-cut by using the operator module, testing is
1.30 @@ -167,8 +167,8 @@
1.31 # Return the new object.
1.32 # Introduce object as context for the new object.
1.33
1.34 - self.machine.LoadImmediate(addr, "result_context")
1.35 - self.machine.LoadImmediate(addr, "result")
1.36 + self.machine.LoadImmediate(addr, "working_context")
1.37 + self.machine.LoadImmediate(addr, "working")
1.38
1.39 # Various built-in methods.
1.40
1.41 @@ -212,8 +212,8 @@
1.42 # Get the item itself.
1.43
1.44 data = self.machine.load(fragment.ref + self.fragment_data_offset + item_pos)
1.45 - self.machine.LoadImmediate(data.context, "result_context")
1.46 - self.machine.LoadImmediate(data.ref, "result")
1.47 + self.machine.LoadImmediate(data.context, "working_context")
1.48 + self.machine.LoadImmediate(data.ref, "working")
1.49
1.50 def builtins_list_len(self):
1.51 obj_value = self.machine.load_from_frame(0)
1.52 @@ -240,8 +240,8 @@
1.53 # Return the new object.
1.54 # Introduce object as context for the new object.
1.55
1.56 - self.machine.LoadImmediate(addr, "result_context")
1.57 - self.machine.LoadImmediate(addr, "result")
1.58 + self.machine.LoadImmediate(addr, "working_context")
1.59 + self.machine.LoadImmediate(addr, "working")
1.60
1.61 def builtins_list_append(self):
1.62 obj_value = self.machine.load_from_frame(0)
1.63 @@ -302,8 +302,8 @@
1.64 fragment_member = obj_value.ref + self.instance_data_offset
1.65
1.66 if self.machine._CheckInstance(obj_value.ref, self.tuple_class):
1.67 - self.machine.LoadImmediate(obj_value.context, "result_context")
1.68 - self.machine.LoadImmediate(obj_value.ref, "result")
1.69 + self.machine.LoadImmediate(obj_value.context, "working_context")
1.70 + self.machine.LoadImmediate(obj_value.ref, "working")
1.71 return
1.72
1.73 # Reject non-list, non-tuple types.
1.74 @@ -334,8 +334,8 @@
1.75 # Return the new object.
1.76 # Introduce object as context for the new object.
1.77
1.78 - self.machine.LoadImmediate(addr, "result_context")
1.79 - self.machine.LoadImmediate(addr, "result")
1.80 + self.machine.LoadImmediate(addr, "working_context")
1.81 + self.machine.LoadImmediate(addr, "working")
1.82
1.83 def builtins_tuple_len(self):
1.84 obj_value = self.machine.load_from_frame(0)
1.85 @@ -357,8 +357,8 @@
1.86 # Return the new object.
1.87 # Introduce object as context for the new object.
1.88
1.89 - self.machine.LoadImmediate(addr, "result_context")
1.90 - self.machine.LoadImmediate(addr, "result")
1.91 + self.machine.LoadImmediate(addr, "working_context")
1.92 + self.machine.LoadImmediate(addr, "working")
1.93
1.94 def builtins_tuple_get_single_item(self):
1.95 obj_value = self.machine.load_from_frame(0)
1.96 @@ -382,8 +382,8 @@
1.97 # Get the item.
1.98
1.99 data = self.machine.load(fragment_member + item_pos)
1.100 - self.machine.LoadImmediate(data.context, "result_context")
1.101 - self.machine.LoadImmediate(data.ref, "result")
1.102 + self.machine.LoadImmediate(data.context, "working_context")
1.103 + self.machine.LoadImmediate(data.ref, "working")
1.104
1.105 def builtins_getattr(self):
1.106 obj_value = self.machine.load_from_frame(0)
1.107 @@ -412,8 +412,8 @@
1.108 loaded_data = self.machine._LoadAddressContextCond(loaded_data.context, loaded_data.ref, obj_value.ref)
1.109 else:
1.110 loaded_data = self.machine.load(obj_value.ref + offset)
1.111 - self.machine.LoadImmediate(loaded_data.context, "result_context")
1.112 - self.machine.LoadImmediate(loaded_data.ref, "result")
1.113 + self.machine.LoadImmediate(loaded_data.context, "working_context")
1.114 + self.machine.LoadImmediate(loaded_data.ref, "working")
1.115 return
1.116
1.117 self.machine.LoadImmediate(self.machine._MakeObject(self.instance_size, self.attr_error_instance), "exception")
1.118 @@ -424,11 +424,11 @@
1.119 cls_value = self.machine.load_from_frame(1)
1.120
1.121 if self.machine._CheckInstance(obj_value.ref, cls_value.ref):
1.122 - self.machine.LoadImmediate(self.constants[True], "result_context")
1.123 - self.machine.LoadImmediate(self.constants[True], "result")
1.124 + self.machine.LoadImmediate(self.constants[True], "working_context")
1.125 + self.machine.LoadImmediate(self.constants[True], "working")
1.126 else:
1.127 - self.machine.LoadImmediate(self.constants[False], "result_context")
1.128 - self.machine.LoadImmediate(self.constants[False], "result")
1.129 + self.machine.LoadImmediate(self.constants[False], "working_context")
1.130 + self.machine.LoadImmediate(self.constants[False], "working")
1.131
1.132 def builtins_print(self):
1.133 # NOTE: Do nothing for now.