sparkql 1.2.1 → 1.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +8 -8
  2. data/CHANGELOG.md +4 -0
  3. data/GRAMMAR.md +63 -38
  4. data/VERSION +1 -1
  5. data/lib/sparkql/lexer.rb +11 -1
  6. data/lib/sparkql/parser.rb +318 -181
  7. data/lib/sparkql/parser.y +93 -64
  8. data/lib/sparkql/parser_tools.rb +122 -10
  9. data/lib/sparkql/token.rb +8 -1
  10. data/test/unit/parser_test.rb +258 -0
  11. metadata +2 -2
data/lib/sparkql/parser.rb CHANGED
@@ -12,176 +12,248 @@ module Sparkql
12
12
 
13
13
  include Sparkql::ParserTools
14
14
  include Sparkql::ParserCompatibility
15
-
15
+
16
16
  ##### State transition tables begin ###
17
17
 
18
18
  racc_action_table = [
19
- 36, 14, 15, 44, 45, 35, 46, 47, 48, 14,
20
- 22, 32, 33, 34, 37, 38, 39, 40, 41, 36,
21
- 17, 16, 23, 50, 35, 51, 10, 11, 14, -35,
22
- 32, 33, 34, 37, 38, 39, 40, 41, 36, 17,
23
- 16, 62, 75, 35, 66, 63, 76, 14, 57, 32,
24
- 33, 34, 37, 38, 39, 40, 41, 36, 18, 19,
25
- 58, 61, 35, 72, 10, 11, 14, nil, 32, 33,
26
- 34, 37, 38, 39, 40, 41, 36, 14, nil, 44,
27
- 45, 35, 46, 47, 48, 14, nil, 32, 33, 34,
28
- 37, 38, 39, 40, 41, 36, nil, nil, 36, nil,
29
- 35, nil, nil, 35, nil, nil, 32, 33, 34, 32,
30
- 33, 34, 36, nil, 8, nil, 9, 35, 10, 11,
31
- 14, 14, nil, 32, 33, 34, 8, nil, 9, nil,
32
- 10, 11, 14, 9, nil, 10, 11, 14, 9, nil,
33
- 10, 11, 14, 9, nil, 10, 11, 14 ]
19
+ 20, 33, 34, 35, 31, 32, 25, 24, 8, 62,
20
+ 9, 84, 16, 85, 17, 18, 19, 20, 33, 34,
21
+ 35, 23, 21, 22, 33, 34, 35, 9, 100, 16,
22
+ 101, 17, 18, 19, 20, 78, 79, 80, 36, 21,
23
+ 22, 39, 8, 63, 9, 81, 16, 82, 17, 18,
24
+ 19, 20, 78, 79, 80, 83, 21, 22, 25, 24,
25
+ 63, 9, nil, 16, nil, 17, 18, 19, 20, 26,
26
+ 27, nil, nil, 21, 22, nil, nil, nil, 9, nil,
27
+ 16, nil, 17, 18, 19, 20, nil, nil, nil, nil,
28
+ 21, 22, nil, nil, nil, 37, nil, 16, nil, 17,
29
+ 18, 19, 20, nil, nil, nil, nil, 21, 22, nil,
30
+ nil, nil, 37, nil, 16, nil, 17, 18, 19, 20,
31
+ nil, nil, nil, nil, 21, 22, nil, nil, nil, 37,
32
+ nil, 16, nil, 17, 18, 19, 20, nil, nil, nil,
33
+ nil, 21, 22, nil, nil, nil, 37, nil, 16, nil,
34
+ 17, 18, 19, 20, nil, nil, nil, nil, 21, 22,
35
+ nil, nil, nil, 37, nil, 16, nil, 17, 18, 19,
36
+ 20, nil, nil, nil, nil, 21, 22, nil, nil, nil,
37
+ 37, 69, 16, nil, 17, 18, 19, 49, 50, 51,
38
+ 52, 53, 21, 22, 20, 16, nil, 56, 57, nil,
39
+ 58, 59, 60, nil, 37, nil, 16, nil, 17, 18,
40
+ 19, 49, 50, 51, 52, 53, 21, 22, 20, 16,
41
+ nil, 56, 57, nil, 58, 59, 60, nil, 37, nil,
42
+ 16, 20, 17, 18, 19, 49, 50, 51, 52, 53,
43
+ nil, 37, nil, 16, 20, 17, 18, 19, 49, 50,
44
+ 51, 52, 53, nil, 37, nil, 16, 20, 17, 18,
45
+ 19, 49, 50, 51, 52, 53, nil, 37, nil, 16,
46
+ 20, 17, 18, 19, 49, 50, 51, 52, 53, nil,
47
+ 37, nil, 16, 20, 17, 18, 19, 49, 50, 51,
48
+ 52, 53, nil, 37, nil, 16, 20, 17, 18, 19,
49
+ 49, 50, 51, 52, 53, nil, 37, 93, 20, nil,
50
+ 17, 18, 19, 49, 50, 51, 52, 53, 37, nil,
51
+ 20, nil, 17, 18, 19, 49, 50, 51, 52, 53,
52
+ 37, 20, nil, nil, 17, 18, 19, nil, 20, nil,
53
+ nil, 37, nil, nil, nil, 17, 18, 19, 37, nil,
54
+ 16, nil, 17, 18, 19, 78, 79, 80, 76, 77 ]
34
55
 
