RubyGems - sfp - Versions diffs - 0.2.1 → 0.3.4 - Mend

sfp 0.2.1 → 0.3.4

Files changed (38) hide show

data/.gitignore +1 -0
data/README.md +28 -76
data/bin/sfp +12 -78
data/lib/sfp/SfpLangLexer.rb +608 -473
data/lib/sfp/SfpLangParser.rb +4571 -4371
data/lib/sfp/Sfplib.rb +30 -20
data/lib/sfp/parser.rb +14 -6
data/lib/sfp/sas_translator.rb +3 -1
data/lib/sfp.rb +0 -5
data/sfp.gemspec +6 -12
data/src/SfpLang.g +82 -13
metadata +22 -57
data/bin/solver/linux-x86/downward +0 -0
data/bin/solver/linux-x86/preprocess +0 -0
data/bin/solver/macos/downward +0 -0
data/bin/solver/macos/preprocess +0 -0
data/lib/sfp/executor.rb +0 -207
data/lib/sfp/planner.rb +0 -482
data/lib/sfp/sas.rb +0 -966
data/test/cloud-schemas.sfp +0 -80
data/test/future/test1.sfp +0 -22
data/test/nd-cloud1.sfp +0 -33
data/test/nd-cloud2.sfp +0 -41
data/test/nd-cloud3.sfp +0 -42
data/test/nd-service1.sfp +0 -23
data/test/nd-service2.sfp +0 -27
data/test/run.sh +0 -53
data/test/s.sfp +0 -14
data/test/service-schemas.sfp +0 -151
data/test/test-module1-scripts.tgz +0 -0
data/test/test-module1.sfp +0 -20
data/test/test1.inc +0 -9
data/test/test1.sfp +0 -13
data/test/test2.sfp +0 -20
data/test/test3.inc +0 -40
data/test/test3.sfp +0 -17
data/test/test4.inc +0 -28
data/test/test4.sfp +0 -22

data/lib/sfp/SfpLangLexer.rb CHANGED Viewed

@@ -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: SfpLang.g
-# Generated at: 2013-05-06 16:26:14
+# Generated at: 2013-07-15 00:24:28
 #
 # ~~~> start load path setup
@@ -71,21 +71,22 @@ module SfpLang
                    :T__65 => 65, :T__27 => 27, :T__62 => 62, :T__26 => 26,
                    :T__63 => 63, :T__25 => 25, :T__24 => 24, :T__23 => 23,
                    :T__22 => 22, :T__21 => 21, :T__20 => 20, :OCTAL_ESC => 17,
-                   :ID => 7, :T__61 => 61, :EOF => -1, :T__60 => 60, :T__55 => 55,
+                   :ID => 6, :T__61 => 61, :EOF => -1, :T__60 => 60, :T__55 => 55,
                    :T__19 => 19, :T__56 => 56, :T__57 => 57, :T__58 => 58,
                    :ESC_SEQ => 13, :BOOLEAN => 9, :T__51 => 51, :T__52 => 52,
                    :T__18 => 18, :T__53 => 53, :T__54 => 54, :T__59 => 59,
                    :NL => 4, :COMMENT => 11, :T__50 => 50, :T__42 => 42,
                    :T__43 => 43, :T__40 => 40, :T__41 => 41, :T__46 => 46,
-                   :T__80 => 80, :T__47 => 47, :T__44 => 44, :T__45 => 45,
-                   :T__48 => 48, :T__49 => 49, :NULL => 5, :UNICODE_ESC => 16,
-                   :NUMBER => 8, :HEX_DIGIT => 15, :MULTILINE_STRING => 10,
+                   :T__80 => 80, :T__47 => 47, :T__81 => 81, :T__44 => 44,
+                   :T__82 => 82, :T__45 => 45, :T__83 => 83, :T__48 => 48,
+                   :T__49 => 49, :NULL => 8, :UNICODE_ESC => 16, :NUMBER => 7,
+                   :HEX_DIGIT => 15, :MULTILINE_STRING => 10, :T__84 => 84,
                    :T__30 => 30, :T__31 => 31, :T__32 => 32, :T__33 => 33,
                    :T__71 => 71, :WS => 12, :T__34 => 34, :T__72 => 72,
                    :T__35 => 35, :T__36 => 36, :T__70 => 70, :T__37 => 37,
                    :T__38 => 38, :T__39 => 39, :T__76 => 76, :T__75 => 75,
                    :T__74 => 74, :T__73 => 73, :T__79 => 79, :T__78 => 78,
-                   :STRING => 6, :T__77 => 77 )
+                   :STRING => 5, :T__77 => 77 )
   end
@@ -111,10 +112,10 @@ module SfpLang
                      "T__60", "T__61", "T__62", "T__63", "T__64", "T__65",
                      "T__66", "T__67", "T__68", "T__69", "T__70", "T__71",
                      "T__72", "T__73", "T__74", "T__75", "T__76", "T__77",
-                     "T__78", "T__79", "T__80", "NULL", "BOOLEAN", "ID",
-                     "NUMBER", "COMMENT", "MULTILINE_STRING", "NL", "WS",
-                     "STRING", "EXPONENT", "HEX_DIGIT", "ESC_SEQ", "OCTAL_ESC",
-                     "UNICODE_ESC" ].freeze
+                     "T__78", "T__79", "T__80", "T__81", "T__82", "T__83",
+                     "T__84", "NULL", "BOOLEAN", "ID", "NUMBER", "COMMENT",
+                     "MULTILINE_STRING", "NL", "WS", "STRING", "EXPONENT",
+                     "HEX_DIGIT", "ESC_SEQ", "OCTAL_ESC", "UNICODE_ESC" ].freeze
     RULE_METHODS = [ :t__18!, :t__19!, :t__20!, :t__21!, :t__22!, :t__23!,
                      :t__24!, :t__25!, :t__26!, :t__27!, :t__28!, :t__29!,
                      :t__30!, :t__31!, :t__32!, :t__33!, :t__34!, :t__35!,
@@ -125,10 +126,10 @@ module SfpLang
                      :t__60!, :t__61!, :t__62!, :t__63!, :t__64!, :t__65!,
                      :t__66!, :t__67!, :t__68!, :t__69!, :t__70!, :t__71!,
                      :t__72!, :t__73!, :t__74!, :t__75!, :t__76!, :t__77!,
-                     :t__78!, :t__79!, :t__80!, :null!, :boolean!, :id!,
-                     :number!, :comment!, :multiline_string!, :nl!, :ws!,
-                     :string!, :exponent!, :hex_digit!, :esc_seq!, :octal_esc!,
-                     :unicode_esc! ].freeze
+                     :t__78!, :t__79!, :t__80!, :t__81!, :t__82!, :t__83!,
+                     :t__84!, :null!, :boolean!, :id!, :number!, :comment!,
+                     :multiline_string!, :nl!, :ws!, :string!, :exponent!,
+                     :hex_digit!, :esc_seq!, :octal_esc!, :unicode_esc! ].freeze
     def initialize( input=nil, options = {} )
@@ -341,8 +342,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 15:9: 'isa'
-      match( "isa" )
+      # at line 15:9: 'final'
+      match( "final" )
       @state.type = type
@@ -365,8 +366,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 16:9: '['
-      match( 0x5b )
+      # at line 16:9: ':'
+      match( 0x3a )
       @state.type = type
@@ -389,8 +390,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 17:9: ']'
-      match( 0x5d )
+      # at line 17:9: '['
+      match( 0x5b )
       @state.type = type
@@ -413,8 +414,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 18:9: 'if'
-      match( "if" )
+      # at line 18:9: ']'
+      match( 0x5d )
       @state.type = type
@@ -437,8 +438,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 19:9: 'then'
-      match( "then" )
+      # at line 19:9: ','
+      match( 0x2c )
       @state.type = type
@@ -461,8 +462,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 20:9: 'or'
-      match( "or" )
+      # at line 20:9: 'isa'
+      match( "isa" )
       @state.type = type
@@ -485,8 +486,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 21:9: 'operator'
-      match( "operator" )
+      # at line 21:9: 'if'
+      match( "if" )
       @state.type = type
@@ -509,8 +510,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 22:9: 'cost'
-      match( "cost" )
+      # at line 22:9: 'then'
+      match( "then" )
       @state.type = type
@@ -533,8 +534,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 23:9: 'conditions'
-      match( "conditions" )
+      # at line 23:9: 'or'
+      match( "or" )
       @state.type = type
@@ -557,8 +558,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 24:9: 'condition'
-      match( "condition" )
+      # at line 24:9: 'operator'
+      match( "operator" )
       @state.type = type
@@ -581,8 +582,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 25:9: 'effects'
-      match( "effects" )
+      # at line 25:9: 'cost'
+      match( "cost" )
       @state.type = type
@@ -605,8 +606,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 26:9: 'procedure'
-      match( "procedure" )
+      # at line 26:9: 'conditions'
+      match( "conditions" )
       @state.type = type
@@ -629,8 +630,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 27:9: '('
-      match( 0x28 )
+      # at line 27:9: 'condition'
+      match( "condition" )
       @state.type = type
@@ -653,8 +654,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 28:9: ','
-      match( 0x2c )
+      # at line 28:9: 'effects'
+      match( "effects" )
       @state.type = type
@@ -677,8 +678,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 29:9: ')'
-      match( 0x29 )
+      # at line 29:9: 'procedure'
+      match( "procedure" )
       @state.type = type
