! Copyright (C) 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs continuations definitions init io
+USING: accessors assocs continuations definitions io
kernel math math.parser namespaces sequences sorting ;
IN: source-files.errors
M: condition error-file error>> error-file ;
M: condition error-line error>> error-line ;
-TUPLE: source-file-error error asset file line# ;
+TUPLE: source-file-error error asset path line# ;
-M: source-file-error error-file [ error>> error-file ] [ file>> ] bi or ;
+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 ;
+: new-source-file-error ( error asset class -- source-file-error )
+ new
+ swap
+ [ >>asset ]
+ [ 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 )
- H{ } clone [ [ push-at ] curry [ dup file>> ] prepose each ] keep ;
+ [ path>> ] collect-by ;
-TUPLE: error-type type word plural icon quot forget-quot { fatal? initial: t } ;
+TUPLE: error-type-holder type word plural icon quot forget-quot { fatal? initial: t } ;
GENERIC: error-type ( error -- type )
-: <definition-error> ( error definition class -- source-file-error )
- new
- swap
- [ >>asset ]
- [ where [ first2 [ >>file ] [ >>line# ] bi* ] when* ] bi
- swap >>error ; inline
-
SYMBOL: error-types
error-types [ V{ } clone ] initialize
SYMBOL: error-observers
-[ V{ } clone error-observers set-global ] "source-files.errors" add-startup-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 remove-eq! drop ;
+: 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! drop
notify-error-observers ;