occi 2.5.3 → 2.5.4

data/lib/occi/api/dsl.rb

@@ -0,0 +1,112 @@
+module OCCI
+  module DSL
+
+    def connect(*args)
+      @client = OCCI::Client.new(*args)
+
+      true
+    end
+
+    def list(*args)
+      check
+
+      @client.list(*args)
+    end
+
+    def describe(*args)
+      check
+
+      @client.describe(*args)
+    end
+
+    def create(*args)
+      check
+
+      @client.create(*args)
+    end
+
+    def delete(*args)
+      check
+
+      @client.delete(*args)
+    end
+
+    def trigger(*args)
+      check
+
+      @client.trigger(*args)
+    end
+
+    def refresh
+      check
+
+      @client.refresh
+    end
+
+    def storagelink(*args)
+      check
+
+      @client.storagelink(*args)
+    end
+
+    def networkinterface(*args)
+      check
+
+      @client.networkinterface(*args)
+    end
+
+    ###
+
+    def resource_types
+      check
+
+      @client.get_resource_types
+    end
+
+    def resource_type_identifiers
+      check
+
+      @client.get_resource_type_identifiers
+    end
+
+    def mixin_type_identifiers
+      check
+
+      @client.get_mixin_type_identifiers
+    end
+
+    def mixin_types
+      check
+
+      @client.get_mixin_types
+    end
+
+    def mixins(*args)
+      check
+
+      @client.get_mixins(*args)
+    end
+
+    ###
+
+    def resource(*args)
+      check
+
+      @client.get_resource(*args)
+    end
+
+    def mixin(*args)
+      check
+
+      @client.find_mixin(*args)
+    end
+
+    private
+
+    def check
+      raise "You have to issue 'connect' first!" if @client.nil?
+      raise "Client is disconnected!" unless @client.connected
+    end
+
+  end
+end

data/lib/occi/collection.rb

@@ -1,6 +1,3 @@
-require 'hashie/mash'
-require 'active_support/json'
-
 module OCCI
   class Collection
     attr_accessor :kinds

data/lib/occi/core.rb

@@ -0,0 +1,21 @@
+require 'occi/core/category'
+require 'occi/core/kind'
+require 'occi/core/mixin'
+require 'occi/core/action'
+require 'occi/core/entity'
+require 'occi/core/link'
+require 'occi/core/resource'
+#require 'occi/core/attribute'
+require 'occi/core/attributes'
+
+module OCCI
+  module Core
+    # @return [Array] list of OCCI::Core::Categories
+    def self.categories
+      categories = []
+      categories << OCCI::Core::Entity.kind
+      categories << OCCI::Core::Link.kind
+      categories << OCCI::Core::Resource.kind
+    end
+  end
+end

data/lib/occi/core/entity.rb

@@ -150,13 +150,14 @@ module OCCI
       # @return [String] text representation
       def to_text
         scheme, term = self.kind.split('#')
-        text         = term + ';scheme=' + scheme.inspect + ';class="kind"' + "\n"
+        text         = 'Category: ' + term + ';scheme=' + scheme.inspect + ';class="kind"' + "\n"
         @mixins.each do |mixin|
           scheme, term = mixin.split('#')
-          text << term + ';scheme=' + scheme.inspect + ';class="mixin"' + "\n"
+          text << 'Category: ' + term + ';scheme=' + scheme.inspect + ';class="mixin"' + "\n"
         end
         @attributes.combine.each_pair do |name, value|
           name = name.inspect if name.kind_of? String
+          value = value.inspect if value.kind_of? String
           text << 'X-OCCI-Attribute: ' + name + '=' + value + "\n"
         end
         @actions.each do |action|

data/lib/occi/log.rb

@@ -1,10 +1,9 @@
 require 'logger'
-require 'active_support/notifications'
 
 module OCCI
   class Log
 
-    include Logger::Severity
+    include ::Logger::Severity
 
     attr_reader :logger
 

data/lib/occi/parser.rb

@@ -1,14 +1,3 @@
-require 'rubygems'
-require 'json'
-require 'nokogiri'
-require 'hashie/mash'
-require 'rubygems/package'
-require 'zlib'
-require 'tempfile'
-require 'occi/collection'
-require 'occi/log'
-require 'occiantlr/OCCIANTLRParser'
-
 module OCCI
   class Parser
 

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module OCCI
-  VERSION = "2.5.3" unless defined?(::OCCI::VERSION)
+  VERSION = "2.5.4" unless defined?(::OCCI::VERSION)
 end

data/lib/occiantlr/OCCIANTLR.g

