occi 3.0.0.beta.0 → 3.0.0.beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. data/bin/occi +3 -3
  2. data/examples/dsl_example.rb +2 -2
  3. data/examples/x509auth_example.rb +2 -2
  4. data/features/occi/core/create/create.feature +1 -1
  5. data/features/occi/core/delete/delete.feature +2 -2
  6. data/features/occi/core/miscellaneous/miscellaneous.feature +2 -2
  7. data/features/occi/core/read/read.feature +2 -2
  8. data/features/occi/core/update/update.feature +2 -2
  9. data/features/occi/infrastructure/create/create.feature +2 -2
  10. data/lib/occi/api/client/http/net_http_fix.rb +4 -0
  11. data/lib/occi/bin/occi_opts.rb +2 -1
  12. data/lib/occi/bin/templates/compute.erb +12 -5
  13. data/lib/occi/collection.rb +5 -1
  14. data/lib/occi/parser.rb +4 -6
  15. data/lib/occi/version.rb +1 -1
  16. data/lib/occiantlr/OCCIANTLR.g +1 -1
  17. data/lib/occiantlr/OCCIANTLRLexer.rb +1 -1
  18. data/lib/occiantlr/OCCIANTLRParser.rb +224 -225
  19. data/spec/occiantlr/parser_spec.rb +1 -1
  20. metadata +2 -3
  21. data/Test Results - discovery_interface.html +0 -862
data/bin/occi CHANGED
@@ -65,15 +65,15 @@ end
65
65
  # running with an empty password, we should ask the user for one
66
66
  # if auth method is not "none"
67
67
  if options.auth[:password].nil? or options.auth[:user_cert_password].nil? or options.auth[:token].nil?
68
- Occi::Log.debug "Password is not set, asking for it now ..."
68
+ Occi::Log.debug "Password or token is not set, asking for it now ..."
69
69
 
70
70
  say("\n")
71
71
 
