[pypy-svn] r9397 - in pypy/dist/pypy: module objspace/flow translator/tool

pedronis at codespeak.net pedronis at codespeak.net
Tue Feb 22 00:08:42 CET 2005


Author: pedronis
Date: Tue Feb 22 00:08:42 2005
New Revision: 9397

Modified:
   pypy/dist/pypy/module/classobjinterp.py
   pypy/dist/pypy/objspace/flow/objspace.py
   pypy/dist/pypy/translator/tool/tointerplevel.py
Log:
forgot tointerplevel Translator construction, so had to regen classobjinterp, oops



Modified: pypy/dist/pypy/module/classobjinterp.py
==============================================================================
--- pypy/dist/pypy/module/classobjinterp.py	(original)
+++ pypy/dist/pypy/module/classobjinterp.py	Tue Feb 22 00:08:42 2005
@@ -22,17 +22,48 @@
 
 def _coerce(space, w_left, w_right):
 
-    w_0=w_3=None
+    w_0=w_3=w_4=w_5=w_6=w_7=v8=w_9=w_10=w_11=w_12=v13=w_etype=w_evalue=None
 
     goto = 1 # startblock
     while True:
 
         if goto == 1:
-            w_0 = space.coerce(w_left, w_right)
-            w_3 = w_0
-            goto = 2
+            try:
+                w_0 = space.coerce(w_left, w_right)
+                w_3 = w_0
+                goto = 5
+            except OperationError, e:
+                if space.is_true(space.issubtype(e.w_type, space.w_Exception)):
+                    w_4, w_5, w_6 = e.w_type, e.w_value, e.w_type
+                    goto = 2
+                else:raise # unhandled case, should not happen
 
         if goto == 2:
+            w_7 = space.is_(w_6, space.w_TypeError)
+            v8 = space.is_true(w_7)
+            if v8 == True:
+                w_3 = space.w_None
+                goto = 5
+            else:
+                assert v8 == False
+                w_9, w_10, w_11 = w_4, w_5, w_6
+                goto = 3
+
+        if goto == 3:
+            w_12 = space.issubtype(w_11, space.w_TypeError)
+            v13 = space.is_true(w_12)
+            if v13 == True:
+                w_3 = space.w_None
+                goto = 5
+            else:
+                assert v13 == False
+                w_etype, w_evalue = w_9, w_10
+                goto = 4
+
+        if goto == 4:
+            raise OperationError(w_etype, w_evalue)
+
+        if goto == 5:
             return w_3
 
 fastf__coerce = _coerce
@@ -713,22 +744,23 @@
     w_9=v10=w_name_3=w_bases_2=w_dic_2=w_11=v12=w_bases_4=w_13=w_14=None
     w_name_4=w_bases_3=w_dic_3=w_15=v16=w_dic_5=w_17=w_18=w_name_5=None
     w_bases_5=w_dic_4=w_19=w_name_6=w_bases_6=w_dic_6=w_30=w_name_11=None
