sportdb-parser 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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1 -1
  3. data/config/rounds_en.txt +1 -0
  4. data/lib/sportdb/parser/lexer.rb +53 -5
  5. data/lib/sportdb/parser/parser.rb +207 -205
  6. data/lib/sportdb/parser/token.rb +15 -1
  7. data/lib/sportdb/parser/version.rb +1 -1
  8. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6d2e6a1f243cdd9e255d659ffd616e875d3baf978edada8e663eb54e9bff35df
4
- data.tar.gz: 76ddc2f54d6ac9e117963e15ae5fa3cadfbaebce8d942021efcd849aaed7811d
3
+ metadata.gz: d0b047ceeb4dc8b4bf446fd47770aa89bd381f35a6375e630dd823e0e8a9f960
4
+ data.tar.gz: a035121961c238510506d0f58862220cf8f7c767845585f3e0d26b4e28367471
5
5
  SHA512:
6
- metadata.gz: 750b13d813a7fddf80b991c4fdb244856b4bd7d07410caa75cacabcd8cc724631b87eb15b3f61de0e84c378475a1dbc42529933997389102378527b623c39f90
7
- data.tar.gz: a88f83b33728a761cbb44c134456aeb3b49f003b422a42b30642c43a95514f8a2825929b56d7d54d788f4c197f680e7830d4dffcb7728ab284ea6e23bae64877
6
+ metadata.gz: 19a354aa23e88a776573e3d481f6754c670b7195e40b3f7063fdeee1d8c6155bb2dfe67129e07e8dd665221205e586df0c0bed6735d227659773ff8bfbd126c2
7
+ data.tar.gz: d89aaedee183b9a8ccc2de58cd7b35e0aa6216463d2873534008bdb02c7e8b8fc9d6cbf555dfd6da67e8c9323d9fb113098ef23ddfa6eb8331b48b74e43477d9
data/CHANGELOG.md CHANGED
@@ -1,4 +1,4 @@
1
- ### 0.6.9
1
+ ### 0.6.10
2
2
  ### 0.0.1 / 2024-07-12
3
3
 
4
4
  * Everything is new. First release.
data/config/rounds_en.txt CHANGED
@@ -18,6 +18,7 @@ Minor Semi-Final
18
18
 
19
19
 
20
20
  1/8 Finals
21
+ Qualifying Round
21
22
 
22
23
 
23
24
 
data/lib/sportdb/parser/lexer.rb CHANGED
@@ -413,6 +413,7 @@ def _tokenize_line( line )
413
413
  end
414
414
 
415
415
 
416
+ old_pos = -1 ## allows to backtrack to old pos (used in geo)
416
417
 
417
418
  while m = @re.match( line, pos )
418
419
  # if debug?
@@ -431,12 +432,14 @@ def _tokenize_line( line )
431
432
  log( msg )
432
433
  end
433
434
 
435
+
434
436
  ##
435
437
  ## todo/fix - also check if possible
436
438
  ## if no match but not yet end off string!!!!
437
439
  ## report skipped text run too!!!
438
440
 
439
- pos = offsets[1]
441
+ old_pos = pos
442
+ pos = offsets[1]
440
443
 
441
444
  # pp offsets if debug?
442
445
 
@@ -444,7 +447,46 @@ def _tokenize_line( line )
444
447
  ## note: racc requires pairs e.g. [:TOKEN, VAL]
445
448
  ## for VAL use "text" or ["text", { opts }] array
446
449
 
