combinators.extras: Add some weird combinators that might be useful.

[factor.git] / extra / modern / html / html.factor

diff --git a/extra/modern/html/html.factor b/extra/modern/html/html.factor
index 0ec7b034a4bb129cc190d7c2d6756099c46983eb..d5d33ed20be8e28f37eed61bc99cedc9cc7e1ed9 100644 (file)
--- a/extra/modern/html/html.factor
+++ b/extra/modern/html/html.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators
 combinators.short-circuit kernel make math modern modern.slices
-sequences sequences.extras shuffle shuffle.extras splitting
+sequences sequences.extras shuffle combinators.extras splitting
 strings unicode ;
 IN: modern.html
 
@@ -70,7 +70,7 @@ C: <dquote> dquote
         { CHAR: \\ CHAR: ' } slice-til-separator-inclusive {
             { f [ to>> over string-expected-got-eof ] }
             { CHAR: ' [ drop ] }
-            { CHAR: \\ [ drop next-char-from drop advance-squote-payload ] }
+            { CHAR: \\ [ drop take-char drop advance-squote-payload ] }
         } case
     ] [
         string-expected-got-eof
@@ -87,7 +87,7 @@ C: <dquote> dquote
     [ "\s\r\n/>" member? ] slice-until ;
 
 : read-value ( n string -- n' string value )
-    skip-whitespace next-char-from {
+    skip-whitespace take-char {
         { CHAR: ' [ CHAR: ' read-string >string <squote> ] }
         { CHAR: " [ CHAR: " read-string >string <dquote> ] }
         { CHAR: [ [ "[" throw ] }