csspool 0.2.4 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.txt CHANGED
@@ -1,3 +1,9 @@
1
+ == 0.2.5
2
+
3
+ * Accepting spaces after error rules.
4
+ * Comments with asterisks tokenize correctly. [Seth Rasmussen]
5
+ * Stop polluting the global namespace with includes. [Thomas Kadauke]
6
+
1
7
  == 0.2.4
2
8
 
3
9
  * Fixed error handling on at rules. Thanks Dan for tests!
data/Rakefile CHANGED
@@ -7,7 +7,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
7
7
  GENERATED_PARSER = "lib/css/sac/generated_parser.rb"
8
8
  GENERATED_PROPERTY_PARSER = "lib/css/sac/generated_property_parser.rb"
9
9
 
10
- Hoe.new('csspool', "0.2.4") do |p|
10
+ Hoe.new('csspool', "0.2.5") do |p|
11
11
  p.rubyforge_name = 'csspool'
12
12
  p.author = 'Aaron Patterson'
13
13
  p.email = 'aaronp@rubyforge.org'
@@ -9,9 +9,7 @@ require 'racc/parser'
9
9
 
10
10
  require "css/sac/conditions"
11
11
  require "css/sac/selectors"
12
-
13
- include CSS::SAC::Conditions
14
- include CSS::SAC::Selectors
12
+
15
13
 
16
14
  module CSS
17
15
 
@@ -19,316 +17,321 @@ module CSS
19
17
 
20
18
  class GeneratedParser < Racc::Parser
21
19
 
20
+ module_eval <<'..end lib/parser.y modeval..idf748a5688a', 'lib/parser.y', 307
21
+ include CSS::SAC::Conditions
22
+ include CSS::SAC::Selectors
23
+ ..end lib/parser.y modeval..idf748a5688a
24
+
22
25
  ##### racc 1.4.5 generates ###
23
26
 