35
56
  racc_action_check = [
36
- 18, 19, 1, 19, 19, 18, 19, 19, 19, 18,
37
- 13, 18, 18, 18, 18, 18, 18, 18, 18, 22,
38
- 21, 21, 15, 21, 22, 22, 22, 22, 22, 28,
39
- 22, 22, 22, 22, 22, 22, 22, 22, 58, 2,
40
- 2, 52, 67, 58, 58, 52, 67, 58, 29, 58,
41
- 58, 58, 58, 58, 58, 58, 58, 63, 6, 6,
42
- 30, 43, 63, 59, 63, 63, 63, nil, 63, 63,
43
- 63, 63, 63, 63, 63, 63, 76, 61, nil, 61,
44
- 61, 76, 61, 61, 61, 76, nil, 76, 76, 76,
45
- 76, 76, 76, 76, 76, 35, nil, nil, 36, nil,
46
- 35, nil, nil, 36, nil, nil, 35, 35, 35, 36,
47
- 36, 36, 57, nil, 0, nil, 0, 57, 0, 0,
48
- 0, 57, nil, 57, 57, 57, 9, nil, 9, nil,
49
- 9, 9, 9, 8, nil, 8, 8, 8, 16, nil,
50
- 16, 16, 16, 17, nil, 17, 17, 17 ]
57
+ 0, 10, 10, 10, 10, 10, 29, 29, 0, 29,
58
+ 0, 70, 0, 70, 0, 0, 0, 8, 64, 64,
59
+ 64, 1, 0, 0, 65, 65, 65, 8, 94, 8,
60
+ 94, 8, 8, 8, 9, 86, 86, 86, 15, 8,
61
+ 8, 23, 9, 30, 9, 44, 9, 46, 9, 9,
62
+ 9, 24, 87, 87, 87, 55, 9, 9, 2, 2,
63
+ 75, 24, nil, 24, nil, 24, 24, 24, 25, 6,
64
+ 6, nil, nil, 24, 24, nil, nil, nil, 25, nil,
65
+ 25, nil, 25, 25, 25, 31, nil, nil, nil, nil,
66
+ 25, 25, nil, nil, nil, 31, nil, 31, nil, 31,
67
+ 31, 31, 32, nil, nil, nil, nil, 31, 31, nil,
68
+ nil, nil, 32, nil, 32, nil, 32, 32, 32, 33,
69
+ nil, nil, nil, nil, 32, 32, nil, nil, nil, 33,
70
+ nil, 33, nil, 33, 33, 33, 34, nil, nil, nil,
71
+ nil, 33, 33, nil, nil, nil, 34, nil, 34, nil,
72
+ 34, 34, 34, 35, nil, nil, nil, nil, 34, 34,
73
+ nil, nil, nil, 35, nil, 35, nil, 35, 35, 35,
74
+ 36, nil, nil, nil, nil, 35, 35, nil, nil, nil,
75
+ 36, 36, 36, nil, 36, 36, 36, 36, 36, 36,
76
+ 36, 36, 36, 36, 85, 27, nil, 27, 27, nil,
77
+ 27, 27, 27, nil, 85, nil, 85, nil, 85, 85,
78
+ 85, 85, 85, 85, 85, 85, 85, 85, 26, 83,
79
+ nil, 83, 83, nil, 83, 83, 83, nil, 26, nil,
80
+ 26, 76, 26, 26, 26, 26, 26, 26, 26, 26,
81
+ nil, 76, nil, 76, 77, 76, 76, 76, 76, 76,
82
+ 76, 76, 76, nil, 77, nil, 77, 78, 77, 77,
83
+ 77, 77, 77, 77, 77, 77, nil, 78, nil, 78,
84
+ 79, 78, 78, 78, 78, 78, 78, 78, 78, nil,
85
+ 79, nil, 79, 80, 79, 79, 79, 79, 79, 79,
86
+ 79, 79, nil, 80, nil, 80, 82, 80, 80, 80,
87
+ 80, 80, 80, 80, 80, nil, 82, 82, 101, nil,
88
+ 82, 82, 82, 82, 82, 82, 82, 82, 101, nil,
89
+ 20, nil, 101, 101, 101, 101, 101, 101, 101, 101,
90
+ 20, 37, nil, nil, 20, 20, 20, nil, 81, nil,
91
+ nil, 37, nil, nil, nil, 37, 37, 37, 81, nil,
92
+ 81, nil, 81, 81, 81, 42, 42, 42, 42, 42 ]
51
93
 