@@ -701,8 +702,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 30:9: 'areall'
-      match( "areall" )
+      # at line 30:9: 'sub'
+      match( "sub" )
       @state.type = type
@@ -725,8 +726,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 31:9: 'isset'
-      match( "isset" )
+      # at line 31:9: '('
+      match( 0x28 )
       @state.type = type
@@ -749,8 +750,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 32:9: 'effect'
-      match( "effect" )
+      # at line 32:9: ')'
+      match( 0x29 )
       @state.type = type
@@ -773,8 +774,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 33:9: 'goal'
-      match( "goal" )
+      # at line 33:9: 'areall'
+      match( "areall" )
       @state.type = type
@@ -797,8 +798,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 34:9: 'constraint'
-      match( "constraint" )
+      # at line 34:9: 'isset'
+      match( "isset" )
       @state.type = type
@@ -821,8 +822,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 35:9: 'always'
-      match( "always" )
+      # at line 35:9: 'effect'
+      match( "effect" )
       @state.type = type
@@ -845,8 +846,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 36:9: 'sometime'
-      match( "sometime" )
+      # at line 36:9: 'goal'
+      match( "goal" )
       @state.type = type
@@ -869,8 +870,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 37:9: 'within'
-      match( "within" )
+      # at line 37:9: 'constraint'
+      match( "constraint" )
       @state.type = type
@@ -893,8 +894,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 38:9: 'after'
-      match( "after" )
+      # at line 38:9: 'always'
+      match( "always" )
       @state.type = type
@@ -917,8 +918,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 39:9: 'before'
-      match( "before" )
+      # at line 39:9: 'sometime'
+      match( "sometime" )
       @state.type = type
@@ -941,8 +942,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 40:9: 'foreach'
-      match( "foreach" )
+      # at line 40:9: 'within'
+      match( "within" )
       @state.type = type
@@ -965,8 +966,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 41:9: 'as'
-      match( "as" )
+      # at line 41:9: 'after'
+      match( "after" )
       @state.type = type
@@ -989,8 +990,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 42:9: 'forall'
-      match( "forall" )
+      # at line 42:9: 'before'
+      match( "before" )
       @state.type = type
@@ -1013,8 +1014,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 43:9: 'exist'
-      match( "exist" )
+      # at line 43:9: 'foreach'
+      match( "foreach" )
       @state.type = type
@@ -1037,8 +1038,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 44:9: 'forsome'
-      match( "forsome" )
+      # at line 44:9: 'as'
+      match( "as" )
       @state.type = type
@@ -1061,8 +1062,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 45:9: '='
-      match( 0x3d )
+      # at line 45:9: 'forall'
+      match( "forall" )
       @state.type = type
@@ -1085,8 +1086,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 46:9: ':different'
-      match( ":different" )
+      # at line 46:9: 'exist'
+      match( "exist" )
       @state.type = type
@@ -1109,8 +1110,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 47:9: 'not'
-      match( "not" )
+      # at line 47:9: 'forsome'
+      match( "forsome" )
       @state.type = type
@@ -1133,8 +1134,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 48:9: 'is'
-      match( "is" )
+      # at line 48:9: '='
+      match( 0x3d )
       @state.type = type
@@ -1157,8 +1158,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 49:9: 'in'
-      match( "in" )
+      # at line 49:9: ':different'
+      match( ":different" )
       @state.type = type
@@ -1181,8 +1182,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 50:9: 'isnot'
-      match( "isnot" )
+      # at line 50:9: 'not'
+      match( "not" )
       @state.type = type
@@ -1205,8 +1206,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 51:9: 'isnt'
-      match( "isnt" )
+      # at line 51:9: 'is'
+      match( "is" )
       @state.type = type
@@ -1229,8 +1230,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 52:9: 'has'
-      match( "has" )
+      # at line 52:9: 'in'
+      match( "in" )
       @state.type = type
@@ -1253,8 +1254,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 53:9: 'total('
-      match( "total(" )
+      # at line 53:9: 'isnot'
+      match( "isnot" )
       @state.type = type
@@ -1277,8 +1278,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 54:9: 'new'
-      match( "new" )
+      # at line 54:9: 'isnt'
+      match( "isnt" )
       @state.type = type
@@ -1301,8 +1302,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 55:9: 'delete'
-      match( "delete" )
+      # at line 55:9: 'has'
+      match( "has" )
       @state.type = type
@@ -1325,8 +1326,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 56:9: 'add('
-      match( "add(" )
+      # at line 56:9: 'total('
+      match( "total(" )
       @state.type = type
@@ -1349,8 +1350,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 57:9: 'remove('
-      match( "remove(" )
+      # at line 57:9: 'new'
+      match( "new" )
       @state.type = type
@@ -1373,8 +1374,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 58:9: '.'
-      match( 0x2e )
+      # at line 58:9: 'delete'
+      match( "delete" )
       @state.type = type
@@ -1397,8 +1398,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 59:9: 'isref'
-      match( "isref" )
+      # at line 59:9: 'add('
+      match( "add(" )
       @state.type = type
@@ -1421,8 +1422,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 60:9: 'either'
-      match( "either" )
+      # at line 60:9: 'remove('
+      match( "remove(" )
       @state.type = type
@@ -1445,8 +1446,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 61:9: '!='
-      match( "!=" )
+      # at line 61:9: 'any'
+      match( "any" )
       @state.type = type
@@ -1469,8 +1470,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 62:9: '+='
-      match( "+=" )
+      # at line 62:9: '.'
+      match( 0x2e )
       @state.type = type
@@ -1493,8 +1494,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 63:9: '-='
-      match( "-=" )
+      # at line 63:9: 'isref'
+      match( "isref" )
       @state.type = type
@@ -1517,8 +1518,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 64:9: '*='
-      match( "*=" )
+      # at line 64:9: 'either'
+      match( "either" )
       @state.type = type
@@ -1541,8 +1542,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 65:9: '/='
-      match( "/=" )
+      # at line 65:9: '!='
+      match( "!=" )
       @state.type = type
@@ -1565,8 +1566,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 66:9: '>'
-      match( 0x3e )
+      # at line 66:9: '+='
+      match( "+=" )
       @state.type = type
@@ -1589,8 +1590,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 67:9: '>='
-      match( ">=" )
+      # at line 67:9: '-='
+      match( "-=" )
       @state.type = type
@@ -1613,8 +1614,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 68:9: '<'
-      match( 0x3c )
+      # at line 68:9: '*='
+      match( "*=" )
       @state.type = type
@@ -1637,8 +1638,8 @@ module SfpLang
       # - - - - main rule block - - - -
-      # at line 69:9: '<='
-      match( "<=" )
+      # at line 69:9: '/='
+      match( "/=" )
       @state.type = type
@@ -1650,18 +1651,114 @@ module SfpLang
     end
+    # lexer rule t__81! (T__81)
+    # (in SfpLang.g)
+    def t__81!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 64 )
+      type = T__81
+      channel = ANTLR3::DEFAULT_CHANNEL
+      # - - - - main rule block - - - -
+      # at line 70:9: '>'
+      match( 0x3e )
+      @state.type = type
+      @state.channel = channel
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 64 )
+    end
+    # lexer rule t__82! (T__82)
+    # (in SfpLang.g)
+    def t__82!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 65 )
+      type = T__82
+      channel = ANTLR3::DEFAULT_CHANNEL
+      # - - - - main rule block - - - -
+      # at line 71:9: '>='
+      match( ">=" )
+      @state.type = type
+      @state.channel = channel
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 65 )
+    end
+    # lexer rule t__83! (T__83)
+    # (in SfpLang.g)
+    def t__83!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 66 )
+      type = T__83
+      channel = ANTLR3::DEFAULT_CHANNEL
+      # - - - - main rule block - - - -
+      # at line 72:9: '<'
+      match( 0x3c )
+      @state.type = type
+      @state.channel = channel
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 66 )
+    end
+    # lexer rule t__84! (T__84)
+    # (in SfpLang.g)
+    def t__84!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in( __method__, 67 )
+      type = T__84
+      channel = ANTLR3::DEFAULT_CHANNEL
+      # - - - - main rule block - - - -
+      # at line 73:9: '<='
+      match( "<=" )
+      @state.type = type
+      @state.channel = channel
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out( __method__, 67 )
+    end
     # lexer rule null! (NULL)
     # (in SfpLang.g)
     def null!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 64 )
+      # trace_in( __method__, 68 )
       type = NULL
       channel = ANTLR3::DEFAULT_CHANNEL
       # - - - - main rule block - - - -
-      # at line 960:2: ( 'null' | 'nil' )
+      # at line 1029:2: ( 'null' | 'nil' )
       alt_1 = 2
       look_1_0 = @input.peek( 1 )
@@ -1680,11 +1777,11 @@ module SfpLang
       end
       case alt_1
       when 1
-        # at line 960:4: 'null'
+        # at line 1029:4: 'null'
         match( "null" )
       when 2
-        # at line 961:4: 'nil'
+        # at line 1030:4: 'nil'
         match( "nil" )
       end
@@ -1694,7 +1791,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 64 )
+      # trace_out( __method__, 68 )
     end
@@ -1702,14 +1799,14 @@ module SfpLang
     # (in SfpLang.g)
     def boolean!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 65 )
+      # trace_in( __method__, 69 )
       type = BOOLEAN
       channel = ANTLR3::DEFAULT_CHANNEL
       # - - - - main rule block - - - -
