Native context: use import/export for Object observe related functions.

src/js/array.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 (function(global, utils, extrasUtils) {
 
 "use strict";
 
 %CheckIsBootstrapping();
 
 // -------------------------------------------------------------------
 // Imports
 
 var Delete;
 var GlobalArray = global.Array;
 var InternalArray = utils.InternalArray;
 var InternalPackedArray = utils.InternalPackedArray;
 var MathMin;
 var ObjectHasOwnProperty;
 var ObjectIsFrozen;
 var ObjectIsSealed;
 var ObjectToString;
+var ObserveBeginPerformSplice;
+var ObserveEndPerformSplice;
+var ObserveEnqueueSpliceRecord;
 var unscopablesSymbol = utils.ImportNow("unscopables_symbol");
 
 utils.Import(function(from) {
   Delete = from.Delete;
   MathMin = from.MathMin;
   ObjectHasOwnProperty = from.ObjectHasOwnProperty;
   ObjectIsFrozen = from.ObjectIsFrozen;
   ObjectIsSealed = from.ObjectIsSealed;
   ObjectToString = from.ObjectToString;
+  ObserveBeginPerformSplice = from.ObserveBeginPerformSplice;
+  ObserveEndPerformSplice = from.ObserveEndPerformSplice;
+  ObserveEnqueueSpliceRecord = from.ObserveEnqueueSpliceRecord;
 });
 
 // -------------------------------------------------------------------
 
 // Global list of arrays visited during toString, toLocaleString and
 // join invocations.
 var visited_arrays = new InternalArray();
 
 
 // Gets a sorted array of array keys.  Useful for operations on sparse
@@ skipping 388 matching lines @@
 
   return InnerArrayJoin(separator, array, length);
 }
 
 
 function ObservedArrayPop(n) {
   n--;
   var value = this[n];
 
   try {
-    $observeBeginPerformSplice(this);
+    ObserveBeginPerformSplice(this);
     delete this[n];
     this.length = n;
   } finally {
-    $observeEndPerformSplice(this);
-    $observeEnqueueSpliceRecord(this, n, [value], 0);
+    ObserveEndPerformSplice(this);
+    ObserveEnqueueSpliceRecord(this, n, [value], 0);
   }
 
   return value;
 }
 
 
 // Removes the last element from the array and returns it. See
 // ECMA-262, section 15.4.4.6.
 function ArrayPop() {
   CHECK_OBJECT_COERCIBLE(this, "Array.prototype.pop");
@@ skipping 14 matching lines @@
   array.length = n;
   return value;
 }
 
 
 function ObservedArrayPush() {
   var n = TO_LENGTH_OR_UINT32(this.length);
   var m = %_ArgumentsLength();
 
   try {
-    $observeBeginPerformSplice(this);
+    ObserveBeginPerformSplice(this);
     for (var i = 0; i < m; i++) {
       this[i+n] = %_Arguments(i);
     }
     var new_length = n + m;
     this.length = new_length;
   } finally {
-    $observeEndPerformSplice(this);
-    $observeEnqueueSpliceRecord(this, n, [], m);
+    ObserveEndPerformSplice(this);
+    ObserveEnqueueSpliceRecord(this, n, [], m);
   }
 
   return new_length;
 }
 
 
 // Appends the arguments to the end of the array and returns the new
 // length of the array. See ECMA-262, section 15.4.4.7.
 function ArrayPush() {
   CHECK_OBJECT_COERCIBLE(this, "Array.prototype.push");
@@ skipping 111 matching lines @@
   } else {
     return GenericArrayReverse(array, len);
   }
 }
 
 
 function ObservedArrayShift(len) {
   var first = this[0];
 
   try {
-    $observeBeginPerformSplice(this);
+    ObserveBeginPerformSplice(this);
     SimpleMove(this, 0, 1, len, 0);
     this.length = len - 1;
   } finally {
-    $observeEndPerformSplice(this);
-    $observeEnqueueSpliceRecord(this, 0, [first], 0);
+    ObserveEndPerformSplice(this);
+    ObserveEnqueueSpliceRecord(this, 0, [first], 0);
   }
 
   return first;
 }
 
 
 function ArrayShift() {
   CHECK_OBJECT_COERCIBLE(this, "Array.prototype.shift");
 
   var array = TO_OBJECT(this);
@@ skipping 21 matching lines @@
 
   return first;
 }
 
 
 function ObservedArrayUnshift() {
   var len = TO_LENGTH_OR_UINT32(this.length);
   var num_arguments = %_ArgumentsLength();
 
   try {
-    $observeBeginPerformSplice(this);
+    ObserveBeginPerformSplice(this);
     SimpleMove(this, 0, 0, len, num_arguments);
     for (var i = 0; i < num_arguments; i++) {
       this[i] = %_Arguments(i);
     }
     var new_length = len + num_arguments;
     this.length = new_length;
   } finally {
-    $observeEndPerformSplice(this);
-    $observeEnqueueSpliceRecord(this, 0, [], num_arguments);
+    ObserveEndPerformSplice(this);
+    ObserveEnqueueSpliceRecord(this, 0, [], num_arguments);
   }
 
   return new_length;
 }
 
 
 function ArrayUnshift(arg1) {  // length == 1
   CHECK_OBJECT_COERCIBLE(this, "Array.prototype.unshift");
 
   if (%IsObserved(this))
@@ skipping 97 matching lines @@
   var num_arguments = %_ArgumentsLength();
   var len = TO_LENGTH_OR_UINT32(this.length);
   var start_i = ComputeSpliceStartIndex(TO_INTEGER(start), len);
   var del_count = ComputeSpliceDeleteCount(delete_count, num_arguments, len,
                                            start_i);
   var deleted_elements = [];
   deleted_elements.length = del_count;
   var num_elements_to_add = num_arguments > 2 ? num_arguments - 2 : 0;
 
   try {
-    $observeBeginPerformSplice(this);
+    ObserveBeginPerformSplice(this);
 
     SimpleSlice(this, start_i, del_count, len, deleted_elements);
     SimpleMove(this, start_i, del_count, len, num_elements_to_add);
 
     // Insert the arguments into the resulting array in
     // place of the deleted elements.
     var i = start_i;
     var arguments_index = 2;
     var arguments_length = %_ArgumentsLength();
     while (arguments_index < arguments_length) {
       this[i++] = %_Arguments(arguments_index++);
     }
     this.length = len - del_count + num_elements_to_add;
 
   } finally {
-    $observeEndPerformSplice(this);
+    ObserveEndPerformSplice(this);
     if (deleted_elements.length || num_elements_to_add) {
-      $observeEnqueueSpliceRecord(this,
-                                  start_i,
-                                  deleted_elements.slice(),
-                                  num_elements_to_add);
+      ObserveEnqueueSpliceRecord(this,
+                                 start_i,
+                                 deleted_elements.slice(),
+                                 num_elements_to_add);
     }
   }
 
   // Return the deleted elements.
   return deleted_elements;
 }
 
 
 function ArraySplice(start, delete_count) {
   CHECK_OBJECT_COERCIBLE(this, "Array.prototype.splice");
@@ skipping 835 matching lines @@
 %InstallToContext([
   "array_pop", ArrayPop,
   "array_push", ArrayPush,
   "array_shift", ArrayShift,
   "array_splice", ArraySplice,
   "array_slice", ArraySlice,
   "array_unshift", ArrayUnshift,
 ]);
 
 });