[pypy-svn] r20497 - pypy/branch/somepbc-refactoring/pypy/annotation

[arigo at codespeak.net]

Author: arigo
Date: Thu Dec  1 15:05:09 2005
New Revision: 20497

Modified:
   pypy/branch/somepbc-refactoring/pypy/annotation/bookkeeper.py
Log:
(mwh)

Oups, this was suppose to go before r20496 :)

Be more precise about annotating the result of a getattr operation on 
a pbc (makes most difference when the PBC is a constant).


Modified: pypy/branch/somepbc-refactoring/pypy/annotation/bookkeeper.py
==============================================================================
--- pypy/branch/somepbc-refactoring/pypy/annotation/bookkeeper.py	(original)
+++ pypy/branch/somepbc-refactoring/pypy/annotation/bookkeeper.py	Thu Dec  1 15:05:09 2005
@@ -500,11 +500,12 @@
         attrfamily.read_locations[position] = True
 
         actuals = []
-        for desc in attrfamily.descs:
+        for desc in descs:
             actuals.append(desc.s_read_attribute(attr))
         s_result = unionof(*actuals)
 
-        attrfamily.attrs[attr] = s_result
+        attrfamily.attrs[attr] = unionof(s_result,
+            attrfamily.attrs.get(attr, s_ImpossibleValue))
 
         if change:
             for position in attrfamily.read_locations: