Merge branch 'master' of git://factorcode.org/git/factor

basis/debugger/debugger.factor

@@ -206,9 +206,8 @@ M: no-cond summary
 M: no-case summary
     drop "Fall-through in case" ;
 
-M: slice-error error.
+M: slice-error summary
-    "Cannot create slice because " write
+    drop "Cannot create slice" ;
-    reason>> print ;
 
 M: bounds-error summary drop "Sequence index out of bounds" ;
 

basis/html/templates/fhtml/fhtml-tests.factor

@@ -6,11 +6,8 @@ IN: html.templates.fhtml.tests
 : test-template ( path -- ? )
     "resource:basis/html/templates/fhtml/test/"
     prepend
-    [
+    [ ".fhtml" append <fhtml> [ call-template ] with-string-writer ]
-        ".fhtml" append <fhtml> [ call-template ] with-string-writer
+    [ ".html" append utf8 file-contents ] bi
-        <string-reader> lines
-    ] keep
-    ".html" append utf8 file-lines
     [ . . ] [ = ] 2bi ;
 
 [ t ] [ "example" test-template ] unit-test

basis/listener/listener-docs.factor

@@ -9,7 +9,29 @@ ARTICLE: "listener-watch" "Watching variables in the listener"
 { $subsection hide-var }
 "To add and remove multiple variables:"
 { $subsection show-vars }
-{ $subsection hide-vars } ;
+{ $subsection hide-vars }
+"Hiding all visible variables:"
+{ $subsection hide-all-vars } ;
+
+HELP: show-var
+{ $values { "var" "a variable name" } }
+{ $description "Adds a variable to the watch list; its value will be printed by the listener after every expression." } ;
+
+HELP: show-vars
+{ $values { "seq" "a sequence of variable names" } }
+{ $description "Adds a sequence of variables to the watch list; their values will be printed by the listener after every expression." } ;
+
+HELP: hide-var
+{ $values { "var" "a variable name" } }
+{ $description "Removes a variable from the watch list." } ;
+
+HELP: hide-vars
+{ $values { "seq" "a sequence of variable names" } }
+{ $description "Removes a sequence of variables from the watch list." } ;
+
+HELP: hide-all-vars
+{ $values { "seq" "a sequence of variable names" } }
+{ $description "Removes all variables from the watch list." } ;
 
 ARTICLE: "listener" "The listener"
 "The listener evaluates Factor expressions read from a stream. The listener is the primary interface to the Factor runtime. Typically, you write Factor code in a text editor, then load it using the listener and test it."

basis/listener/listener.factor

@@ -42,14 +42,16 @@ PRIVATE>
 
 SYMBOL: visible-vars
 
-: show-var ( sym -- ) visible-vars  [ swap suffix ] change ;
+: show-var ( var -- ) visible-vars  [ swap suffix ] change ;
 
 : show-vars ( seq -- ) visible-vars [ swap union ] change ;
 
-: hide-var ( sym -- ) visible-vars [ remove ] change ;
+: hide-var ( var -- ) visible-vars [ remove ] change ;
 
 : hide-vars ( seq -- ) visible-vars [ swap diff ] change ;
 
+: hide-all-vars ( -- ) visible-vars off ;
+
 SYMBOL: error-hook
 
 [ print-error-and-restarts ] error-hook set-global

core/sequences/sequences.factor

@@ -190,7 +190,7 @@ TUPLE: slice
 : collapse-slice ( m n slice -- m' n' seq )
     [ from>> ] [ seq>> ] bi >r tuck + >r + r> r> ; inline
 
-ERROR: slice-error reason ;
+ERROR: slice-error from to seq reason ;
 
 : check-slice ( from to seq -- from to seq )
     pick 0 < [ "start < 0" slice-error ] when

extra/benchmark/regex-dna/regex-dna-tests.factor

@@ -4,7 +4,7 @@ IN: benchmark.regex-dna.tests
 
 [ t ] [
     "resource:extra/benchmark/regex-dna/regex-dna-test-in.txt"
-    [ regex-dna ] with-string-writer <string-reader> lines
+    [ regex-dna ] with-string-writer
     "resource:extra/benchmark/regex-dna/regex-dna-test-out.txt"
-    ascii file-lines =
+    ascii file-contents =
 ] unit-test