From d9cdb80b9002f1ba3e0130c52e3f74040d954a68 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Mon, 5 Dec 2016 10:35:01 -0800 Subject: [PATCH] xmode.loader: use with-variable instead of with-scope. --- basis/xmode/loader/loader.factor | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/basis/xmode/loader/loader.factor b/basis/xmode/loader/loader.factor index 0d9cd03a01..6bd230eb7f 100644 --- a/basis/xmode/loader/loader.factor +++ b/basis/xmode/loader/loader.factor @@ -50,8 +50,7 @@ TAG: KEYWORDS parse-rule-tag dup [ rule-set get ignore-case?>> ] when ; : (parse-rules-tag) ( tag -- rule-set ) - dup rule-set set - { + rule-set get { { "SET" string>rule-set-name name<< } { "IGNORE_CASE" string>boolean ignore-case?<< } { "HIGHLIGHT_DIGITS" string>boolean highlight-digits?<< } @@ -62,11 +61,11 @@ TAG: KEYWORDS parse-rule-tag } init-from-tag ; : parse-rules-tag ( tag -- rule-set ) - [ + rule-set [ [ (parse-rules-tag) ] [ children-tags ] bi [ parse-rule-tag ] with each rule-set get - ] with-scope ; + ] with-variable ; : merge-rule-set-props ( props rule-set -- ) [ assoc-union ] change-props drop ;