[pypy-svn] r11424 - pypy/dist/pypy/interpreter

[arigo at codespeak.net]

Author: arigo
Date: Mon Apr 25 17:06:30 2005
New Revision: 11424

Modified:
   pypy/dist/pypy/interpreter/pyopcode.py
   pypy/dist/pypy/interpreter/typedef.py
Log:
Tweaks for the annotator (don't mix None with ints or bools)


Modified: pypy/dist/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyopcode.py	(original)
+++ pypy/dist/pypy/interpreter/pyopcode.py	Mon Apr 25 17:06:30 2005
@@ -692,7 +692,7 @@
             raise pyframe.BytecodeCorruption            
         fn(f, oparg)
 
-    def MISSING_OPCODE(f, oparg=None):
+    def MISSING_OPCODE(f, oparg=-1):
         raise pyframe.BytecodeCorruption, "unknown opcode"
 
     ### dispatch_table ###

Modified: pypy/dist/pypy/interpreter/typedef.py
==============================================================================
--- pypy/dist/pypy/interpreter/typedef.py	(original)
+++ pypy/dist/pypy/interpreter/typedef.py	Mon Apr 25 17:06:30 2005
@@ -14,7 +14,9 @@
         "NOT_RPYTHON: initialization-time only"
         self.name = __name
         self.base = __base
-        self.hasdict = '__dict__' in rawdict or (__base and __base.hasdict)
+        self.hasdict = '__dict__' in rawdict
+        if __base is not None:
+            self.hasdict |= __base.hasdict
         self.rawdict = rawdict
         self.acceptable_as_base_class = True