csspool 4.0.0 → 4.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.rdoc +7 -0
  3. data/lib/csspool.rb +1 -1
  4. data/lib/csspool/css/parser.rb +243 -243
  5. data/lib/csspool/css/parser.y +4 -4
  6. data/lib/csspool/css/tokenizer.rb +1 -1
  7. data/lib/csspool/css/tokenizer.rex +1 -1
  8. data/test/test_selector.rb +8 -0
  9. data/test/test_term.rb +20 -0
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 78a85df3fe179c10647db55fdae56a52458d191c
4
- data.tar.gz: 316c13064d6a93280dc4a2ab4b785ddc2e62607f
3
+ metadata.gz: 2edaf241ac15154d1007cc6747bc2bf7f0919e5a
4
+ data.tar.gz: bd3761d5763d6816e23754a33a1e1ffd6cdaf7a3
5
5
  SHA512:
6
- metadata.gz: d472fdf6210e101fde9d8a1c21c5ec10229f8587f06e20878c08d337748e0a671eadeb66d82503739f54c3c32d62670d46824656987d7a3e05422e719d2120be
7
- data.tar.gz: 1a96b768e988dc4330cefa5bb51dfe108771204c28e9b8c64be4983d7f4c925368b2c100331b6cca9991328e4b34ff3bfc46156be6d49b4bee2c052ea0d79fa4
6
+ metadata.gz: 4f2a15925fabb99849a678db5b2e2ae381ce527805bade0189e11af3b21a4e85a0e0c8f543ac54aeb0b21869d12d70f5bc99274bda24f531b260aeaf0be4058b
7
+ data.tar.gz: 57af47ae9195945855b92b377f9df39eb6c70ab7d6594b7a88264a9a9f36fa3016a4e5cc44ec6ed857a522aec99629a61843f0a214b74fb011165af53cde160e
data/CHANGELOG.rdoc CHANGED
@@ -1,3 +1,10 @@
1
+ == 4.0.1
2
+
3
+ * Bugfixes
4
+
5
+ * Update parsing for calc
6
+ * Update parsing for Mozilla-specific pseudo elements
7
+
1
8
  == 4.0.0
2
9
 
3
10
  * New Features
data/lib/csspool.rb CHANGED
@@ -13,7 +13,7 @@ require 'csspool/visitors'
13
13
  require 'csspool/collection'
14
14
 
15
15
  module CSSPool
16
- VERSION = "4.0.0"
16
+ VERSION = "4.0.1"
17
17
 
18
18
  def self.CSS doc
19
19
  CSSPool::CSS::Document.parse doc
data/lib/csspool/css/parser.rb CHANGED
@@ -81,191 +81,190 @@ end
81
81
 
