1.1 --- a/rsvp.py Tue Dec 02 01:13:19 2008 +0100
1.2 +++ b/rsvp.py Fri Dec 12 00:59:44 2008 +0100
1.3 @@ -257,9 +257,11 @@
1.4 instructions would otherwise have.
1.5 """
1.6
1.7 - for input in (self.instruction.input, self.instruction.source):
1.8 - if input is not None:
1.9 - self.perform(input)
1.10 + if self.instruction.source is not None:
1.11 + self.perform(self.instruction.source)
1.12 + self.source = self.value
1.13 + if self.instruction.input is not None:
1.14 + self.perform(self.instruction.input)
1.15
1.16 def jump(self, addr, next):
1.17
1.18 @@ -318,12 +320,12 @@
1.19 def LoadAttr(self):
1.20 context, ref = self.value
1.21 # Retrieved context should already be appropriate for the instance.
1.22 - self.value = self.load(ref + self.operand)
1.23 + self.value = self.load(ref + self.operand + 1)
1.24
1.25 def StoreAttr(self):
1.26 context, ref = self.value
1.27 # Target should already be an instance.
1.28 - self.save(ref + self.operand, self.source)
1.29 + self.save(ref + self.operand + 1, self.source)
1.30
1.31 def LoadAttrIndex(self):
1.32 context, ref = self.value