-      # at line 965:2: ( 'true' | 'false' | 'off' | 'on' | 'yes' | 'no' )
+      # at line 1034:2: ( 'true' | 'false' | 'off' | 'on' | 'yes' | 'no' )
       alt_2 = 6
       case look_2 = @input.peek( 1 )
       when 0x74 then alt_2 = 1
@@ -1730,27 +1827,27 @@ module SfpLang
       end
       case alt_2
       when 1
-        # at line 965:4: 'true'
+        # at line 1034:4: 'true'
         match( "true" )
       when 2
-        # at line 966:4: 'false'
+        # at line 1035:4: 'false'
         match( "false" )
       when 3
-        # at line 967:4: 'off'
+        # at line 1036:4: 'off'
         match( "off" )
       when 4
-        # at line 968:4: 'on'
+        # at line 1037:4: 'on'
         match( "on" )
       when 5
-        # at line 969:4: 'yes'
+        # at line 1038:4: 'yes'
         match( "yes" )
       when 6
-        # at line 970:4: 'no'
+        # at line 1039:4: 'no'
         match( "no" )
       end
@@ -1760,7 +1857,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 65 )
+      # trace_out( __method__, 69 )
     end
@@ -1768,14 +1865,14 @@ module SfpLang
     # (in SfpLang.g)
     def id!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 66 )
+      # trace_in( __method__, 70 )
       type = ID
       channel = ANTLR3::DEFAULT_CHANNEL
       # - - - - main rule block - - - -
-      # at line 973:6: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '-' )*
+      # at line 1042:6: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '-' )*
       if @input.peek( 1 ).between?( 0x41, 0x5a ) || @input.peek( 1 ).between?( 0x61, 0x7a )
         @input.consume
       else
@@ -1785,7 +1882,7 @@ module SfpLang
       end
-      # at line 973:26: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '-' )*
+      # at line 1042:26: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '-' )*
       while true # decision 3
         alt_3 = 2
         look_3_0 = @input.peek( 1 )
@@ -1818,7 +1915,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 66 )
+      # trace_out( __method__, 70 )
     end
@@ -1826,15 +1923,15 @@ module SfpLang
     # (in SfpLang.g)
     def number!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 67 )
+      # trace_in( __method__, 71 )
       type = NUMBER
       channel = ANTLR3::DEFAULT_CHANNEL
       # - - - - main rule block - - - -
-      # at line 977:4: ( '-' )? ( '0' .. '9' )+
-      # at line 977:4: ( '-' )?
+      # at line 1046:4: ( '-' )? ( '0' .. '9' )+
+      # at line 1046:4: ( '-' )?
       alt_4 = 2
       look_4_0 = @input.peek( 1 )
@@ -1843,11 +1940,11 @@ module SfpLang
       end
       case alt_4
       when 1
-        # at line 977:4: '-'
+        # at line 1046:4: '-'
         match( 0x2d )
       end
-      # at file 977:8: ( '0' .. '9' )+
+      # at file 1046:8: ( '0' .. '9' )+
       match_count_5 = 0
       while true
         alt_5 = 2
@@ -1859,7 +1956,7 @@ module SfpLang
         end
         case alt_5
         when 1
-          # at line 977:9: '0' .. '9'
+          # at line 1046:9: '0' .. '9'
           match_range( 0x30, 0x39 )
         else
@@ -1879,7 +1976,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 67 )
+      # trace_out( __method__, 71 )
     end
@@ -1887,14 +1984,14 @@ module SfpLang
     # (in SfpLang.g)
     def comment!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 68 )
+      # trace_in( __method__, 72 )
       type = COMMENT
       channel = ANTLR3::DEFAULT_CHANNEL
       # - - - - main rule block - - - -
-      # at line 988:2: ( '//' (~ ( '\\n' | '\\r' ) )* | '#' (~ ( '\\n' | '\\r' ) )* | '/*' ( options {greedy=false; } : . )* '*/' )
+      # at line 1057:2: ( '//' (~ ( '\\n' | '\\r' ) )* | '#' (~ ( '\\n' | '\\r' ) )* | '/*' ( options {greedy=false; } : . )* '*/' )
       alt_9 = 3
       look_9_0 = @input.peek( 1 )
@@ -1915,9 +2012,9 @@ module SfpLang
       end
       case alt_9
       when 1
-        # at line 988:4: '//' (~ ( '\\n' | '\\r' ) )*
+        # at line 1057:4: '//' (~ ( '\\n' | '\\r' ) )*
         match( "//" )
-        # at line 988:9: (~ ( '\\n' | '\\r' ) )*
+        # at line 1057:9: (~ ( '\\n' | '\\r' ) )*
         while true # decision 6
           alt_6 = 2
           look_6_0 = @input.peek( 1 )
@@ -1928,7 +2025,7 @@ module SfpLang
           end
           case alt_6
           when 1
-            # at line 988:9: ~ ( '\\n' | '\\r' )
+            # at line 1057:9: ~ ( '\\n' | '\\r' )
             if @input.peek( 1 ).between?( 0x0, 0x9 ) || @input.peek( 1 ).between?( 0xb, 0xc ) || @input.peek( 1 ).between?( 0xe, 0xff )
               @input.consume
             else
@@ -1948,9 +2045,9 @@ module SfpLang
         # <-- action
       when 2
-        # at line 989:4: '#' (~ ( '\\n' | '\\r' ) )*
+        # at line 1058:4: '#' (~ ( '\\n' | '\\r' ) )*
         match( 0x23 )
-        # at line 989:8: (~ ( '\\n' | '\\r' ) )*
+        # at line 1058:8: (~ ( '\\n' | '\\r' ) )*
         while true # decision 7
           alt_7 = 2
           look_7_0 = @input.peek( 1 )
@@ -1961,7 +2058,7 @@ module SfpLang
           end
           case alt_7
           when 1
-            # at line 989:8: ~ ( '\\n' | '\\r' )
+            # at line 1058:8: ~ ( '\\n' | '\\r' )
             if @input.peek( 1 ).between?( 0x0, 0x9 ) || @input.peek( 1 ).between?( 0xb, 0xc ) || @input.peek( 1 ).between?( 0xe, 0xff )
               @input.consume
             else
@@ -1981,9 +2078,9 @@ module SfpLang
         # <-- action
       when 3
-        # at line 990:4: '/*' ( options {greedy=false; } : . )* '*/'
+        # at line 1059:4: '/*' ( options {greedy=false; } : . )* '*/'
         match( "/*" )
-        # at line 990:9: ( options {greedy=false; } : . )*
+        # at line 1059:9: ( options {greedy=false; } : . )*
         while true # decision 8
           alt_8 = 2
           look_8_0 = @input.peek( 1 )
@@ -2003,7 +2100,7 @@ module SfpLang
           end
           case alt_8
           when 1
-            # at line 990:37: .
+            # at line 1059:37: .
             match_any
           else
@@ -2022,7 +2119,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 68 )
+      # trace_out( __method__, 72 )
     end
@@ -2030,16 +2127,16 @@ module SfpLang
     # (in SfpLang.g)
     def multiline_string!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 69 )
+      # trace_in( __method__, 73 )
       type = MULTILINE_STRING
       channel = ANTLR3::DEFAULT_CHANNEL
       # - - - - main rule block - - - -
-      # at line 994:4: 'r\"' ( options {greedy=false; } : . )* '\"'
+      # at line 1063:4: 'r\"' ( options {greedy=false; } : . )* '\"'
       match( "r\"" )
-      # at line 994:9: ( options {greedy=false; } : . )*
+      # at line 1063:9: ( options {greedy=false; } : . )*
       while true # decision 10
         alt_10 = 2
         look_10_0 = @input.peek( 1 )
@@ -2052,7 +2149,7 @@ module SfpLang
         end
         case alt_10
         when 1
-          # at line 994:37: .
+          # at line 1063:37: .
           match_any
         else
@@ -2067,7 +2164,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 69 )
+      # trace_out( __method__, 73 )
     end
@@ -2075,15 +2172,15 @@ module SfpLang
     # (in SfpLang.g)
     def nl!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 70 )
+      # trace_in( __method__, 74 )
       type = NL
       channel = ANTLR3::DEFAULT_CHANNEL
       # - - - - main rule block - - - -
-      # at line 997:6: ( '\\r' )? '\\n'
-      # at line 997:6: ( '\\r' )?
+      # at line 1066:6: ( '\\r' )? '\\n'
+      # at line 1066:6: ( '\\r' )?
       alt_11 = 2
       look_11_0 = @input.peek( 1 )
@@ -2092,7 +2189,7 @@ module SfpLang
       end
       case alt_11
       when 1
-        # at line 997:6: '\\r'
+        # at line 1066:6: '\\r'
         match( 0xd )
       end
@@ -2104,7 +2201,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 70 )
+      # trace_out( __method__, 74 )
     end
@@ -2112,14 +2209,14 @@ module SfpLang
     # (in SfpLang.g)
     def ws!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 71 )
+      # trace_in( __method__, 75 )
       type = WS
       channel = ANTLR3::DEFAULT_CHANNEL
       # - - - - main rule block - - - -
-      # at line 1000:8: ( ' ' | '\\t' )
+      # at line 1069:8: ( ' ' | '\\t' )
       if @input.peek(1) == 0x9 || @input.peek(1) == 0x20
         @input.consume
       else