82
82
  racc_action_table = [
83
83
  9, 10, 136, 112, 37, 31, 102, 138, 113, 39,
84
- 45, 47, 224, 333, 55, 9, 10, 225, 301, 37,
84
+ 45, 47, 128, 332, 3, 9, 10, 129, 198, 37,
85
85
  31, 45, 47, 37, 39, 45, 47, 103, 39, 45,
86
- 47, 20, 128, 37, 31, 219, 23, 237, 39, 45,
87
- 47, 56, 128, 27, 334, 11, 20, 129, 48, 25,
86
+ 47, 20, 162, 37, 199, 219, 23, 237, 39, 45,
87
+ 47, 107, 112, 27, 333, 11, 20, 113, 48, 25,
88
88
  114, 23, 137, 29, 38, 46, 107, 112, 27, 48,
89
- 11, 210, 113, 48, 25, 246, 46, 48, 29, 38,
89
+ 11, 117, 113, 48, 25, 55, 46, 48, 29, 38,
90
90
  46, 9, 10, 38, 46, 37, 31, 48, 218, 238,
91
- 39, 45, 47, 38, 46, 240, 9, 10, 107, 112,
92
- 37, 31, 198, 106, 113, 39, 45, 47, 239, 91,
93
- 45, 47, 20, 228, 114, 37, 31, 23, 199, 86,
94
- 39, 45, 47, 226, 27, 93, 11, 20, 227, 48,
95
- 25, 55, 23, 59, 29, 38, 46, 196, 221, 27,
96
- -27, 11, 20, 220, 48, 25, 114, 23, 48, 29,
97
- 38, 46, 74, 197, 27, 46, 37, 252, 56, 48,
98
- 25, 39, 45, 47, 29, 38, 46, 37, 73, 72,
99
- 37, 31, 39, 45, 47, 39, 45, 47, 37, 247,
100
- 156, 157, 248, 39, 45, 47, 253, 107, 107, 112,
101
- 107, 112, 102, 117, 113, -87, 113, 20, 37, 31,
102
- 48, 107, 23, 39, 45, 47, 38, 46, 196, 27,
103
- 294, 48, 293, 103, 48, 25, 154, 38, 46, 29,
104
- 38, 46, 48, 260, 197, 20, 37, 31, 38, 46,
105
- 23, 39, 45, 47, 37, 63, 114, 27, 114, 39,
106
- 45, 47, 48, 25, 198, 37, 168, 29, 38, 46,
107
- 39, 45, 47, 20, 261, 167, 45, 47, 23, 262,
108
- 199, 20, 107, 112, 214, 27, 23, 122, 113, 82,
109
- 48, 25, 249, 27, 150, 29, 38, 46, 48, 25,
110
- 84, 123, 124, 29, 38, 46, 37, 31, 83, 48,
111
- 76, 39, 45, 47, 48, 38, 46, 37, 31, 309,
112
- 125, 46, 39, 45, 47, 45, 47, 45, 47, 82,
113
- 114, 310, 55, 20, 307, 154, 213, 308, 23, 91,
114
- 84, 112, 205, 102, 91, 27, 113, 97, 83, 91,
115
- 48, 25, 292, 91, 291, 29, 38, 46, 184, 56,
116
- 59, 48, 91, 48, 103, 48, 183, 38, 46, 93,
117
- 46, 212, 46, 74, 82, 152, 193, 150, 186, 192,
118
- 188, 187, 189, 190, 191, 84, 211, 274, 114, 73,
119
- 72, 140, 290, 184, 289, 59, 281, 236, 230, 231,
120
- 232, 183, 285, 169, 286, 142, 275, 179, 182, 82,
121
- 288, 193, 287, 186, 192, 188, 187, 189, 190, 191,
122
- 84, 284, 144, 283, 233, 234, 235, 207, 184, 143,
123
- 59, 145, 277, 146, 91, 141, 183, 195, 169, 149,
124
- 151, 150, 179, 182, 82, 194, 193, 282, 186, 192,
125
- 188, 187, 189, 190, 191, 84, 224, 226, 168, 167,
126
- 166, 165, 164, 184, 163, 59, 246, 255, 296, 297,
127
- 298, 183, 299, 169, 257, 300, 229, 179, 182, 82,
128
- 302, 193, 256, 186, 192, 188, 187, 189, 190, 191,
129
- 84, 252, 74, 162, 162, 167, 306, 159, 184, 155,
130
- 59, 317, 147, 312, 314, 135, 183, 130, 169, 318,
131
- 319, 320, 179, 182, 82, 321, 193, 322, 186, 192,
132
- 188, 187, 189, 190, 191, 84, 323, 324, 325, 326,
133
- 327, 328, 329, 184, 330, 59, 127, 246, 120, 162,
134
- 119, 183, 115, 169, 104, 53, 340, 179, 182, 82,
135
- 314, 193, 314, 186, 192, 188, 187, 189, 190, 191,
136
- 84, 49, 162, 314, 3, 347, nil, nil, 184, nil,
137
- 59, nil, nil, nil, nil, nil, 183, nil, 169, nil,
138
- nil, nil, 179, 182, 82, nil, 193, nil, 186, 192,
139
- 188, 187, 189, 190, 191, 84, nil, nil, nil, nil,
91
+ 39, 45, 47, 38, 46, 55, 9, 10, 154, 114,
92
+ 37, 31, 56, 37, 82, 39, 45, 47, 39, 45,
93
+ 47, 224, 20, 37, 114, 84, 225, 23, 39, 45,
94
+ 47, 74, 56, 83, 27, 102, 11, 20, -87, 48,
95
+ 25, 292, 23, 291, 29, 38, 46, 73, 72, 27,
96
+ 337, 11, 107, 112, 48, 25, 103, 48, 113, 29,
97
+ 38, 46, 338, 38, 46, 37, 31, 48, 45, 47,
98
+ 39, 45, 47, 38, 46, 37, 31, 128, 37, 31,
99
+ 39, 45, 47, 39, 45, 47, 240, 196, 196, 226,
100
+ 37, 55, 91, 59, 227, 39, 45, 47, 245, 239,
101
+ 114, 246, 20, 197, 197, 20, 48, 23, 93, 48,
102
+ 23, 45, 47, 46, 27, 38, 46, 27, 56, 48,
103
+ 25, 228, 48, 25, 29, 38, 46, 29, 38, 46,
104
+ 37, 31, 198, 221, 48, 39, 45, 47, 37, 31,
105
+ 38, 46, 86, 39, 45, 47, 37, 31, 199, 48,
106
+ 76, 39, 45, 47, 37, 31, 46, 20, 250, 39,
107
+ 45, 47, 23, 156, 157, 20, 107, 112, 251, 27,
108
+ 23, 106, 113, 20, 48, 25, 220, 27, 23, 29,
109
+ 38, 46, 48, 25, 152, 27, 150, 29, 38, 46,
110
+ 48, 25, 45, 47, 107, 29, 38, 46, 48, 154,
111
+ 258, 37, 63, 122, 38, 46, 39, 45, 47, 168,
112
+ 107, 112, 82, 259, 114, 210, 113, 123, 124, 167,
113
+ 112, 205, 102, 84, 306, 113, 97, 307, 20, 260,
114
+ 48, 83, 91, 23, 45, 47, 125, 46, 107, 184,
115
+ 27, 59, 247, 103, 150, 48, 25, 183, 93, 214,
116
+ 29, 38, 46, 91, 181, 82, 91, 193, 114, 186,
117
+ 192, 188, 187, 189, 190, 191, 84, 114, 288, 162,
118
+ 287, 91, 48, -32, 184, -27, 59, 91, 286, 46,
119
+ 285, 290, 183, 289, 169, -32, 213, 74, 179, 182,
120
+ 82, 283, 193, 284, 186, 192, 188, 187, 189, 190,
121
+ 191, 84, 212, 73, 72, 149, 151, 150, 282, 184,
122
+ 281, 59, 236, 230, 231, 232, 272, 183, 273, 169,
123
+ 211, 275, 207, 179, 182, 82, 91, 193, 195, 186,
124
+ 192, 188, 187, 189, 190, 191, 84, 280, 224, 233,
125
+ 234, 235, 140, 226, 184, 194, 59, 279, 168, 167,
126
+ 166, 165, 183, 164, 169, 162, 142, 294, 179, 182,
127
+ 82, 295, 193, 296, 186, 192, 188, 187, 189, 190,
128
+ 191, 84, 297, 144, 300, 301, 250, 74, 162, 184,
129
+ 143, 59, 145, 253, 146, 163, 141, 183, 167, 169,
130
+ 255, 305, 162, 179, 182, 82, 159, 193, 254, 186,
131
+ 192, 188, 187, 189, 190, 191, 84, 229, 310, 312,
132
+ 155, 147, 316, 317, 184, 318, 59, 315, 319, 320,
133
+ 321, 322, 183, 323, 169, 324, 325, 326, 179, 182,
134
+ 82, 327, 193, 300, 186, 192, 188, 187, 189, 190,
135
+ 191, 84, 135, 162, 331, 130, 162, 127, 120, 184,
136
+ 119, 59, 339, 312, 312, 115, 162, 183, 344, 169,
137
+ 300, 162, 104, 179, 182, 82, 53, 193, 312, 186,
138
+ 192, 188, 187, 189, 190, 191, 84, 350, 49, 352,
140
139
  nil, nil, nil, nil, 184, nil, 59, nil, nil, nil,
141
- nil, nil, 183, 169, nil, nil, nil, 179, 182, 181,
140
+ nil, nil, 183, nil, 169, nil, nil, nil, 179, 182,
142
141
  82, nil, 193, nil, 186, 192, 188, 187, 189, 190,
143
- 191, 84, 268, nil, 82, nil, 193, nil, 186, 192,
142
+ 191, 84, 266, nil, 82, nil, 193, nil, 186, 192,
144
143
  188, 187, 189, 190, 191, nil, nil, nil, nil, 169,
145
- nil, nil, nil, 179, 182, 268, nil, 82, nil, 193,
146
- nil, 186, 192, 188, 187, 189, 190, 191, 268, nil,
144
+ nil, nil, nil, 179, 182, 266, nil, 82, nil, 193,
145
+ nil, 186, 192, 188, 187, 189, 190, 191, 266, nil,
147
146
  82, nil, 193, nil, 186, 192, 188, 187, 189, 190,
148
- 191, 268, nil, 82, nil, 193, nil, 186, 192, 188,
149
- 187, 189, 190, 191, 268, nil, 82, nil, 193, nil,
150
- 186, 192, 188, 187, 189, 190, 191, 268, nil, 82,
147
+ 191, 266, nil, 82, nil, 193, nil, 186, 192, 188,
148
+ 187, 189, 190, 191, 266, nil, 82, nil, 193, nil,
149
+ 186, 192, 188, 187, 189, 190, 191, 266, nil, 82,
151
150
  nil, 193, nil, 186, 192, 188, 187, 189, 190, 191,
152
151
  193, nil, 186, 192, 188, 187, 189, 190, 191 ]
