From 9cff14ca01fd89722a4c80aa3cffa30a107453c0 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 30 Dec 2018 20:20:35 -0600 Subject: [PATCH] match: _ -> __ for fun --- basis/match/match-tests.factor | 4 ++-- basis/match/match.factor | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/basis/match/match-tests.factor b/basis/match/match-tests.factor index 9d12154c2a..4424da83ff 100644 --- a/basis/match/match-tests.factor +++ b/basis/match/match-tests.factor @@ -39,7 +39,7 @@ MATCH-VARS: ?a ?b ; { { { 1 2 } [ t ] } { { 1 3 } [ t ] } - { _ [ f ] } + { __ [ f ] } } match-cond ] unit-test @@ -89,7 +89,7 @@ C: foo ] unit-test { { 2 1 } } [ - { "a" 1 2 "b" } { _ ?a ?b _ } { ?b ?a } match-replace + { "a" 1 2 "b" } { __ ?a ?b __ } { ?b ?a } match-replace ] unit-test TUPLE: match-replace-test a b ; diff --git a/basis/match/match.factor b/basis/match/match.factor index f963b1631c..92ff3d3076 100644 --- a/basis/match/match.factor +++ b/basis/match/match.factor @@ -6,7 +6,7 @@ USING: assocs classes classes.tuple combinators kernel lexer macros make namespaces parser quotations sequences summary words ; IN: match -SYMBOL: _ +SYMBOL: __ : define-match-var ( name -- ) create-word-in @@ -29,7 +29,7 @@ PREDICATE: match-var < word "match-var" word-prop ; { [ dup match-var? ] [ set-match-var ] } { [ over match-var? ] [ swap set-match-var ] } { [ 2dup = ] [ 2drop t ] } - { [ 2dup [ _ eq? ] either? ] [ 2drop t ] } + { [ 2dup [ __ eq? ] either? ] [ 2drop t ] } { [ 2dup [ sequence? ] both? ] [ 2dup [ length ] same? [ [ (match) ] 2all?