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

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2010-06-06 00:48:48 -04:00
parent 597f7cb578 bd0a27c18e
commit a1f1330586
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
basis/xmode/catalog/catalog.factor
View File

@ -1,7 +1,7 @@
USING: xmode.loader xmode.utilities xmode.rules namespaces USING: xmode.loader xmode.utilities xmode.rules namespaces
strings splitting assocs sequences kernel io.files xml memoize strings splitting assocs sequences kernel io.files xml memoize
words globs combinators io.encodings.utf8 sorting accessors xml.data words globs combinators io.encodings.utf8 io.pathnames sorting
xml.traversal xml.syntax ; accessors xml.data xml.traversal xml.syntax ;
IN: xmode.catalog IN: xmode.catalog
TUPLE: mode file file-name-glob first-line-glob ; TUPLE: mode file file-name-glob first-line-glob ;
@ -113,7 +113,11 @@ ERROR: mutually-recursive-rulesets ruleset ;
[ nip ] 2keep first-line-glob>> ?glob-matches [ nip ] 2keep first-line-glob>> ?glob-matches
[ 2drop t ] [ file-name-glob>> ?glob-matches ] if ; [ 2drop t ] [ file-name-glob>> ?glob-matches ] if ;
: find-mode ( file-name first-line -- mode ) : ?find-mode ( file-name first-line -- mode/f )
[ file-name ] dip
modes modes
[ nip [ 2dup ] dip suitable-mode? ] assoc-find [ nip [ 2dup ] dip suitable-mode? ] assoc-find
2drop [ 2drop ] dip [ "text" ] unless* ; 2drop [ 2drop ] dip ;
: find-mode ( file-name first-line -- mode )
?find-mode "text" or ; inline

2
core/sets/sets-docs.factor
View File

@ -15,7 +15,7 @@ ABOUT: "sets"
ARTICLE: "set-operations" "Operations on sets" ARTICLE: "set-operations" "Operations on sets"
"To test if an object is a member of a set:" "To test if an object is a member of a set:"
{ $subsections member? } { $subsections in? }
"All sets can be represented as a sequence, without duplicates, of their members:" "All sets can be represented as a sequence, without duplicates, of their members:"
{ $subsections members } { $subsections members }
"Sets can have members added or removed destructively:" "Sets can have members added or removed destructively:"