24
27
  racc_reduce_table = [
25
28
  0, 0, :racc_error,
26
- 7, 43, :_reduce_none,
27
- 3, 43, :_reduce_none,
28
- 3, 47, :_reduce_none,
29
+ 9, 44, :_reduce_none,
30
+ 3, 44, :_reduce_none,
31
+ 3, 48, :_reduce_none,
32
+ 3, 48, :_reduce_none,
33
+ 3, 48, :_reduce_none,
34
+ 2, 48, :_reduce_none,
35
+ 2, 48, :_reduce_none,
36
+ 2, 48, :_reduce_none,
37
+ 0, 48, :_reduce_none,
38
+ 7, 52, :_reduce_10,
39
+ 7, 55, :_reduce_11,
40
+ 5, 55, :_reduce_12,
29
41
  3, 47, :_reduce_none,
30
42
  3, 47, :_reduce_none,
31
- 2, 47, :_reduce_none,
32
- 2, 47, :_reduce_none,
33
- 2, 47, :_reduce_none,
34
43
  0, 47, :_reduce_none,
35
- 7, 51, :_reduce_10,
36
- 8, 54, :_reduce_11,
37
- 5, 54, :_reduce_12,
38
- 3, 46, :_reduce_none,
39
- 3, 46, :_reduce_none,
40
- 0, 46, :_reduce_none,
41
- 7, 49, :_reduce_16,
42
- 2, 56, :_reduce_17,
43
- 3, 56, :_reduce_18,
44
- 2, 59, :_reduce_none,
45
- 1, 53, :_reduce_none,
46
- 0, 53, :_reduce_none,
47
- 4, 58, :_reduce_22,
48
- 1, 58, :_reduce_23,
49
- 7, 50, :_reduce_24,
50
- 4, 60, :_reduce_25,
51
- 1, 62, :_reduce_none,
52
- 0, 62, :_reduce_none,
53
- 2, 63, :_reduce_28,
44
+ 7, 50, :_reduce_16,
45
+ 2, 57, :_reduce_17,
46
+ 3, 57, :_reduce_18,
47
+ 2, 60, :_reduce_none,
48
+ 1, 54, :_reduce_none,
49
+ 0, 54, :_reduce_none,
50
+ 4, 59, :_reduce_22,
51
+ 1, 59, :_reduce_23,
52
+ 7, 51, :_reduce_24,
53
+ 4, 61, :_reduce_25,
54
+ 1, 63, :_reduce_none,
54
55
  0, 63, :_reduce_none,
55
- 2, 64, :_reduce_none,
56
- 2, 64, :_reduce_none,
56
+ 2, 64, :_reduce_28,
57
57
  0, 64, :_reduce_none,
58
- 2, 65, :_reduce_33,
59
- 2, 65, :_reduce_34,
60
- 1, 65, :_reduce_35,
61
- 1, 66, :_reduce_none,
62
- 1, 66, :_reduce_none,
63
- 2, 67, :_reduce_none,
64
- 5, 48, :_reduce_39,
65
- 2, 57, :_reduce_none,
66
- 1, 57, :_reduce_none,
67
- 0, 57, :_reduce_none,
68
- 1, 69, :_reduce_43,
69
- 3, 68, :_reduce_44,
70
- 3, 68, :_reduce_45,
71
- 2, 68, :_reduce_46,
72
- 4, 71, :_reduce_47,
58
+ 2, 65, :_reduce_none,
59
+ 2, 65, :_reduce_none,
60
+ 0, 65, :_reduce_none,
61
+ 2, 66, :_reduce_33,
62
+ 2, 66, :_reduce_34,
63
+ 1, 66, :_reduce_35,
64
+ 1, 67, :_reduce_none,
65
+ 1, 67, :_reduce_none,
66
+ 2, 68, :_reduce_none,
67
+ 5, 49, :_reduce_39,
68
+ 2, 58, :_reduce_none,
69
+ 1, 58, :_reduce_none,
70
+ 0, 58, :_reduce_none,
71
+ 1, 70, :_reduce_43,
72
+ 3, 69, :_reduce_44,
73
+ 3, 69, :_reduce_45,
74
+ 2, 69, :_reduce_46,
75
+ 4, 72, :_reduce_47,
76
+ 1, 72, :_reduce_none,
77
+ 2, 73, :_reduce_49,
78
+ 1, 73, :_reduce_50,
79
+ 3, 71, :_reduce_51,
73
80
  1, 71, :_reduce_none,
74
- 2, 72, :_reduce_49,
75
- 1, 72, :_reduce_50,
76
- 3, 70, :_reduce_51,
77
- 1, 70, :_reduce_none,
78
- 2, 76, :_reduce_53,
79
- 1, 73, :_reduce_54,
80
- 1, 73, :_reduce_55,
81
- 6, 77, :_reduce_56,
82
- 2, 79, :_reduce_57,
83
- 2, 79, :_reduce_58,
84
- 5, 81, :_reduce_59,
85
- 4, 61, :_reduce_none,
86
- 5, 61, :_reduce_61,
87
- 4, 61, :_reduce_62,
88
- 1, 61, :_reduce_none,
89
- 4, 61, :_reduce_none,
90
- 0, 61, :_reduce_none,
91
- 2, 84, :_reduce_none,
92
- 1, 83, :_reduce_none,
93
- 0, 83, :_reduce_none,
94
- 3, 82, :_reduce_69,
95
- 1, 82, :_reduce_none,
96
- 2, 85, :_reduce_71,
97
- 1, 85, :_reduce_72,
98
- 2, 85, :_reduce_none,
99
- 2, 85, :_reduce_none,
81
+ 2, 77, :_reduce_53,
82
+ 1, 74, :_reduce_54,
83
+ 1, 74, :_reduce_55,
84
+ 6, 78, :_reduce_56,
85
+ 2, 80, :_reduce_57,
86
+ 2, 80, :_reduce_58,
87
+ 5, 82, :_reduce_59,
88
+ 4, 62, :_reduce_none,
89
+ 5, 62, :_reduce_61,
90
+ 4, 62, :_reduce_62,
91
+ 1, 62, :_reduce_none,
92
+ 4, 62, :_reduce_none,
93
+ 0, 62, :_reduce_none,
100
94
  2, 85, :_reduce_none,
101
- 1, 85, :_reduce_none,
102
- 1, 85, :_reduce_none,
103
- 2, 86, :_reduce_none,
104
- 2, 86, :_reduce_none,
105
- 2, 86, :_reduce_none,
106
- 2, 86, :_reduce_none,
107
- 2, 86, :_reduce_none,
95
+ 1, 84, :_reduce_none,
96
+ 0, 84, :_reduce_none,
97
+ 3, 83, :_reduce_69,
98
+ 1, 83, :_reduce_none,
99
+ 2, 86, :_reduce_71,
100
+ 1, 86, :_reduce_72,
108
101
  2, 86, :_reduce_none,
109
102
  2, 86, :_reduce_none,
110
103
  2, 86, :_reduce_none,
111
- 5, 80, :_reduce_86,
112
- 6, 80, :_reduce_87,
104
+ 1, 86, :_reduce_none,
105
+ 1, 86, :_reduce_none,
113
106
  2, 87, :_reduce_none,
114
- 1, 74, :_reduce_none,
115
- 0, 74, :_reduce_none,
116
- 2, 75, :_reduce_91,
117
- 2, 75, :_reduce_92,
118
- 2, 75, :_reduce_93,
119
- 2, 75, :_reduce_94,
120
- 1, 75, :_reduce_none,
121
- 1, 75, :_reduce_none,
122
- 1, 75, :_reduce_none,
107
+ 2, 87, :_reduce_none,
108
+ 2, 87, :_reduce_none,
109
+ 2, 87, :_reduce_none,
110
+ 2, 87, :_reduce_none,
111
+ 2, 87, :_reduce_none,
112
+ 2, 87, :_reduce_none,
113
+ 2, 87, :_reduce_none,
114
+ 5, 81, :_reduce_86,
115
+ 6, 81, :_reduce_87,
116
+ 2, 88, :_reduce_none,
123
117
  1, 75, :_reduce_none,
124
- 1, 88, :_reduce_99,
125
- 4, 78, :_reduce_100,
126
- 4, 78, :_reduce_101,
127
- 0, 78, :_reduce_none,
128
- 1, 89, :_reduce_none,
129
- 1, 89, :_reduce_none,
130
- 1, 89, :_reduce_none,
131
- 1, 52, :_reduce_none,
132
- 1, 52, :_reduce_none,
133
- 3, 55, :_reduce_none,
134
- 3, 55, :_reduce_none,
135
- 1, 55, :_reduce_none,
136
- 1, 55, :_reduce_none,
137
- 2, 44, :_reduce_none,
138
- 2, 44, :_reduce_none,
139
- 2, 44, :_reduce_none,
140
- 1, 44, :_reduce_none,
141
- 1, 44, :_reduce_none,
142
- 1, 44, :_reduce_none,
143
- 0, 44, :_reduce_none,
118
+ 0, 75, :_reduce_none,
119
+ 2, 76, :_reduce_91,
120
+ 2, 76, :_reduce_92,
121
+ 2, 76, :_reduce_93,
122
+ 2, 76, :_reduce_94,
123
+ 1, 76, :_reduce_none,
124
+ 1, 76, :_reduce_none,
125
+ 1, 76, :_reduce_none,
126
+ 1, 76, :_reduce_none,
127
+ 1, 89, :_reduce_99,
128
+ 4, 79, :_reduce_100,
129
+ 4, 79, :_reduce_101,
130
+ 0, 79, :_reduce_none,
131
+ 1, 90, :_reduce_none,
132
+ 1, 90, :_reduce_none,
133
+ 1, 90, :_reduce_none,
134
+ 1, 53, :_reduce_none,
135
+ 1, 53, :_reduce_none,
136
+ 3, 56, :_reduce_none,
137
+ 3, 56, :_reduce_none,
138
+ 2, 56, :_reduce_none,
139
+ 2, 56, :_reduce_none,
140
+ 2, 45, :_reduce_none,
141
+ 2, 45, :_reduce_none,
144
142
  2, 45, :_reduce_none,
145
- 0, 45, :_reduce_none ]
143
+ 1, 45, :_reduce_none,
144
+ 1, 45, :_reduce_none,
145
+ 1, 45, :_reduce_none,
146
+ 0, 45, :_reduce_none,
147
+ 2, 46, :_reduce_none,
148
+ 0, 46, :_reduce_none ]
146
149
 
147
150
  racc_reduce_n = 121
148
151
 
