steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xmode.loader: use with-variable instead of with-scope.

char-rename
John Benediktsson 2016-12-05 10:35:01 -08:00
parent 914a9be1f4
commit d9cdb80b90
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
basis/xmode/loader/loader.factor
View File

@ -50,8 +50,7 @@ TAG: KEYWORDS parse-rule-tag
dup [ rule-set get ignore-case?>> <?insensitive-regexp> ] when ; dup [ rule-set get ignore-case?>> <?insensitive-regexp> ] when ;
: (parse-rules-tag) ( tag -- rule-set ) : (parse-rules-tag) ( tag -- rule-set )
<rule-set> dup rule-set set rule-set get {
{
{ "SET" string>rule-set-name name<< } { "SET" string>rule-set-name name<< }
{ "IGNORE_CASE" string>boolean ignore-case?<< } { "IGNORE_CASE" string>boolean ignore-case?<< }
{ "HIGHLIGHT_DIGITS" string>boolean highlight-digits?<< } { "HIGHLIGHT_DIGITS" string>boolean highlight-digits?<< }
@ -62,11 +61,11 @@ TAG: KEYWORDS parse-rule-tag
} init-from-tag ; } init-from-tag ;
: parse-rules-tag ( tag -- rule-set ) : parse-rules-tag ( tag -- rule-set )
[ <rule-set> rule-set [
[ (parse-rules-tag) ] [ children-tags ] bi [ (parse-rules-tag) ] [ children-tags ] bi
[ parse-rule-tag ] with each [ parse-rule-tag ] with each
rule-set get rule-set get
] with-scope ; ] with-variable ;
: merge-rule-set-props ( props rule-set -- ) : merge-rule-set-props ( props rule-set -- )
[ assoc-union ] change-props drop ; [ assoc-union ] change-props drop ;