rack-mount 0.6.9 → 0.6.10

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.
Files changed (5) hide show
  1. data/lib/rack/mount/vendor/regin/regin/parser.rb +127 -135
  2. data/lib/rack/mount/vendor/regin/regin/tokenizer.rb +0 -3
  3. data/lib/rack/mount/vendor/regin/regin/version.rb +1 -1
  4. data/lib/rack/mount/version.rb +1 -1
  5. metadata +4 -4
data/lib/rack/mount/vendor/regin/regin/parser.rb CHANGED
@@ -30,153 +30,148 @@ end
30
30
  ##### State transition tables begin ###
31
31
 
32
32
  racc_action_table = [
33
- 3, 41, 42, 43, 9, 11, 13, 15, 52, 59,
34
- 3, 55, 4, 6, 9, 11, 13, 15, 22, 51,
35
- 3, 33, 4, 6, 9, 11, 13, 15, 21, 60,
36
- 3, 61, 4, 6, 9, 11, 13, 15, 20, 19,
37
- 3, 49, 4, 6, 9, 11, 13, 15, 35, 67,
38
- 3, 68, 4, 6, 9, 11, 13, 15, 40, 39,
39
- 3, 38, 4, 6, 9, 11, 13, 15, nil, 29,
40
- 3, nil, 4, 6, 9, 11, 13, 15, 44, 45,
41
- 31, nil, 4, 6, 32, 24, 48, 41, 42, 43,
42
- 25, 26, 27, 17, nil, 18, 50, nil, 19, nil,
43
- 32, 57, 41, 42, 43, 64, 41, 42, 43, 41,
44
- 42, 43, 41, 42, 43, 41, 42, 43, 41, 42,
45
- 43, 41, 42, 43 ]
33
+ 3, 54, 39, 8, 10, 12, 14, 50, 37, 58,
34
+ 3, 2, 5, 8, 10, 12, 14, 59, 51, 36,
35
+ 3, 2, 5, 8, 10, 12, 14, 47, 40, 41,
36
+ 3, 2, 5, 8, 10, 12, 14, 47, 40, 41,
37
+ 3, 2, 5, 8, 10, 12, 14, 47, 40, 41,
38
+ 3, 2, 5, 8, 10, 12, 14, 47, 40, 41,
39
+ 3, 2, 5, 8, 10, 12, 14, 33, 28, 18,
40
+ 3, 2, 5, 8, 10, 12, 14, 42, 43, 30,
41
+ 21, 2, 5, 31, 23, 46, 47, 40, 41, 24,
42
+ 25, 26, 49, 65, 17, 20, 31, 18, 56, 47,
43
+ 40, 41, 62, 47, 40, 41, 47, 40, 41, 47,
44
+ 40, 41, 19, 48 ]
46
45
 
47
46
  racc_action_check = [
48
- 0, 57, 57, 57, 0, 0, 0, 0, 40, 52,
49
- 22, 46, 0, 0, 22, 22, 22, 22, 8, 40,
50
- 55, 17, 22, 22, 55, 55, 55, 55, 7, 53,
51
- 45, 54, 55, 55, 45, 45, 45, 45, 5, 18,
52
- 44, 30, 45, 45, 44, 44, 44, 44, 20, 59,
53
- 10, 62, 44, 44, 10, 10, 10, 10, 27, 26,
54
- 15, 25, 10, 10, 15, 15, 15, 15, nil, 15,
55
- 21, nil, 15, 15, 21, 21, 21, 21, 29, 29,
56
- 16, nil, 21, 21, 16, 14, 29, 29, 29, 29,
57
- 14, 14, 14, 3, nil, 3, 34, nil, 3, nil,
58
- 34, 47, 47, 47, 47, 56, 56, 56, 56, 58,
59
- 58, 58, 64, 64, 64, 65, 65, 65, 48, 48,
60
- 48, 66, 66, 66 ]
47
+ 0, 44, 26, 0, 0, 0, 0, 38, 25, 52,
48
+ 43, 0, 0, 43, 43, 43, 43, 53, 38, 24,
49
+ 54, 43, 43, 54, 54, 54, 54, 63, 63, 63,
50
+ 21, 54, 54, 21, 21, 21, 21, 62, 62, 62,
51
+ 20, 21, 21, 20, 20, 20, 20, 57, 57, 57,
52
+ 9, 20, 20, 9, 9, 9, 9, 56, 56, 56,
53
+ 14, 9, 9, 14, 14, 14, 14, 19, 14, 17,
54
+ 42, 14, 14, 42, 42, 42, 42, 28, 28, 16,
55
+ 7, 42, 42, 16, 13, 28, 28, 28, 28, 13,
56
+ 13, 13, 32, 60, 3, 6, 32, 3, 45, 45,
57
+ 45, 45, 55, 55, 55, 55, 46, 46, 46, 64,
58
+ 64, 64, 4, 29 ]
61
59
 