149
- racc_shift_n = 227
152
+ racc_shift_n = 230
150
153
 
151
154
  racc_action_table = [
152
- 161, -70, 50, 186, 187, 50, 120, 123, 135, 7,
153
- 130, 112, 168, 115, 49, 10, 119, 121, 122, 124,
154
- 126, 128, 111, 114, -70, 56, 189, 7, 75, 57,
155
- -70, 73, -70, 10, 169, 116, 55, 136, 50, 162,
156
- -70, 188, 120, 123, 142, 4, 130, 112, 143, 115,
157
- 2, 3, 119, 121, 122, 124, 126, 128, 111, 114,
158
- 34, 50, 106, 41, -120, 120, 123, -120, 34, 130,
159
- 112, 116, 115, 19, 41, 119, 121, 122, 124, 126,
160
- 128, 111, 114, 34, 41, 41, -120, 18, 19, -120,
161
- 22, 34, 29, 41, 116, 18, 19, 84, 22, 25,
162
- 29, 132, 7, 133, 34, 41, 134, 82, 10, 19,
163
- 18, 99, 34, 22, 25, 29, 137, 19, 18, 34,
164
- 34, 22, 25, 29, 27, 31, -120, 34, 65, 66,
165
- 67, 18, 27, 31, 22, 25, 29, 221, 220, 18,
166
- 34, 97, 22, 25, 29, 19, 18, 18, 34, 22,
167
- 22, 29, 29, 19, 18, 34, 41, 22, 41, 29,
168
- 27, 31, 96, 34, 144, 41, 146, 18, 19, 41,
169
- 22, 25, 29, 90, 95, 18, 34, 90, 22, 25,
170
- 29, 19, 18, 27, 31, 22, 41, 29, 154, 89,
171
- 18, 84, 84, 22, 25, 29, 27, 31, 41, 41,
172
- 41, 82, 82, 18, 84, 84, 22, 25, 29, 84,
173
- 41, 41, 41, 41, 82, 82, 109, 41, 4, 82,
174
- -120, -120, 41, 2, 3, 75, 107, 41, 73, 41,
175
- 4, 41, 41, -120, -120, 2, 3, 41, -120, 119,
176
- 121, 122, 124, 126, 128, 111, 114, 7, 41, 4,
177
- 8, 4, 41, 10, 2, 3, 2, 3, 4, 41,
178
- 4, 41, 4, 2, 3, 2, 3, 2, 3, 4,
179
- 75, 107, 41, 73, 2, 3, 75, 107, 41, 73,
180
- 41, 41, 41, 177, 41, 41, 55, 77, 182, 41,
181
- 41, 41, 41, 191, 41, 41, 90, 41, 196, 41,
182
- 41, 41, 41, 54, 41, 46, 41, 44, 206, 41,
183
- 90, 41, 210, 211, 41, 213, 41, 215, 41, 41,
184
- 15, 41, 41, 41, 41, 41 ]
155
+ 108, 166, 54, -70, 138, 189, 190, 8, 149, 50,
156
+ 107, 53, 48, 12, 172, 50, 107, 84, 48, 62,
157
+ 19, 84, 8, 63, 36, 19, -70, 83, 12, 19,
158
+ 61, 83, -70, 139, -70, 50, 173, 100, 48, 8,
159
+ 167, 110, -70, 191, 54, 12, -120, 110, 123, 127,
160
+ -120, 21, 132, 116, 26, 119, 32, 19, 122, 125,
161
+ 126, 128, 129, 131, 114, 117, 145, 54, 5, 99,
162
+ 146, 123, 127, 3, 4, 132, 116, 120, 119, 224,
163
+ 223, 122, 125, 126, 128, 129, 131, 114, 117, 36,
164
+ 54, 72, 73, 74, 123, 127, 91, 36, 132, 116,
165
+ 120, 119, 22, 96, 122, 125, 126, 128, 129, 131,
166
+ 114, 117, 36, 19, 135, 136, 21, 22, 137, 26,
167
+ 36, 32, 95, 120, 21, 22, 140, 26, 28, 32,
168
+ 91, 19, 30, 34, 50, 107, 19, 48, 90, 21,
169
+ 30, 34, 26, 28, 32, 147, 19, 21, 36, 19,
170
+ 26, 28, 32, 22, 5, 84, 36, 19, 152, 3,
171
+ 4, 22, 36, 19, 19, 83, 110, 22, 30, 34,
172
+ 36, 36, 154, 91, 19, 21, 30, 34, 26, 28,
173
+ 32, 36, 19, 21, -120, 36, 26, 28, 32, 21,
174
+ 22, 36, 26, 28, 32, 158, 22, 21, 21, 36,
175
+ 26, 26, 32, 32, 22, 30, 34, 19, 21, 19,
176
+ 19, 26, 21, 32, 5, 26, 28, 32, 21, 3,
177
+ 4, 26, 28, 32, 84, 84, 21, 19, 84, 26,
178
+ 28, 32, 19, 19, 83, 83, 19, 19, 83, 122,
179
+ 125, 126, 128, 129, 131, 114, 117, 19, 19, 8,
180
+ 19, 19, 10, -120, -120, 12, 5, -120, 5, 19,
181
+ 5, 3, 4, 3, 4, 3, 4, 5, 19, 5,
182
+ 19, 5, 3, 4, 3, 4, 3, 4, 19, 19,
183
+ 19, 19, 19, 19, 180, 19, 19, 61, 19, 185,
184
+ 19, 78, 192, 19, 19, 19, 196, 19, 19, 199,
185
+ 19, 19, 19, 19, 19, 19, 59, 19, 19, 209,
186
+ 46, 91, 19, 213, 214, 19, 19, 19, 218, 19,
187
+ 19, 16, 19, 6, 19, 19, 19 ]
185
188
 
