sparkql 1.2.2 → 1.2.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +5 -13
  2. data/CHANGELOG.md +21 -0
  3. data/GRAMMAR.md +5 -4
  4. data/Gemfile +1 -2
  5. data/VERSION +1 -1
  6. data/lib/sparkql/function_resolver.rb +768 -676
  7. data/lib/sparkql/parser.rb +198 -178
  8. data/lib/sparkql/parser.y +4 -2
  9. data/lib/sparkql/parser_compatibility.rb +36 -17
  10. data/lib/sparkql/parser_tools.rb +67 -23
  11. data/sparkql.gemspec +19 -17
  12. data/test/unit/function_resolver_test.rb +455 -191
  13. data/test/unit/parser_compatability_test.rb +15 -0
  14. data/test/unit/parser_test.rb +148 -13
  15. metadata +34 -35
  16. data/.ruby-version +0 -1
data/lib/sparkql/parser.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # DO NOT MODIFY!!!!
3
- # This file is automatically generated by Racc 1.4.14
3
+ # This file is automatically generated by Racc 1.4.15
4
4
  # from Racc grammer file "".
5
5
  #
6
6
 
@@ -16,140 +16,148 @@ module Sparkql
16
16
  ##### State transition tables begin ###
17
17
 
18
18
  racc_action_table = [
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,
19
+ 11, 33, 34, 35, 31, 32, 25, 24, 8, 64,
20
+ 9, 65, 17, 23, 18, 19, 20, 11, 33, 34,
21
+ 35, 38, 21, 22, 33, 34, 35, 9, 88, 17,
22
+ 89, 18, 19, 20, 11, 80, 81, 82, 39, 21,
23
+ 22, 105, 8, 106, 9, 83, 17, 86, 18, 19,
24
+ 20, 11, 80, 81, 82, 87, 21, 22, 25, 24,
25
+ nil, 37, nil, 17, nil, 18, 19, 20, 11, 26,
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,
27
+ 17, nil, 18, 19, 20, 11, nil, nil, nil, nil,
28
+ 21, 22, nil, nil, nil, 9, nil, 17, nil, 18,
29
+ 19, 20, 11, nil, nil, nil, nil, 21, 22, nil,
30
+ nil, nil, 37, nil, 17, nil, 18, 19, 20, 11,
31
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 ]
32
+ nil, 17, nil, 18, 19, 20, 11, nil, nil, nil,
33
+ nil, 21, 22, nil, nil, nil, 37, nil, 17, nil,
34
+ 18, 19, 20, 11, nil, nil, nil, nil, 21, 22,
35
+ nil, nil, nil, 37, nil, 17, nil, 18, 19, 20,
36
+ 11, nil, nil, nil, nil, 21, 22, nil, nil, nil,
37
+ 37, nil, 17, nil, 18, 19, 20, 11, nil, nil,
38
+ nil, nil, 21, 22, nil, nil, nil, 37, nil, 17,
39
+ nil, 18, 19, 20, 47, nil, nil, nil, nil, 21,
40
+ 22, nil, nil, nil, 46, nil, 17, 47, 18, 19,
41
+ 20, 51, 52, 53, 54, 55, nil, 46, nil, 17,
42
+ 47, 18, 19, 20, 51, 52, 53, 54, 55, nil,
43
+ 46, nil, 17, 47, 18, 19, 20, 51, 52, 53,
44
+ 54, 55, nil, 46, nil, 17, 47, 18, 19, 20,
45
+ 51, 52, 53, 54, 55, nil, 46, nil, 17, 47,
46
+ 18, 19, 20, 51, 52, 53, 54, 55, nil, 46,
47
+ nil, 17, 47, 18, 19, 20, 51, 52, 53, 54,
48
+ 55, nil, 46, nil, 17, 47, 18, 19, 20, 51,
49
+ 52, 53, 54, 55, nil, 46, nil, 17, nil, 18,
50
+ 19, 20, 51, 52, 53, 54, 55, 72, 17, nil,
51
+ 18, 19, 20, 51, 52, 53, 54, 55, 21, 22,
52
+ 17, nil, 18, 19, 20, 51, 52, 53, 54, 55,
53
+ 21, 22, 33, 34, 35, 31, 32, 80, 81, 82,
54
+ 78, 79, 65, nil, nil, 98, nil, 97, 18, 19,
55
+ 20, 51, 52, 53, 54, 55, 17, nil, 58, 59,
56
+ nil, 60, 61, 62, 17, nil, 58, 59, nil, 60,
57
+ 61, 62, 18, 19, 20, 51, 52, 53, 54, 55,
58
+ 33, 34, 35, 31, 32, 80, 81, 82, 78, 79,
59
+ 17, nil, 18, 19, 20 ]
55
60
 