62
60
  racc_action_pointer = [
63
- -3, nil, nil, 89, nil, 38, nil, 26, 16, nil,
64
- 47, nil, nil, nil, 73, 57, 75, 16, 30, nil,
65
- 48, 67, 7, nil, nil, 49, 47, 49, nil, 65,
66
- 30, nil, nil, nil, 91, nil, nil, nil, nil, nil,
67
- -1, nil, nil, nil, 37, 27, -2, 80, 96, nil,
68
- nil, nil, 0, 18, 20, 17, 84, -21, 87, 29,
69
- nil, nil, 40, nil, 90, 93, 99, nil, nil, nil,
70
- nil, nil ]
61
+ -3, nil, nil, 89, 112, nil, 93, 78, nil, 47,
62
+ nil, nil, nil, 73, 57, nil, 75, 61, nil, 67,
63
+ 37, 27, nil, nil, 8, -3, -6, nil, 65, 103,
64
+ nil, nil, 88, nil, nil, nil, nil, nil, -1, nil,
65
+ nil, nil, 67, 7, -11, 78, 85, nil, nil, nil,
66
+ nil, nil, -1, 7, 17, 82, 36, 26, nil, nil,
67
+ 83, nil, 16, 6, 88, nil, nil, nil, nil ]
71
68
 
72
69
  racc_action_default = [
73
- -40, -10, -16, -40, -22, -40, -23, -1, -2, -14,
74
- -5, -15, -7, -17, -9, -40, -40, -40, -40, -32,
75
- -40, -40, -40, -6, -26, -24, -25, -40, -8, -40,
76
- -40, -12, -31, -11, -40, 72, -3, -4, -27, -28,
77
- -40, -37, -38, -39, -40, -40, -40, -40, -40, -18,
78
- -13, -30, -40, -40, -40, -40, -40, -40, -40, -40,
79
- -20, -21, -40, -36, -40, -40, -40, -29, -19, -35,
80
- -34, -33 ]
70
+ -40, -15, -21, -40, -40, -22, -1, -2, -13, -5,
71
+ -14, -7, -16, -9, -40, -10, -40, -40, -32, -40,
72
+ -40, -40, -6, -25, -23, -24, -40, -8, -40, -40,
73
+ -11, -31, -40, 69, -3, -4, -26, -27, -40, -30,
74
+ -38, -39, -40, -40, -40, -40, -40, -37, -17, -12,
75
+ -29, -28, -40, -40, -40, -40, -40, -40, -19, -20,
76
+ -40, -36, -40, -40, -40, -18, -35, -34, -33 ]
81
77
 
82
78
  racc_goto_table = [
83
- 5, 47, 16, 36, 37, 23, 46, 28, nil, nil,
84
- nil, nil, nil, nil, nil, 30, nil, 34, nil, 56,
85
- 58, nil, nil, nil, nil, nil, nil, nil, 63, 65,
86
- 66, nil, nil, nil, nil, nil, 69, 70, 71, nil,
87
- nil, nil, nil, nil, 53, 54, nil, nil, nil, nil,
88
- nil, nil, nil, nil, nil, 62 ]
79
+ 4, 45, 16, 34, 35, 44, 27, 38, 22, nil,
80
+ nil, nil, nil, nil, 29, nil, 32, nil, 55, 57,
81
+ nil, nil, nil, nil, nil, nil, nil, nil, 61, 63,
82
+ 64, nil, nil, nil, nil, 66, 67, 68, nil, nil,
83
+ nil, nil, 52, 53, nil, nil, nil, nil, nil, nil,
84
+ nil, nil, nil, nil, 60 ]
89
85
 
