occi 2.5.19 → 3.0.0.beta.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (110) hide show
  1. data/.gitignore +4 -0
  2. data/.travis.yml +3 -1
  3. data/AUTHORS +4 -3
  4. data/Gemfile +9 -0
  5. data/Gemfile.lock +64 -21
  6. data/README.md +19 -14
  7. data/Rakefile +12 -8
  8. data/Test Results - discovery_interface.html +862 -0
  9. data/bin/occi +333 -83
  10. data/examples/dsl_example.rb +6 -6
  11. data/examples/x509auth_example.rb +6 -6
  12. data/features/common/step_definitions/common_steps.rb +32 -0
  13. data/features/occi/core/create/create.feature +17 -0
  14. data/features/occi/core/create/step_definitions/create_steps.rb +0 -0
  15. data/features/occi/core/delete/delete.feature +14 -0
  16. data/features/occi/core/delete/step_definitions/delete_steps.rb +0 -0
  17. data/features/occi/core/discovery_interface/discovery_interface.feature +35 -0
  18. data/features/occi/core/discovery_interface/step_definitions/discovery_interface_steps.rb +19 -0
  19. data/features/occi/core/miscellaneous/miscellaneous.feature +14 -0
  20. data/features/occi/core/miscellaneous/step_definitions/miscellaneous_steps.rb +0 -0
  21. data/features/occi/core/read/read.feature +14 -0
  22. data/features/occi/core/read/step_definitions/read_steps.rb +0 -0
  23. data/features/occi/core/update/step_definitions/update_steps.rb +0 -0
  24. data/features/occi/core/update/update.feature +14 -0
  25. data/features/occi/infrastructure/create/create.feature +14 -0
  26. data/features/occi/infrastructure/create/step_definitions/create_steps.rb +0 -0
  27. data/features/support/env.rb +4 -0
  28. data/lib/occi.rb +29 -3
  29. data/lib/occi/api/client/client_amqp.rb +756 -0
  30. data/lib/occi/api/client/client_http.rb +922 -0
  31. data/lib/occi/api/client/http/httparty_fix.rb +53 -0
  32. data/lib/occi/api/client/http/net_http_fix.rb +46 -0
  33. data/lib/occi/api/dsl.rb +77 -73
  34. data/lib/occi/bin/helpers.rb +91 -0
  35. data/lib/occi/bin/occi_opts.rb +251 -0
  36. data/lib/occi/bin/resource_output_factory.rb +90 -0
  37. data/lib/occi/bin/templates/compute.erb +15 -0
  38. data/lib/occi/bin/templates/network.erb +11 -0
  39. data/lib/occi/bin/templates/os_tpl.erb +9 -0
  40. data/lib/occi/bin/templates/resource_tpl.erb +9 -0
  41. data/lib/occi/bin/templates/storage.erb +10 -0
  42. data/lib/occi/collection.rb +122 -25
  43. data/lib/occi/core.rb +18 -9
  44. data/lib/occi/core/action.rb +20 -4
  45. data/lib/occi/core/action_instance.rb +24 -0
  46. data/lib/occi/core/actions.rb +22 -0
  47. data/lib/occi/core/attribute_properties.rb +33 -84
  48. data/lib/occi/core/attributes.rb +32 -14
  49. data/lib/occi/core/categories.rb +46 -0
  50. data/lib/occi/core/category.rb +94 -20
  51. data/lib/occi/core/entities.rb +50 -0
  52. data/lib/occi/core/entity.rb +130 -89
  53. data/lib/occi/core/kind.rb +28 -35
  54. data/lib/occi/core/kinds.rb +22 -0
  55. data/lib/occi/core/link.rb +43 -40
  56. data/lib/occi/core/links.rb +34 -0
  57. data/lib/occi/core/mixin.rb +28 -23
  58. data/lib/occi/core/mixins.rb +22 -0
  59. data/lib/occi/core/related.rb +20 -0
  60. data/lib/occi/core/resource.rb +40 -40
  61. data/lib/occi/core/resources.rb +14 -0
  62. data/lib/occi/infrastructure.rb +27 -0
  63. data/lib/occi/infrastructure/compute.rb +159 -0
  64. data/lib/occi/infrastructure/network.rb +131 -0
  65. data/lib/occi/infrastructure/network/ipnetwork.rb +34 -0
  66. data/lib/occi/infrastructure/networkinterface.rb +124 -0
  67. data/lib/occi/infrastructure/networkinterface/ipnetworkinterface.rb +34 -0
  68. data/lib/occi/infrastructure/os_tpl.rb +19 -0
  69. data/lib/occi/infrastructure/resource_tpl.rb +19 -0
  70. data/lib/occi/infrastructure/storage.rb +96 -0
  71. data/lib/occi/infrastructure/storagelink.rb +73 -0
  72. data/lib/occi/log.rb +6 -2
  73. data/lib/occi/model.rb +38 -70
  74. data/lib/occi/parser.rb +108 -88
  75. data/lib/occi/version.rb +2 -2
  76. data/lib/occiantlr/OCCIANTLR.g +6 -5
  77. data/lib/occiantlr/OCCIANTLRLexer.rb +52 -52
  78. data/lib/occiantlr/OCCIANTLRParser.rb +678 -569
  79. data/lib/occiantlr/README.md +1 -1
  80. data/occi.gemspec +2 -1
  81. data/spec/cassettes/client_http_text_plain.yml +1066 -0
  82. data/spec/occi/api/client/client_amqp_spec.rb +148 -0
  83. data/spec/occi/api/client/client_http_0.5_spec.rb +292 -0
  84. data/spec/occi/api/client/client_http_spec.rb +259 -0
  85. data/spec/occi/api/dsl_spec.rb +0 -0
  86. data/spec/occi/collection_spec.rb +23 -10
  87. data/spec/occi/core/categories_spec.rb +30 -0
  88. data/spec/occi/core/category_spec.rb +41 -0
  89. data/spec/occi/core/entity_spec.rb +52 -0
  90. data/spec/occi/core/resource_spec.rb +21 -0
  91. data/spec/occi/infrastructure/compute_spec.rb +32 -0
  92. data/spec/occi/log_spec.rb +10 -10
  93. data/spec/occi/model_spec.rb +24 -24
  94. data/spec/occi/parser_spec.rb +89 -39
  95. data/spec/occi/test.json +22 -58
  96. data/spec/occiantlr/parser_spec.rb +5 -7
  97. data/spec/spec_helper.rb +13 -3
  98. metadata +116 -19
  99. data/etc/model/infrastructure/compute.json +0 -108
  100. data/etc/model/infrastructure/ipnetwork.json +0 -40
  101. data/etc/model/infrastructure/ipnetworkinterface.json +0 -40
  102. data/etc/model/infrastructure/network.json +0 -55
  103. data/etc/model/infrastructure/networkinterface.json +0 -38
  104. data/etc/model/infrastructure/os_template.json +0 -9
  105. data/etc/model/infrastructure/resource_template.json +0 -9
  106. data/etc/model/infrastructure/storage.json +0 -72
  107. data/etc/model/infrastructure/storagelink.json +0 -38
  108. data/lib/occi/api/client.rb +0 -596
  109. data/lib/occi/client/occiopts.rb +0 -146
  110. data/spec/occi/client_spec.rb +0 -12