186
189
  racc_action_check = [
187
- 118, 125, 176, 145, 145, 18, 176, 176, 86, 43,
188
- 176, 176, 125, 176, 18, 43, 176, 176, 176, 176,
189
- 176, 176, 176, 176, 125, 23, 146, 45, 40, 23,
190
- 125, 40, 125, 45, 125, 176, 23, 86, 170, 118,
191
- 125, 145, 170, 170, 92, 33, 170, 170, 92, 170,
192
- 33, 33, 170, 170, 170, 170, 170, 170, 170, 170,
193
- 37, 81, 77, 107, 107, 81, 81, 107, 88, 81,
194
- 81, 170, 81, 88, 66, 81, 81, 81, 81, 81,
195
- 81, 81, 81, 141, 65, 110, 110, 37, 141, 110,
196
- 37, 181, 37, 82, 81, 88, 181, 148, 88, 88,
197
- 88, 83, 106, 84, 6, 148, 85, 148, 106, 6,
198
- 141, 63, 64, 141, 141, 141, 87, 64, 181, 16,
199
- 17, 181, 181, 181, 6, 6, 148, 20, 35, 35,
200
- 35, 6, 64, 64, 6, 6, 6, 209, 209, 64,
201
- 59, 62, 64, 64, 64, 59, 16, 17, 68, 16,
202
- 17, 16, 17, 68, 20, 39, 90, 20, 91, 20,
203
- 59, 59, 61, 151, 93, 95, 98, 59, 151, 99,
204
- 59, 59, 59, 105, 60, 68, 69, 58, 68, 68,
205
- 68, 69, 39, 151, 151, 39, 108, 39, 109, 56,
206
- 151, 204, 53, 151, 151, 151, 69, 69, 111, 204,
207
- 53, 204, 53, 69, 174, 178, 69, 69, 69, 175,
208
- 112, 55, 174, 178, 174, 178, 79, 175, 36, 175,
209
- 204, 53, 114, 36, 36, 79, 79, 115, 79, 50,
210
- 0, 119, 120, 174, 178, 0, 0, 121, 175, 113,
211
- 113, 113, 113, 113, 113, 113, 113, 1, 122, 2,
212
- 1, 3, 124, 1, 2, 2, 3, 3, 28, 44,
213
- 4, 126, 9, 28, 28, 4, 4, 9, 9, 11,
214
- 152, 152, 128, 152, 11, 11, 155, 155, 130, 155,
215
- 132, 133, 134, 135, 136, 137, 138, 42, 142, 144,
216
- 41, 74, 32, 150, 31, 30, 153, 29, 161, 162,
217
- 168, 169, 27, 22, 21, 15, 177, 10, 180, 8,
218
- 183, 184, 185, 190, 191, 194, 196, 203, 7, 206,
219
- 5, 211, 213, 215, 220, 221 ]
190
+ 80, 124, 21, 130, 87, 148, 148, 17, 97, 80,
191
+ 80, 21, 80, 17, 130, 153, 153, 207, 153, 29,
192
+ 73, 177, 45, 29, 42, 207, 130, 207, 45, 177,
193
+ 29, 177, 130, 87, 130, 18, 130, 69, 18, 194,
194
+ 124, 80, 130, 148, 82, 194, 207, 153, 82, 82,
195
+ 177, 42, 82, 82, 42, 82, 42, 78, 82, 82,
196
+ 82, 82, 82, 82, 82, 82, 93, 174, 11, 68,
197
+ 93, 174, 174, 11, 11, 174, 174, 82, 174, 212,
198
+ 212, 174, 174, 174, 174, 174, 174, 174, 174, 20,
199
+ 179, 40, 40, 40, 179, 179, 81, 89, 179, 179,
200
+ 174, 179, 89, 66, 179, 179, 179, 179, 179, 179,
201
+ 179, 179, 67, 83, 84, 85, 20, 67, 86, 20,
202
+ 9, 20, 65, 179, 89, 9, 88, 89, 89, 89,
203
+ 64, 91, 67, 67, 157, 157, 92, 157, 62, 67,
204
+ 9, 9, 67, 67, 67, 94, 95, 9, 75, 72,
205
+ 9, 9, 9, 75, 0, 178, 70, 100, 106, 0,
206
+ 0, 70, 184, 178, 107, 178, 157, 184, 75, 75,
207
+ 23, 24, 108, 109, 110, 75, 70, 70, 75, 75,
208
+ 75, 25, 111, 70, 178, 215, 70, 70, 70, 184,
209
+ 215, 144, 184, 184, 184, 113, 144, 23, 24, 71,
210
+ 23, 24, 23, 24, 71, 215, 215, 114, 25, 116,
211
+ 117, 25, 215, 25, 41, 215, 215, 215, 144, 41,
212
+ 41, 144, 144, 144, 60, 151, 71, 61, 181, 71,
213
+ 71, 71, 60, 151, 60, 151, 181, 119, 181, 118,
214
+ 118, 118, 118, 118, 118, 118, 118, 122, 123, 2,
215
+ 54, 125, 2, 60, 151, 2, 39, 181, 3, 126,
216
+ 5, 39, 39, 3, 3, 5, 5, 35, 128, 4,
217
+ 129, 7, 35, 35, 4, 4, 7, 7, 49, 131,
218
+ 132, 135, 136, 137, 138, 139, 140, 141, 46, 145,
219
+ 147, 44, 149, 38, 152, 37, 155, 34, 158, 166,
220
+ 167, 172, 173, 32, 30, 27, 26, 180, 19, 183,
221
+ 12, 186, 187, 188, 193, 10, 196, 199, 206, 8,
222
+ 209, 6, 214, 1, 218, 223, 224 ]
220
223
 