90
86
  racc_goto_check = [
91
- 1, 12, 9, 3, 3, 5, 11, 7, nil, nil,
92
- nil, nil, nil, nil, nil, 1, nil, 9, nil, 12,
93
- 12, nil, nil, nil, nil, nil, nil, nil, 12, 12,
94
- 12, nil, nil, nil, nil, nil, 12, 12, 12, nil,
95
- nil, nil, nil, nil, 1, 1, nil, nil, nil, nil,
96
- nil, nil, nil, nil, nil, 1 ]
87
+ 1, 13, 9, 3, 3, 11, 7, 12, 5, nil,
88
+ nil, nil, nil, nil, 1, nil, 9, nil, 13, 13,
89
+ nil, nil, nil, nil, nil, nil, nil, nil, 13, 13,
90
+ 13, nil, nil, nil, nil, 13, 13, 13, nil, nil,
91
+ nil, nil, 1, 1, nil, nil, nil, nil, nil, nil,
92
+ nil, nil, nil, nil, 1 ]
97
93
 
98
94
  racc_goto_pointer = [
99
- nil, 0, nil, -18, nil, -5, nil, -7, nil, -1,
100
- nil, -23, -28 ]
95
+ nil, 0, nil, -17, nil, -1, nil, -7, nil, -1,
96
+ nil, -23, -19, -27 ]
101
97
 
102
98
  racc_goto_default = [
103
- nil, nil, 7, 8, 10, 12, 14, nil, 1, nil,
104
- 2, nil, nil ]
99
+ nil, nil, 6, 7, 9, 11, 13, nil, 15, nil,
100
+ 1, nil, nil, nil ]
105
101
 
106
102
  racc_reduce_table = [
107
103
  0, 0, :racc_error,
108
- 1, 26, :_reduce_1,
109
- 1, 26, :_reduce_none,
110
- 3, 27, :_reduce_3,
111
- 3, 27, :_reduce_4,
112
- 1, 28, :_reduce_5,
113
- 2, 29, :_reduce_6,
114
- 1, 29, :_reduce_7,
115
- 2, 30, :_reduce_8,
104
+ 1, 25, :_reduce_1,
105
+ 1, 25, :_reduce_none,
106
+ 3, 26, :_reduce_3,
107
+ 3, 26, :_reduce_4,
108
+ 1, 27, :_reduce_5,
109
+ 2, 28, :_reduce_6,
110
+ 1, 28, :_reduce_7,
111
+ 2, 29, :_reduce_8,
112
+ 1, 29, :_reduce_none,
116
113
  1, 30, :_reduce_none,
117
- 1, 31, :_reduce_none,
118
- 3, 31, :_reduce_11,
119
- 3, 31, :_reduce_12,
120
- 4, 31, :_reduce_13,
121
- 1, 31, :_reduce_14,
122
- 1, 31, :_reduce_15,
123
- 1, 31, :_reduce_16,
124
- 1, 31, :_reduce_17,
125
- 3, 33, :_reduce_18,
126
- 6, 33, :_reduce_19,
127
- 5, 33, :_reduce_20,
128
- 5, 33, :_reduce_21,
129
- 1, 35, :_reduce_none,
130
- 1, 35, :_reduce_none,
131
- 1, 32, :_reduce_none,
132
- 1, 32, :_reduce_none,
133
- 1, 32, :_reduce_none,
134
- 2, 32, :_reduce_27,
135
- 2, 32, :_reduce_28,
136
- 5, 32, :_reduce_29,
137
- 3, 32, :_reduce_30,
138
- 2, 34, :_reduce_31,
114
+ 3, 30, :_reduce_11,
115
+ 4, 30, :_reduce_12,
116
+ 1, 30, :_reduce_13,
117
+ 1, 30, :_reduce_14,
118
+ 1, 30, :_reduce_15,
119
+ 1, 30, :_reduce_16,
120
+ 3, 32, :_reduce_17,
121
+ 6, 32, :_reduce_18,
122
+ 5, 32, :_reduce_19,
123
+ 5, 32, :_reduce_20,
124
+ 1, 34, :_reduce_none,
139
125
  1, 34, :_reduce_none,
140
- 4, 36, :_reduce_33,
141
- 4, 36, :_reduce_34,
142
- 4, 36, :_reduce_35,
143
- 3, 36, :_reduce_36,
126
+ 1, 31, :_reduce_none,
127
+ 1, 31, :_reduce_none,
128
+ 1, 31, :_reduce_none,
129
+ 2, 31, :_reduce_26,
130
+ 2, 31, :_reduce_27,
131
+ 3, 31, :_reduce_28,
132
+ 2, 36, :_reduce_29,
133
+ 1, 36, :_reduce_none,
134
+ 2, 33, :_reduce_31,
135
+ 1, 33, :_reduce_none,
136
+ 4, 35, :_reduce_33,
137
+ 4, 35, :_reduce_34,
138
+ 4, 35, :_reduce_35,
139
+ 3, 35, :_reduce_36,
144
140
  1, 37, :_reduce_37,
145
141
  1, 37, :_reduce_38,
146
142
  1, 37, :_reduce_39 ]