447
- t = if @re == PROP_CARDS_RE
450
+ t = if @re == GEO_RE
451
+ ### note - possibly end inline geo on [ (and others?? in the future
452
+ if m[:space] || m[:spaces]
453
+ nil ## skip space(s)
454
+ elsif m[:text]
455
+ [:GEO, m[:text]] ## keep pos - why? why not?
456
+ elsif m[:timezone]
457
+ [:TIMEZONE, m[:timezone]]
458
+ elsif m[:sym]
459
+ sym = m[:sym]
460
+ ## return symbols "inline" as is - why? why not?
461
+ ## (?<sym>[;,@|\[\]-])
462
+
463
+ case sym
464
+ when ',' then [:',']
465
+ when '[' then
466
+ ## get out-off geo mode and backtrack (w/ next)
467
+ puts " LEAVE GEO_RE MODE, BACK TO TOP_LEVEL/RE" if debug?
468
+ @re = RE
469
+ pos = old_pos
470
+ next ## backtrack (resume new loop step)
471
+ else
472
+ puts "!!! TOKENIZE ERROR (sym) - ignore sym >#{sym}<"
473
+ nil ## ignore others (e.g. brackets [])
474
+ end
475
+ elsif m[:any]
476
+ ## todo/check log error
477
+ msg = "parse error (tokenize geo) - skipping any match>#{m[:any]}< @#{offsets[0]},#{offsets[1]} in line >#{line}<"
478
+ puts "!! WARN - #{msg}"
479
+
480
+ errors << msg
481
+ log( "!! WARN - #{msg}" )
482
+
483
+ nil
484
+ else
485
+ ## report error/raise expection
486
+ puts "!!! TOKENIZE ERROR - no match found"
487
+ nil
488
+ end
489
+ elsif @re == PROP_CARDS_RE
448
490
  if m[:space] || m[:spaces]
449
491
  nil ## skip space(s)
450
492
  elsif m[:prop_name]
@@ -701,8 +743,6 @@ def _tokenize_line( line )
701
743
  date[:wday] = DAY_MAP[ m[:day_name].downcase ] if m[:day_name]
702
744
  ## note - for debugging keep (pass along) "literal" date
703
745
  [:DATE, [m[:date], date]]
704
- elsif m[:timezone]
705
- [:TIMEZONE, m[:timezone]]
706
746
  elsif m[:duration]
707
747
  ## todo/check/fix - if end: works for kwargs!!!!!
708
748
  duration = { start: {}, end: {}}
@@ -758,10 +798,13 @@ def _tokenize_line( line )
758
798
  ## (?<sym>[;,@|\[\]-])
759
799
 
760
800
  case sym
801
+ when '@' ## enter geo mode
802
+ puts " ENTER GEO_RE MODE" if debug?
803
+ @re = GEO_RE
804
+ [:'@']
761
805
  when ',' then [:',']
762
806
  when ';' then [:';']
763
807
  when '/' then [:'/']
764
- when '@' then [:'@']
765
808
  when '|' then [:'|']
766
809
  when '[' then [:'[']
767
810
  when ']' then [:']']
@@ -814,6 +857,11 @@ def _tokenize_line( line )
814
857
  @re = RE
815
858
  end
816
859
 
860
+ if @re == GEO_RE ### ALWAYS switch back to top level mode
861
+ puts " LEAVE GEO_RE MODE, BACK TO TOP_LEVEL/RE" if debug?
862
+ @re = RE
863
+ end
864
+
817
865
  ##
818
866
  ## if in prop mode continue if last token is [,-]
819
867
  ## otherwise change back to "standard" mode
data/lib/sportdb/parser/parser.rb CHANGED
@@ -9,22 +9,22 @@ class RaccMatchParser < Racc::Parser
9
9
  ##### State transition tables begin ###
10
10
 
