Revision: 3552
Author: [email protected]
Date: Thu Jan 7 01:17:02 2010
Log: Reverted 3551 from trunk.
Review URL: http://codereview.chromium.org/517058
http://code.google.com/p/v8/source/detail?r=3552
Deleted:
/trunk/test/mjsunit/get-prototype-of.js
Modified:
/trunk/src/messages.js
/trunk/src/v8natives.js
/trunk/test/es5conform/es5conform.status
/trunk/tools/presubmit.py
=======================================
--- /trunk/test/mjsunit/get-prototype-of.js Thu Jan 7 00:50:02 2010
+++ /dev/null
@@ -1,68 +0,0 @@
-// 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);
-
=======================================
--- /trunk/src/messages.js Thu Jan 7 00:50:02 2010
+++ /trunk/src/messages.js Thu Jan 7 01:17:02 2010
@@ -178,8 +178,7 @@
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_get_prototype_non_object: "Object.getPrototypeOf called on
non-object"
+ object_keys_non_object: "Object.keys called on non-object"
};
}
var format = kMessages[message.type];
=======================================
--- /trunk/src/v8natives.js Thu Jan 7 00:50:02 2010
+++ /trunk/src/v8natives.js Thu Jan 7 01:17:02 2010
@@ -446,15 +446,6 @@
}
return true;
}
-
-
-// ES5 section 15.2.3.5.
-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.
@@ -521,8 +512,7 @@
));
InstallFunctions($Object, DONT_ENUM, $Array(
"keys", ObjectKeys,
- "create", ObjectCreate,
- "getPrototypeOf", ObjectGetPrototypeOf
+ "create", ObjectCreate
));
}
=======================================
--- /trunk/test/es5conform/es5conform.status Thu Jan 7 00:50:02 2010
+++ /trunk/test/es5conform/es5conform.status Thu Jan 7 01:17:02 2010
@@ -38,6 +38,7 @@
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
@@ -50,9 +51,6 @@
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
=======================================
--- /trunk/tools/presubmit.py Thu Jan 7 00:50:02 2010
+++ /trunk/tools/presubmit.py Thu Jan 7 01:17:02 2010
@@ -221,7 +221,7 @@
COPYRIGHT_HEADER_PATTERN = re.compile(
- r'Copyright [\d-]*20[0-1][0-9] the V8 project authors. All rights
reserved.')
+ r'Copyright [\d-]*200[8-9] the V8 project authors. All rights
reserved.')
class SourceProcessor(SourceFileProcessor):
"""
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