147
143
 
148
144
  racc_reduce_n = 40
149
145
 
150
- racc_shift_n = 72
146
+ racc_shift_n = 69
151
147
 
152
148
  racc_token_table = {
153
149
  false => 0,
154
150
  :error => 1,
155
151
  :BAR => 2,
156
152
  :LBRACK => 3,
157
- :CTYPE => 4,
158
- :RBRACK => 5,
159
- :NEGATE => 6,
160
- :CCLASS => 7,
161
- :DOT => 8,
162
- :CHAR => 9,
163
- :LPAREN => 10,
164
- :RPAREN => 11,
165
- :QMARK => 12,
166
- :COLON => 13,
167
- :NAME => 14,
168
- :L_ANCHOR => 15,
169
- :R_ANCHOR => 16,
170
- :STAR => 17,
171
- :PLUS => 18,
172
- :LCURLY => 19,
173
- :RCURLY => 20,
174
- :MINUS => 21,
175
- :MULTILINE => 22,
176
- :IGNORECASE => 23,
177
- :EXTENDED => 24 }
178
-
179
- racc_nt_base = 25
153
+ :RBRACK => 4,
154
+ :NEGATE => 5,
155
+ :CCLASS => 6,
156
+ :DOT => 7,
157
+ :CHAR => 8,
158
+ :LPAREN => 9,
159
+ :RPAREN => 10,
160
+ :QMARK => 11,
161
+ :COLON => 12,
162
+ :NAME => 13,
163
+ :L_ANCHOR => 14,
164
+ :R_ANCHOR => 15,
165
+ :STAR => 16,
166
+ :PLUS => 17,
167
+ :LCURLY => 18,
168
+ :RCURLY => 19,
169
+ :MINUS => 20,
170
+ :MULTILINE => 21,
171
+ :IGNORECASE => 22,
172
+ :EXTENDED => 23 }
173
+
174
+ racc_nt_base = 24
180
175
 
181
176
  racc_use_result_var = true
182
177
 