-    w_bases_11=w_dic_11=w_65=w_name_23=w_bases_23=w_dic_23=w_66=w_b=None
-    w_name_24=w_bases_24=w_dic_24=w_68=w_b_1=w_71=v72=w_name_26=w_bases_26=None
-    w_dic_26=w_b_2=w_73=w_74=v75=w_name_27=w_bases_27=w_dic_27=w_b_3=None
-    w_76=w_77=w_78=w_name_25=w_bases_25=w_dic_25=w_new_class=w_80=None
-    w_81=w_82=w_83=w_84=w_name_12=w_bases_12=w_dic_12=w_31=w_32=w_33=None
-    w_34=v35=w_name_14=w_bases_14=w_dic_14=w_37=w_38=w_39=w_69=v70=None
-    w_name_13=w_bases_13=w_dic_13=w_i=w_42=w_g=w_name_15=w_bases_15=None
-    w_dic_15=w_i_1=w_g_1=w_47=w_name_17=w_bases_17=w_dic_17=w_i_2=None
-    w_g_2=w_48=w_49=w_name_18=w_bases_18=w_dic_18=w_i_3=w_g_3=w_50=None
-    w_51=v52=w_name_20=w_bases_20=w_dic_20=w_g_4=w_60=w_modname=w_62=None
-    v63=w_name_22=w_bases_22=w_dic_22=w_modname_1=w_64=w_name_19=None
-    w_bases_19=w_dic_19=w_i_4=w_i_5=w_name_16=w_bases_16=w_dic_16=None
-    w_44=w_45=w_46=w_58=v59=w_name_21=w_bases_21=w_dic_21=w_56=w_57=None
-    w_54=w_53=v55=w_name_7=w_bases_7=w_dic_7=w_20=w_21=w_22=w_23=None
-    v24=w_name_9=w_bases_9=w_dic_9=w_25=w_26=w_27=w_40=v41=w_name_10=None
-    w_bases_10=w_dic_10=w_28=w_name_8=w_bases_8=w_dic_8=w_29=None
+    w_bases_11=w_dic_11=w_66=w_name_24=w_bases_24=w_dic_24=w_67=w_b=None
+    w_name_25=w_bases_25=w_dic_25=w_69=w_b_1=w_72=v73=w_name_27=w_bases_27=None
+    w_dic_27=w_b_2=w_74=w_75=v76=w_name_28=w_bases_28=w_dic_28=w_b_3=None
+    w_77=w_78=w_79=w_name_26=w_bases_26=w_dic_26=w_new_class=w_81=None
+    w_82=w_83=w_84=w_85=w_name_12=w_bases_12=w_dic_12=w_31=w_32=w_33=None
+    w_34=v35=w_name_14=w_bases_14=w_dic_14=w_37=w_38=w_39=w_70=v71=None
+    w_name_13=w_bases_13=w_dic_13=w_i=w_42=w_name_15=w_bases_15=w_dic_15=None
+    w_i_1=w_43=w_g=w_name_17=w_bases_17=w_dic_17=w_i_2=w_g_1=w_48=None
+    w_name_18=w_bases_18=w_dic_18=w_i_3=w_g_2=w_49=w_50=w_name_19=None
+    w_bases_19=w_dic_19=w_i_4=w_g_3=w_51=w_52=v53=w_name_21=w_bases_21=None
+    w_dic_21=w_g_4=w_61=w_modname=w_63=v64=w_name_23=w_bases_23=w_dic_23=None
+    w_modname_1=w_65=w_name_20=w_bases_20=w_dic_20=w_i_5=w_i_6=w_name_16=None
+    w_bases_16=w_dic_16=w_44=w_45=w_46=w_59=v60=w_name_22=w_bases_22=None
+    w_dic_22=w_57=w_58=w_55=w_54=v56=w_name_7=w_bases_7=w_dic_7=w_20=None
+    w_21=w_22=w_23=v24=w_name_9=w_bases_9=w_dic_9=w_25=w_26=w_27=None
+    w_40=v41=w_name_10=w_bases_10=w_dic_10=w_28=w_name_8=w_bases_8=None
+    w_dic_8=w_29=None
 
     goto = 1 # startblock
     while True:
@@ -748,7 +780,7 @@
             w_5 = fastf_type_err(space, gs_name, gs_string, w_name_2)
             w_6 = space.type(w_5)
             w_etype, w_evalue = w_6, w_5
-            goto = 31
+            goto = 32
 
         if goto == 3:
             w_9 = space.is_(w_bases_1, space.w_None)
@@ -776,7 +808,7 @@
             w_13 = fastf_type_err(space, gs_bases, gs_tuple, w_bases_4)
             w_14 = space.type(w_13)
             w_etype, w_evalue = w_14, w_13
-            goto = 31
+            goto = 32
 
         if goto == 6:
             w_15 = space.isinstance(w_dic_3, space.w_dict)
@@ -793,7 +825,7 @@
             w_17 = fastf_type_err(space, gs_dict, gs_dict, w_dic_5)
             w_18 = space.type(w_17)
             w_etype, w_evalue = w_18, w_17
-            goto = 31
+            goto = 32
 
         if goto == 8:
             try:
@@ -839,7 +871,7 @@
             try:
                 w_30 = space.getitem(w_dic_6, gs___module__)
                 w_name_11, w_bases_11, w_dic_11 = w_name_6, w_bases_6, w_dic_6