221
224
  racc_action_pointer = [
222
- 221, 222, 240, 242, 251, 320, 98, 309, 300, 253,
223
- 296, 260, nil, nil, nil, 305, 113, 114, 3, nil,
224
- 121, 295, 292, 24, nil, nil, nil, 293, 249, 288,
225
- 286, 285, 283, 36, nil, 121, 209, 54, nil, 149,
226
- 18, 281, 277, -16, 250, 2, nil, nil, nil, nil,
227
- 220, nil, nil, 191, nil, 202, 184, nil, 166, 134,
228
- 163, 157, 130, 106, 106, 75, 65, nil, 142, 170,
229
- nil, nil, nil, nil, 282, nil, nil, 32, nil, 215,
230
- nil, 59, 84, 71, 73, 73, 7, 84, 62, nil,
231
- 147, 149, 43, 152, nil, 156, nil, nil, 133, 160,
232
- nil, nil, nil, nil, nil, 162, 77, 54, 177, 179,
233
- 76, 189, 201, 223, 213, 218, nil, nil, -1, 222,
234
- 223, 228, 239, nil, 243, 0, 252, nil, 263, nil,
235
- 269, nil, 271, 272, 273, 253, 275, 276, 274, nil,
236
- nil, 77, 283, nil, 280, 0, 15, nil, 96, nil,
237
- 263, 157, 260, 285, nil, 266, nil, nil, nil, nil,
238
- nil, 258, 290, nil, nil, nil, nil, nil, 291, 292,
239
- 36, nil, nil, nil, 203, 208, 0, 297, 204, nil,
240
- 276, 85, nil, 299, 302, 273, nil, nil, nil, nil,
241
- 281, 305, nil, nil, 285, nil, 307, nil, nil, nil,
242
- nil, nil, nil, 293, 190, nil, 310, nil, nil, 127,
243
- nil, 312, nil, 313, nil, 314, nil, nil, nil, nil,
244
- 315, 316, nil, nil, nil, nil, nil ]
225
+ 145, 323, 224, 249, 260, 251, 321, 262, 310, 114,
226
+ 306, 59, 299, nil, nil, nil, nil, -18, 25, 299,
227
+ 83, 0, nil, 164, 165, 175, 295, 296, nil, 18,
228
+ 295, nil, 294, nil, 288, 258, nil, 286, 284, 247,
229
+ 84, 205, 18, nil, 281, -3, 279, nil, nil, 269,
230
+ nil, nil, nil, nil, 241, nil, nil, nil, nil, nil,
231
+ 223, 218, 133, nil, 119, 111, 92, 106, 64, 32,
232
+ 150, 193, 140, 11, nil, 142, nil, nil, 48, nil,
233
+ -1, 85, 42, 104, 84, 85, 85, 3, 94, 91,
234
+ nil, 122, 127, 65, 133, 137, nil, -25, nil, nil,
235
+ 148, nil, nil, nil, nil, nil, 128, 155, 163, 162,
236
+ 165, 173, nil, 165, 198, nil, 200, 201, 223, 228,
237
+ nil, nil, 238, 239, 0, 242, 250, nil, 259, 261,
238
+ 2, 270, 271, nil, nil, 272, 273, 274, 254, 276,
239
+ 277, 275, nil, nil, 185, 284, nil, 281, 2, 281,
240
+ nil, 224, 285, 5, nil, 266, nil, 124, 289, nil,
241
+ nil, nil, nil, nil, nil, nil, 259, 291, nil, nil,
242
+ nil, nil, 292, 293, 65, nil, nil, 20, 154, 88,
243
+ 298, 227, nil, 277, 156, nil, 300, 303, 274, nil,
244
+ nil, nil, nil, 282, 14, nil, 307, nil, nil, 308,
245
+ nil, nil, nil, nil, nil, nil, 294, 16, nil, 311,
246
+ nil, nil, 69, nil, 313, 179, nil, nil, 315, nil,
247
+ nil, nil, nil, 316, 317, nil, nil, nil, nil, nil ]
245
248
 
246
249
  racc_action_default = [
247
- -118, -15, -116, -117, -115, -121, -9, -120, -120, -118,
248
- -121, -118, -113, -114, -112, -121, -97, -95, -121, -54,
249
- -98, -120, -121, -48, -2, -55, -43, -120, -118, -120,
250
- -120, -120, -120, -118, -99, -52, -118, -90, -50, -96,
251
- -121, -120, -121, -15, -120, -15, 227, -93, -91, -58,
252
- -120, -57, -94, -65, -53, -120, -121, -46, -121, -6,
253
- -121, -121, -27, -121, -7, -120, -120, -35, -121, -8,
254
- -49, -89, -92, -107, -120, -106, -119, -121, -13, -121,
255
- -14, -121, -120, -121, -121, -121, -63, -121, -121, -45,
256
- -120, -120, -121, -23, -3, -120, -44, -26, -29, -120,
257
- -4, -33, -34, -51, -5, -21, -15, -110, -120, -121,
258
- -111, -120, -120, -121, -120, -120, -36, -77, -121, -120,
259
- -120, -120, -120, -37, -120, -32, -120, -72, -120, -76,
260
- -120, -38, -120, -120, -120, -121, -120, -120, -48, -47,
261
- -19, -42, -121, -17, -120, -102, -121, -25, -65, -20,
262
- -121, -9, -121, -21, -12, -121, -84, -74, -71, -85,
263
- -75, -121, -120, -78, -88, -79, -80, -81, -120, -120,
264
- -121, -82, -83, -73, -65, -65, -121, -120, -65, -39,
265
- -121, -41, -18, -121, -120, -121, -104, -105, -103, -28,
266
- -121, -120, -1, -109, -121, -108, -120, -86, -31, -30,
267
- -69, -64, -62, -68, -65, -60, -120, -40, -22, -121,
268
- -56, -120, -10, -120, -87, -120, -59, -67, -61, -16,
269
- -120, -120, -24, -11, -66, -100, -101 ]
250
+ -118, -121, -15, -116, -117, -115, -121, -118, -120, -9,
251
+ -120, -118, -121, -113, -114, -112, 230, -15, -121, -120,
252
+ -96, -121, -54, -97, -95, -98, -121, -120, -55, -48,
253
+ -120, -2, -120, -43, -120, -118, -99, -120, -120, -118,
254
+ -52, -118, -90, -50, -121, -15, -120, -14, -107, -120,
255
+ -106, -119, -92, -58, -120, -57, -93, -91, -94, -53,
256
+ -65, -120, -121, -46, -121, -121, -27, -6, -121, -121,
257
+ -7, -121, -120, -120, -35, -8, -49, -89, -120, -13,
258
+ -121, -21, -121, -120, -121, -121, -121, -63, -121, -121,
259
+ -45, -120, -120, -121, -23, -120, -26, -29, -3, -44,
260
+ -120, -4, -51, -33, -34, -5, -121, -120, -121, -21,
261
+ -120, -120, -20, -121, -120, -76, -120, -120, -121, -120,
262
+ -36, -77, -120, -120, -121, -120, -120, -37, -120, -120,
263
+ -32, -120, -120, -72, -38, -120, -120, -120, -121, -120,
264
+ -120, -48, -47, -19, -42, -121, -17, -120, -102, -121,
265
+ -25, -65, -120, -121, -12, -121, -110, -111, -120, -84,
266
+ -74, -85, -71, -75, -78, -88, -121, -120, -79, -80,
267
+ -81, -82, -120, -120, -121, -83, -73, -65, -65, -121,
268
+ -120, -65, -39, -121, -41, -18, -121, -120, -121, -104,
269
+ -105, -103, -28, -121, -15, -109, -120, -108, -10, -120,
270
+ -86, -31, -30, -69, -62, -64, -68, -65, -60, -120,
271
+ -40, -22, -121, -56, -120, -9, -11, -87, -120, -59,
272
+ -67, -61, -16, -120, -120, -24, -1, -66, -100, -101 ]
270
273
 