@@ -201,7 +196,6 @@ Racc_token_to_s_table = [
201
196
  "error",
202
197
  "BAR",
203
198
  "LBRACK",
204
- "CTYPE",
205
199
  "RBRACK",
206
200
  "NEGATE",
207
201
  "CCLASS",
@@ -234,6 +228,7 @@ Racc_token_to_s_table = [
234
228
  "bracket_expression",
235
229
  "anchor",
236
230
  "options",
231
+ "quantifier_char",
237
232
  "modifier" ]
238
233
 
239
234
  Racc_debug_parser = false
@@ -289,60 +284,57 @@ def _reduce_11(val, _values, result)
289
284
  end
290
285
 
291
286
  def _reduce_12(val, _values, result)
292
- result = CharacterClass.new(val[1])
293
- result
294
- end
295
-
296
- def _reduce_13(val, _values, result)
297
287
  result = CharacterClass.new(val[2], :negate => true)
298
288
  result
299
289
  end
300
290
 
301
- def _reduce_14(val, _values, result)
291
+ def _reduce_13(val, _values, result)
302
292
  result = CharacterClass.new(val[0])
303
293
  result
304
294
  end
305
295
 
306
- def _reduce_15(val, _values, result)
296
+ def _reduce_14(val, _values, result)
307
297
  result = CharacterClass.new('.')
308
298
  result
309
299
  end
310
300
 
311
- def _reduce_16(val, _values, result)
301
+ def _reduce_15(val, _values, result)
312
302
  result = Anchor.new(val[0])
313
303
  result
314
304
  end
315
305
 
316
- def _reduce_17(val, _values, result)
306
+ def _reduce_16(val, _values, result)
317
307
  result = Character.new(val[0])
318
308
  result
319
309
  end
320
310
 
321
- def _reduce_18(val, _values, result)
311
+ def _reduce_17(val, _values, result)
322
312
  result = Group.new(val[1], :index => @capture_index_stack.pop)
323
313
 
324
314
  result
325
315
  end
326
316
 
327
- def _reduce_19(val, _values, result)
317
+ def _reduce_18(val, _values, result)
328
318
  result = Group.new(val[4], val[2].merge(:capture => false))
329
319
  @options_stack.pop
330
320
 
331
321
  result
332
322
  end
333
323
 
334
- def _reduce_20(val, _values, result)
324
+ def _reduce_19(val, _values, result)
335
325
  result = Group.new(val[3], :capture => false);
336
326
 
337
327
  result
338
328
  end
339
329
 
340
- def _reduce_21(val, _values, result)
330
+ def _reduce_20(val, _values, result)
341
331
  result = Group.new(val[3], :name => val[2], :index => @capture_index_stack.pop);
342
332
 
343
333
  result
344
334
  end
345
335
 
336
+ # reduce 21 omitted
337
+
346
338
  # reduce 22 omitted
347
339
 
348
340
  # reduce 23 omitted
@@ -351,7 +343,10 @@ end
351
343
 
352
344
  # reduce 25 omitted
353
345
 
354
- # reduce 26 omitted
346
+ def _reduce_26(val, _values, result)
347
+ result = val.join
348
+ result
349
+ end
355
350
 
356
351
  def _reduce_27(val, _values, result)
357
352
  result = val.join
@@ -368,10 +363,7 @@ def _reduce_29(val, _values, result)
368
363
  result
369
364
  end
370
365
 
371
- def _reduce_30(val, _values, result)
372
- result = val.join
373
- result
374
- end
366
+ # reduce 30 omitted
375
367
 
376
368
  def _reduce_31(val, _values, result)
377
369
  result = val.join
data/lib/rack/mount/vendor/regin/regin/tokenizer.rb CHANGED
@@ -139,9 +139,6 @@ class Regin::Parser < Racc::Parser
139
139
  when (text = @ss.scan(/\^/))
140
140
  action { [@ss.string[@ss.pos-2, 1] == '[' ? :NEGATE : :CHAR, text] }
141
141
 
142
- when (text = @ss.scan(/:(alnum|alpha|ascii|blank|cntrl|digit|graph|lower|print|punct|space|upper|word|xdigit):/))
143
- action { [:CTYPE, text] }
144
-
145
142
  when (text = @ss.scan(/\\-/))
146
143
  action { [:CHAR, text] }
147
144
 
data/lib/rack/mount/vendor/regin/regin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Regin
2
- Version = '0.3.5'
2
+ Version = '0.3.6'
3
3
  end
data/lib/rack/mount/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rack::Mount
2
- Version = '0.6.9'
2
+ Version = '0.6.10'
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rack-mount
3
3
  version: !ruby/object:Gem::Version
4
- hash: 21
4
+ hash: 19
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 6
9
- - 9
10
- version: 0.6.9
9
+ - 10
10
+ version: 0.6.10
11
11
  platform: ruby
12
12
  authors:
13
13
  - Joshua Peek
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-07-12 00:00:00 -05:00
18
+ date: 2010-08-19 00:00:00 -05:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency