Revision: 3555
Author: [email protected]
Date: Thu Jan 7 02:01:24 2010
Log: Added ES5 15.2.3.2 Object.getPrototypeOf.
Review URL: http://codereview.chromium.org/523124
http://code.google.com/p/v8/source/detail?r=3555
Added:
/branches/bleeding_edge/test/mjsunit/get-prototype-of.js
Modified:
/branches/bleeding_edge/src/messages.js
/branches/bleeding_edge/src/v8natives.js
/branches/bleeding_edge/test/es5conform/es5conform.status
/branches/bleeding_edge/tools/presubmit.py
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/get-prototype-of.js Thu Jan 7
02:01:24 2010
@@ -0,0 +1,68 @@
+// Copyright 2010 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+function TryGetPrototypeOfNonObject(x) {
+ var caught = 0;
+ try {
+ Object.getPrototypeOf(x);
+ } catch (e) {
+ caught = e;
+ }
+
+ assertTrue(caught instanceof TypeError);
+};
+
+function GetPrototypeOfObject(x) {
+ assertDoesNotThrow(Object.getPrototypeOf(x));
+ assertNotNull(Object.getPrototypeOf(x));
+ assertEquals(Object.getPrototypeOf(x), x.__proto__);
+}
+
+function F(){};
+
+// Non object
+var x = 10;
+
+// Object
+var y = new F();
+
+// Make sure that TypeError exceptions are thrown when non-objects are
passed
+// as argument
+TryGetPrototypeOfNonObject(0);
+TryGetPrototypeOfNonObject(null);
+TryGetPrototypeOfNonObject('Testing');
+TryGetPrototypeOfNonObject(x);
+
+// Make sure the real objects have this method and that it returns the
+// actual prototype object. Also test for Functions and RegExp.
+GetPrototypeOfObject(this);
+GetPrototypeOfObject(y);
+GetPrototypeOfObject({x:5});
+GetPrototypeOfObject(F);
+GetPrototypeOfObject(RegExp);
+
=======================================
--- /branches/bleeding_edge/src/messages.js Wed Dec 9 05:56:58 2009
+++ /branches/bleeding_edge/src/messages.js Thu Jan 7 02:01:24 2010
@@ -178,7 +178,8 @@
result_not_primitive: "Result of %0 must be a primitive,
was %1",
invalid_json: "String '%0' is not valid JSON",
circular_structure: "Converting circular structure to
JSON",
- object_keys_non_object: "Object.keys called on non-object"
+ object_keys_non_object: "Object.keys called on non-object",
+ object_get_prototype_non_object: "Object.getPrototypeOf called on
non-object"
};
}
var format = kMessages[message.type];
=======================================
--- /branches/bleeding_edge/src/v8natives.js Wed Dec 9 05:56:58 2009
+++ /branches/bleeding_edge/src/v8natives.js Thu Jan 7 02:01:24 2010
@@ -446,6 +446,15 @@
}
return true;
}
+
+
+// ES5 section 15.2.3.2.
+function ObjectGetPrototypeOf(obj) {
+ if (!IS_OBJECT(obj) && !IS_FUNCTION(obj)) {
+ throw MakeTypeError("object_get_prototype_non_object", [obj]);
+ }
+ return obj.__proto__;
+}
// ES5 section 15.2.3.5.
@@ -512,7 +521,8 @@
));
InstallFunctions($Object, DONT_ENUM, $Array(
"keys", ObjectKeys,
- "create", ObjectCreate
+ "create", ObjectCreate,
+ "getPrototypeOf", ObjectGetPrototypeOf
));
}
=======================================
--- /branches/bleeding_edge/test/es5conform/es5conform.status Tue Sep 15
06:30:46 2009
+++ /branches/bleeding_edge/test/es5conform/es5conform.status Thu Jan 7
02:01:24 2010
@@ -38,7 +38,6 @@
chapter14: UNIMPLEMENTED
chapter15/15.1: UNIMPLEMENTED
chapter15/15.2/15.2.3/15.2.3.1: UNIMPLEMENTED
-chapter15/15.2/15.2.3/15.2.3.2: UNIMPLEMENTED
chapter15/15.2/15.2.3/15.2.3.3: UNIMPLEMENTED
chapter15/15.2/15.2.3/15.2.3.4: UNIMPLEMENTED
chapter15/15.2/15.2.3/15.2.3.5: UNIMPLEMENTED
@@ -51,6 +50,9 @@
chapter15/15.2/15.2.3/15.2.3.12: UNIMPLEMENTED
chapter15/15.2/15.2.3/15.2.3.13: UNIMPLEMENTED
+# Object.getPrototypeOf
+chapter15/15.2/15.2.3/15.2.3.2: PASS
+
# Object.keys
chapter15/15.2/15.2.3/15.2.3.14: PASS
=======================================
--- /branches/bleeding_edge/tools/presubmit.py Thu Nov 26 02:17:03 2009
+++ /branches/bleeding_edge/tools/presubmit.py Thu Jan 7 02:01:24 2010
@@ -221,7 +221,7 @@
COPYRIGHT_HEADER_PATTERN = re.compile(
- r'Copyright [\d-]*200[8-9] the V8 project authors. All rights
reserved.')
+ r'Copyright [\d-]*20[0-1][0-9] the V8 project authors. All rights
reserved.')
class SourceProcessor(SourceFileProcessor):
"""
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
