Changeset 17783 in webkit

Timestamp:

Nov 15, 2006 10:19:37 AM (17 years ago)

Author:

lamadio

Message:

2006-11-13 Lou Amadio <​lamadio@apple.com>

Reviewed by Darin Adler, Maciej Stachowiak

Cleanup: Expanded macros in generated files

• html/HTMLElement.cpp: (WebCore::HTMLElement::isRecognizedTagName):
• ksvg2/scripts/make_names.pl:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLElement.cpp (modified) (1 diff)
• ksvg2/scripts/make_names.pl (modified) (7 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-13  Lou Amadio  <lamadio@apple.com>
+
+        Reviewed by Darin Adler, Maciej Stachowiak
+
+        Cleanup: Expanded macros in generated files
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::isRecognizedTagName):
+        * ksvg2/scripts/make_names.pl:
+
 2006-11-15  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/html/HTMLElement.cpp

@@ -717 +717 @@
     static HashSet<AtomicStringImpl*> tagList;
     if (tagList.isEmpty()) {
-        #define ADD_TAG(name) tagList.add(name##Tag.localName().impl());
-        DOM_HTMLNAMES_FOR_EACH_TAG(ADD_TAG)
+        for (size_t i = 0; i < g_xhtmlTagsCount; i++)
+            tagList.add(g_xhtmlTags[i]->localName().impl());
     }
     return tagList.contains(tagName.localName().impl());

trunk/WebCore/ksvg2/scripts/make_names.pl

@@ -100 +100 @@
 sub printMacros
 {
-    my @names = @_;
+    my ($macro, $suffix, @names) = @_;
     for my $name (@names) {
-        print "    macro($name) \\\n";
+        print "    $macro $name","$suffix;\n";
     }
 }
@@ -205 +205 @@
     print "namespace $cppNamespace { namespace ${namespace}Names {\n\n";
     
-    if (scalar(@tags)) {
-        print"#define DOM_${namespace}NAMES_FOR_EACH_TAG(macro) \\\n";
-        printMacros(@tags);
-        print"// end of macro\n\n";
-    }
-    if (scalar(@attrs)) {
-        print "#define DOM_${namespace}NAMES_FOR_EACH_ATTR(macro) \\\n";
-        printMacros(@attrs);
-        print "// end of macro\n\n";
-    }
-    
     my $lowerNamespace = lc($namespacePrefix);
     print "#ifndef DOM_${namespace}NAMES_HIDE_GLOBALS\n";
@@ -223 +212 @@
     if (scalar(@tags)) {
         print "// Tags\n";
-        print "#define DOM_NAMES_DEFINE_TAG_GLOBAL(name) extern const WebCore::QualifiedName name##Tag;\n";
-        print "DOM_${namespace}NAMES_FOR_EACH_TAG(DOM_NAMES_DEFINE_TAG_GLOBAL)\n";
-        print "#undef DOM_NAMES_DEFINE_TAG_GLOBAL\n\n";
+        printMacros("extern const WebCore::QualifiedName", "Tag", @tags);
+        print "\nextern const WebCore::QualifiedName* g_${lowerNamespace}Tags[];\n";
+        print "extern const size_t g_${lowerNamespace}TagsCount;\n\n";
     }
     
     if (scalar(@attrs)) {
         print "// Attributes\n";
-        print "#define DOM_NAMES_DEFINE_ATTR_GLOBAL(name) extern const WebCore::QualifiedName name##Attr;\n";
-        print "DOM_${namespace}NAMES_FOR_EACH_ATTR(DOM_NAMES_DEFINE_ATTR_GLOBAL)\n";
-        print "#undef DOM_NAMES_DEFINE_ATTR_GLOBAL\n\n";
+        printMacros("extern const WebCore::QualifiedName", "Attr", @attrs);
+        print "\nextern const WebCore::QualifiedName* g_${lowerNamespace}Attr[];\n";
+        print "extern const size_t g_${lowerNamespace}AttrCount;\n\n";
     }
     print "#endif\n\n";
@@ -259 +248 @@
 print "#endif\n\n";
 
+
 print "#include \"${namespace}Names.h\"\n\n";
 print "#include \"StaticConstructors.h\"\n";
@@ -270 +260 @@
 
     if (scalar(@tags)) {
-        print "#define DEFINE_TAG_GLOBAL(name) DEFINE_GLOBAL(QualifiedName, name##Tag, nullAtom, #name, ${lowerNamespace}NamespaceURI)\n";
-        print "DOM_${namespace}NAMES_FOR_EACH_TAG(DEFINE_TAG_GLOBAL)\n\n";
+        print "// Tags\n";
+    for my $name (@tags) {
+        print "DEFINE_GLOBAL(QualifiedName, ", $name, "Tag, nullAtom, \"$name\", ${lowerNamespace}NamespaceURI);\n";
+    }
+        print "\nconst WebCore::QualifiedName* g_${lowerNamespace}Tags[] = {\n";
+        for my $name (@tags) {
+            print "    &${name}Tag,\n";
+        }
+        print "};\n";
+        print "const size_t g_${lowerNamespace}TagsCount = ", scalar(@tags), ";\n\n";
     }
 
     if (scalar(@attrs)) {
-        print "#define DEFINE_ATTR_GLOBAL(name) DEFINE_GLOBAL(QualifiedName, name##Attr, nullAtom, #name, nullAtom)\n";
-        print "DOM_${namespace}NAMES_FOR_EACH_ATTR(DEFINE_ATTR_GLOBAL)\n\n";
-    }
-
-print "void init()
+        print "\n// Attributes\n";
+        for my $name (@attrs) {
+            print "DEFINE_GLOBAL(QualifiedName, ", $name, "Attr, nullAtom, \"$name\", ${lowerNamespace}NamespaceURI);\n";
+    }
+        print "\nconst WebCore::QualifiedName* g_${lowerNamespace}Attr[] = {\n";
+        for my $name (@attrs) {
+            print "    &${name}Attr,\n";
+        }
+        print "};\n";
+        print "const size_t g_${lowerNamespace}AttrCount = ", scalar(@attrs), ";\n\n";
+    }
+
+print "\nvoid init()
 {
     static bool initialized = false;
@@ -326 +332 @@
     
     print "    // " . ucfirst($type) . "\n";
-    print "    #define DEFINE_${shortUpperType}_STRING(name) const char *name##${shortCamelType}String = #name;\n";
-    print "    DOM_${namespace}NAMES_FOR_EACH_${shortUpperType}(DEFINE_${shortUpperType}_STRING)\n\n";
+
+    for my $name (@$namesRef) {
+        print "    const char *$name","${shortCamelType}String = \"$name\";\n";
+    }
+        
     for my $name (@$namesRef) {
         if ($name =~ /_/) {
@@ -335 +344 @@
         }
     }
-    print "\n    #define INITIALIZE_${shortUpperType}_GLOBAL(name) new ((void*)&name##${shortCamelType}) QualifiedName(nullAtom, name##${shortCamelType}String, $namespaceURI);\n";
-    print "    DOM_${namespace}NAMES_FOR_EACH_${shortUpperType}(INITIALIZE_${shortUpperType}_GLOBAL)\n\n";
+    print "\n";
+
+    for my $name (@$namesRef) {
+        print "    new ((void*)&$name","${shortCamelType}) QualifiedName(nullAtom, $name","${shortCamelType}String, $namespaceURI);\n";
+    }
+
 }