@@ -7,7 +7,7 @@ options {
 @header { 
 	require 'uri' 
 	require 'hashie'
-	ATTRIBUTE = { :mutable => true, :required => false, :type => "string" }
+	ATTRIBUTE = { :Mutable => true, :Required => false, :Type => "string" }
 }
 
 /*
@@ -47,7 +47,7 @@ category returns [hash]
 	 category_title returns [value]		: SEMICOLON WS? TITLE EQUALS QUOTE title QUOTE
 	 				  	  { value = $title.text };
 	 category_rel returns [value]		: SEMICOLON WS? REL EQUALS QUOTE uri QUOTE
-					  	  { value = $uri.text };
+					  	  { value = [$uri.text] };
 	 category_location returns [value]	: SEMICOLON WS? LOCATION EQUALS QUOTE uri QUOTE
 	 				  	  { value = $uri.text };
 	 category_attributes  returns [hash] 	@init{hash = Hashie::Mash.new}
@@ -73,7 +73,7 @@ link returns [hash]
 			: link_target { hash[:target] = $link_target.value }
 			  link_rel { hash[:rel] = $link_rel.value }
 			  link_self? { hash[:self] = $link_self.value }
-			  link_category? { hash[:category] = $link_category.value }
+			  link_category? { hash[:kind] = $link_category.value }
 			  link_attributes { hash[:attributes] = $link_attributes.hash }
 			  SEMICOLON?
 			  ;
@@ -107,7 +107,7 @@ x_occi_location returns [location]
 	: X_OCCI_LOCATION_KEY COLON WS? uri SEMICOLON? { location = URI.parse($uri.text) } ;
 
 uri			: ( LOALPHA | UPALPHA | DIGIT | AT | COLON | PERCENT | UNDERSCORE | BACKSLASH | PLUS | DOT | TILDE | HASH | QUESTION | AMPERSAND | SLASH | EQUALS | DASH | X_OCCI_ATTRIBUTE_KEY | X_OCCI_LOCATION_KEY | reserved_words)+;
-term			: ( LOALPHA | reserved_words ) ( LOALPHA | DIGIT | DASH | UNDERSCORE | reserved_words )*;
+term			: ( LOALPHA | reserved_words ) ( LOALPHA | DIGIT | DASH | UNDERSCORE | DOT | reserved_words )*;
 scheme 		        : uri; 
 class_type		: ( KIND | MIXIN | ACTION );
 title			: ( ESC | ~( BACKSLASH | QUOTE | SQUOTE ) | SQUOTE )*;
@@ -118,7 +118,8 @@ attribute returns [hash] @init { hash = Hashie::Mash.new }
 attribute_name returns [hash] @init { hash = Hashie::Mash.new }
                         : comp_first=attribute_component { cur_hash = hash; comp = $comp_first.text }
 			  ( '.' comp_next=attribute_component { cur_hash[comp.to_sym] = Hashie::Mash.new; cur_hash = cur_hash[comp.to_sym]; comp = $comp_next.text })*
-			  { cur_hash[comp.to_sym] = ATTRIBUTE };
+			  { cur_hash[comp.to_sym] = ATTRIBUTE } 
+			  ('{' ('mutable' { cur_hash[comp.to_sym][:Mutable] = true })? ('immutable' { cur_hash[comp.to_sym][:Mutable] = false })? ('required' { cur_hash[comp.to_sym][:Required] = true })? '}' )?;
 attribute_component	: ( LOALPHA | reserved_words) ( LOALPHA | DIGIT | DASH | UNDERSCORE | reserved_words  )*;
 attribute_value returns [value]	: ( string { value = $string.text } | number { value = $number.text.to_i } );
 string			: quoted_string;
@@ -174,7 +175,9 @@ TERM	:	'term';
 TILDE	:	'~';
 TITLE	:	'title';
 UNDERSCORE
-	:	'_';
+	:	'_';	
+LBRACKET : '(';
+RBRACKET : ')';
 
 LOALPHA : 	('a'..'z')+;
 UPALPHA	: 	('A'..'Z')+;
@@ -184,4 +187,4 @@ ESC     : 	'\\' ( QUOTE | '\'' );
 
 quoted_string
 	:	( QUOTE ( ESC | ~( '\\' | QUOTE | '\'' ) | '\'' )* QUOTE);	
-digits	:	DIGIT+;	
+digits	:	DIGIT+;	

data/lib/occiantlr/OCCIANTLR.tokens

@@ -1,29 +1,36 @@
 TERM=45
-LT=18
 CLASS=11
+LT=18
 ATTRIBUTES=15
 ESC=42
 EQUALS=9
 ACTION=41
 ACTIONS=16
+LBRACKET=46
 AT=27
 QUOTE=10
+T__51=51
 SLASH=37
+T__52=52
 TILDE=33
 PLUS=31
 DIGIT=26
+RBRACKET=47
 LOALPHA=24
 DOT=32
+T__50=50
 X_OCCI_ATTRIBUTE_KEY=22
 PERCENT=28
 DASH=38
+T__48=48
+T__49=49
 HASH=34
 AMPERSAND=36
 CATEGORY=21
 UNDERSCORE=29
 REL=13
-CATEGORY_KEY=4
 SEMICOLON=6
+CATEGORY_KEY=4
 LINK=44
 SQUOTE=43
 KIND=39
@@ -40,6 +47,11 @@ X_OCCI_LOCATION_KEY=23
 SELF=20
 TITLE=12
 BACKSLASH=30
+'}'=52
+'mutable'=49
 '.'=32
+'{'=48
 '\\'=30
 '\''=43
+'required'=51
+'immutable'=50

data/lib/occiantlr/OCCIANTLRLexer.rb

@@ -5,7 +5,7 @@
 # Generated using ANTLR version: 3.2.1-SNAPSHOT Jul 31, 2010 19:34:52
 # Ruby runtime library version: 1.8.11
 # Input grammar file: OCCIANTLR.g
-# Generated at: 2012-06-12 16:37:00
+# Generated at: 2012-09-10 12:15:56
 # 
 
 # ~~~> start load path setup
@@ -66,18 +66,19 @@ module OCCIANTLR
   module TokenData
 
     # define the token constants
-    define_tokens( :TERM => 45, :LT => 18, :CLASS => 11, :ATTRIBUTES => 15, 
+    define_tokens( :TERM => 45, :CLASS => 11, :LT => 18, :ATTRIBUTES => 15, 
                    :ESC => 42, :EQUALS => 9, :EOF => -1, :ACTION => 41, 
-                   :ACTIONS => 16, :AT => 27, :QUOTE => 10, :SLASH => 37, 
-                   :TILDE => 33, :PLUS => 31, :DIGIT => 26, :DOT => 32, 
-                   :LOALPHA => 24, :X_OCCI_ATTRIBUTE_KEY => 22, :PERCENT => 28, 
-                   :DASH => 38, :HASH => 34, :AMPERSAND => 36, :CATEGORY => 21, 
-                   :UNDERSCORE => 29, :REL => 13, :CATEGORY_KEY => 4, :SEMICOLON => 6, 
-                   :LINK => 44, :SQUOTE => 43, :KIND => 39, :SCHEME => 8, 
-                   :COLON => 5, :MIXIN => 40, :WS => 7, :QUESTION => 35, 
-                   :UPALPHA => 25, :LINK_KEY => 17, :LOCATION => 14, :GT => 19, 
-                   :X_OCCI_LOCATION_KEY => 23, :SELF => 20, :BACKSLASH => 30, 
-                   :TITLE => 12 )
+                   :ACTIONS => 16, :AT => 27, :LBRACKET => 46, :QUOTE => 10, 
+                   :SLASH => 37, :T__51 => 51, :T__52 => 52, :TILDE => 33, 
+                   :PLUS => 31, :DIGIT => 26, :RBRACKET => 47, :LOALPHA => 24, 
+                   :DOT => 32, :T__50 => 50, :X_OCCI_ATTRIBUTE_KEY => 22, 
+                   :PERCENT => 28, :DASH => 38, :T__48 => 48, :T__49 => 49, 
+                   :HASH => 34, :AMPERSAND => 36, :CATEGORY => 21, :UNDERSCORE => 29, 
+                   :REL => 13, :SEMICOLON => 6, :CATEGORY_KEY => 4, :LINK => 44, 
+                   :SQUOTE => 43, :KIND => 39, :SCHEME => 8, :COLON => 5, 
+                   :MIXIN => 40, :WS => 7, :QUESTION => 35, :UPALPHA => 25, 
+                   :LINK_KEY => 17, :LOCATION => 14, :GT => 19, :X_OCCI_LOCATION_KEY => 23, 
+                   :SELF => 20, :BACKSLASH => 30, :TITLE => 12 )
     
   end
 
@@ -93,22 +94,24 @@ module OCCIANTLR
       # ignore
     end
     
-    RULE_NAMES   = [ "CATEGORY_KEY", "LINK_KEY", "X_OCCI_ATTRIBUTE_KEY", 
-                     "X_OCCI_LOCATION_KEY", "ACTION", "ACTIONS", "AMPERSAND", 
-                     "AT", "ATTRIBUTES", "BACKSLASH", "CATEGORY", "CLASS", 
-                     "COLON", "DASH", "DOT", "EQUALS", "GT", "HASH", "KIND", 
-                     "LINK", "LOCATION", "LT", "MIXIN", "PERCENT", "PLUS", 
-                     "QUESTION", "QUOTE", "REL", "SCHEME", "SELF", "SEMICOLON", 
-                     "SLASH", "SQUOTE", "TERM", "TILDE", "TITLE", "UNDERSCORE", 
-                     "LOALPHA", "UPALPHA", "DIGIT", "WS", "ESC" ].freeze
-    RULE_METHODS = [ :category_key!, :link_key!, :x_occi_attribute_key!, 
-                     :x_occi_location_key!, :action!, :actions!, :ampersand!, 
-                     :at!, :attributes!, :backslash!, :category!, :class!, 
-                     :colon!, :dash!, :dot!, :equals!, :gt!, :hash!, :kind!, 
-                     :link!, :location!, :lt!, :mixin!, :percent!, :plus!, 
-                     :question!, :quote!, :rel!, :scheme!, :self!, :semicolon!, 
-                     :slash!, :squote!, :term!, :tilde!, :title!, :underscore!, 
-                     :loalpha!, :upalpha!, :digit!, :ws!, :esc! ].freeze
+    RULE_NAMES   = [ "T__48", "T__49", "T__50", "T__51", "T__52", "CATEGORY_KEY", 
+                     "LINK_KEY", "X_OCCI_ATTRIBUTE_KEY", "X_OCCI_LOCATION_KEY", 
+                     "ACTION", "ACTIONS", "AMPERSAND", "AT", "ATTRIBUTES", 
+                     "BACKSLASH", "CATEGORY", "CLASS", "COLON", "DASH", 
+                     "DOT", "EQUALS", "GT", "HASH", "KIND", "LINK", "LOCATION", 
+                     "LT", "MIXIN", "PERCENT", "PLUS", "QUESTION", "QUOTE", 
+                     "REL", "SCHEME", "SELF", "SEMICOLON", "SLASH", "SQUOTE", 
+                     "TERM", "TILDE", "TITLE", "UNDERSCORE", "LBRACKET", 
+                     "RBRACKET", "LOALPHA", "UPALPHA", "DIGIT", "WS", "ESC" ].freeze
+    RULE_METHODS = [ :t__48!, :t__49!, :t__50!, :t__51!, :t__52!, :category_key!, 
+                     :link_key!, :x_occi_attribute_key!, :x_occi_location_key!, 
+                     :action!, :actions!, :ampersand!, :at!, :attributes!, 
+                     :backslash!, :category!, :class!, :colon!, :dash!, 
+                     :dot!, :equals!, :gt!, :hash!, :kind!, :link!, :location!, 
+                     :lt!, :mixin!, :percent!, :plus!, :question!, :quote!, 
+                     :rel!, :scheme!, :self!, :semicolon!, :slash!, :squote!, 
+                     :term!, :tilde!, :title!, :underscore!, :lbracket!, 
+                     :rbracket!, :loalpha!, :upalpha!, :digit!, :ws!, :esc! ].freeze
 
     
     def initialize( input=nil, options = {} )
@@ -118,18 +121,138 @@ module OCCIANTLR
     
     
     # - - - - - - - - - - - lexer rules - - - - - - - - - - - -
+    # lexer rule t__48! (T__48)
+    # (in OCCIANTLR.g)
+    def t__48!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 1 )
+
+      type = T__48
+      channel = ANTLR3::DEFAULT_CHANNEL
+
+      
+      # - - - - main rule block - - - -
+      # at line 7:9: '{'
+      match( 0x7b )
+
+      
+      @state.type = type
+      @state.channel = channel
+
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 1 )
+
+    end
+
+    # lexer rule t__49! (T__49)
+    # (in OCCIANTLR.g)
+    def t__49!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 2 )
+
+      type = T__49
+      channel = ANTLR3::DEFAULT_CHANNEL
+
+      
+      # - - - - main rule block - - - -
+      # at line 8:9: 'mutable'
+      match( "mutable" )
+
+      
+      @state.type = type
+      @state.channel = channel
+
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 2 )
+
+    end
+
+    # lexer rule t__50! (T__50)
+    # (in OCCIANTLR.g)
+    def t__50!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 3 )
+
+      type = T__50
+      channel = ANTLR3::DEFAULT_CHANNEL
+
+      
+      # - - - - main rule block - - - -
+      # at line 9:9: 'immutable'
+      match( "immutable" )
+
+      
+      @state.type = type
+      @state.channel = channel
+
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 3 )
+
+    end
+
+    # lexer rule t__51! (T__51)
+    # (in OCCIANTLR.g)
+    def t__51!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 4 )
+
+      type = T__51
+      channel = ANTLR3::DEFAULT_CHANNEL
+
+      
+      # - - - - main rule block - - - -
+      # at line 10:9: 'required'
+      match( "required" )
+
+      
+      @state.type = type
+      @state.channel = channel
+
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 4 )
+
+    end
+
+    # lexer rule t__52! (T__52)
+    # (in OCCIANTLR.g)
+    def t__52!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 5 )
+
+      type = T__52
+      channel = ANTLR3::DEFAULT_CHANNEL
+
+      
+      # - - - - main rule block - - - -
+      # at line 11:9: '}'
+      match( 0x7d )
+
+      
+      @state.type = type
+      @state.channel = channel
+
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 5 )
+
+    end
+
     # lexer rule category_key! (CATEGORY_KEY)
     # (in OCCIANTLR.g)
     def category_key!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 1 )
+      # trace_in( __method__, 6 )
 
       type = CATEGORY_KEY
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 130:4: 'Category'
+      # at line 131:4: 'Category'
       match( "Category" )
 
       
@@ -138,7 +261,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 1 )
+      # trace_out( __method__, 6 )
 
     end
 
@@ -146,14 +269,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def link_key!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 2 )
+      # trace_in( __method__, 7 )
 
       type = LINK_KEY
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 132:4: 'Link'
+      # at line 133:4: 'Link'
       match( "Link" )
 
       
@@ -162,7 +285,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 2 )
+      # trace_out( __method__, 7 )
 
     end
 
@@ -170,14 +293,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def x_occi_attribute_key!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 3 )
+      # trace_in( __method__, 8 )
 
       type = X_OCCI_ATTRIBUTE_KEY
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 134:4: 'X-OCCI-Attribute'
+      # at line 135:4: 'X-OCCI-Attribute'
       match( "X-OCCI-Attribute" )
 
       
@@ -186,7 +309,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 3 )
+      # trace_out( __method__, 8 )
 
     end
 
@@ -194,14 +317,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def x_occi_location_key!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 4 )
+      # trace_in( __method__, 9 )
 
       type = X_OCCI_LOCATION_KEY
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 136:4: 'X-OCCI-Location'
+      # at line 137:4: 'X-OCCI-Location'
       match( "X-OCCI-Location" )
 
       
@@ -210,7 +333,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 4 )
+      # trace_out( __method__, 9 )
 
     end
 
@@ -218,14 +341,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def action!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 5 )
+      # trace_in( __method__, 10 )
 
       type = ACTION
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 140:10: 'action'
+      # at line 141:10: 'action'
       match( "action" )
 
       
@@ -234,7 +357,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 5 )
+      # trace_out( __method__, 10 )
 
     end
 
@@ -242,14 +365,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def actions!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 6 )
+      # trace_in( __method__, 11 )
 
       type = ACTIONS
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 141:11: 'actions'
+      # at line 142:11: 'actions'
       match( "actions" )
 
       
@@ -258,7 +381,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 6 )
+      # trace_out( __method__, 11 )
 
     end
 
@@ -266,14 +389,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def ampersand!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 7 )
+      # trace_in( __method__, 12 )
 
       type = AMPERSAND
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 143:4: '&'
+      # at line 144:4: '&'
       match( 0x26 )
 
       
@@ -282,7 +405,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 7 )
+      # trace_out( __method__, 12 )
 
     end
 
@@ -290,14 +413,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def at!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 8 )
+      # trace_in( __method__, 13 )
 
       type = AT
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 144:6: '@'
+      # at line 145:6: '@'
       match( 0x40 )
 
       
@@ -306,7 +429,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 8 )
+      # trace_out( __method__, 13 )
 
     end
 
@@ -314,14 +437,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def attributes!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 9 )
+      # trace_in( __method__, 14 )
 
       type = ATTRIBUTES
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 146:4: 'attributes'
+      # at line 147:4: 'attributes'
       match( "attributes" )
 
       
@@ -330,7 +453,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 9 )
+      # trace_out( __method__, 14 )
 
     end
 
@@ -338,14 +461,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def backslash!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 10 )
+      # trace_in( __method__, 15 )
 
       type = BACKSLASH
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 148:4: '\\\\'
+      # at line 149:4: '\\\\'
       match( 0x5c )
 
       
@@ -354,7 +477,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 10 )
+      # trace_out( __method__, 15 )
 
     end
 
@@ -362,14 +485,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def category!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 11 )
+      # trace_in( __method__, 16 )
 
       type = CATEGORY
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 149:11: 'category'
+      # at line 150:11: 'category'
       match( "category" )
 
       
@@ -378,7 +501,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 11 )
+      # trace_out( __method__, 16 )
 
     end
 
@@ -386,14 +509,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def class!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 12 )
+      # trace_in( __method__, 17 )
 
       type = CLASS
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 150:9: 'class'
+      # at line 151:9: 'class'
       match( "class" )
 
       
@@ -402,7 +525,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 12 )
+      # trace_out( __method__, 17 )
 
     end
 
@@ -410,14 +533,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def colon!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 13 )
+      # trace_in( __method__, 18 )
 
       type = COLON
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 151:9: ':'
+      # at line 152:9: ':'
       match( 0x3a )
 
       
@@ -426,7 +549,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 13 )
+      # trace_out( __method__, 18 )
 
     end
 
@@ -434,14 +557,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def dash!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 14 )
+      # trace_in( __method__, 19 )
 
       type = DASH
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 152:8: '-'
+      # at line 153:8: '-'
       match( 0x2d )
 
       
@@ -450,7 +573,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 14 )
+      # trace_out( __method__, 19 )
 
     end
 
@@ -458,14 +581,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def dot!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 15 )
+      # trace_in( __method__, 20 )
 
       type = DOT
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 153:7: '.'
+      # at line 154:7: '.'
       match( 0x2e )
 
       
@@ -474,7 +597,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 15 )
+      # trace_out( __method__, 20 )
 
     end
 
@@ -482,14 +605,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def equals!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 16 )
+      # trace_in( __method__, 21 )
 
       type = EQUALS
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 154:10: '='
+      # at line 155:10: '='
       match( 0x3d )
 
       
@@ -498,7 +621,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 16 )
+      # trace_out( __method__, 21 )
 
     end
 
@@ -506,14 +629,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def gt!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 17 )
+      # trace_in( __method__, 22 )
 
       type = GT
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 155:6: '>'
+      # at line 156:6: '>'
       match( 0x3e )
 
       
@@ -522,7 +645,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 17 )
+      # trace_out( __method__, 22 )
 
     end
 
@@ -530,14 +653,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def hash!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 18 )
+      # trace_in( __method__, 23 )
 
       type = HASH
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 156:8: '#'
+      # at line 157:8: '#'
       match( 0x23 )
 
       
@@ -546,7 +669,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 18 )
+      # trace_out( __method__, 23 )
 
     end
 
@@ -554,14 +677,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def kind!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 19 )
+      # trace_in( __method__, 24 )
 
       type = KIND
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 157:8: 'kind'
+      # at line 158:8: 'kind'
       match( "kind" )
 
       
@@ -570,7 +693,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 19 )
+      # trace_out( __method__, 24 )
 
     end
 
@@ -578,14 +701,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def link!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 20 )
+      # trace_in( __method__, 25 )
 
       type = LINK
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 158:8: 'link'
+      # at line 159:8: 'link'
       match( "link" )
 
       
@@ -594,7 +717,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 20 )
+      # trace_out( __method__, 25 )
 
     end
 
@@ -602,14 +725,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def location!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 21 )
+      # trace_in( __method__, 26 )
 
       type = LOCATION
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 159:11: 'location'
+      # at line 160:11: 'location'
       match( "location" )
 
       
@@ -618,7 +741,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 21 )
+      # trace_out( __method__, 26 )
 
     end
 
@@ -626,14 +749,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def lt!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 22 )
+      # trace_in( __method__, 27 )
 
       type = LT
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 160:6: '<'
+      # at line 161:6: '<'
       match( 0x3c )
 
       
@@ -642,7 +765,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 22 )
+      # trace_out( __method__, 27 )
 
     end
 
@@ -650,14 +773,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def mixin!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 23 )
+      # trace_in( __method__, 28 )
 
       type = MIXIN
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 161:9: 'mixin'
+      # at line 162:9: 'mixin'
       match( "mixin" )
 
       
@@ -666,7 +789,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 23 )
+      # trace_out( __method__, 28 )
 
     end
 
@@ -674,14 +797,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def percent!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 24 )
+      # trace_in( __method__, 29 )
 
       type = PERCENT
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 162:11: '%'
+      # at line 163:11: '%'
       match( 0x25 )
 
       
@@ -690,7 +813,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 24 )
+      # trace_out( __method__, 29 )
 
     end
 
@@ -698,14 +821,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def plus!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 25 )
+      # trace_in( __method__, 30 )
 
       type = PLUS
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 163:8: '+'
+      # at line 164:8: '+'
       match( 0x2b )
 
       
@@ -714,7 +837,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 25 )
+      # trace_out( __method__, 30 )
 
     end
 
@@ -722,14 +845,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def question!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 26 )
+      # trace_in( __method__, 31 )
 
       type = QUESTION
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 164:11: '?'
+      # at line 165:11: '?'
       match( 0x3f )
 
       
@@ -738,7 +861,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 26 )
+      # trace_out( __method__, 31 )
 
     end
 
@@ -746,14 +869,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def quote!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 27 )
+      # trace_in( __method__, 32 )
 
       type = QUOTE
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 165:9: '\"'
+      # at line 166:9: '\"'
       match( 0x22 )
 
       
@@ -762,7 +885,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 27 )
+      # trace_out( __method__, 32 )
 
     end
 
@@ -770,14 +893,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def rel!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 28 )
+      # trace_in( __method__, 33 )
 
       type = REL
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 166:7: 'rel'
+      # at line 167:7: 'rel'
       match( "rel" )
 
       
@@ -786,7 +909,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 28 )
+      # trace_out( __method__, 33 )
 
     end
 
@@ -794,14 +917,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def scheme!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 29 )
+      # trace_in( __method__, 34 )
 
       type = SCHEME
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 167:10: 'scheme'
+      # at line 168:10: 'scheme'
       match( "scheme" )
 
       
@@ -810,7 +933,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 29 )
+      # trace_out( __method__, 34 )
 
     end
 
@@ -818,14 +941,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def self!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 30 )
+      # trace_in( __method__, 35 )
 
       type = SELF
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 168:8: 'self'
+      # at line 169:8: 'self'
       match( "self" )
 
       
@@ -834,7 +957,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 30 )
+      # trace_out( __method__, 35 )
 
     end
 
@@ -842,14 +965,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def semicolon!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 31 )
+      # trace_in( __method__, 36 )
 
       type = SEMICOLON
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 170:4: ';'
+      # at line 171:4: ';'
       match( 0x3b )
 
       
@@ -858,7 +981,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 31 )
+      # trace_out( __method__, 36 )
 
     end
 
@@ -866,14 +989,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def slash!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 32 )
+      # trace_in( __method__, 37 )
 
       type = SLASH
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 171:9: '/'
+      # at line 172:9: '/'
       match( 0x2f )
 
       
@@ -882,7 +1005,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 32 )
+      # trace_out( __method__, 37 )
 
     end
 
@@ -890,14 +1013,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def squote!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 33 )
+      # trace_in( __method__, 38 )
 
       type = SQUOTE
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 172:10: '\\''
+      # at line 173:10: '\\''
       match( 0x27 )
 
       
@@ -906,7 +1029,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 33 )
+      # trace_out( __method__, 38 )
 
     end
 
@@ -914,14 +1037,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def term!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 34 )
+      # trace_in( __method__, 39 )
 
       type = TERM
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 173:8: 'term'
+      # at line 174:8: 'term'
       match( "term" )
 
       
@@ -930,7 +1053,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 34 )
+      # trace_out( __method__, 39 )
 
     end
 
@@ -938,14 +1061,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def tilde!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 35 )
+      # trace_in( __method__, 40 )
 
       type = TILDE
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 174:9: '~'
+      # at line 175:9: '~'
       match( 0x7e )
 
       
@@ -954,7 +1077,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 35 )
+      # trace_out( __method__, 40 )
 
     end
 
@@ -962,14 +1085,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def title!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 36 )
+      # trace_in( __method__, 41 )
 
       type = TITLE
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 175:9: 'title'
+      # at line 176:9: 'title'
       match( "title" )
 
       
@@ -978,7 +1101,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 36 )
+      # trace_out( __method__, 41 )
 
     end
 
@@ -986,14 +1109,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def underscore!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 37 )
+      # trace_in( __method__, 42 )
 
       type = UNDERSCORE
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 177:4: '_'
+      # at line 178:4: '_'
       match( 0x5f )
 
       
@@ -1002,7 +1125,55 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 37 )
+      # trace_out( __method__, 42 )
+
+    end
+
+    # lexer rule lbracket! (LBRACKET)
+    # (in OCCIANTLR.g)
+    def lbracket!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 43 )
+
+      type = LBRACKET
+      channel = ANTLR3::DEFAULT_CHANNEL
+
+      
+      # - - - - main rule block - - - -
+      # at line 179:12: '('
+      match( 0x28 )
+
+      
+      @state.type = type
+      @state.channel = channel
+
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 43 )
+
+    end
+
+    # lexer rule rbracket! (RBRACKET)
+    # (in OCCIANTLR.g)
+    def rbracket!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 44 )
+
+      type = RBRACKET
+      channel = ANTLR3::DEFAULT_CHANNEL
+
+      
+      # - - - - main rule block - - - -
+      # at line 180:12: ')'
+      match( 0x29 )
+
+      
+      @state.type = type
+      @state.channel = channel
+
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 44 )
 
     end
 
@@ -1010,15 +1181,15 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def loalpha!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 38 )
+      # trace_in( __method__, 45 )
 
       type = LOALPHA
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 179:12: ( 'a' .. 'z' )+
-      # at file 179:12: ( 'a' .. 'z' )+
+      # at line 182:12: ( 'a' .. 'z' )+
+      # at file 182:12: ( 'a' .. 'z' )+
       match_count_1 = 0
       while true
         alt_1 = 2
@@ -1030,7 +1201,7 @@ module OCCIANTLR
         end
         case alt_1
         when 1
-          # at line 179:13: 'a' .. 'z'
+          # at line 182:13: 'a' .. 'z'
           match_range( 0x61, 0x7a )
 
         else
@@ -1050,7 +1221,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 38 )
+      # trace_out( __method__, 45 )
 
     end
 
@@ -1058,15 +1229,15 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def upalpha!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 39 )
+      # trace_in( __method__, 46 )
 
       type = UPALPHA
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 180:12: ( 'A' .. 'Z' )+
-      # at file 180:12: ( 'A' .. 'Z' )+
+      # at line 183:12: ( 'A' .. 'Z' )+
+      # at file 183:12: ( 'A' .. 'Z' )+
       match_count_2 = 0
       while true
         alt_2 = 2
@@ -1078,7 +1249,7 @@ module OCCIANTLR
         end
         case alt_2
         when 1
-          # at line 180:13: 'A' .. 'Z'
+          # at line 183:13: 'A' .. 'Z'
           match_range( 0x41, 0x5a )
 
         else
@@ -1098,7 +1269,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 39 )
+      # trace_out( __method__, 46 )
 
     end
 
@@ -1106,15 +1277,15 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def digit!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 40 )
+      # trace_in( __method__, 47 )
 
       type = DIGIT
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 181:12: ( '0' .. '9' )+
-      # at file 181:12: ( '0' .. '9' )+
+      # at line 184:12: ( '0' .. '9' )+
+      # at file 184:12: ( '0' .. '9' )+
       match_count_3 = 0
       while true
         alt_3 = 2
@@ -1126,7 +1297,7 @@ module OCCIANTLR
         end
         case alt_3
         when 1
-          # at line 181:13: '0' .. '9'
+          # at line 184:13: '0' .. '9'
           match_range( 0x30, 0x39 )
 
         else
@@ -1146,7 +1317,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 40 )
+      # trace_out( __method__, 47 )
 
     end
 
@@ -1154,15 +1325,15 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def ws!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 41 )
+      # trace_in( __method__, 48 )
 
       type = WS
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 182:12: ( '\\t' | ' ' | '\\r' | '\\n' | '\\u000C' )+
-      # at file 182:12: ( '\\t' | ' ' | '\\r' | '\\n' | '\\u000C' )+
+      # at line 185:12: ( '\\t' | ' ' | '\\r' | '\\n' | '\\u000C' )+
+      # at file 185:12: ( '\\t' | ' ' | '\\r' | '\\n' | '\\u000C' )+
       match_count_4 = 0
       while true
         alt_4 = 2
@@ -1202,7 +1373,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 41 )
+      # trace_out( __method__, 48 )
 
     end
 
@@ -1210,14 +1381,14 @@ module OCCIANTLR
     # (in OCCIANTLR.g)
     def esc!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 42 )
+      # trace_in( __method__, 49 )
 
       type = ESC
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 183:12: '\\\\' ( QUOTE | '\\'' )
+      # at line 186:12: '\\\\' ( QUOTE | '\\'' )
       match( 0x5c )
       if @input.peek(1) == 0x22 || @input.peek(1) == 0x27
         @input.consume
@@ -1235,7 +1406,7 @@ module OCCIANTLR
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 42 )
+      # trace_out( __method__, 49 )
 
     end
 
@@ -1247,176 +1418,204 @@ module OCCIANTLR
     # but instead use the next_token method, which will
     # build and emit the actual next token
     def token!
-      # at line 1:8: ( CATEGORY_KEY | LINK_KEY | X_OCCI_ATTRIBUTE_KEY | X_OCCI_LOCATION_KEY | ACTION | ACTIONS | AMPERSAND | AT | ATTRIBUTES | BACKSLASH | CATEGORY | CLASS | COLON | DASH | DOT | EQUALS | GT | HASH | KIND | LINK | LOCATION | LT | MIXIN | PERCENT | PLUS | QUESTION | QUOTE | REL | SCHEME | SELF | SEMICOLON | SLASH | SQUOTE | TERM | TILDE | TITLE | UNDERSCORE | LOALPHA | UPALPHA | DIGIT | WS | ESC )
-      alt_5 = 42
+      # at line 1:8: ( T__48 | T__49 | T__50 | T__51 | T__52 | CATEGORY_KEY | LINK_KEY | X_OCCI_ATTRIBUTE_KEY | X_OCCI_LOCATION_KEY | ACTION | ACTIONS | AMPERSAND | AT | ATTRIBUTES | BACKSLASH | CATEGORY | CLASS | COLON | DASH | DOT | EQUALS | GT | HASH | KIND | LINK | LOCATION | LT | MIXIN | PERCENT | PLUS | QUESTION | QUOTE | REL | SCHEME | SELF | SEMICOLON | SLASH | SQUOTE | TERM | TILDE | TITLE | UNDERSCORE | LBRACKET | RBRACKET | LOALPHA | UPALPHA | DIGIT | WS | ESC )
+      alt_5 = 49
       alt_5 = @dfa5.predict( @input )
       case alt_5
       when 1
-        # at line 1:10: CATEGORY_KEY
-        category_key!
+        # at line 1:10: T__48
+        t__48!
 
       when 2
-        # at line 1:23: LINK_KEY
-        link_key!
+        # at line 1:16: T__49
+        t__49!
 
       when 3
-        # at line 1:32: X_OCCI_ATTRIBUTE_KEY
-        x_occi_attribute_key!
+        # at line 1:22: T__50
+        t__50!
 
       when 4
-        # at line 1:53: X_OCCI_LOCATION_KEY
-        x_occi_location_key!
+        # at line 1:28: T__51
+        t__51!
 
       when 5
-        # at line 1:73: ACTION
-        action!
+        # at line 1:34: T__52
+        t__52!
 
       when 6
-        # at line 1:80: ACTIONS
-        actions!
+        # at line 1:40: CATEGORY_KEY
+        category_key!
 
       when 7
-        # at line 1:88: AMPERSAND
-        ampersand!
+        # at line 1:53: LINK_KEY
+        link_key!
 
       when 8
-        # at line 1:98: AT
-        at!
+        # at line 1:62: X_OCCI_ATTRIBUTE_KEY
+        x_occi_attribute_key!
 
       when 9
-        # at line 1:101: ATTRIBUTES
-        attributes!
+        # at line 1:83: X_OCCI_LOCATION_KEY
+        x_occi_location_key!
 
       when 10
-        # at line 1:112: BACKSLASH
-        backslash!
+        # at line 1:103: ACTION
+        action!
 
       when 11
-        # at line 1:122: CATEGORY
-        category!
+        # at line 1:110: ACTIONS
+        actions!
 
       when 12
-        # at line 1:131: CLASS
-        class!
+        # at line 1:118: AMPERSAND
+        ampersand!
 
       when 13
-        # at line 1:137: COLON
-        colon!
+        # at line 1:128: AT
+        at!
 
       when 14
-        # at line 1:143: DASH
-        dash!
+        # at line 1:131: ATTRIBUTES
+        attributes!
 
       when 15
-        # at line 1:148: DOT
-        dot!
+        # at line 1:142: BACKSLASH
+        backslash!
 
       when 16
-        # at line 1:152: EQUALS
-        equals!
+        # at line 1:152: CATEGORY
+        category!
 
       when 17
-        # at line 1:159: GT
-        gt!
+        # at line 1:161: CLASS
+        class!
 
       when 18
-        # at line 1:162: HASH
-        hash!
+        # at line 1:167: COLON
+        colon!
 
       when 19
-        # at line 1:167: KIND
-        kind!
+        # at line 1:173: DASH
+        dash!
 
       when 20
-        # at line 1:172: LINK
-        link!
+        # at line 1:178: DOT
+        dot!
 
       when 21
-        # at line 1:177: LOCATION
-        location!
+        # at line 1:182: EQUALS
+        equals!
 
       when 22
-        # at line 1:186: LT
-        lt!
+        # at line 1:189: GT
+        gt!
 
       when 23
-        # at line 1:189: MIXIN
-        mixin!
+        # at line 1:192: HASH
+        hash!
 
       when 24
-        # at line 1:195: PERCENT
-        percent!
+        # at line 1:197: KIND
+        kind!
 
       when 25
-        # at line 1:203: PLUS
-        plus!
+        # at line 1:202: LINK
+        link!
 
       when 26
-        # at line 1:208: QUESTION
-        question!
+        # at line 1:207: LOCATION
+        location!
 
       when 27
-        # at line 1:217: QUOTE
-        quote!
+        # at line 1:216: LT
+        lt!
 
       when 28
-        # at line 1:223: REL
-        rel!
+        # at line 1:219: MIXIN
+        mixin!
 
       when 29
-        # at line 1:227: SCHEME
-        scheme!
+        # at line 1:225: PERCENT
+        percent!
 
       when 30
-        # at line 1:234: SELF
-        self!
+        # at line 1:233: PLUS
+        plus!
 
       when 31
-        # at line 1:239: SEMICOLON
-        semicolon!
+        # at line 1:238: QUESTION
+        question!
 
       when 32
-        # at line 1:249: SLASH
-        slash!
+        # at line 1:247: QUOTE
+        quote!
 
       when 33
-        # at line 1:255: SQUOTE
-        squote!
+        # at line 1:253: REL
+        rel!
 
       when 34
-        # at line 1:262: TERM
-        term!
+        # at line 1:257: SCHEME
+        scheme!
 
       when 35
-        # at line 1:267: TILDE
-        tilde!
+        # at line 1:264: SELF
+        self!
 
       when 36
-        # at line 1:273: TITLE
-        title!
+        # at line 1:269: SEMICOLON
+        semicolon!
 
       when 37
-        # at line 1:279: UNDERSCORE
-        underscore!
+        # at line 1:279: SLASH
+        slash!
 
       when 38
-        # at line 1:290: LOALPHA
-        loalpha!
+        # at line 1:285: SQUOTE
+        squote!
 
       when 39
-        # at line 1:298: UPALPHA
-        upalpha!
+        # at line 1:292: TERM
+        term!
 
       when 40
-        # at line 1:306: DIGIT
-        digit!
+        # at line 1:297: TILDE
+        tilde!
 
       when 41
-        # at line 1:312: WS
-        ws!
+        # at line 1:303: TITLE
+        title!
 
       when 42
-        # at line 1:315: ESC
+        # at line 1:309: UNDERSCORE
+        underscore!
+
+      when 43
+        # at line 1:320: LBRACKET
+        lbracket!
+
+      when 44
+        # at line 1:329: RBRACKET
+        rbracket!
+
+      when 45
+        # at line 1:338: LOALPHA
+        loalpha!
+
+      when 46
+        # at line 1:346: UPALPHA
+        upalpha!
+
+      when 47
+        # at line 1:354: DIGIT
+        digit!
+
+      when 48
+        # at line 1:360: WS
+        ws!
+
+      when 49
+        # at line 1:363: ESC
         esc!
 
       end
@@ -1425,113 +1624,119 @@ module OCCIANTLR
     
     # - - - - - - - - - - DFA definitions - - - - - - - - - - -
     class DFA5 < ANTLR3::DFA
-      EOT = unpack( 1, -1, 3, 32, 1, 31, 2, -1, 1, 41, 1, 31, 6, -1, 2, 
-                    31, 1, -1, 1, 31, 4, -1, 2, 31, 3, -1, 1, 31, 9, -1, 
-                    2, 31, 2, -1, 11, 31, 1, -1, 8, 31, 1, 76, 4, 31, 1, 
-                    -1, 4, 31, 1, 86, 1, 87, 2, 31, 1, -1, 1, 31, 1, 91, 
-                    1, 92, 1, 31, 1, -1, 3, 31, 1, 98, 2, -1, 1, 31, 1, 
-                    100, 1, 31, 2, -1, 1, 102, 1, -1, 1, 105, 2, 31, 1, 
-                    -1, 1, 31, 1, -1, 1, 109, 2, -1, 1, 112, 1, -1, 3, 31, 
-                    4, -1, 1, 31, 1, 117, 1, 118, 1, 31, 2, -1, 1, 120, 
-                    1, -1 )
-      EOF = unpack( 121, -1 )
-      MIN = unpack( 1, 9, 1, 97, 1, 105, 1, 45, 1, 99, 2, -1, 1, 34, 1, 
-                    97, 6, -1, 2, 105, 1, -1, 1, 105, 4, -1, 1, 101, 1, 
-                    99, 3, -1, 1, 101, 8, -1, 1, 79, 2, 116, 2, -1, 1, 116, 
-                    1, 97, 2, 110, 1, 99, 1, 120, 1, 108, 1, 104, 1, 108, 
-                    1, 114, 1, 116, 1, 67, 1, 105, 1, 114, 1, 101, 1, 115, 
-                    1, 100, 1, 107, 1, 97, 1, 105, 1, 97, 1, 101, 1, 102, 
-                    1, 109, 1, 108, 1, 67, 1, 111, 1, 105, 1, 103, 1, 115, 
-                    2, 97, 1, 116, 1, 110, 1, -1, 1, 109, 2, 97, 1, 101, 
-                    1, 73, 1, 110, 1, 98, 1, 111, 1, 97, 2, -1, 1, 105, 
-                    1, 97, 1, 101, 2, -1, 1, 97, 1, 45, 1, 97, 1, 117, 1, 
-                    114, 1, -1, 1, 111, 1, -1, 1, 97, 1, -1, 1, 65, 1, 97, 
-                    1, -1, 1, 116, 1, 121, 1, 110, 4, -1, 1, 101, 2, 97, 
-                    1, 115, 2, -1, 1, 97, 1, -1 )
-      MAX = unpack( 1, 126, 1, 97, 1, 105, 1, 45, 1, 116, 2, -1, 1, 39, 
-                    1, 108, 6, -1, 1, 105, 1, 111, 1, -1, 1, 105, 4, -1, 
-                    2, 101, 3, -1, 1, 105, 8, -1, 1, 79, 2, 116, 2, -1, 
-                    1, 116, 1, 97, 2, 110, 1, 99, 1, 120, 1, 108, 1, 104, 
-                    1, 108, 1, 114, 1, 116, 1, 67, 1, 105, 1, 114, 1, 101, 
-                    1, 115, 1, 100, 1, 107, 1, 97, 1, 105, 1, 122, 1, 101, 
-                    1, 102, 1, 109, 1, 108, 1, 67, 1, 111, 1, 105, 1, 103, 
-                    1, 115, 2, 122, 1, 116, 1, 110, 1, -1, 1, 109, 2, 122, 
-                    1, 101, 1, 73, 1, 110, 1, 98, 1, 111, 1, 122, 2, -1, 
-                    1, 105, 1, 122, 1, 101, 2, -1, 1, 122, 1, 45, 1, 122, 
-                    1, 117, 1, 114, 1, -1, 1, 111, 1, -1, 1, 122, 1, -1, 
-                    1, 76, 1, 122, 1, -1, 1, 116, 1, 121, 1, 110, 4, -1, 
-                    1, 101, 2, 122, 1, 115, 2, -1, 1, 122, 1, -1 )
-      ACCEPT = unpack( 5, -1, 1, 7, 1, 8, 2, -1, 1, 13, 1, 14, 1, 15, 1, 
-                       16, 1, 17, 1, 18, 2, -1, 1, 22, 1, -1, 1, 24, 1, 
-                       25, 1, 26, 1, 27, 2, -1, 1, 31, 1, 32, 1, 33, 1, 
-                       -1, 1, 35, 1, 37, 1, 38, 1, 39, 1, 40, 1, 41, 1, 
-                       1, 1, 2, 3, -1, 1, 42, 1, 10, 34, -1, 1, 28, 9, -1, 
-                       1, 19, 1, 20, 3, -1, 1, 30, 1, 34, 5, -1, 1, 12, 
-                       1, -1, 1, 23, 1, -1, 1, 36, 2, -1, 1, 5, 3, -1, 1, 
-                       29, 1, 3, 1, 4, 1, 6, 4, -1, 1, 11, 1, 21, 1, -1, 
-                       1, 9 )
-      SPECIAL = unpack( 121, -1 )
+      EOT = unpack( 2, -1, 3, 36, 1, -1, 3, 37, 1, 36, 2, -1, 1, 50, 1, 
+                    36, 6, -1, 2, 36, 5, -1, 1, 36, 3, -1, 1, 36, 8, -1, 
+                    4, 36, 3, -1, 2, 36, 2, -1, 13, 36, 1, 81, 1, -1, 15, 
+                    36, 2, -1, 4, 36, 1, 103, 1, 104, 2, 36, 1, 107, 1, 
+                    108, 2, 36, 1, 111, 2, 36, 1, -1, 3, 36, 1, 118, 2, 
+                    -1, 2, 36, 2, -1, 1, 121, 1, 36, 1, -1, 2, 36, 1, -1, 
+                    1, 127, 2, 36, 1, -1, 1, 36, 1, 131, 1, -1, 1, 132, 
+                    2, 36, 1, -1, 1, 137, 1, -1, 3, 36, 2, -1, 1, 36, 1, 
+                    142, 3, -1, 1, 36, 1, 144, 1, 145, 1, 146, 1, -1, 1, 
+                    36, 3, -1, 1, 148, 1, -1 )
+      EOF = unpack( 149, -1 )
+      MIN = unpack( 1, 9, 1, -1, 1, 105, 1, 109, 1, 101, 1, -1, 1, 97, 1, 
+                    105, 1, 45, 1, 99, 2, -1, 1, 34, 1, 97, 6, -1, 2, 105, 
+                    5, -1, 1, 99, 3, -1, 1, 101, 8, -1, 1, 116, 1, 120, 
+                    1, 109, 1, 108, 2, -1, 1, 79, 2, 116, 2, -1, 1, 116, 
+                    1, 97, 2, 110, 1, 99, 1, 104, 1, 108, 1, 114, 1, 116, 
+                    1, 97, 1, 105, 2, 117, 1, 97, 1, 67, 1, 105, 1, 114, 
+                    1, 101, 1, 115, 1, 100, 1, 107, 1, 97, 1, 101, 1, 102, 
+                    1, 109, 1, 108, 1, 98, 1, 110, 1, 116, 1, 105, 1, -1, 
+                    1, 67, 1, 111, 1, 105, 1, 103, 1, 115, 2, 97, 1, 116, 
+                    1, 109, 2, 97, 1, 101, 1, 108, 2, 97, 1, 114, 1, 73, 
+                    1, 110, 1, 98, 1, 111, 1, 97, 2, -1, 1, 105, 1, 101, 
+                    2, -1, 1, 97, 1, 101, 1, -1, 1, 98, 1, 101, 1, 45, 1, 
+                    97, 1, 117, 1, 114, 1, -1, 1, 111, 1, 97, 1, -1, 1, 
+                    97, 1, 108, 1, 100, 1, 65, 1, 97, 1, -1, 1, 116, 1, 
+                    121, 1, 110, 2, -1, 1, 101, 1, 97, 3, -1, 1, 101, 3, 
+                    97, 1, -1, 1, 115, 3, -1, 1, 97, 1, -1 )
+      MAX = unpack( 1, 126, 1, -1, 1, 117, 1, 109, 1, 101, 1, -1, 1, 97, 
+                    1, 105, 1, 45, 1, 116, 2, -1, 1, 39, 1, 108, 6, -1, 
+                    1, 105, 1, 111, 5, -1, 1, 101, 3, -1, 1, 105, 8, -1, 
+                    1, 116, 1, 120, 1, 109, 1, 113, 2, -1, 1, 79, 2, 116, 
+                    2, -1, 1, 116, 1, 97, 2, 110, 1, 99, 1, 104, 1, 108, 
+                    1, 114, 1, 116, 1, 97, 1, 105, 2, 117, 1, 122, 1, 67, 
+                    1, 105, 1, 114, 1, 101, 1, 115, 1, 100, 1, 107, 1, 97, 
+                    1, 101, 1, 102, 1, 109, 1, 108, 1, 98, 1, 110, 1, 116, 
+                    1, 105, 1, -1, 1, 67, 1, 111, 1, 105, 1, 103, 1, 115, 
+                    2, 122, 1, 116, 1, 109, 2, 122, 1, 101, 1, 108, 1, 122, 
+                    1, 97, 1, 114, 1, 73, 1, 110, 1, 98, 1, 111, 1, 122, 
+                    2, -1, 1, 105, 1, 101, 2, -1, 1, 122, 1, 101, 1, -1, 
+                    1, 98, 1, 101, 1, 45, 1, 122, 1, 117, 1, 114, 1, -1, 
+                    1, 111, 1, 122, 1, -1, 1, 122, 1, 108, 1, 100, 1, 76, 
+                    1, 122, 1, -1, 1, 116, 1, 121, 1, 110, 2, -1, 1, 101, 
+                    1, 122, 3, -1, 1, 101, 3, 122, 1, -1, 1, 115, 3, -1, 
+                    1, 122, 1, -1 )
+      ACCEPT = unpack( 1, -1, 1, 1, 3, -1, 1, 5, 4, -1, 1, 12, 1, 13, 2, 
+                       -1, 1, 18, 1, 19, 1, 20, 1, 21, 1, 22, 1, 23, 2, 
+                       -1, 1, 27, 1, 29, 1, 30, 1, 31, 1, 32, 1, -1, 1, 
+                       36, 1, 37, 1, 38, 1, -1, 1, 40, 1, 42, 1, 43, 1, 
+                       44, 1, 45, 1, 46, 1, 47, 1, 48, 4, -1, 1, 6, 1, 7, 
+                       3, -1, 1, 49, 1, 15, 30, -1, 1, 33, 21, -1, 1, 24, 
+                       1, 25, 2, -1, 1, 35, 1, 39, 2, -1, 1, 28, 6, -1, 
+                       1, 17, 2, -1, 1, 41, 5, -1, 1, 10, 3, -1, 1, 34, 
+                       1, 2, 2, -1, 1, 8, 1, 9, 1, 11, 4, -1, 1, 4, 1, -1, 
+                       1, 16, 1, 26, 1, 3, 1, -1, 1, 14 )
+      SPECIAL = unpack( 149, -1 )
       TRANSITION = [
-        unpack( 2, 34, 1, -1, 2, 34, 18, -1, 1, 34, 1, -1, 1, 22, 1, 14, 
-                1, -1, 1, 19, 1, 5, 1, 27, 3, -1, 1, 20, 1, -1, 1, 10, 1, 
-                11, 1, 26, 10, 33, 1, 9, 1, 25, 1, 17, 1, 12, 1, 13, 1, 
-                21, 1, 6, 2, 32, 1, 1, 8, 32, 1, 2, 11, 32, 1, 3, 2, 32, 
-                1, -1, 1, 7, 2, -1, 1, 30, 1, -1, 1, 4, 1, 31, 1, 8, 7, 
-                31, 1, 15, 1, 16, 1, 18, 4, 31, 1, 23, 1, 24, 1, 28, 6, 
-                31, 3, -1, 1, 29 ),
-        unpack( 1, 35 ),
-        unpack( 1, 36 ),
-        unpack( 1, 37 ),
-        unpack( 1, 38, 16, -1, 1, 39 ),
+        unpack( 2, 39, 1, -1, 2, 39, 18, -1, 1, 39, 1, -1, 1, 26, 1, 19, 
+                1, -1, 1, 23, 1, 10, 1, 30, 1, 34, 1, 35, 1, -1, 1, 24, 
+                1, -1, 1, 15, 1, 16, 1, 29, 10, 38, 1, 14, 1, 28, 1, 22, 
+                1, 17, 1, 18, 1, 25, 1, 11, 2, 37, 1, 6, 8, 37, 1, 7, 11, 
+                37, 1, 8, 2, 37, 1, -1, 1, 12, 2, -1, 1, 33, 1, -1, 1, 9, 
+                1, 36, 1, 13, 5, 36, 1, 3, 1, 36, 1, 20, 1, 21, 1, 2, 4, 
+                36, 1, 4, 1, 27, 1, 31, 6, 36, 1, 1, 1, -1, 1, 5, 1, 32 ),
         unpack(  ),
+        unpack( 1, 41, 11, -1, 1, 40 ),
+        unpack( 1, 42 ),
+        unpack( 1, 43 ),
         unpack(  ),
-        unpack( 1, 40, 4, -1, 1, 40 ),
-        unpack( 1, 42, 10, -1, 1, 43 ),
+        unpack( 1, 44 ),
+        unpack( 1, 45 ),
+        unpack( 1, 46 ),
+        unpack( 1, 47, 16, -1, 1, 48 ),
         unpack(  ),
         unpack(  ),
+        unpack( 1, 49, 4, -1, 1, 49 ),
+        unpack( 1, 51, 10, -1, 1, 52 ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 44 ),
-        unpack( 1, 45, 5, -1, 1, 46 ),
         unpack(  ),
-        unpack( 1, 47 ),
         unpack(  ),
+        unpack( 1, 53 ),
+        unpack( 1, 54, 5, -1, 1, 55 ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 48 ),
-        unpack( 1, 49, 1, -1, 1, 50 ),
         unpack(  ),
         unpack(  ),
+        unpack( 1, 56, 1, -1, 1, 57 ),
         unpack(  ),
-        unpack( 1, 51, 3, -1, 1, 52 ),
         unpack(  ),
         unpack(  ),
+        unpack( 1, 58, 3, -1, 1, 59 ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 53 ),
-        unpack( 1, 54 ),
-        unpack( 1, 55 ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 56 ),
-        unpack( 1, 57 ),
-        unpack( 1, 58 ),
-        unpack( 1, 59 ),
         unpack( 1, 60 ),
         unpack( 1, 61 ),
         unpack( 1, 62 ),
-        unpack( 1, 63 ),
-        unpack( 1, 64 ),
+        unpack( 1, 64, 4, -1, 1, 63 ),
+        unpack(  ),
+        unpack(  ),
         unpack( 1, 65 ),
         unpack( 1, 66 ),
         unpack( 1, 67 ),
+        unpack(  ),
+        unpack(  ),
         unpack( 1, 68 ),
         unpack( 1, 69 ),
         unpack( 1, 70 ),
@@ -1540,64 +1745,95 @@ module OCCIANTLR
         unpack( 1, 73 ),
         unpack( 1, 74 ),
         unpack( 1, 75 ),
-        unpack( 26, 31 ),
+        unpack( 1, 76 ),
         unpack( 1, 77 ),
         unpack( 1, 78 ),
         unpack( 1, 79 ),
         unpack( 1, 80 ),
-        unpack( 1, 81 ),
+        unpack( 26, 36 ),
         unpack( 1, 82 ),
         unpack( 1, 83 ),
         unpack( 1, 84 ),
         unpack( 1, 85 ),
-        unpack( 26, 31 ),
-        unpack( 26, 31 ),
+        unpack( 1, 86 ),
+        unpack( 1, 87 ),
         unpack( 1, 88 ),
         unpack( 1, 89 ),
-        unpack(  ),
         unpack( 1, 90 ),
-        unpack( 26, 31 ),
-        unpack( 26, 31 ),
+        unpack( 1, 91 ),
+        unpack( 1, 92 ),
         unpack( 1, 93 ),
         unpack( 1, 94 ),
         unpack( 1, 95 ),
         unpack( 1, 96 ),
         unpack( 1, 97 ),
-        unpack( 26, 31 ),
-        unpack(  ),
         unpack(  ),
+        unpack( 1, 98 ),
         unpack( 1, 99 ),
-        unpack( 26, 31 ),
+        unpack( 1, 100 ),
         unpack( 1, 101 ),
+        unpack( 1, 102 ),
+        unpack( 26, 36 ),
+        unpack( 26, 36 ),
+        unpack( 1, 105 ),
+        unpack( 1, 106 ),
+        unpack( 26, 36 ),
+        unpack( 26, 36 ),
+        unpack( 1, 109 ),
+        unpack( 1, 110 ),
+        unpack( 26, 36 ),
+        unpack( 1, 112 ),
+        unpack( 1, 113 ),
+        unpack( 1, 114 ),
+        unpack( 1, 115 ),
+        unpack( 1, 116 ),
+        unpack( 1, 117 ),
+        unpack( 26, 36 ),
         unpack(  ),
         unpack(  ),
-        unpack( 26, 31 ),
-        unpack( 1, 103 ),
-        unpack( 18, 31, 1, 104, 7, 31 ),
-        unpack( 1, 106 ),
-        unpack( 1, 107 ),
+        unpack( 1, 119 ),
+        unpack( 1, 120 ),
         unpack(  ),
-        unpack( 1, 108 ),
         unpack(  ),
-        unpack( 26, 31 ),
+        unpack( 26, 36 ),
+        unpack( 1, 122 ),
         unpack(  ),
-        unpack( 1, 110, 10, -1, 1, 111 ),
-        unpack( 26, 31 ),
+        unpack( 1, 123 ),
+        unpack( 1, 124 ),
+        unpack( 1, 125 ),
+        unpack( 18, 36, 1, 126, 7, 36 ),
+        unpack( 1, 128 ),
+        unpack( 1, 129 ),
         unpack(  ),
-        unpack( 1, 113 ),
-        unpack( 1, 114 ),
-        unpack( 1, 115 ),
+        unpack( 1, 130 ),
+        unpack( 26, 36 ),
         unpack(  ),
+        unpack( 26, 36 ),
+        unpack( 1, 133 ),
+        unpack( 1, 134 ),
+        unpack( 1, 135, 10, -1, 1, 136 ),
+        unpack( 26, 36 ),
         unpack(  ),
+        unpack( 1, 138 ),
+        unpack( 1, 139 ),
+        unpack( 1, 140 ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 116 ),
-        unpack( 26, 31 ),
-        unpack( 26, 31 ),
-        unpack( 1, 119 ),
+        unpack( 1, 141 ),
+        unpack( 26, 36 ),
+        unpack(  ),
+        unpack(  ),
+        unpack(  ),
+        unpack( 1, 143 ),
+        unpack( 26, 36 ),
+        unpack( 26, 36 ),
+        unpack( 26, 36 ),
+        unpack(  ),
+        unpack( 1, 147 ),
+        unpack(  ),
         unpack(  ),
         unpack(  ),
-        unpack( 26, 31 ),
+        unpack( 26, 36 ),
         unpack(  )
       ].freeze
       
@@ -1612,7 +1848,7 @@ module OCCIANTLR
 
       def description
         <<-'__dfa_description__'.strip!
-          1:1: Tokens : ( CATEGORY_KEY | LINK_KEY | X_OCCI_ATTRIBUTE_KEY | X_OCCI_LOCATION_KEY | ACTION | ACTIONS | AMPERSAND | AT | ATTRIBUTES | BACKSLASH | CATEGORY | CLASS | COLON | DASH | DOT | EQUALS | GT | HASH | KIND | LINK | LOCATION | LT | MIXIN | PERCENT | PLUS | QUESTION | QUOTE | REL | SCHEME | SELF | SEMICOLON | SLASH | SQUOTE | TERM | TILDE | TITLE | UNDERSCORE | LOALPHA | UPALPHA | DIGIT | WS | ESC );
+          1:1: Tokens : ( T__48 | T__49 | T__50 | T__51 | T__52 | CATEGORY_KEY | LINK_KEY | X_OCCI_ATTRIBUTE_KEY | X_OCCI_LOCATION_KEY | ACTION | ACTIONS | AMPERSAND | AT | ATTRIBUTES | BACKSLASH | CATEGORY | CLASS | COLON | DASH | DOT | EQUALS | GT | HASH | KIND | LINK | LOCATION | LT | MIXIN | PERCENT | PLUS | QUESTION | QUOTE | REL | SCHEME | SELF | SEMICOLON | SLASH | SQUOTE | TERM | TILDE | TITLE | UNDERSCORE | LBRACKET | RBRACKET | LOALPHA | UPALPHA | DIGIT | WS | ESC );
         __dfa_description__
       end
     end