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

core/vocabs/loader/loader.factor

@@ -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 ;

extra/javascriptcore/ffi/ffi.factor

@@ -41,17 +41,17 @@ TYPEDEF: void* JSObjectConvertToTypeCallback
 TYPEDEF: uint unsigned
 TYPEDEF: ushort JSChar
 
-C-ENUM: JSPropertyAttributes
+ENUM: JSPropertyAttributes
     { kJSPropertyAttributeNone       0 }
     { kJSPropertyAttributeReadOnly   2 }
     { kJSPropertyAttributeDontEnum   4 }
     { kJSPropertyAttributeDontDelete 8 } ;
 
-C-ENUM: JSClassAttributes
+ENUM: JSClassAttributes
     { kJSClassAttributeNone 0 }
     { kJSClassAttributeNoAutomaticPrototype 2 } ;
 
-C-ENUM: JSType
+ENUM: JSType
     kJSTypeUndefined,
     kJSTypeNull,
     kJSTypeBoolean,

extra/javascriptcore/platforms.txt

@@ -0,0 +1 @@
+macosx