sequences.parser: simplify duplicate defition.

currently, keep possibly poor "next" naming, since it was used in a few
more places than "get+increment". both are kinda bad names i guess.

diff --git a/basis/sequences/parser/parser.factor b/basis/sequences/parser/parser.factor
index 2dc1659f7b0656853f41aea8e0fc845ee2a5153d..cee5fb48982f678fe36e3f58288ef830c42a343d 100644 (file)
--- a/basis/sequences/parser/parser.factor
+++ b/basis/sequences/parser/parser.factor
@@ -31,12 +31,7 @@ TUPLE: sequence-parser sequence n ;
 : advance ( sequence-parser -- sequence-parser )
     [ 1 + ] change-n ; inline
 
-: advance* ( sequence-parser -- )
-    advance drop ; inline
-
-: next ( sequence-parser -- obj ) [ current ] [ advance* ] bi ;
-
-: get+increment ( sequence-parser -- char/f )
+: next ( sequence-parser -- char/f )
     [ current ] [ advance drop ] bi ; inline
 
 :: skip-until ( ... sequence-parser quot: ( ... obj -- ... ? ) -- ... )

diff --git a/extra/c/lexer/lexer.factor b/extra/c/lexer/lexer.factor
index 8869d59d587c4949f7ca75f84d066f88723b14e5..5606dc46bfa3cfa9a5132caf95ba99d08f0b0824 100644 (file)
--- a/extra/c/lexer/lexer.factor
+++ b/extra/c/lexer/lexer.factor
@@ -51,7 +51,7 @@ IN: c.lexer
         } 1||
     ] take-while :> string
     sequence-parser current quote-char = [
-        sequence-parser advance* string
+        sequence-parser advance drop string
     ] [
         start-n sequence-parser n<< f
     ] if ;

diff --git a/extra/html/parser/parser.factor b/extra/html/parser/parser.factor
index 9fc7e6295fd69a8a56e1383e59b2ccb958428dae..b9c09e41ac91afe22627ad0dd7c75141f4247a7b 100644 (file)
--- a/extra/html/parser/parser.factor
+++ b/extra/html/parser/parser.factor
@@ -46,7 +46,7 @@ SYMBOL: tagstack
     CHAR: \" (read-quote) ;
 
 : read-quote ( sequence-parser -- string )
-    dup get+increment CHAR: ' =
+    dup next CHAR: ' =
     [ read-single-quote ] [ read-double-quote ] if ;
 
 : read-key ( sequence-parser -- string )