Reviewed by Darin.
authorvicki <vicki@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 May 2004 23:05:15 +0000 (23:05 +0000)
committervicki <vicki@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 May 2004 23:05:15 +0000 (23:05 +0000)
- 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: https://svn.webkit.org/repository/webkit/trunk@6712 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/khtml/css/cssparser.cpp
WebCore/khtml/css/parser.cpp
WebCore/khtml/css/parser.h
WebCore/khtml/css/parser.y
WebCore/khtml/css/tokenizer.cpp
WebCore/khtml/css/tokenizer.flex

index 38f7dbe4251933cd8b7d3faeb3589a9af06a824d..efe2c9f556343945db42295d3109860c5debf22d 100644 (file)
@@ -1,3 +1,18 @@
+2004-05-27  Vicki Murley <vicki@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!).
index 088ba1881fe3ad7150b1081029944c1cc4496b3a..c0a66b803f44b1911a9c5f257d1304279b37f82c 100644 (file)
@@ -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:
index b01313349ca7d8390914f7c631484ab1d3230ae0..51e9bff9a1d1003dc449c53488288b19000eeb7f 100644 (file)
@@ -11,7 +11,7 @@
 #define yychar cssyychar
 #define yydebug cssyydebug
 #define yynerrs cssyynerrs
-#define              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@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",
index 3393fab87c91f69dfcb328c62acb05204da26539..1f17c4815a50ecb4cd43b323fbc719e46066caf2 100644 (file)
@@ -16,7 +16,7 @@ typedef union {
     Value value;
     ValueList *valueList;
 } YYSTYPE;
-#define              257
+#define        WHITESPACE      257
 #define        SGML_CD 258
 #define        INCLUDES        259
 #define        DASHMATCH       260
index 7835fc73d92af397e3c94f1b90cc2ffabb092d35..b2ae85d7ed6439fdae8e997025e71fcc76758812 100644 (file)
@@ -3,7 +3,7 @@
 /*
  *  This file is part of the KDE libraries
  *  Copyright (C) 2002-2003 Lars Knoll (knoll@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:
index 65a88de5d86ea9070659e3e09616bf979f979949..574f9eda5530f89f30cd4467642b5acd65a5a400 100644 (file)
@@ -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
index 5a20a3d0efb84dd2d5db5c04183b6b397f920d42..b0517840ed91ed7c06935d0c85eeecec2830627c 100644 (file)
@@ -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;}