271
274
  racc_goto_table = [
272
- 40, 42, 24, 92, 118, 6, 108, 147, 150, 98,
273
- 180, 181, 47, 48, 53, 91, 52, 170, 68, 138,
274
- 58, 87, 60, 61, 62, 63, 103, 139, 70, 74,
275
- 185, 51, 5, 71, 76, 72, 216, 79, 217, 158,
276
- 184, nil, nil, 81, nil, nil, nil, 78, 88, 80,
277
- 207, 181, nil, nil, nil, 94, 194, nil, 101, 102,
278
- 100, nil, nil, nil, nil, 104, nil, 105, nil, nil,
279
- nil, nil, nil, nil, nil, 131, nil, nil, nil, 193,
280
- nil, nil, 195, 140, 141, nil, nil, nil, 145, nil,
281
- nil, nil, 148, 200, nil, nil, nil, nil, nil, 203,
282
- 152, 153, nil, 155, 156, 157, nil, 159, 160, nil,
283
- 151, nil, 163, 164, 165, 166, 190, 167, nil, 171,
284
- nil, 172, nil, 173, nil, 174, 175, 176, 208, 178,
285
- 179, nil, nil, nil, nil, nil, nil, 183, nil, nil,
286
- nil, nil, 201, 202, nil, nil, 205, 192, nil, nil,
287
- nil, nil, nil, nil, 1, 197, 12, 13, 14, nil,
288
- nil, 198, 199, 43, nil, 45, nil, nil, nil, nil,
289
- 204, nil, 218, nil, nil, nil, nil, 209, nil, nil,
290
- nil, nil, 59, nil, 212, nil, nil, 64, nil, 214,
291
- 69, nil, nil, nil, nil, nil, nil, nil, nil, 219,
292
- nil, nil, nil, nil, 222, nil, 223, nil, 224, nil,
293
- nil, nil, nil, 225, 226 ]
275
+ 18, 31, 44, 93, 124, 9, 113, 183, 109, 150,
276
+ 2, 51, 184, 13, 14, 15, 88, 17, 97, 60,
277
+ 47, 45, 64, 92, 65, 174, 66, 71, 52, 68,
278
+ 69, 56, 57, 58, 155, 141, 102, 142, 80, 76,
279
+ 49, 81, 188, 55, 1, 67, 82, 210, 79, 70,
280
+ 77, 75, 184, 89, 219, 220, 162, 187, nil, 98,
281
+ nil, nil, 101, nil, 103, 104, nil, 105, nil, nil,
282
+ 106, nil, nil, nil, nil, 134, nil, nil, nil, nil,
283
+ nil, 195, nil, 143, 144, 197, nil, 148, nil, nil,
284
+ nil, nil, 151, nil, nil, nil, 203, nil, nil, 153,
285
+ nil, 206, 156, 157, nil, nil, 159, 193, 160, 161,
286
+ nil, 163, nil, nil, 164, 165, nil, 168, 169, nil,
287
+ 170, 171, nil, 175, 176, 211, nil, 177, 178, 179,
288
+ nil, 181, 182, 204, 205, nil, nil, 208, nil, 186,
289
+ nil, nil, nil, nil, 194, nil, nil, nil, nil, nil,
290
+ 198, nil, nil, nil, nil, nil, nil, nil, nil, 200,
291
+ nil, nil, nil, 221, 201, 202, nil, nil, nil, nil,
292
+ nil, nil, 207, nil, nil, nil, nil, nil, nil, 212,
293
+ nil, nil, nil, nil, nil, nil, nil, nil, 216, nil,
294
+ nil, 217, nil, nil, nil, nil, nil, 215, nil, nil,
295
+ nil, 222, nil, nil, nil, nil, 225, 226, nil, nil,
296
+ 227, nil, nil, nil, nil, 228, 229 ]
294
297
 
