factor: trim using lists

[factor.git] / basis / xml / state / state.factor

diff --git a/basis/xml/state/state.factor b/basis/xml/state/state.factor
index a31565c8ad0b2fb0e4d6618905c048ce0da95a75..288d62229a4f5bcbbfd3037db8d568d623c7c84d 100644 (file)
--- a/basis/xml/state/state.factor
+++ b/basis/xml/state/state.factor
@@ -1,36 +1,25 @@
 ! Copyright (C) 2005, 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel namespaces io math ;
+USING: accessors kernel namespaces ;
 IN: xml.state
 
-TUPLE: spot
-    char { line fixnum } { column fixnum }
-    next check version-1.0? ;
+TUPLE: spot char line column next check version-1.0? stream ;
 
 C: <spot> spot
 
-: get-char ( -- char ) spot get char>> ;
-: set-char ( char -- ) spot get swap >>char drop ;
-: get-line ( -- line ) spot get line>> ;
-: set-line ( line -- ) spot get swap >>line drop ;
-: get-column ( -- column ) spot get column>> ;
-: set-column ( column -- ) spot get swap >>column drop ;
-: get-next ( -- char ) spot get next>> ;
-: set-next ( char -- ) spot get swap >>next drop ;
-: get-check ( -- ? ) spot get check>> ;
-: check ( -- ) spot get t >>check drop ;
-: version-1.0? ( -- ? ) spot get version-1.0?>> ;
+: get-char ( -- char ) spot get char>> ; inline
+: get-line ( -- line ) spot get line>> ; inline
+: get-column ( -- column ) spot get column>> ; inline
+: get-next ( -- char ) spot get next>> ; inline
+: get-check ( -- ? ) spot get check>> ; inline
+: check ( -- ) spot get t >>check drop ; inline
+: version-1.0? ( -- ? ) spot get version-1.0?>> ; inline
 : set-version ( string -- )
-    spot get swap "1.0" = >>version-1.0? drop ;
+    spot get swap "1.0" = >>version-1.0? drop ; inline
 
 SYMBOL: xml-stack
-
 SYMBOL: depth
-
 SYMBOL: interpolating?
-
 SYMBOL: in-dtd?
-
 SYMBOL: pe-table
-
 SYMBOL: extra-entities