Wrap proxy.js in a function.

src/proxy.js

Index: src/proxy.js
diff --git a/src/proxy.js b/src/proxy.js
index 0776eeae8f979302b38630b96374863b98ed9335..9f02705e37acdca5808a4c3f08d23be6ad335d2c 100644
--- a/src/proxy.js
+++ b/src/proxy.js
@@ -2,13 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+var $proxyDelegateCallAndConstruct;
+var $proxyDerivedGetTrap;
+var $proxyDerivedHasTrap;
+var $proxyDerivedHasOwnTrap;
+var $proxyDerivedKeysTrap;
+var $proxyDerivedSetTrap;
+var $proxyEnumerate;
+
+(function() {
+
 "use strict";

[rossberg, 2015/04/10 11:00:28]

DBC: is there a reason not to leave this at the top of the file?

[Yang, 2015/04/10 11:05:11]

I'm considering the option of concatenating all (non-optional) native js files
into one js file (so that references across files don't have to be properties on
the jsbuiltins object anymore). Since some are strict and others are not, having
the strict mode within the function scope would preserve that. Now of course
proxy.js is optional (behind a flag), but I'd like to make this consistent.

 
-// This file relies on the fact that the following declaration has been made
-// in runtime.js:
-// var $Object = global.Object;
+%CheckIsBootstrapping();
 
-var $Proxy = new $Object();
+var GlobalObject = global.Object;
 
 // -------------------------------------------------------------------
 
@@ -43,25 +51,6 @@ function ProxyCreateFunction(handler, callTrap, constructTrap) {
     handler, callTrap, constructTrap, $Function.prototype)
 }
 
-
-// -------------------------------------------------------------------
-
-function SetUpProxy() {
-  %CheckIsBootstrapping()
-
-  var global_proxy = %GlobalProxy(global);
-  global_proxy.Proxy = $Proxy;
-
-  // Set up non-enumerable properties of the Proxy object.
-  InstallFunctions($Proxy, DONT_ENUM, [
-    "create", ProxyCreate,
-    "createFunction", ProxyCreateFunction
-  ])
-}
-
-SetUpProxy();
-
-
 // -------------------------------------------------------------------
 // Proxy Builtins
 
@@ -189,3 +178,24 @@ function ProxyEnumerate(proxy) {
     return ToNameArray(handler.enumerate(), "enumerate", false)
   }
 }
+
+//-------------------------------------------------------------------
+
+var Proxy = new GlobalObject();
+%AddNamedProperty(global, "Proxy", Proxy, DONT_ENUM);
+
+//Set up non-enumerable properties of the Proxy object.
+InstallFunctions(Proxy, DONT_ENUM, [
+  "create", ProxyCreate,
+  "createFunction", ProxyCreateFunction
+])
+
+$proxyDelegateCallAndConstruct = DelegateCallAndConstruct;
+$proxyDerivedGetTrap = DerivedGetTrap;
+$proxyDerivedHasTrap = DerivedHasTrap;
+$proxyDerivedHasOwnTrap = DerivedHasOwnTrap;
+$proxyDerivedKeysTrap = DerivedKeysTrap;
+$proxyDerivedSetTrap = DerivedSetTrap;
+$proxyEnumerate = ProxyEnumerate;
+
+})();