Revert of Migrate error messages, part 7.

src/object-observe.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.
 
 var $observeNotifyChange;
 var $observeEnqueueSpliceRecord;
 var $observeBeginPerformSplice;
 var $observeEndPerformSplice;
 var $observeNativeObjectObserve;
 var $observeNativeObjectGetNotifier;
@@ skipping 297 matching lines @@
 function ObjectInfoGetPerformingTypes(objectInfo) {
   return objectInfo.performingCount > 0 ? objectInfo.performing : null;
 }
 
 
 function ConvertAcceptListToTypeMap(arg) {
   // We use undefined as a sentinel for the default accept list.
   if (IS_UNDEFINED(arg))
     return arg;
 
-  if (!IS_SPEC_OBJECT(arg)) throw MakeTypeError(kObserveInvalidAccept);
+  if (!IS_SPEC_OBJECT(arg))
+    throw MakeTypeError("observe_invalid_accept");
 
   var len = ToInteger(arg.length);
   if (len < 0) len = 0;
 
   return TypeMapCreateFromList(arg, len);
 }
 
 
 // CallbackInfo's optimized state is just a number which represents its global
 // priority. When a change record must be enqueued for the callback, it
@@ skipping 35 matching lines @@
     callbackInfo = new InternalArray;
     callbackInfo.priority = priority;
     CallbackInfoSet(callback, callbackInfo);
   }
   return callbackInfo;
 }
 
 
 function ObjectObserve(object, callback, acceptList) {
   if (!IS_SPEC_OBJECT(object))
-    throw MakeTypeError(kObserveNonObject, "observe", "observe");
+    throw MakeTypeError("observe_non_object", ["observe"]);
   if (%IsJSGlobalProxy(object))
-    throw MakeTypeError(kObserveGlobalProxy, "observe");
+    throw MakeTypeError("observe_global_proxy", ["observe"]);
   if (!IS_SPEC_FUNCTION(callback))
-    throw MakeTypeError(kObserveNonFunction, "observe");
+    throw MakeTypeError("observe_non_function", ["observe"]);
   if (ObjectIsFrozen(callback))
-    throw MakeTypeError(kObserveCallbackFrozen);
+    throw MakeTypeError("observe_callback_frozen");
 
   var objectObserveFn = %GetObjectContextObjectObserve(object);
   return objectObserveFn(object, callback, acceptList);
 }
 
 
 function NativeObjectObserve(object, callback, acceptList) {
   var objectInfo = ObjectInfoGetOrCreate(object);
   var typeList = ConvertAcceptListToTypeMap(acceptList);
   ObjectInfoAddObserver(objectInfo, callback, typeList);
   return object;
 }
 
 
 function ObjectUnobserve(object, callback) {
   if (!IS_SPEC_OBJECT(object))
-    throw MakeTypeError(kObserveNonObject, "unobserve", "unobserve");
+    throw MakeTypeError("observe_non_object", ["unobserve"]);
   if (%IsJSGlobalProxy(object))
-    throw MakeTypeError(kObserveGlobalProxy, "unobserve");
+    throw MakeTypeError("observe_global_proxy", ["unobserve"]);
   if (!IS_SPEC_FUNCTION(callback))
-    throw MakeTypeError(kObserveNonFunction, "unobserve");
+    throw MakeTypeError("observe_non_function", ["unobserve"]);
 
   var objectInfo = ObjectInfoGet(object);
   if (IS_UNDEFINED(objectInfo))
     return object;
 
   ObjectInfoRemoveObserver(objectInfo, callback);
   return object;
 }
 
 