@@ -2139,7 +2236,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 71 )
+      # trace_out( __method__, 75 )
     end
@@ -2147,16 +2244,16 @@ module SfpLang
     # (in SfpLang.g)
     def string!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 72 )
+      # trace_in( __method__, 76 )
       type = STRING
       channel = ANTLR3::DEFAULT_CHANNEL
       # - - - - main rule block - - - -
-      # at line 1004:5: '\"' ( ESC_SEQ | ~ ( '\\\\' | '\"' ) )* '\"'
+      # at line 1073:5: '\"' ( ESC_SEQ | ~ ( '\\\\' | '\"' ) )* '\"'
       match( 0x22 )
-      # at line 1004:9: ( ESC_SEQ | ~ ( '\\\\' | '\"' ) )*
+      # at line 1073:9: ( ESC_SEQ | ~ ( '\\\\' | '\"' ) )*
       while true # decision 12
         alt_12 = 3
         look_12_0 = @input.peek( 1 )
@@ -2169,11 +2266,11 @@ module SfpLang
         end
         case alt_12
         when 1
-          # at line 1004:11: ESC_SEQ
+          # at line 1073:11: ESC_SEQ
           esc_seq!
         when 2
-          # at line 1004:21: ~ ( '\\\\' | '\"' )
+          # at line 1073:21: ~ ( '\\\\' | '\"' )
           if @input.peek( 1 ).between?( 0x0, 0x21 ) || @input.peek( 1 ).between?( 0x23, 0x5b ) || @input.peek( 1 ).between?( 0x5d, 0xff )
             @input.consume
           else
@@ -2196,7 +2293,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 72 )
+      # trace_out( __method__, 76 )
     end
@@ -2204,11 +2301,11 @@ module SfpLang
     # (in SfpLang.g)
     def exponent!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 73 )
+      # trace_in( __method__, 77 )
       # - - - - main rule block - - - -
-      # at line 1008:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+      # at line 1077:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
       if @input.peek(1) == 0x45 || @input.peek(1) == 0x65
         @input.consume
       else
@@ -2218,7 +2315,7 @@ module SfpLang
       end
-      # at line 1008:22: ( '+' | '-' )?
+      # at line 1077:22: ( '+' | '-' )?
       alt_13 = 2
       look_13_0 = @input.peek( 1 )
@@ -2239,7 +2336,7 @@ module SfpLang
       end
-      # at file 1008:33: ( '0' .. '9' )+
+      # at file 1077:33: ( '0' .. '9' )+
       match_count_14 = 0
       while true
         alt_14 = 2
@@ -2251,7 +2348,7 @@ module SfpLang
         end
         case alt_14
         when 1
-          # at line 1008:34: '0' .. '9'
+          # at line 1077:34: '0' .. '9'
           match_range( 0x30, 0x39 )
         else
@@ -2267,7 +2364,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 73 )
+      # trace_out( __method__, 77 )
     end
@@ -2275,11 +2372,11 @@ module SfpLang
     # (in SfpLang.g)
     def hex_digit!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 74 )
+      # trace_in( __method__, 78 )
       # - - - - main rule block - - - -
-      # at line 1011:13: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+      # at line 1080:13: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
       if @input.peek( 1 ).between?( 0x30, 0x39 ) || @input.peek( 1 ).between?( 0x41, 0x46 ) || @input.peek( 1 ).between?( 0x61, 0x66 )
         @input.consume
       else
@@ -2292,7 +2389,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 74 )
+      # trace_out( __method__, 78 )
     end
@@ -2300,11 +2397,11 @@ module SfpLang
     # (in SfpLang.g)
     def esc_seq!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 75 )
+      # trace_in( __method__, 79 )
       # - - - - main rule block - - - -
-      # at line 1015:2: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
+      # at line 1084:2: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
       alt_15 = 3
       look_15_0 = @input.peek( 1 )
@@ -2321,7 +2418,7 @@ module SfpLang
       end
       case alt_15
       when 1
-        # at line 1015:6: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+        # at line 1084:6: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
         match( 0x5c )
         if @input.peek(1) == 0x22 || @input.peek(1) == 0x27 || @input.peek(1) == 0x5c || @input.peek(1) == 0x62 || @input.peek(1) == 0x66 || @input.peek(1) == 0x6e || @input.peek(1) == 0x72 || @input.peek(1) == 0x74
           @input.consume
@@ -2334,17 +2431,17 @@ module SfpLang
       when 2
-        # at line 1016:6: UNICODE_ESC
+        # at line 1085:6: UNICODE_ESC
         unicode_esc!
       when 3
-        # at line 1017:6: OCTAL_ESC
+        # at line 1086:6: OCTAL_ESC
         octal_esc!
       end
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 75 )
+      # trace_out( __method__, 79 )
     end
@@ -2352,11 +2449,11 @@ module SfpLang
     # (in SfpLang.g)
     def octal_esc!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 76 )
+      # trace_in( __method__, 80 )
       # - - - - main rule block - - - -
-      # at line 1022:2: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+      # at line 1091:2: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
       alt_16 = 3
       look_16_0 = @input.peek( 1 )
@@ -2393,45 +2490,45 @@ module SfpLang
       end
       case alt_16
       when 1
-        # at line 1022:6: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+        # at line 1091:6: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
         match( 0x5c )
-        # at line 1022:11: ( '0' .. '3' )
-        # at line 1022:12: '0' .. '3'
+        # at line 1091:11: ( '0' .. '3' )
+        # at line 1091:12: '0' .. '3'
         match_range( 0x30, 0x33 )
-        # at line 1022:22: ( '0' .. '7' )
-        # at line 1022:23: '0' .. '7'
+        # at line 1091:22: ( '0' .. '7' )
+        # at line 1091:23: '0' .. '7'
         match_range( 0x30, 0x37 )
-        # at line 1022:33: ( '0' .. '7' )
-        # at line 1022:34: '0' .. '7'
+        # at line 1091:33: ( '0' .. '7' )
+        # at line 1091:34: '0' .. '7'
         match_range( 0x30, 0x37 )
       when 2
-        # at line 1023:6: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+        # at line 1092:6: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
         match( 0x5c )
-        # at line 1023:11: ( '0' .. '7' )
-        # at line 1023:12: '0' .. '7'
+        # at line 1092:11: ( '0' .. '7' )
+        # at line 1092:12: '0' .. '7'
         match_range( 0x30, 0x37 )
-        # at line 1023:22: ( '0' .. '7' )
-        # at line 1023:23: '0' .. '7'
+        # at line 1092:22: ( '0' .. '7' )
+        # at line 1092:23: '0' .. '7'
         match_range( 0x30, 0x37 )
       when 3
-        # at line 1024:6: '\\\\' ( '0' .. '7' )
+        # at line 1093:6: '\\\\' ( '0' .. '7' )
         match( 0x5c )
-        # at line 1024:11: ( '0' .. '7' )
-        # at line 1024:12: '0' .. '7'
+        # at line 1093:11: ( '0' .. '7' )
+        # at line 1093:12: '0' .. '7'
         match_range( 0x30, 0x37 )
       end
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 76 )
+      # trace_out( __method__, 80 )
     end
@@ -2439,11 +2536,11 @@ module SfpLang
     # (in SfpLang.g)
     def unicode_esc!
       # -> uncomment the next line to manually enable rule tracing
-      # trace_in( __method__, 77 )
+      # trace_in( __method__, 81 )
       # - - - - main rule block - - - -
-      # at line 1029:6: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+      # at line 1098:6: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
       match( 0x5c )
       match( 0x75 )
       hex_digit!
@@ -2453,7 +2550,7 @@ module SfpLang
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out( __method__, 77 )
+      # trace_out( __method__, 81 )
     end
@@ -2465,8 +2562,8 @@ module SfpLang
     # but instead use the next_token method, which will
     # build and emit the actual next token
     def token!
-      # at line 1:8: ( T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | NULL | BOOLEAN | ID | NUMBER | COMMENT | MULTILINE_STRING | NL | WS | STRING )
-      alt_17 = 72
+      # at line 1:8: ( T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | NULL | BOOLEAN | ID | NUMBER | COMMENT | MULTILINE_STRING | NL | WS | STRING )
+      alt_17 = 76
       alt_17 = @dfa17.predict( @input )
       case alt_17
       when 1
@@ -2722,39 +2819,55 @@ module SfpLang
         t__80!
       when 64
-        # at line 1:388: NULL
-        null!
+        # at line 1:388: T__81
+        t__81!
       when 65
-        # at line 1:393: BOOLEAN
-        boolean!
+        # at line 1:394: T__82
+        t__82!
       when 66
-        # at line 1:401: ID
-        id!
+        # at line 1:400: T__83
+        t__83!
       when 67
-        # at line 1:404: NUMBER
-        number!
+        # at line 1:406: T__84
+        t__84!
       when 68
-        # at line 1:411: COMMENT
-        comment!
+        # at line 1:412: NULL
+        null!
       when 69
-        # at line 1:419: MULTILINE_STRING
-        multiline_string!
+        # at line 1:417: BOOLEAN
+        boolean!
       when 70
-        # at line 1:436: NL
-        nl!
+        # at line 1:425: ID
+        id!
       when 71
-        # at line 1:439: WS
-        ws!
+        # at line 1:428: NUMBER
+        number!
       when 72
