From ddfeee462100fb65950d653e3497e336cbccee30 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Wed, 21 Apr 2010 00:29:43 -0500
Subject: [PATCH 1/3] Add a 'not tested' tag to javascriptcore

---
 extra/javascriptcore/tags.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 extra/javascriptcore/tags.txt

diff --git a/extra/javascriptcore/tags.txt b/extra/javascriptcore/tags.txt
new file mode 100644
index 0000000000..700f0dc9a5
--- /dev/null
+++ b/extra/javascriptcore/tags.txt
@@ -0,0 +1 @@
+not tested

From c5530080c47651ec869633432c7125c8339abbef Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@pool-224-36.res.carleton.edu>
Date: Wed, 21 Apr 2010 00:40:40 -0500
Subject: [PATCH 2/3] Fixing issue where require-when could create a
 circularity

---
 core/vocabs/loader/loader.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 2945736f3c..535932fdc7 100644
--- a/core/vocabs/loader/loader.factor
+++ b/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 ;

From eefc8b6e2f962b7ec1b1645c34a83a982a210c8c Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Wed, 21 Apr 2010 00:41:30 -0500
Subject: [PATCH 3/3] Fix C-ENUM: -> ENUM:

---
 extra/javascriptcore/ffi/ffi.factor | 6 +++---
 extra/javascriptcore/platforms.txt  | 1 +
 extra/javascriptcore/tags.txt       | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 extra/javascriptcore/platforms.txt
 delete mode 100644 extra/javascriptcore/tags.txt

diff --git a/extra/javascriptcore/ffi/ffi.factor b/extra/javascriptcore/ffi/ffi.factor
index 7a038b0883..02847e2fa8 100644
--- a/extra/javascriptcore/ffi/ffi.factor
+++ b/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,
diff --git a/extra/javascriptcore/platforms.txt b/extra/javascriptcore/platforms.txt
new file mode 100644
index 0000000000..6e806f449e
--- /dev/null
+++ b/extra/javascriptcore/platforms.txt
@@ -0,0 +1 @@
+macosx
diff --git a/extra/javascriptcore/tags.txt b/extra/javascriptcore/tags.txt
deleted file mode 100644
index 700f0dc9a5..0000000000
--- a/extra/javascriptcore/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-not tested