-                goto = 24
+                goto = 25
             except OperationError, e:
                 if space.is_true(space.issubtype(e.w_type, space.w_IndexError)):
                     (w_name_12, w_bases_12, w_dic_12, w_31, w_32, w_33) = (w_name_6,
@@ -864,7 +896,7 @@
                 assert v35 == False
                 (w_name_14, w_bases_14, w_dic_14, w_37, w_38, w_39) = (w_name_12,
                  w_bases_12, w_dic_12, w_31, w_32, w_33)
-                goto = 26
+                goto = 27
 
         if goto == 14:
             w_40 = space.issubtype(w_27, space.w_KeyError)
@@ -876,205 +908,217 @@
             else:
                 assert v41 == False
                 w_etype, w_evalue = w_25, w_26
-                goto = 31
+                goto = 32
 
         if goto == 15:
-            w_42 = space.call_function((space.sys.get(space.str_w(gs__getframe))), w_i)
             try:
-                w_g = space.getattr(w_42, gs_f_globals)
-                (w_name_15, w_bases_15, w_dic_15, w_i_1, w_g_1) = (w_name_13,
-                 w_bases_13, w_dic_13, w_i, w_g)
+                w_42 = space.call_function((space.sys.get(space.str_w(gs__getframe))), w_i)
+                (w_name_15, w_bases_15, w_dic_15, w_i_1, w_43) = (w_name_13,
+                 w_bases_13, w_dic_13, w_i, w_42)
                 goto = 16
             except OperationError, e:
-                if space.is_true(space.issubtype(e.w_type, space.w_AttributeError)):
+                if space.is_true(space.issubtype(e.w_type, space.w_Exception)):
                     (w_name_16, w_bases_16, w_dic_16, w_44, w_45, w_46) = (w_name_13,
-                     w_bases_13, w_dic_13, space.w_AttributeError, e.w_value,
-                     space.w_AttributeError)
-                    goto = 21
+                     w_bases_13, w_dic_13, e.w_type, e.w_value, e.w_type)
+                    goto = 22
                 else:raise # unhandled case, should not happen
 
         if goto == 16:
             try:
-                w_47 = space.getattr(w_g_1, gs_get)
-                (w_name_17, w_bases_17, w_dic_17, w_i_2, w_g_2,
-                 w_48) = (w_name_15, w_bases_15, w_dic_15, w_i_1, w_g_1, w_47)
+                w_g = space.getattr(w_43, gs_f_globals)
+                (w_name_17, w_bases_17, w_dic_17, w_i_2, w_g_1) = (w_name_15,
+                 w_bases_15, w_dic_15, w_i_1, w_g)
                 goto = 17
             except OperationError, e:
                 if space.is_true(space.issubtype(e.w_type, space.w_AttributeError)):
                     (w_name_16, w_bases_16, w_dic_16, w_44, w_45, w_46) = (w_name_15,
                      w_bases_15, w_dic_15, space.w_AttributeError, e.w_value,
                      space.w_AttributeError)
-                    goto = 21
+                    goto = 22
                 else:raise # unhandled case, should not happen
 
         if goto == 17:
             try:
-                w_49 = space.call_function(w_48, gs_OLD_STYLE_CLASSES_IMPL, space.w_None)
-                (w_name_18, w_bases_18, w_dic_18, w_i_3, w_g_3,
-                 w_50) = (w_name_17, w_bases_17, w_dic_17, w_i_2, w_g_2, w_49)
+                w_48 = space.getattr(w_g_1, gs_get)
+                (w_name_18, w_bases_18, w_dic_18, w_i_3, w_g_2,
+                 w_49) = (w_name_17, w_bases_17, w_dic_17, w_i_2, w_g_1, w_48)
                 goto = 18
             except OperationError, e:
-                if space.is_true(space.issubtype(e.w_type, space.w_Exception)):
+                if space.is_true(space.issubtype(e.w_type, space.w_AttributeError)):
                     (w_name_16, w_bases_16, w_dic_16, w_44, w_45, w_46) = (w_name_17,
-                     w_bases_17, w_dic_17, e.w_type, e.w_value, e.w_type)
-                    goto = 21
+                     w_bases_17, w_dic_17, space.w_AttributeError, e.w_value,
+                     space.w_AttributeError)
+                    goto = 22
                 else:raise # unhandled case, should not happen
 
         if goto == 18:
-            w_51 = space.is_(w_50, g_object)
-            v52 = space.is_true(w_51)
-            if v52 == True:
-                (w_name_19, w_bases_19, w_dic_19, w_i_4) = (w_name_18, w_bases_18,
-                 w_dic_18, w_i_3)
+            try:
+                w_50 = space.call_function(w_49, gs_OLD_STYLE_CLASSES_IMPL, space.w_None)
+                (w_name_19, w_bases_19, w_dic_19, w_i_4, w_g_3,
+                 w_51) = (w_name_18, w_bases_18, w_dic_18, w_i_3, w_g_2, w_50)
                 goto = 19