52
94
  racc_action_pointer = [
53
- 109, 2, 34, nil, nil, nil, 55, nil, 126, 121,
54
- nil, nil, nil, 3, nil, 22, 131, 136, -2, -10,
55
- nil, 15, 17, nil, nil, nil, nil, nil, 17, 36,
56
- 53, nil, nil, nil, nil, 93, 96, nil, nil, nil,
57
- nil, nil, nil, 49, nil, nil, nil, nil, nil, nil,
58
- nil, nil, 33, nil, nil, nil, nil, 110, 36, 55,
59
- nil, 66, nil, 55, nil, nil, nil, 34, nil, nil,
60
- nil, nil, nil, nil, nil, nil, 74, nil ]
95
+ -2, 21, 48, nil, nil, nil, 61, nil, 15, 32,
96
+ -2, nil, nil, nil, nil, 26, nil, nil, nil, nil,
97
+ 318, nil, nil, 41, 49, 66, 216, 181, nil, -4,
98
+ 30, 83, 100, 117, 134, 151, 168, 329, nil, nil,
99
+ nil, nil, 352, nil, 30, nil, 35, nil, nil, nil,
100
+ nil, nil, nil, nil, nil, 40, nil, nil, nil, nil,
101
+ nil, nil, nil, nil, 15, 21, nil, nil, nil, nil,
102
+ -2, nil, nil, nil, nil, 47, 229, 242, 255, 268,
103
+ 281, 336, 294, 205, nil, 192, 32, 49, nil, nil,
104
+ nil, nil, nil, nil, 15, nil, nil, nil, nil, nil,
105
+ nil, 306, nil ]
61
106
 