153
152
 
154
153
  racc_action_check = [
155
154
  2, 2, 47, 205, 2, 2, 212, 47, 205, 2,
156
- 2, 2, 127, 304, 10, 7, 7, 127, 246, 7,
157
- 7, 41, 41, 121, 7, 7, 7, 212, 121, 121,
158
- 121, 2, 137, 63, 63, 111, 2, 141, 63, 63,
159
- 63, 10, 38, 2, 304, 2, 7, 38, 2, 2,
160
- 205, 7, 47, 2, 2, 2, 99, 99, 7, 41,
161
- 7, 99, 99, 7, 7, 146, 41, 121, 7, 7,
162
- 7, 6, 6, 121, 121, 6, 6, 63, 111, 141,
163
- 6, 6, 6, 63, 63, 142, 5, 5, 28, 28,
164
- 5, 5, 202, 28, 28, 5, 5, 5, 142, 25,
165
- 44, 44, 6, 136, 99, 24, 24, 6, 202, 24,
166
- 24, 24, 24, 130, 6, 25, 6, 5, 130, 6,
167
- 6, 11, 5, 11, 6, 6, 6, 89, 116, 5,
168
- 20, 5, 24, 113, 5, 5, 28, 24, 44, 5,
169
- 5, 5, 20, 89, 24, 44, 120, 160, 11, 24,
170
- 24, 120, 120, 120, 24, 24, 24, 298, 20, 20,
171
- 12, 12, 298, 298, 298, 12, 12, 12, 145, 148,
172
- 69, 69, 148, 145, 145, 145, 161, 108, 30, 30,
173
- 216, 216, 98, 30, 30, 98, 216, 12, 13, 13,
174
- 120, 107, 12, 13, 13, 13, 120, 120, 201, 12,
175
- 235, 298, 235, 98, 12, 12, 171, 298, 298, 12,
176
- 12, 12, 145, 173, 201, 13, 14, 14, 145, 145,
177
- 13, 14, 14, 14, 19, 19, 30, 13, 216, 19,
178
- 19, 19, 13, 13, 90, 143, 174, 13, 13, 13,
179
- 143, 143, 143, 14, 175, 177, 43, 43, 14, 180,
180
- 90, 19, 109, 109, 105, 14, 19, 34, 109, 22,
181
- 14, 14, 153, 19, 153, 14, 14, 14, 19, 19,
182
- 22, 34, 34, 19, 19, 19, 21, 21, 22, 143,
183
- 21, 21, 21, 21, 43, 143, 143, 31, 31, 266,
184
- 34, 43, 31, 31, 31, 35, 35, 42, 42, 165,
185
- 109, 266, 58, 21, 265, 58, 104, 265, 21, 196,
186
- 165, 91, 91, 26, 197, 21, 91, 26, 165, 198,
187
- 21, 21, 234, 91, 234, 21, 21, 21, 258, 58,
188
- 258, 31, 199, 35, 26, 42, 258, 31, 31, 91,
189
- 35, 101, 42, 156, 258, 57, 258, 57, 258, 258,
190
- 258, 258, 258, 258, 258, 258, 100, 203, 91, 156,
191
- 156, 48, 233, 218, 233, 218, 218, 139, 139, 139,
192
- 139, 218, 231, 258, 231, 48, 204, 258, 258, 218,
193
- 232, 218, 232, 218, 218, 218, 218, 218, 218, 218,
194
- 218, 230, 48, 230, 139, 139, 139, 96, 281, 48,
195
- 281, 48, 209, 48, 93, 48, 281, 87, 218, 54,
196
- 54, 54, 218, 218, 281, 85, 281, 219, 281, 281,
197
- 281, 281, 281, 281, 281, 281, 228, 229, 81, 80,
198
- 79, 78, 77, 170, 75, 170, 238, 170, 240, 241,
199
- 242, 170, 243, 281, 170, 244, 138, 281, 281, 170,
200
- 248, 170, 170, 170, 170, 170, 170, 170, 170, 170,
201
- 170, 251, 252, 253, 74, 263, 264, 70, 282, 66,
202
- 282, 282, 53, 276, 280, 46, 282, 39, 170, 283,
203
- 284, 285, 170, 170, 282, 286, 282, 287, 282, 282,
204
- 282, 282, 282, 282, 282, 282, 288, 289, 290, 291,
205
- 292, 293, 294, 317, 295, 317, 37, 301, 33, 306,
206
- 32, 317, 29, 282, 27, 9, 311, 282, 282, 317,
207
- 315, 317, 316, 317, 317, 317, 317, 317, 317, 317,
208
- 317, 3, 334, 343, 1, 346, nil, nil, 344, nil,
209
- 344, nil, nil, nil, nil, nil, 344, nil, 317, nil,
210
- nil, nil, 317, 317, 344, nil, 344, nil, 344, 344,
211
- 344, 344, 344, 344, 344, 344, nil, nil, nil, nil,
212
- nil, nil, nil, nil, 82, nil, 82, nil, nil, nil,
213
- nil, nil, 82, 344, nil, nil, nil, 344, 344, 82,
214
- 82, nil, 82, nil, 82, 82, 82, 82, 82, 82,
215
- 82, 82, 307, nil, 307, nil, 307, nil, 307, 307,
216
- 307, 307, 307, 307, 307, nil, nil, nil, nil, 82,
217
- nil, nil, nil, 82, 82, 308, nil, 308, nil, 308,
218
- nil, 308, 308, 308, 308, 308, 308, 308, 309, nil,
219
- 309, nil, 309, nil, 309, 309, 309, 309, 309, 309,
220
- 309, 310, nil, 310, nil, 310, nil, 310, 310, 310,
221
- 310, 310, 310, 310, 268, nil, 268, nil, 268, nil,
222
- 268, 268, 268, 268, 268, 268, 268, 182, nil, 182,
223
- nil, 182, nil, 182, 182, 182, 182, 182, 182, 182,
155
+ 2, 2, 38, 303, 1, 7, 7, 38, 90, 7,
156
+ 7, 42, 42, 120, 7, 7, 7, 212, 120, 120,
157
+ 120, 2, 146, 143, 90, 111, 2, 141, 143, 143,
158
+ 143, 109, 109, 2, 303, 2, 7, 109, 2, 2,
159
+ 205, 7, 47, 2, 2, 2, 30, 30, 7, 42,
160
+ 7, 30, 30, 7, 7, 10, 42, 120, 7, 7,
161
+ 7, 6, 6, 120, 120, 6, 6, 143, 111, 141,
162
+ 6, 6, 6, 143, 143, 58, 5, 5, 58, 109,
163
+ 5, 5, 10, 145, 165, 5, 5, 5, 145, 145,
164
+ 145, 127, 6, 121, 30, 165, 127, 6, 121, 121,
165
+ 121, 156, 58, 165, 6, 98, 6, 5, 98, 6,
166
+ 6, 235, 5, 235, 6, 6, 6, 156, 156, 5,
167
+ 308, 5, 216, 216, 5, 5, 98, 145, 216, 5,
168
+ 5, 5, 308, 145, 145, 31, 31, 121, 44, 44,
169
+ 31, 31, 31, 121, 121, 12, 12, 137, 13, 13,
170
+ 12, 12, 12, 13, 13, 13, 142, 201, 89, 130,
171
+ 296, 11, 25, 11, 130, 296, 296, 296, 148, 142,
172
+ 216, 148, 12, 201, 89, 13, 44, 12, 25, 31,
173
+ 13, 35, 35, 44, 12, 31, 31, 13, 11, 12,
174
+ 12, 136, 13, 13, 12, 12, 12, 13, 13, 13,
175
+ 14, 14, 202, 116, 296, 14, 14, 14, 24, 24,
176
+ 296, 296, 24, 24, 24, 24, 21, 21, 202, 35,
177
+ 21, 21, 21, 21, 63, 63, 35, 14, 160, 63,
178
+ 63, 63, 14, 69, 69, 24, 28, 28, 161, 14,
179
+ 24, 28, 28, 21, 14, 14, 113, 24, 21, 14,
180
+ 14, 14, 24, 24, 57, 21, 57, 24, 24, 24,
181
+ 21, 21, 41, 41, 108, 21, 21, 21, 63, 171,
182
+ 173, 19, 19, 34, 63, 63, 19, 19, 19, 174,
183
+ 99, 99, 22, 175, 28, 99, 99, 34, 34, 177,
184
+ 91, 91, 26, 22, 263, 91, 26, 263, 19, 180,
185
+ 41, 22, 91, 19, 43, 43, 34, 41, 107, 82,
186
+ 19, 82, 153, 26, 153, 19, 19, 82, 91, 105,
187
+ 19, 19, 19, 196, 82, 82, 197, 82, 99, 82,
188
+ 82, 82, 82, 82, 82, 82, 82, 91, 233, 264,
189
+ 233, 198, 43, 264, 256, 20, 256, 199, 232, 43,
190
+ 232, 234, 256, 234, 82, 264, 104, 20, 82, 82,
191
+ 256, 231, 256, 231, 256, 256, 256, 256, 256, 256,
192
+ 256, 256, 101, 20, 20, 54, 54, 54, 230, 279,
193
+ 230, 279, 139, 139, 139, 139, 203, 279, 204, 256,
194
+ 100, 209, 96, 256, 256, 279, 93, 279, 87, 279,
195
+ 279, 279, 279, 279, 279, 279, 279, 219, 228, 139,
196
+ 139, 139, 48, 229, 218, 85, 218, 218, 81, 80,
197
+ 79, 78, 218, 77, 279, 238, 48, 240, 279, 279,
198
+ 218, 241, 218, 242, 218, 218, 218, 218, 218, 218,
199
+ 218, 218, 243, 48, 244, 246, 249, 250, 251, 170,
200
+ 48, 170, 48, 170, 48, 75, 48, 170, 261, 218,
201
+ 170, 262, 74, 218, 218, 170, 70, 170, 170, 170,
202
+ 170, 170, 170, 170, 170, 170, 170, 138, 274, 278,
203
+ 66, 53, 281, 282, 280, 283, 280, 280, 284, 285,
204
+ 286, 287, 280, 288, 170, 289, 290, 291, 170, 170,
205
+ 280, 292, 280, 293, 280, 280, 280, 280, 280, 280,
206
+ 280, 280, 46, 298, 300, 39, 305, 37, 33, 346,
207
+ 32, 346, 309, 313, 314, 29, 328, 346, 330, 280,
208
+ 331, 333, 27, 280, 280, 346, 9, 346, 342, 346,
209
+ 346, 346, 346, 346, 346, 346, 346, 343, 3, 351,
210
+ nil, nil, nil, nil, 315, nil, 315, nil, nil, nil,
211
+ nil, nil, 315, nil, 346, nil, nil, nil, 346, 346,
212
+ 315, nil, 315, nil, 315, 315, 315, 315, 315, 315,
213
+ 315, 315, 337, nil, 337, nil, 337, nil, 337, 337,
214
+ 337, 337, 337, 337, 337, nil, nil, nil, nil, 315,
215
+ nil, nil, nil, 315, 315, 307, nil, 307, nil, 307,
216
+ nil, 307, 307, 307, 307, 307, 307, 307, 338, nil,
217
+ 338, nil, 338, nil, 338, 338, 338, 338, 338, 338,
218
+ 338, 306, nil, 306, nil, 306, nil, 306, 306, 306,
219
+ 306, 306, 306, 306, 182, nil, 182, nil, 182, nil,
220
+ 182, 182, 182, 182, 182, 182, 182, 266, nil, 266,
221
+ nil, 266, nil, 266, 266, 266, 266, 266, 266, 266,
224
222
  185, nil, 185, 185, 185, 185, 185, 185, 185 ]
