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

modern: Fix tests and foo[[ ]]

modern-harvey3
Doug Coleman 2019-12-01 11:25:03 -06:00
parent 9e4a999f7b
commit cb8499373d
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,31 +4,31 @@ USING: kernel modern modern.out modern.slices multiline
sequences tools.test ;
IN: modern.tests
{ f } [ "" upper-colon? ] unit-test
{ t } [ ":" upper-colon? ] unit-test
{ t } [ "::" upper-colon? ] unit-test
{ t } [ ":::" upper-colon? ] unit-test
{ t } [ "FOO:" upper-colon? ] unit-test
{ t } [ "FOO::" upper-colon? ] unit-test
{ t } [ "FOO:::" upper-colon? ] unit-test
{ f } [ "" upper-colon-form? ] unit-test
{ t } [ ":" upper-colon-form? ] unit-test
{ t } [ "::" upper-colon-form? ] unit-test
{ t } [ ":::" upper-colon-form? ] unit-test
{ t } [ "FOO:" upper-colon-form? ] unit-test
{ t } [ "FOO::" upper-colon-form? ] unit-test
{ t } [ "FOO:::" upper-colon-form? ] unit-test
! 'FOO:
{ f } [ "'" upper-colon? ] unit-test
{ t } [ "':" upper-colon? ] unit-test
{ t } [ "'::" upper-colon? ] unit-test
{ t } [ "':::" upper-colon? ] unit-test
{ t } [ "'FOO:" upper-colon? ] unit-test
{ t } [ "'FOO::" upper-colon? ] unit-test
{ t } [ "'FOO:::" upper-colon? ] unit-test
{ f } [ "'" upper-colon-form? ] unit-test
{ t } [ "':" upper-colon-form? ] unit-test
{ t } [ "'::" upper-colon-form? ] unit-test
{ t } [ "':::" upper-colon-form? ] unit-test
{ t } [ "'FOO:" upper-colon-form? ] unit-test
{ t } [ "'FOO::" upper-colon-form? ] unit-test
{ t } [ "'FOO:::" upper-colon-form? ] unit-test
! \FOO: is not an upper-colon form, it is deactivated by the \
{ f } [ "\\" upper-colon? ] unit-test
{ f } [ "\\:" upper-colon? ] unit-test
{ f } [ "\\::" upper-colon? ] unit-test
{ f } [ "\\:::" upper-colon? ] unit-test
{ f } [ "\\FOO:" upper-colon? ] unit-test
{ f } [ "\\FOO::" upper-colon? ] unit-test
{ f } [ "\\FOO:::" upper-colon? ] unit-test
{ f } [ "\\" upper-colon-form? ] unit-test
{ f } [ "\\:" upper-colon-form? ] unit-test
{ f } [ "\\::" upper-colon-form? ] unit-test
{ f } [ "\\:::" upper-colon-form? ] unit-test
{ f } [ "\\FOO:" upper-colon-form? ] unit-test
{ f } [ "\\FOO::" upper-colon-form? ] unit-test
{ f } [ "\\FOO:::" upper-colon-form? ] unit-test
! Comment
@ -156,11 +156,11 @@ IN: modern.tests
{ f } [ "FOO" section-open? ] unit-test
{ f } [ "FOO:" section-open? ] unit-test
{ f } [ ";FOO" section-close? ] unit-test
{ f } [ "FOO" section-close? ] unit-test
{ f } [ ";FOO" section-close-form? ] unit-test
{ f } [ "FOO" section-close-form? ] unit-test
{ f } [ ":>" section-close? ] unit-test
{ f } [ ":::>" section-close? ] unit-test
{ f } [ ":>" section-close-form? ] unit-test
{ f } [ ":::>" section-close-form? ] unit-test
! Strings
@ -250,9 +250,9 @@ IN: modern.tests
{ t } [ "![[ ]]" [ rewrite-string-exact ] keep sequence= ] unit-test
{ t } [ "![=[ ]=]" [ rewrite-string-exact ] keep sequence= ] unit-test
{ t } [ "![==[ ]==]" [ rewrite-string-exact ] keep sequence= ] unit-test
{ t } [ "![0[ ]0]" [ rewrite-string-exact ] keep sequence= ] unit-test
{ t } [ "![00[ ]00]" [ rewrite-string-exact ] keep sequence= ] unit-test
{ t } [ "foo[[ ]]" [ rewrite-string-exact ] keep sequence= ] unit-test
{ t } [ "foo[=[ ]=]" [ rewrite-string-exact ] keep sequence= ] unit-test
{ t } [ "foo[==[ ]==]" [ rewrite-string-exact ] keep sequence= ] unit-test
{ t } [ "foo[11[ ]11]" [ rewrite-string-exact ] keep sequence= ] unit-test
{ t } [ "foo[123[ ]123]" [ rewrite-string-exact ] keep sequence= ] unit-test

2
extra/modern/modern.factor
View File

@ -106,7 +106,7 @@ DEFER: lex-factor-nested
DEFER: lex-factor-fallthrough
MACRO:: read-matched ( $ch -- quot: ( string n tag -- string n' slice' ) )
10 <iota> [ char: 0 + ] map
{ 48 49 50 51 52 53 54 55 56 57 $ch }
$ch matching-delimiter 1string :> ( $openstreq $closestr1 ) ! digits ]
|[ $string $n $tag |
$string $n $tag