1.1 --- a/rsvp.py Mon Jun 08 00:49:37 2009 +0200
1.2 +++ b/rsvp.py Fri Jun 12 22:03:56 2009 +0200
1.3 @@ -461,10 +461,10 @@
1.4 element = self.objlist[data.classcode + self.operand]
1.5
1.6 if element is not None:
1.7 - attr_index, class_attr, offset = element
1.8 + attr_index, static_attr, offset = element
1.9 if attr_index == self.operand:
1.10 - if class_attr:
1.11 - self.value = self.load(offset) # offset is address of class attribute
1.12 + if static_attr:
1.13 + self.value = self.load(offset) # offset is address of class/module attribute
1.14 else:
1.15 self.value = self.load(ref + offset)
1.16 return
1.17 @@ -480,11 +480,11 @@
1.18 element = self.objlist[data.classcode + self.operand]
1.19
1.20 if element is not None:
1.21 - attr_index, class_attr, offset = element
1.22 + attr_index, static_attr, offset = element
1.23 if attr_index == self.operand:
1.24 - if class_attr:
1.25 - loaded_context, loaded_ref = self.load(offset) # offset is address of class attribute
1.26 - if data.attrcode is None: # absent attrcode == class
1.27 + if static_attr:
1.28 + loaded_context, loaded_ref = self.load(offset) # offset is address of class/module attribute
1.29 + if data.attrcode is None: # absent attrcode == class/module
1.30 self.value = loaded_context, loaded_ref
1.31 else:
1.32 self.value = self._LoadAddressContextCond(loaded_context, loaded_ref, inst_ref)
1.33 @@ -501,9 +501,9 @@
1.34 element = self.objlist[data.classcode + self.operand]
1.35
1.36 if element is not None:
1.37 - attr_index, class_attr, offset = element
1.38 + attr_index, static_attr, offset = element
1.39 if attr_index == self.operand:
1.40 - if class_attr:
1.41 + if static_attr:
1.42 self.exception = self._MakeObject(2, self.type_error_instance)
1.43 return self.RaiseException()
1.44 else:
1.45 @@ -715,7 +715,7 @@
1.46
1.47 # Insist on instance vs. class.
1.48
1.49 - if data.attrcode is None: # absent attrcode == class
1.50 + if data.attrcode is None: # absent attrcode == class/module
1.51 return 0
1.52
1.53 if target_data.attrcode is not None: # present attrcode == instance
1.54 @@ -726,7 +726,7 @@
1.55 element = self.objlist[target_data.classcode + data.attrcode]
1.56
1.57 if element is not None:
1.58 - attr_index, class_attr, offset = element
1.59 + attr_index, static_attr, offset = element
1.60 return attr_index == data.attrcode
1.61 else:
1.62 return 0