[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
vicki
vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:42:31 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 055a094480c4cb15dd553cc97d7e27bdd937f1f6
Author: vicki <vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu May 27 23:05:15 2004 +0000
Reviewed by Darin.
- Fix Tiger build failure. Rename constant "S" to "WHITESPACE",
and change all instances of S to WHITESPACE.
* khtml/css/cssparser.cpp:
(DOM::CSSParser::lex): S to WHITESPACE
* khtml/css/parser.cpp: regenerated file
* khtml/css/parser.h: regenerated file
* khtml/css/parser.y: S to WHITESPACE
* khtml/css/tokenizer.cpp: regenerated file
* khtml/css/tokenizer.flex: S to WHITESPACE
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6712 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 38f7dbe..efe2c9f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2004-05-27 Vicki Murley <vicki at apple.com>
+
+ Reviewed by Darin.
+
+ - Fix Tiger build failure. Rename constant "S" to "WHITESPACE",
+ and change all instances of S to WHITESPACE.
+
+ * khtml/css/cssparser.cpp:
+ (DOM::CSSParser::lex): S to WHITESPACE
+ * khtml/css/parser.cpp: regenerated file
+ * khtml/css/parser.h: regenerated file
+ * khtml/css/parser.y: S to WHITESPACE
+ * khtml/css/tokenizer.cpp: regenerated file
+ * khtml/css/tokenizer.flex: S to WHITESPACE
+
2004-05-27 John Louch <set EMAIL_ADDRESS environment variable>
Reviewed by NOBODY (OOPS!).
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 088ba18..c0a66b8 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -1946,7 +1946,7 @@ int DOM::CSSParser::lex( void *_yylval ) {
qDebug("CSSTokenizer: got token %d: '%s'", token, token == END ? "" : QString( (QChar *)t, length ).latin1() );
#endif
switch( token ) {
- case S:
+ case WHITESPACE:
case SGML_CD:
case INCLUDES:
case DASHMATCH:
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index b013133..51e9bff 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -11,7 +11,7 @@
#define yychar cssyychar
#define yydebug cssyydebug
#define yynerrs cssyynerrs
-#define S 257
+#define WHITESPACE 257
#define SGML_CD 258
#define INCLUDES 259
#define DASHMATCH 260
@@ -60,7 +60,7 @@
/*
* This file is part of the KDE libraries
* Copyright (C) 2002-2003 Lars Knoll (knoll at kde.org)
- * Copyright (c) 2003 Apple Computer
+ * Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -328,16 +328,16 @@ static const short yyrline[] = { 0,
#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-static const char * const yytname[] = { "$","error","$undefined.","S","SGML_CD",
-"INCLUDES","DASHMATCH","BEGINSWITH","ENDSWITH","CONTAINS","STRING","IDENT","HASH",
-"':'","'.'","'['","IMPORT_SYM","PAGE_SYM","MEDIA_SYM","FONT_FACE_SYM","CHARSET_SYM",
-"NAMESPACE_SYM","KHTML_RULE_SYM","KHTML_DECLS_SYM","KHTML_VALUE_SYM","IMPORTANT_SYM",
-"QEMS","EMS","EXS","PXS","CMS","MMS","INS","PTS","PCS","DEGS","RADS","GRADS",
-"MSECS","SECS","HERZ","KHERZ","DIMEN","PERCENTAGE","NUMBER","URI","FUNCTION",
-"UNICODERANGE","'{'","'}'","';'","','","'+'","'>'","'-'","'*'","'|'","']'","'='",
-"')'","'/'","'#'","'@'","stylesheet","khtml_rule","khtml_decls","khtml_value",
-"maybe_space","maybe_sgml","maybe_charset","import_list","namespace_list","rule_list",
-"rule","import","namespace","maybe_ns_prefix","string_or_uri","maybe_media_list",
+static const char * const yytname[] = { "$","error","$undefined.","WHITESPACE",
+"SGML_CD","INCLUDES","DASHMATCH","BEGINSWITH","ENDSWITH","CONTAINS","STRING",
+"IDENT","HASH","':'","'.'","'['","IMPORT_SYM","PAGE_SYM","MEDIA_SYM","FONT_FACE_SYM",
+"CHARSET_SYM","NAMESPACE_SYM","KHTML_RULE_SYM","KHTML_DECLS_SYM","KHTML_VALUE_SYM",
+"IMPORTANT_SYM","QEMS","EMS","EXS","PXS","CMS","MMS","INS","PTS","PCS","DEGS",
+"RADS","GRADS","MSECS","SECS","HERZ","KHERZ","DIMEN","PERCENTAGE","NUMBER","URI",
+"FUNCTION","UNICODERANGE","'{'","'}'","';'","','","'+'","'>'","'-'","'*'","'|'",
+"']'","'='","')'","'/'","'#'","'@'","stylesheet","khtml_rule","khtml_decls",
+"khtml_value","maybe_space","maybe_sgml","maybe_charset","import_list","namespace_list",
+"rule_list","rule","import","namespace","maybe_ns_prefix","string_or_uri","maybe_media_list",
"media_list","media","ruleset_list","medium","page","font_face","combinator",
"unary_operator","ruleset","selector_list","selector","namespace_selector","simple_selector",
"element_name","specifier_list","specifier","class","attrib_id","attrib","match",
diff --git a/WebCore/khtml/css/parser.h b/WebCore/khtml/css/parser.h
index 3393fab..1f17c48 100644
--- a/WebCore/khtml/css/parser.h
+++ b/WebCore/khtml/css/parser.h
@@ -16,7 +16,7 @@ typedef union {
Value value;
ValueList *valueList;
} YYSTYPE;
-#define S 257
+#define WHITESPACE 257
#define SGML_CD 258
#define INCLUDES 259
#define DASHMATCH 260
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index 7835fc7..b2ae85d 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -3,7 +3,7 @@
/*
* This file is part of the KDE libraries
* Copyright (C) 2002-2003 Lars Knoll (knoll at kde.org)
- * Copyright (c) 2003 Apple Computer
+ * Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -122,7 +122,7 @@ static int cssyylex( YYSTYPE *yylval ) {
%expect 12
-%token S SGML_CD
+%token WHITESPACE SGML_CD
%token INCLUDES
%token DASHMATCH
@@ -280,13 +280,13 @@ khtml_value:
maybe_space:
/* empty */
- | maybe_space S
+ | maybe_space WHITESPACE
;
maybe_sgml:
/* empty */
| maybe_sgml SGML_CD
- | maybe_sgml S
+ | maybe_sgml WHITESPACE
;
maybe_charset:
@@ -374,7 +374,7 @@ NAMESPACE_SYM maybe_space maybe_ns_prefix string_or_uri maybe_space ';' {
maybe_ns_prefix:
/* empty */ { $$.string = 0; }
-| IDENT S { $$ = $1; }
+| IDENT WHITESPACE { $$ = $1; }
;
string_or_uri:
diff --git a/WebCore/khtml/css/tokenizer.cpp b/WebCore/khtml/css/tokenizer.cpp
index 65a88de..574f9ed 100644
--- a/WebCore/khtml/css/tokenizer.cpp
+++ b/WebCore/khtml/css/tokenizer.cpp
@@ -659,7 +659,7 @@ YY_RULE_SETUP
case 2:
YY_RULE_SETUP
#line 27 "tokenizer.flex"
-{yyTok = S; return yyTok;}
+{yyTok = WHITESPACE; return yyTok;}
YY_BREAK
case 3:
YY_RULE_SETUP
diff --git a/WebCore/khtml/css/tokenizer.flex b/WebCore/khtml/css/tokenizer.flex
index 5a20a3d..b051784 100644
--- a/WebCore/khtml/css/tokenizer.flex
+++ b/WebCore/khtml/css/tokenizer.flex
@@ -24,7 +24,7 @@ range \?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|
\/\*[^*]*\*+([^/*][^*]*\*+)*\/ /* ignore comments */
-[ \t\r\n\f]+ {yyTok = S; return yyTok;}
+[ \t\r\n\f]+ {yyTok = WHITESPACE; return yyTok;}
"<!--" {yyTok = SGML_CD; return yyTok;}
"-->" {yyTok = SGML_CD; return yyTok;}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list