Changeset 72672 in webkit

Timestamp:

Nov 24, 2010 7:51:54 AM (13 years ago)

Author:

Patrick Gansterer

Message:

2010-11-24 Patrick Gansterer <Patrick Gansterer>

Reviewed by Csaba Osztrogonác.

Simplify makeprop.pl
​https://bugs.webkit.org/show_bug.cgi?id=49925

Don't generate CSSPropertyNamesHash.h.
Instead generate CSSPropertyNames directly.

• GNUmakefile.am: Removed rule for CSSPropertyNamesHash.h.
• css/makeprop.pl:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (2 diffs)
• css/makeprop.pl (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-24  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Simplify makeprop.pl
+        https://bugs.webkit.org/show_bug.cgi?id=49925
+
+        Don't generate CSSPropertyNamesHash.h.
+        Instead generate CSSPropertyNames directly.
+
+        * GNUmakefile.am: Removed rule for CSSPropertyNamesHash.h.
+        * css/makeprop.pl:
+
 2010-11-24  Patrick Gansterer  <paroga@webkit.org>
 

trunk/WebCore/GNUmakefile.am

@@ -95 +95 @@
         DerivedSources/WebCore/CSSPropertyNames.h \
         DerivedSources/WebCore/CSSPropertyNames.cpp \
-        DerivedSources/WebCore/CSSPropertyNamesHash.h \
         DerivedSources/WebCore/CSSValueKeywords.h \
         DerivedSources/WebCore/CSSValueKeywords.cpp \
@@ -4580 +4579 @@
 endif  # END ENABLE_BLOB
 
-DerivedSources/WebCore/CSSPropertyNamesHash.h: DerivedSources/WebCore/CSSPropertyNames.cpp
 DerivedSources/WebCore/CSSPropertyNames.cpp: DerivedSources/WebCore/CSSPropertyNames.h
 DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl

trunk/WebCore/css/makeprop.pl

@@ -40 +40 @@
 /* This file is automatically generated from CSSPropertyNames.in by makeprop, do not edit */
 #include \"CSSPropertyNames.h\"
+#include \"HashTools.h\"
+#include <string.h>
+
+namespace WebCore {
 %}
 %struct-type
@@ -52 +56 @@
 %define hash-function-name propery_hash_function
 %define word-array-name property_wordlist
-%includes
 %enum
 %%
@@ -62 +65 @@
   print GPERF $name . ", CSSProperty" . $id . "\n";
 }
-print GPERF "%%\n";
-close GPERF;
+
+print GPERF<< "EOF";
+%%
+const Property* findProperty(register const char* str, register unsigned int len)
+{
+    return CSSPropertyNamesHash::findPropertyImpl(str, len);
+}
+
+const char* getPropertyName(CSSPropertyID id)
+{
+    if (id < firstCSSProperty)
+        return 0;
+    int index = id - firstCSSProperty;
+    if (index >= numCSSProperties)
+        return 0;
+    return propertyNameStrings[index];
+}
+
+} // namespace WebCore
+EOF
 
 open HEADER, ">CSSPropertyNames.h" || die "Could not open CSSPropertyNames.h for writing";
@@ -117 +138 @@
 close HEADER;
 
-system("gperf --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf > CSSPropertyNamesHash.h") == 0 || die "calling gperf failed: $?";
-
-open C, ">>CSSPropertyNamesHash.h" || die "Could not open CSSPropertyNamesHash.h for writing";
-print C << "EOF";
-
-EOF
-
-close C;
-
-my $propertyNamesImpl = "CSSPropertyNames.cpp";
-
-open PROPERTYNAMES, ">$propertyNamesImpl" || die "Could not open $propertyNamesImpl for writing";
-print PROPERTYNAMES << "EOF";
-/* This file is automatically generated by make-hash-tools.pl, do not edit */
-
-
-#include "CSSPropertyNames.h"
-#include "HashTools.h"
-
-namespace WebCore {
-#include "CSSPropertyNamesHash.h"
-
-const Property* findProperty (register const char* str, register unsigned int len)
-{
-    return CSSPropertyNamesHash::findPropertyImpl(str, len);
-}
-
-const char* getPropertyName(CSSPropertyID id)
-{
-    if (id < firstCSSProperty)
-        return 0;
-    int index = id - firstCSSProperty;
-    if (index >= numCSSProperties)
-        return 0;
-    return propertyNameStrings[index];
-}
-
-} // namespace WebCore
-
-EOF
-
-close PROPERTYNAMES;
-
+system("gperf --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf > CSSPropertyNames.cpp") == 0 || die "calling gperf failed: $?";