From 5e658354ab7f1d282dc3bd865079ecf304e3b6f0 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Tue, 13 Oct 2009 13:31:46 -0700
Subject: [PATCH] Fixes for objj on narwhal-jsc plus Externals update.

---
 External/browserjs       | 2 +-
 External/jack            | 2 +-
 External/narwhal         | 2 +-
 Objective-J/constants.js | 2 +-
 Objective-J/evaluate.js  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/External/browserjs b/External/browserjs
index b01b92b12..9eb026b82 160000
--- a/External/browserjs
+++ b/External/browserjs
@@ -1 +1 @@
-Subproject commit b01b92b128c1ba8258344806bc7df79ce5ffee3c
+Subproject commit 9eb026b82b16fac4dfbc0bad9b3b8f83be649096
diff --git a/External/jack b/External/jack
index ec86b9afb..3ee7b5681 160000
--- a/External/jack
+++ b/External/jack
@@ -1 +1 @@
-Subproject commit ec86b9afb8e10f62709c46eda38a216961cceda7
+Subproject commit 3ee7b56812c97770318891a0fd21287cae9ccfc2
diff --git a/External/narwhal b/External/narwhal
index 0a92f837c..4eb47f95f 160000
--- a/External/narwhal
+++ b/External/narwhal
@@ -1 +1 @@
-Subproject commit 0a92f837cc01d824a6f09134fe4a4f58ada5d17a
+Subproject commit 4eb47f95f1a3a8aae052654c1294dfda2b58b173
diff --git a/Objective-J/constants.js b/Objective-J/constants.js
index dbaa46078..4e1ce97ab 100644
--- a/Objective-J/constants.js
+++ b/Objective-J/constants.js
@@ -106,7 +106,7 @@ function objj_printf(string)
 }
 
 #if RHINO
-var warning_stream = function (aString) { Packages.java.lang.System.out.println(aString) };
+var warning_stream = function (aString) { print(aString) };
 #else
 if (window.console && window.console.warn)
     var warning_stream = function(aString) { window.console.warn(aString); }
diff --git a/Objective-J/evaluate.js b/Objective-J/evaluate.js
index 02e33aaf3..09813f90d 100644
--- a/Objective-J/evaluate.js
+++ b/Objective-J/evaluate.js
@@ -162,7 +162,7 @@ function fragment_evaluate_code(aFragment)
         if (typeof system !== "undefined" && system.engine === "rhino")
             compiled = Packages.org.mozilla.javascript.Context.getCurrentContext().compileFunction(window, functionText, GET_FILE(aFragment).path, 0, null);
         else
-            compiled = eval(functionText);
+            compiled = eval("("+functionText+")");
 #else
         // "//@ sourceURL=" at the end lets us name our eval'd files for debuggers, etc.
         // * WebKit:  http://pmuellr.blogspot.com/2009/06/debugger-friendly.html