From: Doug Coleman Date: Wed, 22 Jul 2015 00:00:13 +0000 (-0700) Subject: variants: Add a ";" to VARIANT-MEMBER: X-Git-Tag: unmaintained~2284 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=cfb1b973ffc254d0863b04f99eeff057526c3772 variants: Add a ";" to VARIANT-MEMBER: --- diff --git a/extra/variants/variants-docs.factor b/extra/variants/variants-docs.factor index e23b3ee894..bab2e07d8e 100644 --- a/extra/variants/variants-docs.factor +++ b/extra/variants/variants-docs.factor @@ -32,8 +32,8 @@ IN: scratchpad VARIANT: list ; -VARIANT-MEMBER: list nil -VARIANT-MEMBER: list cons: { { first object } { rest list } } +VARIANT-MEMBER: list nil ; +VARIANT-MEMBER: list cons: { { first object } { rest list } } ; """ } } ; HELP: match diff --git a/extra/variants/variants-tests.factor b/extra/variants/variants-tests.factor index 4a7a7e67e1..6de3de2605 100644 --- a/extra/variants/variants-tests.factor +++ b/extra/variants/variants-tests.factor @@ -23,8 +23,8 @@ VARIANT: list { nil t } [ list initial-value ] unit-test VARIANT: list2 ; -VARIANT-MEMBER: list2 nil2 -VARIANT-MEMBER: list2 cons2: { { first object } { rest list2 } } +VARIANT-MEMBER: list2 nil2 ; +VARIANT-MEMBER: list2 cons2: { { first object } { rest list2 } } ; { t } [ nil2 list2? ] unit-test { t } [ 1 nil2 list2? ] unit-test diff --git a/extra/variants/variants.factor b/extra/variants/variants.factor index 2b753bc4e6..998fc19c85 100644 --- a/extra/variants/variants.factor +++ b/extra/variants/variants.factor @@ -50,7 +50,7 @@ SYNTAX: VARIANT: SYNTAX: VARIANT-MEMBER: scan-word scan-token parse-variant-member - define-variant-class-member ; + define-variant-class-member ";" expect ; MACRO: unboa ( class -- quot ) \ boa [ ] 2sequence [undo] ;