Replace use of '2list' in parser combinators code. parser-combinators
are still broken though due to an error calling the 'parens' test. This used to work in 0.78...cvs
parent
1bafed23f1
commit
64e326e56d
|
@ -228,7 +228,7 @@ DEFER: list>llist
|
||||||
: lappend ( llist1 llist2 -- llist )
|
: lappend ( llist1 llist2 -- llist )
|
||||||
#! Concatenate two lazy lists such that they appear to be one big
|
#! Concatenate two lazy lists such that they appear to be one big
|
||||||
#! lazy list.
|
#! lazy list.
|
||||||
2list list>llist lappend* ;
|
[ ] cons cons list>llist lappend* ;
|
||||||
|
|
||||||
: leach ( llist quot -- )
|
: leach ( llist quot -- )
|
||||||
#! Call the quotation on each item in the lazy list.
|
#! Call the quotation on each item in the lazy list.
|
||||||
|
@ -263,35 +263,3 @@ DEFER: list>llist
|
||||||
drop lnil
|
drop lnil
|
||||||
] if ;
|
] if ;
|
||||||
|
|
||||||
! M: lcons nth lnth ;
|
|
||||||
|
|
||||||
: test1
|
|
||||||
[ 1 ] list>llist
|
|
||||||
[ 2 ] list>llist
|
|
||||||
2list
|
|
||||||
list>llist
|
|
||||||
lappend* ;
|
|
||||||
|
|
||||||
: test2
|
|
||||||
[ 1 2 ] list>llist
|
|
||||||
[ 3 4 ] list>llist
|
|
||||||
2list
|
|
||||||
list>llist
|
|
||||||
lappend* ;
|
|
||||||
|
|
||||||
: test3
|
|
||||||
[ 1 2 3 ] list>llist
|
|
||||||
[ 4 5 6 ] list>llist
|
|
||||||
[ 7 8 9 ] list>llist
|
|
||||||
2list cons
|
|
||||||
list>llist
|
|
||||||
lappend* ;
|
|
||||||
|
|
||||||
: test4
|
|
||||||
[ 1 2 3 4 5 ] list>llist
|
|
||||||
[ 2 mod 1 = ] lsubset ;
|
|
||||||
|
|
||||||
: test5 lnil unit delay lunit [ lnil? not ] lsubset ;
|
|
||||||
|
|
||||||
: test6 lnil unit delay lunit lappend* ;
|
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: kernel lazy parser-combinators test errors strings parser lists math sequences unparser ;
|
USING: kernel lazy parser-combinators test errors strings parser lists math sequences ;
|
||||||
|
|
||||||
! Testing <&>
|
! Testing <&>
|
||||||
[ [ [[ "cd" [[ "a" "b" ]] ]] ] ] [
|
[ [ [[ "cd" [[ "a" "b" ]] ]] ] ] [
|
||||||
|
|
Loading…
Reference in New Issue