sportdb-parser 0.6.10 → 0.6.11
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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1 -1
- data/lib/sportdb/parser/lexer.rb +4 -2
- data/lib/sportdb/parser/parser.rb +370 -349
- data/lib/sportdb/parser/racc_tree.rb +5 -3
- data/lib/sportdb/parser/token-status.rb +81 -8
- data/lib/sportdb/parser/token.rb +1 -0
- data/lib/sportdb/parser/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '0902e4f811d2584b7c7360f00557d979579d5df8b48e3370ace0d3e7d211c45d'
|
4
|
+
data.tar.gz: e03327cfb9f33e39c3cc44063f9915ccc48d1c78b8076ee9fd7ba511d7b7bdc5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 14e1f06f0fd5137208cce8a26f9a534317f0538a59f1701ae0140914afae9bed2963979df71d1032771798983dcf5ee5197c0105c6fb040c0e72052b86d282b5
|
7
|
+
data.tar.gz: e8b973f129cf11f951ba5629b81c53896bec02b949b4eb8d7c175b5fae54e33e31788cdfc18985f0d2759dfc473758512523adddf122e4c5293ce2c45d28543f
|
data/CHANGELOG.md
CHANGED
data/lib/sportdb/parser/lexer.rb
CHANGED
@@ -711,8 +711,10 @@ def _tokenize_line( line )
|
|
711
711
|
elsif m[:note]
|
712
712
|
### todo/check:
|
713
713
|
## use value hash - why? why not? or simplify to:
|
714
|
-
##
|
715
|
-
[:NOTE,
|
714
|
+
## [:NOTE, [m[:note], {note: m[:note] } ]]
|
715
|
+
[:NOTE, m[:note]]
|
716
|
+
elsif m[:score_note]
|
717
|
+
[:SCORE_NOTE, m[:score_note]]
|
716
718
|
elsif m[:time]
|
717
719
|
## unify to iso-format
|
718
720
|
### 12.40 => 12:40
|
@@ -9,341 +9,343 @@ class RaccMatchParser < Racc::Parser
|
|
9
9
|
##### State transition tables begin ###
|
10
10
|
|
11
11
|
racc_action_table = [
|
12
|
-
20, 12, 21,
|
13
|
-
|
14
|
-
26,
|
15
|
-
28,
|
16
|
-
40, 42, 43,
|
17
|
-
55, 51, 53,
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
12
|
+
20, 12, 21, 98, 103, 152, 242, 56, 22, 173,
|
13
|
+
149, 23, 58, 244, 107, 151, 24, 94, 49, 25,
|
14
|
+
26, 118, 27, 59, 86, 103, 31, 171, 91, 218,
|
15
|
+
28, 61, 46, 29, 33, 104, 34, 35, 89, 37,
|
16
|
+
40, 42, 43, 95, 97, 84, 20, 12, 21, 98,
|
17
|
+
174, 55, 51, 53, 22, 108, 104, 23, 219, 88,
|
18
|
+
55, 211, 24, 168, 49, 25, 26, 224, 27, 84,
|
19
|
+
227, 253, 31, 75, 216, 80, 28, 81, 46, 29,
|
20
|
+
33, 210, 34, 35, 228, 37, 40, 42, 43, 95,
|
21
|
+
97, 84, 55, 68, 53, 68, 223, 55, 51, 53,
|
22
|
+
110, 65, 68, 76, 247, 64, 144, 70, 71, 70,
|
23
|
+
71, 143, 159, 160, 113, 49, 70, 71, 228, 77,
|
24
|
+
100, 245, 101, 135, 141, 138, 144, 42, 43, 187,
|
25
|
+
137, 143, 147, 123, 144, 78, 55, 191, 53, 143,
|
26
|
+
127, 130, 128, 129, 65, 189, 190, 84, 64, 127,
|
27
|
+
130, 128, 129, -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
|
-
176,
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
155,
|
30
|
+
176, 178, 179, 49, 181, 123, 183, 55, 185, 55,
|
31
|
+
193, 194, 195, 196, 197, 198, 199, 200, 202, 203,
|
32
|
+
204, 205, 68, 207, 208, 209, 75, 213, 214, 216,
|
33
|
+
220, 221, 222, 225, 46, 229, 230, 176, 232, 55,
|
34
|
+
123, 234, 235, 236, 237, 238, 239, 240, 241, 246,
|
35
|
+
46, 249, 155, 251, 75, 254, 216, 256 ]
|
36
36
|
|
37
37
|
racc_action_check = [
|
38
|
-
0, 0, 0,
|
39
|
-
|
40
|
-
0,
|
41
|
-
0,
|
42
|
-
0, 0, 0,
|
43
|
-
0, 0, 0, 2, 46, 46,
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
92,
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
66, 72,
|
52
|
-
125,
|
53
|
-
58,
|
38
|
+
0, 0, 0, 39, 45, 73, 216, 1, 0, 96,
|
39
|
+
73, 0, 21, 216, 46, 73, 0, 39, 0, 0,
|
40
|
+
0, 52, 0, 22, 36, 46, 0, 95, 36, 156,
|
41
|
+
0, 23, 0, 0, 0, 45, 0, 0, 36, 0,
|
42
|
+
0, 0, 0, 39, 39, 39, 2, 2, 2, 92,
|
43
|
+
96, 0, 0, 0, 2, 46, 46, 2, 156, 36,
|
44
|
+
52, 149, 2, 92, 2, 2, 2, 163, 2, 95,
|
45
|
+
169, 250, 2, 27, 250, 31, 2, 31, 2, 2,
|
46
|
+
2, 149, 2, 2, 169, 2, 2, 2, 2, 92,
|
47
|
+
92, 92, 31, 25, 31, 26, 163, 2, 2, 2,
|
48
|
+
47, 24, 155, 28, 226, 24, 217, 25, 25, 26,
|
49
|
+
26, 217, 77, 77, 47, 47, 155, 155, 226, 29,
|
50
|
+
40, 217, 40, 62, 66, 62, 66, 40, 40, 121,
|
51
|
+
62, 66, 72, 121, 72, 30, 51, 125, 51, 72,
|
52
|
+
125, 125, 125, 125, 136, 123, 123, 32, 136, 58,
|
53
|
+
58, 58, 58, 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
|
-
106, 109, 111, 113, 114, 116, 117, 118, 120,
|
57
|
-
128, 129, 130, 131, 132, 133, 135, 137, 138,
|
58
|
-
141, 142, 144, 147, 148, 150, 151, 152, 153,
|
59
|
-
161, 162, 165, 168, 172, 174,
|
60
|
-
|
61
|
-
|
56
|
+
105, 106, 109, 111, 113, 114, 116, 117, 118, 120,
|
57
|
+
127, 128, 129, 130, 131, 132, 133, 135, 137, 138,
|
58
|
+
139, 141, 142, 144, 147, 148, 150, 151, 152, 153,
|
59
|
+
158, 161, 162, 165, 168, 172, 174, 179, 183, 184,
|
60
|
+
187, 193, 194, 195, 198, 199, 209, 210, 211, 224,
|
61
|
+
228, 241, 242, 243, 244, 252, 253, 255 ]
|
62
62
|
|
63
63
|
racc_action_pointer = [
|
64
|
-
-1,
|
64
|
+
-1, 7, 45, nil, nil, nil, nil, nil, nil, nil,
|
65
65
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
66
|
-
nil, 13,
|
67
|
-
|
68
|
-
|
69
|
-
155,
|
70
|
-
151, 149,
|
71
|
-
nil, nil,
|
66
|
+
nil, 8, 13, 16, 86, 78, 80, 58, 71, 87,
|
67
|
+
131, 40, 101, 120, 121, 151, 20, nil, 123, -1,
|
68
|
+
85, nil, nil, 115, nil, -15, 6, 96, nil, 106,
|
69
|
+
155, 84, 8, 108, nil, 139, 162, nil, 144, 152,
|
70
|
+
151, 149, 112, nil, 151, 151, 113, nil, 146, 147,
|
71
|
+
nil, nil, 121, -3, nil, 143, 138, 77, nil, 144,
|
72
72
|
nil, nil, 145, nil, 126, nil, nil, 137, nil, 136,
|
73
|
-
137, nil,
|
74
|
-
nil, nil, nil, nil, nil,
|
75
|
-
nil,
|
76
|
-
137,
|
77
|
-
|
78
|
-
nil,
|
79
|
-
|
80
|
-
nil,
|
81
|
-
nil, nil,
|
82
|
-
nil,
|
83
|
-
nil,
|
84
|
-
nil, nil, nil, nil, nil, nil, nil,
|
85
|
-
|
86
|
-
nil, nil,
|
87
|
-
nil, nil, nil, nil, nil, nil, nil, nil,
|
88
|
-
|
89
|
-
209, nil,
|
73
|
+
137, nil, 45, nil, 145, 23, 5, 175, nil, nil,
|
74
|
+
nil, nil, nil, nil, nil, 129, 148, nil, nil, 149,
|
75
|
+
nil, 164, nil, 180, 163, nil, 175, 135, 184, nil,
|
76
|
+
137, 111, nil, 90, nil, 135, nil, 184, 185, 186,
|
77
|
+
189, 190, 184, 182, nil, 193, 129, 194, 195, 184,
|
78
|
+
nil, 197, 187, nil, 199, nil, nil, 200, 194, 57,
|
79
|
+
191, 203, 204, 184, nil, 87, 25, nil, 206, nil,
|
80
|
+
nil, 207, 208, 49, nil, 209, nil, nil, 181, 66,
|
81
|
+
nil, nil, 211, nil, 212, nil, nil, nil, nil, 166,
|
82
|
+
nil, nil, nil, 214, 167, nil, nil, 198, nil, nil,
|
83
|
+
nil, nil, nil, 217, 218, 219, nil, nil, 220, 215,
|
84
|
+
nil, nil, nil, nil, nil, nil, nil, nil, nil, 222,
|
85
|
+
212, 204, nil, nil, nil, nil, -9, 93, nil, nil,
|
86
|
+
nil, nil, nil, nil, 181, nil, 100, nil, 197, nil,
|
87
|
+
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
88
|
+
nil, 216, 205, 207, 219, nil, nil, nil, nil, nil,
|
89
|
+
49, nil, 209, 211, nil, 211, nil ]
|
90
90
|
|
91
91
|
racc_action_default = [
|
92
|
-
-1, -
|
92
|
+
-1, -159, -2, -3, -5, -6, -7, -8, -9, -10,
|
93
93
|
-11, -12, -13, -14, -15, -16, -17, -18, -19, -20,
|
94
|
-
-21, -
|
95
|
-
-
|
96
|
-
-104, -106, -109, -110, -122, -123, -
|
97
|
-
-
|
98
|
-
-31, -33, -
|
99
|
-
-75, -76, -
|
100
|
-
-87, -88, -
|
101
|
-
-
|
102
|
-
-107, -108, -111, -127, -128, -
|
103
|
-
-
|
104
|
-
-
|
105
|
-
-
|
106
|
-
-45, -
|
107
|
-
-
|
108
|
-
-82, -
|
109
|
-
-102, -112, -
|
110
|
-
-
|
111
|
-
-24, -
|
112
|
-
-39, -41, -43, -46, -49, -52, -47, -
|
113
|
-
-60, -62, -64, -65, -
|
114
|
-
-
|
115
|
-
-
|
116
|
-
-
|
117
|
-
-68, -71, -
|
94
|
+
-21, -159, -159, -159, -159, -159, -159, -159, -159, -159,
|
95
|
+
-159, -159, -85, -87, -88, -159, -159, -94, -159, -159,
|
96
|
+
-104, -106, -109, -110, -122, -123, -159, -159, -134, -159,
|
97
|
+
-159, -159, -144, -159, -149, -159, -159, -4, -159, -159,
|
98
|
+
-31, -33, -159, -36, -159, -44, -159, -48, -53, -73,
|
99
|
+
-75, -76, -159, -56, -59, -66, -159, -159, -83, -159,
|
100
|
+
-87, -88, -159, -86, -159, -89, -90, -159, -92, -93,
|
101
|
+
-159, -96, -159, -99, -159, -159, -159, -159, -117, -105,
|
102
|
+
-107, -108, -111, -127, -128, -129, -159, -125, -126, -159,
|
103
|
+
-133, -159, -136, -137, -139, -142, -159, -159, -147, -150,
|
104
|
+
-145, -151, -152, -155, 257, -159, -23, -159, -159, -159,
|
105
|
+
-159, -159, -159, -159, -34, -159, -159, -38, -40, -42,
|
106
|
+
-45, -159, -159, -50, -51, -54, -74, -159, -159, -159,
|
107
|
+
-159, -61, -63, -68, -67, -159, -159, -78, -159, -81,
|
108
|
+
-82, -159, -159, -118, -120, -159, -95, -98, -159, -159,
|
109
|
+
-102, -112, -159, -114, -159, -116, -130, -132, -124, -129,
|
110
|
+
-135, -138, -140, -159, -146, -148, -153, -159, -156, -157,
|
111
|
+
-158, -22, -24, -159, -159, -159, -28, -29, -159, -159,
|
112
|
+
-35, -37, -39, -41, -43, -46, -49, -52, -47, -159,
|
113
|
+
-159, -159, -60, -62, -64, -65, -159, -159, -77, -79,
|
114
|
+
-80, -84, -141, -119, -159, -91, -159, -101, -159, -113,
|
115
|
+
-115, -131, -143, -154, -25, -26, -27, -30, -32, -55,
|
116
|
+
-57, -159, -66, -159, -159, -72, -121, -100, -103, -58,
|
117
|
+
-68, -70, -159, -68, -71, -159, -69 ]
|
118
118
|
|
119
119
|
racc_goto_table = [
|
120
|
-
74, 92, 153,
|
121
|
-
|
122
|
-
2, 125, 60, 132, 62, 136,
|
123
|
-
|
124
|
-
111, 117, 121,
|
120
|
+
74, 92, 153, 122, 119, 63, 169, 66, 72, 177,
|
121
|
+
126, 112, 120, 93, 82, 83, 3, 1, 57, 105,
|
122
|
+
109, 2, 125, 60, 132, 62, 136, 206, 73, 148,
|
123
|
+
150, 255, 156, 158, 116, 79, 87, 90, 99, 163,
|
124
|
+
106, 111, 117, 121, 188, nil, nil, nil, nil, nil,
|
125
125
|
nil, nil, nil, nil, nil, nil, nil, 170, nil, nil,
|
126
|
-
nil, nil, nil, nil,
|
127
|
-
nil,
|
128
|
-
|
129
|
-
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
126
|
+
nil, nil, 182, nil, nil, nil, 167, nil, nil, 186,
|
127
|
+
nil, nil, 119, nil, nil, 180, 184, 192, 172, nil,
|
128
|
+
226, nil, nil, 231, nil, nil, nil, nil, nil, nil,
|
130
129
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
131
|
-
nil, nil, nil, nil, nil, nil, nil, nil, nil, 199,
|
132
|
-
nil, nil, nil, 210, nil, nil, nil, nil, nil, nil,
|
133
|
-
nil, 170, nil, 215, nil, 230, 119, nil, nil, nil,
|
134
130
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
131
|
+
nil, nil, nil, nil, nil, nil, nil, 201, nil, nil,
|
132
|
+
nil, nil, nil, 212, nil, nil, nil, nil, nil, nil,
|
133
|
+
nil, 170, nil, nil, nil, 233, 119, 217, nil, nil,
|
135
134
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
136
|
-
nil, nil, nil, nil, nil, nil, 247, nil, nil, nil,
|
137
135
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
138
|
-
nil, nil, nil, nil, nil, nil, nil,
|
136
|
+
nil, nil, nil, nil, nil, nil, nil, nil, nil, 250,
|
139
137
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
138
|
+
nil, nil, nil, nil, nil, nil, nil, nil, nil, 243,
|
139
|
+
nil, 248, nil, nil, nil, nil, nil, nil, nil, nil,
|
140
140
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
141
|
-
nil, nil, nil, nil,
|
141
|
+
nil, nil, nil, nil, nil, nil, nil, 252 ]
|
142
142
|
|
143
143
|
racc_goto_check = [
|
144
|
-
31, 46, 33,
|
145
|
-
|
146
|
-
2, 19, 21, 22, 23, 25, 27, 29, 30,
|
147
|
-
34, 37, 38,
|
148
|
-
|
144
|
+
31, 46, 33, 59, 63, 24, 48, 26, 26, 55,
|
145
|
+
20, 57, 61, 47, 60, 41, 3, 1, 3, 54,
|
146
|
+
54, 2, 19, 21, 22, 23, 25, 27, 29, 30,
|
147
|
+
32, 34, 37, 38, 60, 39, 43, 44, 49, 50,
|
148
|
+
53, 58, 62, 64, 65, nil, nil, nil, nil, nil,
|
149
149
|
nil, nil, nil, nil, nil, nil, nil, 46, nil, nil,
|
150
|
-
nil, nil, nil, nil,
|
151
|
-
nil,
|
152
|
-
nil, nil,
|
150
|
+
nil, nil, 59, nil, nil, nil, 47, nil, nil, 59,
|
151
|
+
nil, nil, 63, nil, nil, 57, 61, 20, 41, nil,
|
152
|
+
48, nil, nil, 55, nil, nil, nil, nil, nil, nil,
|
153
153
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
154
154
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
155
|
-
nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
155
|
+
nil, nil, nil, nil, nil, nil, nil, 24, nil, nil,
|
156
156
|
nil, nil, nil, 31, nil, nil, nil, nil, nil, nil,
|
157
|
-
nil, 46, nil,
|
158
|
-
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
157
|
+
nil, 46, nil, nil, nil, 59, 63, 26, nil, nil,
|
159
158
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
160
|
-
nil, nil, nil, nil, nil, nil, 33, nil, nil, nil,
|
161
159
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
162
|
-
nil, nil, nil, nil, nil, nil, nil,
|
160
|
+
nil, nil, nil, nil, nil, nil, nil, nil, nil, 33,
|
163
161
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
162
|
+
nil, nil, nil, nil, nil, nil, nil, nil, nil, 31,
|
163
|
+
nil, 46, nil, nil, nil, nil, nil, nil, nil, nil,
|
164
164
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
165
|
-
nil, nil, nil, nil, 31 ]
|
165
|
+
nil, nil, nil, nil, nil, nil, nil, 31 ]
|
166
166
|
|
167
167
|
racc_goto_pointer = [
|
168
|
-
nil,
|
169
|
-
nil, nil, nil, nil, nil, nil, nil, nil, nil, -
|
170
|
-
-
|
171
|
-
-
|
172
|
-
nil, -
|
173
|
-
-
|
174
|
-
-
|
168
|
+
nil, 17, 21, 16, nil, nil, nil, nil, nil, nil,
|
169
|
+
nil, nil, nil, nil, nil, nil, nil, nil, nil, -36,
|
170
|
+
-48, 0, -36, 1, -19, -36, -18, -115, nil, 1,
|
171
|
+
-44, -27, -43, -73, -222, nil, nil, -44, -44, 4,
|
172
|
+
nil, -17, nil, 0, 1, nil, -37, -26, -88, -2,
|
173
|
+
-45, nil, nil, -6, -26, -96, nil, -36, -6, -52,
|
174
|
+
-17, -41, -10, -48, -12, -79 ]
|
175
175
|
|
176
176
|
racc_goto_default = [
|
177
177
|
nil, nil, nil, nil, 4, 5, 6, 7, 8, 9,
|
178
178
|
10, 11, 13, 14, 15, 16, 17, 18, 19, nil,
|
179
179
|
nil, nil, nil, nil, nil, nil, nil, 67, 142, nil,
|
180
|
-
nil, nil, nil, nil,
|
180
|
+
nil, nil, nil, nil, 215, 154, 69, nil, nil, 30,
|
181
181
|
32, 96, 36, nil, nil, 38, 39, nil, nil, 41,
|
182
|
-
nil, 44, 45, nil, nil, 47, 48, nil, nil,
|
183
|
-
52, nil, 54, nil, nil ]
|
182
|
+
nil, 44, 45, nil, nil, nil, 47, 48, nil, nil,
|
183
|
+
50, 52, nil, 54, nil, nil ]
|
184
184
|
|
185
185
|
racc_reduce_table = [
|
186
186
|
0, 0, :racc_error,
|
187
|
-
0,
|
188
|
-
1, 57, :_reduce_none,
|
187
|
+
0, 58, :_reduce_none,
|
189
188
|
1, 58, :_reduce_none,
|
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
189
|
1, 59, :_reduce_none,
|
199
|
-
|
200
|
-
1,
|
201
|
-
1,
|
202
|
-
1,
|
203
|
-
1,
|
204
|
-
1,
|
205
|
-
1,
|
206
|
-
1,
|
207
|
-
1,
|
208
|
-
|
209
|
-
1,
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
190
|
+
2, 59, :_reduce_none,
|
191
|
+
1, 60, :_reduce_none,
|
192
|
+
1, 60, :_reduce_none,
|
193
|
+
1, 60, :_reduce_none,
|
194
|
+
1, 60, :_reduce_none,
|
195
|
+
1, 60, :_reduce_none,
|
196
|
+
1, 60, :_reduce_none,
|
197
|
+
1, 60, :_reduce_none,
|
198
|
+
1, 60, :_reduce_none,
|
199
|
+
1, 60, :_reduce_13,
|
200
|
+
1, 60, :_reduce_none,
|
201
|
+
1, 60, :_reduce_none,
|
202
|
+
1, 60, :_reduce_none,
|
203
|
+
1, 60, :_reduce_none,
|
204
|
+
1, 60, :_reduce_none,
|
205
|
+
1, 60, :_reduce_none,
|
206
|
+
1, 60, :_reduce_none,
|
207
|
+
1, 60, :_reduce_21,
|
208
|
+
4, 69, :_reduce_none,
|
209
|
+
1, 76, :_reduce_none,
|
214
210
|
2, 76, :_reduce_none,
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
1,
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
1,
|
231
|
-
2,
|
232
|
-
|
233
|
-
|
234
|
-
1,
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
1,
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
1, 89, :
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
1, 94, :
|
269
|
-
2,
|
270
|
-
4,
|
271
|
-
1, 95, :
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
2,
|
277
|
-
|
278
|
-
1,
|
279
|
-
|
280
|
-
|
281
|
-
|
211
|
+
3, 77, :_reduce_25,
|
212
|
+
3, 77, :_reduce_26,
|
213
|
+
3, 77, :_reduce_27,
|
214
|
+
2, 77, :_reduce_none,
|
215
|
+
4, 75, :_reduce_29,
|
216
|
+
5, 74, :_reduce_30,
|
217
|
+
0, 79, :_reduce_none,
|
218
|
+
3, 79, :_reduce_32,
|
219
|
+
1, 78, :_reduce_33,
|
220
|
+
2, 78, :_reduce_34,
|
221
|
+
4, 73, :_reduce_35,
|
222
|
+
1, 80, :_reduce_36,
|
223
|
+
3, 80, :_reduce_37,
|
224
|
+
1, 82, :_reduce_none,
|
225
|
+
2, 82, :_reduce_none,
|
226
|
+
1, 82, :_reduce_none,
|
227
|
+
2, 82, :_reduce_none,
|
228
|
+
2, 81, :_reduce_42,
|
229
|
+
3, 81, :_reduce_43,
|
230
|
+
1, 81, :_reduce_44,
|
231
|
+
2, 81, :_reduce_45,
|
232
|
+
4, 71, :_reduce_46,
|
233
|
+
4, 72, :_reduce_47,
|
234
|
+
1, 83, :_reduce_48,
|
235
|
+
3, 83, :_reduce_49,
|
236
|
+
1, 85, :_reduce_none,
|
237
|
+
1, 85, :_reduce_none,
|
238
|
+
2, 85, :_reduce_none,
|
239
|
+
1, 84, :_reduce_53,
|
240
|
+
2, 84, :_reduce_54,
|
241
|
+
5, 70, :_reduce_55,
|
242
|
+
0, 87, :_reduce_56,
|
243
|
+
3, 87, :_reduce_57,
|
244
|
+
4, 87, :_reduce_58,
|
245
|
+
1, 86, :_reduce_59,
|
246
|
+
3, 86, :_reduce_60,
|
247
|
+
1, 89, :_reduce_none,
|
248
|
+
2, 89, :_reduce_62,
|
249
|
+
1, 89, :_reduce_none,
|
250
|
+
2, 89, :_reduce_64,
|
251
|
+
3, 88, :_reduce_65,
|
252
|
+
0, 90, :_reduce_66,
|
253
|
+
1, 90, :_reduce_67,
|
254
|
+
0, 91, :_reduce_68,
|
255
|
+
6, 91, :_reduce_69,
|
256
|
+
3, 91, :_reduce_70,
|
257
|
+
4, 91, :_reduce_71,
|
258
|
+
3, 92, :_reduce_72,
|
259
|
+
1, 83, :_reduce_73,
|
260
|
+
2, 83, :_reduce_74,
|
261
|
+
1, 93, :_reduce_none,
|
262
|
+
1, 93, :_reduce_none,
|
263
|
+
4, 64, :_reduce_77,
|
264
|
+
1, 94, :_reduce_78,
|
265
|
+
2, 94, :_reduce_79,
|
266
|
+
4, 65, :_reduce_80,
|
267
|
+
1, 95, :_reduce_81,
|
268
|
+
1, 95, :_reduce_82,
|
269
|
+
2, 61, :_reduce_83,
|
270
|
+
4, 61, :_reduce_84,
|
271
|
+
1, 96, :_reduce_none,
|
272
|
+
2, 96, :_reduce_86,
|
273
|
+
1, 97, :_reduce_87,
|
274
|
+
1, 97, :_reduce_88,
|
275
|
+
2, 62, :_reduce_89,
|
276
|
+
2, 63, :_reduce_90,
|
277
|
+
4, 63, :_reduce_91,
|
282
278
|
1, 100, :_reduce_none,
|
283
279
|
1, 100, :_reduce_none,
|
284
|
-
|
285
|
-
|
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,
|
280
|
+
1, 99, :_reduce_94,
|
281
|
+
3, 99, :_reduce_95,
|
292
282
|
1, 101, :_reduce_none,
|
293
|
-
1,
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
3,
|
300
|
-
|
301
|
-
|
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,
|
283
|
+
1, 101, :_reduce_none,
|
284
|
+
3, 66, :_reduce_98,
|
285
|
+
2, 66, :_reduce_99,
|
286
|
+
5, 66, :_reduce_100,
|
287
|
+
4, 66, :_reduce_101,
|
288
|
+
1, 105, :_reduce_102,
|
289
|
+
3, 105, :_reduce_103,
|
290
|
+
1, 102, :_reduce_104,
|
291
|
+
2, 102, :_reduce_105,
|
309
292
|
1, 102, :_reduce_none,
|
310
|
-
|
311
|
-
1,
|
312
|
-
1,
|
293
|
+
1, 106, :_reduce_107,
|
294
|
+
1, 106, :_reduce_108,
|
295
|
+
1, 106, :_reduce_109,
|
296
|
+
1, 106, :_reduce_110,
|
297
|
+
2, 106, :_reduce_111,
|
298
|
+
2, 104, :_reduce_112,
|
299
|
+
3, 104, :_reduce_113,
|
300
|
+
2, 104, :_reduce_114,
|
301
|
+
3, 104, :_reduce_115,
|
302
|
+
2, 104, :_reduce_116,
|
303
|
+
1, 104, :_reduce_117,
|
304
|
+
2, 98, :_reduce_118,
|
305
|
+
3, 98, :_reduce_119,
|
306
|
+
1, 107, :_reduce_120,
|
307
|
+
3, 107, :_reduce_121,
|
308
|
+
1, 103, :_reduce_none,
|
309
|
+
1, 103, :_reduce_none,
|
310
|
+
3, 109, :_reduce_124,
|
313
311
|
1, 110, :_reduce_none,
|
314
312
|
1, 110, :_reduce_none,
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
1,
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
2,
|
327
|
-
|
328
|
-
|
329
|
-
|
330
|
-
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
313
|
+
1, 111, :_reduce_none,
|
314
|
+
1, 111, :_reduce_none,
|
315
|
+
0, 112, :_reduce_129,
|
316
|
+
1, 112, :_reduce_130,
|
317
|
+
4, 108, :_reduce_131,
|
318
|
+
3, 108, :_reduce_132,
|
319
|
+
2, 68, :_reduce_133,
|
320
|
+
1, 113, :_reduce_134,
|
321
|
+
3, 113, :_reduce_135,
|
322
|
+
2, 113, :_reduce_136,
|
323
|
+
1, 115, :_reduce_none,
|
324
|
+
2, 115, :_reduce_none,
|
325
|
+
2, 114, :_reduce_139,
|
326
|
+
3, 114, :_reduce_140,
|
327
|
+
4, 67, :_reduce_141,
|
328
|
+
2, 67, :_reduce_142,
|
329
|
+
4, 67, :_reduce_143,
|
330
|
+
1, 117, :_reduce_144,
|
331
|
+
2, 117, :_reduce_145,
|
332
|
+
3, 117, :_reduce_146,
|
333
|
+
1, 119, :_reduce_none,
|
334
|
+
2, 119, :_reduce_none,
|
335
|
+
1, 118, :_reduce_149,
|
336
|
+
2, 118, :_reduce_150,
|
337
|
+
2, 120, :_reduce_151,
|
338
|
+
1, 121, :_reduce_152,
|
339
|
+
2, 121, :_reduce_153,
|
340
|
+
3, 121, :_reduce_154,
|
341
|
+
1, 116, :_reduce_155,
|
342
|
+
2, 116, :_reduce_156,
|
343
|
+
1, 122, :_reduce_157,
|
344
|
+
1, 122, :_reduce_158 ]
|
345
|
+
|
346
|
+
racc_reduce_n = 159
|
347
|
+
|
348
|
+
racc_shift_n = 257
|
347
349
|
|
348
350
|
racc_token_table = {
|
349
351
|
false => 0,
|
@@ -397,13 +399,14 @@ racc_token_table = {
|
|
397
399
|
:GEO => 48,
|
398
400
|
:VS => 49,
|
399
401
|
:SCORE_MORE => 50,
|
400
|
-
:
|
401
|
-
:
|
402
|
-
:
|
403
|
-
:
|
404
|
-
:
|
402
|
+
:SCORE_NOTE => 51,
|
403
|
+
:PLAYER => 52,
|
404
|
+
:PROP_GOALS => 53,
|
405
|
+
:NONE => 54,
|
406
|
+
:OG => 55,
|
407
|
+
:PEN => 56 }
|
405
408
|
|
406
|
-
racc_nt_base =
|
409
|
+
racc_nt_base = 57
|
407
410
|
|
408
411
|
racc_use_result_var = true
|
409
412
|
|
@@ -476,6 +479,7 @@ Racc_token_to_s_table = [
|
|
476
479
|
"GEO",
|
477
480
|
"VS",
|
478
481
|
"SCORE_MORE",
|
482
|
+
"SCORE_NOTE",
|
479
483
|
"PLAYER",
|
480
484
|
"PROP_GOALS",
|
481
485
|
"NONE",
|
@@ -536,6 +540,7 @@ Racc_token_to_s_table = [
|
|
536
540
|
"match_fixture",
|
537
541
|
"match_sep",
|
538
542
|
"score",
|
543
|
+
"score_note_opt",
|
539
544
|
"goals_alt",
|
540
545
|
"goal_alt",
|
541
546
|
"goal_alt_sep",
|
@@ -1232,47 +1237,47 @@ module_eval(<<'.,.,', 'parser.y', 426)
|
|
1232
1237
|
|
1233
1238
|
module_eval(<<'.,.,', 'parser.y', 427)
|
1234
1239
|
def _reduce_115(val, _values, result)
|
1235
|
-
result = {}.merge( val[0] )
|
1240
|
+
result = { note: val[1] }.merge( val[0] )
|
1236
1241
|
result
|
1237
1242
|
end
|
1238
1243
|
.,.,
|
1239
1244
|
|
1240
1245
|
module_eval(<<'.,.,', 'parser.y', 428)
|
1241
1246
|
def _reduce_116(val, _values, result)
|
1242
|
-
result = {}
|
1247
|
+
result = { note: val[0] }
|
1243
1248
|
result
|
1244
1249
|
end
|
1245
1250
|
.,.,
|
1246
1251
|
|
1247
|
-
module_eval(<<'.,.,', 'parser.y',
|
1252
|
+
module_eval(<<'.,.,', 'parser.y', 431)
|
1248
1253
|
def _reduce_117(val, _values, result)
|
1249
1254
|
result = {}
|
1250
1255
|
result
|
1251
1256
|
end
|
1252
1257
|
.,.,
|
1253
1258
|
|
1254
|
-
module_eval(<<'.,.,', 'parser.y',
|
1259
|
+
module_eval(<<'.,.,', 'parser.y', 437)
|
1255
1260
|
def _reduce_118(val, _values, result)
|
1256
1261
|
result = { geo: val[1] }
|
1257
1262
|
result
|
1258
1263
|
end
|
1259
1264
|
.,.,
|
1260
1265
|
|
1261
|
-
module_eval(<<'.,.,', 'parser.y',
|
1266
|
+
module_eval(<<'.,.,', 'parser.y', 438)
|
1262
1267
|
def _reduce_119(val, _values, result)
|
1263
1268
|
result = { geo: val[1], timezone: val[2] }
|
1264
1269
|
result
|
1265
1270
|
end
|
1266
1271
|
.,.,
|
1267
1272
|
|
1268
|
-
module_eval(<<'.,.,', 'parser.y',
|
1273
|
+
module_eval(<<'.,.,', 'parser.y', 441)
|
1269
1274
|
def _reduce_120(val, _values, result)
|
1270
1275
|
result = val
|
1271
1276
|
result
|
1272
1277
|
end
|
1273
1278
|
.,.,
|
1274
1279
|
|
1275
|
-
module_eval(<<'.,.,', 'parser.y',
|
1280
|
+
module_eval(<<'.,.,', 'parser.y', 442)
|
1276
1281
|
def _reduce_121(val, _values, result)
|
1277
1282
|
result.push( val[2] )
|
1278
1283
|
result
|
@@ -1283,7 +1288,7 @@ module_eval(<<'.,.,', 'parser.y', 440)
|
|
1283
1288
|
|
1284
1289
|
# reduce 123 omitted
|
1285
1290
|
|
1286
|
-
module_eval(<<'.,.,', 'parser.y',
|
1291
|
+
module_eval(<<'.,.,', 'parser.y', 450)
|
1287
1292
|
def _reduce_124(val, _values, result)
|
1288
1293
|
trace( "RECUDE match_fixture" )
|
1289
1294
|
result = { team1: val[0],
|
@@ -1303,60 +1308,76 @@ module_eval(<<'.,.,', 'parser.y', 448)
|
|
1303
1308
|
|
1304
1309
|
module_eval(<<'.,.,', 'parser.y', 462)
|
1305
1310
|
def _reduce_129(val, _values, result)
|
1311
|
+
result = {}
|
1312
|
+
result
|
1313
|
+
end
|
1314
|
+
.,.,
|
1315
|
+
|
1316
|
+
module_eval(<<'.,.,', 'parser.y', 463)
|
1317
|
+
def _reduce_130(val, _values, result)
|
1318
|
+
result = { score_note: val[0] }
|
1319
|
+
result
|
1320
|
+
end
|
1321
|
+
.,.,
|
1322
|
+
|
1323
|
+
module_eval(<<'.,.,', 'parser.y', 468)
|
1324
|
+
def _reduce_131(val, _values, result)
|
1306
1325
|
trace( "REDUCE => match_result : TEAM score TEAM" )
|
1307
1326
|
result = { team1: val[0],
|
1308
1327
|
team2: val[2],
|
1309
1328
|
score: val[1][1]
|
1310
|
-
}
|
1329
|
+
}.merge( val[3] )
|
1330
|
+
pp result
|
1311
1331
|
|
1312
1332
|
result
|
1313
1333
|
end
|
1314
1334
|
.,.,
|
1315
1335
|
|
1316
|
-
module_eval(<<'.,.,', 'parser.y',
|
1317
|
-
def
|
1336
|
+
module_eval(<<'.,.,', 'parser.y', 477)
|
1337
|
+
def _reduce_132(val, _values, result)
|
1318
1338
|
trace( "REDUCE => match_result : match_fixture score" )
|
1319
|
-
result = { score: val[1][1] }.merge( val[0] )
|
1339
|
+
result = { score: val[1][1] }.merge( val[0] ).merge( val[2] )
|
1340
|
+
pp result
|
1320
1341
|
|
1321
1342
|
result
|
1322
1343
|
end
|
1323
1344
|
.,.,
|
1324
1345
|
|
1325
|
-
module_eval(<<'.,.,', 'parser.y',
|
1326
|
-
def
|
1346
|
+
module_eval(<<'.,.,', 'parser.y', 503)
|
1347
|
+
def _reduce_133(val, _values, result)
|
1327
1348
|
@tree << GoalLineAlt.new( goals: val[0] )
|
1328
1349
|
|
1329
1350
|
result
|
1330
1351
|
end
|
1331
1352
|
.,.,
|
1332
1353
|
|
1333
|
-
module_eval(<<'.,.,', 'parser.y',
|
1334
|
-
def
|
1354
|
+
module_eval(<<'.,.,', 'parser.y', 507)
|
1355
|
+
def _reduce_134(val, _values, result)
|
1335
1356
|
result = val
|
1336
1357
|
result
|
1337
1358
|
end
|
1338
1359
|
.,.,
|
1339
1360
|
|
1340
|
-
module_eval(<<'.,.,', 'parser.y',
|
1341
|
-
def
|
1361
|
+
module_eval(<<'.,.,', 'parser.y', 509)
|
1362
|
+
def _reduce_135(val, _values, result)
|
1342
1363
|
result.push( val[2])
|
1343
1364
|
result
|
1344
1365
|
end
|
1345
1366
|
.,.,
|
1346
1367
|
|
1347
|
-
module_eval(<<'.,.,', 'parser.y',
|
1348
|
-
def
|
1368
|
+
module_eval(<<'.,.,', 'parser.y', 511)
|
1369
|
+
def _reduce_136(val, _values, result)
|
1349
1370
|
result.push( val[1])
|
1350
1371
|
result
|
1351
1372
|
end
|
1352
1373
|
.,.,
|
1353
1374
|
|
1354
|
-
# reduce
|
1375
|
+
# reduce 137 omitted
|
1355
1376
|
|
1356
|
-
# reduce
|
1377
|
+
# reduce 138 omitted
|
1357
1378
|
|
1358
|
-
module_eval(<<'.,.,', 'parser.y',
|
1359
|
-
def
|
1379
|
+
module_eval(<<'.,.,', 'parser.y', 519)
|
1380
|
+
def _reduce_139(val, _values, result)
|
1360
1381
|
result = GoalAlt.new( score: val[0],
|
1361
1382
|
player: val[1] )
|
1362
1383
|
|
@@ -1364,8 +1385,8 @@ module_eval(<<'.,.,', 'parser.y', 511)
|
|
1364
1385
|
end
|
1365
1386
|
.,.,
|
1366
1387
|
|
1367
|
-
module_eval(<<'.,.,', 'parser.y',
|
1368
|
-
def
|
1388
|
+
module_eval(<<'.,.,', 'parser.y', 524)
|
1389
|
+
def _reduce_140(val, _values, result)
|
1369
1390
|
result = GoalAlt.new( score: val[0],
|
1370
1391
|
player: val[1],
|
1371
1392
|
minute: val[2] )
|
@@ -1374,8 +1395,8 @@ module_eval(<<'.,.,', 'parser.y', 516)
|
|
1374
1395
|
end
|
1375
1396
|
.,.,
|
1376
1397
|
|
1377
|
-
module_eval(<<'.,.,', 'parser.y',
|
1378
|
-
def
|
1398
|
+
module_eval(<<'.,.,', 'parser.y', 536)
|
1399
|
+
def _reduce_141(val, _values, result)
|
1379
1400
|
kwargs = val[1]
|
1380
1401
|
@tree << GoalLine.new( **kwargs )
|
1381
1402
|
|
@@ -1383,8 +1404,8 @@ module_eval(<<'.,.,', 'parser.y', 528)
|
|
1383
1404
|
end
|
1384
1405
|
.,.,
|
1385
1406
|
|
1386
|
-
module_eval(<<'.,.,', 'parser.y',
|
1387
|
-
def
|
1407
|
+
module_eval(<<'.,.,', 'parser.y', 541)
|
1408
|
+
def _reduce_142(val, _values, result)
|
1388
1409
|
kwargs = val[0]
|
1389
1410
|
@tree << GoalLine.new( **kwargs )
|
1390
1411
|
|
@@ -1392,8 +1413,8 @@ module_eval(<<'.,.,', 'parser.y', 533)
|
|
1392
1413
|
end
|
1393
1414
|
.,.,
|
1394
1415
|
|
1395
|
-
module_eval(<<'.,.,', 'parser.y',
|
1396
|
-
def
|
1416
|
+
module_eval(<<'.,.,', 'parser.y', 546)
|
1417
|
+
def _reduce_143(val, _values, result)
|
1397
1418
|
kwargs = val[1]
|
1398
1419
|
@tree << GoalLine.new( **kwargs )
|
1399
1420
|
|
@@ -1401,8 +1422,8 @@ module_eval(<<'.,.,', 'parser.y', 538)
|
|
1401
1422
|
end
|
1402
1423
|
.,.,
|
1403
1424
|
|
1404
|
-
module_eval(<<'.,.,', 'parser.y',
|
1405
|
-
def
|
1425
|
+
module_eval(<<'.,.,', 'parser.y', 551)
|
1426
|
+
def _reduce_144(val, _values, result)
|
1406
1427
|
result = { goals1: val[0],
|
1407
1428
|
goals2: [] }
|
1408
1429
|
|
@@ -1410,8 +1431,8 @@ module_eval(<<'.,.,', 'parser.y', 543)
|
|
1410
1431
|
end
|
1411
1432
|
.,.,
|
1412
1433
|
|
1413
|
-
module_eval(<<'.,.,', 'parser.y',
|
1414
|
-
def
|
1434
|
+
module_eval(<<'.,.,', 'parser.y', 554)
|
1435
|
+
def _reduce_145(val, _values, result)
|
1415
1436
|
result = { goals1: [],
|
1416
1437
|
goals2: val[1] }
|
1417
1438
|
|
@@ -1419,8 +1440,8 @@ module_eval(<<'.,.,', 'parser.y', 546)
|
|
1419
1440
|
end
|
1420
1441
|
.,.,
|
1421
1442
|
|
1422
|
-
module_eval(<<'.,.,', 'parser.y',
|
1423
|
-
def
|
1443
|
+
module_eval(<<'.,.,', 'parser.y', 557)
|
1444
|
+
def _reduce_146(val, _values, result)
|
1424
1445
|
result = { goals1: val[0],
|
1425
1446
|
goals2: val[2] }
|
1426
1447
|
|
@@ -1428,26 +1449,26 @@ module_eval(<<'.,.,', 'parser.y', 549)
|
|
1428
1449
|
end
|
1429
1450
|
.,.,
|
1430
1451
|
|
1431
|
-
# reduce
|
1452
|
+
# reduce 147 omitted
|
1432
1453
|
|
1433
|
-
# reduce
|
1454
|
+
# reduce 148 omitted
|
1434
1455
|
|
1435
|
-
module_eval(<<'.,.,', 'parser.y',
|
1436
|
-
def
|
1456
|
+
module_eval(<<'.,.,', 'parser.y', 573)
|
1457
|
+
def _reduce_149(val, _values, result)
|
1437
1458
|
result = val
|
1438
1459
|
result
|
1439
1460
|
end
|
1440
1461
|
.,.,
|
1441
1462
|
|
1442
|
-
module_eval(<<'.,.,', 'parser.y',
|
1443
|
-
def
|
1463
|
+
module_eval(<<'.,.,', 'parser.y', 574)
|
1464
|
+
def _reduce_150(val, _values, result)
|
1444
1465
|
result.push( val[1])
|
1445
1466
|
result
|
1446
1467
|
end
|
1447
1468
|
.,.,
|
1448
1469
|
|
1449
|
-
module_eval(<<'.,.,', 'parser.y',
|
1450
|
-
def
|
1470
|
+
module_eval(<<'.,.,', 'parser.y', 590)
|
1471
|
+
def _reduce_151(val, _values, result)
|
1451
1472
|
result = Goal.new( player: val[0],
|
1452
1473
|
minutes: val[1] )
|
1453
1474
|
|
@@ -1455,29 +1476,29 @@ module_eval(<<'.,.,', 'parser.y', 582)
|
|
1455
1476
|
end
|
1456
1477
|
.,.,
|
1457
1478
|
|
1458
|
-
module_eval(<<'.,.,', 'parser.y',
|
1459
|
-
def
|
1479
|
+
module_eval(<<'.,.,', 'parser.y', 602)
|
1480
|
+
def _reduce_152(val, _values, result)
|
1460
1481
|
result = val
|
1461
1482
|
result
|
1462
1483
|
end
|
1463
1484
|
.,.,
|
1464
1485
|
|
1465
|
-
module_eval(<<'.,.,', 'parser.y',
|
1466
|
-
def
|
1486
|
+
module_eval(<<'.,.,', 'parser.y', 603)
|
1487
|
+
def _reduce_153(val, _values, result)
|
1467
1488
|
result.push( val[1])
|
1468
1489
|
result
|
1469
1490
|
end
|
1470
1491
|
.,.,
|
1471
1492
|
|
1472
|
-
module_eval(<<'.,.,', 'parser.y',
|
1473
|
-
def
|
1493
|
+
module_eval(<<'.,.,', 'parser.y', 604)
|
1494
|
+
def _reduce_154(val, _values, result)
|
1474
1495
|
result.push( val[2])
|
1475
1496
|
result
|
1476
1497
|
end
|
1477
1498
|
.,.,
|
1478
1499
|
|
1479
|
-
module_eval(<<'.,.,', 'parser.y',
|
1480
|
-
def
|
1500
|
+
module_eval(<<'.,.,', 'parser.y', 610)
|
1501
|
+
def _reduce_155(val, _values, result)
|
1481
1502
|
kwargs = {}.merge( val[0][1] )
|
1482
1503
|
result = Minute.new( **kwargs )
|
1483
1504
|
|
@@ -1485,8 +1506,8 @@ module_eval(<<'.,.,', 'parser.y', 602)
|
|
1485
1506
|
end
|
1486
1507
|
.,.,
|
1487
1508
|
|
1488
|
-
module_eval(<<'.,.,', 'parser.y',
|
1489
|
-
def
|
1509
|
+
module_eval(<<'.,.,', 'parser.y', 615)
|
1510
|
+
def _reduce_156(val, _values, result)
|
1490
1511
|
kwargs = { }.merge( val[0][1] ).merge( val[1] )
|
1491
1512
|
result = Minute.new( **kwargs )
|
1492
1513
|
|
@@ -1494,15 +1515,15 @@ module_eval(<<'.,.,', 'parser.y', 607)
|
|
1494
1515
|
end
|
1495
1516
|
.,.,
|
1496
1517
|
|
1497
|
-
module_eval(<<'.,.,', 'parser.y',
|
1498
|
-
def
|
1518
|
+
module_eval(<<'.,.,', 'parser.y', 619)
|
1519
|
+
def _reduce_157(val, _values, result)
|
1499
1520
|
result = { og: true }
|
1500
1521
|
result
|
1501
1522
|
end
|
1502
1523
|
.,.,
|
1503
1524
|
|
1504
|
-
module_eval(<<'.,.,', 'parser.y',
|
1505
|
-
def
|
1525
|
+
module_eval(<<'.,.,', 'parser.y', 620)
|
1526
|
+
def _reduce_158(val, _values, result)
|
1506
1527
|
result = { pen: true }
|
1507
1528
|
result
|
1508
1529
|
end
|
@@ -169,10 +169,12 @@ end
|
|
169
169
|
|
170
170
|
|
171
171
|
MatchLine = Struct.new( :ord, :date, :time, :wday,
|
172
|
-
:team1, :team2,
|
173
|
-
:
|
172
|
+
:team1, :team2,
|
173
|
+
:score, :score_note,
|
174
|
+
:status,
|
174
175
|
:geo,
|
175
|
-
:timezone
|
176
|
+
:timezone,
|
177
|
+
:note ) do ## change to geos - why? why not?
|
176
178
|
|
177
179
|
def pretty_print( printer )
|
178
180
|
printer.text( "<MatchLine " )
|
@@ -133,20 +133,93 @@ NOTE_RE = %r{
|
|
133
133
|
## [in Estadio Victoria]
|
134
134
|
## [in UD José Brindis]
|
135
135
|
## [in Colomos Alfredo "Pistache" Torres stadium]
|
136
|
+
##
|
137
|
+
## TODO/FIX
|
138
|
+
## remove in ?? - is same as @ Estadio Victoria and such - why? why not=
|
136
139
|
)
|
137
|
-
|
140
|
+
)
|
141
|
+
\]
|
142
|
+
}ix
|
143
|
+
|
144
|
+
|
145
|
+
|
146
|
+
SCORE_NOTE_RE = %r{
|
147
|
+
\[
|
148
|
+
(?<score_note>
|
149
|
+
(?: # plain aet e.g. [aet]
|
150
|
+
aet | a\.e\.t\. |
|
151
|
+
after [ ] extra [ ] time
|
152
|
+
)
|
153
|
+
|
|
154
|
+
(?: # plain penalties e.g. [3-2 pen]
|
155
|
+
\d{1,2}-\d{1,2}
|
156
|
+
[ ]* (?: p|pen )
|
157
|
+
)
|
158
|
+
|
|
159
|
+
(?: # plain aet with penalties e.g. [aet; 4-3 pen] or [aet, 4-3p]
|
160
|
+
aet [ ]* [,;]
|
161
|
+
[ ]*
|
162
|
+
\d{1,2}-\d{1,2}
|
163
|
+
[ ]* (?: p|pen )
|
164
|
+
)
|
165
|
+
|
|
138
166
|
(?:
|
139
167
|
## e.g. Spain wins on penalties
|
140
168
|
## 1860 München wins on penalties etc.
|
141
169
|
## must start with digit 1-9 or letter
|
142
170
|
## todo - add more special chars - why? why not?
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
171
|
+
##
|
172
|
+
(?:
|
173
|
+
aet [ ]* ## allow space here - why? why not
|
174
|
+
[,;][ ]
|
175
|
+
)?
|
176
|
+
|
177
|
+
(?:
|
178
|
+
(?: # opt 1 - no team listed/named - requires score
|
179
|
+
wins? [ ] ## note - allow win or wins
|
180
|
+
(?: ## score
|
181
|
+
\d{1,2}-\d{1,2}
|
182
|
+
[ ]
|
183
|
+
)
|
184
|
+
on [ ] (?: pens | penalties |
|
185
|
+
aggregate )
|
186
|
+
)
|
187
|
+
|
|
188
|
+
(?: # opt 2 - team required; score optional
|
189
|
+
(?: ## team required
|
190
|
+
[1-9\p{L}][0-9\p{L} .-]+?
|
191
|
+
[ ]
|
192
|
+
)
|
193
|
+
wins [ ]
|
194
|
+
(?: ## score optional
|
195
|
+
\d{1,2}-\d{1,2}
|
196
|
+
[ ]
|
197
|
+
)?
|
198
|
+
on [ ] (?: pens | penalties |
|
199
|
+
aggregate )
|
200
|
+
### [^\]]*? ## allow more? use non-greedy
|
201
|
+
)
|
202
|
+
))
|
203
|
+
|
|
204
|
+
(?: ## e.g. agg 3-2 etc.
|
205
|
+
agg [ ] \d{1,2}-\d{1,2}
|
206
|
+
)
|
207
|
+
|
|
208
|
+
(?: ## e.g. agg 4-4, Ajax win on away goals
|
209
|
+
(?: ## agg 4-4, optional for now - why? why not?
|
210
|
+
agg [ ] \d{1,2}-\d{1,2}
|
211
|
+
[ ]*[,;][ ]
|
212
|
+
)?
|
213
|
+
(?: ## team required
|
214
|
+
[1-9\p{L}][0-9\p{L} .-]+?
|
215
|
+
[ ]
|
216
|
+
)
|
217
|
+
wins? [ ]
|
218
|
+
on [ ] away [ ] goals
|
219
|
+
)
|
220
|
+
) # score_note ref
|
221
|
+
\]
|
222
|
+
}ix
|
150
223
|
|
151
224
|
|
152
225
|
end # class Lexer
|
data/lib/sportdb/parser/token.rb
CHANGED