Bug 734454: Minor cleanups to atom declarations and definitions, in preparation for conversion to a table. r=waldo

This commit is contained in:
Jim Blandy
2012-03-16 16:15:31 -07:00
parent eaaf9fa6bc
commit 91d07cbb69
5 changed files with 123 additions and 61 deletions

View File

@@ -131,7 +131,7 @@ const char *const js_common_atom_names[] = {
js_call_str, /* callAtom */
js_callee_str, /* calleeAtom */
js_caller_str, /* callerAtom */
js_class_prototype_str, /* classPrototypeAtom */
js_classPrototype_str, /* classPrototypeAtom */
js_constructor_str, /* constructorAtom */
js_each_str, /* eachAtom */
js_eval_str, /* evalAtom */
@@ -141,7 +141,7 @@ const char *const js_common_atom_names[] = {
js_ignoreCase_str, /* ignoreCaseAtom */
js_index_str, /* indexAtom */
js_input_str, /* inputAtom */
"toISOString", /* toISOStringAtom */
js_toISOString_str, /* toISOStringAtom */
js_iterator_str, /* iteratorAtom */
js_join_str, /* joinAtom */
js_lastIndex_str, /* lastIndexAtom */
@@ -152,9 +152,9 @@ const char *const js_common_atom_names[] = {
js_name_str, /* nameAtom */
js_next_str, /* nextAtom */
js_noSuchMethod_str, /* noSuchMethodAtom */
"[object Null]", /* objectNullAtom */
"[object Undefined]", /* objectUndefinedAtom */
"of", /* ofAtom */
js_objectNull_str, /* objectNullAtom */
js_objectUndefined_str, /* objectUndefinedAtom */
js_of_str, /* ofAtom */
js_proto_str, /* protoAtom */
js_set_str, /* setAtom */
js_source_str, /* sourceAtom */
@@ -167,18 +167,18 @@ const char *const js_common_atom_names[] = {
js_toUTCString_str, /* toUTCStringAtom */
js_valueOf_str, /* valueOfAtom */
js_toJSON_str, /* toJSONAtom */
"(void 0)", /* void0Atom */
js_void0_str, /* void0Atom */
js_enumerable_str, /* enumerableAtom */
js_configurable_str, /* configurableAtom */
js_writable_str, /* writableAtom */
js_value_str, /* valueAtom */
js_test_str, /* testAtom */
"use strict", /* useStrictAtom */
"loc", /* locAtom */
"line", /* lineAtom */
"Infinity", /* InfinityAtom */
"NaN", /* NaNAtom */
"builder", /* builderAtom */
js_useStrict_str, /* useStrictAtom */
js_loc_str, /* locAtom */
js_line_str, /* lineAtom */
js_Infinity_str, /* InfinityAtom */
js_NaN_str, /* NaNAtom */
js_builder_str, /* builderAtom */
#if JS_HAS_XML_SUPPORT
js_etago_str, /* etagoAtom */
@@ -191,30 +191,30 @@ const char *const js_common_atom_names[] = {
js_starQualifier_str, /* starQualifierAtom */
js_tagc_str, /* tagcAtom */
js_xml_str, /* xmlAtom */
"@mozilla.org/js/function", /* functionNamespaceURIAtom */
js_functionNamespaceURI_str,/* functionNamespaceURIAtom */
#endif
"Proxy", /* ProxyAtom */
js_Proxy_str, /* ProxyAtom */
"getOwnPropertyDescriptor", /* getOwnPropertyDescriptorAtom */
"getPropertyDescriptor", /* getPropertyDescriptorAtom */
"defineProperty", /* definePropertyAtom */
"delete", /* deleteAtom */
"getOwnPropertyNames", /* getOwnPropertyNames */
"enumerate", /* enumerateAtom */
"fix", /* fixAtom */
js_getOwnPropertyDescriptor_str, /* getOwnPropertyDescriptorAtom */
js_getPropertyDescriptor_str, /* getPropertyDescriptorAtom */
js_defineProperty_str, /* definePropertyAtom */
js_delete_str, /* deleteAtom */
js_getOwnPropertyNames_str, /* getOwnPropertyNames */
js_enumerate_str, /* enumerateAtom */
js_fix_str, /* fixAtom */
"has", /* hasAtom */
"hasOwn", /* hasOwnAtom */
"keys", /* keysAtom */
"iterate", /* iterateAtom */
js_has_str, /* hasAtom */
js_hasOwn_str, /* hasOwnAtom */
js_keys_str, /* keysAtom */
js_iterate_str, /* iterateAtom */
"WeakMap", /* WeakMapAtom */
js_WeakMap_str, /* WeakMapAtom */
"byteLength", /* byteLengthAtom */
js_byteLength_str, /* byteLengthAtom */
"return", /* returnAtom */
"throw" /* throwAtom */
js_return_str, /* returnAtom */
js_throw_str /* throwAtom */
};
void
@@ -248,6 +248,9 @@ JS_STATIC_ASSERT(JS_ARRAY_LENGTH(js_common_atom_names) < 256);
const size_t js_common_atom_count = JS_ARRAY_LENGTH(js_common_atom_names);
const char js_undefined_str[] = "undefined";
const char js_object_str[] = "object";
const char js_anonymous_str[] = "anonymous";
const char js_apply_str[] = "apply";
const char js_arguments_str[] = "arguments";
@@ -256,17 +259,17 @@ const char js_BYTES_PER_ELEMENT_str[] = "BYTES_PER_ELEMENT";
const char js_call_str[] = "call";
const char js_callee_str[] = "callee";
const char js_caller_str[] = "caller";
const char js_class_prototype_str[] = "prototype";
const char js_classPrototype_str[] = "prototype";
const char js_constructor_str[] = "constructor";
const char js_each_str[] = "each";
const char js_eval_str[] = "eval";
const char js_fileName_str[] = "fileName";
const char js_get_str[] = "get";
const char js_getter_str[] = "getter";
const char js_global_str[] = "global";
const char js_ignoreCase_str[] = "ignoreCase";
const char js_index_str[] = "index";
const char js_input_str[] = "input";
const char js_toISOString_str[] = "toISOString";
const char js_iterator_str[] = "__iterator__";
const char js_join_str[] = "join";
const char js_lastIndex_str[] = "lastIndex";
@@ -277,9 +280,10 @@ const char js_multiline_str[] = "multiline";
const char js_name_str[] = "name";
const char js_next_str[] = "next";
const char js_noSuchMethod_str[] = "__noSuchMethod__";
const char js_object_str[] = "object";
const char js_objectNull_str[] = "[object Null]";
const char js_objectUndefined_str[] = "[object Undefined]";
const char js_of_str[] = "of";
const char js_proto_str[] = "__proto__";
const char js_setter_str[] = "setter";
const char js_set_str[] = "set";
const char js_source_str[] = "source";
const char js_stack_str[] = "stack";
@@ -289,14 +293,20 @@ const char js_toLocaleString_str[] = "toLocaleString";
const char js_toSource_str[] = "toSource";
const char js_toString_str[] = "toString";
const char js_toUTCString_str[] = "toUTCString";
const char js_undefined_str[] = "undefined";
const char js_valueOf_str[] = "valueOf";
const char js_toJSON_str[] = "toJSON";
const char js_void0_str[] = "(void 0)";
const char js_enumerable_str[] = "enumerable";
const char js_configurable_str[] = "configurable";
const char js_writable_str[] = "writable";
const char js_value_str[] = "value";
const char js_test_str[] = "test";
const char js_useStrict_str[] = "use strict";
const char js_loc_str[] = "loc";
const char js_line_str[] = "line";
const char js_Infinity_str[] = "Infinity";
const char js_NaN_str[] = "NaN";
const char js_builder_str[] = "builder";
#if JS_HAS_XML_SUPPORT
const char js_etago_str[] = "</";
@@ -309,13 +319,32 @@ const char js_star_str[] = "*";
const char js_starQualifier_str[] = "*::";
const char js_tagc_str[] = ">";
const char js_xml_str[] = "xml";
const char js_functionNamespaceURI_str[] = "@mozilla.org/js/function";
#endif
const char js_getOwnPropertyDescriptor_str[] = "getOwnPropertyDescriptor";
const char js_getPropertyDescriptor_str[] = "getPropertyDescriptor";
const char js_defineProperty_str[] = "defineProperty";
const char js_getOwnPropertyNames_str[] = "getOwnPropertyNames";
const char js_enumerate_str[] = "enumerate";
const char js_fix_str[] = "fix";
const char js_has_str[] = "has";
const char js_hasOwn_str[] = "hasOwn";
const char js_keys_str[] = "keys";
const char js_iterate_str[] = "iterate";
const char js_byteLength_str[] = "byteLength";
const char js_return_str[] = "return";
const char js_throw_str[] = "throw";
#if JS_HAS_GENERATORS
const char js_close_str[] = "close";
const char js_send_str[] = "send";
#endif
/* Constant strings that are not atomized. */
const char js_getter_str[] = "getter";
const char js_setter_str[] = "setter";
/*
* For a browser build from 2007-08-09 after the browser starts up there are
* just 55 double atoms, but over 15000 string atoms. Not to penalize more