225
223
 
226
224
  racc_action_pointer = [
227
- nil, 534, -2, 531, nil, 84, 69, 13, nil, 511,
228
- 10, 117, 154, 182, 210, nil, nil, nil, nil, 218,
229
- 124, 270, 239, nil, 99, 81, 307, 508, 83, 503,
230
- 173, 281, 501, 500, 250, 283, nil, 450, 36, 421,
231
- nil, 9, 285, 234, 88, nil, 469, -4, 355, nil,
232
- nil, nil, nil, 467, 404, nil, nil, 340, 298, nil,
233
- nil, nil, nil, 27, nil, nil, 459, nil, nil, 162,
234
- 461, nil, nil, nil, 457, 424, nil, 423, 423, 423,
235
- 422, 421, 570, nil, nil, 405, nil, 398, nil, 91,
236
- 198, 305, nil, 386, nil, nil, 387, nil, 176, 51,
237
- 347, 333, nil, nil, 297, 244, nil, 186, 172, 247,
238
- nil, 28, nil, 127, nil, nil, 118, nil, nil, nil,
239
- 140, 17, nil, nil, nil, nil, nil, 6, nil, nil,
240
- 107, nil, nil, nil, nil, nil, 47, 26, 390, 353,
241
- nil, 31, 79, 229, nil, 162, 59, nil, 164, nil,
242
- nil, nil, nil, 257, nil, nil, 325, nil, nil, nil,
243
- 111, 170, nil, nil, nil, 279, nil, nil, nil, nil,
244
- 429, 199, nil, 206, 229, 237, nil, 238, nil, nil,
245
- 230, nil, 659, nil, nil, 668, nil, nil, nil, nil,
246
- nil, nil, nil, nil, nil, nil, 291, 296, 301, 314,
247
- nil, 162, 56, 338, 357, -3, nil, nil, nil, 392,
248
- nil, nil, 0, nil, nil, nil, 175, nil, 359, 367,
249
- nil, nil, nil, nil, nil, nil, nil, nil, 420, 421,
250
- 387, 368, 376, 358, 318, 196, nil, nil, 430, nil,
251
- 419, 420, 432, 423, 426, nil, 10, nil, 444, nil,
252
- nil, 425, 444, 456, nil, nil, nil, nil, 324, nil,
253
- nil, nil, nil, 458, 447, 282, 278, nil, 646, nil,
254
- nil, nil, nil, nil, nil, nil, 454, nil, nil, nil,
255
- 442, 394, 464, 465, 466, 467, 471, 473, 482, 483,
256
- 484, 485, 486, 487, 488, 485, nil, nil, 151, nil,
257
- nil, 501, nil, nil, -6, nil, 502, 584, 607, 620,
258
- 633, 497, nil, nil, nil, 488, 490, 499, nil, nil,
259
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
260
- nil, nil, nil, nil, 525, nil, nil, nil, nil, nil,
261
- nil, nil, nil, 501, 534, nil, 516, nil ]
225
+ nil, 14, -2, 558, nil, 84, 69, 13, nil, 542,
226
+ 61, 167, 149, 152, 204, nil, nil, nil, nil, 275,
227
+ 349, 220, 272, nil, 212, 154, 296, 536, 241, 526,
228
+ 51, 139, 521, 520, 276, 179, nil, 471, 6, 469,
229
+ nil, 260, 9, 302, 136, nil, 516, -4, 416, nil,
230
+ nil, nil, nil, 486, 380, nil, nil, 259, 81, nil,
231
+ nil, nil, nil, 228, nil, nil, 480, nil, nil, 235,
232
+ 470, nil, nil, nil, 465, 455, nil, 424, 423, 423,
233
+ 422, 421, 315, nil, nil, 415, nil, 399, nil, 132,
234
+ -18, 294, nil, 388, nil, nil, 392, nil, 109, 285,
235
+ 391, 374, nil, nil, 357, 319, nil, 313, 269, 36,
236
+ nil, 28, nil, 250, nil, nil, 203, nil, nil, nil,
237
+ 17, 97, nil, nil, nil, nil, nil, 95, nil, nil,
238
+ 163, nil, nil, nil, nil, nil, 145, 151, 431, 378,
239
+ nil, 31, 160, 27, nil, 87, 25, nil, 173, nil,
240
+ nil, nil, nil, 317, nil, nil, 93, nil, nil, nil,
241
+ 202, 242, nil, nil, nil, 74, nil, nil, nil, nil,
242
+ 455, 272, nil, 273, 282, 286, nil, 292, nil, nil,
243
+ 290, nil, 636, nil, nil, 658, nil, nil, nil, nil,
244
+ nil, nil, nil, nil, nil, nil, 315, 318, 333, 339,
245
+ nil, 131, 176, 377, 379, -3, nil, nil, nil, 391,
246
+ nil, nil, 0, nil, nil, nil, 127, nil, 420, 367,
247
+ nil, nil, nil, nil, nil, nil, nil, nil, 412, 417,
248
+ 384, 367, 354, 344, 357, 117, nil, nil, 428, nil,
249
+ 418, 422, 435, 433, 448, nil, 449, nil, nil, 420,
250
+ 439, 451, nil, nil, nil, nil, 350, nil, nil, nil,
251
+ nil, 461, 452, 282, 342, nil, 649, nil, nil, nil,
252
+ nil, nil, nil, nil, 469, nil, nil, nil, 457, 385,
253
+ 490, 478, 479, 481, 484, 485, 486, 487, 489, 491,
254
+ 492, 493, 497, 507, nil, nil, 164, nil, 516, nil,
255
+ 516, nil, nil, -6, nil, 519, 623, 597, 119, 513,
256
+ nil, nil, nil, 501, 502, 560, nil, nil, nil, nil,
257
+ nil, nil, nil, nil, nil, nil, nil, nil, 529, nil,
258
+ 519, 534, nil, 534, nil, nil, nil, 574, 610, nil,
259
+ nil, nil, 516, 538, nil, nil, 525, nil, nil, nil,
260
+ nil, 540, nil ]
262
261
 
