From c93a28ffa2cd455a5d2ce009c4edab4f84d83eaf Mon Sep 17 00:00:00 2001 From: Chris Double Date: Wed, 18 May 2005 22:54:59 +0000 Subject: [PATCH] get parser-combinator code working with latest factor sequence changes --- contrib/parser-combinators/lazy.factor | 2 +- contrib/parser-combinators/parser-combinators.factor | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/parser-combinators/lazy.factor b/contrib/parser-combinators/lazy.factor index 226f1e06d2..a85fb53882 100644 --- a/contrib/parser-combinators/lazy.factor +++ b/contrib/parser-combinators/lazy.factor @@ -263,7 +263,7 @@ DEFER: list>llist drop lnil ] ifte ; -M: lcons nth lnth ; +! M: lcons nth lnth ; : test1 [ 1 ] list>llist diff --git a/contrib/parser-combinators/parser-combinators.factor b/contrib/parser-combinators/parser-combinators.factor index c80457566e..d611c321a2 100644 --- a/contrib/parser-combinators/parser-combinators.factor +++ b/contrib/parser-combinators/parser-combinators.factor @@ -50,7 +50,7 @@ GENERIC: ptail M: string ptail ( object -- tail ) #! Polymorphic tail. Return the tail of the object. #! For a string this is everything but the first character. - 1 swap string-tail ; + 1 swap tail ; M: list ptail ( object -- tail ) #! Polymorphic tail. Return the tail of the object. @@ -96,7 +96,7 @@ M: list pempty? ( object -- bool ) dup length pick < [ 2drop "" ] [ - string-head + head ] ifte ; : (list-take) ( n list accum -- list ) @@ -131,7 +131,7 @@ M: list ptake ( n object -- object ) dup length pick < [ 2drop "" ] [ - string-tail + tail ] ifte ; : list-drop ( n list -- list )