62
107
  racc_action_default = [
63
- -2, -55, -1, -3, -4, -5, -55, -8, -55, -55,
64
- -13, -14, -15, -55, -23, -55, -55, -55, -55, -55,
65
- -9, -55, -55, 78, -10, -11, -6, -16, -17, -18,
66
- -55, -34, -39, -40, -41, -55, -55, -44, -45, -46,
67
- -47, -48, -7, -55, -49, -50, -51, -52, -53, -54,
68
- -12, -19, -55, -24, -26, -27, -28, -55, -55, -55,
69
- -43, -55, -20, -55, -36, -37, -21, -55, -29, -31,
70
- -32, -33, -42, -38, -25, -22, -55, -30 ]
108
+ -2, -68, -1, -3, -4, -5, -68, -8, -68, -68,
109
+ -13, -19, -20, -21, -22, -68, -35, -50, -51, -52,
110
+ -68, -66, -67, -68, -68, -68, -68, -68, -9, -68,
111
+ -19, -68, -68, -68, -68, -68, -68, -68, -54, 103,
112
+ -10, -11, -6, -23, -24, -25, -68, -45, -46, -55,
113
+ -56, -57, -58, -59, -7, -68, -60, -61, -62, -63,
114
+ -64, -65, -12, -53, -14, -15, -16, -17, -18, -31,
115
+ -68, -36, -38, -39, -40, -68, -68, -68, -68, -68,
116
+ -68, -68, -68, -68, -32, -68, -26, -27, -28, -29,
117
+ -30, -47, -48, -33, -68, -41, -43, -44, -49, -37,
118
+ -34, -68, -42 ]
71
119
 
72
120
  racc_goto_table = [
73
- 27, 30, 2, 31, 43, 68, 49, 20, 56, 53,
74
- 1, 21, 26, 42, 28, 24, 25, 29, 52, 67,
75
- 59, 60, nil, 77, nil, nil, nil, nil, nil, nil,
121
+ 30, 73, 61, 55, 72, 71, 95, 28, 1, 2,
122
+ 42, 38, 64, 65, 66, 67, 68, 47, 29, 54,
123
+ 70, 94, nil, 40, 41, 102, nil, 74, 75, 46,
76
124
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
77
- 69, 30, 64, 70, 65, nil, 73, nil, 49, 56,
78
- 74, nil, nil, nil, nil, nil, nil, nil, 69, 30,
79
- nil, 70 ]
125
+ nil, nil, nil, nil, nil, nil, nil, 96, nil, nil,
126
+ 73, nil, nil, 72, 99, nil, 92, nil, 61, 98,
127
+ 86, 87, 88, 89, 90, nil, 96, 47, 47, 47,
128
+ 47, 47, 91, 97, nil, nil, 74, nil, nil, 46,
129
+ 46, 46, 46, 46, nil, nil, nil, nil, nil, nil,
130
+ nil, nil, 97 ]
80
131
 
81
132
  racc_goto_check = [
82
- 11, 14, 2, 18, 20, 19, 10, 3, 6, 17,
83
- 1, 2, 7, 8, 12, 3, 3, 13, 15, 16,
84
- 18, 18, nil, 19, nil, nil, nil, nil, nil, nil,
133
+ 11, 17, 14, 24, 12, 22, 23, 3, 1, 2,
134
+ 7, 11, 10, 10, 10, 10, 10, 11, 2, 8,
135
+ 19, 21, nil, 3, 3, 23, nil, 11, 11, 18,
85
136
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
86
- 11, 14, 18, 18, 10, nil, 20, nil, 10, 6,
87
- 17, nil, nil, nil, nil, nil, nil, nil, 11, 14,
88
- nil, 18 ]
137
+ nil, nil, nil, nil, nil, nil, nil, 17, nil, nil,
138
+ 17, nil, nil, 12, 22, nil, 14, nil, 14, 24,
139
+ 7, 7, 7, 7, 7, nil, 17, 11, 11, 11,
140
+ 11, 11, 11, 11, nil, nil, 11, nil, nil, 18,
141
+ 18, 18, 18, 18, nil, nil, nil, nil, nil, nil,
142
+ nil, nil, 11 ]
89
143
 
90
144
  racc_goto_pointer = [
91
- nil, 10, 2, -1, nil, nil, -14, -6, -6, nil,
92
- -13, -18, -4, -1, -17, -4, -39, -13, -15, -53,
93
- -15 ]
145
+ nil, 8, 9, -1, nil, nil, nil, -16, -8, nil,
146
+ -19, -9, -32, nil, -25, nil, nil, -35, 3, -16,
147
+ nil, -61, -31, -76, -24 ]
94
148
 
95
149
  racc_goto_default = [
96
150
  nil, nil, nil, 3, 4, 5, 6, nil, nil, 7,
97
- 12, 54, 71, nil, 13, nil, nil, nil, 55, nil,
98
- nil ]
151
+ 10, 11, 12, 13, 14, 43, 44, 45, 15, nil,
152
+ 48, nil, nil, nil, nil ]
99
153
 
