:vars and .vars

core/debugger/debugger.factor

@@ -31,6 +31,9 @@ M: string error. print ;
 : :get ( variable -- value )
     error-continuation get continuation-name assoc-stack ;
 
+: :vars ( -- )
+    error-continuation get continuation-name namestack. ;
+
 : :res ( n -- )
     1- restarts get-global nth f restarts set-global restart ;
 

core/inspector/inspector.factor

@@ -1,4 +1,4 @@
-! Copyright (C) 2005, 2007 Slava Pestov.
+! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays generic hashtables io kernel assocs math
 namespaces prettyprint sequences strings io.styles vectors words
@@ -93,6 +93,15 @@ SYMBOL: +editable+
 
 : describe ( obj -- ) H{ } describe* ;
 
+: namestack. ( seq -- )
+    [
+        [ global eq? not ] subset
+        [ keys ] map concat prune
+    ] keep [ dupd assoc-stack ] curry H{ } map>assoc describe ;
+
+: .vars ( -- )
+    namestack namestack. ;
+
 SYMBOL: inspector-hook
 
 [ H{ { +number-rows+ t } } describe* ] inspector-hook set-global

core/mirrors/mirrors.factor

@@ -1,8 +1,8 @@
-! Copyright (C) 2007 Slava Pestov.
+! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs hashtables kernel sequences generic words
 arrays classes slots slots.private tuples math vectors
-quotations ;
+quotations sorting prettyprint ;
 IN: mirrors
 
 GENERIC: object-slots ( obj -- seq )
@@ -69,8 +69,13 @@ M: enum clear-assoc enum-seq delete-all ;
 
 INSTANCE: enum assoc
 
+: sort-assoc ( assoc -- alist )
+    >alist
+    [ dup first unparse-short swap ] { } map>assoc
+    sort-keys values ;
+
 GENERIC: make-mirror ( obj -- assoc )
-M: hashtable make-mirror ;
+M: hashtable make-mirror sort-assoc ;
 M: integer make-mirror drop f ;
 M: array make-mirror <enum> ;
 M: vector make-mirror <enum> ;

core/prettyprint/prettyprint-tests.factor

@@ -67,7 +67,7 @@ unit-test
 [ "[ \\ [ ]" ] [ [ \ [ ] unparse ] unit-test
     
 [ t ] [
-    100 \ dup <array> [ pprint-short ] with-string-writer
+    100 \ dup <array> unparse-short
     "{" head?
 ] unit-test
 

core/prettyprint/prettyprint.factor

@@ -75,6 +75,9 @@ combinators quotations ;
        { string-limit t }
     } clone [ pprint ] bind ;
 
+: unparse-short ( obj -- str )
+    [ pprint-short ] with-string-writer ;
+
 : short. ( obj -- ) pprint-short nl ;
 
 : .b ( n -- ) >bin print ;