]> gitweb.factorcode.org Git - factor.git/commitdiff
xmode.catalog: factor ?find-mode (which returns f if no mode found) from find-mode...
authorJoe Groff <arcata@gmail.com>
Sat, 5 Jun 2010 22:17:51 +0000 (15:17 -0700)
committerJoe Groff <arcata@gmail.com>
Sat, 5 Jun 2010 22:17:51 +0000 (15:17 -0700)
basis/xmode/catalog/catalog.factor

index 9b337418b3a6543b3d9156755596daefae5db0ad..6ca3013bf779ef1fee27d6d38ac1aff0e7caed5d 100644 (file)
@@ -113,8 +113,11 @@ ERROR: mutually-recursive-rulesets ruleset ;
     [ nip ] 2keep first-line-glob>> ?glob-matches
     [ 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
     [ 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