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

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

db4
Joe Groff 2010-04-20 22:48:45 -07:00
parent 33cf10e922 eefc8b6e2f
commit 6b2fdc73f5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/vocabs/loader/loader.factor
View File

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

6
extra/javascriptcore/ffi/ffi.factor
View File

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

1
extra/javascriptcore/platforms.txt Normal file
View File

@ -0,0 +1 @@
macosx