-        # at line 1:442: STRING
+        # at line 1:435: COMMENT
+        comment!
+      when 73
+        # at line 1:443: MULTILINE_STRING
+        multiline_string!
+      when 74
+        # at line 1:460: NL
+        nl!
+      when 75
+        # at line 1:463: WS
+        ws!
+      when 76
+        # at line 1:466: STRING
         string!
       end
@@ -2763,148 +2876,154 @@ module SfpLang
     # - - - - - - - - - - DFA definitions - - - - - - - - - - -
     class DFA17 < ANTLR3::DFA
-      EOT = unpack( 1, -1, 2, 35, 2, -1, 2, 35, 2, -1, 3, 35, 3, -1, 5,
-                    35, 2, -1, 4, 35, 6, -1, 1, 81, 1, 83, 1, 35, 6, -1,
-                    1, 86, 1, 91, 1, 92, 11, 35, 1, 107, 2, 35, 1, 110,
-                    4, 35, 1, 115, 6, 35, 1, 110, 6, 35, 7, -1, 2, 35, 1,
-                    -1, 1, 131, 3, 35, 2, -1, 14, 35, 1, -1, 1, 35, 1, 110,
-                    1, -1, 4, 35, 1, -1, 6, 35, 1, 164, 1, 165, 1, 35, 1,
-                    167, 1, 168, 2, 35, 1, 110, 1, 35, 1, -1, 2, 35, 1,
-                    174, 5, 35, 1, 180, 7, 35, 1, 188, 1, 35, 1, 110, 5,
-                    35, 1, -1, 1, 195, 6, 35, 2, -1, 1, 167, 2, -1, 3, 35,
-                    1, 205, 1, 206, 1, -1, 1, 207, 1, 208, 3, 35, 1, -1,
-                    2, 35, 1, 214, 1, 35, 1, 216, 2, 35, 1, -1, 5, 35, 1,
-                    224, 1, -1, 5, 35, 1, 110, 3, 35, 4, -1, 1, 233, 4,
-                    35, 1, -1, 1, 35, 1, -1, 1, 240, 1, 241, 1, -1, 2, 35,
-                    1, 244, 1, 245, 1, -1, 1, 246, 1, 247, 1, 35, 1, 249,
-                    1, 35, 1, 251, 1, 35, 1, 253, 1, -1, 4, 35, 1, 258,
-                    1, 259, 2, -1, 2, 35, 4, -1, 1, 262, 1, -1, 1, 263,
-                    3, -1, 1, 264, 3, 35, 2, -1, 1, 268, 1, 35, 3, -1, 1,
-                    270, 1, 272, 1, 35, 1, -1, 1, 274, 1, -1, 1, 275, 1,
-                    -1, 1, 276, 3, -1 )
-      EOF = unpack( 277, -1 )
-      MIN = unpack( 1, 9, 1, 102, 1, 99, 2, -1, 1, 108, 1, 102, 2, -1, 1,
-                    104, 1, 102, 1, 114, 3, -1, 1, 100, 1, 111, 1, 105,
-                    1, 101, 1, 97, 2, -1, 1, 101, 1, 97, 1, 101, 1, 34,
-                    3, -1, 1, 48, 1, -1, 1, 42, 2, 61, 1, 101, 6, -1, 3,
-                    45, 1, 97, 1, 104, 2, 109, 1, 97, 1, 105, 1, 102, 1,
-                    116, 1, 101, 1, 116, 1, 117, 1, 45, 1, 101, 1, 102,
-                    1, 45, 1, 111, 1, 101, 1, 119, 1, 116, 1, 45, 1, 100,
-                    1, 97, 1, 116, 1, 102, 1, 114, 1, 108, 1, 45, 1, 119,
-                    2, 108, 1, 115, 1, 108, 1, 109, 7, -1, 1, 115, 1, 108,
-                    1, -1, 1, 45, 1, 101, 1, 111, 1, 101, 2, -1, 1, 116,
-                    2, 101, 1, 112, 1, 116, 1, 100, 1, 115, 1, 101, 1, 115,
-                    1, 101, 1, 104, 1, 110, 1, 97, 1, 101, 1, -1, 1, 114,
-                    1, 45, 1, -1, 1, 99, 2, 97, 1, 101, 1, -1, 1, 40, 1,
-                    108, 1, 104, 1, 111, 1, 97, 1, 115, 2, 45, 1, 108, 2,
+      EOT = unpack( 1, -1, 2, 35, 2, -1, 3, 35, 1, 57, 3, -1, 3, 35, 2,
+                    -1, 4, 35, 1, -1, 4, 35, 6, -1, 1, 86, 1, 88, 1, 35,
+                    6, -1, 1, 91, 1, 96, 1, 97, 12, 35, 2, -1, 3, 35, 1,
+                    116, 2, 35, 1, 119, 4, 35, 1, 124, 5, 35, 1, 119, 6,
+                    35, 7, -1, 2, 35, 1, -1, 1, 139, 3, 35, 2, -1, 2, 35,
+                    1, 146, 15, 35, 1, -1, 1, 35, 1, 119, 1, -1, 4, 35,
+                    1, -1, 1, 35, 1, 171, 3, 35, 1, 175, 1, 176, 1, 35,
+                    1, 178, 1, 179, 2, 35, 1, 119, 1, 35, 1, -1, 2, 35,
+                    1, 185, 3, 35, 1, -1, 2, 35, 1, 191, 12, 35, 1, 204,
+                    1, 35, 1, 119, 5, 35, 2, -1, 1, 211, 2, 35, 2, -1, 1,
+                    178, 2, -1, 3, 35, 1, 217, 1, 218, 1, -1, 1, 219, 1,
+                    220, 3, 35, 1, -1, 2, 35, 1, 226, 1, 35, 1, 228, 2,
+                    35, 1, 231, 3, 35, 1, 119, 1, -1, 5, 35, 1, 240, 1,
+                    -1, 5, 35, 4, -1, 1, 246, 4, 35, 1, -1, 1, 35, 1, -1,
+                    1, 253, 1, 254, 1, -1, 1, 35, 1, 256, 1, 35, 1, -1,
+                    2, 35, 1, 260, 1, 261, 1, -1, 1, 262, 1, 263, 1, 264,
+                    1, 35, 1, 266, 1, -1, 4, 35, 1, 271, 1, 272, 2, -1,
+                    1, 273, 1, -1, 1, 274, 2, 35, 7, -1, 1, 277, 3, 35,
+                    4, -1, 1, 281, 1, 35, 1, -1, 1, 283, 1, 285, 1, 35,
+                    1, -1, 1, 287, 1, -1, 1, 288, 1, -1, 1, 289, 3, -1 )
+      EOF = unpack( 290, -1 )
+      MIN = unpack( 1, 9, 1, 102, 1, 99, 2, -1, 1, 108, 1, 102, 1, 97, 1,
+                    100, 3, -1, 1, 104, 1, 102, 1, 114, 2, -1, 1, 100, 1,
+                    111, 1, 105, 1, 101, 1, -1, 1, 101, 1, 97, 1, 101, 1,
+                    34, 3, -1, 1, 48, 1, -1, 1, 42, 2, 61, 1, 101, 6, -1,
+                    3, 45, 1, 97, 1, 104, 1, 98, 2, 109, 1, 97, 1, 105,
+                    1, 102, 1, 116, 1, 110, 1, 114, 1, 108, 2, -1, 1, 101,
+                    1, 116, 1, 117, 1, 45, 1, 101, 1, 102, 1, 45, 1, 111,
+                    1, 101, 1, 119, 1, 116, 1, 45, 1, 100, 1, 121, 1, 97,
+                    1, 116, 1, 102, 1, 45, 1, 119, 2, 108, 1, 115, 1, 108,
+                    1, 109, 7, -1, 1, 115, 1, 108, 1, -1, 1, 45, 1, 101,
+                    1, 111, 1, 101, 2, -1, 1, 116, 1, 101, 1, 45, 1, 101,
+                    1, 112, 1, 116, 1, 100, 1, 115, 1, 101, 1, 115, 1, 101,
+                    1, 104, 2, 97, 1, 115, 1, 110, 1, 97, 1, 101, 1, -1,
+                    1, 114, 1, 45, 1, -1, 1, 99, 2, 97, 1, 101, 1, -1, 1,
+                    40, 1, 45, 1, 108, 1, 104, 1, 111, 2, 45, 1, 108, 2,
                     45, 1, 101, 1, 111, 1, 45, 1, 117, 1, -1, 2, 116, 1,
-                    45, 1, 102, 1, 101, 1, 109, 1, 116, 1, 111, 1, 45, 1,
-                    105, 1, 116, 1, 115, 1, 110, 1, 116, 1, 99, 1, 101,
-                    1, 45, 1, 108, 1, 45, 1, 97, 1, 101, 1, 108, 1, 121,
-                    1, 114, 1, -1, 1, 45, 1, 105, 1, 114, 1, 97, 1, 108,
-                    1, 111, 1, 101, 2, -1, 1, 45, 2, -1, 1, 116, 1, 118,
-                    1, 100, 2, 45, 1, -1, 2, 45, 1, 97, 1, 105, 1, 115,
-                    1, -1, 1, 116, 1, 114, 1, 45, 1, 100, 1, 45, 1, 116,
-                    1, 114, 1, -1, 1, 40, 1, 116, 1, 100, 1, 108, 1, 115,
-                    1, 45, 1, -1, 1, 110, 1, 101, 1, 99, 1, 108, 1, 109,
-                    1, 45, 3, 101, 4, -1, 1, 45, 1, 109, 2, 105, 1, 97,
-                    1, -1, 1, 115, 1, -1, 2, 45, 1, -1, 1, 111, 1, 117,
-                    2, 45, 1, -1, 2, 45, 1, 104, 1, 45, 1, 101, 1, 45, 1,
-                    40, 1, 45, 1, -1, 1, 101, 1, 116, 1, 111, 1, 105, 2,
-                    45, 2, -1, 2, 114, 4, -1, 1, 45, 1, -1, 1, 45, 3, -1,
-                    1, 45, 1, 101, 2, 110, 2, -1, 1, 45, 1, 101, 3, -1,
+                    45, 1, 102, 1, 101, 1, 109, 1, -1, 1, 116, 1, 111, 1,
+                    45, 1, 105, 1, 116, 1, 115, 1, 110, 1, 116, 1, 99, 1,
+                    101, 1, 108, 1, 97, 1, 108, 1, 111, 1, 101, 1, 45, 1,
+                    108, 1, 45, 1, 97, 1, 101, 1, 108, 1, 121, 1, 114, 2,
+                    -1, 1, 45, 1, 105, 1, 114, 2, -1, 1, 45, 2, -1, 1, 116,
+                    1, 118, 1, 100, 2, 45, 1, -1, 2, 45, 1, 97, 1, 105,
+                    1, 115, 1, -1, 1, 116, 1, 114, 1, 45, 1, 100, 1, 45,
+                    1, 116, 1, 114, 1, 45, 1, 99, 1, 108, 1, 109, 1, 45,
+                    1, -1, 1, 40, 1, 116, 1, 100, 1, 108, 1, 115, 1, 45,
+                    1, -1, 1, 110, 4, 101, 4, -1, 1, 45, 1, 109, 2, 105,
+                    1, 97, 1, -1, 1, 115, 1, -1, 2, 45, 1, -1, 1, 104, 1,
+                    45, 1, 101, 1, -1, 1, 111, 1, 117, 2, 45, 1, -1, 3,
+                    45, 1, 40, 1, 45, 1, -1, 1, 101, 1, 116, 1, 111, 1,
+                    105, 2, 45, 2, -1, 1, 45, 1, -1, 1, 45, 2, 114, 7, -1,
+                    1, 45, 1, 101, 2, 110, 4, -1, 1, 45, 1, 101, 1, -1,
                     2, 45, 1, 116, 1, -1, 1, 45, 1, -1, 1, 45, 1, -1, 1,
                     45, 3, -1 )
-      MAX = unpack( 1, 125, 1, 115, 1, 116, 2, -1, 1, 111, 1, 120, 2, -1,
-                    3, 114, 3, -1, 1, 115, 1, 111, 1, 105, 1, 101, 1, 111,
-                    2, -1, 1, 117, 1, 97, 2, 101, 3, -1, 1, 61, 1, -1, 3,
-                    61, 1, 101, 6, -1, 3, 122, 1, 97, 1, 104, 1, 109, 1,
-                    115, 1, 97, 1, 116, 1, 102, 1, 116, 1, 101, 1, 116,
-                    1, 117, 1, 122, 1, 101, 1, 102, 1, 122, 1, 111, 1, 101,
-                    1, 119, 1, 116, 1, 122, 1, 100, 1, 97, 1, 116, 1, 102,
-                    1, 114, 1, 108, 1, 122, 1, 119, 2, 108, 1, 115, 1, 108,
-                    1, 109, 7, -1, 1, 115, 1, 108, 1, -1, 1, 122, 1, 101,
-                    1, 116, 1, 101, 2, -1, 1, 116, 2, 101, 1, 112, 1, 116,
-                    2, 115, 1, 101, 1, 115, 1, 101, 1, 104, 1, 110, 1, 97,
-                    1, 101, 1, -1, 1, 114, 1, 122, 1, -1, 1, 99, 2, 97,
-                    1, 101, 1, -1, 1, 40, 1, 108, 1, 104, 1, 111, 2, 115,
-                    2, 122, 1, 108, 2, 122, 1, 101, 1, 111, 1, 122, 1, 117,
-                    1, -1, 2, 116, 1, 122, 1, 102, 1, 101, 1, 109, 1, 116,
-                    1, 111, 1, 122, 1, 105, 1, 116, 1, 115, 1, 110, 1, 116,
-                    1, 99, 1, 101, 1, 122, 1, 108, 1, 122, 1, 97, 1, 101,
-                    1, 108, 1, 121, 1, 114, 1, -1, 1, 122, 1, 105, 1, 114,
-                    1, 97, 1, 108, 1, 111, 1, 101, 2, -1, 1, 122, 2, -1,
-                    1, 116, 1, 118, 1, 100, 2, 122, 1, -1, 2, 122, 1, 97,
-                    1, 105, 1, 115, 1, -1, 1, 116, 1, 114, 1, 122, 1, 100,
-                    1, 122, 1, 116, 1, 114, 1, -1, 1, 40, 1, 116, 1, 100,
-                    1, 108, 1, 115, 1, 122, 1, -1, 1, 110, 1, 101, 1, 99,
-                    1, 108, 1, 109, 1, 122, 3, 101, 4, -1, 1, 122, 1, 109,
-                    2, 105, 1, 97, 1, -1, 1, 115, 1, -1, 2, 122, 1, -1,
-                    1, 111, 1, 117, 2, 122, 1, -1, 2, 122, 1, 104, 1, 122,
-                    1, 101, 1, 122, 1, 40, 1, 122, 1, -1, 1, 101, 1, 116,
-                    1, 111, 1, 105, 2, 122, 2, -1, 2, 114, 4, -1, 1, 122,
-                    1, -1, 1, 122, 3, -1, 1, 122, 1, 101, 2, 110, 2, -1,
-                    1, 122, 1, 101, 3, -1, 2, 122, 1, 116, 1, -1, 1, 122,
-                    1, -1, 1, 122, 1, -1, 1, 122, 3, -1 )
-      ACCEPT = unpack( 3, -1, 1, 3, 1, 4, 2, -1, 1, 10, 1, 11, 3, -1, 1,
-                       21, 1, 22, 1, 23, 5, -1, 1, 39, 1, 40, 4, -1, 1,
-                       52, 1, 55, 1, 56, 1, -1, 1, 58, 4, -1, 1, 66, 1,
-                       67, 1, 68, 1, 70, 1, 71, 1, 72, 36, -1, 1, 69, 1,
-                       57, 1, 59, 1, 61, 1, 60, 1, 63, 1, 62, 2, -1, 1,
-                       43, 4, -1, 1, 42, 1, 12, 14, -1, 1, 14, 2, -1, 1,
-                       65, 4, -1, 1, 35, 15, -1, 1, 9, 24, -1, 1, 50, 7,
-                       -1, 1, 41, 1, 48, 1, -1, 1, 64, 1, 46, 5, -1, 1,
-                       45, 5, -1, 1, 16, 7, -1, 1, 13, 6, -1, 1, 27, 9,
-                       -1, 1, 25, 1, 44, 1, 53, 1, 2, 5, -1, 1, 6, 1, -1,
-                       1, 37, 2, -1, 1, 47, 4, -1, 1, 32, 8, -1, 1, 7, 6,
-                       -1, 1, 26, 1, 54, 2, -1, 1, 24, 1, 29, 1, 31, 1,
-                       33, 1, -1, 1, 36, 1, -1, 1, 49, 1, 51, 1, 1, 4, -1,
-                       1, 8, 1, 19, 2, -1, 1, 34, 1, 38, 1, 30, 3, -1, 1,
-                       15, 1, -1, 1, 5, 1, -1, 1, 18, 1, -1, 1, 20, 1, 17,
-                       1, 28 )
-      SPECIAL = unpack( 277, -1 )
+      MAX = unpack( 1, 125, 1, 115, 1, 117, 2, -1, 1, 111, 1, 120, 1, 111,
+                    1, 100, 3, -1, 3, 114, 2, -1, 1, 115, 1, 111, 1, 105,
+                    1, 101, 1, -1, 1, 117, 1, 97, 2, 101, 3, -1, 1, 61,
+                    1, -1, 3, 61, 1, 101, 6, -1, 3, 122, 1, 97, 1, 104,
+                    1, 98, 1, 109, 1, 115, 1, 97, 1, 116, 1, 102, 1, 116,
+                    1, 110, 1, 114, 1, 108, 2, -1, 1, 101, 1, 116, 1, 117,
+                    1, 122, 1, 101, 1, 102, 1, 122, 1, 111, 1, 101, 1, 119,
+                    1, 116, 1, 122, 1, 100, 1, 121, 1, 97, 1, 116, 1, 102,
+                    1, 122, 1, 119, 2, 108, 1, 115, 1, 108, 1, 109, 7, -1,
+                    1, 115, 1, 108, 1, -1, 1, 122, 1, 101, 1, 116, 1, 101,
+                    2, -1, 1, 116, 1, 101, 1, 122, 1, 101, 1, 112, 1, 116,
+                    2, 115, 1, 101, 1, 115, 1, 101, 1, 104, 1, 97, 2, 115,
+                    1, 110, 1, 97, 1, 101, 1, -1, 1, 114, 1, 122, 1, -1,
+                    1, 99, 2, 97, 1, 101, 1, -1, 1, 40, 1, 122, 1, 108,
+                    1, 104, 1, 111, 2, 122, 1, 108, 2, 122, 1, 101, 1, 111,
+                    1, 122, 1, 117, 1, -1, 2, 116, 1, 122, 1, 102, 1, 101,
+                    1, 109, 1, -1, 1, 116, 1, 111, 1, 122, 1, 105, 1, 116,
+                    1, 115, 1, 110, 1, 116, 1, 99, 1, 101, 1, 108, 1, 97,
+                    1, 108, 1, 111, 1, 101, 1, 122, 1, 108, 1, 122, 1, 97,
+                    1, 101, 1, 108, 1, 121, 1, 114, 2, -1, 1, 122, 1, 105,
+                    1, 114, 2, -1, 1, 122, 2, -1, 1, 116, 1, 118, 1, 100,
+                    2, 122, 1, -1, 2, 122, 1, 97, 1, 105, 1, 115, 1, -1,
+                    1, 116, 1, 114, 1, 122, 1, 100, 1, 122, 1, 116, 1, 114,
+                    1, 122, 1, 99, 1, 108, 1, 109, 1, 122, 1, -1, 1, 40,
+                    1, 116, 1, 100, 1, 108, 1, 115, 1, 122, 1, -1, 1, 110,
+                    4, 101, 4, -1, 1, 122, 1, 109, 2, 105, 1, 97, 1, -1,
+                    1, 115, 1, -1, 2, 122, 1, -1, 1, 104, 1, 122, 1, 101,
+                    1, -1, 1, 111, 1, 117, 2, 122, 1, -1, 3, 122, 1, 40,
+                    1, 122, 1, -1, 1, 101, 1, 116, 1, 111, 1, 105, 2, 122,
+                    2, -1, 1, 122, 1, -1, 1, 122, 2, 114, 7, -1, 1, 122,
+                    1, 101, 2, 110, 4, -1, 1, 122, 1, 101, 1, -1, 2, 122,
+                    1, 116, 1, -1, 1, 122, 1, -1, 1, 122, 1, -1, 1, 122,
+                    3, -1 )
+      ACCEPT = unpack( 3, -1, 1, 3, 1, 4, 4, -1, 1, 11, 1, 12, 1, 13, 3,
+                       -1, 1, 25, 1, 26, 4, -1, 1, 42, 4, -1, 1, 56, 1,
+                       59, 1, 60, 1, -1, 1, 62, 4, -1, 1, 70, 1, 71, 1,
+                       72, 1, 74, 1, 75, 1, 76, 15, -1, 1, 43, 1, 10, 24,
+                       -1, 1, 73, 1, 61, 1, 63, 1, 65, 1, 64, 1, 67, 1,
+                       66, 2, -1, 1, 46, 4, -1, 1, 45, 1, 15, 18, -1, 1,
+                       17, 2, -1, 1, 69, 4, -1, 1, 38, 14, -1, 1, 14, 6,
+                       -1, 1, 24, 23, -1, 1, 53, 1, 55, 3, -1, 1, 44, 1,
+                       51, 1, -1, 1, 68, 1, 49, 5, -1, 1, 48, 5, -1, 1,
+                       19, 12, -1, 1, 16, 6, -1, 1, 30, 5, -1, 1, 28, 1,
+                       47, 1, 57, 1, 2, 5, -1, 1, 6, 1, -1, 1, 40, 2, -1,
+                       1, 9, 3, -1, 1, 50, 4, -1, 1, 35, 5, -1, 1, 7, 6,
+                       -1, 1, 29, 1, 58, 1, -1, 1, 39, 3, -1, 1, 27, 1,
+                       32, 1, 34, 1, 36, 1, 52, 1, 54, 1, 1, 4, -1, 1, 8,
+                       1, 22, 1, 37, 1, 41, 2, -1, 1, 33, 3, -1, 1, 18,
+                       1, -1, 1, 5, 1, -1, 1, 21, 1, -1, 1, 23, 1, 20, 1,
+                       31 )
+      SPECIAL = unpack( 290, -1 )
       TRANSITION = [
         unpack( 1, 39, 1, 38, 2, -1, 1, 38, 18, -1, 1, 39, 1, 27, 1, 40,
-                1, 37, 4, -1, 1, 12, 1, 14, 1, 30, 1, 28, 1, 13, 1, 29,
-                1, 26, 1, 31, 10, 36, 1, 21, 1, -1, 1, 33, 1, 20, 1, 32,
-                2, -1, 26, 35, 1, 7, 1, -1, 1, 8, 3, -1, 1, 15, 1, 18, 1,
-                5, 1, 24, 1, 6, 1, 19, 1, 16, 1, 23, 1, 1, 4, 35, 1, 22,
-                1, 10, 1, 11, 1, 35, 1, 25, 1, 2, 1, 9, 2, 35, 1, 17, 1,
+                1, 37, 4, -1, 1, 15, 1, 16, 1, 30, 1, 28, 1, 11, 1, 29,
+                1, 26, 1, 31, 10, 36, 1, 8, 1, -1, 1, 33, 1, 21, 1, 32,
+                2, -1, 26, 35, 1, 9, 1, -1, 1, 10, 3, -1, 1, 17, 1, 20,
+                1, 5, 1, 24, 1, 6, 1, 7, 1, 18, 1, 23, 1, 1, 4, 35, 1, 22,
+                1, 13, 1, 14, 1, 35, 1, 25, 1, 2, 1, 12, 2, 35, 1, 19, 1,
                 35, 1, 34, 1, 35, 1, 3, 1, -1, 1, 4 ),
         unpack( 1, 43, 7, -1, 1, 41, 4, -1, 1, 42 ),
-        unpack( 1, 45, 11, -1, 1, 46, 4, -1, 1, 44 ),
+        unpack( 1, 45, 11, -1, 1, 47, 4, -1, 1, 44, 1, 46 ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 48, 2, -1, 1, 47 ),
-        unpack( 1, 50, 2, -1, 1, 51, 14, -1, 1, 49 ),
+        unpack( 1, 49, 2, -1, 1, 48 ),
+        unpack( 1, 51, 2, -1, 1, 52, 14, -1, 1, 50 ),
+        unpack( 1, 55, 7, -1, 1, 53, 5, -1, 1, 54 ),
+        unpack( 1, 56 ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 52, 6, -1, 1, 53, 2, -1, 1, 54 ),
-        unpack( 1, 57, 7, -1, 1, 58, 1, -1, 1, 56, 1, -1, 1, 55 ),
-        unpack( 1, 59 ),
         unpack(  ),
-        unpack(  ),
-        unpack(  ),
-        unpack( 1, 64, 1, -1, 1, 62, 5, -1, 1, 61, 5, -1, 1, 60, 1, 63 ),
+        unpack( 1, 58, 6, -1, 1, 59, 2, -1, 1, 60 ),
+        unpack( 1, 63, 7, -1, 1, 64, 1, -1, 1, 62, 1, -1, 1, 61 ),
         unpack( 1, 65 ),
-        unpack( 1, 66 ),
-        unpack( 1, 67 ),
-        unpack( 1, 69, 13, -1, 1, 68 ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 71, 3, -1, 1, 73, 5, -1, 1, 70, 5, -1, 1, 72 ),
+        unpack( 1, 70, 1, -1, 1, 68, 5, -1, 1, 67, 1, -1, 1, 71, 3, -1,
+                 1, 66, 1, 69 ),
+        unpack( 1, 72 ),
+        unpack( 1, 73 ),
         unpack( 1, 74 ),
-        unpack( 1, 75 ),
-        unpack( 1, 77, 66, -1, 1, 76 ),
         unpack(  ),
+        unpack( 1, 76, 3, -1, 1, 78, 5, -1, 1, 75, 5, -1, 1, 77 ),
+        unpack( 1, 79 ),
+        unpack( 1, 80 ),
+        unpack( 1, 82, 66, -1, 1, 81 ),
         unpack(  ),
         unpack(  ),
-        unpack( 10, 36, 3, -1, 1, 78 ),
         unpack(  ),
-        unpack( 1, 37, 4, -1, 1, 37, 13, -1, 1, 79 ),
-        unpack( 1, 80 ),
-        unpack( 1, 82 ),
-        unpack( 1, 84 ),
+        unpack( 10, 36, 3, -1, 1, 83 ),
+        unpack(  ),
+        unpack( 1, 37, 4, -1, 1, 37, 13, -1, 1, 84 ),
+        unpack( 1, 85 ),
+        unpack( 1, 87 ),
+        unpack( 1, 89 ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
@@ -2912,48 +3031,53 @@ module SfpLang
         unpack(  ),
         unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 2, 35, 1, 85, 23, 35 ),
+                 2, 35, 1, 90, 23, 35 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 1, 87, 12, 35, 1, 89, 3, 35, 1, 90, 1, 88, 7, 35 ),
+                 1, 92, 12, 35, 1, 94, 3, 35, 1, 95, 1, 93, 7, 35 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 93 ),
-        unpack( 1, 94 ),
-        unpack( 1, 95 ),
-        unpack( 1, 96, 1, 98, 4, -1, 1, 97 ),
+        unpack( 1, 98 ),
         unpack( 1, 99 ),
