[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:26:44 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5fc8bbdd8c30356e84c33dc7d7c95be046adc763
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Mar 1 04:07:22 2003 +0000
* khtml/css/parser.y: Fixed bad check-in that broke the build in a subtle way.
* khtml/css/parser.cpp: Regenerated.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3722 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c58a8ad..89b2d3f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2003-02-28 Darin Adler <darin at apple.com>
+
+ * khtml/css/parser.y: Fixed bad check-in that broke the build in a subtle way.
+ * khtml/css/parser.cpp: Regenerated.
+
2003-02-28 Trey Matteson <trey at apple.com>
More support for autofill, autocomplete.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c58a8ad..89b2d3f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2003-02-28 Darin Adler <darin at apple.com>
+
+ * khtml/css/parser.y: Fixed bad check-in that broke the build in a subtle way.
+ * khtml/css/parser.cpp: Regenerated.
+
2003-02-28 Trey Matteson <trey at apple.com>
More support for autofill, autocomplete.
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index 6fdea62..2888cc5 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -176,7 +176,7 @@ static int cssyylex( YYSTYPE *yylval ) {
-#define YYFINAL 258
+#define YYFINAL 259
#define YYFLAG -32768
#define YYNTBASE 60
@@ -220,17 +220,17 @@ static const short yyprhs[] = { 0,
0, 5, 8, 11, 14, 21, 27, 33, 34, 37,
38, 41, 44, 45, 51, 55, 59, 60, 64, 65,
69, 71, 73, 75, 77, 79, 81, 88, 92, 96,
- 98, 100, 101, 103, 108, 116, 118, 123, 124, 128,
- 131, 135, 139, 143, 147, 150, 153, 154, 156, 158,
- 164, 166, 171, 173, 177, 180, 184, 187, 189, 191,
- 193, 196, 198, 200, 202, 204, 207, 210, 215, 224,
- 226, 228, 230, 232, 234, 236, 238, 240, 243, 250,
- 252, 255, 257, 261, 263, 267, 271, 277, 282, 287,
- 294, 300, 303, 306, 307, 309, 313, 316, 319, 320,
- 322, 325, 328, 331, 334, 337, 339, 341, 344, 347,
- 350, 353, 356, 359, 362, 365, 368, 371, 374, 377,
- 380, 383, 386, 389, 392, 395, 398, 404, 407, 411,
- 415, 418, 424, 428, 430
+ 98, 100, 101, 103, 104, 106, 111, 114, 122, 123,
+ 127, 130, 134, 138, 142, 146, 149, 152, 153, 155,
+ 157, 163, 165, 170, 173, 175, 179, 182, 185, 189,
+ 192, 194, 196, 198, 201, 204, 206, 208, 210, 212,
+ 215, 218, 223, 232, 234, 236, 238, 240, 242, 244,
+ 246, 248, 251, 258, 260, 263, 265, 269, 271, 275,
+ 279, 285, 290, 295, 302, 308, 311, 314, 315, 317,
+ 321, 324, 327, 330, 331, 333, 336, 339, 342, 345,
+ 348, 350, 352, 355, 358, 361, 364, 367, 370, 373,
+ 376, 379, 382, 385, 388, 391, 394, 397, 400, 403,
+ 406, 409, 415, 418, 422, 426, 429, 435, 439, 441
};
static const short yyrhs[] = { 66,
@@ -241,63 +241,64 @@ static const short yyrhs[] = { 66,
65, 3, 0, 0, 20, 64, 10, 64, 49, 0,
20, 1, 107, 0, 20, 1, 49, 0, 0, 67,
70, 65, 0, 0, 68, 69, 65, 0, 81, 0,
- 73, 0, 77, 0, 78, 0, 106, 0, 105, 0,
+ 74, 0, 77, 0, 78, 0, 106, 0, 105, 0,
16, 64, 71, 64, 72, 49, 0, 16, 1, 107,
0, 16, 1, 49, 0, 10, 0, 44, 0, 0,
- 76, 0, 72, 50, 64, 76, 0, 18, 64, 74,
- 47, 64, 75, 48, 0, 76, 0, 72, 50, 64,
- 76, 0, 0, 75, 81, 64, 0, 11, 64, 0,
- 17, 1, 107, 0, 17, 1, 49, 0, 19, 1,
- 107, 0, 19, 1, 49, 0, 51, 64, 0, 52,
- 64, 0, 0, 53, 0, 51, 0, 82, 47, 64,
- 94, 48, 0, 83, 0, 82, 50, 64, 83, 0,
- 84, 0, 83, 79, 84, 0, 85, 64, 0, 85,
- 86, 64, 0, 86, 64, 0, 11, 0, 54, 0,
- 87, 0, 86, 87, 0, 12, 0, 88, 0, 90,
- 0, 93, 0, 14, 11, 0, 11, 64, 0, 15,
- 64, 89, 55, 0, 15, 64, 89, 91, 64, 92,
- 64, 55, 0, 56, 0, 5, 0, 6, 0, 7,
- 0, 8, 0, 9, 0, 11, 0, 10, 0, 13,
- 11, 0, 13, 45, 64, 11, 64, 57, 0, 96,
- 0, 95, 96, 0, 95, 0, 1, 108, 1, 0,
- 1, 0, 96, 49, 64, 0, 1, 49, 64, 0,
- 1, 108, 1, 49, 64, 0, 95, 96, 49, 64,
- 0, 95, 1, 49, 64, 0, 95, 1, 108, 1,
- 49, 64, 0, 97, 13, 64, 99, 98, 0, 11,
- 64, 0, 24, 64, 0, 0, 101, 0, 99, 100,
- 101, 0, 58, 64, 0, 50, 64, 0, 0, 102,
- 0, 80, 102, 0, 10, 64, 0, 11, 64, 0,
- 44, 64, 0, 46, 64, 0, 104, 0, 103, 0,
- 43, 64, 0, 42, 64, 0, 28, 64, 0, 29,
- 64, 0, 30, 64, 0, 31, 64, 0, 32, 64,
- 0, 33, 64, 0, 34, 64, 0, 35, 64, 0,
- 36, 64, 0, 37, 64, 0, 38, 64, 0, 39,
- 64, 0, 40, 64, 0, 26, 64, 0, 25, 64,
- 0, 27, 64, 0, 41, 64, 0, 45, 64, 99,
- 57, 64, 0, 12, 64, 0, 59, 1, 107, 0,
- 59, 1, 49, 0, 1, 107, 0, 47, 1, 108,
- 1, 48, 0, 47, 1, 48, 0, 107, 0, 108,
- 1, 107, 0
+ 73, 0, 0, 76, 0, 73, 50, 64, 76, 0,
+ 73, 1, 0, 18, 64, 73, 47, 64, 75, 48,
+ 0, 0, 75, 81, 64, 0, 11, 64, 0, 17,
+ 1, 107, 0, 17, 1, 49, 0, 19, 1, 107,
+ 0, 19, 1, 49, 0, 51, 64, 0, 52, 64,
+ 0, 0, 53, 0, 51, 0, 82, 47, 64, 94,
+ 48, 0, 83, 0, 82, 50, 64, 83, 0, 82,
+ 1, 0, 84, 0, 83, 79, 84, 0, 83, 1,
+ 0, 85, 64, 0, 85, 86, 64, 0, 86, 64,
+ 0, 11, 0, 54, 0, 87, 0, 86, 87, 0,
+ 86, 1, 0, 12, 0, 88, 0, 90, 0, 93,
+ 0, 14, 11, 0, 11, 64, 0, 15, 64, 89,
+ 55, 0, 15, 64, 89, 91, 64, 92, 64, 55,
+ 0, 56, 0, 5, 0, 6, 0, 7, 0, 8,
+ 0, 9, 0, 11, 0, 10, 0, 13, 11, 0,
+ 13, 45, 64, 11, 64, 57, 0, 96, 0, 95,
+ 96, 0, 95, 0, 1, 108, 1, 0, 1, 0,
+ 96, 49, 64, 0, 1, 49, 64, 0, 1, 108,
+ 1, 49, 64, 0, 95, 96, 49, 64, 0, 95,
+ 1, 49, 64, 0, 95, 1, 108, 1, 49, 64,
+ 0, 97, 13, 64, 99, 98, 0, 11, 64, 0,
+ 24, 64, 0, 0, 101, 0, 99, 100, 101, 0,
+ 99, 1, 0, 58, 64, 0, 50, 64, 0, 0,
+ 102, 0, 80, 102, 0, 10, 64, 0, 11, 64,
+ 0, 44, 64, 0, 46, 64, 0, 104, 0, 103,
+ 0, 43, 64, 0, 42, 64, 0, 28, 64, 0,
+ 29, 64, 0, 30, 64, 0, 31, 64, 0, 32,
+ 64, 0, 33, 64, 0, 34, 64, 0, 35, 64,
+ 0, 36, 64, 0, 37, 64, 0, 38, 64, 0,
+ 39, 64, 0, 40, 64, 0, 26, 64, 0, 25,
+ 64, 0, 27, 64, 0, 41, 64, 0, 45, 64,
+ 99, 57, 64, 0, 12, 64, 0, 59, 1, 107,
+ 0, 59, 1, 49, 0, 1, 107, 0, 47, 1,
+ 108, 1, 48, 0, 47, 1, 48, 0, 107, 0,
+ 108, 1, 107, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 225, 227, 228, 229, 232, 240, 246, 271, 273, 276,
- 278, 279, 282, 284, 289, 290, 293, 295, 306, 308,
- 318, 320, 321, 322, 323, 324, 327, 340, 343, 348,
- 350, 353, 357, 361, 368, 382, 387, 394, 396, 405,
- 427, 431, 436, 440, 445, 447, 448, 451, 453, 456,
- 476, 490, 506, 510, 527, 532, 536, 542, 563, 568,
- 573, 583, 590, 591, 592, 595, 604, 628, 634, 642,
- 646, 649, 652, 655, 658, 663, 665, 668, 674, 682,
- 686, 691, 694, 700, 708, 712, 718, 724, 729, 735,
- 743, 768, 775, 777, 780, 785, 798, 802, 805, 810,
- 812, 813, 814, 820, 821, 822, 824, 829, 831, 832,
- 833, 834, 835, 836, 837, 838, 839, 840, 841, 842,
- 843, 844, 845, 846, 847, 848, 852, 867, 874, 881,
- 889, 915, 917, 920, 922
+ 225, 227, 228, 229, 232, 239, 245, 270, 272, 275,
+ 277, 278, 281, 283, 288, 289, 292, 294, 305, 307,
+ 317, 319, 320, 321, 322, 323, 326, 339, 342, 347,
+ 349, 352, 356, 360, 364, 368, 372, 378, 392, 394,
+ 403, 425, 429, 434, 438, 443, 445, 446, 449, 451,
+ 454, 474, 488, 502, 508, 512, 527, 533, 538, 543,
+ 550, 571, 576, 581, 589, 595, 602, 603, 604, 607,
+ 616, 640, 646, 654, 658, 661, 664, 667, 670, 675,
+ 677, 680, 686, 694, 698, 703, 706, 712, 720, 724,
+ 730, 736, 741, 747, 755, 780, 787, 789, 792, 797,
+ 810, 816, 820, 823, 828, 830, 831, 832, 838, 839,
+ 840, 842, 847, 849, 850, 851, 852, 853, 854, 855,
+ 856, 857, 858, 859, 860, 861, 862, 863, 864, 865,
+ 866, 870, 885, 892, 899, 907, 933, 935, 938, 940
};
#endif
@@ -312,8 +313,8 @@ static const char * const yytname[] = { "$","error","$undefined.","S","SGML_CD
"HERZ","KHERZ","DIMEN","PERCENTAGE","NUMBER","URI","FUNCTION","UNICODERANGE",
"'{'","'}'","';'","','","'+'","'>'","'-'","'*'","']'","'='","')'","'/'","'@'",
"stylesheet","konq_rule","konq_decls","konq_value","maybe_space","maybe_sgml",
-"maybe_charset","import_list","rule_list","rule","import","string_or_uri","media_list",
-"media","media_list2","ruleset_list","medium","page","font_face","combinator",
+"maybe_charset","import_list","rule_list","rule","import","string_or_uri","maybe_media_list",
+"media_list","media","ruleset_list","medium","page","font_face","combinator",
"unary_operator","ruleset","selector_list","selector","simple_selector","element_name",
"specifier_list","specifier","class","attrib_id","attrib","match","ident_or_string",
"pseudo","declaration_list","decl_list","declaration","property","prio","expr",
@@ -326,186 +327,224 @@ static const short yyr1[] = { 0,
60, 60, 60, 60, 61, 62, 63, 64, 64, 65,
65, 65, 66, 66, 66, 66, 67, 67, 68, 68,
69, 69, 69, 69, 69, 69, 70, 70, 70, 71,
- 71, 72, 72, 72, 73, 74, 74, 75, 75, 76,
- 77, 77, 78, 78, 79, 79, 79, 80, 80, 81,
- 82, 82, 83, 83, 84, 84, 84, 85, 85, 86,
- 86, 87, 87, 87, 87, 88, 89, 90, 90, 91,
- 91, 91, 91, 91, 91, 92, 92, 93, 93, 94,
- 94, 94, 94, 94, 95, 95, 95, 95, 95, 95,
- 96, 97, 98, 98, 99, 99, 100, 100, 100, 101,
- 101, 101, 101, 101, 101, 101, 101, 102, 102, 102,
+ 71, 72, 72, 73, 73, 73, 73, 74, 75, 75,
+ 76, 77, 77, 78, 78, 79, 79, 79, 80, 80,
+ 81, 82, 82, 82, 83, 83, 83, 84, 84, 84,
+ 85, 85, 86, 86, 86, 87, 87, 87, 87, 88,
+ 89, 90, 90, 91, 91, 91, 91, 91, 91, 92,
+ 92, 93, 93, 94, 94, 94, 94, 94, 95, 95,
+ 95, 95, 95, 95, 96, 97, 98, 98, 99, 99,
+ 99, 100, 100, 100, 101, 101, 101, 101, 101, 101,
+ 101, 101, 102, 102, 102, 102, 102, 102, 102, 102,
102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
- 102, 102, 102, 102, 102, 102, 103, 104, 105, 105,
- 106, 107, 107, 108, 108
+ 102, 103, 104, 105, 105, 106, 107, 107, 108, 108
};
static const short yyr2[] = { 0,
4, 2, 2, 2, 6, 5, 5, 0, 2, 0,
2, 2, 0, 5, 3, 3, 0, 3, 0, 3,
1, 1, 1, 1, 1, 1, 6, 3, 3, 1,
- 1, 0, 1, 4, 7, 1, 4, 0, 3, 2,
- 3, 3, 3, 3, 2, 2, 0, 1, 1, 5,
- 1, 4, 1, 3, 2, 3, 2, 1, 1, 1,
- 2, 1, 1, 1, 1, 2, 2, 4, 8, 1,
- 1, 1, 1, 1, 1, 1, 1, 2, 6, 1,
- 2, 1, 3, 1, 3, 3, 5, 4, 4, 6,
- 5, 2, 2, 0, 1, 3, 2, 2, 0, 1,
- 2, 2, 2, 2, 2, 1, 1, 2, 2, 2,
+ 1, 0, 1, 0, 1, 4, 2, 7, 0, 3,
+ 2, 3, 3, 3, 3, 2, 2, 0, 1, 1,
+ 5, 1, 4, 2, 1, 3, 2, 2, 3, 2,
+ 1, 1, 1, 2, 2, 1, 1, 1, 1, 2,
+ 2, 4, 8, 1, 1, 1, 1, 1, 1, 1,
+ 1, 2, 6, 1, 2, 1, 3, 1, 3, 3,
+ 5, 4, 4, 6, 5, 2, 2, 0, 1, 3,
+ 2, 2, 2, 0, 1, 2, 2, 2, 2, 2,
+ 1, 1, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 5, 2, 3, 3,
- 2, 5, 3, 1, 3
+ 2, 5, 2, 3, 3, 2, 5, 3, 1, 3
};
static const short yydefact[] = { 13,
0, 0, 0, 0, 8, 8, 8, 10, 0, 0,
8, 8, 8, 2, 3, 4, 17, 0, 16, 15,
9, 8, 0, 0, 0, 12, 11, 19, 0, 0,
- 58, 62, 0, 0, 8, 59, 8, 0, 47, 53,
- 8, 8, 60, 63, 64, 65, 84, 8, 0, 0,
- 80, 0, 8, 8, 8, 8, 8, 8, 8, 8,
+ 61, 66, 0, 0, 8, 62, 8, 0, 0, 55,
+ 8, 0, 63, 67, 68, 69, 88, 8, 0, 0,
+ 84, 0, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 49, 48, 0,
- 99, 95, 100, 107, 106, 0, 0, 10, 133, 134,
- 0, 14, 78, 8, 66, 0, 0, 8, 8, 8,
- 8, 0, 55, 8, 57, 61, 8, 0, 92, 6,
- 0, 81, 8, 8, 102, 103, 128, 124, 123, 125,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 126, 109, 108, 104, 0, 105, 101,
- 7, 8, 8, 0, 0, 0, 0, 0, 8, 0,
- 0, 10, 22, 23, 24, 21, 26, 25, 18, 0,
- 0, 8, 0, 5, 0, 0, 45, 46, 54, 56,
- 86, 83, 8, 0, 8, 85, 0, 99, 98, 97,
- 96, 29, 28, 30, 31, 8, 131, 0, 32, 0,
- 0, 20, 132, 135, 8, 67, 71, 72, 73, 74,
- 75, 68, 70, 8, 0, 47, 8, 89, 0, 88,
- 99, 8, 32, 42, 41, 8, 0, 0, 33, 44,
- 43, 130, 129, 0, 0, 50, 87, 8, 8, 91,
- 127, 0, 33, 40, 8, 8, 79, 77, 76, 8,
- 90, 93, 27, 8, 0, 38, 0, 0, 34, 0,
- 69, 34, 35, 8, 39, 0, 0, 0
+ 8, 8, 8, 8, 8, 8, 8, 50, 49, 0,
+ 0, 99, 105, 112, 111, 0, 0, 10, 138, 139,
+ 0, 14, 82, 8, 70, 0, 0, 54, 8, 8,
+ 57, 8, 8, 0, 58, 0, 65, 60, 64, 8,
+ 0, 96, 6, 0, 85, 8, 8, 107, 108, 133,
+ 129, 128, 130, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 131, 114, 113, 109,
+ 0, 110, 106, 101, 7, 8, 8, 0, 0, 0,
+ 0, 0, 8, 0, 0, 10, 22, 23, 24, 21,
+ 26, 25, 18, 0, 0, 8, 0, 5, 0, 0,
+ 46, 47, 56, 59, 90, 87, 8, 0, 8, 89,
+ 0, 0, 103, 102, 100, 29, 28, 30, 31, 8,
+ 136, 0, 34, 0, 0, 20, 137, 140, 8, 71,
+ 75, 76, 77, 78, 79, 72, 74, 8, 0, 0,
+ 8, 93, 0, 92, 0, 8, 34, 43, 42, 8,
+ 0, 35, 45, 44, 135, 134, 0, 0, 51, 91,
+ 8, 8, 95, 132, 0, 0, 41, 37, 8, 8,
+ 83, 81, 80, 8, 94, 97, 27, 39, 0, 0,
+ 0, 36, 73, 38, 8, 40, 0, 0, 0
};
-static const short yydefgoto[] = { 256,
- 5, 6, 7, 10, 17, 8, 28, 87, 152, 88,
- 186, 217, 153, 218, 250, 219, 154, 155, 102, 80,
- 37, 38, 39, 40, 41, 42, 43, 44, 163, 45,
- 204, 240, 46, 49, 50, 51, 52, 230, 81, 144,
- 82, 83, 84, 85, 157, 158, 90, 91
+static const short yydefgoto[] = { 257,
+ 5, 6, 7, 10, 17, 8, 28, 87, 156, 88,
+ 190, 235, 221, 157, 251, 222, 158, 159, 104, 80,
+ 37, 38, 39, 40, 41, 42, 43, 44, 167, 45,
+ 208, 244, 46, 49, 50, 51, 52, 233, 81, 148,
+ 82, 83, 84, 85, 161, 162, 90, 91
};
-static const short yypact[] = { 175,
- 32, -36, -9, -3,-32768,-32768,-32768,-32768, 93, 97,
--32768,-32768,-32768, 79, 79, 79, 152, 87,-32768,-32768,
--32768,-32768, 117, 13, 226,-32768,-32768, 81, 153, 31,
--32768,-32768, 80, 92,-32768,-32768,-32768, 51, 128,-32768,
- 200, 200,-32768,-32768,-32768,-32768, 96,-32768, 58, 30,
- 77, 123,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+static const short yypact[] = { 143,
+ 12, -7, 59, 63,-32768,-32768,-32768,-32768, -8, 28,
+-32768,-32768,-32768, 110, 110, 110, 134, 154,-32768,-32768,
+-32768,-32768, 73, 13, 432,-32768,-32768, 112, -3, 44,
+-32768,-32768, 85, 129,-32768,-32768,-32768, 32, 380,-32768,
+ 111, 166,-32768,-32768,-32768,-32768, 60,-32768, 136, 91,
+ 142, 147,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 292,
- -30,-32768,-32768,-32768,-32768, 173, 104,-32768,-32768,-32768,
- 145,-32768,-32768,-32768,-32768, 12, 42,-32768,-32768,-32768,
--32768, 137, 79, 200, 79,-32768,-32768, 176, 79,-32768,
- 115, 138,-32768,-32768, 79, 79, 79, 79, 79, 79,
- 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
- 79, 79, 79, 79, 79, 79, 79, 226, 79,-32768,
--32768,-32768,-32768, 263, 139, 2, 158, 208,-32768, 219,
- 221,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 152, 185,
- 18,-32768, 78,-32768, 13, 117, 79, 79,-32768, 79,
- 79, 157,-32768, 225,-32768, 79, 226, -31, 79, 79,
--32768,-32768,-32768,-32768,-32768,-32768,-32768, 161, 36, 169,
- 172, 152,-32768,-32768,-32768, 79,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768, 180, 142,-32768, 79, 178, 79,
- 111,-32768, 36,-32768,-32768,-32768, 184, 195, 196,-32768,
--32768,-32768,-32768, 19, 162,-32768, 79,-32768,-32768,-32768,
- 79, 191,-32768, 79,-32768,-32768,-32768,-32768,-32768,-32768,
- 79, 79,-32768,-32768, 36, 79, 22, 36, 197, 99,
--32768,-32768,-32768,-32768, 79, 245, 246,-32768
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 377,
+ 281,-32768,-32768,-32768,-32768, 146, 103,-32768,-32768,-32768,
+ 191,-32768,-32768,-32768,-32768, 17, 96,-32768,-32768,-32768,
+-32768,-32768,-32768, 184, 110, 166,-32768, 110,-32768,-32768,
+ 200, 110,-32768, 82, 155,-32768,-32768, 110, 110, 110,
+ 110, 110, 110, 110, 110, 110, 110, 110, 110, 110,
+ 110, 110, 110, 110, 110, 110, 110, 110, 110, 110,
+ 432, 110,-32768,-32768,-32768,-32768,-32768, 469, 124, 2,
+ 158, 208,-32768, 222, 224,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768, 134, 128, 18,-32768, 127,-32768, 13, 73,
+ 110, 110,-32768, 110, 110, 153,-32768, 227,-32768, 110,
+ 432, 332, 110, 110,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768, 161, 24, 165, 172, 134,-32768,-32768,-32768, 110,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 181, 386,
+-32768, 110, 175, 110, 230,-32768, 97,-32768,-32768,-32768,
+ 33,-32768,-32768,-32768,-32768,-32768, 16, 15,-32768, 110,
+-32768,-32768,-32768, 110, 183, 41, 110,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768, 110, 110,-32768, 110, 24, 20,
+ 139,-32768,-32768,-32768,-32768, 110, 233, 236,-32768
};
static const short yypgoto[] = {-32768,
-32768,-32768,-32768, -5, -79,-32768,-32768,-32768,-32768,-32768,
--32768, 34,-32768,-32768,-32768, -121,-32768,-32768,-32768,-32768,
- -83,-32768, 82, 148,-32768, 235, -29,-32768,-32768,-32768,
--32768,-32768,-32768, 113,-32768, 230,-32768,-32768, -98,-32768,
- 140, 201,-32768,-32768,-32768,-32768, -6, -37
+-32768,-32768, 26,-32768,-32768, -19,-32768,-32768,-32768,-32768,
+ -83,-32768, 67, 140,-32768, 204, -32,-32768,-32768,-32768,
+-32768,-32768,-32768, 77,-32768, 197,-32768,-32768, -22,-32768,
+ 100, 169,-32768,-32768,-32768,-32768, -6, -36
};
-#define YYLAST 335
+#define YYLAST 522
static const short yytable[] = { 14,
- 15, 16, 20, 156, 21, 23, 24, 25, 159, 108,
- 11, 184, 106, 47, 21, 21, 30, 141, 142, 142,
- 21, 21, 162, 48, 21, 212, 143, 143, 195, 96,
- 111, 97, 9, 21, -8, 103, 105, 12, 21, 178,
- 48, -8, 109, 13, 21, 185, 216, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 192, 174, 106, 237, 251, -82, 211, 92,
- 146, 21, 197, 198, 199, 200, 201, 29, 161, 164,
- 93, 233, 165, 166, 167, 168, 86, 98, 170, 21,
- 99, 171, 95, -1, 147, 110, 22, 176, 177, 31,
- 32, 33, 34, 35, 31, 32, 33, 34, 35, 21,
- 148, 149, 150, 249, 94, 113, 252, 31, 32, 33,
- 34, 35, 202, 203, 229, 114, 179, 180, 183, 18,
- 187, 19, 18, 189, 107, 160, 253, 31, 32, 33,
- 34, 35, 36, 194, 26, 27, 196, 36, -94, -94,
- 142, 18, 151, 173, 21, 194, 254, 208, 143, 210,
- 36, 238, 239, 145, -51, -8, 172, -51, 100, 101,
- 213, 215, -8, 221, 223, 18, 175, 182, -52, 224,
- 36, -52, 100, 101, 1, 2, 3, 4, 225, 18,
- 89, 227, 194, 18, 18, 207, 231, 18, 188, 214,
- 234, 32, 33, 34, 35, 18, -8, 220, 18, 190,
- 222, 191, 241, 242, 18, 209, 228, 226, 21, 245,
- 246, 18, 193, 235, 247, 53, 54, 55, 248, 243,
- 244, 236, -36, -37, 257, 258, 232, 206, 255, 169,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 53, 54, 55, 104, 78, 205, 79, 112,
- 140, 0, 0, 181, 0, 0, 0, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 0,
- 0, 0, 0, 78, 0, 79, 56, 57, 58, 59,
+ 15, 16, 20, 160, 21, 23, 24, 25, 163, 109,
+ 111, 188, 9, 47, -8, 21, 30, 21, 21, 21,
+ 21, -8, 21, 48, 242, 243, 21, 166, 199, 96,
+ 21, 97, 98, 238, 220, 105, 108, 22, 18, 11,
+ 19, 238, 112, 18, 89, 189, 21, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+ 141, 142, 241, 109, 253, 21, 196, 178, 99, 239,
+ 150, 100, 240, 31, 32, 33, 34, 35, 165, -33,
+ 240, 114, 92, 169, 170, 93, 171, 172, 21, 21,
+ 174, 48, -1, 151, 175, 12, 18, 220, 110, 13,
+ 180, 181, 21, 31, 32, 33, 34, 35, 182, 152,
+ 153, 154, 32, 33, 34, 35, 36, 86, 18, 94,
+ 177, 201, 202, 203, 204, 205, 26, 27, -86, 95,
+ 183, 184, 187, 168, 191, -32, 149, 193, -8, 31,
+ 32, 33, 34, 35, 29, -8, 36, 198, 215, 117,
+ 200, 155, 1, 2, 3, 4, 107, 255, -8, 198,
+ 18, 212, 186, 214, 18, 197, -8, 32, 33, 34,
+ 35, 206, 207, 113, 217, 219, 254, 224, 226, -8,
+ 116, 164, 36, 227, 31, 32, 33, 34, 35, 18,
+ 176, 211, 228, 179, 18, 230, 198, 18, 192, 218,
+ 234, 18, -8, 223, 237, -8, -8, -8, 18, -8,
+ 225, 18, 194, 231, 195, 245, 246, 213, 229, 252,
+ 144, 247, 258, 248, 249, 259, 210, 36, 250, -104,
+ -104, -104, 236, 173, 106, 209, 115, 185, 143, 256,
+ 0, 0, 0, 232, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, 0, -98, -98, 146,
+ -104, 144, -104, 0, 0, 0, 0, 147, 0, 0,
+ -104, -104, -104, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, 0, 145, 0,
+ 146, -104, 144, -104, 0, 0, 0, 0, 147, 0,
+ 0, -104, -104, -104, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, -104, -104,
+ -104, -104, -104, -104, -104, -104, -104, -104, 0, 0,
+ 101, 146, -104, 0, -104, 0, 101, 0, 216, 147,
+ -48, -48, -48, -48, -48, 0, -48, -48, -48, -48,
+ -48, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 0, 0, 0, 0, 0, 0, -52, 0, 0, -52,
+ 102, 103, -53, -48, 21, -53, 102, 103, 0, -48,
+ 0, 53, 54, 55, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 56, 57, 58, 59,
60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74
+ 70, 71, 72, 73, 74, 75, 76, 77, 53, 54,
+ 55, 0, 78, 0, 79, 0, 0, 0, 0, 0,
+ 0, 0, 0, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, 0, 0, 0, 0, 78,
+ 0, 79
};
static const short yycheck[] = { 5,
- 6, 7, 9, 87, 3, 11, 12, 13, 88, 47,
- 47, 10, 42, 1, 3, 3, 22, 48, 50, 50,
- 3, 3, 11, 11, 3, 57, 58, 58, 11, 35,
- 1, 37, 1, 3, 3, 41, 42, 47, 3, 138,
- 11, 10, 48, 47, 3, 44, 11, 53, 54, 55,
+ 6, 7, 9, 87, 3, 11, 12, 13, 88, 42,
+ 47, 10, 1, 1, 3, 3, 22, 3, 3, 3,
+ 3, 10, 3, 11, 10, 11, 3, 11, 11, 35,
+ 3, 37, 1, 1, 11, 41, 42, 10, 47, 47,
+ 49, 1, 48, 47, 48, 44, 3, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 152, 111, 104, 57, 55, 48, 177, 49,
- 86, 3, 5, 6, 7, 8, 9, 1, 94, 48,
- 11, 213, 98, 99, 100, 101, 16, 47, 104, 3,
- 50, 107, 11, 0, 1, 48, 10, 113, 114, 11,
- 12, 13, 14, 15, 11, 12, 13, 14, 15, 3,
- 17, 18, 19, 245, 45, 49, 248, 11, 12, 13,
- 14, 15, 55, 56, 24, 13, 142, 143, 145, 47,
- 147, 49, 47, 149, 49, 1, 48, 11, 12, 13,
- 14, 15, 54, 160, 3, 4, 162, 54, 48, 49,
- 50, 47, 59, 49, 3, 172, 250, 173, 58, 175,
- 54, 10, 11, 1, 47, 3, 1, 50, 51, 52,
- 186, 188, 10, 190, 191, 47, 49, 49, 47, 195,
- 54, 50, 51, 52, 20, 21, 22, 23, 204, 47,
- 48, 207, 209, 47, 47, 49, 212, 47, 1, 49,
- 216, 12, 13, 14, 15, 47, 44, 49, 47, 1,
- 49, 1, 228, 229, 47, 1, 49, 48, 3, 235,
- 236, 47, 48, 50, 240, 10, 11, 12, 244, 49,
- 50, 47, 47, 47, 0, 0, 213, 166, 254, 102,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 10, 11, 12, 41, 51, 165, 53, 50,
- 80, -1, -1, 144, -1, -1, -1, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, -1,
- -1, -1, -1, 51, -1, 53, 25, 26, 27, 28,
+ 76, 77, 57, 106, 55, 3, 156, 114, 47, 47,
+ 86, 50, 50, 11, 12, 13, 14, 15, 94, 49,
+ 50, 1, 49, 99, 100, 11, 102, 103, 3, 3,
+ 106, 11, 0, 1, 110, 47, 47, 11, 49, 47,
+ 116, 117, 3, 11, 12, 13, 14, 15, 141, 17,
+ 18, 19, 12, 13, 14, 15, 54, 16, 47, 45,
+ 49, 5, 6, 7, 8, 9, 3, 4, 48, 11,
+ 146, 147, 149, 48, 151, 49, 1, 153, 3, 11,
+ 12, 13, 14, 15, 1, 10, 54, 164, 181, 13,
+ 166, 59, 20, 21, 22, 23, 1, 251, 3, 176,
+ 47, 177, 49, 179, 47, 48, 11, 12, 13, 14,
+ 15, 55, 56, 48, 190, 192, 48, 194, 195, 44,
+ 49, 1, 54, 199, 11, 12, 13, 14, 15, 47,
+ 1, 49, 208, 49, 47, 211, 213, 47, 1, 49,
+ 216, 47, 47, 49, 220, 50, 51, 52, 47, 54,
+ 49, 47, 1, 49, 1, 231, 232, 1, 48, 249,
+ 1, 49, 0, 239, 240, 0, 170, 54, 244, 10,
+ 11, 12, 217, 104, 41, 169, 50, 148, 80, 255,
+ -1, -1, -1, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, -1, 48, 49, 50,
+ 51, 1, 53, -1, -1, -1, -1, 58, -1, -1,
+ 10, 11, 12, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, -1, 48, -1,
+ 50, 51, 1, 53, -1, -1, -1, -1, 58, -1,
+ -1, 10, 11, 12, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 25, 26, 27, 28,
29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43
+ 39, 40, 41, 42, 43, 44, 45, 46, -1, -1,
+ 1, 50, 51, -1, 53, -1, 1, -1, 57, 58,
+ 11, 12, 13, 14, 15, -1, 11, 12, 13, 14,
+ 15, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ -1, -1, -1, -1, -1, -1, 47, -1, -1, 50,
+ 51, 52, 47, 54, 3, 50, 51, 52, -1, 54,
+ -1, 10, 11, 12, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 10, 11,
+ 12, -1, 51, -1, 53, -1, -1, -1, -1, -1,
+ -1, -1, -1, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, -1, -1, -1, -1, 51,
+ -1, 53
};
#define YYPURE 1
@@ -1056,18 +1095,17 @@ case 5:
#line 233 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
- delete p->rule;
p->rule = yyvsp[-2].rule;
;
break;}
case 6:
-#line 241 "parser.y"
+#line 240 "parser.y"
{
/* can be empty */
;
break;}
case 7:
-#line 247 "parser.y"
+#line 246 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-1].valueList ) {
@@ -1092,7 +1130,7 @@ case 7:
;
break;}
case 14:
-#line 284 "parser.y"
+#line 283 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "charset rule: " << qString(yyvsp[-2].string) << endl;
@@ -1100,7 +1138,7 @@ case 14:
;
break;}
case 18:
-#line 295 "parser.y"
+#line 294 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
@@ -1111,7 +1149,7 @@ case 18:
;
break;}
case 20:
-#line 308 "parser.y"
+#line 307 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
@@ -1122,7 +1160,7 @@ case 20:
;
break;}
case 27:
-#line 328 "parser.y"
+#line 327 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "@import: " << qString(yyvsp[-3].string) << endl;
@@ -1137,40 +1175,52 @@ case 27:
;
break;}
case 28:
-#line 340 "parser.y"
+#line 339 "parser.y"
{
yyval.rule = 0;
;
break;}
case 29:
-#line 343 "parser.y"
+#line 342 "parser.y"
{
yyval.rule = 0;
;
break;}
case 32:
-#line 354 "parser.y"
+#line 353 "parser.y"
+{
+ yyval.mediaList = 0;
+ ;
+ break;}
+case 34:
+#line 361 "parser.y"
{
yyval.mediaList = 0;
;
break;}
-case 33:
-#line 357 "parser.y"
+case 35:
+#line 364 "parser.y"
{
yyval.mediaList = new MediaListImpl();
yyval.mediaList->appendMedium( domString(yyvsp[0].string) );
;
break;}
-case 34:
-#line 361 "parser.y"
+case 36:
+#line 368 "parser.y"
{
yyval.mediaList = yyvsp[-3].mediaList;
- if ( !yyval.mediaList ) yyval.mediaList = new MediaListImpl();
yyval.mediaList->appendMedium( domString(yyvsp[0].string) );
;
break;}
-case 35:
-#line 369 "parser.y"
+case 37:
+#line 372 "parser.y"
+{
+ delete yyvsp[-1].mediaList;
+ yyval.mediaList = 0;
+ ;
+ break;}
+case 38:
+#line 379 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
if ( yyvsp[-4].mediaList && yyvsp[-1].ruleList &&
@@ -1183,26 +1233,12 @@ case 35:
}
;
break;}
-case 36:
-#line 383 "parser.y"
-{
- yyval.mediaList = new MediaListImpl();
- yyval.mediaList->appendMedium( domString(yyvsp[0].string) );
- ;
- break;}
-case 37:
-#line 387 "parser.y"
-{
- yyval.mediaList = yyvsp[-3].mediaList;
- yyval.mediaList->appendMedium( domString(yyvsp[0].string) );
- ;
- break;}
-case 38:
-#line 395 "parser.y"
+case 39:
+#line 393 "parser.y"
{ yyval.ruleList = 0; ;
break;}
-case 39:
-#line 396 "parser.y"
+case 40:
+#line 394 "parser.y"
{
yyval.ruleList = yyvsp[-2].ruleList;
if ( yyvsp[-1].rule ) {
@@ -1211,58 +1247,58 @@ case 39:
}
;
break;}
-case 40:
-#line 406 "parser.y"
+case 41:
+#line 404 "parser.y"
{
yyval.string = yyvsp[-1].string;
;
break;}
-case 41:
-#line 428 "parser.y"
-{
- yyval.rule = 0;
- ;
- break;}
case 42:
-#line 431 "parser.y"
+#line 426 "parser.y"
{
yyval.rule = 0;
;
break;}
case 43:
-#line 437 "parser.y"
+#line 429 "parser.y"
{
yyval.rule = 0;
;
break;}
case 44:
-#line 440 "parser.y"
+#line 435 "parser.y"
{
yyval.rule = 0;
;
break;}
case 45:
-#line 446 "parser.y"
-{ yyval.relation = CSSSelector::Sibling; ;
+#line 438 "parser.y"
+{
+ yyval.rule = 0;
+ ;
break;}
case 46:
-#line 447 "parser.y"
-{ yyval.relation = CSSSelector::Child; ;
+#line 444 "parser.y"
+{ yyval.relation = CSSSelector::Sibling; ;
break;}
case 47:
-#line 448 "parser.y"
-{ yyval.relation = CSSSelector::Descendant; ;
+#line 445 "parser.y"
+{ yyval.relation = CSSSelector::Child; ;
break;}
case 48:
-#line 452 "parser.y"
-{ yyval.val = -1; ;
+#line 446 "parser.y"
+{ yyval.relation = CSSSelector::Descendant; ;
break;}
case 49:
-#line 453 "parser.y"
-{ yyval.val = 1; ;
+#line 450 "parser.y"
+{ yyval.val = -1; ;
break;}
case 50:
-#line 457 "parser.y"
+#line 451 "parser.y"
+{ yyval.val = 1; ;
+ break;}
+case 51:
+#line 455 "parser.y"
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "got ruleset" << endl << " selector:" << endl;
@@ -1281,8 +1317,8 @@ case 50:
}
;
break;}
-case 51:
-#line 477 "parser.y"
+case 52:
+#line 475 "parser.y"
{
if ( yyvsp[0].selector ) {
yyval.selectorList = new QPtrList<CSSSelector>;
@@ -1297,31 +1333,38 @@ case 51:
}
;
break;}
-case 52:
-#line 490 "parser.y"
+case 53:
+#line 488 "parser.y"
{
- yyval.selectorList = yyvsp[-3].selectorList;
- if ( yyvsp[0].selector ) {
- if ( !yyval.selectorList ) {
- yyval.selectorList = new QPtrList<CSSSelector>;
- yyval.selectorList->setAutoDelete(true);
- }
+ if ( yyvsp[-3].selectorList && yyvsp[0].selector ) {
+ yyval.selectorList = yyvsp[-3].selectorList;
yyval.selectorList->append( yyvsp[0].selector );
#ifdef CSS_DEBUG
kdDebug( 6080 ) << " got simple selector:" << endl;
yyvsp[0].selector->print();
#endif
- }
+ } else {
+ delete yyvsp[-3].selectorList;
+ delete yyvsp[0].selector;
+ yyval.selectorList = 0;
+ }
;
break;}
-case 53:
-#line 507 "parser.y"
+case 54:
+#line 502 "parser.y"
+{
+ delete yyvsp[-1].selectorList;
+ yyval.selectorList = 0;
+ ;
+ break;}
+case 55:
+#line 509 "parser.y"
{
yyval.selector = yyvsp[0].selector;
;
break;}
-case 54:
-#line 510 "parser.y"
+case 56:
+#line 512 "parser.y"
{
yyval.selector = yyvsp[0].selector;
CSSSelector *end = yyvsp[0].selector;
@@ -1338,29 +1381,38 @@ DOM::DocumentImpl *doc = p->document();
}
;
break;}
-case 55:
-#line 528 "parser.y"
+case 57:
+#line 527 "parser.y"
+{
+ delete yyvsp[-1].selector;
+ yyval.selector = 0;
+ ;
+ break;}
+case 58:
+#line 534 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->tag = yyvsp[-1].element;
;
break;}
-case 56:
-#line 532 "parser.y"
+case 59:
+#line 538 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
- yyval.selector->tag = yyvsp[-2].element;
+ if ( yyval.selector )
+ yyval.selector->tag = yyvsp[-2].element;
;
break;}
-case 57:
-#line 536 "parser.y"
+case 60:
+#line 543 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
- yyval.selector->tag = -1;
+ if ( yyval.selector )
+ yyval.selector->tag = 0xffffffff;
;
break;}
-case 58:
-#line 543 "parser.y"
+case 61:
+#line 551 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
DOM::DocumentImpl *doc = p->document();
@@ -1382,21 +1434,21 @@ case 58:
}
;
break;}
-case 59:
-#line 563 "parser.y"
+case 62:
+#line 571 "parser.y"
{
- yyval.element = -1;
+ yyval.element = 0xffff;
;
break;}
-case 60:
-#line 569 "parser.y"
+case 63:
+#line 577 "parser.y"
{
yyval.selector = yyvsp[0].selector;
yyval.selector->nonCSSHint = static_cast<CSSParser *>(parser)->nonCSSHint;
;
break;}
-case 61:
-#line 573 "parser.y"
+case 64:
+#line 581 "parser.y"
{
yyval.selector = yyvsp[-1].selector;
CSSSelector *end = yyvsp[-1].selector;
@@ -1406,8 +1458,15 @@ case 61:
end->tagHistory = yyvsp[0].selector;
;
break;}
-case 62:
-#line 584 "parser.y"
+case 65:
+#line 589 "parser.y"
+{
+ delete yyvsp[-1].selector;
+ yyval.selector = 0;
+ ;
+ break;}
+case 66:
+#line 596 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Id;
@@ -1415,8 +1474,8 @@ case 62:
yyval.selector->value = domString(yyvsp[0].string);
;
break;}
-case 66:
-#line 596 "parser.y"
+case 70:
+#line 608 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::List;
@@ -1424,8 +1483,8 @@ case 66:
yyval.selector->value = domString(yyvsp[0].string);
;
break;}
-case 67:
-#line 605 "parser.y"
+case 71:
+#line 617 "parser.y"
{
CSSParser *p = static_cast<CSSParser *>(parser);
DOM::DocumentImpl *doc = p->document();
@@ -1448,16 +1507,16 @@ case 67:
}
;
break;}
-case 68:
-#line 629 "parser.y"
+case 72:
+#line 641 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->attr = yyvsp[-1].attribute;
yyval.selector->match = CSSSelector::Set;
;
break;}
-case 69:
-#line 634 "parser.y"
+case 73:
+#line 646 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->attr = yyvsp[-5].attribute;
@@ -1465,52 +1524,52 @@ case 69:
yyval.selector->value = domString(yyvsp[-2].string);
;
break;}
-case 70:
-#line 643 "parser.y"
+case 74:
+#line 655 "parser.y"
{
yyval.val = CSSSelector::Exact;
;
break;}
-case 71:
-#line 646 "parser.y"
+case 75:
+#line 658 "parser.y"
{
yyval.val = CSSSelector::List;
;
break;}
-case 72:
-#line 649 "parser.y"
+case 76:
+#line 661 "parser.y"
{
yyval.val = CSSSelector::Hyphen;
;
break;}
-case 73:
-#line 652 "parser.y"
+case 77:
+#line 664 "parser.y"
{
yyval.val = CSSSelector::Begin;
;
break;}
-case 74:
-#line 655 "parser.y"
+case 78:
+#line 667 "parser.y"
{
yyval.val = CSSSelector::End;
;
break;}
-case 75:
-#line 658 "parser.y"
+case 79:
+#line 670 "parser.y"
{
yyval.val = CSSSelector::Contain;
;
break;}
-case 78:
-#line 669 "parser.y"
+case 82:
+#line 681 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Pseudo;
yyval.selector->value = domString(yyvsp[0].string);
;
break;}
-case 79:
-#line 674 "parser.y"
+case 83:
+#line 686 "parser.y"
{
yyval.selector = new CSSSelector();
yyval.selector->match = CSSSelector::Pseudo;
@@ -1518,28 +1577,28 @@ case 79:
yyval.selector->value = domString(yyvsp[-2].string);
;
break;}
-case 80:
-#line 683 "parser.y"
+case 84:
+#line 695 "parser.y"
{
yyval.ok = yyvsp[0].ok;
;
break;}
-case 81:
-#line 686 "parser.y"
+case 85:
+#line 698 "parser.y"
{
yyval.ok = yyvsp[-1].ok;
if ( yyvsp[0].ok )
yyval.ok = yyvsp[0].ok;
;
break;}
-case 82:
-#line 691 "parser.y"
+case 86:
+#line 703 "parser.y"
{
yyval.ok = yyvsp[0].ok;
;
break;}
-case 83:
-#line 694 "parser.y"
+case 87:
+#line 706 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1547,8 +1606,8 @@ case 83:
#endif
;
break;}
-case 84:
-#line 700 "parser.y"
+case 88:
+#line 712 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1556,14 +1615,14 @@ case 84:
#endif
;
break;}
-case 85:
-#line 709 "parser.y"
+case 89:
+#line 721 "parser.y"
{
yyval.ok = yyvsp[-2].ok;
;
break;}
-case 86:
-#line 712 "parser.y"
+case 90:
+#line 724 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1571,8 +1630,8 @@ case 86:
#endif
;
break;}
-case 87:
-#line 718 "parser.y"
+case 91:
+#line 730 "parser.y"
{
yyval.ok = false;
#ifdef CSS_DEBUG
@@ -1580,16 +1639,16 @@ case 87:
#endif
;
break;}
-case 88:
-#line 724 "parser.y"
+case 92:
+#line 736 "parser.y"
{
yyval.ok = yyvsp[-3].ok;
if ( yyvsp[-2].ok )
yyval.ok = yyvsp[-2].ok;
;
break;}
-case 89:
-#line 729 "parser.y"
+case 93:
+#line 741 "parser.y"
{
yyval.ok = yyvsp[-3].ok;
#ifdef CSS_DEBUG
@@ -1597,8 +1656,8 @@ case 89:
#endif
;
break;}
-case 90:
-#line 735 "parser.y"
+case 94:
+#line 747 "parser.y"
{
yyval.ok = yyvsp[-5].ok;
#ifdef CSS_DEBUG
@@ -1606,8 +1665,8 @@ case 90:
#endif
;
break;}
-case 91:
-#line 744 "parser.y"
+case 95:
+#line 756 "parser.y"
{
yyval.ok = false;
CSSParser *p = static_cast<CSSParser *>(parser);
@@ -1631,74 +1690,83 @@ case 91:
p->valueList = 0;
;
break;}
-case 92:
-#line 769 "parser.y"
+case 96:
+#line 781 "parser.y"
{
QString str = qString(yyvsp[-1].string);
yyval.prop_id = getPropertyID( str.lower().latin1(), str.length() );
;
break;}
-case 93:
-#line 776 "parser.y"
+case 97:
+#line 788 "parser.y"
{ yyval.b = true; ;
break;}
-case 94:
-#line 777 "parser.y"
+case 98:
+#line 789 "parser.y"
{ yyval.b = false; ;
break;}
-case 95:
-#line 781 "parser.y"
+case 99:
+#line 793 "parser.y"
{
yyval.valueList = new ValueList;
yyval.valueList->addValue( yyvsp[0].value );
;
break;}
-case 96:
-#line 785 "parser.y"
-{
- yyval.valueList = yyvsp[-2].valueList;
- if ( yyvsp[-1].tok ) {
- Value v;
- v.id = 0;
- v.unit = Value::Operator;
- v.iValue = yyvsp[-1].tok;
- yyval.valueList->addValue( v );
- }
- yyval.valueList->addValue( yyvsp[0].value );
+case 100:
+#line 797 "parser.y"
+{
+ yyval.valueList = yyvsp[-2].valueList;
+ if ( yyval.valueList ) {
+ if ( yyvsp[-1].tok ) {
+ Value v;
+ v.id = 0;
+ v.unit = Value::Operator;
+ v.iValue = yyvsp[-1].tok;
+ yyval.valueList->addValue( v );
+ }
+ yyval.valueList->addValue( yyvsp[0].value );
+ }
;
break;}
-case 97:
-#line 799 "parser.y"
+case 101:
+#line 810 "parser.y"
+{
+ delete yyvsp[-1].valueList;
+ yyval.valueList = 0;
+ ;
+ break;}
+case 102:
+#line 817 "parser.y"
{
yyval.tok = '/';
;
break;}
-case 98:
-#line 802 "parser.y"
+case 103:
+#line 820 "parser.y"
{
yyval.tok = ',';
;
break;}
-case 99:
-#line 805 "parser.y"
+case 104:
+#line 823 "parser.y"
{
yyval.tok = 0;
;
break;}
-case 100:
-#line 811 "parser.y"
+case 105:
+#line 829 "parser.y"
{ yyval.value = yyvsp[0].value; ;
break;}
-case 101:
-#line 812 "parser.y"
+case 106:
+#line 830 "parser.y"
{ yyval.value = yyvsp[0].value; yyval.value.fValue *= yyvsp[-1].val; ;
break;}
-case 102:
-#line 813 "parser.y"
+case 107:
+#line 831 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_STRING; ;
break;}
-case 103:
-#line 814 "parser.y"
+case 108:
+#line 832 "parser.y"
{
QString str = qString( yyvsp[-1].string );
yyval.value.id = getValueID( str.lower().latin1(), str.length() );
@@ -1706,102 +1774,102 @@ case 103:
yyval.value.string = yyvsp[-1].string;
;
break;}
-case 104:
-#line 820 "parser.y"
+case 109:
+#line 838 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_URI; ;
break;}
-case 105:
-#line 821 "parser.y"
+case 110:
+#line 839 "parser.y"
{ yyval.value.id = 0; yyval.value.iValue = 0; yyval.value.unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ ;
break;}
-case 106:
-#line 822 "parser.y"
+case 111:
+#line 840 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[0].string; yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;
break;}
-case 107:
-#line 824 "parser.y"
+case 112:
+#line 842 "parser.y"
{
yyval.value = yyvsp[0].value;
;
break;}
-case 108:
-#line 830 "parser.y"
+case 113:
+#line 848 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;
break;}
-case 109:
-#line 831 "parser.y"
+case 114:
+#line 849 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;
break;}
-case 110:
-#line 832 "parser.y"
+case 115:
+#line 850 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;
break;}
-case 111:
-#line 833 "parser.y"
+case 116:
+#line 851 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;
break;}
-case 112:
-#line 834 "parser.y"
+case 117:
+#line 852 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;
break;}
-case 113:
-#line 835 "parser.y"
+case 118:
+#line 853 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;
break;}
-case 114:
-#line 836 "parser.y"
+case 119:
+#line 854 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;
break;}
-case 115:
-#line 837 "parser.y"
+case 120:
+#line 855 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;
break;}
-case 116:
-#line 838 "parser.y"
+case 121:
+#line 856 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;
break;}
-case 117:
-#line 839 "parser.y"
+case 122:
+#line 857 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;
break;}
-case 118:
-#line 840 "parser.y"
+case 123:
+#line 858 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;
break;}
-case 119:
-#line 841 "parser.y"
+case 124:
+#line 859 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;
break;}
-case 120:
-#line 842 "parser.y"
+case 125:
+#line 860 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;
break;}
-case 121:
-#line 843 "parser.y"
+case 126:
+#line 861 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;
break;}
-case 122:
-#line 844 "parser.y"
+case 127:
+#line 862 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;
break;}
-case 123:
-#line 845 "parser.y"
+case 128:
+#line 863 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;
break;}
-case 124:
-#line 846 "parser.y"
+case 129:
+#line 864 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;
break;}
-case 125:
-#line 847 "parser.y"
+case 130:
+#line 865 "parser.y"
{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;
break;}
-case 126:
-#line 848 "parser.y"
+case 131:
+#line 866 "parser.y"
{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION ;
break;}
-case 127:
-#line 853 "parser.y"
+case 132:
+#line 871 "parser.y"
{
Function *f = new Function;
f->name = yyvsp[-4].string;
@@ -1811,12 +1879,12 @@ case 127:
yyval.value.function = f;
;
break;}
-case 128:
-#line 868 "parser.y"
+case 133:
+#line 886 "parser.y"
{ yyval.string = yyvsp[-1].string; ;
break;}
-case 129:
-#line 875 "parser.y"
+case 134:
+#line 893 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1824,8 +1892,8 @@ case 129:
#endif
;
break;}
-case 130:
-#line 881 "parser.y"
+case 135:
+#line 899 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1833,8 +1901,8 @@ case 130:
#endif
;
break;}
-case 131:
-#line 890 "parser.y"
+case 136:
+#line 908 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2064,6 +2132,6 @@ yyerrhandle:
}
return 1;
}
-#line 925 "parser.y"
+#line 943 "parser.y"
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index 9f1b433..b207ff5 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -349,7 +349,7 @@ string_or_uri:
| URI
;
-maybe_media_list
+maybe_media_list:
/* empty */ {
$$ = 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list