data/lib/occi/version.rb CHANGED
@@ -1,3 +1,3 @@
1
- module OCCI
2
- VERSION = "2.5.19" unless defined?(::OCCI::VERSION)
1
+ module Occi
2
+ VERSION = "3.0.0.beta.0" unless defined?(::Occi::VERSION)
3
3
  end
data/lib/occiantlr/OCCIANTLR.g CHANGED
@@ -7,7 +7,7 @@ options {
7
7
  @header {
8
8
  require 'uri'
9
9
  require 'hashie'
10
- ATTRIBUTE = { :Mutable => true, :Required => false, :Type => "string" }
10
+ ATTRIBUTE = { :mutable => true, :required => false, :type => "string" }
11
11
  }
12
12
 
13
13
  /*
@@ -73,15 +73,16 @@ link returns [hash]
73
73
  : link_target { hash[:target] = $link_target.value }
74
74
  link_rel { hash[:rel] = $link_rel.value }
75
75
  link_self? { hash[:self] = $link_self.value }
76
- link_category? { hash[:kind] = $link_category.value }
76
+ link_category? { hash[:categories] = $link_category.array }
77
77
  link_attributes { hash[:attributes] = $link_attributes.hash }
78
78
  SEMICOLON?
79
79
  ;
80
80
  link_target returns [value] : WS? LT uri GT { value = $uri.text };
81
81
  link_rel returns [value] : SEMICOLON WS? REL EQUALS QUOTE uri QUOTE { value = $uri.text };
82
82
  link_self returns [value] : SEMICOLON WS? SELF EQUALS QUOTE uri QUOTE { value = $uri.text };
83
- link_category returns [value] : SEMICOLON WS? CATEGORY EQUALS QUOTE uri QUOTE { value = $uri.text };
84
- link_attributes returns [hash] @init { hash = Hashie::Mash.new }
83
+ link_category returns [array] @init {array = Array.new}
84
+ : SEMICOLON WS? CATEGORY EQUALS QUOTE kind=uri { array << $kind.text } (WS mixin=uri { array << $mixin.text })* QUOTE;
85
+ link_attributes returns [hash] @init {hash = Hashie::Mash.new}
85
86
  : (SEMICOLON WS? attribute { hash.merge!($attribute.hash) } )*;
86
87
 
87
88
  /*
@@ -119,7 +120,7 @@ attribute_name returns [hash] @init { hash = Hashie::Mash.new }
119
120
  : comp_first=attribute_component { cur_hash = hash; comp = $comp_first.text }
120
121
  ( '.' comp_next=attribute_component { cur_hash[comp.to_sym] = Hashie::Mash.new; cur_hash = cur_hash[comp.to_sym]; comp = $comp_next.text })*
121
122
  { cur_hash[comp.to_sym] = ATTRIBUTE }
122
- ('{' ('mutable' { cur_hash[comp.to_sym][:Mutable] = true })? ('immutable' { cur_hash[comp.to_sym][:Mutable] = false })? ('required' { cur_hash[comp.to_sym][:Required] = true })? '}' )?;
123
+ ('{' ('mutable' { cur_hash[comp.to_sym][:mutable] = true })? ('immutable' { cur_hash[comp.to_sym][:mutable] = false })? ('required' { cur_hash[comp.to_sym][:required] = true })? '}' )?;
123
124
  attribute_component : ( LOALPHA | reserved_words) ( LOALPHA | DIGIT | DASH | UNDERSCORE | reserved_words )*;
124
125
  attribute_value returns [value] : ( quoted_string { value = $quoted_string.text } | number { value = $number.text.to_i } );
125
126
  number : ( digits ( DOT digits )? );
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-09-10 16:19:48
8
+ # Generated at: 2012-10-05 18:10:39
9
9
  #
10
10
 
11
11
  # ~~~> start load path setup
@@ -252,7 +252,7 @@ module OCCIANTLR
252
252
 
253
253
 
254
254
  # - - - - main rule block - - - -
255
- # at line 130:4: 'Category'
255
+ # at line 131:4: 'Category'
256
256
  match( "Category" )
257
257
 
258
258
 
@@ -276,7 +276,7 @@ module OCCIANTLR
276
276
 
277
277
 
278
278
  # - - - - main rule block - - - -
279
- # at line 132:4: 'Link'
279
+ # at line 133:4: 'Link'
280
280
  match( "Link" )
281
281
 
282
282
 
@@ -300,7 +300,7 @@ module OCCIANTLR
300
300
 
301
301
 
302
302
  # - - - - main rule block - - - -
303
- # at line 134:4: 'X-OCCI-Attribute'
303
+ # at line 135:4: 'X-OCCI-Attribute'
304
304
  match( "X-OCCI-Attribute" )
305
305
 
306
306
 
@@ -324,7 +324,7 @@ module OCCIANTLR
324
324
 
325
325
 
326
326
  # - - - - main rule block - - - -
327
- # at line 136:4: 'X-OCCI-Location'
327
+ # at line 137:4: 'X-OCCI-Location'
328
328
  match( "X-OCCI-Location" )
329
329
 
330
330
 
@@ -348,7 +348,7 @@ module OCCIANTLR
348
348
 
349
349
 
350
350
  # - - - - main rule block - - - -
351
- # at line 140:10: 'action'
351
+ # at line 141:10: 'action'
352
352
  match( "action" )
353
353
 
354
354
 
@@ -372,7 +372,7 @@ module OCCIANTLR
372
372
 
373
373
 
374
374
  # - - - - main rule block - - - -
375
- # at line 141:11: 'actions'
375
+ # at line 142:11: 'actions'
376
376
  match( "actions" )
377
377
 
378
378
 
@@ -396,7 +396,7 @@ module OCCIANTLR
396
396
 
397
397
 
398
398
  # - - - - main rule block - - - -
399
- # at line 143:4: '&'
399
+ # at line 144:4: '&'
400
400
  match( 0x26 )
401
401
 
402
402
 
@@ -420,7 +420,7 @@ module OCCIANTLR
420
420
 
421
421
 
422
422
  # - - - - main rule block - - - -
423
- # at line 144:6: '@'
423
+ # at line 145:6: '@'
424
424
  match( 0x40 )
425
425
 
426
426
 
@@ -444,7 +444,7 @@ module OCCIANTLR
444
444
 
445
445
 
446
446
  # - - - - main rule block - - - -
447
- # at line 146:4: 'attributes'
447
+ # at line 147:4: 'attributes'
448
448
  match( "attributes" )
449
449
 
450
450
 
@@ -468,7 +468,7 @@ module OCCIANTLR
468
468
 
469
469
 
470
470
  # - - - - main rule block - - - -
471
- # at line 148:4: '\\\\'
471
+ # at line 149:4: '\\\\'
472
472
  match( 0x5c )
473
473
 
474
474
 
@@ -492,7 +492,7 @@ module OCCIANTLR
492
492
 
493
493
 
494
494
  # - - - - main rule block - - - -
495
- # at line 149:11: 'category'
495
+ # at line 150:11: 'category'
496
496
  match( "category" )
497
497
 
498
498
 
@@ -516,7 +516,7 @@ module OCCIANTLR
516
516
 
517
517
 
518
518
  # - - - - main rule block - - - -
519
- # at line 150:9: 'class'
519
+ # at line 151:9: 'class'
520
520
  match( "class" )
521
521
 
522
522
 
@@ -540,7 +540,7 @@ module OCCIANTLR
540
540
 
541
541
 
542
542
  # - - - - main rule block - - - -
543
- # at line 151:9: ':'
543
+ # at line 152:9: ':'
544
544
  match( 0x3a )
545
545
 
546
546
 
@@ -564,7 +564,7 @@ module OCCIANTLR
564
564
 
565
565
 
566
566
  # - - - - main rule block - - - -
567
- # at line 152:8: '-'
567
+ # at line 153:8: '-'
568
568
  match( 0x2d )
569
569
 
570
570
 
@@ -588,7 +588,7 @@ module OCCIANTLR
588
588
 
589
589
 
590
590
  # - - - - main rule block - - - -
591
- # at line 153:7: '.'
591
+ # at line 154:7: '.'
592
592
  match( 0x2e )
593
593
 
594
594
 
@@ -612,7 +612,7 @@ module OCCIANTLR
612
612
 
613
613
 
614
614
  # - - - - main rule block - - - -
615
- # at line 154:10: '='
615
+ # at line 155:10: '='
616
616
  match( 0x3d )
617
617
 
618
618
 
@@ -636,7 +636,7 @@ module OCCIANTLR
636
636
 
637
637
 
638
638
  # - - - - main rule block - - - -
639
- # at line 155:6: '>'
639
+ # at line 156:6: '>'
640
640
  match( 0x3e )
641
641
 
642
642
 
@@ -660,7 +660,7 @@ module OCCIANTLR
660
660
 
661
661
 
662
662
  # - - - - main rule block - - - -
663
- # at line 156:8: '#'
663
+ # at line 157:8: '#'
664
664
  match( 0x23 )
665
665
 
666
666
 
@@ -684,7 +684,7 @@ module OCCIANTLR
684
684
 
685
685
 
686
686
  # - - - - main rule block - - - -
687
- # at line 157:8: 'kind'
687
+ # at line 158:8: 'kind'
688
688
  match( "kind" )
689
689
 
690
690
 
@@ -708,7 +708,7 @@ module OCCIANTLR
708
708
 
709
709
 
710
710
  # - - - - main rule block - - - -
711
- # at line 158:8: 'link'
711
+ # at line 159:8: 'link'
712
712
  match( "link" )
713
713
 
714
714
 
@@ -732,7 +732,7 @@ module OCCIANTLR
732
732
 
733
733
 
734
734
  # - - - - main rule block - - - -
735
- # at line 159:11: 'location'
735
+ # at line 160:11: 'location'
736
736
  match( "location" )
737
737
 
738
738
 
@@ -756,7 +756,7 @@ module OCCIANTLR
756
756
 
757
757
 
758
758
  # - - - - main rule block - - - -
759
- # at line 160:6: '<'
759
+ # at line 161:6: '<'
760
760
  match( 0x3c )
761
761
 
762
762
 
@@ -780,7 +780,7 @@ module OCCIANTLR
780
780
 
781
781
 
782
782
  # - - - - main rule block - - - -
783
- # at line 161:9: 'mixin'
783
+ # at line 162:9: 'mixin'
784
784
  match( "mixin" )
785
785
 
786
786
 
@@ -804,7 +804,7 @@ module OCCIANTLR
804
804
 
805
805
 
806
806
  # - - - - main rule block - - - -
807
- # at line 162:11: '%'
807
+ # at line 163:11: '%'
808
808
  match( 0x25 )
809
809
 
810
810
 
@@ -828,7 +828,7 @@ module OCCIANTLR
828
828
 
829
829
 
830
830
  # - - - - main rule block - - - -
831
- # at line 163:8: '+'
831
+ # at line 164:8: '+'
832
832
  match( 0x2b )
833
833
 
834
834
 
@@ -852,7 +852,7 @@ module OCCIANTLR
852
852
 
853
853
 
854
854
  # - - - - main rule block - - - -
855
- # at line 164:11: '?'
855
+ # at line 165:11: '?'
856
856
  match( 0x3f )
857
857
 
858
858
 
@@ -876,7 +876,7 @@ module OCCIANTLR
876
876
 
877
877
 
878
878
  # - - - - main rule block - - - -
879
- # at line 165:9: '\"'
879
+ # at line 166:9: '\"'
880
880
  match( 0x22 )
881
881
 
882
882
 
@@ -900,7 +900,7 @@ module OCCIANTLR
900
900
 
901
901
 
902
902
  # - - - - main rule block - - - -
903
- # at line 166:7: 'rel'
903
+ # at line 167:7: 'rel'
904
904
  match( "rel" )
905
905
 
906
906
 
@@ -924,7 +924,7 @@ module OCCIANTLR
924
924
 
925
925
 
926
926
  # - - - - main rule block - - - -
927
- # at line 167:10: 'scheme'
927
+ # at line 168:10: 'scheme'
928
928
  match( "scheme" )
929
929
 
930
930
 
@@ -948,7 +948,7 @@ module OCCIANTLR
948
948
 
949
949
 
950
950
  # - - - - main rule block - - - -
951
- # at line 168:8: 'self'
951
+ # at line 169:8: 'self'
952
952
  match( "self" )
953
953
 
954
954
 
@@ -972,7 +972,7 @@ module OCCIANTLR
972
972
 
973
973
 
974
974
  # - - - - main rule block - - - -
975
- # at line 170:4: ';'
975
+ # at line 171:4: ';'
976
976
  match( 0x3b )
977
977
 
978
978
 
@@ -996,7 +996,7 @@ module OCCIANTLR
996
996
 
997
997
 
998
998
  # - - - - main rule block - - - -
999
- # at line 171:9: '/'
999
+ # at line 172:9: '/'
1000
1000
  match( 0x2f )
1001
1001
 
1002
1002
 
@@ -1020,7 +1020,7 @@ module OCCIANTLR
1020
1020
 
1021
1021
 
1022
1022
  # - - - - main rule block - - - -
1023
- # at line 172:10: '\\''
1023
+ # at line 173:10: '\\''
1024
1024
  match( 0x27 )
1025
1025
 
1026
1026
 
@@ -1044,7 +1044,7 @@ module OCCIANTLR
1044
1044
 
1045
1045
 
1046
1046
  # - - - - main rule block - - - -
1047
- # at line 173:8: 'term'
1047
+ # at line 174:8: 'term'
1048
1048
  match( "term" )
1049
1049
 
1050
1050
 
@@ -1068,7 +1068,7 @@ module OCCIANTLR
1068
1068
 
1069
1069
 
1070
1070
  # - - - - main rule block - - - -
1071
- # at line 174:9: '~'
1071
+ # at line 175:9: '~'
1072
1072
  match( 0x7e )
1073
1073
 
1074
1074
 
@@ -1092,7 +1092,7 @@ module OCCIANTLR
1092
1092
 
1093
1093
 
1094
1094
  # - - - - main rule block - - - -
1095
- # at line 175:9: 'title'
1095
+ # at line 176:9: 'title'
1096
1096
  match( "title" )
1097
1097
 
1098
1098
 
@@ -1116,7 +1116,7 @@ module OCCIANTLR
1116
1116
 
1117
1117
 
1118
1118
  # - - - - main rule block - - - -
1119
- # at line 177:4: '_'
1119
+ # at line 178:4: '_'
1120
1120
  match( 0x5f )
1121
1121
 
1122
1122
 
@@ -1140,7 +1140,7 @@ module OCCIANTLR
1140
1140
 
1141
1141
 
1142
1142
  # - - - - main rule block - - - -
1143
- # at line 178:12: '('
1143
+ # at line 179:12: '('
1144
1144
  match( 0x28 )
1145
1145
 
1146
1146
 
@@ -1164,7 +1164,7 @@ module OCCIANTLR
1164
1164
 
1165
1165
 
1166
1166
  # - - - - main rule block - - - -
1167
- # at line 179:12: ')'
1167
+ # at line 180:12: ')'
1168
1168
  match( 0x29 )
1169
1169
 
1170
1170
 
@@ -1188,8 +1188,8 @@ module OCCIANTLR
1188
1188
 
1189
1189
 
1190
1190
  # - - - - main rule block - - - -
1191
- # at line 181:12: ( 'a' .. 'z' )+
1192
- # at file 181:12: ( 'a' .. 'z' )+
1191
+ # at line 182:12: ( 'a' .. 'z' )+
1192
+ # at file 182:12: ( 'a' .. 'z' )+
1193
1193
  match_count_1 = 0
1194
1194
  while true
1195
1195
  alt_1 = 2
@@ -1201,7 +1201,7 @@ module OCCIANTLR
1201
1201
  end
1202
1202
  case alt_1
1203
1203
  when 1
1204
- # at line 181:13: 'a' .. 'z'
1204
+ # at line 182:13: 'a' .. 'z'
1205
1205
  match_range( 0x61, 0x7a )
1206
1206
 
1207
1207
  else
@@ -1236,8 +1236,8 @@ module OCCIANTLR
1236
1236
 
1237
1237
 
1238
1238
  # - - - - main rule block - - - -
1239
- # at line 182:12: ( 'A' .. 'Z' )+
1240
- # at file 182:12: ( 'A' .. 'Z' )+
1239
+ # at line 183:12: ( 'A' .. 'Z' )+
1240
+ # at file 183:12: ( 'A' .. 'Z' )+
1241
1241
  match_count_2 = 0
1242
1242
  while true
1243
1243
  alt_2 = 2
@@ -1249,7 +1249,7 @@ module OCCIANTLR
1249
1249
  end
1250
1250
  case alt_2
1251
1251
  when 1
1252
- # at line 182:13: 'A' .. 'Z'
1252
+ # at line 183:13: 'A' .. 'Z'
1253
1253
  match_range( 0x41, 0x5a )
1254
1254
 
1255
1255
  else
@@ -1284,8 +1284,8 @@ module OCCIANTLR
1284
1284
 
1285
1285
 
1286
1286
  # - - - - main rule block - - - -
1287
- # at line 183:12: ( '0' .. '9' )+
1288
- # at file 183:12: ( '0' .. '9' )+
1287
+ # at line 184:12: ( '0' .. '9' )+
1288
+ # at file 184:12: ( '0' .. '9' )+
1289
1289
  match_count_3 = 0
1290
1290
  while true
1291
1291
  alt_3 = 2
@@ -1297,7 +1297,7 @@ module OCCIANTLR
1297
1297
  end
1298
1298
  case alt_3
1299
1299
  when 1
1300
- # at line 183:13: '0' .. '9'
1300
+ # at line 184:13: '0' .. '9'
1301
1301
  match_range( 0x30, 0x39 )
1302
1302
 
1303
1303
  else
@@ -1332,8 +1332,8 @@ module OCCIANTLR
1332
1332
 
1333
1333
 
1334
1334
  # - - - - main rule block - - - -
1335
- # at line 184:12: ( '\\t' | ' ' | '\\r' | '\\n' | '\\u000C' )+
1336
- # at file 184:12: ( '\\t' | ' ' | '\\r' | '\\n' | '\\u000C' )+
1335
+ # at line 185:12: ( '\\t' | ' ' | '\\r' | '\\n' | '\\u000C' )+
1336
+ # at file 185:12: ( '\\t' | ' ' | '\\r' | '\\n' | '\\u000C' )+
1337
1337
  match_count_4 = 0
1338
1338
  while true
1339
1339
  alt_4 = 2
@@ -1388,7 +1388,7 @@ module OCCIANTLR
1388
1388
 
1389
1389
 
1390
1390
  # - - - - main rule block - - - -
1391
- # at line 185:12: '\\\\' ( QUOTE | '\\'' )
1391
+ # at line 186:12: '\\\\' ( QUOTE | '\\'' )
1392
1392
  match( 0x5c )
1393
1393
  if @input.peek(1) == 0x22 || @input.peek(1) == 0x27
1394
1394
  @input.consume