-        unpack( 1, 101, 10, -1, 1, 100 ),
-        unpack( 1, 102 ),
-        unpack( 1, 103 ),
-        unpack( 1, 104 ),
+        unpack( 1, 100 ),
+        unpack( 1, 101 ),
+        unpack( 1, 102, 1, 104, 4, -1, 1, 103 ),
         unpack( 1, 105 ),
-        unpack( 1, 106 ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 26, 35 ),
+        unpack( 1, 107, 10, -1, 1, 106 ),
         unpack( 1, 108 ),
         unpack( 1, 109 ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 26, 35 ),
+        unpack( 1, 110 ),
         unpack( 1, 111 ),
         unpack( 1, 112 ),
+        unpack(  ),
+        unpack(  ),
         unpack( 1, 113 ),
         unpack( 1, 114 ),
+        unpack( 1, 115 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 116 ),
         unpack( 1, 117 ),
         unpack( 1, 118 ),
-        unpack( 1, 119 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
         unpack( 1, 120 ),
         unpack( 1, 121 ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 19, 35, 1, 122, 6, 35 ),
+        unpack( 1, 122 ),
         unpack( 1, 123 ),
-        unpack( 1, 124 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
         unpack( 1, 125 ),
         unpack( 1, 126 ),
         unpack( 1, 127 ),
         unpack( 1, 128 ),
+        unpack( 1, 129 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 19, 35, 1, 130, 6, 35 ),
+        unpack( 1, 131 ),
+        unpack( 1, 132 ),
+        unpack( 1, 133 ),
+        unpack( 1, 134 ),
+        unpack( 1, 135 ),
+        unpack( 1, 136 ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
@@ -2961,201 +3085,206 @@ module SfpLang
         unpack(  ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 129 ),
-        unpack( 1, 130 ),
+        unpack( 1, 137 ),
+        unpack( 1, 138 ),
         unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 132 ),
-        unpack( 1, 133, 4, -1, 1, 134 ),
-        unpack( 1, 135 ),
-        unpack(  ),
-        unpack(  ),
-        unpack( 1, 136 ),
-        unpack( 1, 137 ),
-        unpack( 1, 138 ),
-        unpack( 1, 139 ),
         unpack( 1, 140 ),
-        unpack( 1, 141, 14, -1, 1, 142 ),
+        unpack( 1, 141, 4, -1, 1, 142 ),
         unpack( 1, 143 ),
+        unpack(  ),
+        unpack(  ),
         unpack( 1, 144 ),
         unpack( 1, 145 ),
-        unpack( 1, 146 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
         unpack( 1, 147 ),
         unpack( 1, 148 ),
         unpack( 1, 149 ),
-        unpack( 1, 150 ),
-        unpack(  ),
-        unpack( 1, 151 ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 26, 35 ),
-        unpack(  ),
+        unpack( 1, 150, 14, -1, 1, 151 ),
         unpack( 1, 152 ),
         unpack( 1, 153 ),
         unpack( 1, 154 ),
         unpack( 1, 155 ),
-        unpack(  ),
         unpack( 1, 156 ),
         unpack( 1, 157 ),
-        unpack( 1, 158 ),
-        unpack( 1, 159 ),
-        unpack( 1, 161, 3, -1, 1, 160, 13, -1, 1, 162 ),
+        unpack( 1, 159, 3, -1, 1, 158, 13, -1, 1, 160 ),
+        unpack( 1, 161 ),
+        unpack( 1, 162 ),
         unpack( 1, 163 ),
+        unpack( 1, 164 ),
+        unpack(  ),
+        unpack( 1, 165 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 26, 35 ),
+        unpack(  ),
         unpack( 1, 166 ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 26, 35 ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 26, 35 ),
+        unpack( 1, 167 ),
+        unpack( 1, 168 ),
         unpack( 1, 169 ),
+        unpack(  ),
         unpack( 1, 170 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 171 ),
-        unpack(  ),
         unpack( 1, 172 ),
         unpack( 1, 173 ),
+        unpack( 1, 174 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 175 ),
-        unpack( 1, 176 ),
         unpack( 1, 177 ),
-        unpack( 1, 178 ),
-        unpack( 1, 179 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
+        unpack( 1, 180 ),
         unpack( 1, 181 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
         unpack( 1, 182 ),
+        unpack(  ),
         unpack( 1, 183 ),
         unpack( 1, 184 ),
-        unpack( 1, 185 ),
-        unpack( 1, 186 ),
-        unpack( 1, 187 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 186 ),
+        unpack( 1, 187 ),
+        unpack( 1, 188 ),
+        unpack(  ),
         unpack( 1, 189 ),
+        unpack( 1, 190 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 190 ),
-        unpack( 1, 191 ),
         unpack( 1, 192 ),
         unpack( 1, 193 ),
         unpack( 1, 194 ),
-        unpack(  ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 26, 35 ),
+        unpack( 1, 195 ),
         unpack( 1, 196 ),
         unpack( 1, 197 ),
         unpack( 1, 198 ),
         unpack( 1, 199 ),
         unpack( 1, 200 ),
         unpack( 1, 201 ),
-        unpack(  ),
-        unpack(  ),
+        unpack( 1, 202 ),
+        unpack( 1, 203 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 205 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
+        unpack( 1, 206 ),
+        unpack( 1, 207 ),
+        unpack( 1, 208 ),
+        unpack( 1, 209 ),
+        unpack( 1, 210 ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 202 ),
-        unpack( 1, 203 ),
-        unpack( 1, 204 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 212 ),
+        unpack( 1, 213 ),
+        unpack(  ),
+        unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
         unpack(  ),
+        unpack(  ),
+        unpack( 1, 214 ),
+        unpack( 1, 215 ),
+        unpack( 1, 216 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 209 ),
-        unpack( 1, 210 ),
-        unpack( 1, 211 ),
         unpack(  ),
-        unpack( 1, 212 ),
-        unpack( 1, 213 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 215 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 217 ),
-        unpack( 1, 218 ),
-        unpack(  ),
-        unpack( 1, 219 ),
-        unpack( 1, 220 ),
         unpack( 1, 221 ),
         unpack( 1, 222 ),
         unpack( 1, 223 ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 26, 35 ),
         unpack(  ),
+        unpack( 1, 224 ),
         unpack( 1, 225 ),
-        unpack( 1, 226 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
         unpack( 1, 227 ),
-        unpack( 1, 228 ),
-        unpack( 1, 229 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 229 ),
         unpack( 1, 230 ),
-        unpack( 1, 231 ),
-        unpack( 1, 232 ),
-        unpack(  ),
-        unpack(  ),
-        unpack(  ),
-        unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 232 ),
+        unpack( 1, 233 ),
         unpack( 1, 234 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
+        unpack(  ),
         unpack( 1, 235 ),
         unpack( 1, 236 ),
         unpack( 1, 237 ),
-        unpack(  ),
         unpack( 1, 238 ),
-        unpack(  ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 18, 35, 1, 239, 7, 35 ),
+        unpack( 1, 239 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
         unpack(  ),
+        unpack( 1, 241 ),
         unpack( 1, 242 ),
         unpack( 1, 243 ),
+        unpack( 1, 244 ),
+        unpack( 1, 245 ),
+        unpack(  ),
+        unpack(  ),
+        unpack(  ),
+        unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 247 ),
+        unpack( 1, 248 ),
+        unpack( 1, 249 ),
+        unpack( 1, 250 ),
+        unpack(  ),
+        unpack( 1, 251 ),
+        unpack(  ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 18, 35, 1, 252, 7, 35 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
         unpack(  ),
+        unpack( 1, 255 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 257 ),
+        unpack(  ),
+        unpack( 1, 258 ),
+        unpack( 1, 259 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 248 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 250 ),
+        unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 252 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack(  ),
-        unpack( 1, 254 ),
-        unpack( 1, 255 ),
-        unpack( 1, 256 ),
-        unpack( 1, 257 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 265 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
         unpack(  ),
-        unpack(  ),
-        unpack( 1, 260 ),
-        unpack( 1, 261 ),
-        unpack(  ),
-        unpack(  ),
+        unpack( 1, 267 ),
+        unpack( 1, 268 ),
+        unpack( 1, 269 ),
+        unpack( 1, 270 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
         unpack(  ),
         unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
@@ -3163,27 +3292,33 @@ module SfpLang
         unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
+        unpack( 1, 275 ),
+        unpack( 1, 276 ),
+        unpack(  ),
+        unpack(  ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
-        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 26, 35 ),
-        unpack( 1, 265 ),
-        unpack( 1, 266 ),
-        unpack( 1, 267 ),
         unpack(  ),
         unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
-        unpack( 1, 269 ),
+        unpack( 1, 278 ),
+        unpack( 1, 279 ),
+        unpack( 1, 280 ),
+        unpack(  ),
         unpack(  ),
         unpack(  ),
         unpack(  ),
+        unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
+                 26, 35 ),
+        unpack( 1, 282 ),
+        unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
-                 18, 35, 1, 271, 7, 35 ),
-        unpack( 1, 273 ),
+                 18, 35, 1, 284, 7, 35 ),
+        unpack( 1, 286 ),
         unpack(  ),
         unpack( 1, 35, 2, -1, 10, 35, 7, -1, 26, 35, 4, -1, 1, 35, 1, -1,
                  26, 35 ),
@@ -3209,7 +3344,7 @@ module SfpLang
       def description
         <<-'__dfa_description__'.strip!
-          1:1: Tokens : ( T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | NULL | BOOLEAN | ID | NUMBER | COMMENT | MULTILINE_STRING | NL | WS | STRING );
+          1:1: Tokens : ( T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | NULL | BOOLEAN | ID | NUMBER | COMMENT | MULTILINE_STRING | NL | WS | STRING );
         __dfa_description__
       end
     end