72
- options.auth[:user_cert_password] = ask("Enter password: ") {
72
+ options.auth[:user_cert_password] = ask("Enter a password or an auth. token: ") {
73
73
  |q| q.echo = false
74
74
  } unless options.auth[:type] == "none"
75
75
 
76
- options.auth[:password] = options.auth[:user_cert_password]
76
+ options.auth[:token] = options.auth[:password] = options.auth[:user_cert_password]
77
77
  end
78
78
 
79
79
  # establish a connection before entering the loop
data/examples/dsl_example.rb CHANGED
@@ -143,13 +143,13 @@ cmpt_data = describe cmpt_loc
143
143
  pp cmpt_data
144
144
 
145
145
  ## wait until the resource is "active"
146
- while cmpt_data.resources.first.attributes.occi.compute.state == "inactive"
146
+ while cmpt_data[0].resources.first.attributes.occi.compute.state == "inactive"
147
147
  puts "\nCompute resource #{cmpt_loc} is inactive, waiting ..."
148
148
  sleep 1
149
149
  cmpt_data = describe cmpt_loc
150
150
  end
151
151
 
152
- puts "\nCompute resource #{cmpt_loc} is #{cmpt_data.resources.first.attributes.occi.compute.state}"
152
+ puts "\nCompute resource #{cmpt_loc} is #{cmpt_data[0].resources.first.attributes.occi.compute.state}"
153
153
 
154
154
  ## delete the resource and exit
155
155
  if clean_up_compute
data/examples/x509auth_example.rb CHANGED
@@ -140,13 +140,13 @@ cmpt_data = client.describe cmpt_loc
140
140
  pp cmpt_data
141
141
 
142
142
  ## wait until the resource is "active"
143
- while cmpt_data.resources.first.attributes.occi.compute.state == "inactive"
143
+ while cmpt_data[0].resources.first.attributes.occi.compute.state == "inactive"
144
144
  puts "\nCompute resource #{cmpt_loc} is inactive, waiting ..."
145
145
  sleep 1
146
146
  cmpt_data = client.describe cmpt_loc
147
147
  end
148
148
 
149
- puts "\nCompute resource #{cmpt_loc} is #{cmpt_data.resources.first.attributes.occi.compute.state}"
149
+ puts "\nCompute resource #{cmpt_loc} is #{cmpt_data[0].resources.first.attributes.occi.compute.state}"
150
150
 
151
151
  ## delete the resource and exit
152
152
  if clean_up_compute
data/features/occi/core/create/create.feature CHANGED
@@ -9,7 +9,7 @@ Feature:
9
9
  And transfer_protocol : <protocol>
10
10
  And accept type : <accept_type>
11
11
  And have an initialize Client
12
- When
12
+ When the Client makes a create request
13
13
  Then the Client should have the response code <response_code>
14
14
 
15
15
  Scenarios:
data/features/occi/core/delete/delete.feature CHANGED
@@ -6,9 +6,9 @@ Feature:
6
6
  And transfer_protocol : <protocol>
7
7
  And accept type : <accept_type>
8
8
  And have an initialize Client
9
- When
9
+ When the Client makes a delete request
10
10
  Then the Client should have the response code <response_code>
11
11
 
12
12
  Scenarios:
13
13
  | protocol | endpoint | accept_type | response_code |
14
- | http | http://141.5.99.69/ | text/plain | 201 |
14
+ | http | http://141.5.99.69/ | text/plain | 201 |
data/features/occi/core/miscellaneous/miscellaneous.feature CHANGED
@@ -6,9 +6,9 @@ Feature:
6
6
  And transfer_protocol : <protocol>
7
7
  And accept type : <accept_type>
8
8
  And have an initialize Client
9
- When
9
+ When the Client makes a miscellaneous request
10
10
  Then the Client should have the response code <response_code>
11
11
 
12
12
  Scenarios:
13
13
  | protocol | endpoint | accept_type | response_code |
14
- | http | http://141.5.99.69/ | text/plain | 201 |
14
+ | http | http://141.5.99.69/ | text/plain | 201 |
data/features/occi/core/read/read.feature CHANGED
@@ -6,9 +6,9 @@ Feature:
6
6
  And transfer_protocol : <protocol>
7
7
  And accept type : <accept_type>
8
8
  And have an initialize Client
9
- When
9
+ When the Client makes a read request
10
10
  Then the Client should have the response code <response_code>
11
11
 
12
12
  Scenarios:
13
13
  | protocol | endpoint | accept_type | response_code |
14
- | http | http://141.5.99.69/ | text/plain | 201 |
14
+ | http | http://141.5.99.69/ | text/plain | 201 |
data/features/occi/core/update/update.feature CHANGED
@@ -6,9 +6,9 @@ Feature:
6
6
  And transfer_protocol : <protocol>
7
7
  And accept type : <accept_type>
8
8
  And have an initialize Client
9
- When
9
+ When the Client makes an update request
10
10
  Then the Client should have the response code <response_code>
11
11
 
12
12
  Scenarios:
13
13
  | protocol | endpoint | accept_type | response_code |
14
- | http | http://141.5.99.69/ | text/plain | 201 |
14
+ | http | http://141.5.99.69/ | text/plain | 201 |
data/features/occi/infrastructure/create/create.feature CHANGED
@@ -6,9 +6,9 @@ Feature:
6
6
  And transfer_protocol : <protocol>
7
7
  And accept type : <accept_type>
8
8
  And have an initialize Client
9
- When
9
+ When the Client makes a create request
10
10
  Then the Client should have the response code <response_code>
11
11
 
12
12
  Scenarios:
13
13
  | protocol | endpoint | accept_type | response_code |
14
- | http | http://141.5.99.69/ | text/plain | 201 |
14
+ | http | http://141.5.99.69/ | text/plain | 201 |
data/lib/occi/api/client/http/net_http_fix.rb CHANGED
@@ -11,7 +11,9 @@ if RUBY_ENGINE == 'jruby'
11
11
  module Net
12
12
  class HTTP
13
13
 
14
+ old_verbose, $VERBOSE = $VERBOSE, nil
14
15
  SSL_ATTRIBUTES = SSL_ATTRIBUTES.concat %w(extra_chain_cert)
16
+ $VERBOSE = old_verbose
15
17
 
16
18
  # An Array of certificates that will be sent to the client.
17
19
  attr_accessor :extra_chain_cert
@@ -35,7 +37,9 @@ else
35
37
  module Net
36
38
  class HTTP
37
39
 
40
+ old_verbose, $VERBOSE = $VERBOSE, nil
38
41
  SSL_ATTRIBUTES = SSL_ATTRIBUTES.concat %w(extra_chain_cert)
42
+ $VERBOSE = old_verbose
39
43
 
40
44
  # An Array of certificates that will be sent to the client.
41
45
  attr_accessor :extra_chain_cert
data/lib/occi/bin/occi_opts.rb CHANGED
@@ -78,9 +78,10 @@ module Occi
78
78
  opts.on("-p",
79
79
  "--password PASSWORD",
80
80
  String,
81
- "Password for basic, digest or x509 authentication") do |password|
81
+ "Password for basic, digest and x509 authentication or an auth. token for KeyStone") do |password|
82
82
  options.auth[:password] = password