295
298
  racc_goto_check = [
296
- 3, 3, 5, 16, 40, 4, 13, 21, 11, 20,
297
- 15, 6, 33, 33, 3, 14, 33, 22, 23, 27,
298
- 3, 19, 3, 3, 3, 3, 28, 29, 32, 10,
299
- 36, 38, 1, 33, 3, 33, 41, 3, 42, 44,
300
- 47, nil, nil, 3, nil, nil, nil, 4, 3, 4,
301
- 15, 6, nil, nil, nil, 5, 11, nil, 3, 3,
302
- 5, nil, nil, nil, nil, 5, nil, 3, nil, nil,
303
- nil, nil, nil, nil, nil, 3, nil, nil, nil, 13,
304
- nil, nil, 13, 3, 3, nil, nil, nil, 3, nil,
305
- nil, nil, 3, 40, nil, nil, nil, nil, nil, 40,
306
- 3, 3, nil, 3, 3, 3, nil, 3, 3, nil,
307
- 4, nil, 3, 3, 3, 3, 19, 3, nil, 3,
308
- nil, 3, nil, 3, nil, 3, 3, 3, 16, 3,
309
- 3, nil, nil, nil, nil, nil, nil, 3, nil, nil,
310
- nil, nil, 19, 19, nil, nil, 19, 5, nil, nil,
311
- nil, nil, nil, nil, 2, 3, 2, 2, 2, nil,
312
- nil, 3, 3, 2, nil, 2, nil, nil, nil, nil,
313
- 3, nil, 19, nil, nil, nil, nil, 3, nil, nil,
314
- nil, nil, 2, nil, 3, nil, nil, 2, nil, 3,
315
- 2, nil, nil, nil, nil, nil, nil, nil, nil, 3,
316
- nil, nil, nil, nil, 3, nil, 3, nil, 3, nil,
317
- nil, nil, nil, 3, 3 ]
299
+ 3, 5, 3, 16, 40, 4, 11, 15, 13, 21,
300
+ 2, 3, 6, 2, 2, 2, 19, 2, 20, 3,
301
+ 4, 2, 3, 14, 3, 22, 3, 23, 33, 3,
302
+ 3, 33, 33, 33, 11, 27, 28, 29, 3, 32,
303
+ 10, 3, 36, 38, 1, 2, 3, 15, 4, 2,
304
+ 33, 2, 6, 3, 41, 42, 44, 47, nil, 5,
305
+ nil, nil, 5, nil, 3, 3, nil, 5, nil, nil,
306
+ 3, nil, nil, nil, nil, 3, nil, nil, nil, nil,
307
+ nil, 13, nil, 3, 3, 13, nil, 3, nil, nil,
308
+ nil, nil, 3, nil, nil, nil, 40, nil, nil, 3,
309
+ nil, 40, 3, 3, nil, nil, 3, 19, 3, 3,
310
+ nil, 3, nil, nil, 3, 3, nil, 3, 3, nil,
311
+ 3, 3, nil, 3, 3, 16, nil, 3, 3, 3,
312
+ nil, 3, 3, 19, 19, nil, nil, 19, nil, 3,
313
+ nil, nil, nil, nil, 3, nil, nil, nil, nil, nil,
314
+ 3, nil, nil, nil, nil, nil, nil, nil, nil, 3,
315
+ nil, nil, nil, 19, 3, 3, nil, nil, nil, nil,
316
+ nil, nil, 3, nil, nil, nil, nil, nil, nil, 3,
317
+ nil, nil, nil, nil, nil, nil, nil, nil, 3, nil,
318
+ nil, 3, nil, nil, nil, nil, nil, 4, nil, nil,
319
+ nil, 3, nil, nil, nil, nil, 3, 5, nil, nil,
320
+ 3, nil, nil, nil, nil, 3, 3 ]
318
321
 
319
322
  racc_goto_pointer = [
320
- nil, 32, 154, -7, 4, -4, -130, nil, nil, nil,
321
- -11, -97, nil, -73, -43, -131, -55, nil, nil, -32,
322
- -53, -91, -108, -17, nil, nil, nil, -69, -42, -61,
323
- nil, nil, -9, -4, nil, nil, -115, nil, 13, nil,
324
- -77, -167, -165, nil, -74, nil, nil, -105 ]
323
+ nil, 44, 10, -8, 3, -8, -132, nil, nil, nil,
324
+ 22, -75, nil, -72, -41, -137, -61, nil, nil, -44,
325
+ -48, -88, -105, -13, nil, nil, nil, -54, -35, -52,
326
+ nil, nil, -3, 8, nil, nil, -106, nil, 22, nil,
327
+ -78, -152, -151, nil, -62, nil, nil, -91 ]
325
328
 
326
329
  racc_goto_default = [
327
- nil, nil, nil, 83, nil, nil, 28, 33, 36, 9,
328
- 110, nil, 11, nil, nil, nil, 149, 93, 32, nil,
329
- nil, nil, nil, nil, 113, 85, 21, 23, 26, 30,
330
- 35, 37, nil, 38, 39, 16, nil, 20, 117, 86,
331
- nil, nil, nil, 125, 127, 129, 17, nil ]
330
+ nil, nil, nil, 85, nil, nil, 35, 39, 41, 11,
331
+ 111, nil, 7, nil, nil, nil, 112, 94, 38, nil,
332
+ nil, nil, nil, nil, 118, 86, 27, 29, 33, 37,
333
+ 40, 42, nil, 43, 20, 23, nil, 25, 121, 87,
334
+ nil, nil, nil, 130, 133, 115, 24, nil ]
332
335
 
333
336
  racc_token_table = {
334
337
  false => 0,
@@ -372,11 +375,12 @@ racc_token_table = {
372
375
  "[" => 38,
373
376
  "]" => 39,
374
377
  ")" => 40,
375
- "=" => 41 }
378
+ "=" => 41,
379
+ :IDEN => 42 }
376
380
 
377
381
  racc_use_result_var = true
378
382
 
379
- racc_nt_base = 42
383
+ racc_nt_base = 43
380
384
 