-            else:
-                assert v52 == False
-                (w_name_20, w_bases_20, w_dic_20, w_g_4) = (w_name_18, w_bases_18,
-                 w_dic_18, w_g_3)
-                goto = 22
+            except OperationError, e:
+                if space.is_true(space.issubtype(e.w_type, space.w_Exception)):
+                    (w_name_16, w_bases_16, w_dic_16, w_44, w_45, w_46) = (w_name_18,
+                     w_bases_18, w_dic_18, e.w_type, e.w_value, e.w_type)
+                    goto = 22
+                else:raise # unhandled case, should not happen
 
         if goto == 19:
+            w_52 = space.is_(w_51, g_object)
+            v53 = space.is_true(w_52)
+            if v53 == True:
+                (w_name_20, w_bases_20, w_dic_20, w_i_5) = (w_name_19, w_bases_19,
+                 w_dic_19, w_i_4)
+                goto = 20
+            else:
+                assert v53 == False
+                (w_name_21, w_bases_21, w_dic_21, w_g_4) = (w_name_19, w_bases_19,
+                 w_dic_19, w_g_3)
+                goto = 23
+
+        if goto == 20:
             try:
-                w_i_5 = space.inplace_add(w_i_4, gi_1)
-                (w_name_13, w_bases_13, w_dic_13, w_i) = (w_name_19, w_bases_19,
-                 w_dic_19, w_i_5)
+                w_i_6 = space.inplace_add(w_i_5, gi_1)
+                (w_name_13, w_bases_13, w_dic_13, w_i) = (w_name_20, w_bases_20,
+                 w_dic_20, w_i_6)
                 goto = 15
                 continue
             except OperationError, e:
                 if space.is_true(space.issubtype(e.w_type, space.w_OverflowError)):
