1.1 --- a/micropython/rsvp.py Sun Jun 12 22:14:36 2011 +0200
1.2 +++ b/micropython/rsvp.py Mon Jun 13 00:18:13 2011 +0200
1.3 @@ -602,11 +602,11 @@
1.4 "Return from a subprogram."
1.5 cost = 2
1.6
1.7 -class LoadResult(Instruction):
1.8 +class LoadResultIntoValue(Instruction):
1.9 "Load into the current value a returned value."
1.10 cost = 1
1.11
1.12 -class StoreResult(Instruction):
1.13 +class LoadValueIntoResult(Instruction):
1.14 "Store the current value as a value to be returned."
1.15 cost = 1
1.16
1.17 @@ -674,7 +674,7 @@
1.18 LoadConst, LoadClass, LoadFunction, LoadName, LoadTemp,
1.19 LoadAddress, LoadAddressContext, LoadAddressContextCond,
1.20 LoadAttr, LoadAttrIndex, LoadAttrIndexContextCond,
1.21 - LoadCallable, LoadContextIntoValue, LoadResult,
1.22 + LoadCallable, LoadContextIntoValue, LoadResultIntoValue,
1.23 LoadException, MakeInstance, MakeFragment,
1.24 CopyExtra
1.25 )
1.26 @@ -682,7 +682,7 @@
1.27 # Instructions which use the current value. (LoadAttrIndexContext not defined.)
1.28
1.29 simple_input_user_instructions = (
1.30 - StoreTemp, StoreFrame, StoreResult, StoreException, # as the value being stored
1.31 + StoreTemp, StoreFrame, LoadValueIntoResult, StoreException, # as the value being stored
1.32 LoadAddressContext, LoadAddressContextCond, # as the object being referenced
1.33 LoadAttr, LoadAttrIndex, LoadAttrIndexContextCond, # as the object being referenced
1.34 StoreAttr, StoreAttrIndex, StoreCallable, # as the object being referenced