]> gitweb.factorcode.org Git - factor.git/commitdiff
xmode.loader: use with-variable instead of with-scope.
authorJohn Benediktsson <mrjbq7@gmail.com>
Mon, 5 Dec 2016 18:35:01 +0000 (10:35 -0800)
committerJohn Benediktsson <mrjbq7@gmail.com>
Mon, 5 Dec 2016 18:35:01 +0000 (10:35 -0800)
basis/xmode/loader/loader.factor

index 0d9cd03a01b82ec2f6f447361433426f190dcbbf..6bd230eb7ffcb4e2de7c088a7a4063480d904074 100644 (file)
@@ -50,8 +50,7 @@ TAG: KEYWORDS parse-rule-tag
     dup [ rule-set get ignore-case?>> <?insensitive-regexp> ] when ;
 
 : (parse-rules-tag) ( tag -- rule-set )
-    <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> 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 ;