-USING: compiler.units continuations kernel namespaces
-threads.private words vocabs tools.deploy.shaker ;
+USING: namespaces tools.deploy.shaker ;
IN: debugger
: error. ( error -- ) original-error get die-with2 ;
: print-error ( error -- ) error. ;
-
-"threads" vocab [
- [
- "error-in-thread" "threads" lookup
- [ [ drop error. ] define ] [ f "combination" set-word-prop ] bi
- ] with-compilation-unit
-] when
-USING: namespaces tools.deploy.config fry sequences system kernel ui ui.gadgets.worlds ;
+USING: continuations namespaces sequences kernel ui
+ui.gadgets.worlds ;
-deploy-name get "Factor" or '[
- _ " encountered an error." append
+[
+ "Error"
"The application encountered an error it cannot recover from and will now exit."
system-alert die
-] ui-error-hook set-global
+]
+[ ui-error-hook set-global ]
+[ callback-error-hook set-global ]
+[ [ drop ] prepose thread-error-hook set-global ] tri
-! Copyright (C) 2006, 2009 Slava Pestov.\r
+! Copyright (C) 2006, 2011 Slava Pestov.\r
! See http://factorcode.org/license.txt for BSD license.\r
-USING: accessors debugger io kernel namespaces prettyprint\r
-ui.gadgets.panes ui.gadgets.worlds ui ;\r
+USING: accessors continuations debugger io io.streams.string\r
+kernel namespaces prettyprint ui ui.gadgets.worlds ;\r
IN: ui.debugger\r
\r
-: <error-pane> ( error -- pane )\r
- <pane> [ [ print-error ] with-pane ] keep ; inline\r
+: error-alert ( error -- )\r
+ [ "Error" ] dip [ print-error ] with-string-writer\r
+ system-alert ;\r
\r
-: error-window ( error -- )\r
- <error-pane> "Error" open-window ;\r
+! ( error -- )\r
+[ error-alert ] ui-error-hook set-global\r
\r
-[ error-window ] ui-error-hook set-global\r
+! ( error -- )\r
+[\r
+ ui-running? [ dup error-alert ] [ dup print-error ] if die\r
+] callback-error-hook set-global\r
\r
M: world-error error.\r
"An error occurred while drawing the world " write\r
-! Copyright (C) 2006, 2009 Slava Pestov.
+! Copyright (C) 2006, 2011 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays hashtables io kernel math models
-colors.constants namespaces sequences words continuations debugger
-prettyprint help editors fonts ui ui.commands ui.gestures ui.gadgets
-ui.pens.solid ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons
-ui.gadgets.labels ui.gadgets.presentations ui.gadgets.viewports
-ui.gadgets.tables ui.gadgets.tracks ui.gadgets.scrollers
-ui.gadgets.borders ui.gadgets.status-bar ui.tools.traceback
-ui.tools.inspector ui.tools.browser ui.debugger ;
+colors.constants namespaces sequences words continuations
+debugger prettyprint help editors fonts ui ui.commands
+ui.debugger ui.gestures ui.gadgets ui.pens.solid
+ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons
+ui.gadgets.labels ui.gadgets.presentations ui.gadgets.panes
+ui.gadgets.viewports ui.gadgets.tables ui.gadgets.tracks
+ui.gadgets.scrollers ui.gadgets.borders ui.gadgets.status-bar
+ui.tools.traceback ui.tools.inspector ui.tools.browser ;
IN: ui.tools.debugger
TUPLE: debugger < track error restarts restart-hook restart-list continuation ;
t >>selection-required?
t >>single-click? ; inline
+: <error-pane> ( error -- pane )
+ <pane> [ [ print-error ] with-pane ] keep ; inline
+
: <error-display> ( debugger -- gadget )
[ <filled-pile> ] dip
[ error>> <error-pane> add-gadget ]
[
dup error-in-debugger?
- [ rethrow ] [ error-continuation get debugger-window ] if
+ [ error-alert ] [ error-continuation get debugger-window ] if
] ui-error-hook set-global
debugger "gestures" f {