263
262
  racc_action_default = [
264
263
  -1, -222, -222, -222, -2, -6, -7, -8, -9, -222,
265
264
  -222, -222, -39, -40, -41, -42, -43, -44, -45, -32,
266
265
  -22, -222, -222, -53, -222, -222, -87, -222, -222, -222,
267
266
  -222, -222, -222, -101, -103, -109, -110, -113, -222, -118,
268
- -117, -122, -123, -124, -125, -130, -222, -222, -222, 348,
267
+ -117, -122, -123, -124, -125, -130, -222, -222, -222, 353,
269
268
  -3, -4, -5, -222, -222, -14, -15, -222, -222, -221,
270
269
  -36, -37, -38, -31, -46, -47, -222, -97, -20, -222,
271
270
  -222, -34, -25, -26, -32, -222, -51, -222, -55, -56,
@@ -275,7 +274,7 @@ racc_action_default = [
275
274
  -165, -222, -172, -222, -174, -94, -222, -96, -98, -99,
276
275
  -222, -222, -104, -105, -106, -107, -108, -222, -115, -119,
277
276
  -222, -126, -127, -128, -129, -131, -113, -222, -222, -222,
278
- -145, -222, -222, -222, -150, -222, -154, -10, -222, -12,
277
+ -145, -222, -222, -222, -150, -222, -32, -10, -222, -12,
279
278
  -13, -19, -17, -222, -220, -48, -27, -49, -34, -28,
280
279
  -24, -222, -31, -50, -52, -222, -193, -190, -207, -35,
281
280
  -180, -181, -182, -183, -184, -185, -186, -187, -188, -189,
@@ -284,97 +283,98 @@ racc_action_default = [
284
283
  -65, -66, -67, -222, -222, -222, -70, -79, -82, -222,
285
284
  -85, -86, -87, -81, -92, -159, -162, -161, -222, -222,
286
285
  -173, -95, -100, -102, -114, -121, -116, -120, -222, -222,
287
- -222, -222, -222, -222, -222, -222, -144, -146, -154, -147,
288
- -222, -222, -112, -222, -222, -155, -156, -11, -222, -16,
289
- -21, -23, -222, -32, -54, -175, -176, -177, -222, -179,
290
- -209, -205, -191, -203, -222, -196, -199, -202, -222, -211,
291
- -74, -76, -73, -75, -68, -77, -222, -84, -88, -160,
292
- -171, -222, -222, -222, -222, -222, -222, -222, -222, -222,
293
- -222, -222, -222, -222, -222, -222, -148, -149, -222, -151,
294
- -152, -222, -18, -33, -222, -178, -32, -222, -222, -222,
295
- -222, -222, -78, -166, -170, -171, -171, -222, -132, -133,
296
- -134, -135, -136, -137, -138, -139, -140, -141, -142, -143,
297
- -153, -111, -157, -29, -32, -195, -197, -198, -200, -201,
298
- -204, -167, -168, -171, -222, -169, -222, -30 ]
286
+ -222, -222, -222, -222, -222, -222, -144, -146, -32, -147,
287
+ -222, -222, -112, -222, -154, -11, -222, -16, -21, -23,
288
+ -222, -32, -54, -175, -176, -177, -222, -179, -209, -205,
289
+ -191, -203, -222, -196, -199, -202, -222, -211, -74, -76,
290
+ -73, -75, -68, -77, -222, -84, -88, -160, -171, -222,
291
+ -222, -222, -222, -222, -222, -222, -222, -222, -222, -222,
292
+ -222, -222, -222, -154, -148, -149, -222, -151, -32, -155,
293
+ -156, -18, -33, -222, -178, -32, -222, -222, -222, -222,
294
+ -78, -166, -170, -171, -171, -222, -132, -133, -134, -135,
295
+ -136, -137, -138, -139, -140, -141, -142, -143, -32, -111,
296
+ -222, -222, -29, -32, -195, -197, -198, -222, -222, -204,
297
+ -167, -168, -171, -222, -152, -157, -222, -200, -201, -169,
298
+ -153, -222, -30 ]
299
299
 
300
300
  racc_goto_table = [
301
- 67, 180, 105, 80, 116, 241, 243, 242, 90, 81,
302
- 77, 68, 204, 267, 244, 160, 269, 264, 96, 88,
303
- 89, 313, 54, 57, 126, 203, 118, 60, 61, 62,
304
- 131, 132, 133, 134, 64, 278, 75, 4, 87, 85,
305
- 50, 51, 52, 215, 216, 338, 339, 222, 223, 65,
306
- 121, 66, 303, 139, 158, 161, 341, 342, 118, 332,
307
- 69, 58, 258, 148, 2, 1, nil, nil, nil, nil,
308
- 153, nil, nil, 209, 202, nil, 206, nil, nil, nil,
309
- nil, nil, nil, 217, 345, 200, 201, nil, nil, 259,
310
- 208, nil, nil, nil, nil, nil, nil, nil, nil, 267,
311
- nil, nil, 251, 311, nil, nil, 295, nil, nil, nil,
301
+ 80, 180, 105, 67, 116, 243, 90, 265, 81, 77,
302
+ 267, 241, 68, 242, 262, 204, 160, 311, 96, 89,
303
+ 88, 298, 118, 54, 57, 60, 61, 62, 215, 216,
304
+ 347, 348, 64, 126, 75, 203, 276, 85, 87, 131,
305
+ 132, 133, 134, 4, 222, 223, 50, 51, 52, 65,
306
+ 121, 66, 340, 341, 118, 302, 139, 158, 161, 345,
307
+ 69, 58, 256, 148, 2, 1, nil, nil, nil, nil,
308
+ 328, 153, 202, 209, 206, nil, nil, nil, nil, nil,
309
+ nil, 349, nil, 217, nil, 201, 200, nil, nil, 257,
310
+ 208, 265, nil, nil, nil, nil, nil, nil, 309, nil,
311
+ nil, nil, nil, 249, nil, nil, nil, nil, nil, nil,
312
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
313
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 274,
314
+ 244, 265, 265, nil, nil, nil, nil, 278, 335, 336,
315
+ nil, nil, nil, 80, nil, nil, nil, nil, 248, nil,
316
+ nil, 81, 252, nil, nil, nil, 329, nil, nil, nil,
317
+ 261, nil, 265, 265, 242, nil, nil, nil, nil, nil,
318
+ nil, nil, nil, nil, nil, 304, nil, 268, 269, 270,
319
+ 271, nil, nil, nil, nil, nil, nil, nil, nil, nil,
320
+ 277, nil, nil, nil, nil, nil, nil, nil, 313, 314,
312
321
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
313
- nil, nil, nil, nil, nil, nil, 276, nil, nil, nil,
314
- nil, nil, nil, nil, nil, nil, nil, 280, 267, 267,
315
- 267, 267, 336, 337, nil, nil, 80, 250, nil, nil,
316
- nil, nil, 81, 254, nil, nil, nil, nil, nil, 331,
317
- 242, nil, nil, 263, nil, nil, nil, nil, nil, nil,
318
- nil, nil, nil, nil, nil, nil, nil, 305, nil, 270,
319
- 271, 272, 273, nil, nil, nil, nil, nil, nil, nil,
320
- 279, nil, nil, nil, nil, nil, nil, nil, nil, nil,
321
- 315, 316, nil, nil, nil, nil, nil, nil, nil, nil,
322
322
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
323
+ nil, nil, 293, nil, nil, nil, nil, nil, nil, nil,
324
+ nil, nil, nil, nil, 342, 303, nil, nil, nil, nil,
325
+ nil, nil, nil, nil, 261, nil, nil, nil, 308, nil,
323
326
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
324
- nil, nil, nil, nil, 304, nil, 343, nil, nil, nil,
325
- nil, nil, nil, nil, nil, nil, nil, nil, nil, 263,
327
+ nil, nil, nil, nil, nil, 351, nil, nil, nil, nil,
326
328
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
327
- nil, nil, nil, 346, nil, nil, nil, nil, nil, nil,
329
+ nil, nil, 330, nil, 261, 261, nil, nil, nil, 334,
328
330
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
329
- nil, nil, nil, nil, nil, nil, nil, 335, 263, 263,
330
- 263, 263, nil, nil, nil, nil, nil, nil, nil, nil,
331
331
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
332
- nil, nil, nil, nil, nil, 344 ]
332
+ nil, nil, 343, nil, nil, 261, 261, 346 ]
333
333
 
