]> gitweb.factorcode.org Git - factor.git/commitdiff
Fixing issue where require-when could create a circularity
authorDaniel Ehrenberg <littledan@pool-224-36.res.carleton.edu>
Wed, 21 Apr 2010 05:40:40 +0000 (00:40 -0500)
committerDaniel Ehrenberg <littledan@pool-224-36.res.carleton.edu>
Wed, 21 Apr 2010 05:40:40 +0000 (00:40 -0500)
core/vocabs/loader/loader.factor

index 2945736f3cf7033ddedabe3e5f0ef3bff8dcfe9f..535932fdc7afc8df170a8493d11fbb46bf809a1e 100644 (file)
@@ -75,7 +75,7 @@ require-when-table [ V{ } clone ] initialize
 : load-conditional-requires ( vocab -- )
     vocab-name require-when-vocabs get in? [
         require-when-table get [
-            [ [ vocab ] all? ] dip
+            [ [ vocab dup [ source-loaded?>> +done+ = ] when ] all? ] dip
             [ require ] curry when
         ] assoc-each
     ] when ;