core: trim using lists with lint.vocabs tool

[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 e179c99913aa5f9ac370f97a41092b62c153eb14..49dbf64ce953a29ffcf2d74850dde7f21c194193 100644 (file)
--- a/core/source-files/errors/errors.factor
+++ b/core/source-files/errors/errors.factor
@@ -1,28 +1,41 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs kernel math.order sorting sequences definitions
-namespaces arrays splitting io math.parser math init ;
+USING: accessors assocs continuations definitions io
+kernel math math.parser namespaces sequences sorting ;
 IN: source-files.errors
 
-TUPLE: source-file-error error asset file line# ;
+GENERIC: error-file ( error -- file )
+GENERIC: error-line ( error -- line )
 
-: sort-errors ( errors -- alist )
-    [ [ [ line#>> ] compare ] sort ] { } assoc-map-as sort-keys ;
+M: object error-file drop f ;
+M: object error-line drop f ;
 
-: group-by-source-file ( errors -- assoc )
-    H{ } clone [ [ push-at ] curry [ dup file>> ] prepose each ] keep ;
+M: condition error-file error>> error-file ;
+M: condition error-line error>> error-line ;
 
-TUPLE: error-type type word plural icon quot forget-quot ;
+TUPLE: source-file-error error asset path line# ;
 
-GENERIC: error-type ( error -- type )
+M: source-file-error error-file [ error>> error-file ] [ path>> ] bi or ;
+M: source-file-error error-line [ error>> error-line ] [ line#>> ] bi or ;
+M: source-file-error compute-restarts error>> compute-restarts ;
 
-: <definition-error> ( error definition class -- source-file-error )
+: new-source-file-error ( error asset class -- source-file-error )
     new
         swap
         [ >>asset ]
-        [ where [ first2 [ >>file ] [ >>line# ] bi* ] when* ] bi
+        [ where [ first2 [ >>path ] [ >>line# ] bi* ] when* ] bi
         swap >>error ; inline
 
+: sort-errors ( errors -- alist )
+    [ [ line#>> 0 or ] sort-with ] { } assoc-map-as sort-keys ;
+
+: group-by-source-file ( errors -- assoc )
+    [ path>> ] collect-by ;
+
+TUPLE: error-type-holder type word plural icon quot forget-quot { fatal? initial: t } ;
+
+GENERIC: error-type ( error -- type )
+
 SYMBOL: error-types
 
 error-types [ V{ } clone ] initialize
@@ -34,12 +47,12 @@ error-types [ V{ } clone ] initialize
     error-types get at icon>> ;
 
 : error-counts ( -- alist )
-    error-types get [ nip dup quot>> call( -- seq ) length ] assoc-map ;
+    error-types get
+    [ nip dup quot>> call( -- seq ) length ] assoc-map
+    [ [ fatal?>> ] [ 0 > ] bi* and ] assoc-filter ;
 
 : error-summary ( -- )
-    error-counts
-    [ nip 0 > ] assoc-filter
-    [
+    error-counts [
         over
         [ word>> write ]
         [ " - show " write number>string write bl ]
@@ -55,23 +68,26 @@ GENERIC: errors-changed ( observer -- )
 
 SYMBOL: error-observers
 
-[ V{ } clone error-observers set-global ] "source-files.errors" add-init-hook
+STARTUP-HOOK: [ V{ } clone error-observers set-global ]
 
-: add-error-observer ( observer -- ) error-observers get push ;
+: 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 ;
+: notify-error-observers ( -- )
+    error-observers get [ errors-changed ] each ;
 
 : delete-file-errors ( seq file type -- )
     [
-        [ swap file>> = ] [ swap error-type = ]
+        [ swap path>> = ] [ swap error-type = ]
         bi-curry* bi and not
-    ] 2curry filter-here
+    ] 2curry filter! drop
     notify-error-observers ;
 
 : delete-definition-errors ( definition -- )
     error-types get [
         second forget-quot>> dup
         [ call( definition -- ) ] [ 2drop ] if
-    ] with each ;
\ No newline at end of file
+    ] with each ;