83
83
  options.auth[:user_cert_password] = password
84
+ options.auth[:token] = password
84
85
  end
85
86
 
86
87
  opts.on("-c",
data/lib/occi/bin/templates/compute.erb CHANGED
@@ -3,13 +3,20 @@ Available COMPUTE resources:
3
3
  <% occi_resources.each do |occi_compute| %>
4
4
  <% compute = occi_compute.as_json %>
5
5
  COMPUTE resource "<%= compute.resources.first.attributes.occi.core.title %>":
6
- ID: <%= compute.resources.first.attributes.occi.core.id %>
7
- TITLE: <%= compute.resources.first.attributes.occi.core.title %>
8
- STATE: <%= compute.resources.first.attributes.occi.compute.state %>
6
+ ID: <%= compute.resources.first.attributes.occi.core.id %>
7
+ TITLE: <%= compute.resources.first.attributes.occi.core.title %>
8
+ STATE: <%= compute.resources.first.attributes.occi.compute.state %>
9
9
  LINKS:
10
10
  <% if compute.links %><% compute.links.each do |link| %>
11
11
  LINK "<%= link.attributes.occi.core.target.split("/")[1] %>":
12
- ID: <%= link.attributes.occi.core.id %>
13
- TARGET: <%= link.attributes.occi.core.target %>
12
+ ID: <%= link.attributes.occi.core.id %>
13
+ TITLE: <%= link.attributes.occi.core.title %>
14
+ TARGET: <%= link.attributes.occi.core.target %>
15
+ <% if link.attributes.occi.networkinterface %>
16
+ IP ADDRESS: <%= link.attributes.occi.networkinterface.address %>
17
+ MAC ADDRESS: <%= link.attributes.occi.networkinterface.mac %>
18
+ <% elsif link.attributes.occi.storagelink %>
19
+ MOUNT POINT: <%= link.attributes.occi.storagelink.deviceid %>
20
+ <% end %>
14
21
  <% end %><% end %>
15
22
  <% end %>
data/lib/occi/collection.rb CHANGED
@@ -132,7 +132,11 @@ module Occi
132
132
  # if there is only one resource and the links inside the resource have no location,
133
133
  # then these links must be rendered as separate links inside the collection
134
134
  if !collection.resources.nil? && collection.resources.size == 1
135
- lnks = @resources.first.links if collection.resources.first.links.blank? && @links.empty?
135
+ if collection.resources.first.links.blank? && @links.empty?
136
+ lnks = @resources.first.links
137
+ else
138
+ lnks = @links
139
+ end
136
140
  else
137
141
  lnks = @links
138
142
  end
data/lib/occi/parser.rb CHANGED
@@ -110,7 +110,6 @@ module Occi
110
110
  mixins = cats.categories
111
111
  collection.links << Occi::Core::Link.new(kind, mixins, entity.attributes)
112
112
  elsif entity_type == Occi::Core::Resource
113
- entity.links = []
114
113
  link_strings = header['LINK'].to_s.split(',')
115
114
  link_strings.each do |link_string|
116
115
  link = OCCIANTLR::Parser.new('Link: ' + link_string).link
@@ -123,10 +122,10 @@ module Occi
123
122
  kind = link.categories.reverse!.pop
124
123
  mixins = link.categories
125
124
 
126
- entity.links << Occi::Core::Link.new(kind, mixins, link.attributes, link.actions, link.rel, link.target, link.source)
125
+ collection.links << Occi::Core::Link.new(kind, mixins, link.attributes, link.actions, link.rel, link.target, link.source)
127
126
  end
128
127
  end
129
- collection.resources << Occi::Core::Resource.new(entity.kind, entity.mixins, entity.attributes, entity.actions, entity.links)
128
+ collection.resources << Occi::Core::Resource.new(entity.kind, entity.mixins, entity.attributes, entity.actions, collection.links)
130
129
  end
131
130
  collection
132
131
  end
@@ -179,7 +178,6 @@ module Occi
179
178
  mixins = cats
180
179
  collection.links << Occi::Core::Link.new(kind, mixins, entity.attributes)
181
180
  elsif entity_type == Occi::Core::Resource
182
- entity.links = []
183
181
  links.each do |link|
184
182
  if link.rel.include? 'action#'
185
183
  entity.actions = [link.rel] + entity.actions.to_a
@@ -192,10 +190,10 @@ module Occi
192
190
  mixins = link.categories
193
191
 
194
192
  link = Occi::Core::Link.new(kind, mixins, link.attributes, link.actions, link.rel, link.target, link.source)
195
- entity.links << link
193
+ collection.links << link
196
194
  end
197
195
  end
198
- collection.resources << Occi::Core::Resource.new(entity.kind, entity.mixins, entity.attributes, entity.actions, entity.links)
196
+ collection.resources << Occi::Core::Resource.new(entity.kind, entity.mixins, entity.attributes, entity.actions, collection.links)
199
197
  end unless entity.kind.nil?
200
198
  collection
201
199
  end
data/lib/occi/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Occi
2
- VERSION = "3.0.0.beta.0" unless defined?(::Occi::VERSION)
2
+ VERSION = "3.0.0.beta.1" unless defined?(::Occi::VERSION)
3
3
  end
data/lib/occiantlr/OCCIANTLR.g CHANGED
@@ -83,7 +83,7 @@ link returns [hash]
83
83
  link_category returns [array] @init {array = Array.new}
84
84
  : SEMICOLON WS? CATEGORY EQUALS QUOTE kind=uri { array << $kind.text } (WS mixin=uri { array << $mixin.text })* QUOTE;
85
85
  link_attributes returns [hash] @init {hash = Hashie::Mash.new}
86
- : (SEMICOLON WS? attribute { hash.merge!($attribute.hash) } )*;
86
+ : SEMICOLON (WS? attribute { hash.merge!($attribute.hash) } )*;
87
87
 
88
88
  /*
89
89
  e.g.
data/lib/occiantlr/OCCIANTLRLexer.rb CHANGED
@@ -5,7 +5,7 @@
5
5
  # Generated using ANTLR version: 3.2.1-SNAPSHOT Jul 31, 2010 19:34:52
6
6
  # Ruby runtime library version: 1.8.11
7
7
  # Input grammar file: OCCIANTLR.g
8
- # Generated at: 2012-10-05 18:10:39
8
+ # Generated at: 2012-12-17 19:22:54
9
9
  #
10
10
 
11
11
  # ~~~> start load path setup
data/lib/occiantlr/OCCIANTLRParser.rb CHANGED
@@ -5,7 +5,7 @@
5
5
  # Generated using ANTLR version: 3.2.1-SNAPSHOT Jul 31, 2010 19:34:52
6
6
  # Ruby runtime library version: 1.8.11
7
7
  # Input grammar file: OCCIANTLR.g
8
- # Generated at: 2012-10-05 18:10:39
8
+ # Generated at: 2012-12-17 19:22:54
9
9
  #
10
10
 
11
11
  # ~~~> start load path setup
@@ -1211,7 +1211,7 @@ module OCCIANTLR
1211
1211
  # parser rule link_attributes
1212
1212
  #
1213
1213
  # (in OCCIANTLR.g)
1214
- # 85:2: link_attributes returns [hash] : ( SEMICOLON ( WS )? attribute )* ;
1214
+ # 85:2: link_attributes returns [hash] : SEMICOLON ( ( WS )? attribute )* ;
1215
1215
  #
1216
1216
  def link_attributes
1217
1217
  # -> uncomment the next line to manually enable rule tracing
@@ -1222,25 +1222,20 @@ module OCCIANTLR
1222
1222
  hash = Hashie::Mash.new
1223
1223
 
1224
1224
  begin
1225
- # at line 86:8: ( SEMICOLON ( WS )? attribute )*
1226
- # at line 86:8: ( SEMICOLON ( WS )? attribute )*
1225
+ # at line 86:8: SEMICOLON ( ( WS )? attribute )*
1226
+ match( SEMICOLON, TOKENS_FOLLOWING_SEMICOLON_IN_link_attributes_753 )
1227
+ # at line 86:18: ( ( WS )? attribute )*
1227
1228
  while true # decision 26
1228
1229
  alt_26 = 2
1229
1230
  look_26_0 = @input.peek( 1 )
1230
1231
 
1231
- if ( look_26_0 == SEMICOLON )
1232
- look_26_1 = @input.peek( 2 )
1233
-
1234
- if ( look_26_1.between?( WS, SCHEME ) || look_26_1.between?( CLASS, ACTIONS ) || look_26_1.between?( SELF, CATEGORY ) || look_26_1 == LOALPHA || look_26_1.between?( KIND, ACTION ) || look_26_1.between?( LINK, TERM ) )
1235
- alt_26 = 1
1236
-
1237
- end
1232
+ if ( look_26_0.between?( WS, SCHEME ) || look_26_0.between?( CLASS, ACTIONS ) || look_26_0.between?( SELF, CATEGORY ) || look_26_0 == LOALPHA || look_26_0.between?( KIND, ACTION ) || look_26_0.between?( LINK, TERM ) )
1233
+ alt_26 = 1
1238
1234
 
1239
1235
  end
1240
1236
  case alt_26
1241
1237
  when 1
1242
- # at line 86:9: SEMICOLON ( WS )? attribute
1243
- match( SEMICOLON, TOKENS_FOLLOWING_SEMICOLON_IN_link_attributes_754 )
1238
+ # at line 86:19: ( WS )? attribute
1244
1239
  # at line 86:19: ( WS )?
1245
1240
  alt_25 = 2
1246
1241
  look_25_0 = @input.peek( 1 )
@@ -2394,106 +2389,108 @@ module OCCIANTLR
2394
2389
 
2395
2390
  # - - - - - - - - - - DFA definitions - - - - - - - - - - -
2396
2391
  class DFA17 < ANTLR3::DFA
2397
- EOT = unpack( 28, -1 )
2398
- EOF = unpack( 2, 2, 26, -1 )
2399
- MIN = unpack( 1, 6, 1, 7, 1, -1, 2, 8, 1, 10, 8, 4, 1, -1, 12, 4,
2392
+ EOT = unpack( 29, -1 )
2393
+ EOF = unpack( 1, -1, 1, 4, 25, -1, 1, 4, 1, -1 )
2394
+ MIN = unpack( 2, 6, 2, 8, 1, -1, 1, 10, 8, 4, 1, -1, 12, 4, 1, 6,
2400
2395
  1, -1 )
2401
- MAX = unpack( 1, 6, 1, 45, 1, -1, 2, 45, 1, 26, 8, 52, 1, -1, 12,
2402
- 52, 1, -1 )
2403
- ACCEPT = unpack( 2, -1, 1, 2, 11, -1, 1, 1, 12, -1, 1, 1 )
2404
- SPECIAL = unpack( 28, -1 )
2396
+ MAX = unpack( 1, 6, 3, 45, 1, -1, 1, 26, 8, 52, 1, -1, 12, 52, 1,
2397
+ 45, 1, -1 )
2398
+ ACCEPT = unpack( 4, -1, 1, 2, 9, -1, 1, 1, 13, -1, 1, 1 )
2399
+ SPECIAL = unpack( 29, -1 )
2405
2400
  TRANSITION = [
2406
2401
  unpack( 1, 1 ),
2407
- unpack( 1, 3, 1, 2, 2, -1, 6, 2, 3, -1, 1, 4, 1, 2, 2, -1, 1, 2,
2408
- 14, -1, 3, 2, 2, -1, 2, 2 ),
2402
+ unpack( 1, 4, 1, 2, 1, 4, 2, -1, 6, 4, 3, -1, 1, 3, 1, 4, 2, -1,
2403
+ 1, 4, 14, -1, 3, 4, 2, -1, 2, 4 ),
2404
+ unpack( 1, 4, 2, -1, 6, 4, 3, -1, 1, 3, 1, 4, 2, -1, 1, 4, 14,
2405
+ -1, 3, 4, 2, -1, 2, 4 ),
2406
+ unpack( 1, 4, 1, 5, 1, -1, 6, 4, 3, -1, 2, 4, 2, -1, 1, 4, 1, -1,
2407
+ 1, 4, 2, -1, 1, 4, 2, -1, 1, 4, 5, -1, 4, 4, 2, -1, 2,
2408
+ 4 ),
2409
2409
  unpack( ),
2410
- unpack( 1, 2, 2, -1, 6, 2, 3, -1, 1, 4, 1, 2, 2, -1, 1, 2, 14,
2411
- -1, 3, 2, 2, -1, 2, 2 ),
2412
- unpack( 1, 2, 1, 5, 1, -1, 6, 2, 3, -1, 2, 2, 2, -1, 1, 2, 1, -1,
2413
- 1, 2, 2, -1, 1, 2, 2, -1, 1, 2, 5, -1, 4, 2, 2, -1, 2,
2414
- 2 ),
2415
- unpack( 1, 6, 15, -1, 1, 2 ),
2416
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 2, 6, 26, 3, 2, 2,
2410
+ unpack( 1, 6, 15, -1, 1, 4 ),
2411
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 4, 6, 26, 3, 4, 2,
2417
2412
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2418
2413
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2419
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2420
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2414
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2415
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2421
2416
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2422
2417
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2423
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2424
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2418
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2419
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2425
2420
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2426
2421
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2427
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2428
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2422
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2423
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2429
2424
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2430
2425
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2431
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2432
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2426
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2427
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2433
2428
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2434
2429
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2435
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2436
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2430
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2431
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2437
2432
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2438
2433
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2439
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2440
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2434
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2435
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2441
2436
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2442
2437
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2443
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2444
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2438
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2439
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2445
2440
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2446
2441
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2447
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2442
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2448
2443
  unpack( ),
2449
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2444
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2450
2445
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2451
2446
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2452
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2453
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2447
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2448
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2454
2449
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2455
2450
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2456
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2457
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2451
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2452
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2458
2453
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2459
2454
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2460
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2461
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2455
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2456
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2462
2457
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2463
2458
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2464
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2465
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2459
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2460
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2466
2461
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2467
2462
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2468
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2469
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2463
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2464
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2470
2465
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2471
2466
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2472
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2473
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2467
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2468
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2474
2469
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2475
2470
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2476
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2477
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2471
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2472
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2478
2473
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2479
2474
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2480
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2481
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2475
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2476
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2482
2477
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2483
2478
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2484
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2485
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2479
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2480
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2486
2481
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2487
2482
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2488
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2489
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2483
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2484
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2490
2485
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2491
2486
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2492
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2493
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 27, 6, 26, 3, 2, 2,
2487
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2488
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 27, 6, 26, 3, 4, 2,
2494
2489
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2495
2490
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2496
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2491
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2492
+ unpack( 1, 28, 2, 4, 2, -1, 6, 4, 3, -1, 2, 4, 2, -1, 1, 4, 14,
2493
+ -1, 3, 4, 2, -1, 2, 4 ),
2497
2494
  unpack( )
2498
2495
  ].freeze
2499
2496
 
@@ -2513,187 +2510,189 @@ module OCCIANTLR
2513
2510
  end
2514
2511
  end
2515
2512
  class DFA18 < ANTLR3::DFA
2516
- EOT = unpack( 48, -1 )
2517
- EOF = unpack( 2, 2, 46, -1 )
2518
- MIN = unpack( 1, 6, 1, 7, 1, -1, 2, 8, 1, 10, 8, 4, 1, -1, 13, 4,
2519
- 1, -1, 19, 4 )
2520
- MAX = unpack( 1, 6, 1, 45, 1, -1, 2, 45, 1, 26, 8, 52, 1, -1, 13,
2521
- 52, 1, -1, 19, 52 )
2522
- ACCEPT = unpack( 2, -1, 1, 2, 11, -1, 1, 1, 13, -1, 1, 1, 19, -1 )
2523
- SPECIAL = unpack( 48, -1 )
2513
+ EOT = unpack( 49, -1 )
2514
+ EOF = unpack( 1, -1, 1, 4, 26, -1, 1, 4, 20, -1 )
2515
+ MIN = unpack( 2, 6, 2, 8, 1, -1, 1, 10, 8, 4, 1, -1, 13, 4, 1, 6,
2516
+ 19, 4, 1, -1 )
2517
+ MAX = unpack( 1, 6, 3, 45, 1, -1, 1, 26, 8, 52, 1, -1, 13, 52, 1,
2518
+ 45, 19, 52, 1, -1 )
2519
+ ACCEPT = unpack( 4, -1, 1, 2, 9, -1, 1, 1, 33, -1, 1, 1 )
2520
+ SPECIAL = unpack( 49, -1 )
2524
2521
  TRANSITION = [
2525
2522
  unpack( 1, 1 ),
2526
- unpack( 1, 3, 1, 2, 2, -1, 6, 2, 3, -1, 1, 2, 1, 4, 2, -1, 1, 2,
2527
- 14, -1, 3, 2, 2, -1, 2, 2 ),
2523
+ unpack( 1, 4, 1, 2, 1, 4, 2, -1, 6, 4, 3, -1, 1, 4, 1, 3, 2, -1,
2524
+ 1, 4, 14, -1, 3, 4, 2, -1, 2, 4 ),
2525
+ unpack( 1, 4, 2, -1, 6, 4, 3, -1, 1, 4, 1, 3, 2, -1, 1, 4, 14,
2526
+ -1, 3, 4, 2, -1, 2, 4 ),
2527
+ unpack( 1, 4, 1, 5, 1, -1, 6, 4, 3, -1, 2, 4, 2, -1, 1, 4, 1, -1,
2528
+ 1, 4, 2, -1, 1, 4, 2, -1, 1, 4, 5, -1, 4, 4, 2, -1, 2,
2529
+ 4 ),
2528
2530
  unpack( ),
2529
- unpack( 1, 2, 2, -1, 6, 2, 3, -1, 1, 2, 1, 4, 2, -1, 1, 2, 14,
2530
- -1, 3, 2, 2, -1, 2, 2 ),
2531
- unpack( 1, 2, 1, 5, 1, -1, 6, 2, 3, -1, 2, 2, 2, -1, 1, 2, 1, -1,
2532
- 1, 2, 2, -1, 1, 2, 2, -1, 1, 2, 5, -1, 4, 2, 2, -1, 2,
2533
- 2 ),
2534
- unpack( 1, 6, 15, -1, 1, 2 ),
2535
- unpack( 1, 2, 1, 11, 2, 2, 1, 26, 1, 22, 1, 2, 6, 26, 3, 2, 2,
2531
+ unpack( 1, 6, 15, -1, 1, 4 ),
2532
+ unpack( 1, 4, 1, 11, 2, 4, 1, 26, 1, 22, 1, 4, 6, 26, 3, 4, 2,
2536
2533
  26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12, 1, 13,
2537
2534
  1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20, 1, 21,
2538
- 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2539
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2540
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2535
+ 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2536
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2537
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2541
2538
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2542
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2543
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2544
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2539
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2540
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2541
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2545
2542
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2546
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2547
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2548
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2543
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2544
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2545
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2549
2546
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2550
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2551
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2552
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2547
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2548
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2549
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2553
2550
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2554
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2555
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2556
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2551
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2552
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2553
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2557
2554
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2558
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2559
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2560
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2555
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2556
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2557
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2561
2558
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2562
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2563
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2564
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2559
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2560
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2561
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2565
2562
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2566
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2563
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2567
2564
  unpack( ),
2568
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2569
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2565
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2566
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2570
2567
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2571
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2572
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2573
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2568
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2569
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2570
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2574
2571
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2575
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2576
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2577
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2572
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2573
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2574
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2578
2575
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2579
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2580
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2581
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2576
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2577
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2578
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2582
2579
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2583
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2584
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2585
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2580
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2581
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2582
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2586
2583
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2587
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2588
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2589
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2584
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2585
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2586
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2590
2587
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2591
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2592
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2593
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2588
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2589
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2590
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2594
2591
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2595
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2596
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2597
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2592
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2593
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2594
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2598
2595
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2599
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2600
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2601
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2596
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2597
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2598
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2602
2599
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2603
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2604
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2605
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2600
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2601
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2602
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2606
2603
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2607
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2608
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2609
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2604
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2605
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2606
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2610
2607
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2611
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2612
- unpack( 1, 2, 1, 11, 1, 2, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2613
- 2, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2608
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2609
+ unpack( 1, 4, 1, 11, 1, 4, 1, 27, 1, 26, 1, 22, 1, 28, 6, 26, 3,
2610
+ 4, 2, 26, 1, 24, 1, 25, 1, 7, 1, 8, 1, 9, 1, 10, 1, 12,
2614
2611
  1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 19, 1, 20,
2615
- 1, 21, 1, 23, 3, 26, 2, 2, 2, 26, 7, 2 ),
2616
- unpack( 1, 2, 1, 33, 2, 2, 1, 47, 1, 43, 1, 2, 6, 47, 3, 2, 2,
2612
+ 1, 21, 1, 23, 3, 26, 2, 4, 2, 26, 7, 4 ),
2613
+ unpack( 1, 4, 1, 33, 2, 4, 1, 47, 1, 43, 1, 4, 6, 47, 3, 4, 2,
2617
2614
  47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1, 34, 1,
2618
- 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1, 41, 1,
2619
- 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2620
- unpack( ),
2621
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2622
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2623
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2624
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2625
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2626
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2627
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2628
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2629
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2630
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2631
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2632
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2633
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2634
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2635
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2636
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2637
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2638
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2639
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2640
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2641
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2642
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2643
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2644
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2645
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2646
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2647
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2648
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2649
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2650
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2651
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2652
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2653
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2654
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2655
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2656
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2657
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2658
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2659
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2660
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2661
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2662
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2663
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2664
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2665
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2666
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2667
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2668
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2669
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2670
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2671
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2672
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2673
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2674
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2675
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2676
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2677
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2678
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2679
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2680
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2681
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2682
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2683
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2684
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2685
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2686
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2687
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2688
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2689
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2690
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2691
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2692
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 ),
2693
- unpack( 1, 2, 1, 33, 1, 2, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2694
- 2, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2695
- 34, 1, 35, 1, 28, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2696
- 41, 1, 42, 1, 44, 3, 47, 2, 2, 2, 47, 7, 2 )
2615
+ 35, 1, 14, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1, 41, 1,
2616
+ 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2617
+ unpack( 1, 48, 2, 4, 2, -1, 6, 4, 3, -1, 2, 4, 2, -1, 1, 4, 14,
2618
+ -1, 3, 4, 2, -1, 2, 4 ),
2619
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2620
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2621
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2622
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2623
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2624
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2625
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2626
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2627
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2628
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2629
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2630
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2631
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2632
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2633
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2634
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2635
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2636
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2637
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2638
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2639
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2640
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2641
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2642
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2643
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2644
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2645
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2646
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2647
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2648
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2649
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2650
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2651
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2652
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2653
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2654
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2655
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2656
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2657
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2658
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2659
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2660
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2661
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2662
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2663
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2664
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2665
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2666
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2667
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2668
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2669
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2670
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2671
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2672
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2673
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2674
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2675
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2676
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2677
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2678
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2679
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2680
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2681
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2682
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2683
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2684
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2685
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2686
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2687
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2688
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2689
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2690
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2691
+ unpack( 1, 4, 1, 33, 1, 4, 1, 27, 1, 47, 1, 43, 1, 28, 6, 47, 3,
2692
+ 4, 2, 47, 1, 45, 1, 46, 1, 29, 1, 30, 1, 31, 1, 32, 1,
2693
+ 34, 1, 35, 1, 48, 1, 36, 1, 37, 1, 38, 1, 39, 1, 40, 1,
2694
+ 41, 1, 42, 1, 44, 3, 47, 2, 4, 2, 47, 7, 4 ),
2695
+ unpack( )
2697
2696
  ].freeze
2698
2697
 
2699
2698
  ( 0 ... MIN.length ).zip( MIN, MAX ) do | i, a, z |
@@ -2824,9 +2823,9 @@ module OCCIANTLR
2824
2823
  TOKENS_FOLLOWING_WS_IN_link_category_720 = Set[ 5, 7, 8, 9, 11, 12, 13, 14, 15, 16, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 44, 45 ]
2825
2824
  TOKENS_FOLLOWING_uri_IN_link_category_724 = Set[ 7, 10 ]
2826
2825
  TOKENS_FOLLOWING_QUOTE_IN_link_category_730 = Set[ 1 ]
2827
- TOKENS_FOLLOWING_SEMICOLON_IN_link_attributes_754 = Set[ 7, 8, 11, 12, 13, 14, 15, 16, 20, 21, 24, 39, 40, 41, 44, 45 ]
2826
+ TOKENS_FOLLOWING_SEMICOLON_IN_link_attributes_753 = Set[ 1, 7, 8, 11, 12, 13, 14, 15, 16, 20, 21, 24, 39, 40, 41, 44, 45 ]
2828
2827
  TOKENS_FOLLOWING_WS_IN_link_attributes_756 = Set[ 7, 8, 11, 12, 13, 14, 15, 16, 20, 21, 24, 39, 40, 41, 44, 45 ]
2829
- TOKENS_FOLLOWING_attribute_IN_link_attributes_759 = Set[ 1, 6 ]
2828
+ TOKENS_FOLLOWING_attribute_IN_link_attributes_759 = Set[ 1, 7, 8, 11, 12, 13, 14, 15, 16, 20, 21, 24, 39, 40, 41, 44, 45 ]
2830
2829
  TOKENS_FOLLOWING_X_OCCI_ATTRIBUTE_KEY_IN_x_occi_attribute_780 = Set[ 5 ]
2831
2830
  TOKENS_FOLLOWING_COLON_IN_x_occi_attribute_782 = Set[ 7, 8, 11, 12, 13, 14, 15, 16, 20, 21, 24, 39, 40, 41, 44, 45 ]
2832
2831
  TOKENS_FOLLOWING_WS_IN_x_occi_attribute_784 = Set[ 7, 8, 11, 12, 13, 14, 15, 16, 20, 21, 24, 39, 40, 41, 44, 45 ]