100
154
  racc_reduce_table = [
101
155
  0, 0, :racc_error,
102
- 1, 22, :_reduce_none,
103
- 0, 22, :_reduce_2,
104
- 1, 23, :_reduce_none,
105
- 1, 23, :_reduce_none,
106
- 1, 23, :_reduce_none,
107
- 3, 24, :_reduce_6,
108
- 3, 24, :_reduce_7,
109
- 1, 24, :_reduce_none,
110
- 2, 26, :_reduce_9,
111
- 3, 25, :_reduce_10,
112
- 3, 25, :_reduce_11,
113
- 3, 30, :_reduce_12,
114
- 1, 27, :_reduce_none,
115
- 1, 27, :_reduce_none,
116
156
  1, 27, :_reduce_none,
157
+ 0, 27, :_reduce_2,
158
+ 1, 28, :_reduce_none,
117
159
  1, 28, :_reduce_none,
118
160
  1, 28, :_reduce_none,
119
- 1, 28, :_reduce_18,
120
- 3, 31, :_reduce_19,
121
- 4, 31, :_reduce_20,
122
- 3, 33, :_reduce_21,
123
- 4, 33, :_reduce_22,
124
- 1, 35, :_reduce_none,
161
+ 3, 29, :_reduce_6,
162
+ 3, 29, :_reduce_7,
163
+ 1, 29, :_reduce_none,
164
+ 2, 31, :_reduce_9,
165
+ 3, 30, :_reduce_10,
166
+ 3, 30, :_reduce_11,
167
+ 3, 35, :_reduce_12,
168
+ 1, 32, :_reduce_none,
169
+ 3, 36, :_reduce_14,
170
+ 3, 36, :_reduce_15,
171
+ 3, 36, :_reduce_16,
172
+ 3, 36, :_reduce_17,
173
+ 3, 36, :_reduce_18,
174
+ 1, 36, :_reduce_none,
125
175
  1, 36, :_reduce_none,
126
- 3, 36, :_reduce_25,
127
176
  1, 38, :_reduce_none,
128
177
  1, 38, :_reduce_none,
129
- 1, 38, :_reduce_28,
178
+ 1, 33, :_reduce_none,
179
+ 1, 33, :_reduce_24,
180
+ 1, 33, :_reduce_none,
181
+ 3, 41, :_reduce_26,
182
+ 3, 41, :_reduce_27,
183
+ 3, 41, :_reduce_28,
184
+ 3, 41, :_reduce_29,
185
+ 3, 41, :_reduce_30,
186
+ 3, 40, :_reduce_31,
187
+ 4, 40, :_reduce_32,
188
+ 3, 46, :_reduce_33,
189
+ 4, 46, :_reduce_34,
190
+ 1, 44, :_reduce_none,
191
+ 1, 45, :_reduce_none,
192
+ 3, 45, :_reduce_37,
193
+ 1, 48, :_reduce_38,
194
+ 1, 48, :_reduce_none,
195
+ 1, 48, :_reduce_none,
196
+ 1, 47, :_reduce_none,
197
+ 3, 47, :_reduce_42,
198
+ 1, 49, :_reduce_none,
199
+ 1, 49, :_reduce_none,
200
+ 1, 42, :_reduce_none,
201
+ 1, 42, :_reduce_none,
202
+ 3, 42, :_reduce_47,
203
+ 3, 42, :_reduce_48,
204
+ 3, 34, :_reduce_49,
130
205
  1, 37, :_reduce_none,
131
- 3, 37, :_reduce_30,
132
- 1, 40, :_reduce_none,
133
- 1, 40, :_reduce_none,
134
- 1, 40, :_reduce_none,
135
- 1, 34, :_reduce_none,
136
- 1, 34, :_reduce_none,
137
- 3, 34, :_reduce_36,
138
- 3, 34, :_reduce_37,
139
- 3, 29, :_reduce_38,
140
- 1, 39, :_reduce_none,
141
- 1, 39, :_reduce_none,
206
+ 1, 37, :_reduce_none,
207
+ 1, 37, :_reduce_none,
208
+ 3, 37, :_reduce_53,
209
+ 2, 37, :_reduce_54,
210
+ 1, 43, :_reduce_none,
211
+ 1, 43, :_reduce_none,
212
+ 1, 43, :_reduce_none,
213
+ 1, 43, :_reduce_none,
214
+ 1, 43, :_reduce_none,
215
+ 1, 50, :_reduce_none,
216
+ 1, 50, :_reduce_none,
217
+ 1, 50, :_reduce_none,
218
+ 1, 50, :_reduce_none,
219
+ 1, 50, :_reduce_none,
220
+ 1, 50, :_reduce_none,
142
221
  1, 39, :_reduce_none,
143
- 3, 39, :_reduce_42,
144
- 2, 39, :_reduce_43,
145
- 1, 32, :_reduce_none,
146
- 1, 32, :_reduce_none,
147
- 1, 32, :_reduce_none,
148
- 1, 32, :_reduce_none,
149
- 1, 32, :_reduce_none,
150
- 1, 41, :_reduce_none,
151
- 1, 41, :_reduce_none,
152
- 1, 41, :_reduce_none,
153
- 1, 41, :_reduce_none,
154
- 1, 41, :_reduce_none,
155
- 1, 41, :_reduce_none ]
222
+ 1, 39, :_reduce_none ]
156
223
 