56
61
  racc_action_check = [
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 ]
62
+ 0, 30, 30, 30, 30, 30, 29, 29, 0, 29,
63
+ 0, 30, 0, 1, 0, 0, 0, 8, 66, 66,
64
+ 66, 16, 0, 0, 67, 67, 67, 8, 73, 8,
65
+ 73, 8, 8, 8, 9, 90, 90, 90, 23, 8,
66
+ 8, 99, 9, 99, 9, 44, 9, 48, 9, 9,
67
+ 9, 11, 91, 91, 91, 57, 9, 9, 2, 2,
68
+ nil, 11, nil, 11, nil, 11, 11, 11, 24, 6,
69
+ 6, nil, nil, 11, 11, nil, nil, nil, 24, nil,
70
+ 24, nil, 24, 24, 24, 25, nil, nil, nil, nil,
71
+ 24, 24, nil, nil, nil, 25, nil, 25, nil, 25,
72
+ 25, 25, 31, nil, nil, nil, nil, 25, 25, nil,
73
+ nil, nil, 31, nil, 31, nil, 31, 31, 31, 32,
74
+ nil, nil, nil, nil, 31, 31, nil, nil, nil, 32,
75
+ nil, 32, nil, 32, 32, 32, 33, nil, nil, nil,
76
+ nil, 32, 32, nil, nil, nil, 33, nil, 33, nil,
77
+ 33, 33, 33, 34, nil, nil, nil, nil, 33, 33,
78
+ nil, nil, nil, 34, nil, 34, nil, 34, 34, 34,
79
+ 35, nil, nil, nil, nil, 34, 34, nil, nil, nil,
80
+ 35, nil, 35, nil, 35, 35, 35, 37, nil, nil,
81
+ nil, nil, 35, 35, nil, nil, nil, 37, nil, 37,
82
+ nil, 37, 37, 37, 26, nil, nil, nil, nil, 37,
83
+ 37, nil, nil, nil, 26, nil, 26, 46, 26, 26,
84
+ 26, 26, 26, 26, 26, 26, nil, 46, nil, 46,
85
+ 47, 46, 46, 46, 46, 46, 46, 46, 46, nil,
86
+ 47, nil, 47, 78, 47, 47, 47, 47, 47, 47,
87
+ 47, 47, nil, 78, nil, 78, 79, 78, 78, 78,
88
+ 78, 78, 78, 78, 78, nil, 79, nil, 79, 80,
89
+ 79, 79, 79, 79, 79, 79, 79, 79, nil, 80,
90
+ nil, 80, 81, 80, 80, 80, 80, 80, 80, 80,
91
+ 80, nil, 81, nil, 81, 82, 81, 81, 81, 81,
92
+ 81, 81, 81, 81, nil, 82, nil, 82, nil, 82,
93
+ 82, 82, 82, 82, 82, 82, 82, 38, 38, nil,
94
+ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
95
+ 89, nil, 89, 89, 89, 89, 89, 89, 89, 89,
96
+ 89, 89, 71, 71, 71, 71, 71, 84, 84, 84,
97
+ 84, 84, 71, nil, nil, 86, nil, 84, 86, 86,
98
+ 86, 86, 86, 86, 86, 86, 27, nil, 27, 27,
99
+ nil, 27, 27, 27, 87, nil, 87, 87, nil, 87,
100
+ 87, 87, 106, 106, 106, 106, 106, 106, 106, 106,
101
+ 10, 10, 10, 10, 10, 42, 42, 42, 42, 42,
102
+ 83, nil, 83, 83, 83 ]
93
103
 
94
104
  racc_action_pointer = [
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 ]
105
+ -2, 13, 48, nil, nil, nil, 61, nil, 15, 32,
106
+ 387, 49, nil, nil, nil, nil, 9, nil, nil, nil,
107
+ nil, nil, nil, 38, 66, 83, 202, 352, nil, -4,
108
+ -2, 100, 117, 134, 151, 168, nil, 185, 304, nil,
109
+ nil, nil, 392, nil, 30, nil, 215, 228, 35, nil,
110
+ nil, nil, nil, nil, nil, nil, nil, 40, nil, nil,
111
+ nil, nil, nil, nil, nil, nil, 15, 21, nil, nil,
112
+ nil, 339, nil, 15, nil, nil, nil, nil, 241, 254,
113
+ 267, 280, 293, 386, 344, nil, 342, 360, nil, 316,
114
+ 32, 49, nil, nil, nil, nil, nil, nil, nil, 28,
115
+ nil, nil, nil, nil, nil, nil, 366, nil ]
106
116
 
