xmode: update for recent jEdit mode changes

[factor.git] / basis / xmode / loader / loader.factor

diff --git a/basis/xmode/loader/loader.factor b/basis/xmode/loader/loader.factor
index 0d9cd03a01b82ec2f6f447361433426f190dcbbf..fa01ca1796927738bac508c792cfb4f85bdb0280 100644 (file)
--- a/basis/xmode/loader/loader.factor
+++ b/basis/xmode/loader/loader.factor
@@ -27,7 +27,7 @@ RULE: SPAN span-rule parse-rule-tag
     shared-tag-attrs delegate-attr match-type-attr span-attrs parse-begin/end-tags init-span-tag ;
 
 RULE: SPAN_REGEXP span-rule parse-rule-tag
-    shared-tag-attrs delegate-attr match-type-attr span-attrs regexp-attr parse-begin/end-tags init-span-tag ;
+    shared-tag-attrs delegate-attr match-type-attr span-attrs regexp-attr parse-regexp-begin/end-tags init-span-tag ;
 
 RULE: EOL_SPAN eol-span-rule parse-rule-tag
     shared-tag-attrs delegate-attr match-type-attr literal-start init-eol-span-tag ;
@@ -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 ;