Merge branch 'master' of git://factorcode.org/git/factor

basis/io/launcher/launcher.factor

@@ -99,10 +99,12 @@ M: process hashcode* handle>> hashcode* ;
 
 GENERIC: >process ( obj -- process )
 
-ERROR: process-already-started ;
+ERROR: process-already-started process ;
 
-M: process-already-started summary
-    drop "Process has already been started once" ;
+M: process-already-started error.
+    "Process has already been started" print nl
+    "Launch descriptor:" print nl
+    process>> . ;
 
 M: process >process
     dup process-started? [
@@ -116,7 +118,14 @@ HOOK: current-process-handle io-backend ( -- handle )
 
 HOOK: run-process* io-backend ( process -- handle )
 
-ERROR: process-was-killed ;
+ERROR: process-was-killed process ;
+
+M: process-was-killed error.
+    "Process was killed as a result of a call to" print
+    "kill-process, or a timeout" print
+    nl
+    "Launch descriptor:" print nl
+    process>> . ;
 
 : wait-for-process ( process -- status )
     [

core/memory/memory-tests.factor

@@ -1,4 +1,4 @@
-USING: generic kernel kernel.private math memory prettyprint
+USING: generic kernel kernel.private math memory prettyprint io
 sequences tools.test words namespaces layouts classes
 classes.builtin arrays quotations ;
 IN: memory.tests
@@ -19,6 +19,7 @@ TUPLE: testing x y z ;
 [ ] [
     num-types get [
         type>class [
+            dup . flush
             "predicate" word-prop instances [
                 class drop
             ] each

extra/hello-world/deploy.factor

@@ -1,15 +1,15 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-word-props? f }
-    { deploy-random? f }
-    { deploy-compiler? f }
     { deploy-c-types? f }
-    { deploy-ui? f }
-    { deploy-reflection 1 }
-    { deploy-threads? f }
-    { deploy-io 2 }
-    { deploy-word-defs? f }
-    { "stop-after-last-window?" t }
     { deploy-name "Hello world (console)" }
+    { deploy-threads? f }
+    { deploy-word-props? f }
+    { deploy-reflection 2 }
+    { deploy-random? f }
+    { deploy-io 2 }
     { deploy-math? f }
+    { deploy-ui? f }
+    { deploy-compiler? f }
+    { "stop-after-last-window?" t }
+    { deploy-word-defs? f }
 }

vm/image.c

@@ -186,13 +186,16 @@ void strip_compiled_quotations(void)
 
 DEFINE_PRIMITIVE(save_image_and_exit)
 {
-	/* This reduces deployed image size */
-	strip_compiled_quotations();
-
+	/* We unbox this before doing anything else. This is the only point
+	where we might throw an error, so we have to throw an error here since
+	later steps destroy the current image. */
 	F_CHAR *path = unbox_native_string();
 
 	REGISTER_C_STRING(path);
 
+	/* This reduces deployed image size */
+	strip_compiled_quotations();
+
 	/* strip out userenv data which is set on startup anyway */
 	CELL i;
 	for(i = 0; i < FIRST_SAVE_ENV; i++)