rubyang 0.1.0 → 0.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.codeclimate.yml +3 -0
- data/.gitignore +1 -0
- data/README.md +106 -2
- data/lib/rubyang/cli.rb +112 -101
- data/lib/rubyang/cli/parser.rb +1 -1
- data/lib/rubyang/component/base.rb +35 -0
- data/lib/rubyang/component/example.rb +15 -0
- data/lib/rubyang/database/component_manager.rb +77 -0
- data/lib/rubyang/database/data_tree.rb +22 -2
- data/lib/rubyang/database/schema_tree.rb +34 -3
- data/lib/rubyang/model/parser/parser.tab.rb +248 -248
- data/lib/rubyang/model/parser/parser.y +1 -1
- data/lib/rubyang/restapi.rb +8 -1
- data/lib/rubyang/restapi/app.rb +72 -0
- data/lib/rubyang/server.rb +8 -0
- data/lib/rubyang/server/base.rb +30 -0
- data/lib/rubyang/server/example.rb +9 -0
- data/lib/rubyang/version.rb +1 -1
- data/lib/rubyang/webui/public/js/webui.js +95 -3
- data/lib/rubyang/yang/rubyang.yang +33 -0
- data/rubyang.gemspec +5 -5
- metadata +11 -4
- data/lib/rubyang/restapi/httpd.rb +0 -62
@@ -1,14 +1,18 @@
|
|
1
1
|
# coding: utf-8
|
2
2
|
|
3
|
+
require 'drb/drb'
|
3
4
|
require 'rexml/document'
|
4
5
|
require 'rexml/formatters/pretty'
|
5
6
|
require 'json'
|
6
7
|
|
7
8
|
require_relative 'helper'
|
9
|
+
require_relative 'component_manager'
|
8
10
|
|
9
11
|
module Rubyang
|
10
12
|
class Database
|
11
13
|
class DataTree
|
14
|
+
include DRb::DRbUndumped
|
15
|
+
|
12
16
|
class Node
|
13
17
|
attr_reader :parent, :schema_tree, :schema, :children
|
14
18
|
def initialize parent, schema_tree, schema
|
@@ -512,8 +516,22 @@ module Rubyang
|
|
512
516
|
|
513
517
|
class Root < InteriorNode
|
514
518
|
def commit
|
515
|
-
|
516
|
-
|
519
|
+
begin
|
520
|
+
components = self.edit( "rubyang" ).edit( "component" ).children.map{ |c|
|
521
|
+
component = c.key_values.first
|
522
|
+
hook = c.edit("hook").value
|
523
|
+
file_path = c.edit("file-path").value
|
524
|
+
[component, hook, file_path]
|
525
|
+
}
|
526
|
+
self.root.parent.component_manager.update components
|
527
|
+
self.root.parent.component_manager.run "commit"
|
528
|
+
rescue => e
|
529
|
+
puts 'rescue in commit'
|
530
|
+
puts e
|
531
|
+
ensure
|
532
|
+
backup = self.to_xml
|
533
|
+
@parent.history.push backup
|
534
|
+
end
|
517
535
|
end
|
518
536
|
def revert
|
519
537
|
backup = @parent.history.pop
|
@@ -709,9 +727,11 @@ module Rubyang
|
|
709
727
|
end
|
710
728
|
end
|
711
729
|
|
730
|
+
attr_accessor :component_manager
|
712
731
|
def initialize schema_tree
|
713
732
|
@root = Root.new( self, schema_tree, schema_tree.root )
|
714
733
|
@history = Array.new
|
734
|
+
@component_manager = Rubyang::Database::ComponentManager.new
|
715
735
|
end
|
716
736
|
def history
|
717
737
|
@history
|
@@ -128,6 +128,29 @@ module Rubyang
|
|
128
128
|
result
|
129
129
|
end
|
130
130
|
end
|
131
|
+
class EmptyType < Type
|
132
|
+
def initialize
|
133
|
+
@arg = 'empty'
|
134
|
+
end
|
135
|
+
def valid?
|
136
|
+
result = true
|
137
|
+
result
|
138
|
+
end
|
139
|
+
end
|
140
|
+
class UnionType < Type
|
141
|
+
def initialize
|
142
|
+
@arg = 'union'
|
143
|
+
@types = Array.new
|
144
|
+
end
|
145
|
+
def add_type type
|
146
|
+
@types.push type
|
147
|
+
end
|
148
|
+
def valid? value
|
149
|
+
result = false
|
150
|
+
result ||= @types.inject( false ){ |r, t| r || t.valid?( value ) }
|
151
|
+
result
|
152
|
+
end
|
153
|
+
end
|
131
154
|
|
132
155
|
class Path
|
133
156
|
attr_reader :path
|
@@ -153,7 +176,7 @@ module Rubyang
|
|
153
176
|
self.update arg
|
154
177
|
end
|
155
178
|
def valid? value
|
156
|
-
if @range.find{ |min2, max2| (min2..max2).include?( value
|
179
|
+
if @range.find{ |min2, max2| (min2..max2).include?( Integer(value) ) }
|
157
180
|
true
|
158
181
|
else
|
159
182
|
false
|
@@ -236,7 +259,7 @@ module Rubyang
|
|
236
259
|
end
|
237
260
|
class Pattern
|
238
261
|
def initialize
|
239
|
-
@pattern = Regexp.new( '
|
262
|
+
@pattern = Regexp.new( '^.*$' )
|
240
263
|
end
|
241
264
|
def valid? value
|
242
265
|
if @pattern =~ value
|
@@ -246,7 +269,8 @@ module Rubyang
|
|
246
269
|
end
|
247
270
|
end
|
248
271
|
def update arg
|
249
|
-
|
272
|
+
p arg
|
273
|
+
@pattern = Regexp.new( '^' + arg + '$' )
|
250
274
|
end
|
251
275
|
def to_s
|
252
276
|
@pattern.inspect
|
@@ -730,6 +754,13 @@ module Rubyang
|
|
730
754
|
}
|
731
755
|
when 'leafref'
|
732
756
|
type = LeafrefType.new self, type_stmt.substmt( 'path' )[0].arg
|
757
|
+
when 'empty'
|
758
|
+
type = EmptyType.new
|
759
|
+
when 'union'
|
760
|
+
type = UnionType.new
|
761
|
+
type_stmt.substmt( "type" ).each{ |s|
|
762
|
+
type.add_type( resolve_type s, yangs, current_module, typedef_list )
|
763
|
+
}
|
733
764
|
else
|
734
765
|
case type_stmt.arg
|
735
766
|
when /^[^:]+$/
|
@@ -11,197 +11,197 @@ module Rubyang
|
|
11
11
|
##### State transition tables begin ###
|
12
12
|
|
13
13
|
racc_action_table = [
|
14
|
-
63, 63, 63, 63,
|
15
|
-
|
16
|
-
|
17
|
-
|
14
|
+
63, 459, 63, 63, 63, 63, 62, 458, 62, 62,
|
15
|
+
62, 62, 63, 63, 617, 606, 63, 63, 62, 62,
|
16
|
+
616, 605, 62, 62, 457, 395, 520, 63, 75, 631,
|
17
|
+
456, 226, 160, 62, 645, 11, 57, 58, 402, 129,
|
18
18
|
57, 58, 57, 58, 523, 57, 58, 159, 103, 11,
|
19
|
-
155,
|
20
|
-
102, 11, 103,
|
21
|
-
15, 15, 15,
|
19
|
+
155, 232, 596, 25, 11, 100, 11, 27, 101, 32,
|
20
|
+
102, 11, 103, 11, 225, 159, 225, 15, 15, 15,
|
21
|
+
15, 15, 15, 11, 637, 551, 552, 81, 11, 15,
|
22
22
|
15, 15, 15, 15, 15, 104, 105, 106, 107, 108,
|
23
23
|
401, 15, 109, 100, 110, 111, 101, 112, 102, 113,
|
24
|
-
103, 232, 114, 115,
|
25
|
-
|
26
|
-
|
27
|
-
109, 374, 110, 111, 11, 112,
|
28
|
-
114, 115, 57, 58,
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
11, 11,
|
68
|
-
11, 11, 11,
|
69
|
-
11, 291, 292, 11,
|
70
|
-
|
71
|
-
15,
|
72
|
-
|
73
|
-
11,
|
24
|
+
103, 232, 114, 115, 625, 249, 490, 492, 11, 651,
|
25
|
+
11, 494, 497, 498, 502, 57, 58, 233, 11, 4,
|
26
|
+
57, 58, 5, 104, 105, 106, 107, 108, 57, 58,
|
27
|
+
109, 374, 110, 111, 11, 112, 585, 113, 63, 239,
|
28
|
+
114, 115, 57, 58, 62, 551, 552, 576, 11, 240,
|
29
|
+
551, 552, 225, 239, 103, 63, 638, 11, 57, 58,
|
30
|
+
249, 62, 11, 557, 63, 250, 225, 57, 58, 239,
|
31
|
+
62, 11, 259, 276, 57, 58, 261, 104, 77, 291,
|
32
|
+
292, 154, 225, 166, 76, 239, 11, 153, 325, 165,
|
33
|
+
644, 225, 384, 385, 105, 106, 107, 108, 225, 168,
|
34
|
+
109, 343, 110, 111, 11, 167, 275, 127, 11, 365,
|
35
|
+
105, 106, 107, 108, 354, 11, 109, 212, 110, 111,
|
36
|
+
57, 58, 275, 553, 170, 57, 58, 173, 57, 58,
|
37
|
+
169, 239, 175, 172, 57, 58, 239, 180, 174, 344,
|
38
|
+
182, 545, 184, 179, 225, 11, 181, 11, 183, 225,
|
39
|
+
57, 58, 57, 58, 187, 326, 105, 106, 107, 108,
|
40
|
+
186, 239, 109, 343, 110, 111, 57, 58, 275, 37,
|
41
|
+
38, 363, 364, 275, 225, 259, 276, 239, 11, 261,
|
42
|
+
189, 191, 551, 552, 250, 307, 188, 190, 241, 195,
|
43
|
+
225, 259, 276, 37, 38, 194, 57, 58, 275, 57,
|
44
|
+
58, 240, 105, 106, 107, 108, 11, 239, 103, 343,
|
45
|
+
110, 11, 249, 63, 275, 11, 446, 250, 440, 62,
|
46
|
+
225, 259, 445, 225, 290, 261, 528, 529, 291, 292,
|
47
|
+
441, 104, 105, 106, 107, 108, 324, 325, 109, 293,
|
48
|
+
110, 111, 218, 63, 275, 55, 56, 57, 58, 62,
|
49
|
+
57, 58, 240, 57, 58, 11, 63, 11, 452, 224,
|
50
|
+
63, 239, 62, 249, 451, 63, 62, 15, 15, 15,
|
51
|
+
63, 62, 15, 277, 225, 259, 62, 225, 290, 261,
|
52
|
+
448, 262, 291, 292, 57, 58, 240, 11, 63, 11,
|
53
|
+
63, 11, 57, 58, 62, 239, 62, 249, 275, 513,
|
54
|
+
63, 63, 250, 239, 103, 468, 62, 62, 225, 259,
|
55
|
+
276, 467, 470, 261, 475, 70, 225, 259, 469, 260,
|
56
|
+
474, 261, 103, 55, 56, 57, 58, 104, 105, 106,
|
57
|
+
107, 108, 275, 613, 109, 477, 110, 111, 603, 386,
|
58
|
+
275, 476, 15, 67, 602, 104, 105, 106, 107, 108,
|
59
|
+
57, 58, 109, 63, 110, 111, 251, 63, 610, 62,
|
60
|
+
615, 239, 103, 62, 609, 63, 614, 57, 58, 63,
|
61
|
+
508, 62, 25, 15, 225, 62, 26, 27, 15, 103,
|
62
|
+
15, 15, 15, 15, 15, 104, 105, 106, 107, 108,
|
63
|
+
18, 225, 109, 103, 110, 111, 15, 16, 15, 15,
|
64
|
+
11, 15, 104, 105, 106, 107, 108, 14, 13, 109,
|
65
|
+
565, 110, 111, 471, 11, 15, 104, 105, 106, 107,
|
66
|
+
108, 57, 58, 109, 11, 110, 111, 15, 11, 11,
|
67
|
+
524, 494, 502, 249, 11, 11, 11, 498, 497, 250,
|
68
|
+
11, 11, 11, 11, 11, 11, 259, 276, 260, 11,
|
69
|
+
261, 11, 11, 291, 292, 11, 11, 11, 11, 15,
|
70
|
+
11, 11, 11, 15, 11, 171, 11, 11, 176, 177,
|
71
|
+
178, 6, 15, 15, 185, 15, 15, 11, 11, 15,
|
72
|
+
15, 11, 11, 11, 11, 11, 11, 11, 11, 11,
|
73
|
+
130, 11, 27, 70 ]
|
74
74
|
|
75
75
|
racc_action_check = [
|
76
|
-
74, 73, 72, 71,
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
619, 619,
|
81
|
-
123,
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
211,
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
201,
|
120
|
-
|
121
|
-
210, 210,
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
506,
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
76
|
+
416, 418, 74, 73, 72, 71, 416, 418, 74, 73,
|
77
|
+
72, 71, 612, 611, 601, 537, 411, 413, 612, 611,
|
78
|
+
601, 537, 411, 413, 417, 211, 478, 535, 59, 619,
|
79
|
+
417, 197, 124, 535, 623, 217, 211, 211, 217, 79,
|
80
|
+
619, 619, 197, 197, 478, 623, 623, 124, 211, 519,
|
81
|
+
123, 197, 519, 19, 58, 79, 57, 123, 79, 19,
|
82
|
+
79, 56, 79, 224, 619, 123, 197, 416, 418, 74,
|
83
|
+
73, 72, 71, 225, 619, 623, 623, 68, 232, 612,
|
84
|
+
611, 601, 537, 411, 413, 79, 79, 79, 79, 79,
|
85
|
+
211, 417, 79, 68, 79, 79, 68, 79, 68, 79,
|
86
|
+
68, 452, 79, 79, 618, 452, 452, 452, 239, 624,
|
87
|
+
240, 452, 452, 452, 452, 618, 618, 198, 249, 0,
|
88
|
+
624, 624, 0, 68, 68, 68, 68, 68, 198, 198,
|
89
|
+
68, 209, 68, 68, 250, 68, 518, 68, 39, 198,
|
90
|
+
68, 68, 209, 209, 39, 618, 618, 507, 259, 518,
|
91
|
+
624, 624, 198, 209, 209, 41, 620, 260, 507, 507,
|
92
|
+
518, 41, 261, 505, 43, 518, 209, 620, 620, 507,
|
93
|
+
43, 275, 518, 518, 505, 505, 518, 209, 60, 518,
|
94
|
+
518, 116, 507, 131, 60, 505, 276, 116, 518, 131,
|
95
|
+
620, 620, 209, 209, 507, 507, 507, 507, 505, 132,
|
96
|
+
507, 507, 507, 507, 78, 132, 507, 78, 290, 208,
|
97
|
+
505, 505, 505, 505, 207, 291, 505, 192, 505, 505,
|
98
|
+
208, 208, 505, 504, 133, 207, 207, 135, 192, 192,
|
99
|
+
133, 208, 136, 135, 504, 504, 207, 140, 136, 206,
|
100
|
+
141, 503, 142, 140, 208, 292, 141, 324, 142, 207,
|
101
|
+
206, 206, 503, 503, 148, 205, 208, 208, 208, 208,
|
102
|
+
148, 206, 208, 208, 208, 208, 205, 205, 208, 20,
|
103
|
+
20, 207, 207, 207, 206, 206, 206, 205, 325, 206,
|
104
|
+
149, 150, 503, 503, 205, 204, 149, 150, 199, 163,
|
105
|
+
205, 205, 205, 28, 28, 163, 204, 204, 206, 199,
|
106
|
+
199, 199, 205, 205, 205, 205, 343, 204, 204, 205,
|
107
|
+
205, 363, 199, 193, 205, 364, 406, 199, 384, 193,
|
108
|
+
204, 204, 406, 199, 204, 204, 482, 482, 204, 204,
|
109
|
+
385, 204, 204, 204, 204, 204, 204, 204, 204, 203,
|
110
|
+
204, 204, 196, 407, 204, 33, 33, 33, 33, 407,
|
111
|
+
203, 203, 203, 196, 196, 401, 410, 403, 412, 196,
|
112
|
+
414, 203, 410, 203, 412, 419, 414, 405, 543, 660,
|
113
|
+
421, 419, 408, 202, 203, 203, 421, 196, 203, 203,
|
114
|
+
409, 201, 203, 203, 202, 202, 202, 551, 423, 55,
|
115
|
+
425, 552, 201, 201, 423, 202, 425, 202, 203, 473,
|
116
|
+
427, 429, 202, 201, 201, 433, 427, 429, 202, 202,
|
117
|
+
202, 433, 434, 202, 442, 49, 201, 201, 434, 201,
|
118
|
+
442, 201, 473, 47, 47, 47, 47, 201, 201, 201,
|
119
|
+
201, 201, 202, 597, 201, 444, 201, 201, 533, 210,
|
120
|
+
201, 444, 415, 48, 533, 473, 473, 473, 473, 473,
|
121
|
+
210, 210, 473, 540, 473, 473, 200, 542, 544, 540,
|
122
|
+
599, 210, 210, 542, 544, 657, 599, 200, 200, 659,
|
123
|
+
472, 657, 17, 42, 210, 659, 17, 17, 598, 200,
|
124
|
+
420, 658, 422, 600, 424, 210, 210, 210, 210, 210,
|
125
|
+
15, 200, 210, 472, 210, 210, 426, 12, 428, 10,
|
126
|
+
430, 432, 200, 200, 200, 200, 200, 7, 6, 200,
|
127
|
+
506, 200, 200, 437, 5, 443, 472, 472, 472, 472,
|
128
|
+
472, 506, 506, 472, 4, 472, 472, 40, 38, 37,
|
129
|
+
479, 483, 487, 488, 490, 492, 494, 495, 496, 506,
|
130
|
+
497, 498, 502, 32, 27, 26, 506, 506, 506, 110,
|
131
|
+
506, 111, 112, 506, 506, 113, 114, 115, 25, 118,
|
132
|
+
109, 108, 125, 126, 523, 134, 528, 529, 137, 138,
|
133
|
+
139, 1, 534, 143, 144, 147, 536, 637, 159, 541,
|
134
|
+
164, 107, 644, 105, 106, 104, 103, 102, 101, 100,
|
135
|
+
80, 70, 67, 66 ]
|
136
136
|
|
137
137
|
racc_action_pointer = [
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
nil, nil,
|
142
|
-
|
143
|
-
nil, nil, nil, nil, nil,
|
144
|
-
|
145
|
-
|
146
|
-
|
138
|
+
116, 571, nil, nil, 522, 512, 508, 503, nil, nil,
|
139
|
+
428, nil, 493, nil, nil, 488, nil, 465, nil, 46,
|
140
|
+
261, nil, nil, nil, nil, 556, 543, 542, 285, nil,
|
141
|
+
nil, nil, 541, 331, nil, nil, nil, 527, 526, 134,
|
142
|
+
456, 151, 402, 160, nil, nil, nil, 409, 439, 396,
|
143
|
+
nil, nil, nil, nil, nil, 387, 59, 54, 52, 24,
|
144
|
+
174, nil, nil, nil, nil, nil, 574, 580, 72, nil,
|
145
|
+
589, 1, 0, -1, -2, nil, nil, nil, 202, 34,
|
146
|
+
585, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
147
147
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
148
|
-
|
149
|
-
|
150
|
-
nil, nil, nil, 45, 27,
|
151
|
-
nil,
|
152
|
-
|
153
|
-
|
154
|
-
nil, nil, nil,
|
148
|
+
587, 586, 585, 584, 583, 581, 582, 579, 559, 558,
|
149
|
+
547, 549, 550, 553, 554, 555, 177, nil, 488, nil,
|
150
|
+
nil, nil, nil, 45, 27, 560, 492, nil, nil, nil,
|
151
|
+
nil, 179, 195, 220, 561, 223, 228, 564, 565, 566,
|
152
|
+
233, 236, 238, 502, 570, nil, nil, 504, 250, 276,
|
153
|
+
277, nil, nil, nil, nil, nil, nil, nil, nil, 576,
|
154
|
+
nil, nil, nil, 285, 509, nil, nil, nil, nil, nil,
|
155
155
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
156
156
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
157
|
-
nil, nil,
|
158
|
-
|
159
|
-
|
160
|
-
nil, nil, nil, nil,
|
161
|
-
nil, nil,
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
nil, nil, nil, nil, nil,
|
157
|
+
nil, nil, 212, 309, nil, nil, 337, 26, 112, 283,
|
158
|
+
451, 376, 368, 334, 280, 250, 234, 209, 204, 126,
|
159
|
+
434, 20, nil, nil, nil, nil, nil, 33, nil, nil,
|
160
|
+
nil, nil, nil, nil, 61, 71, nil, nil, nil, nil,
|
161
|
+
nil, nil, 76, nil, nil, nil, nil, nil, nil, 106,
|
162
|
+
108, nil, nil, nil, nil, nil, nil, nil, nil, 116,
|
163
|
+
132, nil, nil, nil, nil, nil, nil, nil, nil, 146,
|
164
|
+
155, 160, nil, nil, nil, nil, nil, nil, nil, nil,
|
165
|
+
nil, nil, nil, nil, nil, 169, 184, nil, nil, nil,
|
166
166
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
167
|
-
|
167
|
+
206, 213, 243, nil, nil, nil, nil, nil, nil, nil,
|
168
168
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
169
169
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
170
|
-
nil, nil, nil, nil,
|
170
|
+
nil, nil, nil, nil, 245, 276, nil, nil, nil, nil,
|
171
171
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
172
|
-
nil, nil, nil,
|
172
|
+
nil, nil, nil, 304, nil, nil, nil, nil, nil, nil,
|
173
173
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
174
|
-
nil, nil, nil,
|
174
|
+
nil, nil, nil, 309, 313, nil, nil, nil, nil, nil,
|
175
175
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
176
|
-
nil, nil, nil, nil,
|
176
|
+
nil, nil, nil, nil, 314, 326, nil, nil, nil, nil,
|
177
177
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
178
|
-
nil,
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
nil, nil,
|
178
|
+
nil, 353, nil, 355, nil, 296, 312, 339, 301, 370,
|
179
|
+
352, 12, 354, 13, 356, 371, -4, 20, -3, 361,
|
180
|
+
409, 366, 411, 384, 413, 386, 425, 396, 427, 397,
|
181
|
+
498, nil, 430, 401, 408, nil, nil, 509, nil, nil,
|
182
|
+
nil, nil, 410, 444, 431, nil, nil, nil, nil, nil,
|
183
183
|
nil, nil, 76, nil, nil, nil, nil, nil, nil, nil,
|
184
184
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
185
|
-
nil, nil,
|
186
|
-
nil, nil,
|
187
|
-
|
188
|
-
nil, nil,
|
189
|
-
nil, nil, nil, nil, nil, nil, nil, nil,
|
190
|
-
nil, nil, nil,
|
191
|
-
nil, nil, nil,
|
192
|
-
|
193
|
-
nil,
|
185
|
+
nil, nil, 465, 394, nil, nil, nil, nil, 21, 525,
|
186
|
+
nil, nil, 294, 496, nil, nil, nil, 494, 504, nil,
|
187
|
+
532, nil, 533, nil, 534, 500, 502, 538, 539, nil,
|
188
|
+
nil, nil, 540, 236, 218, 158, 505, 142, nil, nil,
|
189
|
+
nil, nil, nil, nil, nil, nil, nil, nil, 131, 47,
|
190
|
+
nil, nil, nil, 562, nil, nil, nil, nil, 564, 565,
|
191
|
+
nil, nil, nil, 434, 501, 23, 505, 11, nil, nil,
|
192
|
+
449, 508, 453, 297, 454, nil, nil, nil, nil, nil,
|
193
|
+
nil, 385, 389, nil, nil, nil, nil, nil, nil, nil,
|
194
194
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
195
195
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
196
196
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
197
|
-
nil, nil, nil, nil, nil, nil, nil,
|
198
|
-
|
199
|
-
nil,
|
200
|
-
|
201
|
-
nil, nil, nil, nil, nil, nil, nil,
|
202
|
-
nil, nil, nil, nil,
|
203
|
-
nil, nil, nil, nil, nil, nil, nil,
|
204
|
-
|
197
|
+
nil, nil, nil, nil, nil, nil, nil, 423, 407, 456,
|
198
|
+
412, 10, nil, nil, nil, nil, nil, nil, nil, nil,
|
199
|
+
nil, 9, 8, nil, nil, nil, nil, nil, 99, 24,
|
200
|
+
151, nil, nil, 29, 104, nil, nil, nil, nil, nil,
|
201
|
+
nil, nil, nil, nil, nil, nil, nil, 575, nil, nil,
|
202
|
+
nil, nil, nil, nil, 580, nil, nil, nil, nil, nil,
|
203
|
+
nil, nil, nil, nil, nil, nil, nil, 461, 410, 465,
|
204
|
+
298, nil, nil ]
|
205
205
|
|
206
206
|
racc_action_default = [
|
207
207
|
-480, -480, -1, -2, -480, -480, -480, -480, -469, -470,
|
@@ -273,47 +273,47 @@ racc_action_default = [
|
|
273
273
|
-191, -215, -190 ]
|
274
274
|
|
275
275
|
racc_goto_table = [
|
276
|
-
61, 313, 64,
|
276
|
+
61, 313, 64, 243, 65, 244, 281, 297, 282, 298,
|
277
277
|
245, 40, 42, 284, 267, 217, 330, 163, 7, 12,
|
278
278
|
266, 283, 299, 311, 228, 348, 268, 285, 300, 314,
|
279
279
|
331, 349, 119, 120, 121, 122, 286, 116, 495, 332,
|
280
|
-
350, 71, 72, 73, 74, 68, 48, 49,
|
281
|
-
146, 59, 60, 152, 337, 493, 118, 373,
|
282
|
-
142, 66, 79,
|
280
|
+
350, 71, 72, 73, 74, 68, 48, 49, 301, 315,
|
281
|
+
146, 59, 60, 152, 337, 493, 118, 373, 302, 316,
|
282
|
+
142, 66, 79, 486, 126, 501, 487, 221, 229, 236,
|
283
283
|
246, 253, 269, 287, 304, 318, 333, 351, 358, 369,
|
284
|
-
377, 389, 539,
|
284
|
+
377, 389, 539, 488, 235, 547, 530, 265, 280, 296,
|
285
285
|
310, 329, 347, 357, 368, 376, 388, 143, 147, 548,
|
286
286
|
531, 147, 264, 279, 295, 309, 328, 346, 356, 367,
|
287
287
|
431, 164, 158, 162, 131, 132, 133, 134, 135, 136,
|
288
288
|
137, 138, 139, 140, 141, 214, 193, 148, 149, 222,
|
289
289
|
230, 237, 247, 254, 270, 288, 305, 319, 334, 352,
|
290
290
|
359, 370, 378, 390, 397, 118, 496, 24, 436, 439,
|
291
|
-
20, 215, 28,
|
291
|
+
20, 215, 28, 489, 216, 223, 231, 238, 248, 255,
|
292
292
|
271, 289, 306, 320, 335, 353, 360, 371, 379, 391,
|
293
|
-
398, 33, 258, 274, 256, 272, 323,
|
293
|
+
398, 33, 258, 274, 256, 272, 323, 533, 321, 47,
|
294
294
|
372, 409, 394, 380, 392, 399, 257, 273, 410, 538,
|
295
|
-
322, 22,
|
296
|
-
627, 303, 317, 405,
|
297
|
-
|
298
|
-
654,
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
428, 432,
|
308
|
-
|
309
|
-
|
310
|
-
573,
|
311
|
-
432,
|
312
|
-
|
313
|
-
|
314
|
-
460,
|
315
|
-
465, 560,
|
316
|
-
|
295
|
+
322, 22, 618, 30, 626, 381, 393, 80, 412, 491,
|
296
|
+
627, 303, 317, 405, 535, 647, 653, 525, 526, 527,
|
297
|
+
599, 408, 623, 646, 628, 466, 624, 652, 143, 648,
|
298
|
+
654, 619, 632, 633, 540, 143, 411, 542, 620, 639,
|
299
|
+
640, 659, 407, 414, 419, 143, 413, 421, 406, 503,
|
300
|
+
546, 423, 425, 657, 200, 415, 416, 417, 252, 201,
|
301
|
+
263, 202, 278, 157, 203, 294, 500, 204, 308, 312,
|
302
|
+
427, 418, 420, 429, 430, 205, 327, 336, 505, 558,
|
303
|
+
206, 345, 207, 355, 361, 362, 422, 424, 426, 499,
|
304
|
+
434, 506, 566, 435, 437, 507, 577, 438, 144, 208,
|
305
|
+
366, 145, 532, 128, 125, 444, 504, 519, 554, 209,
|
306
|
+
375, 382, 383, 472, 509, 473, 514, 210, 387, 150,
|
307
|
+
428, 432, 211, 396, 400, 589, 151, 572, 442, 568,
|
308
|
+
518, 586, 595, 44, 587, 567, 45, 46, 1, 590,
|
309
|
+
78, 569, 2, 3, 17, 19, 21, 588, 23, 29,
|
310
|
+
573, 31, 338, 591, 339, 340, 341, 342, 39, 432,
|
311
|
+
432, 574, 592, 123, 156, 124, 584, 433, 161, 41,
|
312
|
+
43, 575, 192, 593, 213, 196, 219, 220, 447, 478,
|
313
|
+
521, 449, 450, 594, 453, 454, 561, 455, 580, 522,
|
314
|
+
460, 597, 461, 197, 462, 227, 463, 443, 464, 164,
|
315
|
+
465, 560, 198, 579, 234, 199, 242, 479, 480, 481,
|
316
|
+
482, 483, 484, 485, nil, nil, 559, nil, 578, nil,
|
317
317
|
nil, nil, nil, nil, nil, nil, 432, nil, nil, nil,
|
318
318
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
319
319
|
nil, nil, nil, nil, nil, nil, 549, 555, 562, 570,
|
@@ -339,47 +339,47 @@ racc_goto_table = [
|
|
339
339
|
660 ]
|
340
340
|
|
341
341
|
racc_goto_check = [
|
342
|
-
45, 145, 45,
|
342
|
+
45, 145, 45, 76, 45, 54, 76, 76, 54, 54,
|
343
343
|
77, 46, 46, 77, 122, 178, 77, 177, 4, 4,
|
344
344
|
125, 125, 125, 125, 69, 125, 118, 118, 118, 118,
|
345
345
|
118, 118, 45, 45, 45, 45, 120, 55, 108, 120,
|
346
|
-
120, 46, 46, 46, 46, 9, 4, 8,
|
347
|
-
174, 4, 4, 174, 153, 104, 46, 153,
|
348
|
-
70, 8, 9,
|
346
|
+
120, 46, 46, 46, 46, 9, 4, 8, 128, 128,
|
347
|
+
174, 4, 4, 174, 153, 104, 46, 153, 130, 130,
|
348
|
+
70, 8, 9, 85, 46, 112, 86, 62, 62, 62,
|
349
349
|
62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
|
350
|
-
62, 62, 108,
|
350
|
+
62, 62, 108, 87, 73, 92, 104, 73, 73, 73,
|
351
351
|
73, 73, 73, 73, 73, 73, 73, 46, 46, 93,
|
352
352
|
112, 46, 137, 137, 137, 137, 137, 137, 137, 137,
|
353
353
|
149, 46, 49, 49, 4, 4, 4, 4, 4, 4,
|
354
354
|
4, 4, 4, 4, 4, 20, 55, 4, 4, 20,
|
355
355
|
20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
|
356
356
|
20, 20, 20, 20, 20, 46, 109, 14, 149, 149,
|
357
|
-
6, 21, 6,
|
357
|
+
6, 21, 6, 88, 45, 21, 21, 21, 21, 21,
|
358
358
|
21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
|
359
|
-
21, 7, 32, 32, 30, 30, 32,
|
359
|
+
21, 7, 32, 32, 30, 30, 32, 89, 30, 7,
|
360
360
|
32, 70, 32, 30, 30, 30, 31, 31, 70, 109,
|
361
|
-
31, 12,
|
362
|
-
92, 123, 123, 46,
|
363
|
-
|
364
|
-
93,
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
373
|
-
46, 46,
|
374
|
-
|
375
|
-
|
376
|
-
120,
|
377
|
-
46,
|
378
|
-
|
379
|
-
|
380
|
-
45,
|
381
|
-
45, 73,
|
382
|
-
|
361
|
+
31, 12, 90, 12, 91, 31, 31, 14, 70, 94,
|
362
|
+
92, 123, 123, 46, 95, 92, 92, 96, 97, 98,
|
363
|
+
99, 46, 100, 101, 93, 149, 102, 103, 46, 93,
|
364
|
+
93, 105, 106, 107, 110, 46, 46, 111, 113, 114,
|
365
|
+
115, 116, 117, 119, 121, 46, 46, 124, 4, 126,
|
366
|
+
127, 129, 131, 132, 133, 46, 46, 46, 134, 135,
|
367
|
+
136, 138, 139, 14, 140, 141, 76, 142, 143, 144,
|
368
|
+
146, 46, 46, 147, 148, 150, 151, 152, 154, 155,
|
369
|
+
156, 157, 158, 159, 160, 161, 46, 46, 46, 69,
|
370
|
+
162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
|
371
|
+
172, 173, 76, 175, 176, 177, 181, 178, 182, 183,
|
372
|
+
184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
|
373
|
+
46, 46, 194, 195, 196, 145, 197, 77, 198, 122,
|
374
|
+
199, 200, 76, 201, 54, 125, 202, 203, 1, 77,
|
375
|
+
205, 118, 2, 3, 5, 10, 11, 125, 13, 15,
|
376
|
+
120, 16, 37, 118, 38, 39, 40, 42, 44, 46,
|
377
|
+
46, 128, 120, 47, 48, 50, 153, 4, 51, 52,
|
378
|
+
53, 130, 56, 128, 57, 59, 60, 61, 45, 63,
|
379
|
+
64, 45, 45, 130, 45, 45, 62, 45, 62, 65,
|
380
|
+
45, 66, 45, 67, 45, 68, 45, 46, 45, 46,
|
381
|
+
45, 73, 71, 73, 72, 74, 75, 78, 79, 80,
|
382
|
+
81, 82, 83, 84, nil, nil, 137, nil, 137, nil,
|
383
383
|
nil, nil, nil, nil, nil, nil, 46, nil, nil, nil,
|
384
384
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
385
385
|
nil, nil, nil, nil, nil, nil, 20, 20, 20, 20,
|
@@ -405,27 +405,27 @@ racc_goto_check = [
|
|
405
405
|
46 ]
|
406
406
|
|
407
407
|
racc_goto_pointer = [
|
408
|
-
nil,
|
409
|
-
|
408
|
+
nil, 328, 332, 333, 14, 320, 133, 151, 14, -4,
|
409
|
+
319, 319, 174, 321, 130, 320, 322, nil, nil, nil,
|
410
410
|
-67, -41, nil, nil, nil, nil, nil, nil, nil, nil,
|
411
|
-
-26, -14, -28, nil, nil, nil, nil,
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
-51,
|
416
|
-
|
417
|
-
-
|
418
|
-
-
|
419
|
-
-
|
420
|
-
-166,
|
421
|
-
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
nil, -
|
427
|
-
|
428
|
-
-
|
411
|
+
-26, -14, -28, nil, nil, nil, nil, 137, 139, 140,
|
412
|
+
141, nil, 142, nil, 323, -39, -14, 278, 231, -11,
|
413
|
+
278, 234, 333, 333, -194, -33, 208, 172, nil, 199,
|
414
|
+
170, 171, -129, -77, -108, -99, -142, 215, 188, -173,
|
415
|
+
-51, 222, 196, -114, 224, 197, -196, -189, -55, -54,
|
416
|
+
-53, -52, -51, -50, -49, -389, -386, -369, -299, -313,
|
417
|
+
-411, -424, -418, -404, -253, -288, -275, -274, -273, -318,
|
418
|
+
-403, -410, -401, -407, -397, -385, -397, -396, -414, -306,
|
419
|
+
-273, -271, -387, -382, -391, -390, -413, 7, -175, -26,
|
420
|
+
-166, -42, -187, -2, -53, -181, -218, -263, -155, -50,
|
421
|
+
-145, -50, -394, 71, 48, 74, 49, -99, 75, 50,
|
422
|
+
77, 52, 79, 54, 55, -203, -64, -62, -61, -215,
|
423
|
+
85, 61, 62, -151, -200, -236, 88, 65, 88, 66,
|
424
|
+
67, 68, -83, -189, -224, -80, -80, -186, -221, -77,
|
425
|
+
176, 104, 82, 179, -62, 215, 216, -108, -180, nil,
|
426
|
+
nil, -163, -206, 112, 91, 92, 93, -137, -168, -136,
|
427
|
+
-167, 118, 98, 194, 121, 102, 103, 201, -83, -155,
|
428
|
+
-197, 296, 299, 300, nil, 267 ]
|
429
429
|
|
430
430
|
racc_goto_default = [
|
431
431
|
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
|
@@ -3638,7 +3638,7 @@ module_eval(<<'.,.,', 'parser.y', 1435)
|
|
3638
3638
|
|
3639
3639
|
module_eval(<<'.,.,', 'parser.y', 1444)
|
3640
3640
|
def _reduce_475(val, _values, result)
|
3641
|
-
result = val[0] + val[
|
3641
|
+
result = val[0] + val[2]
|
3642
3642
|
|
3643
3643
|
result
|
3644
3644
|
end
|