334
334
  racc_goto_check = [
335
- 17, 18, 51, 35, 51, 58, 62, 58, 41, 36,
336
- 32, 12, 46, 76, 68, 15, 76, 80, 48, 39,
337
- 40, 73, 8, 8, 61, 42, 55, 7, 7, 7,
338
- 61, 61, 61, 61, 7, 52, 7, 2, 38, 7,
339
- 2, 2, 2, 70, 70, 82, 82, 56, 57, 28,
340
- 59, 27, 16, 63, 14, 17, 73, 73, 55, 69,
335
+ 35, 18, 51, 17, 51, 62, 41, 76, 36, 32,
336
+ 76, 58, 12, 58, 80, 46, 15, 73, 48, 40,
337
+ 39, 68, 55, 8, 8, 7, 7, 7, 70, 70,
338
+ 82, 82, 7, 61, 7, 42, 52, 7, 38, 61,
339
+ 61, 61, 61, 2, 56, 57, 2, 2, 2, 28,
340
+ 59, 27, 73, 73, 55, 16, 63, 14, 17, 69,
341
341
  11, 10, 74, 9, 3, 1, nil, nil, nil, nil,
342
- 8, nil, nil, 51, 41, nil, 41, nil, nil, nil,
343
- nil, nil, nil, 51, 73, 39, 40, nil, nil, 18,
344
- 48, nil, nil, nil, nil, nil, nil, nil, nil, 76,
345
- nil, nil, 15, 80, nil, nil, 68, nil, nil, nil,
342
+ 68, 8, 41, 51, 41, nil, nil, nil, nil, nil,
343
+ nil, 73, nil, 51, nil, 40, 39, nil, nil, 18,
344
+ 48, 76, nil, nil, nil, nil, nil, nil, 80, nil,
345
+ nil, nil, nil, 15, nil, nil, nil, nil, nil, nil,
346
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
347
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 46,
348
+ 17, 76, 76, nil, nil, nil, nil, 18, 80, 80,
349
+ nil, nil, nil, 35, nil, nil, nil, nil, 12, nil,
350
+ nil, 36, 32, nil, nil, nil, 62, nil, nil, nil,
351
+ 35, nil, 76, 76, 58, nil, nil, nil, nil, nil,
352
+ nil, nil, nil, nil, nil, 18, nil, 41, 41, 41,
353
+ 41, nil, nil, nil, nil, nil, nil, nil, nil, nil,
354
+ 51, nil, nil, nil, nil, nil, nil, nil, 18, 18,
346
355
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
347
- nil, nil, nil, nil, nil, nil, 46, nil, nil, nil,
348
- nil, nil, nil, nil, nil, nil, nil, 18, 76, 76,
349
- 76, 76, 80, 80, nil, nil, 35, 12, nil, nil,
350
- nil, nil, 36, 32, nil, nil, nil, nil, nil, 62,
351
- 58, nil, nil, 35, nil, nil, nil, nil, nil, nil,
352
- nil, nil, nil, nil, nil, nil, nil, 18, nil, 41,
353
- 41, 41, 41, nil, nil, nil, nil, nil, nil, nil,
354
- 51, nil, nil, nil, nil, nil, nil, nil, nil, nil,
355
- 18, 18, nil, nil, nil, nil, nil, nil, nil, nil,
356
356
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
357
+ nil, nil, 17, nil, nil, nil, nil, nil, nil, nil,
358
+ nil, nil, nil, nil, 18, 17, nil, nil, nil, nil,
359
+ nil, nil, nil, nil, 35, nil, nil, nil, 17, nil,
357
360
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
358
- nil, nil, nil, nil, 17, nil, 18, nil, nil, nil,
359
- nil, nil, nil, nil, nil, nil, nil, nil, nil, 35,
361
+ nil, nil, nil, nil, nil, 18, nil, nil, nil, nil,
360
362
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
361
- nil, nil, nil, 18, nil, nil, nil, nil, nil, nil,
363
+ nil, nil, 17, nil, 35, 35, nil, nil, nil, 17,
362
364
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
363
- nil, nil, nil, nil, nil, nil, nil, 17, 35, 35,
364
- 35, 35, nil, nil, nil, nil, nil, nil, nil, nil,
365
365
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
366
- nil, nil, nil, nil, nil, 17 ]
366
+ nil, nil, 17, nil, nil, 35, 35, 17 ]
367
367
 
