steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modern: Allow FOO: FOO; again

modern-harvey2
Doug Coleman 2017-12-24 15:14:03 -08:00
parent 7785fea284
commit ed43df35fb
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/modern/modern-tests.factor
View File

@ -183,6 +183,7 @@ IN: modern.tests
} [ "<FOO: foo BAR: bar ;FOO>" string>literals >strings ] unit-test } [ "<FOO: foo BAR: bar ;FOO>" string>literals >strings ] unit-test
![[
{ {
{ {
{ {
@ -202,3 +203,14 @@ IN: modern.tests
} }
} }
} [ "foo:: <FOO FOO>[ 0 ][ 1 ][ 2 ][ 3 ] <BAR BAR>" string>literals >strings ] unit-test } [ "foo:: <FOO FOO>[ 0 ][ 1 ][ 2 ][ 3 ] <BAR BAR>" string>literals >strings ] unit-test
]]
{
{
{ "foo::" { { "<FOO" { } "FOO>" } { "[" { "0" } "]" } } }
{ "[" { "1" } "]" }
{ "[" { "2" } "]" }
{ "[" { "3" } "]" }
{ "<BAR" { } "BAR>" }
}
} [ "foo:: <FOO FOO> [ 0 ] [ 1 ] [ 2 ] [ 3 ] <BAR BAR>" string>literals >strings ] unit-test

1
extra/modern/modern.factor
View File

@ -207,6 +207,7 @@ ERROR: unexpected-terminator n string slice ;
! Also in stack effects ( T: int -- ) can be ended by -- and ) ! Also in stack effects ( T: int -- ) can be ended by -- and )
dup ?last { dup ?last {
{ [ dup ";" sequence= ] [ drop unclip-last 3array ] } { [ dup ";" sequence= ] [ drop unclip-last 3array ] }
{ [ dup ";" tail? ] [ drop unclip-last 3array ] }
{ [ dup "--" sequence= ] [ drop unclip-last -rot 2array [ rewind-slice ] dip ] } { [ dup "--" sequence= ] [ drop unclip-last -rot 2array [ rewind-slice ] dip ] }
{ [ dup "]" sequence= ] [ drop unclip-last -rot 2array [ rewind-slice ] dip ] } { [ dup "]" sequence= ] [ drop unclip-last -rot 2array [ rewind-slice ] dip ] }
{ [ dup "}" sequence= ] [ drop unclip-last -rot 2array [ rewind-slice ] dip ] } { [ dup "}" sequence= ] [ drop unclip-last -rot 2array [ rewind-slice ] dip ] }