From 090862ce1a9c119713044c2e4ee1bc83eb122955 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 16 Apr 2013 11:23:41 -0700 Subject: [PATCH] words.alias: make aliases to parsing words also parsing words. --- core/words/alias/alias-tests.factor | 7 ++++++- core/words/alias/alias.factor | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/words/alias/alias-tests.factor b/core/words/alias/alias-tests.factor index 4dc53f769e..badf63486b 100644 --- a/core/words/alias/alias-tests.factor +++ b/core/words/alias/alias-tests.factor @@ -1,6 +1,11 @@ -USING: math eval tools.test effects ; +USING: math eval lexer tools.test effects sequences ; IN: words.alias.tests ALIAS: foo + [ ] [ "IN: words.alias.tests CONSTANT: foo 5" eval( -- ) ] unit-test [ ( -- value ) ] [ \ foo stack-effect ] unit-test + +ALIAS: MY-H{ H{ +{ H{ { 1 2 } } } [ + "IN: words.alias.tests MY-H{ { 1 2 } }" eval( -- x ) +] unit-test diff --git a/core/words/alias/alias.factor b/core/words/alias/alias.factor index e9fd7213fc..754cda996b 100644 --- a/core/words/alias/alias.factor +++ b/core/words/alias/alias.factor @@ -8,7 +8,8 @@ PREDICATE: alias < word "alias" word-prop ; : define-alias ( new old -- ) [ [ 1quotation ] [ stack-effect ] bi define-inline ] - [ drop t "alias" set-word-prop ] 2bi ; + [ drop t "alias" set-word-prop ] + [ parsing-word? [ t "parsing" set-word-prop ] [ drop ] if ] 2tri ; M: alias reset-word [ call-next-method ] [ f "alias" set-word-prop ] bi ;