368
368
  racc_goto_pointer = [
369
- nil, 65, 35, 64, nil, nil, nil, 15, 12, 9,
370
- 50, 40, -9, nil, -16, -56, -200, -19, -81, nil,
369
+ nil, 65, 41, 64, nil, nil, nil, 13, 13, 9,
370
+ 50, 40, -8, nil, -13, -55, -195, -16, -81, nil,
371
371
  nil, nil, nil, nil, nil, nil, nil, 32, 30, nil,
372
- nil, nil, -12, nil, nil, -19, -13, nil, 13, -6,
373
- -5, -17, -66, nil, nil, nil, -79, nil, -8, nil,
374
- nil, -26, -177, nil, nil, -5, -73, -73, -138, 16,
375
- nil, -11, -139, 6, nil, nil, nil, nil, -132, -242,
376
- -64, nil, nil, -259, -108, nil, -169, nil, nil, nil,
377
- -165, nil, -264, nil ]
372
+ nil, nil, -13, nil, nil, -22, -14, nil, 13, -5,
373
+ -6, -19, -56, nil, nil, nil, -76, nil, -8, nil,
374
+ nil, -26, -176, nil, nil, -9, -76, -76, -132, 16,
375
+ nil, -2, -140, 9, nil, nil, nil, nil, -223, -272,
376
+ -79, nil, nil, -261, -108, nil, -175, nil, nil, nil,
377
+ -168, nil, -307, nil ]
378
378
 
379
379
  racc_goto_default = [
380
380
  nil, nil, nil, nil, 5, 6, 7, 8, nil, nil,
@@ -383,9 +383,9 @@ racc_goto_default = [
383
383
  21, 22, nil, 78, 79, 177, 174, 24, nil, nil,
384
384
  nil, nil, nil, 92, 94, 95, 110, 26, nil, 98,
385
385
  99, nil, 100, 101, 28, 30, 32, 33, 34, nil,
386
- 35, 36, nil, 40, 41, 42, 43, 44, nil, 245,
386
+ 35, 36, nil, 40, 41, 42, 43, 44, nil, 299,
387
387
  109, 108, 111, nil, nil, 170, 172, 173, 175, 176,
388
- nil, 265, 266, 185 ]
388
+ nil, 263, 264, 185 ]
389
389
 