107
117
  racc_action_default = [
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 ]
118
+ -2, -70, -1, -3, -4, -5, -70, -8, -70, -70,
119
+ -13, -70, -21, -22, -23, -24, -70, -39, -54, -55,
120
+ -56, -68, -69, -70, -70, -70, -70, -70, -9, -70,
121
+ -13, -70, -70, -70, -70, -70, -20, -70, -70, 108,
122
+ -10, -11, -6, -25, -26, -27, -70, -70, -70, -49,
123
+ -50, -57, -58, -59, -60, -61, -7, -70, -62, -63,
124
+ -64, -65, -66, -67, -12, -19, -14, -15, -16, -17,
125
+ -18, -70, -35, -70, -40, -42, -43, -44, -70, -70,
126
+ -70, -70, -70, -70, -70, -29, -70, -70, -36, -70,
127
+ -30, -31, -32, -33, -34, -51, -52, -28, -37, -70,
128
+ -45, -47, -48, -53, -41, -38, -70, -46 ]
119
129
 
120
130
  racc_goto_table = [
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,
124
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
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 ]
131
+ 49, 1, 100, 56, 57, 73, 63, 28, 75, 99,
132
+ 76, nil, 77, nil, 74, 42, 30, 2, 36, nil,
133
+ 49, 49, 107, 40, 41, nil, 29, nil, nil, 48,
134
+ nil, nil, nil, nil, nil, 84, 85, nil, 66, 67,
135
+ 68, 69, 70, nil, 71, nil, nil, nil, nil, 48,
136
+ 48, nil, 49, 49, 49, 49, 49, 95, 101, 75,
137
+ 102, 76, 96, 77, 103, 104, 63, 90, 91, 92,
138
+ 93, 94, nil, nil, nil, nil, nil, nil, 101, nil,
139
+ 102, 48, 48, 48, 48, 48 ]
131
140
 
132
141
  racc_goto_check = [
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,
136
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
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 ]
142
+ 11, 1, 23, 8, 24, 19, 14, 3, 12, 21,
143
+ 17, nil, 11, nil, 22, 7, 10, 2, 10, nil,
144
+ 11, 11, 23, 3, 3, nil, 2, nil, nil, 18,
145
+ nil, nil, nil, nil, nil, 7, 7, nil, 10, 10,
146
+ 10, 10, 10, nil, 10, nil, nil, nil, nil, 18,
147
+ 18, nil, 11, 11, 11, 11, 11, 11, 17, 12,
148
+ 11, 17, 14, 11, 24, 22, 14, 7, 7, 7,
149
+ 7, 7, nil, nil, nil, nil, nil, nil, 17, nil,
150
+ 11, 18, 18, 18, 18, 18 ]
143
151
 
144
152
  racc_goto_pointer = [
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 ]
153
+ nil, 1, 17, -1, nil, nil, nil, -11, -24, nil,
154
+ 7, -26, -30, nil, -21, nil, nil, -28, 3, -33,
155
+ nil, -77, -24, -84, -23 ]
148
156
 
149
157
  racc_goto_default = [
150
158
  nil, nil, nil, 3, 4, 5, 6, nil, nil, 7,
151
- 10, 11, 12, 13, 14, 43, 44, 45, 15, nil,
152
- 48, nil, nil, nil, nil ]
159
+ 10, 12, 13, 14, 15, 43, 44, 45, 16, nil,
160
+ 50, nil, nil, nil, nil ]
153
161
 
