[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:43:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 45b2c727c2b86c28a56ac8569ec2077afeeaa0b8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jun 2 21:12:51 2003 +0000
Fix for 3263679, color: # doesn't parse. Fix is to add an
error-handling case for # by itself to parser.y.
Reviewed by gramps/ken
* khtml/css/parser.cpp:
* khtml/css/parser.y:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4468 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4ff86a2..99c8253 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-06-02 David Hyatt <hyatt at apple.com>
+
+ Fix for 3263679, color: # doesn't parse. Fix is to add an
+ error-handling case for # by itself to parser.y.
+
+ Reviewed by gramps/ken
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
=== Safari-81 ===
2003-06-02 Darin Adler <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4ff86a2..99c8253 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-06-02 David Hyatt <hyatt at apple.com>
+
+ Fix for 3263679, color: # doesn't parse. Fix is to add an
+ error-handling case for # by itself to parser.y.
+
+ Reviewed by gramps/ken
+
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.y:
+
=== Safari-81 ===
2003-06-02 Darin Adler <darin at apple.com>
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index 1b48e2e..33f5032 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -181,20 +181,20 @@ static int cssyylex( YYSTYPE *yylval ) {
-#define YYFINAL 271
+#define YYFINAL 273
#define YYFLAG -32768
-#define YYNTBASE 60
+#define YYNTBASE 61
-#define YYTRANSLATE(x) ((unsigned)(x) <= 297 ? yytranslate[x] : 109)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 297 ? yytranslate[x] : 110)
static const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 59, 2, 2, 2, 2, 2,
57, 54, 51, 50, 53, 14, 58, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 13, 49, 2,
- 56, 52, 2, 59, 2, 2, 2, 2, 2, 2,
+ 56, 52, 2, 60, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
15, 2, 55, 2, 2, 2, 2, 2, 2, 2,
@@ -233,61 +233,61 @@ static const short yyprhs[] = { 0,
246, 248, 251, 255, 262, 264, 267, 269, 273, 275,
279, 284, 288, 294, 299, 304, 311, 317, 320, 327,
329, 333, 336, 339, 340, 342, 346, 349, 352, 355,
- 356, 358, 361, 364, 367, 370, 373, 375, 377, 380,
+ 356, 358, 361, 364, 367, 370, 373, 375, 378, 380,
383, 386, 389, 392, 395, 398, 401, 404, 407, 410,
- 413, 416, 419, 422, 425, 428, 431, 434, 440, 444,
- 447, 451, 455, 458, 464, 468, 470
+ 413, 416, 419, 422, 425, 428, 431, 434, 437, 443,
+ 447, 450, 454, 458, 461, 467, 471, 473
};
-static const short yyrhs[] = { 66,
- 65, 67, 68, 0, 61, 64, 0, 62, 64, 0,
- 63, 64, 0, 21, 47, 64, 81, 64, 48, 0,
- 22, 47, 64, 94, 48, 0, 23, 47, 64, 99,
- 48, 0, 0, 64, 3, 0, 0, 65, 4, 0,
- 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,
- 74, 0, 77, 0, 78, 0, 106, 0, 105, 0,
- 16, 64, 71, 64, 72, 49, 0, 16, 1, 107,
+static const short yyrhs[] = { 67,
+ 66, 68, 69, 0, 62, 65, 0, 63, 65, 0,
+ 64, 65, 0, 21, 47, 65, 82, 65, 48, 0,
+ 22, 47, 65, 95, 48, 0, 23, 47, 65, 100,
+ 48, 0, 0, 65, 3, 0, 0, 66, 4, 0,
+ 66, 3, 0, 0, 20, 65, 10, 65, 49, 0,
+ 20, 1, 108, 0, 20, 1, 49, 0, 0, 68,
+ 71, 66, 0, 0, 69, 70, 66, 0, 82, 0,
+ 75, 0, 78, 0, 79, 0, 107, 0, 106, 0,
+ 16, 65, 72, 65, 73, 49, 0, 16, 1, 108,
0, 16, 1, 49, 0, 10, 0, 44, 0, 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,
+ 74, 0, 0, 77, 0, 74, 50, 65, 77, 0,
+ 74, 1, 0, 18, 65, 74, 47, 65, 76, 48,
+ 0, 0, 76, 82, 65, 0, 11, 65, 0, 17,
+ 1, 108, 0, 17, 1, 49, 0, 19, 1, 108,
+ 0, 19, 1, 49, 0, 51, 65, 0, 52, 65,
+ 0, 0, 53, 0, 51, 0, 83, 47, 65, 95,
+ 48, 0, 84, 0, 83, 50, 65, 84, 0, 83,
+ 1, 0, 85, 0, 84, 80, 85, 0, 84, 1,
+ 0, 86, 65, 0, 86, 87, 65, 0, 87, 65,
+ 0, 11, 0, 54, 0, 88, 0, 87, 88, 0,
+ 87, 1, 0, 12, 0, 89, 0, 91, 0, 94,
+ 0, 14, 11, 0, 11, 65, 0, 15, 65, 90,
+ 55, 0, 15, 65, 90, 92, 65, 93, 65, 55,
0, 56, 0, 5, 0, 6, 0, 7, 0, 8,
0, 9, 0, 11, 0, 10, 0, 13, 11, 0,
- 13, 13, 11, 0, 13, 45, 64, 84, 64, 57,
- 0, 96, 0, 95, 96, 0, 95, 0, 1, 108,
- 1, 0, 1, 0, 96, 49, 64, 0, 96, 108,
- 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, 97, 1, 0, 97,
- 13, 64, 1, 99, 98, 0, 98, 0, 97, 13,
- 64, 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, 45,
- 64, 1, 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
+ 13, 13, 11, 0, 13, 45, 65, 85, 65, 57,
+ 0, 97, 0, 96, 97, 0, 96, 0, 1, 109,
+ 1, 0, 1, 0, 97, 49, 65, 0, 97, 109,
+ 49, 65, 0, 1, 49, 65, 0, 1, 109, 1,
+ 49, 65, 0, 96, 97, 49, 65, 0, 96, 1,
+ 49, 65, 0, 96, 1, 109, 1, 49, 65, 0,
+ 98, 13, 65, 100, 99, 0, 98, 1, 0, 98,
+ 13, 65, 1, 100, 99, 0, 99, 0, 98, 13,
+ 65, 0, 11, 65, 0, 24, 65, 0, 0, 102,
+ 0, 100, 101, 102, 0, 100, 1, 0, 58, 65,
+ 0, 50, 65, 0, 0, 103, 0, 81, 103, 0,
+ 10, 65, 0, 11, 65, 0, 44, 65, 0, 46,
+ 65, 0, 105, 0, 59, 65, 0, 104, 0, 43,
+ 65, 0, 42, 65, 0, 28, 65, 0, 29, 65,
+ 0, 30, 65, 0, 31, 65, 0, 32, 65, 0,
+ 33, 65, 0, 34, 65, 0, 35, 65, 0, 36,
+ 65, 0, 37, 65, 0, 38, 65, 0, 39, 65,
+ 0, 40, 65, 0, 26, 65, 0, 25, 65, 0,
+ 27, 65, 0, 41, 65, 0, 45, 65, 100, 57,
+ 65, 0, 45, 65, 1, 0, 12, 65, 0, 60,
+ 1, 108, 0, 60, 1, 49, 0, 1, 108, 0,
+ 47, 1, 109, 1, 48, 0, 47, 1, 48, 0,
+ 108, 0, 109, 1, 108, 0
};
#endif
@@ -305,10 +305,10 @@ static const short yyrline[] = { 0,
693, 696, 702, 708, 716, 720, 725, 728, 734, 742,
746, 749, 755, 761, 766, 772, 780, 803, 807, 815,
820, 827, 834, 836, 839, 844, 857, 863, 867, 870,
- 875, 877, 878, 879, 885, 886, 887, 889, 894, 896,
+ 875, 877, 878, 879, 885, 886, 887, 888, 890, 895,
897, 898, 899, 900, 901, 902, 903, 904, 905, 906,
- 907, 908, 909, 910, 911, 912, 913, 917, 925, 937,
- 944, 951, 959, 985, 987, 990, 992
+ 907, 908, 909, 910, 911, 912, 913, 914, 918, 926,
+ 938, 945, 952, 960, 986, 988, 991, 993
};
#endif
@@ -321,8 +321,8 @@ static const char * const yytname[] = { "$","error","$undefined.","S","SGML_CD
"KONQ_RULE_SYM","KONQ_DECLS_SYM","KONQ_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","konq_rule","konq_decls","konq_value","maybe_space","maybe_sgml",
+"'{'","'}'","';'","','","'+'","'>'","'-'","'*'","']'","'='","')'","'/'","'#'",
+"'@'","stylesheet","konq_rule","konq_decls","konq_value","maybe_space","maybe_sgml",
"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",
@@ -334,21 +334,21 @@ static const char * const yytname[] = { "$","error","$undefined.","S","SGML_CD
#endif
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, 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, 93, 94, 94, 94, 94, 94, 95,
- 95, 95, 95, 95, 95, 95, 96, 96, 96, 96,
- 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, 103, 103, 104,
- 105, 105, 106, 107, 107, 108, 108
+ 61, 61, 61, 61, 62, 63, 64, 65, 65, 66,
+ 66, 66, 67, 67, 67, 67, 68, 68, 69, 69,
+ 70, 70, 70, 70, 70, 70, 71, 71, 71, 72,
+ 72, 73, 73, 74, 74, 74, 74, 75, 76, 76,
+ 77, 78, 78, 79, 79, 80, 80, 80, 81, 81,
+ 82, 83, 83, 83, 84, 84, 84, 85, 85, 85,
+ 86, 86, 87, 87, 87, 88, 88, 88, 88, 89,
+ 90, 91, 91, 92, 92, 92, 92, 92, 92, 93,
+ 93, 94, 94, 94, 95, 95, 95, 95, 95, 96,
+ 96, 96, 96, 96, 96, 96, 97, 97, 97, 97,
+ 97, 98, 99, 99, 100, 100, 100, 101, 101, 101,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 103,
+ 103, 103, 103, 103, 103, 103, 103, 103, 103, 103,
+ 103, 103, 103, 103, 103, 103, 103, 103, 104, 104,
+ 105, 106, 106, 107, 108, 108, 109, 109
};
static const short yyr2[] = { 0,
@@ -363,10 +363,10 @@ static const short yyr2[] = { 0,
1, 2, 3, 6, 1, 2, 1, 3, 1, 3,
4, 3, 5, 4, 4, 6, 5, 2, 6, 1,
3, 2, 2, 0, 1, 3, 2, 2, 2, 0,
- 1, 2, 2, 2, 2, 2, 1, 1, 2, 2,
+ 1, 2, 2, 2, 2, 2, 1, 2, 1, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 5, 3, 2,
- 3, 3, 2, 5, 3, 1, 3
+ 2, 2, 2, 2, 2, 2, 2, 2, 5, 3,
+ 2, 3, 3, 2, 5, 3, 1, 3
};
static const short yydefact[] = { 13,
@@ -378,217 +378,215 @@ static const short yydefact[] = { 13,
0, 85, 0, 100, 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, 50,
- 49, 0, 0, 105, 111, 118, 117, 0, 0, 10,
- 145, 146, 0, 14, 82, 0, 8, 70, 0, 0,
- 54, 8, 8, 57, 8, 8, 0, 58, 0, 65,
- 60, 64, 8, 0, 102, 103, 6, 0, 86, 8,
- 0, 98, 8, 113, 114, 140, 135, 134, 136, 121,
+ 49, 8, 0, 0, 105, 111, 119, 117, 0, 0,
+ 10, 146, 147, 0, 14, 82, 0, 8, 70, 0,
+ 0, 54, 8, 8, 57, 8, 8, 0, 58, 0,
+ 65, 60, 64, 8, 0, 102, 103, 6, 0, 86,
+ 8, 0, 98, 8, 113, 114, 141, 136, 135, 137,
122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 137, 120, 119, 115, 0, 116, 112, 107,
- 7, 8, 8, 0, 0, 0, 0, 0, 8, 0,
- 0, 10, 22, 23, 24, 21, 26, 25, 18, 0,
- 83, 0, 8, 0, 5, 0, 0, 46, 47, 56,
- 59, 92, 88, 8, 0, 8, 90, 0, 8, 0,
- 139, 0, 109, 108, 106, 29, 28, 30, 31, 8,
- 143, 0, 34, 0, 0, 20, 144, 147, 8, 71,
- 75, 76, 77, 78, 79, 72, 74, 8, 0, 0,
- 8, 95, 0, 94, 91, 0, 0, 8, 34, 43,
- 42, 8, 0, 35, 45, 44, 142, 141, 0, 0,
- 51, 93, 8, 0, 97, 138, 0, 0, 41, 37,
- 8, 8, 84, 81, 80, 8, 96, 99, 27, 39,
- 0, 0, 0, 36, 73, 38, 8, 40, 0, 0,
- 0
+ 132, 133, 134, 138, 121, 120, 115, 0, 116, 118,
+ 112, 107, 7, 8, 8, 0, 0, 0, 0, 0,
+ 8, 0, 0, 10, 22, 23, 24, 21, 26, 25,
+ 18, 0, 83, 0, 8, 0, 5, 0, 0, 46,
+ 47, 56, 59, 92, 88, 8, 0, 8, 90, 0,
+ 8, 0, 140, 0, 109, 108, 106, 29, 28, 30,
+ 31, 8, 144, 0, 34, 0, 0, 20, 145, 148,
+ 8, 71, 75, 76, 77, 78, 79, 72, 74, 8,
+ 0, 0, 8, 95, 0, 94, 91, 0, 0, 8,
+ 34, 43, 42, 8, 0, 35, 45, 44, 143, 142,
+ 0, 0, 51, 93, 8, 0, 97, 139, 0, 0,
+ 41, 37, 8, 8, 84, 81, 80, 8, 96, 99,
+ 27, 39, 0, 0, 0, 36, 73, 38, 8, 40,
+ 0, 0, 0
};
-static const short yydefgoto[] = { 269,
- 5, 6, 7, 10, 17, 8, 28, 89, 162, 90,
- 200, 247, 233, 163, 263, 234, 164, 165, 107, 82,
- 37, 38, 39, 40, 41, 42, 43, 44, 174, 45,
- 218, 256, 46, 50, 51, 52, 53, 54, 83, 154,
- 84, 85, 86, 87, 167, 168, 92, 93
+static const short yydefgoto[] = { 271,
+ 5, 6, 7, 10, 17, 8, 28, 90, 164, 91,
+ 202, 249, 235, 165, 265, 236, 166, 167, 108, 83,
+ 37, 38, 39, 40, 41, 42, 43, 44, 176, 45,
+ 220, 258, 46, 50, 51, 52, 53, 54, 84, 156,
+ 85, 86, 87, 88, 169, 170, 93, 94
};
-static const short yypact[] = { 198,
- 19, -28, -19, 2,-32768,-32768,-32768,-32768, -24, 106,
--32768,-32768,-32768, 84, 84, 84, 149, 120,-32768,-32768,
--32768,-32768, 129, 567, 521,-32768,-32768, 122, 108, 82,
--32768,-32768, 1, 116,-32768,-32768,-32768, 44, 160,-32768,
- 222, 395,-32768,-32768,-32768,-32768, 70,-32768,-32768, 55,
- 109, 90, 14,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+static const short yypact[] = { 187,
+ 17, 0, 43, 56,-32768,-32768,-32768,-32768, -28, 119,
+-32768,-32768,-32768, 101, 101, 101, 21, 116,-32768,-32768,
+-32768,-32768, 131, 210, 492,-32768,-32768, 102, -13, 84,
+-32768,-32768, 95, 110,-32768,-32768,-32768, 44, 176,-32768,
+ 229, 541,-32768,-32768,-32768,-32768, 105,-32768,-32768, 93,
+ 99, 108, 13,-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,
--32768, 621, 293,-32768,-32768,-32768,-32768, 159, 111,-32768,
--32768,-32768, 145,-32768,-32768, 139,-32768,-32768, 102, 87,
--32768,-32768,-32768,-32768,-32768,-32768, 244, 84, 395,-32768,
- 84,-32768,-32768, 158, 84, 84,-32768, 153, 114,-32768,
- 85,-32768,-32768, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 84, 84, 84, 477, 84,-32768,-32768,
--32768,-32768,-32768, 592, 192, 92, 150, 175,-32768, 200,
- 204,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 149, 119,
--32768, 129,-32768, 33,-32768, 567, 129, 84, 84,-32768,
- 84, 84, 193,-32768, 205,-32768, 84, 150,-32768, 428,
--32768, 344, 84, 84,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 201, 103, 214, 250, 149,-32768,-32768,-32768, 84,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 161, 179,
--32768, 84, 259, 84, 84, 592, 242,-32768, 96,-32768,
--32768,-32768, 46,-32768,-32768,-32768,-32768,-32768, 18, 23,
--32768, 84,-32768, 242,-32768, 84, 166, 30, 84,-32768,
--32768,-32768,-32768,-32768,-32768,-32768, 84,-32768,-32768, 84,
- 103, 21, 174,-32768,-32768,-32768,-32768, 84, 208, 224,
--32768
+-32768,-32768, 540, 346,-32768,-32768,-32768,-32768, 193, 113,
+-32768,-32768,-32768, 164,-32768,-32768, 158,-32768,-32768, 12,
+ 1,-32768,-32768,-32768,-32768,-32768,-32768, 148, 101, 541,
+-32768, 101,-32768,-32768, 181, 101, 101,-32768, 146, 125,
+-32768, 32,-32768,-32768, 101, 101, 101, 101, 101, 101,
+ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+ 101, 101, 101, 101, 101, 101, 101, 448, 101, 101,
+-32768,-32768,-32768,-32768,-32768, 594, 167, 161, 145, 198,
+-32768, 211, 216,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ 21, 38,-32768, 131,-32768, 33,-32768, 210, 131, 101,
+ 101,-32768, 101, 101, 173,-32768, 223,-32768, 101, 145,
+-32768, 295,-32768, 397, 101, 101,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768, 184, 104, 189, 203, 21,-32768,-32768,
+-32768, 101,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ 156, 549,-32768, 101, 213, 101, 101, 594, 244,-32768,
+ 109,-32768,-32768,-32768, 45,-32768,-32768,-32768,-32768,-32768,
+ 19, 165,-32768, 101,-32768, 244,-32768, 101, 183, 47,
+ 101,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 101,-32768,
+-32768, 101, 104, 25, 124,-32768,-32768,-32768,-32768, 101,
+ 235, 239,-32768
};
static const short yypgoto[] = {-32768,
--32768,-32768,-32768, -5, -81,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, -4,-32768,-32768, -29,-32768,-32768,-32768,-32768,
- -85,-32768, 67, -94,-32768, 219, -32,-32768,-32768,-32768,
--32768,-32768,-32768, 69,-32768, 213,-32768, -209, -142,-32768,
- 95, 183,-32768,-32768,-32768,-32768, -6, -36
+-32768,-32768,-32768, -5, -82,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768, 15,-32768,-32768, -16,-32768,-32768,-32768,-32768,
+ -85,-32768, 72, -95,-32768, 220, -32,-32768,-32768,-32768,
+-32768,-32768,-32768, 85,-32768, 214,-32768, -217, -117,-32768,
+ 111, 217,-32768,-32768,-32768,-32768, -6, -36
};
-#define YYLAST 664
+#define YYLAST 653
static const short yytable[] = { 14,
- 15, 16, 20, 166, 192, 23, 24, 25, 169, 112,
- 114, 95, 180, 96, 122, 121, 30, 245, 11, 9,
- 21, -8, 18, 21, 19, 21, 123, 12, -8, 99,
- 250, 100, 254, 255, 258, 108, 111, 211, 212, 213,
- 214, 215, 115, 116, 101, 97, 250, 227, 13, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 253, 265, 112, 209, -33, 252,
- 206, 185, 156, 244, 21, 188, 21, 216, 217, 21,
- 102, 172, 251, 103, 21, 252, 176, 177, 21, 178,
- 179, 198, 117, 181, 21, 21, 232, 182, 21, 118,
- -1, 157, 173, 232, 187, 22, 18, 190, 113, 48,
- 29, 31, 32, 33, 34, 35, 98, 158, 159, 160,
- 94, 21, 49, 189, 175, 199, 18, 88, 120, 31,
- 32, 33, 34, 35, -32, 170, 193, 194, 197, 171,
- 201, 26, 27, 203, 18, 91, -87, -104, 183, 155,
- 104, -8, 186, 208, 36, 18, 207, 210, -8, 161,
- -48, -48, -48, -48, -48, 202, 208, 267, 222, 104,
- 224, 208, 36, 225, 31, 32, 33, 34, 35, -48,
- -48, -48, -48, -48, 229, 231, 18, 236, 238, 18,
- 204, 184, -8, 239, 205, 223, -52, 270, 241, -52,
- 105, 106, 240, -48, 259, 242, 208, 1, 2, 3,
- 4, 266, 246, 271, 248, -53, 249, 36, -53, 105,
- 106, 264, -48, 32, 33, 34, 35, 257, 18, 18,
- 196, 221, 150, 220, 219, 260, 261, 18, 195, 230,
- 262, -110, -110, -110, 31, 32, 33, 34, 35, 109,
- 18, 268, 235, 119, 149, 49, -110, -110, -110, -110,
+ 15, 16, 20, 21, 168, 23, 24, 25, 171, 113,
+ 115, 247, 182, 123, 21, 122, 30, 9, 18, -8,
+ 19, 21, 175, 26, 27, 124, -8, 21, 260, 100,
+ 194, 101, 190, 18, 92, 109, 112, 213, 214, 215,
+ 216, 217, 116, 117, 102, 252, 11, 252, 177, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 229, 255, 150, 113, 211, 267,
+ 191, 208, 187, 158, 18, 209, 21, 218, 219, 12,
+ 103, 253, 174, 104, 254, -33, 254, 178, 179, 119,
+ 180, 181, 13, 21, 183, 96, 21, 97, 184, 48,
+ 246, 21, -1, 159, 234, 189, 29, 89, 192, 234,
+ 99, 21, 49, 31, 32, 33, 34, 35, 22, 160,
+ 161, 162, 95, 21, 31, 32, 33, 34, 35, 98,
+ 118, 31, 32, 33, 34, 35, -87, -104, 195, 196,
+ 199, 18, 203, 114, 18, 205, 121, -32, 31, 32,
+ 33, 34, 35, 21, 172, 210, 36, 21, 173, 212,
+ 200, 268, 163, 188, 256, 257, 105, 36, 210, 269,
+ 224, 185, 226, 210, 36, 227, -48, -48, -48, -48,
+ -48, 18, 18, 157, 186, -8, 231, 233, 204, 238,
+ 240, 36, -8, 243, 201, 241, 1, 2, 3, 4,
+ 47, 206, 21, 18, 242, 198, 207, 244, 210, 18,
+ 48, 223, -52, 225, 248, -52, 106, 107, 251, -48,
+ 18, 261, 232, 49, 272, 18, -8, 237, 273, 259,
+ 32, 33, 34, 35, 152, 250, 266, 262, 263, 18,
+ 222, 239, 264, -110, -110, -110, -104, -104, -104, 18,
+ 110, 245, 221, 270, 120, 0, 197, 49, -110, -110,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
- -110, -110, -110, -110, -110, -110, -110, -110, -104, -104,
- -104, 152, -110, 150, -110, 0, 18, 36, 237, 153,
- 0, 0, -110, -110, -110, 18, 0, 243, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -110, -110, -110,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
- -110, -110, -110, -110, -110, -110, -110, -110, -110, 0,
- 151, 0, 152, -110, 150, -110, 0, 0, 0, 0,
- 153, 0, 0, -110, -110, -110, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -110, -110,
+ -104, -104, -104, 154, -110, 228, -110, 21, 0, 151,
+ 0, 155, -110, 0, 55, 56, 57, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, -101, -101, -101, 0, 80, 152, 81, 0, 0,
+ 0, 0, 0, 82, 0, -110, -110, -110, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
- 0, 0, 0, 152, -110, 110, -110, -8, 0, 0,
- 228, 153, 0, 0, 0, -8, 32, 33, 34, 35,
+ -110, -110, 0, 153, 0, 154, -110, 152, -110, 0,
+ 0, 0, 0, 155, -110, 0, -110, -110, -110, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 226, 0,
- 21, 0, 0, 0, 0, 0, 0, 55, 56, 57,
- 0, -8, 0, 0, -8, -8, -8, 0, -8, 0,
- 0, -8, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, -101, -101, -101, 191, 80, 21,
- 81, 0, 0, 0, 0, 0, 55, 56, 57, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 21, 0, 0, 0, 80, 0, 81,
- 55, 56, 57, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 47, 0, 21,
- 0, 80, 0, 81, 0, 0, 0, 48, 0, 0,
+ 0, -110, -110, -110, -110, -110, -110, -110, -110, -110,
+ -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
+ -110, -110, -110, 0, 0, 0, 154, -110, 193, -110,
+ 21, 0, 0, 230, 155, -110, 0, 55, 56, 57,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 49, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 55, 56, 57, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, -104, -104, -104, 58, 59, 60, 61,
+ 0, 0, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 21, 0, 0, 0, 80, 0,
+ 81, 55, 56, 57, 0, 0, 82, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 58, 59, 60, 61,
62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
72, 73, 74, 75, 76, 77, 78, 79, 0, 0,
- 0, 0, 80, 0, 81, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76
+ 0, 111, 80, -8, 81, 0, 0, 0, 0, 105,
+ 82, -8, 32, 33, 34, 35, 0, 0, 0, -48,
+ -48, -48, -48, -48, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 0, 0, 0, 0, -8, 0, 0,
+ -8, -8, -8, 0, -8, -53, 0, -8, -53, 106,
+ 107, 0, -48, 55, 56, 57, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 0, 0, 0, 0, 80, 0, 81, 0, 0, 0,
+ 0, 0, 82
};
static const short yycheck[] = { 5,
- 6, 7, 9, 89, 147, 11, 12, 13, 90, 42,
- 47, 11, 107, 13, 1, 52, 22, 227, 47, 1,
- 3, 3, 47, 3, 49, 3, 13, 47, 10, 35,
- 1, 37, 10, 11, 244, 41, 42, 5, 6, 7,
- 8, 9, 48, 49, 1, 45, 1, 190, 47, 55,
+ 6, 7, 9, 3, 90, 11, 12, 13, 91, 42,
+ 47, 229, 108, 1, 3, 52, 22, 1, 47, 3,
+ 49, 3, 11, 3, 4, 13, 10, 3, 246, 35,
+ 148, 37, 1, 47, 48, 41, 42, 5, 6, 7,
+ 8, 9, 48, 49, 1, 1, 47, 1, 48, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 57, 55, 109, 172, 49, 50,
- 162, 118, 88, 226, 3, 1, 3, 55, 56, 3,
- 47, 97, 47, 50, 3, 50, 102, 103, 3, 105,
- 106, 10, 48, 109, 3, 3, 11, 113, 3, 1,
- 0, 1, 11, 11, 120, 10, 47, 123, 49, 11,
- 1, 11, 12, 13, 14, 15, 11, 17, 18, 19,
- 49, 3, 24, 49, 48, 44, 47, 16, 49, 11,
- 12, 13, 14, 15, 49, 1, 152, 153, 155, 11,
- 157, 3, 4, 159, 47, 48, 48, 49, 1, 1,
- 1, 3, 49, 170, 54, 47, 48, 173, 10, 59,
- 11, 12, 13, 14, 15, 1, 183, 263, 184, 1,
- 186, 188, 54, 189, 11, 12, 13, 14, 15, 11,
- 12, 13, 14, 15, 200, 202, 47, 204, 205, 47,
- 1, 49, 44, 209, 1, 1, 47, 0, 48, 50,
- 51, 52, 218, 54, 49, 221, 223, 20, 21, 22,
- 23, 48, 228, 0, 229, 47, 232, 54, 50, 51,
- 52, 261, 54, 12, 13, 14, 15, 243, 47, 47,
- 49, 49, 1, 177, 176, 251, 252, 47, 154, 49,
- 256, 10, 11, 12, 11, 12, 13, 14, 15, 41,
- 47, 267, 49, 51, 82, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 1, 53, -1, 47, 54, 49, 58,
- -1, -1, 10, 11, 12, 47, -1, 49, -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,
+ 76, 77, 78, 79, 192, 57, 82, 110, 174, 55,
+ 49, 164, 119, 89, 47, 48, 3, 55, 56, 47,
+ 47, 47, 98, 50, 50, 49, 50, 103, 104, 1,
+ 106, 107, 47, 3, 110, 11, 3, 13, 114, 11,
+ 228, 3, 0, 1, 11, 121, 1, 16, 124, 11,
+ 11, 3, 24, 11, 12, 13, 14, 15, 10, 17,
+ 18, 19, 49, 3, 11, 12, 13, 14, 15, 45,
+ 48, 11, 12, 13, 14, 15, 48, 49, 154, 155,
+ 157, 47, 159, 49, 47, 161, 49, 49, 11, 12,
+ 13, 14, 15, 3, 1, 172, 54, 3, 11, 175,
+ 10, 48, 60, 49, 10, 11, 1, 54, 185, 265,
+ 186, 1, 188, 190, 54, 191, 11, 12, 13, 14,
+ 15, 47, 47, 1, 49, 3, 202, 204, 1, 206,
+ 207, 54, 10, 48, 44, 211, 20, 21, 22, 23,
+ 1, 1, 3, 47, 220, 49, 1, 223, 225, 47,
+ 11, 49, 47, 1, 230, 50, 51, 52, 234, 54,
+ 47, 49, 49, 24, 0, 47, 44, 49, 0, 245,
+ 12, 13, 14, 15, 1, 231, 263, 253, 254, 47,
+ 179, 49, 258, 10, 11, 12, 47, 48, 49, 47,
+ 41, 49, 178, 269, 51, -1, 156, 24, 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, 50, 51, 1, 53, 3, -1, -1,
- 57, 58, -1, -1, -1, 11, 12, 13, 14, 15,
+ 47, 48, 49, 50, 51, 1, 53, 3, -1, 83,
+ -1, 58, 59, -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, 47, 48, 49, -1, 51, 1, 53, -1, -1,
+ -1, -1, -1, 59, -1, 10, 11, 12, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 1, -1,
- 3, -1, -1, -1, -1, -1, -1, 10, 11, 12,
- -1, 47, -1, -1, 50, 51, 52, -1, 54, -1,
- -1, 57, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 1, 51, 3,
- 53, -1, -1, -1, -1, -1, 10, 11, 12, -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, 59, -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, 3, -1, -1, -1, 51, -1, 53,
- 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, -1, 3,
- -1, 51, -1, 53, -1, -1, -1, 11, -1, -1,
+ 44, 45, 46, -1, -1, -1, 50, 51, 1, 53,
+ 3, -1, -1, 57, 58, 59, -1, 10, 11, 12,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 24, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 10, 11, 12, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 47, 48, 49, 25, 26, 27, 28,
+ -1, -1, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 3, -1, -1, -1, 51, -1,
+ 53, 10, 11, 12, -1, -1, 59, -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, -1,
- -1, -1, 51, -1, 53, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43
+ -1, 1, 51, 3, 53, -1, -1, -1, -1, 1,
+ 59, 11, 12, 13, 14, 15, -1, -1, -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, 47, -1, -1,
+ 50, 51, 52, -1, 54, 47, -1, 57, 50, 51,
+ 52, -1, 54, 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, -1, -1, -1, 51, -1, 53, -1, -1, -1,
+ -1, -1, 59
};
#define YYPURE 1
@@ -1886,89 +1884,93 @@ case 117:
{ yyval.value.id = 0; yyval.value.string = yyvsp[0].string; yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;
break;}
case 118:
-#line 889 "parser.y"
+#line 888 "parser.y"
+{ yyval.value.id = 0; yyval.value.string = ParseString(); yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;
+ break;}
+case 119:
+#line 890 "parser.y"
{
yyval.value = yyvsp[0].value;
;
break;}
-case 119:
-#line 895 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;
- break;}
case 120:
#line 896 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;
break;}
case 121:
#line 897 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;
break;}
case 122:
#line 898 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;
break;}
case 123:
#line 899 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;
break;}
case 124:
#line 900 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;
break;}
case 125:
#line 901 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;
break;}
case 126:
#line 902 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;
break;}
case 127:
#line 903 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;
break;}
case 128:
#line 904 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;
break;}
case 129:
#line 905 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;
break;}
case 130:
#line 906 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;
break;}
case 131:
#line 907 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;
break;}
case 132:
#line 908 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;
break;}
case 133:
#line 909 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;
break;}
case 134:
#line 910 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;
break;}
case 135:
#line 911 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;
break;}
case 136:
#line 912 "parser.y"
-{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;
break;}
case 137:
#line 913 "parser.y"
-{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION ;
+{ yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;
break;}
case 138:
-#line 918 "parser.y"
+#line 914 "parser.y"
+{ yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION ;
+ break;}
+case 139:
+#line 919 "parser.y"
{
Function *f = new Function;
f->name = yyvsp[-4].string;
@@ -1978,20 +1980,20 @@ case 138:
yyval.value.function = f;
;
break;}
-case 139:
-#line 926 "parser.y"
+case 140:
+#line 927 "parser.y"
{
yyval.value.id = 0;
yyval.value.unit = Value::Function;
yyval.value.function = 0;
;
break;}
-case 140:
-#line 938 "parser.y"
+case 141:
+#line 939 "parser.y"
{ yyval.string = yyvsp[-1].string; ;
break;}
-case 141:
-#line 945 "parser.y"
+case 142:
+#line 946 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -1999,8 +2001,8 @@ case 141:
#endif
;
break;}
-case 142:
-#line 951 "parser.y"
+case 143:
+#line 952 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2008,8 +2010,8 @@ case 142:
#endif
;
break;}
-case 143:
-#line 960 "parser.y"
+case 144:
+#line 961 "parser.y"
{
yyval.rule = 0;
#ifdef CSS_DEBUG
@@ -2239,6 +2241,6 @@ yyerrhandle:
}
return 1;
}
-#line 995 "parser.y"
+#line 996 "parser.y"
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index 3e7cc41..d715291 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -885,6 +885,7 @@ term:
| URI maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_URI; }
| UNICODERANGE maybe_space { $$.id = 0; $$.iValue = 0; $$.unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ }
| hexcolor { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_RGBCOLOR; }
+| '#' maybe_space { $$.id = 0; $$.string = ParseString(); $$.unit = CSSPrimitiveValue::CSS_RGBCOLOR; } /* Handle error case: "color: #;" */
/* ### according to the specs a function can have a unary_operator in front. I know no case where this makes sense */
| function {
$$ = $1;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list