@@ skipping 138 matching lines @@
   ObjectInfoEnqueueInternalChangeRecord(objectInfo, changeRecord);
 }
 
 
 function ObjectNotifierNotify(changeRecord) {
   if (!IS_SPEC_OBJECT(this))
     throw MakeTypeError(kCalledOnNonObject, "notify");
 
   var objectInfo = ObjectInfoGetFromNotifier(this);
   if (IS_UNDEFINED(objectInfo))
-    throw MakeTypeError(kObserveNotifyNonNotifier);
+    throw MakeTypeError("observe_notify_non_notifier");
   if (!IS_STRING(changeRecord.type))
-    throw MakeTypeError(kObserveTypeNonString);
+    throw MakeTypeError("observe_type_non_string");
 
   ObjectInfoEnqueueExternalChangeRecord(objectInfo, changeRecord);
 }
 
 
 function ObjectNotifierPerformChange(changeType, changeFn) {
   if (!IS_SPEC_OBJECT(this))
     throw MakeTypeError(kCalledOnNonObject, "performChange");
 
   var objectInfo = ObjectInfoGetFromNotifier(this);
   if (IS_UNDEFINED(objectInfo))
-    throw MakeTypeError(kObserveNotifyNonNotifier);
+    throw MakeTypeError("observe_notify_non_notifier");
   if (!IS_STRING(changeType))
-    throw MakeTypeError(kObservePerformNonString);
+    throw MakeTypeError("observe_perform_non_string");
   if (!IS_SPEC_FUNCTION(changeFn))
-    throw MakeTypeError(kObservePerformNonFunction);
+    throw MakeTypeError("observe_perform_non_function");
 
   var performChangeFn = %GetObjectContextNotifierPerformChange(objectInfo);
   performChangeFn(objectInfo, changeType, changeFn);
 }
 
 
 function NativeObjectNotifierPerformChange(objectInfo, changeType, changeFn) {
   ObjectInfoAddPerformingType(objectInfo, changeType);
 
   var changeRecord;
   try {
     changeRecord = %_CallFunction(UNDEFINED, changeFn);
   } finally {
     ObjectInfoRemovePerformingType(objectInfo, changeType);
   }
 
   if (IS_SPEC_OBJECT(changeRecord))
     ObjectInfoEnqueueExternalChangeRecord(objectInfo, changeRecord, changeType);
 }
 
 
 function ObjectGetNotifier(object) {
   if (!IS_SPEC_OBJECT(object))
-    throw MakeTypeError(kObserveNonObject, "getNotifier", "getNotifier");
+    throw MakeTypeError("observe_non_object", ["getNotifier"]);
   if (%IsJSGlobalProxy(object))
-    throw MakeTypeError(kObserveGlobalProxy, "getNotifier");
+    throw MakeTypeError("observe_global_proxy", ["getNotifier"]);
 
   if (ObjectIsFrozen(object)) return null;
 
   if (!%ObjectWasCreatedInCurrentOrigin(object)) return null;
 
   var getNotifierFn = %GetObjectContextObjectGetNotifier(object);
   return getNotifierFn(object);
 }
 
 
@@ skipping 21 matching lines @@
   var delivered = [];
   %MoveArrayContents(callbackInfo, delivered);
   %DeliverObservationChangeRecords(callback, delivered);
 
   return true;
 }
 
 
 function ObjectDeliverChangeRecords(callback) {
   if (!IS_SPEC_FUNCTION(callback))
-    throw MakeTypeError(kObserveNonFunction, "deliverChangeRecords");
+    throw MakeTypeError("observe_non_function", ["deliverChangeRecords"]);
 
   while (CallbackDeliverPending(callback)) {}
 }
 
 
 function ObserveMicrotaskRunner() {
   var pendingObservers = GetPendingObservers();
   if (!IS_NULL(pendingObservers)) {
     SetPendingObservers(null);
     for (var i in pendingObservers) {
@@ skipping 21 matching lines @@
 
 $observeNotifyChange = NotifyChange;
 $observeEnqueueSpliceRecord = EnqueueSpliceRecord;
 $observeBeginPerformSplice = BeginPerformSplice;
 $observeEndPerformSplice = EndPerformSplice;
 $observeNativeObjectObserve = NativeObjectObserve;
 $observeNativeObjectGetNotifier = NativeObjectGetNotifier;
 $observeNativeObjectNotifierPerformChange = NativeObjectNotifierPerformChange;
 
 })();