wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 734454: Use a table to declare atoms. r=waldo

Browse Source
This commit is contained in:
Jim Blandy 2012-03-16 16:15:31 -07:00
parent f0861f366e
commit 00ec77b58e
4 changed files with 154 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/Makefile.in
View File

@ -189,6 +189,7 @@ INSTALLED_HEADERS = \
jsalloc.h \
jsapi.h \
jsatom.h \
jsatom.tbl \
jsclass.h \
jsclist.h \
jsdbgapi.h \

194
js/src/jsatom.cpp
View File

@ -117,104 +117,19 @@ const char *const js_common_atom_names[] = {
"boolean", /* typeAtoms[JSTYPE_BOOLEAN] */
js_null_str, /* typeAtoms[JSTYPE_NULL] */
"xml", /* typeAtoms[JSTYPE_XML] */
js_null_str, /* nullAtom */
js_null_str /* nullAtom */
#define JS_PROTO(name,code,init) js_##name##_str,
#define JS_PROTO(name,code,init) ,js_##name##_str
#include "jsproto.tbl"
#undef JS_PROTO
js_anonymous_str, /* anonymousAtom */
js_apply_str, /* applyAtom */
js_arguments_str, /* argumentsAtom */
js_arity_str, /* arityAtom */
js_BYTES_PER_ELEMENT_str, /* BYTES_PER_ELEMENTAtom */
js_call_str, /* callAtom */
js_callee_str, /* calleeAtom */
js_caller_str, /* callerAtom */
js_classPrototype_str, /* classPrototypeAtom */
js_constructor_str, /* constructorAtom */
js_each_str, /* eachAtom */
js_eval_str, /* evalAtom */
js_fileName_str, /* fileNameAtom */
js_get_str, /* getAtom */
js_global_str, /* globalAtom */
js_ignoreCase_str, /* ignoreCaseAtom */
js_index_str, /* indexAtom */
js_input_str, /* inputAtom */
js_toISOString_str, /* toISOStringAtom */
js_iterator_str, /* iteratorAtom */
js_join_str, /* joinAtom */
js_lastIndex_str, /* lastIndexAtom */
js_length_str, /* lengthAtom */
js_lineNumber_str, /* lineNumberAtom */
js_message_str, /* messageAtom */
js_multiline_str, /* multilineAtom */
js_name_str, /* nameAtom */
js_next_str, /* nextAtom */
js_noSuchMethod_str, /* noSuchMethodAtom */
js_objectNull_str, /* objectNullAtom */
js_objectUndefined_str, /* objectUndefinedAtom */
js_of_str, /* ofAtom */
js_proto_str, /* protoAtom */
js_set_str, /* setAtom */
js_source_str, /* sourceAtom */
js_stack_str, /* stackAtom */
js_sticky_str, /* stickyAtom */
js_toGMTString_str, /* toGMTStringAtom */
js_toLocaleString_str, /* toLocaleStringAtom */
js_toSource_str, /* toSourceAtom */
js_toString_str, /* toStringAtom */
js_toUTCString_str, /* toUTCStringAtom */
js_valueOf_str, /* valueOfAtom */
js_toJSON_str, /* toJSONAtom */
js_void0_str, /* void0Atom */
js_enumerable_str, /* enumerableAtom */
js_configurable_str, /* configurableAtom */
js_writable_str, /* writableAtom */
js_value_str, /* valueAtom */
js_test_str, /* testAtom */
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 */
js_namespace_str, /* namespaceAtom */
js_ptagc_str, /* ptagcAtom */
js_qualifier_str, /* qualifierAtom */
js_space_str, /* spaceAtom */
js_stago_str, /* stagoAtom */
js_star_str, /* starAtom */
js_starQualifier_str, /* starQualifierAtom */
js_tagc_str, /* tagcAtom */
js_xml_str, /* xmlAtom */
js_functionNamespaceURI_str,/* functionNamespaceURIAtom */
#endif
js_Proxy_str, /* ProxyAtom */
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 */
js_has_str, /* hasAtom */
js_hasOwn_str, /* hasOwnAtom */
js_keys_str, /* keysAtom */
js_iterate_str, /* iterateAtom */
js_WeakMap_str, /* WeakMapAtom */
js_byteLength_str, /* byteLengthAtom */
js_return_str, /* returnAtom */
js_throw_str /* throwAtom */
#define DEFINE_ATOM(id, text) ,js_##id##_str
#define DEFINE_PROTOTYPE_ATOM(id) ,js_##id##_str
#define DEFINE_KEYWORD_ATOM(id) ,js_##id##_str
#include "jsatom.tbl"
#undef DEFINE_ATOM
#undef DEFINE_PROTOTYPE_ATOM
#undef DEFINE_KEYWORD_ATOM
};
void
@ -251,90 +166,13 @@ 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";
const char js_arity_str[] = "arity";
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_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_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";
const char js_length_str[] = "length";
const char js_lineNumber_str[] = "lineNumber";
const char js_message_str[] = "message";
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_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_set_str[] = "set";
const char js_source_str[] = "source";
const char js_stack_str[] = "stack";
const char js_sticky_str[] = "sticky";
const char js_toGMTString_str[] = "toGMTString";
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_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[] = "</";
const char js_namespace_str[] = "namespace";
const char js_ptagc_str[] = "/>";
const char js_qualifier_str[] = "::";
const char js_space_str[] = " ";
const char js_stago_str[] = "<";
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";
#define DEFINE_ATOM(id, text) const char js_##id##_str[] = text;
#define DEFINE_PROTOTYPE_ATOM(id)
#define DEFINE_KEYWORD_ATOM(id)
#include "jsatom.tbl"
#undef DEFINE_ATOM
#undef DEFINE_PROTOTYPE_ATOM
#undef DEFINE_KEYWORD_ATOM
#if JS_HAS_GENERATORS
const char js_close_str[] = "close";