157
- racc_reduce_n = 55
224
+ racc_reduce_n = 68
158
225
 
159
- racc_shift_n = 78
226
+ racc_shift_n = 103
160
227
 
161
228
  racc_token_table = {
162
229
  false => 0,
163
230
  :error => 1,
164
231
  :UMINUS => 2,
165
- :OPERATOR => 3,
166
- :RANGE_OPERATOR => 4,
167
- :UNARY_CONJUNCTION => 5,
168
- :CONJUNCTION => 6,
169
- :LPAREN => 7,
170
- :RPAREN => 8,
171
- :STANDARD_FIELD => 9,
172
- :CUSTOM_FIELD => 10,
173
- :KEYWORD => 11,
174
- :COMMA => 12,
175
- :INTEGER => 13,
176
- :DECIMAL => 14,
177
- :CHARACTER => 15,
178
- :DATE => 16,
179
- :DATETIME => 17,
180
- :TIME => 18,
181
- :BOOLEAN => 19,
182
- :NULL => 20 }
183
-
184
- racc_nt_base = 21
232
+ :MUL => 3,
233
+ :DIV => 4,
234
+ :MOD => 5,
235
+ :ADD => 6,
236
+ :SUB => 7,
237
+ :OPERATOR => 8,
238
+ :RANGE_OPERATOR => 9,
239
+ :UNARY_CONJUNCTION => 10,
240
+ :CONJUNCTION => 11,
241
+ :LPAREN => 12,
242
+ :RPAREN => 13,
243
+ :KEYWORD => 14,
244
+ :COMMA => 15,
245
+ :INTEGER => 16,
246
+ :DECIMAL => 17,
247
+ :CHARACTER => 18,
248
+ :DATE => 19,
249
+ :DATETIME => 20,
250
+ :TIME => 21,
251
+ :BOOLEAN => 22,
252
+ :NULL => 23,
253
+ :STANDARD_FIELD => 24,
254
+ :CUSTOM_FIELD => 25 }
255
+
256
+ racc_nt_base = 26
185
257
 
186
258
  racc_use_result_var = true
187
259
 