390
390
  racc_reduce_table = [
391
391
  0, 0, :racc_error,
@@ -540,8 +540,8 @@ racc_reduce_table = [
540
540
  4, 125, :_reduce_149,
541
541
  2, 125, :_reduce_150,
542
542
  4, 125, :_reduce_151,
543
- 4, 125, :_reduce_152,
544
- 5, 125, :_reduce_153,
543
+ 6, 125, :_reduce_152,
544
+ 7, 125, :_reduce_153,
545
545
  0, 126, :_reduce_none,
546
546
  1, 126, :_reduce_none,
547
547
  1, 127, :_reduce_none,
@@ -588,8 +588,8 @@ racc_reduce_table = [
588
588
  3, 138, :_reduce_197,
589
589
  3, 138, :_reduce_198,
590
590
  1, 139, :_reduce_none,
591
- 3, 139, :_reduce_200,
592
- 3, 139, :_reduce_201,
591
+ 4, 139, :_reduce_200,
592
+ 4, 139, :_reduce_201,
593
593
  1, 140, :_reduce_202,
594
594
  1, 140, :_reduce_203,
595
595
  3, 140, :_reduce_204,
@@ -613,7 +613,7 @@ racc_reduce_table = [
613
613
 
614
614
  racc_reduce_n = 222
615
615
 
616
- racc_shift_n = 348
616
+ racc_shift_n = 353
617
617
 
618
618
  racc_token_table = {
619
619
  false => 0,
data/lib/csspool/css/parser.y CHANGED
@@ -481,12 +481,12 @@ rule
481
481
  val[2].join(', ')
482
482
  )
483
483
  }
484
- | COLON MOZ_PSEUDO_ELEMENT any_number_of_idents RPAREN {
484
+ | COLON MOZ_PSEUDO_ELEMENT optional_space any_number_of_idents optional_space RPAREN {
485
485
  result = Selectors::PseudoElement.new(
486
486
  interpret_identifier(val[1].sub(/\($/, ''))
487
487
  )
488
488
  }
489
- | COLON COLON MOZ_PSEUDO_ELEMENT any_number_of_idents RPAREN {
489
+ | COLON COLON MOZ_PSEUDO_ELEMENT optional_space any_number_of_idents optional_space RPAREN {
490
490
  result = Selectors::PseudoElement.new(
491
491
  interpret_identifier(val[2].sub(/\($/, ''))
492
492
  )
@@ -594,8 +594,8 @@ rule
594
594
  ;
595
595
  calc_product
596
596
  : calc_value
597
- | calc_value STAR calc_value { result = val.join('') }
598
- | calc_value SLASH calc_value { result = val.join('') }
597
+ | calc_value optional_space STAR calc_value { result = val.join('') }
598
+ | calc_value optional_space SLASH calc_value { result = val.join('') }
599
599
  ;
600
600
  calc_value
601
601
  : numeric { result = val.join('') }
data/lib/csspool/css/tokenizer.rb CHANGED
@@ -94,7 +94,7 @@ class Tokenizer < Parser
94
94
  when (text = @ss.scan(/[\s]*@supports[\s]*/i))
95
95
  action { @state = :LOGICQUERY; [:SUPPORTS_SYM, st(text)] }
96
96
 
97
- when (text = @ss.scan(/calc\(\s*/i))
97
+ when (text = @ss.scan(/(\-[A-Za-z]+\-)?calc\(\s*/i))
98
98
  action { [:CALC_SYM, st(text)] }
99
99
 
100
100
  when (text = @ss.scan(/\-?([_A-Za-z]|[^\0-\177]|\\[0-9A-Fa-f]{1,6}(\r\n|[\s])?|\\[^\n\r\f0-9A-Fa-f])([_A-Za-z0-9-]|[^\0-\177]|\\[0-9A-Fa-f]{1,6}(\r\n|[\s])?|\\[^\n\r\f0-9A-Fa-f])*\(\s*/i))
data/lib/csspool/css/tokenizer.rex CHANGED
@@ -79,7 +79,7 @@ rule
79
79
  {w}@media{w} { @state = :LOGICQUERY; [:MEDIA_SYM, st(text)] }
80
80
  {w}@supports{w} { @state = :LOGICQUERY; [:SUPPORTS_SYM, st(text)] }
81
81
 
82
- calc\(\s* { [:CALC_SYM, st(text)] }
82
+ ({vendorprefix})?calc\(\s* { [:CALC_SYM, st(text)] }
83
83
  {ident}\(\s* { [:FUNCTION, st(text)] }
84
84
 
85
85
  {w}@import{w} { [:IMPORT_SYM, st(text)] }
data/test/test_selector.rb CHANGED
@@ -169,6 +169,14 @@ module CSSPool
169
169
  assert_equal '-moz-tree-line', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
170
170
  end
171
171
 
172
+ def test_mozilla_pseudo_element_single_parameter_with_whitespace
173
+ doc = CSSPool.CSS <<-eocss
174
+ treechildren::-moz-tree-line( one ) { background: red; }
175
+ eocss
176
+ rs = doc.rule_sets.first
177
+ assert_equal '-moz-tree-line', rs.selectors.first.simple_selectors.first.additional_selectors.first.name
178
+ end
179
+
172
180
  def test_mozilla_pseudo_element_multiple_parameters
173
181
  doc = CSSPool.CSS <<-eocss
174
182
  treechildren::-moz-tree-line(one, two, three) { background: red; }
data/test/test_term.rb CHANGED
@@ -11,6 +11,14 @@ module CSSPool
11
11
  assert_equal '100% + 15px', rs.declarations.first.expressions.first.expression
12
12
  end
13
13
 
14
+ def test_vendor_prefix_math_simple
15
+ doc = CSSPool.CSS <<-eocss
16
+ a { top: -webkit-calc(100% + 15px) }
17
+ eocss
18
+ rs = doc.rule_sets.first
19
+ assert_equal '100% + 15px', rs.declarations.first.expressions.first.expression
20
+ end
21
+
14
22
  def test_math_complex
15
23
  doc = CSSPool.CSS <<-eocss
16
24
  a { top: calc(100%/3 - 2*1em - 2*1px) }
@@ -35,6 +43,18 @@ module CSSPool
35
43
  assert_equal '1.4*-8px', rs.declarations.first.expressions.first.expression
36
44
  end
37
45
 
46
+ def test_space_after_param
47
+ CSSPool.CSS <<-eocss
48
+ a { left: calc((100% - 48.5em) * 0.4 + 0.4em); }
49
+ eocss
50
+ end
51
+
52
+ def test_space_before_param
53
+ CSSPool.CSS <<-eocss
54
+ a { left: calc(0.4 * (100% - 48.5em) + 0.4em); }
55
+ eocss
56
+ end
57
+
38
58
  def test_two_in_a_row
39
59
  doc = CSSPool.CSS <<-eocss
40
60
  a { background-size: calc(-2px + 100%) calc(-2px + 100%); }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: csspool
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0
4
+ version: 4.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Aaron Patterson
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-07-11 00:00:00.000000000 Z
12
+ date: 2014-08-31 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rdoc