From 42f3b0e16e8d327c048053663788fe096986ca89 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 6 Apr 2009 01:10:34 -0500
Subject: [PATCH] Fix bootstrap errors
---
basis/bootstrap/stage2.factor | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/basis/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor
index 6c824b6155..12741f2170 100644
--- a/basis/bootstrap/stage2.factor
+++ b/basis/bootstrap/stage2.factor
@@ -45,11 +45,18 @@ SYMBOL: bootstrap-time
[ optimized>> ] count-words " compiled words" print
[ symbol? ] count-words " symbol words" print
[ ] count-words " words total" print
-
+
"Bootstrapping is complete." print
"Now, you can run Factor:" print
vm write " -i=" write "output-image" get print flush ;
+: save/restore-error ( quot -- )
+ error get-global
+ error-continuation get-global
+ [ call ] 2dip
+ error-continuation set-global
+ error set-global ; inline
+
[
! We time bootstrap
millis
@@ -104,6 +111,7 @@ SYMBOL: bootstrap-time
drop
[
load-help? off
- "vocab:bootstrap/bootstrap-error.factor" run-file
+ [ "vocab:bootstrap/bootstrap-error.factor" parse-file ] save/restore-error
+ call
] with-scope
] recover