-                    (w_name_16, w_bases_16, w_dic_16, w_44, w_45, w_46) = (w_name_19,
-                     w_bases_19, w_dic_19, space.w_OverflowError, e.w_value,
+                    (w_name_16, w_bases_16, w_dic_16, w_44, w_45, w_46) = (w_name_20,
+                     w_bases_20, w_dic_20, space.w_OverflowError, e.w_value,
                      space.w_OverflowError)
-                    goto = 21
+                    goto = 22
                 elif space.is_true(space.issubtype(e.w_type, space.w_FloatingPointError)):
-                    (w_name_16, w_bases_16, w_dic_16, w_44, w_45, w_46) = (w_name_19,
-                     w_bases_19, w_dic_19, space.w_FloatingPointError, e.w_value,
+                    (w_name_16, w_bases_16, w_dic_16, w_44, w_45, w_46) = (w_name_20,
+                     w_bases_20, w_dic_20, space.w_FloatingPointError, e.w_value,
                      space.w_FloatingPointError)
-                    goto = 21
+                    goto = 22
                 else:raise # unhandled case, should not happen
 
-        if goto == 20:
-            w_53 = space.issubtype(w_54, space.w_ValueError)
-            v55 = space.is_true(w_53)
-            if v55 == True:
-                w_name_11, w_bases_11, w_dic_11 = w_name_21, w_bases_21, w_dic_21
-                goto = 24
+        if goto == 21:
+            w_54 = space.issubtype(w_55, space.w_ValueError)
+            v56 = space.is_true(w_54)
+            if v56 == True:
+                w_name_11, w_bases_11, w_dic_11 = w_name_22, w_bases_22, w_dic_22
+                goto = 25
             else:
-                assert v55 == False
-                w_etype, w_evalue = w_56, w_57
-                goto = 31
+                assert v56 == False
+                w_etype, w_evalue = w_57, w_58
+                goto = 32
 
-        if goto == 21:
-            w_58 = space.is_(w_46, space.w_ValueError)
-            v59 = space.is_true(w_58)
-            if v59 == True:
+        if goto == 22:
+            w_59 = space.is_(w_46, space.w_ValueError)
+            v60 = space.is_true(w_59)
+            if v60 == True:
                 w_name_11, w_bases_11, w_dic_11 = w_name_16, w_bases_16, w_dic_16
-                goto = 24
+                goto = 25
             else:
-                assert v59 == False
-                (w_name_21, w_bases_21, w_dic_21, w_56, w_57, w_54) = (w_name_16,
+                assert v60 == False
+                (w_name_22, w_bases_22, w_dic_22, w_57, w_58, w_55) = (w_name_16,
                  w_bases_16, w_dic_16, w_44, w_45, w_46)
-                goto = 20
+                goto = 21
                 continue
 
-        if goto == 22:
-            w_60 = space.getattr(w_g_4, gs_get)
-            w_modname = space.call_function(w_60, gs___name__, space.w_None)
-            w_62 = space.is_(w_modname, space.w_None)
-            v63 = space.is_true(w_62)
-            if v63 == True:
-                w_name_11, w_bases_11, w_dic_11 = w_name_20, w_bases_20, w_dic_20
-                goto = 24
-            else:
-                assert v63 == False
-                (w_name_22, w_bases_22, w_dic_22, w_modname_1) = (w_name_20,
-                 w_bases_20, w_dic_20, w_modname)
-                goto = 23
-
         if goto == 23:
-            w_64 = space.setitem(w_dic_22, gs___module__, w_modname_1)
-            w_name_11, w_bases_11, w_dic_11 = w_name_22, w_bases_22, w_dic_22
-            goto = 24
+            w_61 = space.getattr(w_g_4, gs_get)
+            w_modname = space.call_function(w_61, gs___name__, space.w_None)
+            w_63 = space.is_(w_modname, space.w_None)
+            v64 = space.is_true(w_63)
+            if v64 == True:
+                w_name_11, w_bases_11, w_dic_11 = w_name_21, w_bases_21, w_dic_21
+                goto = 25
+            else:
+                assert v64 == False
+                (w_name_23, w_bases_23, w_dic_23, w_modname_1) = (w_name_21,
+                 w_bases_21, w_dic_21, w_modname)
+                goto = 24
 
         if goto == 24:
-            w_65 = space.iter(w_bases_11)
-            (w_name_23, w_bases_23, w_dic_23, w_66) = (w_name_11, w_bases_11,
-             w_dic_11, w_65)
+            w_65 = space.setitem(w_dic_23, gs___module__, w_modname_1)
+            w_name_11, w_bases_11, w_dic_11 = w_name_23, w_bases_23, w_dic_23
             goto = 25
 
         if goto == 25:
+            w_66 = space.iter(w_bases_11)
+            (w_name_24, w_bases_24, w_dic_24, w_67) = (w_name_11, w_bases_11,
+             w_dic_11, w_66)
+            goto = 26
+
+        if goto == 26:
             try:
-                w_b = space.next(w_66)
-                (w_name_24, w_bases_24, w_dic_24, w_68, w_b_1) = (w_name_23,
-                 w_bases_23, w_dic_23, w_66, w_b)
-                goto = 27
+                w_b = space.next(w_67)
+                (w_name_25, w_bases_25, w_dic_25, w_69, w_b_1) = (w_name_24,
+                 w_bases_24, w_dic_24, w_67, w_b)
+                goto = 28
             except OperationError, e:
                 if space.is_true(space.issubtype(e.w_type, space.w_StopIteration)):
-                    w_name_25, w_bases_25, w_dic_25 = w_name_23, w_bases_23, w_dic_23
-                    goto = 30
+                    w_name_26, w_bases_26, w_dic_26 = w_name_24, w_bases_24, w_dic_24
+                    goto = 31
                 else:raise # unhandled case, should not happen
 
-        if goto == 26:
-            w_69 = space.issubtype(w_39, space.w_KeyError)
-            v70 = space.is_true(w_69)
-            if v70 == True:
+        if goto == 27:
+            w_70 = space.issubtype(w_39, space.w_KeyError)
+            v71 = space.is_true(w_70)
+            if v71 == True:
                 (w_name_13, w_bases_13, w_dic_13, w_i) = (w_name_14, w_bases_14,
                  w_dic_14, gi_0)
                 goto = 15
                 continue
             else:
-                assert v70 == False
+                assert v71 == False
                 w_etype, w_evalue = w_37, w_38
-                goto = 31
+                goto = 32
 
-        if goto == 27:
-            w_71 = space.isinstance(w_b_1, gcls_classobj)
-            v72 = space.is_true(w_71)
-            if v72 == True:
-                (w_name_23, w_bases_23, w_dic_23, w_66) = (w_name_24, w_bases_24,
-                 w_dic_24, w_68)
-                goto = 25
+        if goto == 28:
+            w_72 = space.isinstance(w_b_1, gcls_classobj)
+            v73 = space.is_true(w_72)
+            if v73 == True:
+                (w_name_24, w_bases_24, w_dic_24, w_67) = (w_name_25, w_bases_25,
+                 w_dic_25, w_69)
+                goto = 26
                 continue
             else:
-                assert v72 == False
-                (w_name_26, w_bases_26, w_dic_26, w_b_2) = (w_name_24, w_bases_24,
-                 w_dic_24, w_b_1)
-                goto = 28
-
-        if goto == 28:
-            w_73 = space.call_function(space.w_type, w_b_2)
-            w_74 = space.call_function((space.builtin.get(space.str_w(gs_callable))), w_73)
-            v75 = space.is_true(w_74)
-            if v75 == True:
-                (w_name_27, w_bases_27, w_dic_27, w_b_3) = (w_name_26, w_bases_26,
-                 w_dic_26, w_b_2)
+                assert v73 == False
+                (w_name_27, w_bases_27, w_dic_27, w_b_2) = (w_name_25, w_bases_25,
+                 w_dic_25, w_b_1)
                 goto = 29
-            else:
-                assert v75 == False
-                w_etype, w_evalue = space.w_TypeError, gs_base_must_be_class
-                goto = 31
 
         if goto == 29:
-            w_76 = space.call_function(space.w_type, w_b_3)
-            w_77 = space.call_function(w_76, w_name_27, w_bases_27, w_dic_27)
-            w_78 = w_77
-            goto = 32
+            w_74 = space.call_function(space.w_type, w_b_2)
+            w_75 = space.call_function((space.builtin.get(space.str_w(gs_callable))), w_74)
+            v76 = space.is_true(w_75)
+            if v76 == True:
+                (w_name_28, w_bases_28, w_dic_28, w_b_3) = (w_name_27, w_bases_27,
+                 w_dic_27, w_b_2)
+                goto = 30
+            else:
+                assert v76 == False
+                w_etype, w_evalue = space.w_TypeError, gs_base_must_be_class
+                goto = 32
 
         if goto == 30:
-            w_new_class = space.call_function(gbltinmethod___new__, gcls_classobj)
-            w_80 = space.call_function(gdescriptor_object___setattr__, w_new_class, gs___dict__, w_dic_25)
-            w_81 = space.getattr(gdescriptor_classobj__name, gs___set__)
-            w_82 = space.call_function(w_81, w_new_class, w_name_25)
-            w_83 = space.getattr(gdescriptor_classobj__bases, gs___set__)
-            w_84 = space.call_function(w_83, w_new_class, w_bases_25)
-            w_78 = w_new_class
-            goto = 32
+            w_77 = space.call_function(space.w_type, w_b_3)
+            w_78 = space.call_function(w_77, w_name_28, w_bases_28, w_dic_28)
+            w_79 = w_78
+            goto = 33
 
         if goto == 31:
-            raise OperationError(w_etype, w_evalue)
+            w_new_class = space.call_function(gbltinmethod___new__, gcls_classobj)
+            w_81 = space.call_function(gdescriptor_object___setattr__, w_new_class, gs___dict__, w_dic_26)
+            w_82 = space.getattr(gdescriptor_classobj__name, gs___set__)
+            w_83 = space.call_function(w_82, w_new_class, w_name_26)
+            w_84 = space.getattr(gdescriptor_classobj__bases, gs___set__)
+            w_85 = space.call_function(w_84, w_new_class, w_bases_26)
+            w_79 = w_new_class
+            goto = 33
 
         if goto == 32:
-            return w_78
+            raise OperationError(w_etype, w_evalue)
+
+        if goto == 33:
+            return w_79
 
 fastf___new__ = __new__
 

Modified: pypy/dist/pypy/objspace/flow/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/flow/objspace.py	(original)
+++ pypy/dist/pypy/objspace/flow/objspace.py	Tue Feb 22 00:08:42 2005
@@ -332,7 +332,8 @@
     'delitem': [IndexError, KeyError],
     'getattr': [AttributeError],
     'delattr': [AttributeError],
-    'iter'   : [TypeError]
+    'iter'   : [TypeError],
+    'coerce' : [TypeError],
     }
 # continuing like above, but in a more programmatic style.
 def _add_exceptions(names, exc):

Modified: pypy/dist/pypy/translator/tool/tointerplevel.py
==============================================================================
--- pypy/dist/pypy/translator/tool/tointerplevel.py	(original)
+++ pypy/dist/pypy/translator/tool/tointerplevel.py	Tue Feb 22 00:08:42 2005
@@ -54,7 +54,7 @@
     else:
         entrypoint = tuple(objs)
 
-    t = Translator(None, verbose=False, simplifying=True)
+    t = Translator(None, verbose=False, simplifying=True, builtins_can_raise_exceptions=True)
     gen = GenRpy(t, entrypoint, modname, mod.__dict__)
 
     output = options.output or modname + "interp.py"



More information about the Pypy-commit mailing list