[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 16:28:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3700fe5d5ab432f04f6b7db23c912517c8651e3d
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 24 13:26:59 2010 +0000
2010-11-24 Patrick Gansterer <paroga at webkit.org>
Reviewed by Csaba Osztrogonác.
Simplify make-hash-tools.pl
https://bugs.webkit.org/show_bug.cgi?id=49922
HashTools.h does not need to be generated, because it only contains static code.
* html/DocTypeStrings.gperf: Include findDoctypeEntry function.
* make-hash-tools.pl: Do not generate HashTools.h.
* platform/ColorData.gperf: Include findColor function.
* platform/HashTools.h: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72664 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a88ce1..88ab7c1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-24 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Csaba Osztrogonác.
+
+ Simplify make-hash-tools.pl
+ https://bugs.webkit.org/show_bug.cgi?id=49922
+
+ HashTools.h does not need to be generated, because it only contains static code.
+
+ * html/DocTypeStrings.gperf: Include findDoctypeEntry function.
+ * make-hash-tools.pl: Do not generate HashTools.h.
+ * platform/ColorData.gperf: Include findColor function.
+ * platform/HashTools.h: Added.
+
2010-11-24 Andreas Kling <kling at webkit.org>
Reviewed by Simon Hausmann.
diff --git a/WebCore/html/DocTypeStrings.gperf b/WebCore/html/DocTypeStrings.gperf
index 22488eb..2e2a7e8 100644
--- a/WebCore/html/DocTypeStrings.gperf
+++ b/WebCore/html/DocTypeStrings.gperf
@@ -1,3 +1,9 @@
+%{
+#include "HashTools.h"
+#include <string.h>
+
+namespace WebCore {
+%}
%struct-type
struct PubIDInfo;
%omit-struct-type
@@ -88,3 +94,10 @@ struct PubIDInfo;
"-//webtechs//dtd mozilla html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
"-/w3c/dtd html 4.0 transitional/en", PubIDInfo::eQuirks, PubIDInfo::eQuirks
"html", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
+%%
+const PubIDInfo* findDoctypeEntry(register const char* str, register unsigned int len)
+{
+ return DocTypeStringsHash::findDoctypeEntryImpl(str, len);
+}
+
+} // namespace WebCore
diff --git a/WebCore/make-hash-tools.pl b/WebCore/make-hash-tools.pl
index b070829..37639eb 100644
--- a/WebCore/make-hash-tools.pl
+++ b/WebCore/make-hash-tools.pl
@@ -27,123 +27,25 @@ my $outdir = $ARGV[0];
shift;
my $option = basename($ARGV[0],".gperf");
-my $hashToolsHeader = "$outdir/HashTools.h";
-
-sub createHashToolsHeader() {
-
-open HEADER, ">$hashToolsHeader" || die "Could not open $hashToolsHeader for writing";
-print HEADER << "EOF";
-/* This file is automatically generated by make-hash-tools.pl, do not edit */
-
-#ifndef HashTools_h
-#define HashTools_h
-
-#include "wtf/Platform.h"
-
-namespace WebCore {
-
-struct PubIDInfo {
- enum eMode {
- eQuirks,
- eQuirks3,
- eAlmostStandards
- };
-
- const char* name;
- eMode mode_if_no_sysid;
- eMode mode_if_sysid;
-};
-
-struct NamedColor {
- const char* name;
- unsigned ARGBValue;
-};
-
-struct Property {
- const char* name;
- int id;
-};
-
-struct Value {
- const char* name;
- int id;
-};
-
-const PubIDInfo* findDoctypeEntry(register const char* str, register unsigned int len);
-const NamedColor* findColor(register const char* str, register unsigned int len);
-const Property* findProperty(register const char* str, register unsigned int len);
-const Value* findValue(register const char* str, register unsigned int len);
-}
-
-#endif // HashTools_h
-
-EOF
-close HEADER;
-
-}
switch ($option) {
case "DocTypeStrings" {
- createHashToolsHeader();
-
- my $docTypeStringsImpl = "$outdir/DocTypeStrings.cpp";
- my $docTypeStringsGenerated = "$outdir/DocTypeStringsHash.h";
+ my $docTypeStringsGenerated = "$outdir/DocTypeStrings.cpp";
my $docTypeStringsGperf = $ARGV[0];
shift;
- open DOCTYPESTRINGS, ">$docTypeStringsImpl" || die "Could not open $docTypeStringsImpl for writing";
- print DOCTYPESTRINGS << "EOF";
-/* This file is automatically generated by make-hash-tools.pl, do not edit */
-
-#include <string.h>
-#include "HashTools.h"
-
-namespace WebCore {
-#include "DocTypeStringsHash.h"
-
-const PubIDInfo* findDoctypeEntry (register const char* str, register unsigned int len)
-{
- return DocTypeStringsHash::findDoctypeEntryImpl(str, len);
-}
-
-}
-
-EOF
- close DOCTYPESTRINGS;
-
system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
} # case "DocTypeStrings"
case "ColorData" {
- my $colorDataImpl = "$outdir/ColorData.cpp";
- my $colorDataGenerated = "$outdir/ColorDataHash.h";
+ my $colorDataGenerated = "$outdir/ColorData.cpp";
my $colorDataGperf = $ARGV[0];
shift;
- open COLORDATA, ">$colorDataImpl" || die "Could not open $colorDataImpl for writing";
- print COLORDATA << "EOF";
-/* This file is automatically generated by make-hash-tools.pl, do not edit */
-
-#include <string.h>
-#include "HashTools.h"
-
-namespace WebCore {
-#include "ColorDataHash.h"
-
-const struct NamedColor* findColor (register const char* str, register unsigned int len)
-{
- return ColorDataHash::findColorImpl(str, len);
-}
-
-}
-
-EOF
- close COLORDATA;
-
system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
} # case "ColorData"
diff --git a/WebCore/platform/ColorData.gperf b/WebCore/platform/ColorData.gperf
index f83e793..2a72237 100644
--- a/WebCore/platform/ColorData.gperf
+++ b/WebCore/platform/ColorData.gperf
@@ -1,3 +1,9 @@
+%{
+#include "HashTools.h"
+#include <string.h>
+
+namespace WebCore {
+%}
%struct-type
struct NamedColor;
%omit-struct-type
@@ -160,3 +166,10 @@ white, 0xffffffff
whitesmoke, 0xfff5f5f5
yellow, 0xffffff00
yellowgreen, 0xff9acd32
+%%
+const struct NamedColor* findColor(register const char* str, register unsigned int len)
+{
+ return ColorDataHash::findColorImpl(str, len);
+}
+
+} // namespace WebCore
diff --git a/WebCore/platform/HashTools.h b/WebCore/platform/HashTools.h
new file mode 100644
index 0000000..4fb0904
--- /dev/null
+++ b/WebCore/platform/HashTools.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2010 Andras Becsi <abecsi at inf.u-szeged.hu>, University of Szeged
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef HashTools_h
+#define HashTools_h
+
+namespace WebCore {
+
+struct PubIDInfo {
+ enum eMode {
+ eQuirks,
+ eQuirks3,
+ eAlmostStandards
+ };
+
+ const char* name;
+ eMode mode_if_no_sysid;
+ eMode mode_if_sysid;
+};
+
+struct NamedColor {
+ const char* name;
+ unsigned ARGBValue;
+};
+
+struct Property {
+ const char* name;
+ int id;
+};
+
+struct Value {
+ const char* name;
+ int id;
+};
+
+const PubIDInfo* findDoctypeEntry(register const char* str, register unsigned int len);
+const NamedColor* findColor(register const char* str, register unsigned int len);
+const Property* findProperty(register const char* str, register unsigned int len);
+const Value* findValue(register const char* str, register unsigned int len);
+
+} // namespace WebCore
+
+#endif // HashTools_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list