[svn:parrot] r46040 - in trunk: src/pmc t/pmc

NotFound at svn.parrot.org NotFound at svn.parrot.org
Mon Apr 26 20:06:36 UTC 2010


Author: NotFound
Date: Mon Apr 26 20:06:36 2010
New Revision: 46040
URL: https://trac.parrot.org/parrot/changeset/46040

Log:
revert test code commited by mistake in r46039

Modified:
   trunk/src/pmc/imageio.pmc
   trunk/t/pmc/packfile.t

Modified: trunk/src/pmc/imageio.pmc
==============================================================================
--- trunk/src/pmc/imageio.pmc	Mon Apr 26 20:01:49 2010	(r46039)
+++ trunk/src/pmc/imageio.pmc	Mon Apr 26 20:06:36 2010	(r46040)
@@ -261,10 +261,8 @@
       case enum_PackID_normal:
         {
             const INTVAL type = VTABLE_shift_integer(interp, info);
-            if (type <= 0 || type > interp->n_vtable_max) {
-	        abort();
+            if (type <= 0 || type > interp->n_vtable_max)
                 Parrot_ex_throw_from_c_args(interp, NULL, 1, "Unknown PMC type to thaw %d", type);
-            }
 
             pmc = Parrot_pmc_new_noinit(interp, type);
             VTABLE_thaw(interp, pmc, info);
@@ -276,7 +274,6 @@
         }
         break;
       default:
-        abort();
         Parrot_ex_throw_from_c_args(interp, NULL, 1, "Unknown PMC id args thaw %d", packid_flags);
         break;
     }

Modified: trunk/t/pmc/packfile.t
==============================================================================
--- trunk/t/pmc/packfile.t	Mon Apr 26 20:01:49 2010	(r46039)
+++ trunk/t/pmc/packfile.t	Mon Apr 26 20:06:36 2010	(r46040)
@@ -100,7 +100,6 @@
 # Packfile.set_string_native, Packfile.get_integer_keyed_str
 .sub 'test_get_integer'
     .local pmc pf
-    push_eh unknown_key
     pf  = _pbc()
     $I0 = pf["version_major"]
     ok(1, "get_integer_keyed_str(version_major)")
@@ -112,6 +111,7 @@
     ok(1, "get_integer_keyed_str(version_patch)")
 
     # Requesting unknown key should throw exception
+    push_eh unknown_key
     $I3 = pf["foo"]
     ok(0, "get_integer_keyed_str return unknown key")
     .return ()


More information about the parrot-commits mailing list