@@ -205,14 +277,17 @@ Racc_token_to_s_table = [
205
277
  "$end",
206
278
  "error",
207
279
  "UMINUS",
280
+ "MUL",
281
+ "DIV",
282
+ "MOD",
283
+ "ADD",
284
+ "SUB",
208
285
  "OPERATOR",
209
286
  "RANGE_OPERATOR",
210
287
  "UNARY_CONJUNCTION",
211
288
  "CONJUNCTION",
212
289
  "LPAREN",
213
290
  "RPAREN",
214
- "STANDARD_FIELD",
215
- "CUSTOM_FIELD",
216
291
  "KEYWORD",
217
292
  "COMMA",
218
293
  "INTEGER",
@@ -223,25 +298,31 @@ Racc_token_to_s_table = [
223
298
  "TIME",
224
299
  "BOOLEAN",
225
300
  "NULL",
301
+ "STANDARD_FIELD",
302
+ "CUSTOM_FIELD",
226
303
  "$start",
227
304
  "target",
228
305
  "expressions",
229
306
  "expression",
230
307
  "conjunction",
231
308
  "unary_conjunction",
232
- "field",
309
+ "field_expression",
233
310
  "condition",
234
311
  "range",
235
312
  "group",
313
+ "field_arithmetic_expression",
314
+ "literals",
315
+ "field_function_expression",
316
+ "field",
236
317
  "function",
237
- "literal",
238
- "literal_function",
318
+ "arithmetic_condition",
239
319
  "literal_list",
320
+ "literal",
240
321
  "function_name",
241
322
  "function_args",
323
+ "literal_function",
242
324
  "literal_function_args",
243
325
  "function_arg",
244
- "literals",
245
326
  "literal_function_arg",
246
327
  "rangeable" ]
247
328
 
@@ -298,126 +379,182 @@ end
298
379
 
299
380
  # reduce 13 omitted
300
381
 
301
- # reduce 14 omitted
382
+ def _reduce_14(val, _values, result)
383
+ result = tokenize_arithmetic(val[0], val[1], val[2])
384
+ result
385
+ end
302
386
 
303
- # reduce 15 omitted
387
+ def _reduce_15(val, _values, result)
388
+ result = tokenize_arithmetic(val[0], val[1], val[2])
389
+ result
390
+ end
304
391
 
305
- # reduce 16 omitted
392
+ def _reduce_16(val, _values, result)
393
+ result = tokenize_arithmetic(val[0], val[1], val[2])
394
+ result
395
+ end
306
396
 
307
- # reduce 17 omitted
397
+ def _reduce_17(val, _values, result)
398
+ result = tokenize_arithmetic(val[0], val[1], val[2])
399
+ result
400
+ end
308
401
 
309
402
  def _reduce_18(val, _values, result)
403
+ result = tokenize_arithmetic(val[0], val[1], val[2])
404
+ result
405
+ end
406
+
407
+ # reduce 19 omitted
408
+
409
+ # reduce 20 omitted
410
+
411
+ # reduce 21 omitted
412
+
413
+ # reduce 22 omitted
414
+
415
+ # reduce 23 omitted
416
+
417
+ def _reduce_24(val, _values, result)
310
418
  result = tokenize_list(val[0])
311
419
  result
312
420
  end
313
421
 
314
- def _reduce_19(val, _values, result)
422
+ # reduce 25 omitted
423
+
424
+ def _reduce_26(val, _values, result)
425
+ result = add_fold(val[0], val[2])
426
+ result
427
+ end
428
+
429
+ def _reduce_27(val, _values, result)
430
+ result = sub_fold(val[0], val[2])
431
+ result
432
+ end
433
+
434
+ def _reduce_28(val, _values, result)
435
+ result = mul_fold(val[0], val[2])
436
+ result
437
+ end
438
+
439
+ def _reduce_29(val, _values, result)
440
+ result = div_fold(val[0], val[2])
441
+ result
442
+ end
443
+
444
+ def _reduce_30(val, _values, result)
445
+ result = mod_fold(val[0], val[2])
446
+ result
447
+ end
448
+
449
+ def _reduce_31(val, _values, result)
315
450
  result = tokenize_function(val[0], [])
316
451
  result
317
452
  end
318
453
 
319
- def _reduce_20(val, _values, result)
454
+ def _reduce_32(val, _values, result)
320
455
  result = tokenize_function(val[0], val[2])
321
456
  result
322
457
  end
323
458
 
324
- def _reduce_21(val, _values, result)
459
+ def _reduce_33(val, _values, result)
325
460
  result = tokenize_function(val[0], [])
326
461
  result
327
462
  end
328
463
 
329
- def _reduce_22(val, _values, result)
464
+ def _reduce_34(val, _values, result)
330
465
  result = tokenize_function(val[0], val[2])
331
466
  result
332
467
  end
333
468
 
334
- # reduce 23 omitted
469
+ # reduce 35 omitted
335
470
 
336
- # reduce 24 omitted
471
+ # reduce 36 omitted
337
472
 
338
- def _reduce_25(val, _values, result)
473
+ def _reduce_37(val, _values, result)
339
474
  result = tokenize_function_args(val[0], val[2])
340
475
  result
341
476
  end
342
477
 
343
- # reduce 26 omitted
344
-
345
- # reduce 27 omitted
346
-
347
- def _reduce_28(val, _values, result)
478
+ def _reduce_38(val, _values, result)
348
479
  result = tokenize_field_arg(val[0])
349
480
  result
350
481
  end
351
482
 
352
- # reduce 29 omitted
483
+ # reduce 39 omitted
353
484
 
354
- def _reduce_30(val, _values, result)
485
+ # reduce 40 omitted
486
+
487
+ # reduce 41 omitted
488
+
489
+ def _reduce_42(val, _values, result)
355
490
  result = tokenize_function_args(val[0], val[2])
356
491
  result
357
492
  end
358
493
 
359
- # reduce 31 omitted
360
-
361
- # reduce 32 omitted
494
+ # reduce 43 omitted
362
495
 
363
- # reduce 33 omitted
496
+ # reduce 44 omitted
364
497
 
365
- # reduce 34 omitted
498
+ # reduce 45 omitted
366
499
 
367
- # reduce 35 omitted
500
+ # reduce 46 omitted
368
501
 
369
- def _reduce_36(val, _values, result)
502
+ def _reduce_47(val, _values, result)
370
503
  result = tokenize_multiple(val[0], val[2])
371
504
  result
372
505
  end
373
506
 
374
- def _reduce_37(val, _values, result)
507
+ def _reduce_48(val, _values, result)
375
508
  result = tokenize_multiple(val[0], val[2])
376
509
  result
377
510
  end
378
511
 
379
- def _reduce_38(val, _values, result)
512
+ def _reduce_49(val, _values, result)
380
513
  result = tokenize_multiple(val[0], val[2])
381
514
  result
382
515
  end
383
516
 
384
- # reduce 39 omitted
517
+ # reduce 50 omitted
385
518
 
386
- # reduce 40 omitted
519
+ # reduce 51 omitted
387
520
 
388
- # reduce 41 omitted
521
+ # reduce 52 omitted
389
522
 
390
- def _reduce_42(val, _values, result)
523
+ def _reduce_53(val, _values, result)
391
524
  result = val[1]
392
525
  result
393
526
  end
394
527
 
395
- def _reduce_43(val, _values, result)
528
+ def _reduce_54(val, _values, result)
396
529
  result = tokenize_literal_negation(val[1])
397
530
  result
398
531
  end
399
532
 
400
- # reduce 44 omitted
533
+ # reduce 55 omitted
401
534
 
402
- # reduce 45 omitted
535
+ # reduce 56 omitted
403
536
 
404
- # reduce 46 omitted
537
+ # reduce 57 omitted
405
538
 
406
- # reduce 47 omitted
539
+ # reduce 58 omitted
407
540
 
408
- # reduce 48 omitted
541
+ # reduce 59 omitted
409
542
 
410
- # reduce 49 omitted
543
+ # reduce 60 omitted
411
544
 
412
- # reduce 50 omitted
545
+ # reduce 61 omitted
413
546
 
414
- # reduce 51 omitted
547
+ # reduce 62 omitted
415
548
 
416
- # reduce 52 omitted
549
+ # reduce 63 omitted
550
+
551
+ # reduce 64 omitted
552
+
553
+ # reduce 65 omitted
417
554
 
418
- # reduce 53 omitted
555
+ # reduce 66 omitted
419
556
 
420
- # reduce 54 omitted
557
+ # reduce 67 omitted
421
558
 
422
559
  def _reduce_none(val, _values, result)
423
560
  val[0]