194
js/src/jsatom.h
View File

@ -283,100 +283,13 @@ struct JSAtomState
js::PropertyName *classAtoms[JSProto_LIMIT];
/* Various built-in or commonly-used atoms, pinned on first context. */
js::PropertyName *anonymousAtom;
js::PropertyName *applyAtom;
js::PropertyName *argumentsAtom;
js::PropertyName *arityAtom;
js::PropertyName *BYTES_PER_ELEMENTAtom;
js::PropertyName *callAtom;
js::PropertyName *calleeAtom;
js::PropertyName *callerAtom;
js::PropertyName *classPrototypeAtom;
js::PropertyName *constructorAtom;
js::PropertyName *eachAtom;
js::PropertyName *evalAtom;
js::PropertyName *fileNameAtom;
js::PropertyName *getAtom;
js::PropertyName *globalAtom;
js::PropertyName *ignoreCaseAtom;
js::PropertyName *indexAtom;
js::PropertyName *inputAtom;
js::PropertyName *toISOStringAtom;
js::PropertyName *iteratorAtom;
js::PropertyName *joinAtom;
js::PropertyName *lastIndexAtom;
js::PropertyName *lengthAtom;
js::PropertyName *lineNumberAtom;
js::PropertyName *messageAtom;
js::PropertyName *multilineAtom;
js::PropertyName *nameAtom;
js::PropertyName *nextAtom;
js::PropertyName *noSuchMethodAtom;
js::PropertyName *objectNullAtom;
js::PropertyName *objectUndefinedAtom;
js::PropertyName *ofAtom;
js::PropertyName *protoAtom;
js::PropertyName *setAtom;
js::PropertyName *sourceAtom;
js::PropertyName *stackAtom;
js::PropertyName *stickyAtom;
js::PropertyName *toGMTStringAtom;
js::PropertyName *toLocaleStringAtom;
js::PropertyName *toSourceAtom;
js::PropertyName *toStringAtom;
js::PropertyName *toUTCStringAtom;
js::PropertyName *valueOfAtom;
js::PropertyName *toJSONAtom;
js::PropertyName *void0Atom;
js::PropertyName *enumerableAtom;
js::PropertyName *configurableAtom;
js::PropertyName *writableAtom;
js::PropertyName *valueAtom;
js::PropertyName *testAtom;
js::PropertyName *useStrictAtom;
js::PropertyName *locAtom;
js::PropertyName *lineAtom;
js::PropertyName *InfinityAtom;
js::PropertyName *NaNAtom;
js::PropertyName *builderAtom;
#if JS_HAS_XML_SUPPORT
js::PropertyName *etagoAtom;
js::PropertyName *namespaceAtom;
js::PropertyName *ptagcAtom;
js::PropertyName *qualifierAtom;
js::PropertyName *spaceAtom;
js::PropertyName *stagoAtom;
js::PropertyName *starAtom;
js::PropertyName *starQualifierAtom;
js::PropertyName *tagcAtom;
js::PropertyName *xmlAtom;
/* Represents an invalid URI, for internal use only. */
js::PropertyName *functionNamespaceURIAtom;
#endif
js::PropertyName *ProxyAtom;
js::PropertyName *getOwnPropertyDescriptorAtom;
js::PropertyName *getPropertyDescriptorAtom;
js::PropertyName *definePropertyAtom;
js::PropertyName *deleteAtom;
js::PropertyName *getOwnPropertyNamesAtom;
js::PropertyName *enumerateAtom;
js::PropertyName *fixAtom;
js::PropertyName *hasAtom;
js::PropertyName *hasOwnAtom;
js::PropertyName *keysAtom;
js::PropertyName *iterateAtom;
js::PropertyName *WeakMapAtom;
js::PropertyName *byteLengthAtom;
js::PropertyName *returnAtom;
js::PropertyName *throwAtom;
#define DEFINE_ATOM(id, text) js::PropertyName *id##Atom;
#define DEFINE_PROTOTYPE_ATOM(id) js::PropertyName *id##Atom;
#define DEFINE_KEYWORD_ATOM(id) js::PropertyName *id##Atom;
#include "jsatom.tbl"
#undef DEFINE_ATOM
#undef DEFINE_PROTOTYPE_ATOM
#undef DEFINE_KEYWORD_ATOM
/* Less frequently used atoms, pinned lazily by JS_ResolveStandardClass. */
struct {
@ -459,92 +372,13 @@ extern const char js_undefined_str[];
#include "jsproto.tbl"
#undef JS_PROTO
extern const char js_anonymous_str[];
extern const char js_apply_str[];
extern const char js_arguments_str[];
extern const char js_arity_str[];
extern const char js_BYTES_PER_ELEMENT_str[];
extern const char js_call_str[];
extern const char js_callee_str[];
extern const char js_caller_str[];
extern const char js_classPrototype_str[];
extern const char js_constructor_str[];
extern const char js_each_str[];
extern const char js_eval_str[];
extern const char js_fileName_str[];
extern const char js_get_str[];
extern const char js_global_str[];
extern const char js_ignoreCase_str[];
extern const char js_index_str[];
extern const char js_input_str[];
extern const char js_toISOString_str[];
extern const char js_iterator_str[];
extern const char js_join_str[];
extern const char js_lastIndex_str[];
extern const char js_length_str[];
extern const char js_lineNumber_str[];
extern const char js_message_str[];
extern const char js_multiline_str[];
extern const char js_name_str[];
extern const char js_next_str[];
extern const char js_noSuchMethod_str[];
extern const char js_objectNull_str[];
extern const char js_objectUndefined_str[];
extern const char js_of_str[];
extern const char js_proto_str[];
extern const char js_set_str[];
extern const char js_source_str[];
extern const char js_stack_str[];
extern const char js_sticky_str[];
extern const char js_toGMTString_str[];
extern const char js_toLocaleString_str[];
extern const char js_toSource_str[];
extern const char js_toString_str[];
extern const char js_toUTCString_str[];
extern const char js_valueOf_str[];
extern const char js_toJSON_str[];
extern const char js_void0_str[];
extern const char js_enumerable_str[];
extern const char js_configurable_str[];
extern const char js_writable_str[];
extern const char js_value_str[];
extern const char js_test_str[];
extern const char js_useStrict_str[];
extern const char js_loc_str[];
extern const char js_line_str[];
extern const char js_Infinity_str[];
extern const char js_NaN_str[];
extern const char js_builder_str[];
#if JS_HAS_XML_SUPPORT
extern const char js_etago_str[];
extern const char js_namespace_str[];
extern const char js_ptagc_str[];
extern const char js_qualifier_str[];
extern const char js_space_str[];
extern const char js_stago_str[];
extern const char js_star_str[];
extern const char js_starQualifier_str[];
extern const char js_tagc_str[];
extern const char js_xml_str[];
extern const char js_functionNamespaceURI_str[];
#endif
extern const char js_Proxy_str[];
extern const char js_getOwnPropertyDescriptor_str[];
extern const char js_getPropertyDescriptor_str[];
extern const char js_defineProperty_str[];
extern const char js_getOwnPropertyNames_str[];
extern const char js_enumerate_str[];
extern const char js_fix_str[];
extern const char js_has_str[];
extern const char js_hasOwn_str[];
extern const char js_keys_str[];
extern const char js_iterate_str[];
extern const char js_WeakMap_str[];
extern const char js_byteLength_str[];
extern const char js_return_str[];
extern const char js_throw_str[];
#define DEFINE_ATOM(id, text) extern const char js_##id##_str[];
#define DEFINE_PROTOTYPE_ATOM(id)
#define DEFINE_KEYWORD_ATOM(id)
#include "jsatom.tbl"
#undef DEFINE_ATOM
#undef DEFINE_PROTOTYPE_ATOM
#undef DEFINE_KEYWORD_ATOM
#if JS_HAS_GENERATORS
extern const char js_close_str[];

123
js/src/jsatom.tbl Normal file
View File

@ -0,0 +1,123 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* vim: set sw=4 ts=8 et tw=80 ft=c: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/*
* Declare pre-interned atoms for easy use by SpiderMonkey's C++ code.
* These entries define two things, where <id> is the macros' first
* argument:
*
* - js::PropertyName *<id>Atom: a member of JSAtomState pointing to the
* atom itself. Usually accessed as cx->runtime->atomState.<id>Atom.
*
* - const char js_<id>_str[]: a global within SpiderMonkey, holding the
* atom's name. Some macros skip this, because it's already defined
* elsewhere.
*
* DEFINE_ATOM(id, name)
* Define an atom whose JavaScript string's value is |name|.
*
* DEFINE_PROTOTYPE_ATOM(id)
* Define an atom whose name is the same as one of those defined in
* jsproto.tbl. The code that processes that has already declared and
* defined the js_<id>_str global, so this defines only the JSAtomState
* member.
*
* DEFINE_KEYWORD_ATOM(id)
* Define an atom whose name is the same as one of those defined in
* jskeyword.tbl. The code that processes that has already declared and
* defined the js_<id>_str global, so this defines only the JSAtomState
* member.
*/
DEFINE_ATOM(anonymous, "anonymous")
DEFINE_ATOM(apply, "apply")
DEFINE_ATOM(arguments, "arguments")
DEFINE_ATOM(arity, "arity")
DEFINE_ATOM(BYTES_PER_ELEMENT, "BYTES_PER_ELEMENT")
DEFINE_ATOM(call, "call")
DEFINE_ATOM(callee, "callee")
DEFINE_ATOM(caller, "caller")
DEFINE_ATOM(classPrototype, "prototype")
DEFINE_ATOM(constructor, "constructor")
DEFINE_ATOM(each, "each")
DEFINE_ATOM(eval, "eval")
DEFINE_ATOM(fileName, "fileName")
DEFINE_ATOM(get, "get")
DEFINE_ATOM(global, "global")
DEFINE_ATOM(ignoreCase, "ignoreCase")
DEFINE_ATOM(index, "index")
DEFINE_ATOM(input, "input")
DEFINE_ATOM(toISOString, "toISOString")
DEFINE_ATOM(iterator, "__iterator__")
DEFINE_ATOM(join, "join")
DEFINE_ATOM(lastIndex, "lastIndex")
DEFINE_ATOM(length, "length")
DEFINE_ATOM(lineNumber, "lineNumber")
DEFINE_ATOM(message, "message")
DEFINE_ATOM(multiline, "multiline")
DEFINE_ATOM(name, "name")
DEFINE_ATOM(next, "next")
DEFINE_ATOM(noSuchMethod, "__noSuchMethod__")
DEFINE_ATOM(objectNull, "[object Null]")
DEFINE_ATOM(objectUndefined, "[object Undefined]")
DEFINE_ATOM(of, "of")
DEFINE_ATOM(proto, "__proto__")
DEFINE_ATOM(set, "set")
DEFINE_ATOM(source, "source")
DEFINE_ATOM(stack, "stack")
DEFINE_ATOM(sticky, "sticky")
DEFINE_ATOM(toGMTString, "toGMTString")
DEFINE_ATOM(toLocaleString, "toLocaleString")
DEFINE_ATOM(toSource, "toSource")
DEFINE_ATOM(toString, "toString")
DEFINE_ATOM(toUTCString, "toUTCString")
DEFINE_ATOM(valueOf, "valueOf")
DEFINE_ATOM(toJSON, "toJSON")
DEFINE_ATOM(void0, "(void 0)")
DEFINE_ATOM(enumerable, "enumerable")
DEFINE_ATOM(configurable, "configurable")
DEFINE_ATOM(writable, "writable")
DEFINE_ATOM(value, "value")
DEFINE_ATOM(test, "test")
DEFINE_ATOM(useStrict, "use strict")
DEFINE_ATOM(loc, "loc")
DEFINE_ATOM(line, "line")
DEFINE_ATOM(Infinity, "Infinity")
DEFINE_ATOM(NaN, "NaN")
DEFINE_ATOM(builder, "builder")
#if JS_HAS_XML_SUPPORT
DEFINE_ATOM(etago, "</")
DEFINE_ATOM(namespace, "namespace")
DEFINE_ATOM(ptagc, "/>")
DEFINE_ATOM(qualifier, "::")
DEFINE_ATOM(space, " ")
DEFINE_ATOM(stago, "<")
DEFINE_ATOM(star, "*")
DEFINE_ATOM(starQualifier, "*::")
DEFINE_ATOM(tagc, ">")
DEFINE_ATOM(xml, "xml")
DEFINE_ATOM(functionNamespaceURI, "@mozilla.org/js/function")
#endif
DEFINE_PROTOTYPE_ATOM(Proxy)
DEFINE_ATOM(getOwnPropertyDescriptor, "getOwnPropertyDescriptor")
DEFINE_ATOM(getPropertyDescriptor, "getPropertyDescriptor")
DEFINE_ATOM(defineProperty, "defineProperty")
DEFINE_KEYWORD_ATOM(delete)
DEFINE_ATOM(getOwnPropertyNames, "getOwnPropertyNames")
DEFINE_ATOM(enumerate, "enumerate")
DEFINE_ATOM(fix, "fix")
DEFINE_ATOM(has, "has")
DEFINE_ATOM(hasOwn, "hasOwn")
DEFINE_ATOM(keys, "keys")
DEFINE_ATOM(iterate, "iterate")
DEFINE_PROTOTYPE_ATOM(WeakMap)
DEFINE_ATOM(byteLength, "byteLength")
DEFINE_KEYWORD_ATOM(return)
DEFINE_KEYWORD_ATOM(throw)