381
385
  Racc_arg = [
382
386
  racc_action_table,
@@ -437,6 +441,7 @@ Racc_token_to_s_table = [
437
441
  '"]"',
438
442
  '")"',
439
443
  '"="',
444
+ 'IDEN',
440
445
  '$start',
441
446
  'stylesheet',
442
447
  's_cdo_cdc_0toN',
@@ -14,7 +14,7 @@ module CSS
14
14
  module SAC
15
15
  class Parser < CSS::SAC::GeneratedParser
16
16
  # The version of CSSPool you're using
17
- VERSION = '0.2.4'
17
+ VERSION = '0.2.5'
18
18
 
19
19
  TOKENIZER = Tokenizer.new
20
20
 
@@ -119,8 +119,8 @@ module CSS
119
119
  tokens = []
120
120
  pos = 0
121
121
 
122
- comments = input_data.scan(/\/\*[^*]*\*+\//m)
123
- non_comments = input_data.split(/\/\*[^*]*\*+\//m)
122
+ comments = input_data.scan(/\/\*.*\*\//m)
123
+ non_comments = input_data.split(/\/\*.*\*\//m)
124
124
 
125
125
  # Handle a small edge case, if our CSS is *only* comments,
126
126
  # the split, zip, scan trick won't work
data/lib/parser.y CHANGED
@@ -6,7 +6,7 @@ token IMPORTANT_SYM IMPORT_SYM MEDIA_SYM PAGE_SYM CHARSET_SYM DIMENSION
6
6
 
7
7
  rule
8
8
  stylesheet
9
- : s_cdo_cdc_0toN CHARSET_SYM s_0toN STRING ';' import_0toN ruleset_media_page_0toN
9
+ : s_cdo_cdc_0toN CHARSET_SYM s_0toN STRING s_0toN ';' s_0toN import_0toN ruleset_media_page_0toN
10
10
  | s_cdo_cdc_0toN import_0toN ruleset_media_page_0toN
11
11
  ;
12
12
  ruleset_media_page_0toN
@@ -24,7 +24,7 @@ rule
24
24
  }
25
25
  ;
26
26
  ignorable_at
27
- : '@' IDENT s_0toN string_uri_or_ident_1toN s_0toN medium_0toN ';' s_0toN {
27
+ : '@' IDENT s_0toN string_uri_or_ident_1toN medium_0toN ';' s_0toN {
28
28
  self.document_handler.ignorable_at_rule(val[1])
29
29
  }
30
30
  | '@' IDENT s_0toN error S {
@@ -281,8 +281,8 @@ rule
281
281
  string_uri_or_ident_1toN
282
282
  : string_or_uri s_0toN string_uri_or_ident_1toN
283
283
  | IDENT s_0toN string_uri_or_ident_1toN
284
- | IDENT
285
- | string_or_uri
284
+ | IDEN s_0toN
285
+ | string_or_uri s_0toN
286
286
  ;
287
287
  s_cdo_cdc_0toN
288
288
  : S s_cdo_cdc_0toN
@@ -302,6 +302,7 @@ end
302
302
  ---- header
303
303
  require "css/sac/conditions"
304
304
  require "css/sac/selectors"
305
-
305
+
306
+ ---- inner
306
307
  include CSS::SAC::Conditions
307
308
  include CSS::SAC::Selectors
@@ -26,7 +26,7 @@ class ConditionalSelectorTest < SelectorTestCase
26
26
  end
27
27
 
28
28
  def test_equals_tilde
29
- attribute = AttributeCondition.new('class', 'foo', true)
29
+ attribute = CSS::SAC::Conditions::AttributeCondition.new('class', 'foo', true)
30
30
  div = ElementSelector.new('div')
31
31
  sel = ConditionalSelector.new(div, attribute)
32
32
 
@@ -99,9 +99,12 @@ class TokenizerTest < Test::Unit::TestCase
99
99
  :IDENT, :LBRACE, :IDENT, :delim, [:IDENT, "pink"], :delim, :delim)
100
100
  end
101
101
 
102
+ def test_comment_with_an_asterisk_in_it
103
+ assert_tokens("/* * */", :COMMENT)
104
+ end
105
+
102
106
  def assert_tokens(text, *expected)
103
107
  tokens = @tokenizer.tokenize(text).reject { |t| t.name == :S }
104
- # puts tokens.collect { |t| [t.name, t.value].inspect }.join(",\n")
105
108
 
106
109
  assert_equal(expected.size, tokens.size)
107
110
 
metadata CHANGED
@@ -1,33 +1,36 @@
1
1
  --- !ruby/object:Gem::Specification
2
- rubygems_version: 0.9.4
3
- specification_version: 1
4
2
  name: csspool
5
3
  version: !ruby/object:Gem::Version
6
- version: 0.2.4
7
- date: 2007-12-06 00:00:00 -08:00
8
- summary: Parses CSS
9
- require_paths:
10
- - lib
11
- email: aaronp@rubyforge.org
12
- homepage: http://csspool.rubyforge.org/
13
- rubyforge_project: csspool
14
- description: CSSpool (pronounced "cesspool") is a validating SAC parser for CSS. The parser calls methods on a document handler depending on what it has found. CSSPool currently only supports CSS 2.1. CSSPool will not yield invalid properties or selectors.
15
- autorequire:
16
- default_executable:
17
- bindir: bin
18
- has_rdoc: true
19
- required_ruby_version: !ruby/object:Gem::Version::Requirement
20
- requirements:
21
- - - ">"
22
- - !ruby/object:Gem::Version
23
- version: 0.0.0
24
- version:
4
+ version: 0.2.5
25
5
  platform: ruby
26
- signing_key:
27
- cert_chain:
28
- post_install_message:
29
6
  authors:
30
7
  - Aaron Patterson
8
+ autorequire:
9
+ bindir: bin
10
+ cert_chain: []
11
+
12
+ date: 2008-04-09 00:00:00 -07:00
13
+ default_executable:
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
16
+ name: hoe
17
+ version_requirement:
18
+ version_requirements: !ruby/object:Gem::Requirement
19
+ requirements:
20
+ - - ">="
21
+ - !ruby/object:Gem::Version
22
+ version: 1.5.1
23
+ version:
24
+ description: CSSpool (pronounced "cesspool") is a validating SAC parser for CSS. The parser calls methods on a document handler depending on what it has found. CSSPool currently only supports CSS 2.1. CSSPool will not yield invalid properties or selectors.
25
+ email: aaronp@rubyforge.org
26
+ executables: []
27
+
28
+ extensions: []
29
+
30
+ extra_rdoc_files:
31
+ - CHANGELOG.txt
32
+ - Manifest.txt
33
+ - README.txt
31
34
  files:
32
35
  - CHANGELOG.txt
33
36
  - Manifest.txt
@@ -107,28 +110,32 @@ files:
107
110
  - test/test_token.rb
108
111
  - test/test_tokenizer.rb
109
112
  - test/test_xpath.rb
110
- test_files:
111
- - test/test_all.rb
113
+ has_rdoc: true
114
+ homepage: http://csspool.rubyforge.org/
115
+ post_install_message:
112
116
  rdoc_options:
113
117
  - --main
114
118
  - README.txt
115
- extra_rdoc_files:
116
- - CHANGELOG.txt
117
- - Manifest.txt
118
- - README.txt
119
- executables: []
120
-
121
- extensions: []
122
-
119
+ require_paths:
120
+ - lib
121
+ required_ruby_version: !ruby/object:Gem::Requirement
122
+ requirements:
123
+ - - ">="
124
+ - !ruby/object:Gem::Version
125
+ version: "0"
126
+ version:
127
+ required_rubygems_version: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - ">="
130
+ - !ruby/object:Gem::Version
131
+ version: "0"
132
+ version:
123
133
  requirements: []
124
134
 
125
- dependencies:
126
- - !ruby/object:Gem::Dependency
127
- name: hoe
128
- version_requirement:
129
- version_requirements: !ruby/object:Gem::Version::Requirement
130
- requirements:
131
- - - ">="
132
- - !ruby/object:Gem::Version
133
- version: 1.3.0
134
- version:
135
+ rubyforge_project: csspool
136
+ rubygems_version: 1.1.0
137
+ signing_key:
138
+ specification_version: 2
139
+ summary: Parses CSS
140
+ test_files:
141
+ - test/test_all.rb