154
162
  racc_reduce_table = [
155
163
  0, 0, :racc_error,
@@ -171,42 +179,44 @@ racc_reduce_table = [
171
179
  3, 36, :_reduce_16,
172
180
  3, 36, :_reduce_17,
173
181
  3, 36, :_reduce_18,
182
+ 3, 36, :_reduce_19,
183
+ 2, 36, :_reduce_20,
174
184
  1, 36, :_reduce_none,
175
185
  1, 36, :_reduce_none,
176
186
  1, 38, :_reduce_none,
177
187
  1, 38, :_reduce_none,
178
188
  1, 33, :_reduce_none,
179
- 1, 33, :_reduce_24,
189
+ 1, 33, :_reduce_26,
180
190
  1, 33, :_reduce_none,
181
- 3, 41, :_reduce_26,
182
- 3, 41, :_reduce_27,
183
- 3, 41, :_reduce_28,
184
- 3, 41, :_reduce_29,
191
+ 3, 33, :_reduce_28,
192
+ 2, 33, :_reduce_29,
185
193
  3, 41, :_reduce_30,
186
- 3, 40, :_reduce_31,
187
- 4, 40, :_reduce_32,
188
- 3, 46, :_reduce_33,
189
- 4, 46, :_reduce_34,
194
+ 3, 41, :_reduce_31,
195
+ 3, 41, :_reduce_32,
196
+ 3, 41, :_reduce_33,
197
+ 3, 41, :_reduce_34,
198
+ 3, 40, :_reduce_35,
199
+ 4, 40, :_reduce_36,
200
+ 3, 46, :_reduce_37,
201
+ 4, 46, :_reduce_38,
190
202
  1, 44, :_reduce_none,
191
203
  1, 45, :_reduce_none,
192
- 3, 45, :_reduce_37,
193
- 1, 48, :_reduce_38,
204
+ 3, 45, :_reduce_41,
205
+ 1, 48, :_reduce_42,
194
206
  1, 48, :_reduce_none,
195
207
  1, 48, :_reduce_none,
196
208
  1, 47, :_reduce_none,
197
- 3, 47, :_reduce_42,
209
+ 3, 47, :_reduce_46,
198
210
  1, 49, :_reduce_none,
199
211
  1, 49, :_reduce_none,
200
212
  1, 42, :_reduce_none,
201
213
  1, 42, :_reduce_none,
202
- 3, 42, :_reduce_47,
203
- 3, 42, :_reduce_48,
204
- 3, 34, :_reduce_49,
214
+ 3, 42, :_reduce_51,
215
+ 3, 42, :_reduce_52,
216
+ 3, 34, :_reduce_53,
205
217
  1, 37, :_reduce_none,
206
218
  1, 37, :_reduce_none,
207
219
  1, 37, :_reduce_none,
208
- 3, 37, :_reduce_53,
209
- 2, 37, :_reduce_54,
210
220
  1, 43, :_reduce_none,
211
221
  1, 43, :_reduce_none,
212
222
  1, 43, :_reduce_none,
@@ -221,9 +231,9 @@ racc_reduce_table = [
221
231
  1, 39, :_reduce_none,
222
232
  1, 39, :_reduce_none ]
223
233
 
224
- racc_reduce_n = 68
234
+ racc_reduce_n = 70
225
235
 
226
- racc_shift_n = 103
236
+ racc_shift_n = 108
227
237
 
228
238
  racc_token_table = {
229
239
  false => 0,
@@ -404,9 +414,15 @@ def _reduce_18(val, _values, result)
404
414
  result
405
415
  end
406
416
 
407
- # reduce 19 omitted
417
+ def _reduce_19(val, _values, result)
418
+ result = tokenize_arithmetic_group(val[1])
419
+ result
420
+ end
408
421
 
409
- # reduce 20 omitted
422
+ def _reduce_20(val, _values, result)
423
+ result = tokenize_arithmetic_negation(val[1])
424
+ result
425
+ end
410
426
 
411
427
  # reduce 21 omitted
412
428
 
@@ -414,69 +430,69 @@ end
414
430
 
415
431
  # reduce 23 omitted
416
432
 
417
- def _reduce_24(val, _values, result)
418
- result = tokenize_list(val[0])
419
- result
420
- end
433
+ # reduce 24 omitted
421
434
 
422
435
  # reduce 25 omitted
423
436
 
424
437
  def _reduce_26(val, _values, result)
425
- result = add_fold(val[0], val[2])
438
+ result = tokenize_list(val[0])
426
439
  result
427
440
  end
428
441
 
429
- def _reduce_27(val, _values, result)
430
- result = sub_fold(val[0], val[2])
431
- result
432
- end
442
+ # reduce 27 omitted
433
443
 
434
444
  def _reduce_28(val, _values, result)
435
- result = mul_fold(val[0], val[2])
445
+ result = group_fold(val[1])
436
446
  result
437
447
  end
438
448
 
439
449
  def _reduce_29(val, _values, result)
440
- result = div_fold(val[0], val[2])
450
+ result = tokenize_literal_negation(val[1])
441
451
  result
442
452
  end
443
453
 
444
454
  def _reduce_30(val, _values, result)
445
- result = mod_fold(val[0], val[2])
455
+ result = add_fold(val[0], val[2])
446
456
  result
447
457
  end
448
458
 
449
459
  def _reduce_31(val, _values, result)
450
- result = tokenize_function(val[0], [])
460
+ result = sub_fold(val[0], val[2])
451
461
  result
452
462
  end
453
463
 
454
464
  def _reduce_32(val, _values, result)
455
- result = tokenize_function(val[0], val[2])
465
+ result = mul_fold(val[0], val[2])
456
466
  result
457
467
  end
458
468
 
459
469
  def _reduce_33(val, _values, result)
460
- result = tokenize_function(val[0], [])
470
+ result = div_fold(val[0], val[2])
461
471
  result
462
472
  end
463
473
 
464
474
  def _reduce_34(val, _values, result)
465
- result = tokenize_function(val[0], val[2])
475
+ result = mod_fold(val[0], val[2])
466
476
  result
467
477
  end
468
478
 
469
- # reduce 35 omitted
479
+ def _reduce_35(val, _values, result)
480
+ result = tokenize_function(val[0], [])
481
+ result
482
+ end
470
483
 
471
- # reduce 36 omitted
484
+ def _reduce_36(val, _values, result)
485
+ result = tokenize_function(val[0], val[2])
486
+ result
487
+ end
472
488
 
473
489
  def _reduce_37(val, _values, result)
474
- result = tokenize_function_args(val[0], val[2])
490
+ result = tokenize_function(val[0], [])
475
491
  result
476
492
  end
477
493
 
478
494
  def _reduce_38(val, _values, result)
479
- result = tokenize_field_arg(val[0])
495
+ result = tokenize_function(val[0], val[2])
480
496
  result
481
497
  end
482
498
 
@@ -484,10 +500,13 @@ end
484
500
 
485
501
  # reduce 40 omitted
486
502
 
487
- # reduce 41 omitted
503
+ def _reduce_41(val, _values, result)
504
+ result = tokenize_function_args(val[0], val[2])
505
+ result
506
+ end
488
507
 
489
508
  def _reduce_42(val, _values, result)
490
- result = tokenize_function_args(val[0], val[2])
509
+ result = tokenize_field_arg(val[0])
491
510
  result
492
511
  end
493
512
 
@@ -497,38 +516,35 @@ end
497
516
 
498
517
  # reduce 45 omitted
499
518
 
500
- # reduce 46 omitted
501
-
502
- def _reduce_47(val, _values, result)
503
- result = tokenize_multiple(val[0], val[2])
519
+ def _reduce_46(val, _values, result)
520
+ result = tokenize_function_args(val[0], val[2])
504
521
  result
505
522
  end
506
523
 
507
- def _reduce_48(val, _values, result)
524
+ # reduce 47 omitted
525
+
526
+ # reduce 48 omitted
527
+
528
+ # reduce 49 omitted
529
+
530
+ # reduce 50 omitted
531
+
532
+ def _reduce_51(val, _values, result)
508
533
  result = tokenize_multiple(val[0], val[2])
509
534
  result
510
535
  end
511
536
 
512
- def _reduce_49(val, _values, result)
537
+ def _reduce_52(val, _values, result)
513
538
  result = tokenize_multiple(val[0], val[2])
514
539
  result
515
540
  end
516
541
 
517
- # reduce 50 omitted
518
-
519
- # reduce 51 omitted
520
-
521
- # reduce 52 omitted
522
-
523
542
  def _reduce_53(val, _values, result)
524
- result = val[1]
543
+ result = tokenize_multiple(val[0], val[2])
525
544
  result
526
545
  end
527
546
 
528
- def _reduce_54(val, _values, result)
529
- result = tokenize_literal_negation(val[1])
530
- result
531
- end
547
+ # reduce 54 omitted
532
548
 
533
549
  # reduce 55 omitted
534
550
 
@@ -556,6 +572,10 @@ end
556
572
 
557
573
  # reduce 67 omitted
558
574
 
575
+ # reduce 68 omitted
576
+
577
+ # reduce 69 omitted
578
+
559
579
  def _reduce_none(val, _values, result)
560
580
  val[0]
561
581
  end