11
11
  racc_action_table = [
12
- 20, 12, 21, 209, 56, 103, 171, 225, 22, 216,
13
- 80, 23, 81, 107, 222, 173, 24, 98, 49, 25,
14
- 26, 226, 27, 208, 103, 55, 31, 53, 118, 58,
15
- 28, 94, 46, 29, 33, 104, 34, 35, 217, 37,
16
- 40, 42, 43, 221, 20, 12, 21, 98, 84, 55,
17
- 51, 53, 22, 108, 104, 23, 174, 95, 97, 84,
18
- 24, 168, 49, 25, 26, 55, 27, 65, 86, 185,
19
- 31, 64, 91, 123, 28, 65, 46, 29, 33, 64,
20
- 34, 35, 89, 37, 40, 42, 43, 95, 97, 84,
21
- 68, 59, 68, 55, 51, 53, 110, 250, 68, 61,
22
- 214, 244, 75, 88, 70, 71, 70, 71, 76, 144,
23
- 113, 49, 70, 71, 143, 226, 152, 55, 77, 53,
24
- 100, 149, 101, 135, 242, 138, 151, 42, 43, 141,
25
- 137, 144, 147, 239, 144, 78, 143, 84, 189, 143,
26
- 241, 127, 130, 128, 129, 127, 130, 128, 129, 159,
27
- 160, 187, 188, -107, -108, 85, 46, 102, 114, 115,
12
+ 20, 12, 21, 209, 56, 239, 250, 225, 22, 214,
13
+ 144, 23, 241, 107, 171, 143, 24, 58, 49, 25,
14
+ 26, 226, 27, 208, 103, 242, 31, 20, 12, 21,
15
+ 28, 173, 46, 29, 33, 22, 34, 35, 23, 37,
16
+ 40, 42, 43, 24, 98, 49, 25, 26, 98, 27,
17
+ 55, 51, 53, 31, 108, 104, 84, 28, 94, 46,
18
+ 29, 33, 168, 34, 35, 118, 37, 40, 42, 43,
19
+ 103, 216, 174, 222, 135, 59, 138, 55, 51, 53,
20
+ 80, 137, 81, 86, 95, 97, 84, 91, 95, 97,
21
+ 84, 68, 55, 68, 53, 110, 55, 89, 53, 68,
22
+ 217, 104, 221, 55, 61, 70, 71, 70, 71, 113,
23
+ 49, 244, 152, 70, 71, 75, 65, 149, 88, 100,
24
+ 64, 101, 151, 159, 160, 226, 42, 43, 141, 147,
25
+ 144, 144, 187, 188, 189, 143, 143, 127, 130, 128,
26
+ 129, 185, 65, 76, 77, 123, 64, 127, 130, 128,
27
+ 129, 78, 84, -107, -108, 85, 46, 102, 114, 115,
28
28
  55, 123, 124, 131, 133, 134, 139, 140, 145, 146,
29
29
  155, 157, 161, 162, 164, 165, -97, 166, 46, 175,
30
30
  176, 177, 49, 179, 123, 181, 55, 183, 55, 191,
@@ -35,22 +35,22 @@ racc_action_table = [
35
35
  155, 248, 75, 251, 214, 253 ]
36
36
 
37
37
  racc_action_check = [
38
- 0, 0, 0, 149, 1, 45, 95, 169, 0, 156,
39
- 31, 0, 31, 46, 163, 96, 0, 39, 0, 0,
40
- 0, 169, 0, 149, 46, 31, 0, 31, 52, 21,
41
- 0, 39, 0, 0, 0, 45, 0, 0, 156, 0,
42
- 0, 0, 0, 163, 2, 2, 2, 92, 95, 0,
43
- 0, 0, 2, 46, 46, 2, 96, 39, 39, 39,
44
- 2, 92, 2, 2, 2, 52, 2, 24, 36, 121,
45
- 2, 24, 36, 121, 2, 136, 2, 2, 2, 136,
46
- 2, 2, 36, 2, 2, 2, 2, 92, 92, 92,
47
- 25, 22, 26, 2, 2, 2, 47, 247, 155, 23,
48
- 247, 224, 27, 36, 25, 25, 26, 26, 28, 215,
49
- 47, 47, 155, 155, 215, 224, 73, 51, 29, 51,
50
- 40, 73, 40, 62, 215, 62, 73, 40, 40, 66,
51
- 62, 66, 72, 214, 72, 30, 66, 32, 125, 72,
52
- 214, 125, 125, 125, 125, 58, 58, 58, 58, 77,
53
- 77, 123, 123, 33, 34, 35, 38, 43, 49, 50,
38
+ 0, 0, 0, 149, 1, 214, 247, 169, 0, 247,
39
+ 215, 0, 214, 46, 95, 215, 0, 21, 0, 0,
40
+ 0, 169, 0, 149, 46, 215, 0, 2, 2, 2,
41
+ 0, 96, 0, 0, 0, 2, 0, 0, 2, 0,
42
+ 0, 0, 0, 2, 39, 2, 2, 2, 92, 2,
43
+ 0, 0, 0, 2, 46, 46, 95, 2, 39, 2,
44
+ 2, 2, 92, 2, 2, 52, 2, 2, 2, 2,
45
+ 45, 156, 96, 163, 62, 22, 62, 2, 2, 2,
46
+ 31, 62, 31, 36, 39, 39, 39, 36, 92, 92,
47
+ 92, 25, 51, 26, 51, 47, 31, 36, 31, 155,
48
+ 156, 45, 163, 52, 23, 25, 25, 26, 26, 47,
49
+ 47, 224, 73, 155, 155, 27, 24, 73, 36, 40,
50
+ 24, 40, 73, 77, 77, 224, 40, 40, 66, 72,
51
+ 66, 72, 123, 123, 125, 66, 72, 125, 125, 125,
52
+ 125, 121, 136, 28, 29, 121, 136, 58, 58, 58,
53
+ 58, 30, 32, 33, 34, 35, 38, 43, 49, 50,
54
54
  53, 55, 56, 59, 60, 61, 64, 65, 68, 69,
55
55
  75, 76, 79, 82, 84, 87, 89, 90, 94, 97,
56
56
  106, 109, 111, 113, 114, 116, 117, 118, 120, 127,
@@ -61,31 +61,31 @@ racc_action_check = [
61
61
  239, 240, 241, 249, 250, 252 ]
62
62
 
63
63
  racc_action_pointer = [
64
- -1, 4, 43, nil, nil, nil, nil, nil, nil, nil,
64
+ -1, 4, 26, nil, nil, nil, nil, nil, nil, nil,
65
65
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
66
- nil, 25, 81, 84, 52, 75, 77, 87, 76, 86,
67
- 131, -25, 91, 120, 121, 151, 64, nil, 123, 13,
68
- 85, nil, nil, 115, nil, -14, 5, 92, nil, 108,
69
- 155, 67, 15, 110, nil, 139, 162, nil, 140, 152,
70
- 151, 149, 112, nil, 151, 151, 118, nil, 146, 147,
71
- nil, nil, 121, 108, nil, 143, 138, 114, nil, 144,
72
- nil, nil, 145, nil, 168, nil, nil, 137, nil, 136,
73
- 137, nil, 43, nil, 145, 2, 11, 175, nil, nil,
66
+ nil, 13, 65, 89, 101, 76, 78, 100, 111, 112,
67
+ 147, 45, 106, 120, 121, 151, 79, nil, 123, 40,
68
+ 84, nil, nil, 115, nil, 51, 5, 91, nil, 107,
69
+ 155, 41, 52, 109, nil, 139, 162, nil, 142, 152,
70
+ 151, 149, 63, nil, 151, 151, 117, nil, 146, 147,
71
+ nil, nil, 118, 104, nil, 143, 138, 88, nil, 144,
72
+ nil, nil, 145, nil, 126, nil, nil, 137, nil, 136,
73
+ 137, nil, 44, nil, 145, 10, 27, 175, nil, nil,
74
74
  nil, nil, nil, nil, nil, nil, 147, nil, nil, 148,
75
- nil, 163, nil, 179, 162, nil, 174, 136, 183, nil,
76
- 138, 51, nil, 98, nil, 136, nil, 183, 184, 185,
77
- 188, 189, 183, 181, nil, 192, 60, 193, 194, 183,
75
+ nil, 163, nil, 179, 162, nil, 174, 135, 183, nil,
76
+ 137, 123, nil, 78, nil, 132, nil, 183, 184, 185,
77
+ 188, 189, 183, 181, nil, 192, 127, 193, 194, 183,
78
78
  nil, 196, 186, nil, 198, nil, nil, 199, 193, -1,
79
- 190, 202, 203, 183, nil, 83, 5, nil, 205, nil,
80
- nil, 206, 207, -4, nil, 208, nil, nil, 180, 3,
79
+ 190, 202, 203, 183, nil, 84, 67, nil, 205, nil,
80
+ nil, 206, 207, 55, nil, 208, nil, nil, 180, 3,
81
81
  nil, nil, 210, nil, 211, nil, nil, nil, nil, nil,
82
- nil, 212, 167, nil, nil, 196, nil, nil, nil, nil,
82
+ nil, 212, 166, nil, nil, 196, nil, nil, nil, nil,
83
83
  nil, 215, 216, 217, nil, nil, 218, 213, nil, nil,
84
84
  nil, nil, nil, nil, nil, nil, nil, 220, 210, 202,
85
- nil, nil, nil, nil, 118, 96, nil, nil, nil, nil,
86
- nil, nil, 221, nil, 97, nil, 195, nil, nil, nil,
85
+ nil, nil, nil, nil, -10, -3, nil, nil, nil, nil,
86
+ nil, nil, 179, nil, 107, nil, 195, nil, nil, nil,
87
87
  nil, nil, nil, nil, nil, nil, nil, nil, 214, 203,
88
- 205, 217, nil, nil, nil, nil, nil, 75, nil, 207,
88
+ 205, 217, nil, nil, nil, nil, nil, -16, nil, 207,
89
89
  209, nil, 209, nil ]
90
90
 
91
91
  racc_action_default = [
@@ -184,162 +184,162 @@ racc_goto_default = [
184
184
 
185
185
  racc_reduce_table = [
186
186
  0, 0, :racc_error,
187
- 0, 56, :_reduce_none,
188
- 1, 56, :_reduce_none,
187
+ 0, 57, :_reduce_none,
189
188
  1, 57, :_reduce_none,
190
- 2, 57, :_reduce_none,
191
189
  1, 58, :_reduce_none,
192
- 1, 58, :_reduce_none,
193
- 1, 58, :_reduce_none,
194
- 1, 58, :_reduce_none,
195
- 1, 58, :_reduce_none,
196
- 1, 58, :_reduce_none,
197
- 1, 58, :_reduce_none,
198
- 1, 58, :_reduce_none,
199
- 1, 58, :_reduce_13,
200
- 1, 58, :_reduce_none,
201
- 1, 58, :_reduce_none,
202
- 1, 58, :_reduce_none,
203
- 1, 58, :_reduce_none,
204
- 1, 58, :_reduce_none,
205
- 1, 58, :_reduce_none,
206
- 1, 58, :_reduce_none,
207
- 1, 58, :_reduce_21,
208
- 4, 67, :_reduce_none,
209
- 1, 74, :_reduce_none,
210
- 2, 74, :_reduce_none,
211
- 3, 75, :_reduce_25,
212
- 3, 75, :_reduce_26,
213
- 3, 75, :_reduce_27,
190
+ 2, 58, :_reduce_none,
191
+ 1, 59, :_reduce_none,
192
+ 1, 59, :_reduce_none,
193
+ 1, 59, :_reduce_none,
194
+ 1, 59, :_reduce_none,
195
+ 1, 59, :_reduce_none,
196
+ 1, 59, :_reduce_none,
197
+ 1, 59, :_reduce_none,
198
+ 1, 59, :_reduce_none,
199
+ 1, 59, :_reduce_13,
200
+ 1, 59, :_reduce_none,
201
+ 1, 59, :_reduce_none,
202
+ 1, 59, :_reduce_none,
203
+ 1, 59, :_reduce_none,
204
+ 1, 59, :_reduce_none,
205
+ 1, 59, :_reduce_none,
206
+ 1, 59, :_reduce_none,
207
+ 1, 59, :_reduce_21,
208
+ 4, 68, :_reduce_none,
209
+ 1, 75, :_reduce_none,
214
210
  2, 75, :_reduce_none,
215
- 4, 73, :_reduce_29,
216
- 5, 72, :_reduce_30,
217
- 0, 77, :_reduce_none,
218
- 3, 77, :_reduce_32,
219
- 1, 76, :_reduce_33,
220
- 2, 76, :_reduce_34,
221
- 4, 71, :_reduce_35,
222
- 1, 78, :_reduce_36,
223
- 3, 78, :_reduce_37,
224
- 1, 80, :_reduce_none,
225
- 2, 80, :_reduce_none,
226
- 1, 80, :_reduce_none,
227
- 2, 80, :_reduce_none,
228
- 2, 79, :_reduce_42,
229
- 3, 79, :_reduce_43,
230
- 1, 79, :_reduce_44,
231
- 2, 79, :_reduce_45,
232
- 4, 69, :_reduce_46,
233
- 4, 70, :_reduce_47,
234
- 1, 81, :_reduce_48,
235
- 3, 81, :_reduce_49,
236
- 1, 83, :_reduce_none,
237
- 1, 83, :_reduce_none,
238
- 2, 83, :_reduce_none,
239
- 1, 82, :_reduce_53,
240
- 2, 82, :_reduce_54,
241
- 5, 68, :_reduce_55,
242
- 0, 85, :_reduce_56,
243
- 3, 85, :_reduce_57,
244
- 4, 85, :_reduce_58,
245
- 1, 84, :_reduce_59,
246
- 3, 84, :_reduce_60,
247
- 1, 87, :_reduce_none,
248
- 2, 87, :_reduce_62,
249
- 1, 87, :_reduce_none,
250
- 2, 87, :_reduce_64,
251
- 3, 86, :_reduce_65,
252
- 0, 88, :_reduce_66,
253
- 1, 88, :_reduce_67,
254
- 0, 89, :_reduce_68,
255
- 6, 89, :_reduce_69,
256
- 3, 89, :_reduce_70,
257
- 4, 89, :_reduce_71,
258
- 3, 90, :_reduce_72,
259
- 1, 81, :_reduce_73,
260
- 2, 81, :_reduce_74,
261
- 1, 91, :_reduce_none,
262
- 1, 91, :_reduce_none,
263
- 4, 62, :_reduce_77,
264
- 1, 92, :_reduce_78,
265
- 2, 92, :_reduce_79,
266
- 4, 63, :_reduce_80,
267
- 1, 93, :_reduce_81,
268
- 1, 93, :_reduce_82,
269
- 2, 59, :_reduce_83,
270
- 4, 59, :_reduce_84,
271
- 1, 94, :_reduce_none,
272
- 2, 94, :_reduce_86,
273
- 1, 95, :_reduce_87,
274
- 1, 95, :_reduce_88,
275
- 2, 60, :_reduce_89,
276
- 2, 61, :_reduce_90,
277
- 4, 61, :_reduce_91,
278
- 1, 98, :_reduce_none,
279
- 1, 98, :_reduce_none,
280
- 1, 97, :_reduce_94,
281
- 3, 97, :_reduce_95,
211
+ 3, 76, :_reduce_25,
212
+ 3, 76, :_reduce_26,
213
+ 3, 76, :_reduce_27,
214
+ 2, 76, :_reduce_none,
215
+ 4, 74, :_reduce_29,
216
+ 5, 73, :_reduce_30,
217
+ 0, 78, :_reduce_none,
218
+ 3, 78, :_reduce_32,
219
+ 1, 77, :_reduce_33,
220
+ 2, 77, :_reduce_34,
221
+ 4, 72, :_reduce_35,
222
+ 1, 79, :_reduce_36,
223
+ 3, 79, :_reduce_37,
224
+ 1, 81, :_reduce_none,
225
+ 2, 81, :_reduce_none,
226
+ 1, 81, :_reduce_none,
227
+ 2, 81, :_reduce_none,
228
+ 2, 80, :_reduce_42,
229
+ 3, 80, :_reduce_43,
230
+ 1, 80, :_reduce_44,
231
+ 2, 80, :_reduce_45,
232
+ 4, 70, :_reduce_46,
233
+ 4, 71, :_reduce_47,
234
+ 1, 82, :_reduce_48,
235
+ 3, 82, :_reduce_49,
236
+ 1, 84, :_reduce_none,
237
+ 1, 84, :_reduce_none,
238
+ 2, 84, :_reduce_none,
239
+ 1, 83, :_reduce_53,
240
+ 2, 83, :_reduce_54,
241
+ 5, 69, :_reduce_55,
242
+ 0, 86, :_reduce_56,
243
+ 3, 86, :_reduce_57,
244
+ 4, 86, :_reduce_58,
245
+ 1, 85, :_reduce_59,
246
+ 3, 85, :_reduce_60,
247
+ 1, 88, :_reduce_none,
248
+ 2, 88, :_reduce_62,
249
+ 1, 88, :_reduce_none,
250
+ 2, 88, :_reduce_64,
251
+ 3, 87, :_reduce_65,
252
+ 0, 89, :_reduce_66,
253
+ 1, 89, :_reduce_67,
254
+ 0, 90, :_reduce_68,
255
+ 6, 90, :_reduce_69,
256
+ 3, 90, :_reduce_70,
257
+ 4, 90, :_reduce_71,
258
+ 3, 91, :_reduce_72,
259
+ 1, 82, :_reduce_73,
260
+ 2, 82, :_reduce_74,
261
+ 1, 92, :_reduce_none,
262
+ 1, 92, :_reduce_none,
263
+ 4, 63, :_reduce_77,
264
+ 1, 93, :_reduce_78,
265
+ 2, 93, :_reduce_79,
266
+ 4, 64, :_reduce_80,
267
+ 1, 94, :_reduce_81,
268
+ 1, 94, :_reduce_82,
269
+ 2, 60, :_reduce_83,
270
+ 4, 60, :_reduce_84,
271
+ 1, 95, :_reduce_none,
272
+ 2, 95, :_reduce_86,
273
+ 1, 96, :_reduce_87,
274
+ 1, 96, :_reduce_88,
275
+ 2, 61, :_reduce_89,
276
+ 2, 62, :_reduce_90,
277
+ 4, 62, :_reduce_91,
282
278
  1, 99, :_reduce_none,
283
279
  1, 99, :_reduce_none,
284
- 3, 64, :_reduce_98,
285
- 2, 64, :_reduce_99,
286
- 5, 64, :_reduce_100,
287
- 4, 64, :_reduce_101,
288
- 1, 103, :_reduce_102,
289
- 3, 103, :_reduce_103,
290
- 1, 100, :_reduce_104,
291
- 2, 100, :_reduce_105,
280
+ 1, 98, :_reduce_94,
281
+ 3, 98, :_reduce_95,
292
282
  1, 100, :_reduce_none,
293
- 1, 104, :_reduce_107,
294
- 1, 104, :_reduce_108,
295
- 1, 104, :_reduce_109,
296
- 1, 104, :_reduce_110,
297
- 2, 104, :_reduce_111,
298
- 2, 102, :_reduce_112,
299
- 3, 102, :_reduce_113,
300
- 2, 102, :_reduce_114,
301
- 3, 102, :_reduce_115,
302
- 2, 102, :_reduce_116,
303
- 1, 102, :_reduce_117,
304
- 2, 96, :_reduce_118,
305
- 3, 96, :_reduce_119,
306
- 1, 105, :_reduce_120,
307
- 3, 105, :_reduce_121,
308
- 1, 101, :_reduce_none,
283
+ 1, 100, :_reduce_none,
284
+ 3, 65, :_reduce_98,
285
+ 2, 65, :_reduce_99,
286
+ 5, 65, :_reduce_100,
287
+ 4, 65, :_reduce_101,
288
+ 1, 104, :_reduce_102,
289
+ 3, 104, :_reduce_103,
290
+ 1, 101, :_reduce_104,
291
+ 2, 101, :_reduce_105,
309
292
  1, 101, :_reduce_none,
310
- 3, 107, :_reduce_124,
311
- 1, 108, :_reduce_none,
312
- 1, 108, :_reduce_none,
293
+ 1, 105, :_reduce_107,
294
+ 1, 105, :_reduce_108,
295
+ 1, 105, :_reduce_109,
296
+ 1, 105, :_reduce_110,
297
+ 2, 105, :_reduce_111,
298
+ 2, 103, :_reduce_112,
299
+ 3, 103, :_reduce_113,
300
+ 2, 103, :_reduce_114,
301
+ 3, 103, :_reduce_115,
302
+ 2, 103, :_reduce_116,
303
+ 1, 103, :_reduce_117,
304
+ 2, 97, :_reduce_118,
305
+ 3, 97, :_reduce_119,
306
+ 1, 106, :_reduce_120,
307
+ 3, 106, :_reduce_121,
308
+ 1, 102, :_reduce_none,
309
+ 1, 102, :_reduce_none,
310
+ 3, 108, :_reduce_124,
313
311
  1, 109, :_reduce_none,
314
312
  1, 109, :_reduce_none,
315
- 3, 106, :_reduce_129,
316
- 2, 106, :_reduce_130,
317
- 2, 66, :_reduce_131,
318
- 1, 110, :_reduce_132,
319
- 3, 110, :_reduce_133,
320
- 2, 110, :_reduce_134,
321
- 1, 112, :_reduce_none,
322
- 2, 112, :_reduce_none,
323
- 2, 111, :_reduce_137,
324
- 3, 111, :_reduce_138,
325
- 4, 65, :_reduce_139,
326
- 2, 65, :_reduce_140,
327
- 4, 65, :_reduce_141,
328
- 1, 114, :_reduce_142,
329
- 2, 114, :_reduce_143,
330
- 3, 114, :_reduce_144,
331
- 1, 116, :_reduce_none,
332
- 2, 116, :_reduce_none,
333
- 1, 115, :_reduce_147,
334
- 2, 115, :_reduce_148,
335
- 2, 117, :_reduce_149,
336
- 1, 118, :_reduce_150,
337
- 2, 118, :_reduce_151,
338
- 3, 118, :_reduce_152,
339
- 1, 113, :_reduce_153,
340
- 2, 113, :_reduce_154,
341
- 1, 119, :_reduce_155,
342
- 1, 119, :_reduce_156 ]
313
+ 1, 110, :_reduce_none,
314
+ 1, 110, :_reduce_none,
315
+ 3, 107, :_reduce_129,
316
+ 2, 107, :_reduce_130,
317
+ 2, 67, :_reduce_131,
318
+ 1, 111, :_reduce_132,
319
+ 3, 111, :_reduce_133,
320
+ 2, 111, :_reduce_134,
321
+ 1, 113, :_reduce_none,
322
+ 2, 113, :_reduce_none,
323
+ 2, 112, :_reduce_137,
324
+ 3, 112, :_reduce_138,
325
+ 4, 66, :_reduce_139,
326
+ 2, 66, :_reduce_140,
327
+ 4, 66, :_reduce_141,
328
+ 1, 115, :_reduce_142,
329
+ 2, 115, :_reduce_143,
330
+ 3, 115, :_reduce_144,
331
+ 1, 117, :_reduce_none,
332
+ 2, 117, :_reduce_none,
333
+ 1, 116, :_reduce_147,
334
+ 2, 116, :_reduce_148,
335
+ 2, 118, :_reduce_149,
336
+ 1, 119, :_reduce_150,
337
+ 2, 119, :_reduce_151,
338
+ 3, 119, :_reduce_152,
339
+ 1, 114, :_reduce_153,
340
+ 2, 114, :_reduce_154,
341
+ 1, 120, :_reduce_155,
342
+ 1, 120, :_reduce_156 ]
343
343
 
344
344
  racc_reduce_n = 157
345
345
 
@@ -394,15 +394,16 @@ racc_token_table = {
394
394
  :NOTE => 45,
395
395
  "@" => 46,
396
396
  :TIMEZONE => 47,
397
- :VS => 48,
398
- :SCORE_MORE => 49,
399
- :PLAYER => 50,
400
- :PROP_GOALS => 51,
401
- :NONE => 52,
402
- :OG => 53,
403
- :PEN => 54 }
397
+ :GEO => 48,
398
+ :VS => 49,
399
+ :SCORE_MORE => 50,
400
+ :PLAYER => 51,
401
+ :PROP_GOALS => 52,
402
+ :NONE => 53,
403
+ :OG => 54,
404
+ :PEN => 55 }
404
405
 
405
- racc_nt_base = 55
406
+ racc_nt_base = 56
406
407
 
407
408
  racc_use_result_var = true
408
409
 
@@ -472,6 +473,7 @@ Racc_token_to_s_table = [
472
473
  "NOTE",
473
474
  "\"@\"",
474
475
  "TIMEZONE",
476
+ "GEO",
475
477
  "VS",
476
478
  "SCORE_MORE",
477
479
  "PLAYER",
data/lib/sportdb/parser/token.rb CHANGED
@@ -134,7 +134,6 @@ ANY_RE = %r{
134
134
  RE = Regexp.union(
135
135
  STATUS_RE,
136
136
  NOTE_RE,
137
- TIMEZONE_RE,
138
137
  DURATION_RE, # note - duration MUST match before date
139
138
  DATE_RE, ## note - date must go before time (e.g. 12.12. vs 12.12)
140
139
  TIME_RE,
@@ -148,6 +147,21 @@ RE = Regexp.union(
148
147
  )
149
148
 
150
149
 
150
+ GEO_BASICS_RE = %r{
151
+ (?<spaces> [ ]{2,}) |
152
+ (?<space> [ ])
153
+ |
154
+ (?<sym> [,\[] )
155
+ }ix
156
+
157
+
158
+ GEO_RE = Regexp.union(
159
+ TIMEZONE_RE,
160
+ GEO_BASICS_RE,
161
+ TEXT_RE,
162
+ ANY_RE,
163
+ )
164
+
151
165
 
152
166
  ######################################################
153
167
  ## goal mode (switched to by PLAYER_WITH_MINUTE_RE)
data/lib/sportdb/parser/version.rb CHANGED
@@ -4,7 +4,7 @@ module SportDb
4
4
  module Parser
5
5
  MAJOR = 0 ## todo: namespace inside version or something - why? why not??
6
6
  MINOR = 6
7
- PATCH = 9
7
+ PATCH = 10
8
8
  VERSION = [MAJOR,MINOR,PATCH].join('.')
9
9
 
10
10
  def self.version
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sportdb-parser
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.9
4
+ version: 0.6.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gerald Bauer