Merge branch 'master' into startup

[factor.git] / core / source-files / errors / errors.factor

diff --git a/core/source-files/errors/errors.factor b/core/source-files/errors/errors.factor
index f5c41285ee31c504c912749d24524fe4e1a094d9..4f5473ce9de921869ee2e94e7245102c19d90943 100644 (file)
--- a/core/source-files/errors/errors.factor
+++ b/core/source-files/errors/errors.factor
@@ -17,6 +17,7 @@ TUPLE: source-file-error error asset file line# ;
 
 M: source-file-error error-file [ error>> error-file ] [ file>> ] bi or ;
 M: source-file-error error-line [ error>> error-line ] [ line#>> ] bi or ;
+M: source-file-error compute-restarts error>> compute-restarts ;
 
 : sort-errors ( errors -- alist )
     [ [ line#>> ] sort-with ] { } assoc-map-as sort-keys ;
@@ -71,7 +72,7 @@ SYMBOL: error-observers
 
 : add-error-observer ( observer -- ) error-observers get push ;
 
-: remove-error-observer ( observer -- ) error-observers get delq ;
+: remove-error-observer ( observer -- ) error-observers get remove-eq! drop ;
 
 : notify-error-observers ( -- ) error-observers get [ errors-changed ] each ;
 
@@ -79,7 +80,7 @@ SYMBOL: error-observers
     [
         [ swap file>> = ] [ swap error-type = ]
         bi-curry* bi and not
-    ] 2curry filter-here
+    ] 2curry filter! drop
     notify-error-observers ;
 
 : delete-definition-errors ( definition -- )