sfp 0.3.22 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44ac56c90eaec6ecac630620c665b638f9ffab39
-  data.tar.gz: aac76d92cb369a72ad935ac24ca33b06a93aa117
+  metadata.gz: 5aaa593d3387a397e9ec0ca4a44adfa88016ff00
+  data.tar.gz: 443fa1844bef24bb4c1ded0822d0519d600d481c
 SHA512:
-  metadata.gz: c629e6db9ab2eee74150378093b3890ce34697e6ab7a0480e34d2025eae72f5af4bfa5e17f834e90ef3cbbdafc7d8f54e043009a48e44d35b3273e013cc27cfb
-  data.tar.gz: 15e5d8e43c6c660ea6c2cfc4e8c47509714d111e95fad1b528e3bb27ec6a90a981bdfa22d45a5247d4ef3cb685be34b4a85c359890d8d5af950937281d15df66
+  metadata.gz: 721a5319c5ede930324912678407614473f1fdcf2014c00f3622069f1c04e9ec3881e63bcd6a1fb4a8351924d67475c9a0e0d258217d9915572c517e5b7cb2d8
+  data.tar.gz: eb70b081e1d8618e7de550ab06001b77c6beb5cbc89e90a9c87d84b08dac57c8b194cf4c31c15ff8cc3684537650fbd9fd62bd1cb69687f65f8ec004df9e8a3a

data/VERSION

@@ -1 +1 @@
-0.3.22
+0.4.1

data/lib/sfp/SfpLangLexer.rb

@@ -5,7 +5,7 @@
 # Generated using ANTLR version: 3.5
 # Ruby runtime library version: 1.10.0
 # Input grammar file: SfpLang.g
-# Generated at: 2013-11-14 11:25:20
+# Generated at: 2013-12-19 16:23:36
 #
 
 # ~~~> start load path setup
@@ -2041,7 +2041,7 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 996:2: ( 'null' | 'nil' )
+      # at line 1000:2: ( 'null' | 'nil' )
       alt_1 = 2
       look_1_0 = @input.peek( 1 )
 
@@ -2062,12 +2062,12 @@ module SfpLang
       end
       case alt_1
       when 1
-        # at line 996:4: 'null'
+        # at line 1000:4: 'null'
         match( "null" )
 
 
       when 2
-        # at line 997:4: 'nil'
+        # at line 1001:4: 'nil'
         match( "nil" )
 
 
@@ -2096,7 +2096,7 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1001:2: ( 'true' | 'false' | 'off' | 'on' | 'yes' | 'no' )
+      # at line 1005:2: ( 'true' | 'false' | 'off' | 'on' | 'yes' | 'no' )
       alt_2 = 6
       case look_2 = @input.peek( 1 )
       when 0x74 then alt_2 = 1
@@ -2119,32 +2119,32 @@ module SfpLang
       end
       case alt_2
       when 1
-        # at line 1001:4: 'true'
+        # at line 1005:4: 'true'
         match( "true" )
 
 
       when 2
-        # at line 1002:4: 'false'
+        # at line 1006:4: 'false'
         match( "false" )
 
 
       when 3
-        # at line 1003:4: 'off'
+        # at line 1007:4: 'off'
         match( "off" )
 
 
       when 4
-        # at line 1004:4: 'on'
+        # at line 1008:4: 'on'
         match( "on" )
 
 
       when 5
-        # at line 1005:4: 'yes'
+        # at line 1009:4: 'yes'
         match( "yes" )
 
 
       when 6
-        # at line 1006:4: 'no'
+        # at line 1010:4: 'no'
         match( "no" )
 
 
@@ -2173,7 +2173,7 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1009:6: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )*
+      # at line 1013: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
@@ -2184,7 +2184,7 @@ module SfpLang
       end
 
 
-      # at line 1009:25: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )*
+      # at line 1013:25: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )*
       while true # decision 3
         alt_3 = 2
         look_3_0 = @input.peek( 1 )
@@ -2237,8 +2237,8 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1013:4: ( '-' )? ( '0' .. '9' )+
-      # at line 1013:4: ( '-' )?
+      # at line 1017:4: ( '-' )? ( '0' .. '9' )+
+      # at line 1017:4: ( '-' )?
       alt_4 = 2
       look_4_0 = @input.peek( 1 )
 
@@ -2247,11 +2247,11 @@ module SfpLang
       end
       case alt_4
       when 1
-        # at line 1013:4: '-'
+        # at line 1017:4: '-'
         match( 0x2d )
 
       end
-      # at file 1013:8: ( '0' .. '9' )+
+      # at file 1017:8: ( '0' .. '9' )+
       match_count_5 = 0
       while true
         alt_5 = 2
@@ -2311,7 +2311,7 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1024:2: ( '//' (~ ( '\\n' | '\\r' ) )* | '#' (~ ( '\\n' | '\\r' ) )* | '/*' ( options {greedy=false; } : . )* '*/' )
+      # at line 1028:2: ( '//' (~ ( '\\n' | '\\r' ) )* | '#' (~ ( '\\n' | '\\r' ) )* | '/*' ( options {greedy=false; } : . )* '*/' )
       alt_9 = 3
       look_9_0 = @input.peek( 1 )
 
@@ -2334,10 +2334,10 @@ module SfpLang
       end
       case alt_9
       when 1
-        # at line 1024:4: '//' (~ ( '\\n' | '\\r' ) )*
+        # at line 1028:4: '//' (~ ( '\\n' | '\\r' ) )*
         match( "//" )
 
-        # at line 1024:9: (~ ( '\\n' | '\\r' ) )*
+        # at line 1028:9: (~ ( '\\n' | '\\r' ) )*
         while true # decision 6
           alt_6 = 2
           look_6_0 = @input.peek( 1 )
@@ -2372,9 +2372,9 @@ module SfpLang
 
 
       when 2
-        # at line 1025:4: '#' (~ ( '\\n' | '\\r' ) )*
+        # at line 1029:4: '#' (~ ( '\\n' | '\\r' ) )*
         match( 0x23 )
-        # at line 1025:8: (~ ( '\\n' | '\\r' ) )*
+        # at line 1029:8: (~ ( '\\n' | '\\r' ) )*
         while true # decision 7
           alt_7 = 2
           look_7_0 = @input.peek( 1 )
@@ -2409,10 +2409,10 @@ module SfpLang
 
 
       when 3
-        # at line 1026:4: '/*' ( options {greedy=false; } : . )* '*/'
+        # at line 1030:4: '/*' ( options {greedy=false; } : . )* '*/'
         match( "/*" )
 
-        # at line 1026:9: ( options {greedy=false; } : . )*
+        # at line 1030:9: ( options {greedy=false; } : . )*
         while true # decision 8
           alt_8 = 2
           look_8_0 = @input.peek( 1 )
@@ -2432,7 +2432,7 @@ module SfpLang
           end
           case alt_8
           when 1
-            # at line 1026:37: .
+            # at line 1030:37: .
             match_any
 
           else
@@ -2474,10 +2474,10 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1030:4: 'r\"' ( options {greedy=false; } : . )* '\"'
+      # at line 1034:4: 'r\"' ( options {greedy=false; } : . )* '\"'
       match( "r\"" )
 
-      # at line 1030:9: ( options {greedy=false; } : . )*
+      # at line 1034:9: ( options {greedy=false; } : . )*
       while true # decision 10
         alt_10 = 2
         look_10_0 = @input.peek( 1 )
@@ -2490,7 +2490,7 @@ module SfpLang
         end
         case alt_10
         when 1
-          # at line 1030:37: .
+          # at line 1034:37: .
           match_any
 
         else
@@ -2524,8 +2524,8 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1033:6: ( ( '\\r' )? '\\n' | ';' )
-      # at line 1033:6: ( ( '\\r' )? '\\n' | ';' )
+      # at line 1037:6: ( ( '\\r' )? '\\n' | ';' )
+      # at line 1037:6: ( ( '\\r' )? '\\n' | ';' )
       alt_12 = 2
       look_12_0 = @input.peek( 1 )
 
@@ -2539,8 +2539,8 @@ module SfpLang
       end
       case alt_12
       when 1
-        # at line 1033:7: ( '\\r' )? '\\n'
-        # at line 1033:7: ( '\\r' )?
+        # at line 1037:7: ( '\\r' )? '\\n'
+        # at line 1037:7: ( '\\r' )?
         alt_11 = 2
         look_11_0 = @input.peek( 1 )
 
@@ -2549,14 +2549,14 @@ module SfpLang
         end
         case alt_11
         when 1
-          # at line 1033:7: '\\r'
+          # at line 1037:7: '\\r'
           match( 0xd )
 
         end
         match( 0xa )
 
       when 2
-        # at line 1033:18: ';'
+        # at line 1037:18: ';'
         match( 0x3b )
 
       end
@@ -2585,7 +2585,7 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1036:8: ( ' ' | '\\t' )
+      # at line 1040:8: ( ' ' | '\\t' )
       if @input.peek(1) == 0x9 || @input.peek(1) == 0x20
         @input.consume
       else
@@ -2626,9 +2626,9 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1040:5: '\"' ( ESC_SEQ |~ ( '\\\\' | '\"' ) )* '\"'
+      # at line 1044:5: '\"' ( ESC_SEQ |~ ( '\\\\' | '\"' ) )* '\"'
       match( 0x22 )
-      # at line 1040:9: ( ESC_SEQ |~ ( '\\\\' | '\"' ) )*
+      # at line 1044:9: ( ESC_SEQ |~ ( '\\\\' | '\"' ) )*
       while true # decision 13
         alt_13 = 3
         look_13_0 = @input.peek( 1 )
@@ -2641,12 +2641,12 @@ module SfpLang
         end
         case alt_13
         when 1
-          # at line 1040:11: ESC_SEQ
+          # at line 1044:11: ESC_SEQ
           esc_seq!
 
 
         when 2
-          # at line 1040:21: ~ ( '\\\\' | '\"' )
+          # at line 1044:21: ~ ( '\\\\' | '\"' )
           if @input.peek( 1 ).between?( 0x0, 0x21 ) || @input.peek( 1 ).between?( 0x23, 0x5b ) || @input.peek( 1 ).between?( 0x5d, 0xff )
             @input.consume
           else
@@ -2686,7 +2686,7 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1045:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+      # at line 1049:12: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
       if @input.peek(1) == 0x45 || @input.peek(1) == 0x65
         @input.consume
       else
@@ -2697,7 +2697,7 @@ module SfpLang
       end
 
 
-      # at line 1045:22: ( '+' | '-' )?
+      # at line 1049:22: ( '+' | '-' )?
       alt_14 = 2
       look_14_0 = @input.peek( 1 )
 
@@ -2719,7 +2719,7 @@ module SfpLang
 
 
       end
-      # at file 1045:33: ( '0' .. '9' )+
+      # at file 1049:33: ( '0' .. '9' )+
       match_count_15 = 0
       while true
         alt_15 = 2
@@ -2803,7 +2803,7 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1052:2: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
+      # at line 1056:2: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
       alt_16 = 3
       look_16_0 = @input.peek( 1 )
 
@@ -2822,7 +2822,7 @@ module SfpLang
       end
       case alt_16
       when 1
-        # at line 1052:6: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+        # at line 1056: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
@@ -2836,12 +2836,12 @@ module SfpLang
 
 
       when 2
-        # at line 1053:6: UNICODE_ESC
+        # at line 1057:6: UNICODE_ESC
         unicode_esc!
 
 
       when 3
-        # at line 1054:6: OCTAL_ESC
+        # at line 1058:6: OCTAL_ESC
         octal_esc!
 
 
@@ -2864,7 +2864,7 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1059:2: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+      # at line 1063:2: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
       alt_17 = 3
       look_17_0 = @input.peek( 1 )
 
@@ -2906,7 +2906,7 @@ module SfpLang
       end
       case alt_17
       when 1
-        # at line 1059:6: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+        # at line 1063:6: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
         match( 0x5c )
         if @input.peek( 1 ).between?( 0x30, 0x33 )
           @input.consume
@@ -2940,7 +2940,7 @@ module SfpLang
 
 
       when 2
-        # at line 1060:6: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+        # at line 1064:6: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
         match( 0x5c )
         if @input.peek( 1 ).between?( 0x30, 0x37 )
           @input.consume
@@ -2964,7 +2964,7 @@ module SfpLang
 
 
       when 3
-        # at line 1061:6: '\\\\' ( '0' .. '7' )
+        # at line 1065:6: '\\\\' ( '0' .. '7' )
         match( 0x5c )
         if @input.peek( 1 ).between?( 0x30, 0x37 )
           @input.consume
@@ -2996,7 +2996,7 @@ module SfpLang
 
 
       # - - - - main rule block - - - -
-      # at line 1066:6: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+      # at line 1070:6: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
       match( 0x5c )
       match( 0x75 )
 

data/lib/sfp/SfpLangParser.rb

@@ -5,7 +5,7 @@
 # Generated using ANTLR version: 3.5
 # Ruby runtime library version: 1.10.0
 # Input grammar file: SfpLang.g
-# Generated at: 2013-11-14 11:25:17
+# Generated at: 2013-12-19 16:23:34
 #
 
 # ~~~> start load path setup
@@ -2064,15 +2064,19 @@ module SfpLang
         # --> action
 
         			template = @root.at?(( path68 && @input.to_s( path68.start, path68.stop ) ))
-        			raise Exception, "Object template #{( path68 && @input.to_s( path68.start, path68.stop ) )} is not found!" if
-        				template.is_a?(Sfp::Unknown) or template.is_a?(Sfp::Undefined)
-        			raise Exception, "#{( path68 && @input.to_s( path68.start, path68.stop ) )} is not an object!" if
-        				!template.is_a?(Hash) or template['_context'] != 'object'
-        			@now[__ID66__.text] = Sfp::Helper.deep_clone(template)
-        			@now[__ID66__.text].accept(Sfp::Visitor::ParentEliminator.new)
-        			@now[__ID66__.text]['_parent'] = @now
-        			@now[__ID66__.text]['_self'] = __ID66__.text
-        			@now[__ID66__.text].accept(Sfp::Visitor::SfpGenerator.new(@root))
+        			if template.is_a?(Sfp::Unknown) or template.is_a?(Sfp::Undefined)
+        				raise Exception, "Object template #{( path68 && @input.to_s( path68.start, path68.stop ) )} is not found!"
+        			end
+        			if !template.is_a?(Hash) or (template['_context'] != 'object' and template['_context'] != 'abstract')
+        puts template['_context']
+        				raise Exception, "#{( path68 && @input.to_s( path68.start, path68.stop ) )}:[#{template['_context']}] is not an object or an abstract object!"
+        			end
+        			object = @now[__ID66__.text] = Sfp::Helper.deep_clone(template)
+        			object.accept(Sfp::Visitor::ParentEliminator.new)
+        			object['_parent'] = @now
+        			object['_self'] = __ID66__.text
+        			object['_context'] = 'object'
+        			object.accept(Sfp::Visitor::SfpGenerator.new(@root))
         			@use_template = true
         		
         # <-- action
@@ -2092,7 +2096,7 @@ module SfpLang
       		
       # <-- action
 
-      # at line 226:3: ( 'isa' object_schema ( object_schemata )* )?
+      # at line 230:3: ( 'isa' object_schema ( object_schemata )* )?
       alt_28 = 2
       look_28_0 = @input.peek( 1 )
 
@@ -2101,7 +2105,7 @@ module SfpLang
       end
       case alt_28
       when 1
-        # at line 226:4: 'isa' object_schema ( object_schemata )*
+        # at line 230:4: 'isa' object_schema ( object_schemata )*
         string_literal69 = match( T__66, TOKENS_FOLLOWING_T__66_IN_object_def_506 )
         tree_for_string_literal69 = @adaptor.create_with_payload( string_literal69 )
         @adaptor.add_child( root_0, tree_for_string_literal69 )
@@ -2112,7 +2116,7 @@ module SfpLang
         @state.following.pop
         @adaptor.add_child( root_0, object_schema70.tree )
 
-        # at line 226:24: ( object_schemata )*
+        # at line 230:24: ( object_schemata )*
         while true # decision 27
           alt_27 = 2
           look_27_0 = @input.peek( 1 )
@@ -2123,7 +2127,7 @@ module SfpLang
           end
           case alt_27
           when 1
-            # at line 226:25: object_schemata
+            # at line 230:25: object_schemata
             @state.following.push( TOKENS_FOLLOWING_object_schemata_IN_object_def_511 )
             object_schemata71 = object_schemata
             @state.following.pop
@@ -2137,7 +2141,7 @@ module SfpLang
 
 
       end
-      # at line 227:3: ( object_body )?
+      # at line 231:3: ( object_body )?
       alt_29 = 2
       look_29_0 = @input.peek( 1 )
 
@@ -2146,7 +2150,7 @@ module SfpLang
       end
       case alt_29
       when 1
-        # at line 227:3: object_body
+        # at line 231:3: object_body
         @state.following.push( TOKENS_FOLLOWING_object_body_IN_object_def_520 )
         object_body72 = object_body
         @state.following.pop
@@ -2206,7 +2210,7 @@ module SfpLang
     # parser rule object_body
     #
     # (in SfpLang.g)
-    # 247:1: object_body : '{' ( NL )* ( object_attribute | procedure ( NL )* )* '}' ;
+    # 251:1: object_body : '{' ( NL )* ( object_attribute | procedure ( NL )* )* '}' ;
     #
     def object_body
       # -> uncomment the next line to manually enable rule tracing
@@ -2238,13 +2242,13 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 248:4: '{' ( NL )* ( object_attribute | procedure ( NL )* )* '}'
+      # at line 252:4: '{' ( NL )* ( object_attribute | procedure ( NL )* )* '}'
       char_literal73 = match( T__84, TOKENS_FOLLOWING_T__84_IN_object_body_536 )
       tree_for_char_literal73 = @adaptor.create_with_payload( char_literal73 )
       @adaptor.add_child( root_0, tree_for_char_literal73 )
 
 
-      # at line 248:8: ( NL )*
+      # at line 252:8: ( NL )*
       while true # decision 30
         alt_30 = 2
         look_30_0 = @input.peek( 1 )
@@ -2255,7 +2259,7 @@ module SfpLang
         end
         case alt_30
         when 1
-          # at line 248:8: NL
+          # at line 252:8: NL
           __NL74__ = match( NL, TOKENS_FOLLOWING_NL_IN_object_body_538 )
           tree_for_NL74 = @adaptor.create_with_payload( __NL74__ )
           @adaptor.add_child( root_0, tree_for_NL74 )
@@ -2267,7 +2271,7 @@ module SfpLang
         end
       end # loop for decision 30
 
-      # at line 248:12: ( object_attribute | procedure ( NL )* )*
+      # at line 252:12: ( object_attribute | procedure ( NL )* )*
       while true # decision 32
         alt_32 = 3
         look_32_0 = @input.peek( 1 )
@@ -2280,7 +2284,7 @@ module SfpLang
         end
         case alt_32
         when 1
-          # at line 248:14: object_attribute
+          # at line 252:14: object_attribute
           @state.following.push( TOKENS_FOLLOWING_object_attribute_IN_object_body_543 )
           object_attribute75 = object_attribute
           @state.following.pop
@@ -2288,13 +2292,13 @@ module SfpLang
 
 
         when 2
-          # at line 248:33: procedure ( NL )*
+          # at line 252:33: procedure ( NL )*
           @state.following.push( TOKENS_FOLLOWING_procedure_IN_object_body_547 )
           procedure76 = procedure
           @state.following.pop
           @adaptor.add_child( root_0, procedure76.tree )
 
-          # at line 248:43: ( NL )*
+          # at line 252:43: ( NL )*
           while true # decision 31
             alt_31 = 2
             look_31_0 = @input.peek( 1 )
@@ -2305,7 +2309,7 @@ module SfpLang
             end
             case alt_31
             when 1
-              # at line 248:43: NL
+              # at line 252:43: NL
               __NL77__ = match( NL, TOKENS_FOLLOWING_NL_IN_object_body_549 )
               tree_for_NL77 = @adaptor.create_with_payload( __NL77__ )
               @adaptor.add_child( root_0, tree_for_NL77 )
@@ -2359,7 +2363,7 @@ module SfpLang
     # parser rule object_attribute
     #
     # (in SfpLang.g)
-    # 251:1: object_attribute : ( attribute | ID equals_op NULL ( NL )+ );
+    # 255:1: object_attribute : ( attribute | ID equals_op NULL ( NL )+ );
     #
     def object_attribute
       # -> uncomment the next line to manually enable rule tracing
@@ -2386,7 +2390,7 @@ module SfpLang
       tree_for_NL83 = nil
 
       begin
-      # at line 252:2: ( attribute | ID equals_op NULL ( NL )+ )
+      # at line 256:2: ( attribute | ID equals_op NULL ( NL )+ )
       alt_34 = 2
       look_34_0 = @input.peek( 1 )
 
@@ -2421,7 +2425,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 252:4: attribute
+        # at line 256:4: attribute
         @state.following.push( TOKENS_FOLLOWING_attribute_IN_object_attribute_566 )
         attribute79 = attribute
         @state.following.pop
@@ -2432,7 +2436,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 253:4: ID equals_op NULL ( NL )+
+        # at line 257:4: ID equals_op NULL ( NL )+
         __ID80__ = match( ID, TOKENS_FOLLOWING_ID_IN_object_attribute_571 )
         tree_for_ID80 = @adaptor.create_with_payload( __ID80__ )
         @adaptor.add_child( root_0, tree_for_ID80 )
@@ -2448,7 +2452,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_NULL82 )
 
 
-        # at file 253:22: ( NL )+
+        # at file 257:22: ( NL )+
         match_count_33 = 0
         while true
           alt_33 = 2
@@ -2460,7 +2464,7 @@ module SfpLang
           end
           case alt_33
           when 1
-            # at line 253:22: NL
+            # at line 257:22: NL
             __NL83__ = match( NL, TOKENS_FOLLOWING_NL_IN_object_attribute_577 )
             tree_for_NL83 = @adaptor.create_with_payload( __NL83__ )
             @adaptor.add_child( root_0, tree_for_NL83 )
@@ -2515,7 +2519,7 @@ module SfpLang
     # parser rule state_dependency
     #
     # (in SfpLang.g)
-    # 257:1: state_dependency : 'if' dep_effect ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}' )* ( NL )+ ;
+    # 261:1: state_dependency : 'if' dep_effect ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}' )* ( NL )+ ;
     #
     def state_dependency
       # -> uncomment the next line to manually enable rule tracing
@@ -2568,7 +2572,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 258:4: 'if' dep_effect ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}' )* ( NL )+
+      # at line 262:4: 'if' dep_effect ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}' )* ( NL )+
       string_literal84 = match( T__62, TOKENS_FOLLOWING_T__62_IN_state_dependency_593 )
       tree_for_string_literal84 = @adaptor.create_with_payload( string_literal84 )
       @adaptor.add_child( root_0, tree_for_string_literal84 )
@@ -2579,7 +2583,7 @@ module SfpLang
       @state.following.pop
       @adaptor.add_child( root_0, dep_effect85.tree )
 
-      # at line 259:14: ( NL )*
+      # at line 263:14: ( NL )*
       while true # decision 35
         alt_35 = 2
         look_35_0 = @input.peek( 1 )
@@ -2590,7 +2594,7 @@ module SfpLang
         end
         case alt_35
         when 1
-          # at line 259:14: NL
+          # at line 263:14: NL
           __NL86__ = match( NL, TOKENS_FOLLOWING_NL_IN_state_dependency_599 )
           tree_for_NL86 = @adaptor.create_with_payload( __NL86__ )
           @adaptor.add_child( root_0, tree_for_NL86 )
@@ -2607,7 +2611,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_string_literal87 )
 
 
-      # at line 259:25: ( NL )*
+      # at line 263:25: ( NL )*
       while true # decision 36
         alt_36 = 2
         look_36_0 = @input.peek( 1 )
@@ -2618,7 +2622,7 @@ module SfpLang
         end
         case alt_36
         when 1
-          # at line 259:25: NL
+          # at line 263:25: NL
           __NL88__ = match( NL, TOKENS_FOLLOWING_NL_IN_state_dependency_604 )
           tree_for_NL88 = @adaptor.create_with_payload( __NL88__ )
           @adaptor.add_child( root_0, tree_for_NL88 )
@@ -2635,7 +2639,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal89 )
 
 
-      # at line 260:3: ( NL )*
+      # at line 264:3: ( NL )*
       while true # decision 37
         alt_37 = 2
         look_37_0 = @input.peek( 1 )
@@ -2646,7 +2650,7 @@ module SfpLang
         end
         case alt_37
         when 1
-          # at line 260:3: NL
+          # at line 264:3: NL
           __NL90__ = match( NL, TOKENS_FOLLOWING_NL_IN_state_dependency_611 )
           tree_for_NL90 = @adaptor.create_with_payload( __NL90__ )
           @adaptor.add_child( root_0, tree_for_NL90 )
@@ -2668,14 +2672,14 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal92 )
 
 
-      # at line 262:3: ( ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}' )*
+      # at line 266:3: ( ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}' )*
       while true # decision 41
         alt_41 = 2
         alt_41 = @dfa41.predict( @input )
         case alt_41
         when 1
-          # at line 262:5: ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}'
-          # at line 262:5: ( NL )*
+          # at line 266:5: ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}'
+          # at line 266:5: ( NL )*
           while true # decision 38
             alt_38 = 2
             look_38_0 = @input.peek( 1 )
@@ -2686,7 +2690,7 @@ module SfpLang
             end
             case alt_38
             when 1
-              # at line 262:5: NL
+              # at line 266:5: NL
               __NL93__ = match( NL, TOKENS_FOLLOWING_NL_IN_state_dependency_625 )
               tree_for_NL93 = @adaptor.create_with_payload( __NL93__ )
               @adaptor.add_child( root_0, tree_for_NL93 )
@@ -2703,7 +2707,7 @@ module SfpLang
           @adaptor.add_child( root_0, tree_for_string_literal94 )
 
 
-          # at line 262:14: ( NL )*
+          # at line 266:14: ( NL )*
           while true # decision 39
             alt_39 = 2
             look_39_0 = @input.peek( 1 )
@@ -2714,7 +2718,7 @@ module SfpLang
             end
             case alt_39
             when 1
-              # at line 262:14: NL
+              # at line 266:14: NL
               __NL95__ = match( NL, TOKENS_FOLLOWING_NL_IN_state_dependency_630 )
               tree_for_NL95 = @adaptor.create_with_payload( __NL95__ )
               @adaptor.add_child( root_0, tree_for_NL95 )
@@ -2731,7 +2735,7 @@ module SfpLang
           @adaptor.add_child( root_0, tree_for_char_literal96 )
 
 
-          # at line 263:3: ( NL )*
+          # at line 267:3: ( NL )*
           while true # decision 40
             alt_40 = 2
             look_40_0 = @input.peek( 1 )
@@ -2742,7 +2746,7 @@ module SfpLang
             end
             case alt_40
             when 1
-              # at line 263:3: NL
+              # at line 267:3: NL
               __NL97__ = match( NL, TOKENS_FOLLOWING_NL_IN_state_dependency_637 )
               tree_for_NL97 = @adaptor.create_with_payload( __NL97__ )
               @adaptor.add_child( root_0, tree_for_NL97 )
@@ -2770,7 +2774,7 @@ module SfpLang
         end
       end # loop for decision 41
 
-      # at file 265:3: ( NL )+
+      # at file 269:3: ( NL )+
       match_count_42 = 0
       while true
         alt_42 = 2
@@ -2782,7 +2786,7 @@ module SfpLang
         end
         case alt_42
         when 1
-          # at line 265:3: NL
+          # at line 269:3: NL
           __NL100__ = match( NL, TOKENS_FOLLOWING_NL_IN_state_dependency_650 )
           tree_for_NL100 = @adaptor.create_with_payload( __NL100__ )
           @adaptor.add_child( root_0, tree_for_NL100 )
@@ -2831,7 +2835,7 @@ module SfpLang
     # parser rule dep_effect
     #
     # (in SfpLang.g)
-    # 268:1: dep_effect : reference equals_op ( value | NULL ) ;
+    # 272:1: dep_effect : reference equals_op ( value | NULL ) ;
     #
     def dep_effect
       # -> uncomment the next line to manually enable rule tracing
@@ -2858,7 +2862,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 269:4: reference equals_op ( value | NULL )
+      # at line 273:4: reference equals_op ( value | NULL )
       @state.following.push( TOKENS_FOLLOWING_reference_IN_dep_effect_662 )
       reference101 = reference
       @state.following.pop
@@ -2869,7 +2873,7 @@ module SfpLang
       @state.following.pop
       @adaptor.add_child( root_0, equals_op102.tree )
 
-      # at line 270:3: ( value | NULL )
+      # at line 274:3: ( value | NULL )
       alt_43 = 2
       look_43_0 = @input.peek( 1 )
 
@@ -2883,7 +2887,7 @@ module SfpLang
       end
       case alt_43
       when 1
-        # at line 270:5: value
+        # at line 274:5: value
         @state.following.push( TOKENS_FOLLOWING_value_IN_dep_effect_671 )
         value103 = value
         @state.following.pop
@@ -2891,7 +2895,7 @@ module SfpLang
 
 
       when 2
-        # at line 271:5: NULL
+        # at line 275:5: NULL
         __NULL104__ = match( NULL, TOKENS_FOLLOWING_NULL_IN_dep_effect_677 )
         tree_for_NULL104 = @adaptor.create_with_payload( __NULL104__ )
         @adaptor.add_child( root_0, tree_for_NULL104 )
@@ -2930,7 +2934,7 @@ module SfpLang
     # parser rule op_param
     #
     # (in SfpLang.g)
-    # 275:1: op_param : ID equals_op reference ( NL )+ ;
+    # 279:1: op_param : ID equals_op reference ( NL )+ ;
     #
     def op_param
       # -> uncomment the next line to manually enable rule tracing
@@ -2958,7 +2962,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 276:4: ID equals_op reference ( NL )+
+      # at line 280:4: ID equals_op reference ( NL )+
       __ID105__ = match( ID, TOKENS_FOLLOWING_ID_IN_op_param_693 )
       tree_for_ID105 = @adaptor.create_with_payload( __ID105__ )
       @adaptor.add_child( root_0, tree_for_ID105 )
@@ -2974,7 +2978,7 @@ module SfpLang
       @state.following.pop
       @adaptor.add_child( root_0, reference107.tree )
 
-      # at file 276:27: ( NL )+
+      # at file 280:27: ( NL )+
       match_count_44 = 0
       while true
         alt_44 = 2
@@ -2986,7 +2990,7 @@ module SfpLang
         end
         case alt_44
         when 1
-          # at line 276:27: NL
+          # at line 280:27: NL
           __NL108__ = match( NL, TOKENS_FOLLOWING_NL_IN_op_param_699 )
           tree_for_NL108 = @adaptor.create_with_payload( __NL108__ )
           @adaptor.add_child( root_0, tree_for_NL108 )
@@ -3040,7 +3044,7 @@ module SfpLang
     # parser rule op_conditions
     #
     # (in SfpLang.g)
-    # 280:1: op_conditions : ( 'conditions' | 'condition' ) '{' ( NL )* ( op_statement )* '}' ( NL )+ ;
+    # 284:1: op_conditions : ( 'conditions' | 'condition' ) '{' ( NL )* ( op_statement )* '}' ( NL )+ ;
     #
     def op_conditions
       # -> uncomment the next line to manually enable rule tracing
@@ -3073,7 +3077,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 281:4: ( 'conditions' | 'condition' ) '{' ( NL )* ( op_statement )* '}' ( NL )+
+      # at line 285:4: ( 'conditions' | 'condition' ) '{' ( NL )* ( op_statement )* '}' ( NL )+
       set109 = @input.look
 
       if @input.peek( 1 ).between?( T__45, T__46 )
@@ -3094,7 +3098,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal110 )
 
 
-      # at line 281:37: ( NL )*
+      # at line 285:37: ( NL )*
       while true # decision 45
         alt_45 = 2
         look_45_0 = @input.peek( 1 )
@@ -3105,7 +3109,7 @@ module SfpLang
         end
         case alt_45
         when 1
-          # at line 281:37: NL
+          # at line 285:37: NL
           __NL111__ = match( NL, TOKENS_FOLLOWING_NL_IN_op_conditions_725 )
           tree_for_NL111 = @adaptor.create_with_payload( __NL111__ )
           @adaptor.add_child( root_0, tree_for_NL111 )
@@ -3125,7 +3129,7 @@ module SfpLang
       		
       # <-- action
 
-      # at line 286:3: ( op_statement )*
+      # at line 290:3: ( op_statement )*
       while true # decision 46
         alt_46 = 2
         look_46_0 = @input.peek( 1 )
@@ -3136,7 +3140,7 @@ module SfpLang
         end
         case alt_46
         when 1
-          # at line 286:3: op_statement
+          # at line 290:3: op_statement
           @state.following.push( TOKENS_FOLLOWING_op_statement_IN_op_conditions_734 )
           op_statement112 = op_statement
           @state.following.pop
@@ -3153,7 +3157,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal113 )
 
 
-      # at file 287:7: ( NL )+
+      # at file 291:7: ( NL )+
       match_count_47 = 0
       while true
         alt_47 = 2
@@ -3165,7 +3169,7 @@ module SfpLang
         end
         case alt_47
         when 1
-          # at line 287:7: NL
+          # at line 291:7: NL
           __NL114__ = match( NL, TOKENS_FOLLOWING_NL_IN_op_conditions_741 )
           tree_for_NL114 = @adaptor.create_with_payload( __NL114__ )
           @adaptor.add_child( root_0, tree_for_NL114 )
@@ -3219,7 +3223,7 @@ module SfpLang
     # parser rule op_effects
     #
     # (in SfpLang.g)
-    # 291:1: op_effects : 'effects' '{' ( NL )* ( op_statement )* '}' ( NL )+ ;
+    # 295:1: op_effects : 'effects' '{' ( NL )* ( op_statement )* '}' ( NL )+ ;
     #
     def op_effects
       # -> uncomment the next line to manually enable rule tracing
@@ -3252,7 +3256,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 292:4: 'effects' '{' ( NL )* ( op_statement )* '}' ( NL )+
+      # at line 296:4: 'effects' '{' ( NL )* ( op_statement )* '}' ( NL )+
       string_literal115 = match( T__51, TOKENS_FOLLOWING_T__51_IN_op_effects_757 )
       tree_for_string_literal115 = @adaptor.create_with_payload( string_literal115 )
       @adaptor.add_child( root_0, tree_for_string_literal115 )
@@ -3263,7 +3267,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal116 )
 
 
-      # at line 292:18: ( NL )*
+      # at line 296:18: ( NL )*
       while true # decision 48
         alt_48 = 2
         look_48_0 = @input.peek( 1 )
@@ -3274,7 +3278,7 @@ module SfpLang
         end
         case alt_48
         when 1
-          # at line 292:18: NL
+          # at line 296:18: NL
           __NL117__ = match( NL, TOKENS_FOLLOWING_NL_IN_op_effects_761 )
           tree_for_NL117 = @adaptor.create_with_payload( __NL117__ )
           @adaptor.add_child( root_0, tree_for_NL117 )
@@ -3294,7 +3298,7 @@ module SfpLang
       		
       # <-- action
 
-      # at line 297:3: ( op_statement )*
+      # at line 301:3: ( op_statement )*
       while true # decision 49
         alt_49 = 2
         look_49_0 = @input.peek( 1 )
@@ -3305,7 +3309,7 @@ module SfpLang
         end
         case alt_49
         when 1
-          # at line 297:3: op_statement
+          # at line 301:3: op_statement
           @state.following.push( TOKENS_FOLLOWING_op_statement_IN_op_effects_770 )
           op_statement118 = op_statement
           @state.following.pop
@@ -3322,7 +3326,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal119 )
 
 
-      # at file 298:7: ( NL )+
+      # at file 302:7: ( NL )+
       match_count_50 = 0
       while true
         alt_50 = 2
@@ -3334,7 +3338,7 @@ module SfpLang
         end
         case alt_50
         when 1
-          # at line 298:7: NL
+          # at line 302:7: NL
           __NL120__ = match( NL, TOKENS_FOLLOWING_NL_IN_op_effects_777 )
           tree_for_NL120 = @adaptor.create_with_payload( __NL120__ )
           @adaptor.add_child( root_0, tree_for_NL120 )
@@ -3388,7 +3392,7 @@ module SfpLang
     # parser rule op_statement
     #
     # (in SfpLang.g)
-    # 302:1: op_statement : reference equals_op value ( NL )+ ;
+    # 306:1: op_statement : reference equals_op value ( NL )+ ;
     #
     def op_statement
       # -> uncomment the next line to manually enable rule tracing
@@ -3415,7 +3419,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 303:4: reference equals_op value ( NL )+
+      # at line 307:4: reference equals_op value ( NL )+
       @state.following.push( TOKENS_FOLLOWING_reference_IN_op_statement_793 )
       reference121 = reference
       @state.following.pop
@@ -3431,7 +3435,7 @@ module SfpLang
       @state.following.pop
       @adaptor.add_child( root_0, value123.tree )
 
-      # at file 303:30: ( NL )+
+      # at file 307:30: ( NL )+
       match_count_51 = 0
       while true
         alt_51 = 2
@@ -3443,7 +3447,7 @@ module SfpLang
         end
         case alt_51
         when 1
-          # at line 303:30: NL
+          # at line 307:30: NL
           __NL124__ = match( NL, TOKENS_FOLLOWING_NL_IN_op_statement_799 )
           tree_for_NL124 = @adaptor.create_with_payload( __NL124__ )
           @adaptor.add_child( root_0, tree_for_NL124 )
@@ -3497,7 +3501,7 @@ module SfpLang
     # parser rule procedure
     #
     # (in SfpLang.g)
-    # 307:1: procedure : ( 'synchronized' )? ( 'procedure' | 'sub' ) ID ( parameters )? '{' ( NL )* ( 'cost' equals_op NUMBER ( NL )+ )? ( conditions )? effects '}' ;
+    # 311:1: procedure : ( 'synchronized' )? ( 'procedure' | 'sub' ) ID ( parameters )? '{' ( NL )* ( 'cost' equals_op NUMBER ( NL )+ )? ( conditions )? effects '}' ;
     #
     def procedure
       # -> uncomment the next line to manually enable rule tracing
@@ -3541,12 +3545,12 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 308:4: ( 'synchronized' )? ( 'procedure' | 'sub' ) ID ( parameters )? '{' ( NL )* ( 'cost' equals_op NUMBER ( NL )+ )? ( conditions )? effects '}'
+      # at line 312:4: ( 'synchronized' )? ( 'procedure' | 'sub' ) ID ( parameters )? '{' ( NL )* ( 'cost' equals_op NUMBER ( NL )+ )? ( conditions )? effects '}'
       # --> action
         @synchronized = false  
       # <-- action
 
-      # at line 309:3: ( 'synchronized' )?
+      # at line 313:3: ( 'synchronized' )?
       alt_52 = 2
       look_52_0 = @input.peek( 1 )
 
@@ -3555,7 +3559,7 @@ module SfpLang
       end
       case alt_52
       when 1
-        # at line 309:4: 'synchronized'
+        # at line 313:4: 'synchronized'
         string_literal125 = match( T__80, TOKENS_FOLLOWING_T__80_IN_procedure_820 )
         tree_for_string_literal125 = @adaptor.create_with_payload( string_literal125 )
         @adaptor.add_child( root_0, tree_for_string_literal125 )
@@ -3604,7 +3608,7 @@ module SfpLang
       		
       # <-- action
 
-      # at line 322:3: ( parameters )?
+      # at line 326:3: ( parameters )?
       alt_53 = 2
       look_53_0 = @input.peek( 1 )
 
@@ -3613,7 +3617,7 @@ module SfpLang
       end
       case alt_53
       when 1
-        # at line 322:3: parameters
+        # at line 326:3: parameters
         @state.following.push( TOKENS_FOLLOWING_parameters_IN_procedure_842 )
         parameters128 = parameters
         @state.following.pop
@@ -3626,7 +3630,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal129 )
 
 
-      # at line 322:19: ( NL )*
+      # at line 326:19: ( NL )*
       while true # decision 54
         alt_54 = 2
         look_54_0 = @input.peek( 1 )
@@ -3637,7 +3641,7 @@ module SfpLang
         end
         case alt_54
         when 1
-          # at line 322:19: NL
+          # at line 326:19: NL
           __NL130__ = match( NL, TOKENS_FOLLOWING_NL_IN_procedure_847 )
           tree_for_NL130 = @adaptor.create_with_payload( __NL130__ )
           @adaptor.add_child( root_0, tree_for_NL130 )
@@ -3649,7 +3653,7 @@ module SfpLang
         end
       end # loop for decision 54
 
-      # at line 323:3: ( 'cost' equals_op NUMBER ( NL )+ )?
+      # at line 327:3: ( 'cost' equals_op NUMBER ( NL )+ )?
       alt_56 = 2
       look_56_0 = @input.peek( 1 )
 
@@ -3658,7 +3662,7 @@ module SfpLang
       end
       case alt_56
       when 1
-        # at line 323:5: 'cost' equals_op NUMBER ( NL )+
+        # at line 327:5: 'cost' equals_op NUMBER ( NL )+
         string_literal131 = match( T__48, TOKENS_FOLLOWING_T__48_IN_procedure_855 )
         tree_for_string_literal131 = @adaptor.create_with_payload( string_literal131 )
         @adaptor.add_child( root_0, tree_for_string_literal131 )
@@ -3679,7 +3683,7 @@ module SfpLang
         	@now['_cost'] = __NUMBER133__.text.to_i	
         # <-- action
 
-        # at file 325:4: ( NL )+
+        # at file 329:4: ( NL )+
         match_count_55 = 0
         while true
           alt_55 = 2
@@ -3691,7 +3695,7 @@ module SfpLang
           end
           case alt_55
           when 1
-            # at line 325:4: NL
+            # at line 329:4: NL
             __NL134__ = match( NL, TOKENS_FOLLOWING_NL_IN_procedure_869 )
             tree_for_NL134 = @adaptor.create_with_payload( __NL134__ )
             @adaptor.add_child( root_0, tree_for_NL134 )
@@ -3711,7 +3715,7 @@ module SfpLang
 
 
       end
-      # at line 327:3: ( conditions )?
+      # at line 331:3: ( conditions )?
       alt_57 = 2
       look_57_0 = @input.peek( 1 )
 
@@ -3720,7 +3724,7 @@ module SfpLang
       end
       case alt_57
       when 1
-        # at line 327:3: conditions
+        # at line 331:3: conditions
         @state.following.push( TOKENS_FOLLOWING_conditions_IN_procedure_879 )
         conditions135 = conditions
         @state.following.pop
@@ -3774,7 +3778,7 @@ module SfpLang
     # parser rule parameters
     #
     # (in SfpLang.g)
-    # 331:1: parameters : '(' parameter ( ',' ( NL )* parameter )* ')' ;
+    # 335:1: parameters : '(' parameter ( ',' ( NL )* parameter )* ')' ;
     #
     def parameters
       # -> uncomment the next line to manually enable rule tracing
@@ -3806,7 +3810,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 332:4: '(' parameter ( ',' ( NL )* parameter )* ')'
+      # at line 336:4: '(' parameter ( ',' ( NL )* parameter )* ')'
       char_literal138 = match( T__19, TOKENS_FOLLOWING_T__19_IN_parameters_899 )
       tree_for_char_literal138 = @adaptor.create_with_payload( char_literal138 )
       @adaptor.add_child( root_0, tree_for_char_literal138 )
@@ -3817,7 +3821,7 @@ module SfpLang
       @state.following.pop
       @adaptor.add_child( root_0, parameter139.tree )
 
-      # at line 332:18: ( ',' ( NL )* parameter )*
+      # at line 336:18: ( ',' ( NL )* parameter )*
       while true # decision 59
         alt_59 = 2
         look_59_0 = @input.peek( 1 )
@@ -3828,13 +3832,13 @@ module SfpLang
         end
         case alt_59
         when 1
-          # at line 332:19: ',' ( NL )* parameter
+          # at line 336:19: ',' ( NL )* parameter
           char_literal140 = match( T__23, TOKENS_FOLLOWING_T__23_IN_parameters_904 )
           tree_for_char_literal140 = @adaptor.create_with_payload( char_literal140 )
           @adaptor.add_child( root_0, tree_for_char_literal140 )
 
 
-          # at line 332:23: ( NL )*
+          # at line 336:23: ( NL )*
           while true # decision 58
             alt_58 = 2
             look_58_0 = @input.peek( 1 )
@@ -3845,7 +3849,7 @@ module SfpLang
             end
             case alt_58
             when 1
-              # at line 332:23: NL
+              # at line 336:23: NL
               __NL141__ = match( NL, TOKENS_FOLLOWING_NL_IN_parameters_906 )
               tree_for_NL141 = @adaptor.create_with_payload( __NL141__ )
               @adaptor.add_child( root_0, tree_for_NL141 )
@@ -3904,7 +3908,7 @@ module SfpLang
     # parser rule parameter
     #
     # (in SfpLang.g)
-    # 335:1: parameter : ( ID ':' path | ID reference_type | ID 'areall' path | ID 'isset' path );
+    # 339:1: parameter : ( ID ':' path | ID reference_type | ID 'areall' path | ID 'isset' path );
     #
     def parameter
       # -> uncomment the next line to manually enable rule tracing
@@ -3941,7 +3945,7 @@ module SfpLang
       tree_for_string_literal153 = nil
 
       begin
-      # at line 336:2: ( ID ':' path | ID reference_type | ID 'areall' path | ID 'isset' path )
+      # at line 340:2: ( ID ':' path | ID reference_type | ID 'areall' path | ID 'isset' path )
       alt_60 = 4
       look_60_0 = @input.peek( 1 )
 
@@ -3964,7 +3968,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 336:4: ID ':' path
+        # at line 340:4: ID ':' path
         __ID144__ = match( ID, TOKENS_FOLLOWING_ID_IN_parameter_925 )
         tree_for_ID144 = @adaptor.create_with_payload( __ID144__ )
         @adaptor.add_child( root_0, tree_for_ID144 )
@@ -3994,7 +3998,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 342:4: ID reference_type
+        # at line 346:4: ID reference_type
         __ID147__ = match( ID, TOKENS_FOLLOWING_ID_IN_parameter_938 )
         tree_for_ID147 = @adaptor.create_with_payload( __ID147__ )
         @adaptor.add_child( root_0, tree_for_ID147 )
@@ -4015,7 +4019,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 344:4: ID 'areall' path
+        # at line 348:4: ID 'areall' path
         __ID149__ = match( ID, TOKENS_FOLLOWING_ID_IN_parameter_949 )
         tree_for_ID149 = @adaptor.create_with_payload( __ID149__ )
         @adaptor.add_child( root_0, tree_for_ID149 )
@@ -4046,7 +4050,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 351:4: ID 'isset' path
+        # at line 355:4: ID 'isset' path
         __ID152__ = match( ID, TOKENS_FOLLOWING_ID_IN_parameter_962 )
         tree_for_ID152 = @adaptor.create_with_payload( __ID152__ )
         @adaptor.add_child( root_0, tree_for_ID152 )
@@ -4104,7 +4108,7 @@ module SfpLang
     # parser rule conditions
     #
     # (in SfpLang.g)
-    # 360:1: conditions : ( 'conditions' | 'condition' ) '{' ( NL )* constraint_body '}' ( NL )+ ;
+    # 364:1: conditions : ( 'conditions' | 'condition' ) '{' ( NL )* constraint_body '}' ( NL )+ ;
     #
     def conditions
       # -> uncomment the next line to manually enable rule tracing
@@ -4137,7 +4141,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 361:4: ( 'conditions' | 'condition' ) '{' ( NL )* constraint_body '}' ( NL )+
+      # at line 365:4: ( 'conditions' | 'condition' ) '{' ( NL )* constraint_body '}' ( NL )+
       set155 = @input.look
 
       if @input.peek( 1 ).between?( T__45, T__46 )
@@ -4166,7 +4170,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal156 )
 
 
-      # at line 366:7: ( NL )*
+      # at line 370:7: ( NL )*
       while true # decision 61
         alt_61 = 2
         look_61_0 = @input.peek( 1 )
@@ -4177,7 +4181,7 @@ module SfpLang
         end
         case alt_61
         when 1
-          # at line 366:7: NL
+          # at line 370:7: NL
           __NL157__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditions_997 )
           tree_for_NL157 = @adaptor.create_with_payload( __NL157__ )
           @adaptor.add_child( root_0, tree_for_NL157 )
@@ -4199,7 +4203,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal159 )
 
 
-      # at file 366:31: ( NL )+
+      # at file 370:31: ( NL )+
       match_count_62 = 0
       while true
         alt_62 = 2
@@ -4211,7 +4215,7 @@ module SfpLang
         end
         case alt_62
         when 1
-          # at line 366:31: NL
+          # at line 370:31: NL
           __NL160__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditions_1004 )
           tree_for_NL160 = @adaptor.create_with_payload( __NL160__ )
           @adaptor.add_child( root_0, tree_for_NL160 )
@@ -4265,7 +4269,7 @@ module SfpLang
     # parser rule effects
     #
     # (in SfpLang.g)
-    # 371:1: effects : ( 'effects' | 'effect' ) '{' ( NL )* effect_body '}' ( NL )+ ;
+    # 375:1: effects : ( 'effects' | 'effect' ) '{' ( NL )* effect_body '}' ( NL )+ ;
     #
     def effects
       # -> uncomment the next line to manually enable rule tracing
@@ -4298,7 +4302,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 372:4: ( 'effects' | 'effect' ) '{' ( NL )* effect_body '}' ( NL )+
+      # at line 376:4: ( 'effects' | 'effect' ) '{' ( NL )* effect_body '}' ( NL )+
       set161 = @input.look
 
       if @input.peek( 1 ).between?( T__50, T__51 )
@@ -4328,7 +4332,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal162 )
 
 
-      # at line 378:7: ( NL )*
+      # at line 382:7: ( NL )*
       while true # decision 63
         alt_63 = 2
         look_63_0 = @input.peek( 1 )
@@ -4339,7 +4343,7 @@ module SfpLang
         end
         case alt_63
         when 1
-          # at line 378:7: NL
+          # at line 382:7: NL
           __NL163__ = match( NL, TOKENS_FOLLOWING_NL_IN_effects_1037 )
           tree_for_NL163 = @adaptor.create_with_payload( __NL163__ )
           @adaptor.add_child( root_0, tree_for_NL163 )
@@ -4361,7 +4365,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal165 )
 
 
-      # at file 380:7: ( NL )+
+      # at file 384:7: ( NL )+
       match_count_64 = 0
       while true
         alt_64 = 2
@@ -4373,7 +4377,7 @@ module SfpLang
         end
         case alt_64
         when 1
-          # at line 380:7: NL
+          # at line 384:7: NL
           __NL166__ = match( NL, TOKENS_FOLLOWING_NL_IN_effects_1050 )
           tree_for_NL166 = @adaptor.create_with_payload( __NL166__ )
           @adaptor.add_child( root_0, tree_for_NL166 )
@@ -4430,7 +4434,7 @@ module SfpLang
     # parser rule goal_constraint
     #
     # (in SfpLang.g)
-    # 387:1: goal_constraint : 'goal' ( 'constraint' )? ( NL )* '{' ( NL )* ( goal_body )* '}' ;
+    # 391:1: goal_constraint : 'goal' ( 'constraint' )? ( NL )* '{' ( NL )* ( goal_body )* '}' ;
     #
     def goal_constraint
       # -> uncomment the next line to manually enable rule tracing
@@ -4465,13 +4469,13 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 388:4: 'goal' ( 'constraint' )? ( NL )* '{' ( NL )* ( goal_body )* '}'
+      # at line 392:4: 'goal' ( 'constraint' )? ( NL )* '{' ( NL )* ( goal_body )* '}'
       string_literal167 = match( T__60, TOKENS_FOLLOWING_T__60_IN_goal_constraint_1066 )
       tree_for_string_literal167 = @adaptor.create_with_payload( string_literal167 )
       @adaptor.add_child( root_0, tree_for_string_literal167 )
 
 
-      # at line 388:11: ( 'constraint' )?
+      # at line 392:11: ( 'constraint' )?
       alt_65 = 2
       look_65_0 = @input.peek( 1 )
 
@@ -4480,7 +4484,7 @@ module SfpLang
       end
       case alt_65
       when 1
-        # at line 388:11: 'constraint'
+        # at line 392:11: 'constraint'
         string_literal168 = match( T__47, TOKENS_FOLLOWING_T__47_IN_goal_constraint_1068 )
         tree_for_string_literal168 = @adaptor.create_with_payload( string_literal168 )
         @adaptor.add_child( root_0, tree_for_string_literal168 )
@@ -4488,7 +4492,7 @@ module SfpLang
 
 
       end
-      # at line 388:25: ( NL )*
+      # at line 392:25: ( NL )*
       while true # decision 66
         alt_66 = 2
         look_66_0 = @input.peek( 1 )
@@ -4499,7 +4503,7 @@ module SfpLang
         end
         case alt_66
         when 1
-          # at line 388:25: NL
+          # at line 392:25: NL
           __NL169__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_constraint_1071 )
           tree_for_NL169 = @adaptor.create_with_payload( __NL169__ )
           @adaptor.add_child( root_0, tree_for_NL169 )
@@ -4528,7 +4532,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal170 )
 
 
-      # at line 397:7: ( NL )*
+      # at line 401:7: ( NL )*
       while true # decision 67
         alt_67 = 2
         look_67_0 = @input.peek( 1 )
@@ -4539,7 +4543,7 @@ module SfpLang
         end
         case alt_67
         when 1
-          # at line 397:7: NL
+          # at line 401:7: NL
           __NL171__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_constraint_1082 )
           tree_for_NL171 = @adaptor.create_with_payload( __NL171__ )
           @adaptor.add_child( root_0, tree_for_NL171 )
@@ -4551,7 +4555,7 @@ module SfpLang
         end
       end # loop for decision 67
 
-      # at line 397:11: ( goal_body )*
+      # at line 401:11: ( goal_body )*
       while true # decision 68
         alt_68 = 2
         look_68_0 = @input.peek( 1 )
@@ -4562,7 +4566,7 @@ module SfpLang
         end
         case alt_68
         when 1
-          # at line 397:11: goal_body
+          # at line 401:11: goal_body
           @state.following.push( TOKENS_FOLLOWING_goal_body_IN_goal_constraint_1085 )
           goal_body172 = goal_body
           @state.following.pop
@@ -4615,7 +4619,7 @@ module SfpLang
     # parser rule global_constraint
     #
     # (in SfpLang.g)
-    # 401:1: global_constraint : ( 'global' | 'always' ) ( 'constraint' )? ( NL )* '{' ( NL )* constraint_body '}' ;
+    # 405:1: global_constraint : ( 'global' | 'always' ) ( 'constraint' )? ( NL )* '{' ( NL )* constraint_body '}' ;
     #
     def global_constraint
       # -> uncomment the next line to manually enable rule tracing
@@ -4650,7 +4654,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 402:4: ( 'global' | 'always' ) ( 'constraint' )? ( NL )* '{' ( NL )* constraint_body '}'
+      # at line 406:4: ( 'global' | 'always' ) ( 'constraint' )? ( NL )* '{' ( NL )* constraint_body '}'
       set174 = @input.look
 
       if @input.peek(1) == T__39 || @input.peek(1) == T__59
@@ -4666,7 +4670,7 @@ module SfpLang
       end
 
 
-      # at line 402:24: ( 'constraint' )?
+      # at line 406:24: ( 'constraint' )?
       alt_69 = 2
       look_69_0 = @input.peek( 1 )
 
@@ -4675,7 +4679,7 @@ module SfpLang
       end
       case alt_69
       when 1
-        # at line 402:24: 'constraint'
+        # at line 406:24: 'constraint'
         string_literal175 = match( T__47, TOKENS_FOLLOWING_T__47_IN_global_constraint_1109 )
         tree_for_string_literal175 = @adaptor.create_with_payload( string_literal175 )
         @adaptor.add_child( root_0, tree_for_string_literal175 )
@@ -4683,7 +4687,7 @@ module SfpLang
 
 
       end
-      # at line 402:38: ( NL )*
+      # at line 406:38: ( NL )*
       while true # decision 70
         alt_70 = 2
         look_70_0 = @input.peek( 1 )
@@ -4694,7 +4698,7 @@ module SfpLang
         end
         case alt_70
         when 1
-          # at line 402:38: NL
+          # at line 406:38: NL
           __NL176__ = match( NL, TOKENS_FOLLOWING_NL_IN_global_constraint_1112 )
           tree_for_NL176 = @adaptor.create_with_payload( __NL176__ )
           @adaptor.add_child( root_0, tree_for_NL176 )
@@ -4719,7 +4723,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal177 )
 
 
-      # at line 407:7: ( NL )*
+      # at line 411:7: ( NL )*
       while true # decision 71
         alt_71 = 2
         look_71_0 = @input.peek( 1 )
@@ -4730,7 +4734,7 @@ module SfpLang
         end
         case alt_71
         when 1
-          # at line 407:7: NL
+          # at line 411:7: NL
           __NL178__ = match( NL, TOKENS_FOLLOWING_NL_IN_global_constraint_1123 )
           tree_for_NL178 = @adaptor.create_with_payload( __NL178__ )
           @adaptor.add_child( root_0, tree_for_NL178 )
@@ -4788,7 +4792,7 @@ module SfpLang
     # parser rule sometime_constraint
     #
     # (in SfpLang.g)
-    # 411:1: sometime_constraint : 'sometime' ( 'constraint' )? ( NL )* '{' ( NL )* constraint_body '}' ;
+    # 415:1: sometime_constraint : 'sometime' ( 'constraint' )? ( NL )* '{' ( NL )* constraint_body '}' ;
     #
     def sometime_constraint
       # -> uncomment the next line to manually enable rule tracing
@@ -4823,13 +4827,13 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 412:4: 'sometime' ( 'constraint' )? ( NL )* '{' ( NL )* constraint_body '}'
+      # at line 416:4: 'sometime' ( 'constraint' )? ( NL )* '{' ( NL )* constraint_body '}'
       string_literal181 = match( T__77, TOKENS_FOLLOWING_T__77_IN_sometime_constraint_1143 )
       tree_for_string_literal181 = @adaptor.create_with_payload( string_literal181 )
       @adaptor.add_child( root_0, tree_for_string_literal181 )
 
 
-      # at line 412:15: ( 'constraint' )?
+      # at line 416:15: ( 'constraint' )?
       alt_72 = 2
       look_72_0 = @input.peek( 1 )
 
@@ -4838,7 +4842,7 @@ module SfpLang
       end
       case alt_72
       when 1
-        # at line 412:15: 'constraint'
+        # at line 416:15: 'constraint'
         string_literal182 = match( T__47, TOKENS_FOLLOWING_T__47_IN_sometime_constraint_1145 )
         tree_for_string_literal182 = @adaptor.create_with_payload( string_literal182 )
         @adaptor.add_child( root_0, tree_for_string_literal182 )
@@ -4846,7 +4850,7 @@ module SfpLang
 
 
       end
-      # at line 412:29: ( NL )*
+      # at line 416:29: ( NL )*
       while true # decision 73
         alt_73 = 2
         look_73_0 = @input.peek( 1 )
@@ -4857,7 +4861,7 @@ module SfpLang
         end
         case alt_73
         when 1
-          # at line 412:29: NL
+          # at line 416:29: NL
           __NL183__ = match( NL, TOKENS_FOLLOWING_NL_IN_sometime_constraint_1148 )
           tree_for_NL183 = @adaptor.create_with_payload( __NL183__ )
           @adaptor.add_child( root_0, tree_for_NL183 )
@@ -4882,7 +4886,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal184 )
 
 
-      # at line 417:7: ( NL )*
+      # at line 421:7: ( NL )*
       while true # decision 74
         alt_74 = 2
         look_74_0 = @input.peek( 1 )
@@ -4893,7 +4897,7 @@ module SfpLang
         end
         case alt_74
         when 1
-          # at line 417:7: NL
+          # at line 421:7: NL
           __NL185__ = match( NL, TOKENS_FOLLOWING_NL_IN_sometime_constraint_1159 )
           tree_for_NL185 = @adaptor.create_with_payload( __NL185__ )
           @adaptor.add_child( root_0, tree_for_NL185 )
@@ -4951,7 +4955,7 @@ module SfpLang
     # parser rule goal_body
     #
     # (in SfpLang.g)
-    # 422:1: goal_body : ( ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ ) | ( 'always' | 'global' ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'sometime' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'within' NUMBER ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'after' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* ( 'then' | 'within' NUMBER ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'before' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ );
+    # 426:1: goal_body : ( ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ ) | ( 'always' | 'global' ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'sometime' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'within' NUMBER ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'after' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* ( 'then' | 'within' NUMBER ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'before' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ );
     #
     def goal_body
       # -> uncomment the next line to manually enable rule tracing
@@ -5073,7 +5077,7 @@ module SfpLang
       tree_for_NL244 = nil
 
       begin
-      # at line 423:2: ( ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ ) | ( 'always' | 'global' ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'sometime' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'within' NUMBER ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'after' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* ( 'then' | 'within' NUMBER ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'before' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ )
+      # at line 427:2: ( ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ ) | ( 'always' | 'global' ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'sometime' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'within' NUMBER ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'after' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* ( 'then' | 'within' NUMBER ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ | 'before' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+ )
       alt_99 = 6
       case look_99 = @input.peek( 1 )
       when ID, T__53, T__56, T__57, T__58, T__62, T__72, T__82 then alt_99 = 1
@@ -5091,15 +5095,15 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 423:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )
-        # at line 423:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )
-        # at line 424:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+
-        # at line 424:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
+        # at line 427:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )
+        # at line 427:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )
+        # at line 428:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+
+        # at line 428:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
         alt_75 = 4
         alt_75 = @dfa75.predict( @input )
         case alt_75
         when 1
-          # at line 424:6: constraint_statement
+          # at line 428:6: constraint_statement
           @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_goal_body_1187 )
           constraint_statement188 = constraint_statement
           @state.following.pop
@@ -5114,7 +5118,7 @@ module SfpLang
 
 
         when 2
-          # at line 428:6: constraint_namespace
+          # at line 432:6: constraint_namespace
           @state.following.push( TOKENS_FOLLOWING_constraint_namespace_IN_goal_body_1200 )
           constraint_namespace189 = constraint_namespace
           @state.following.pop
@@ -5122,7 +5126,7 @@ module SfpLang
 
 
         when 3
-          # at line 429:6: constraint_iterator
+          # at line 433:6: constraint_iterator
           @state.following.push( TOKENS_FOLLOWING_constraint_iterator_IN_goal_body_1207 )
           constraint_iterator190 = constraint_iterator
           @state.following.pop
@@ -5130,7 +5134,7 @@ module SfpLang
 
 
         when 4
-          # at line 430:6: constraint_class_quantification
+          # at line 434:6: constraint_class_quantification
           @state.following.push( TOKENS_FOLLOWING_constraint_class_quantification_IN_goal_body_1214 )
           constraint_class_quantification191 = constraint_class_quantification
           @state.following.pop
@@ -5138,7 +5142,7 @@ module SfpLang
 
 
         end
-        # at file 432:3: ( NL )+
+        # at file 436:3: ( NL )+
         match_count_76 = 0
         while true
           alt_76 = 2
@@ -5150,7 +5154,7 @@ module SfpLang
           end
           case alt_76
           when 1
-            # at line 432:3: NL
+            # at line 436:3: NL
             __NL192__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1223 )
             tree_for_NL192 = @adaptor.create_with_payload( __NL192__ )
             @adaptor.add_child( root_0, tree_for_NL192 )
@@ -5174,7 +5178,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 433:4: ( 'always' | 'global' ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
+        # at line 437:4: ( 'always' | 'global' ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
         set193 = @input.look
 
         if @input.peek(1) == T__39 || @input.peek(1) == T__59
@@ -5190,7 +5194,7 @@ module SfpLang
         end
 
 
-        # at line 433:24: ( NL )*
+        # at line 437:24: ( NL )*
         while true # decision 77
           alt_77 = 2
           look_77_0 = @input.peek( 1 )
@@ -5201,7 +5205,7 @@ module SfpLang
           end
           case alt_77
           when 1
-            # at line 433:24: NL
+            # at line 437:24: NL
             __NL194__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1236 )
             tree_for_NL194 = @adaptor.create_with_payload( __NL194__ )
             @adaptor.add_child( root_0, tree_for_NL194 )
@@ -5227,7 +5231,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal195 )
 
 
-        # at line 439:7: ( NL )*
+        # at line 443:7: ( NL )*
         while true # decision 78
           alt_78 = 2
           look_78_0 = @input.peek( 1 )
@@ -5238,7 +5242,7 @@ module SfpLang
           end
           case alt_78
           when 1
-            # at line 439:7: NL
+            # at line 443:7: NL
             __NL196__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1247 )
             tree_for_NL196 = @adaptor.create_with_payload( __NL196__ )
             @adaptor.add_child( root_0, tree_for_NL196 )
@@ -5260,7 +5264,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal198 )
 
 
-        # at file 439:31: ( NL )+
+        # at file 443:31: ( NL )+
         match_count_79 = 0
         while true
           alt_79 = 2
@@ -5272,7 +5276,7 @@ module SfpLang
           end
           case alt_79
           when 1
-            # at line 439:31: NL
+            # at line 443:31: NL
             __NL199__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1254 )
             tree_for_NL199 = @adaptor.create_with_payload( __NL199__ )
             @adaptor.add_child( root_0, tree_for_NL199 )
@@ -5300,13 +5304,13 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 441:4: 'sometime' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
+        # at line 445:4: 'sometime' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
         string_literal200 = match( T__77, TOKENS_FOLLOWING_T__77_IN_goal_body_1264 )
         tree_for_string_literal200 = @adaptor.create_with_payload( string_literal200 )
         @adaptor.add_child( root_0, tree_for_string_literal200 )
 
 
-        # at line 441:15: ( NL )*
+        # at line 445:15: ( NL )*
         while true # decision 80
           alt_80 = 2
           look_80_0 = @input.peek( 1 )
@@ -5317,7 +5321,7 @@ module SfpLang
           end
           case alt_80
           when 1
-            # at line 441:15: NL
+            # at line 445:15: NL
             __NL201__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1266 )
             tree_for_NL201 = @adaptor.create_with_payload( __NL201__ )
             @adaptor.add_child( root_0, tree_for_NL201 )
@@ -5346,7 +5350,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal202 )
 
 
-        # at line 450:7: ( NL )*
+        # at line 454:7: ( NL )*
         while true # decision 81
           alt_81 = 2
           look_81_0 = @input.peek( 1 )
@@ -5357,7 +5361,7 @@ module SfpLang
           end
           case alt_81
           when 1
-            # at line 450:7: NL
+            # at line 454:7: NL
             __NL203__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1277 )
             tree_for_NL203 = @adaptor.create_with_payload( __NL203__ )
             @adaptor.add_child( root_0, tree_for_NL203 )
@@ -5379,7 +5383,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal205 )
 
 
-        # at file 450:31: ( NL )+
+        # at file 454:31: ( NL )+
         match_count_82 = 0
         while true
           alt_82 = 2
@@ -5391,7 +5395,7 @@ module SfpLang
           end
           case alt_82
           when 1
-            # at line 450:31: NL
+            # at line 454:31: NL
             __NL206__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1284 )
             tree_for_NL206 = @adaptor.create_with_payload( __NL206__ )
             @adaptor.add_child( root_0, tree_for_NL206 )
@@ -5424,7 +5428,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 453:4: 'within' NUMBER ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
+        # at line 457:4: 'within' NUMBER ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
         string_literal207 = match( T__83, TOKENS_FOLLOWING_T__83_IN_goal_body_1298 )
         tree_for_string_literal207 = @adaptor.create_with_payload( string_literal207 )
         @adaptor.add_child( root_0, tree_for_string_literal207 )
@@ -5435,7 +5439,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_NUMBER208 )
 
 
-        # at line 453:20: ( NL )*
+        # at line 457:20: ( NL )*
         while true # decision 83
           alt_83 = 2
           look_83_0 = @input.peek( 1 )
@@ -5446,7 +5450,7 @@ module SfpLang
           end
           case alt_83
           when 1
-            # at line 453:20: NL
+            # at line 457:20: NL
             __NL209__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1302 )
             tree_for_NL209 = @adaptor.create_with_payload( __NL209__ )
             @adaptor.add_child( root_0, tree_for_NL209 )
@@ -5473,7 +5477,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal210 )
 
 
-        # at line 460:7: ( NL )*
+        # at line 464:7: ( NL )*
         while true # decision 84
           alt_84 = 2
           look_84_0 = @input.peek( 1 )
@@ -5484,7 +5488,7 @@ module SfpLang
           end
           case alt_84
           when 1
-            # at line 460:7: NL
+            # at line 464:7: NL
             __NL211__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1313 )
             tree_for_NL211 = @adaptor.create_with_payload( __NL211__ )
             @adaptor.add_child( root_0, tree_for_NL211 )
@@ -5506,7 +5510,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal213 )
 
 
-        # at file 460:31: ( NL )+
+        # at file 464:31: ( NL )+
         match_count_85 = 0
         while true
           alt_85 = 2
@@ -5518,7 +5522,7 @@ module SfpLang
           end
           case alt_85
           when 1
-            # at line 460:31: NL
+            # at line 464:31: NL
             __NL214__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1320 )
             tree_for_NL214 = @adaptor.create_with_payload( __NL214__ )
             @adaptor.add_child( root_0, tree_for_NL214 )
@@ -5546,13 +5550,13 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 462:4: 'after' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* ( 'then' | 'within' NUMBER ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
+        # at line 466:4: 'after' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* ( 'then' | 'within' NUMBER ) ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
         string_literal215 = match( T__38, TOKENS_FOLLOWING_T__38_IN_goal_body_1330 )
         tree_for_string_literal215 = @adaptor.create_with_payload( string_literal215 )
         @adaptor.add_child( root_0, tree_for_string_literal215 )
 
 
-        # at line 462:12: ( NL )*
+        # at line 466:12: ( NL )*
         while true # decision 86
           alt_86 = 2
           look_86_0 = @input.peek( 1 )
@@ -5563,7 +5567,7 @@ module SfpLang
           end
           case alt_86
           when 1
-            # at line 462:12: NL
+            # at line 466:12: NL
             __NL216__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1332 )
             tree_for_NL216 = @adaptor.create_with_payload( __NL216__ )
             @adaptor.add_child( root_0, tree_for_NL216 )
@@ -5596,7 +5600,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal217 )
 
 
-        # at line 475:7: ( NL )*
+        # at line 479:7: ( NL )*
         while true # decision 87
           alt_87 = 2
           look_87_0 = @input.peek( 1 )
@@ -5607,7 +5611,7 @@ module SfpLang
           end
           case alt_87
           when 1
-            # at line 475:7: NL
+            # at line 479:7: NL
             __NL218__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1343 )
             tree_for_NL218 = @adaptor.create_with_payload( __NL218__ )
             @adaptor.add_child( root_0, tree_for_NL218 )
@@ -5629,7 +5633,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal220 )
 
 
-        # at line 475:31: ( NL )*
+        # at line 479:31: ( NL )*
         while true # decision 88
           alt_88 = 2
           look_88_0 = @input.peek( 1 )
@@ -5640,7 +5644,7 @@ module SfpLang
           end
           case alt_88
           when 1
-            # at line 475:31: NL
+            # at line 479:31: NL
             __NL221__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1350 )
             tree_for_NL221 = @adaptor.create_with_payload( __NL221__ )
             @adaptor.add_child( root_0, tree_for_NL221 )
@@ -5657,7 +5661,7 @@ module SfpLang
         	self.goto_parent()	
         # <-- action
 
-        # at line 477:3: ( 'then' | 'within' NUMBER )
+        # at line 481:3: ( 'then' | 'within' NUMBER )
         alt_89 = 2
         look_89_0 = @input.peek( 1 )
 
@@ -5671,7 +5675,7 @@ module SfpLang
         end
         case alt_89
         when 1
-          # at line 477:5: 'then'
+          # at line 481:5: 'then'
           string_literal222 = match( T__81, TOKENS_FOLLOWING_T__81_IN_goal_body_1361 )
           tree_for_string_literal222 = @adaptor.create_with_payload( string_literal222 )
           @adaptor.add_child( root_0, tree_for_string_literal222 )
@@ -5679,7 +5683,7 @@ module SfpLang
 
 
         when 2
-          # at line 478:6: 'within' NUMBER
+          # at line 482:6: 'within' NUMBER
           string_literal223 = match( T__83, TOKENS_FOLLOWING_T__83_IN_goal_body_1368 )
           tree_for_string_literal223 = @adaptor.create_with_payload( string_literal223 )
           @adaptor.add_child( root_0, tree_for_string_literal223 )
@@ -5697,7 +5701,7 @@ module SfpLang
 
 
         end
-        # at line 480:5: ( NL )*
+        # at line 484:5: ( NL )*
         while true # decision 90
           alt_90 = 2
           look_90_0 = @input.peek( 1 )
@@ -5708,7 +5712,7 @@ module SfpLang
           end
           case alt_90
           when 1
-            # at line 480:5: NL
+            # at line 484:5: NL
             __NL225__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1382 )
             tree_for_NL225 = @adaptor.create_with_payload( __NL225__ )
             @adaptor.add_child( root_0, tree_for_NL225 )
@@ -5733,7 +5737,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal226 )
 
 
-        # at line 485:7: ( NL )*
+        # at line 489:7: ( NL )*
         while true # decision 91
           alt_91 = 2
           look_91_0 = @input.peek( 1 )
@@ -5744,7 +5748,7 @@ module SfpLang
           end
           case alt_91
           when 1
-            # at line 485:7: NL
+            # at line 489:7: NL
             __NL227__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1393 )
             tree_for_NL227 = @adaptor.create_with_payload( __NL227__ )
             @adaptor.add_child( root_0, tree_for_NL227 )
@@ -5766,7 +5770,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal229 )
 
 
-        # at file 485:31: ( NL )+
+        # at file 489:31: ( NL )+
         match_count_92 = 0
         while true
           alt_92 = 2
@@ -5778,7 +5782,7 @@ module SfpLang
           end
           case alt_92
           when 1
-            # at line 485:31: NL
+            # at line 489:31: NL
             __NL230__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1400 )
             tree_for_NL230 = @adaptor.create_with_payload( __NL230__ )
             @adaptor.add_child( root_0, tree_for_NL230 )
@@ -5816,13 +5820,13 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 489:4: 'before' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
+        # at line 493:4: 'before' ( NL )* '{' ( NL )* constraint_body '}' ( NL )* 'then' ( NL )* '{' ( NL )* constraint_body '}' ( NL )+
         string_literal231 = match( T__43, TOKENS_FOLLOWING_T__43_IN_goal_body_1418 )
         tree_for_string_literal231 = @adaptor.create_with_payload( string_literal231 )
         @adaptor.add_child( root_0, tree_for_string_literal231 )
 
 
-        # at line 489:13: ( NL )*
+        # at line 493:13: ( NL )*
         while true # decision 93
           alt_93 = 2
           look_93_0 = @input.peek( 1 )
@@ -5833,7 +5837,7 @@ module SfpLang
           end
           case alt_93
           when 1
-            # at line 489:13: NL
+            # at line 493:13: NL
             __NL232__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1420 )
             tree_for_NL232 = @adaptor.create_with_payload( __NL232__ )
             @adaptor.add_child( root_0, tree_for_NL232 )
@@ -5861,7 +5865,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal233 )
 
 
-        # at line 497:7: ( NL )*
+        # at line 501:7: ( NL )*
         while true # decision 94
           alt_94 = 2
           look_94_0 = @input.peek( 1 )
@@ -5872,7 +5876,7 @@ module SfpLang
           end
           case alt_94
           when 1
-            # at line 497:7: NL
+            # at line 501:7: NL
             __NL234__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1431 )
             tree_for_NL234 = @adaptor.create_with_payload( __NL234__ )
             @adaptor.add_child( root_0, tree_for_NL234 )
@@ -5894,7 +5898,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal236 )
 
 
-        # at line 497:31: ( NL )*
+        # at line 501:31: ( NL )*
         while true # decision 95
           alt_95 = 2
           look_95_0 = @input.peek( 1 )
@@ -5905,7 +5909,7 @@ module SfpLang
           end
           case alt_95
           when 1
-            # at line 497:31: NL
+            # at line 501:31: NL
             __NL237__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1438 )
             tree_for_NL237 = @adaptor.create_with_payload( __NL237__ )
             @adaptor.add_child( root_0, tree_for_NL237 )
@@ -5927,7 +5931,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_string_literal238 )
 
 
-        # at line 499:10: ( NL )*
+        # at line 503:10: ( NL )*
         while true # decision 96
           alt_96 = 2
           look_96_0 = @input.peek( 1 )
@@ -5938,7 +5942,7 @@ module SfpLang
           end
           case alt_96
           when 1
-            # at line 499:10: NL
+            # at line 503:10: NL
             __NL239__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1449 )
             tree_for_NL239 = @adaptor.create_with_payload( __NL239__ )
             @adaptor.add_child( root_0, tree_for_NL239 )
@@ -5963,7 +5967,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal240 )
 
 
-        # at line 504:7: ( NL )*
+        # at line 508:7: ( NL )*
         while true # decision 97
           alt_97 = 2
           look_97_0 = @input.peek( 1 )
@@ -5974,7 +5978,7 @@ module SfpLang
           end
           case alt_97
           when 1
-            # at line 504:7: NL
+            # at line 508:7: NL
             __NL241__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1460 )
             tree_for_NL241 = @adaptor.create_with_payload( __NL241__ )
             @adaptor.add_child( root_0, tree_for_NL241 )
@@ -5996,7 +6000,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal243 )
 
 
-        # at file 504:31: ( NL )+
+        # at file 508:31: ( NL )+
         match_count_98 = 0
         while true
           alt_98 = 2
@@ -6008,7 +6012,7 @@ module SfpLang
           end
           case alt_98
           when 1
-            # at line 504:31: NL
+            # at line 508:31: NL
             __NL244__ = match( NL, TOKENS_FOLLOWING_NL_IN_goal_body_1467 )
             tree_for_NL244 = @adaptor.create_with_payload( __NL244__ )
             @adaptor.add_child( root_0, tree_for_NL244 )
@@ -6068,7 +6072,7 @@ module SfpLang
     # parser rule nested_constraint
     #
     # (in SfpLang.g)
-    # 509:1: nested_constraint : '{' ( NL )* constraint_body '}' ;
+    # 513:1: nested_constraint : '{' ( NL )* constraint_body '}' ;
     #
     def nested_constraint
       # -> uncomment the next line to manually enable rule tracing
@@ -6097,13 +6101,13 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 510:4: '{' ( NL )* constraint_body '}'
+      # at line 514:4: '{' ( NL )* constraint_body '}'
       char_literal245 = match( T__84, TOKENS_FOLLOWING_T__84_IN_nested_constraint_1487 )
       tree_for_char_literal245 = @adaptor.create_with_payload( char_literal245 )
       @adaptor.add_child( root_0, tree_for_char_literal245 )
 
 
-      # at line 510:8: ( NL )*
+      # at line 514:8: ( NL )*
       while true # decision 100
         alt_100 = 2
         look_100_0 = @input.peek( 1 )
@@ -6114,7 +6118,7 @@ module SfpLang
         end
         case alt_100
         when 1
-          # at line 510:8: NL
+          # at line 514:8: NL
           __NL246__ = match( NL, TOKENS_FOLLOWING_NL_IN_nested_constraint_1489 )
           tree_for_NL246 = @adaptor.create_with_payload( __NL246__ )
           @adaptor.add_child( root_0, tree_for_NL246 )
@@ -6167,7 +6171,7 @@ module SfpLang
     # parser rule constraint
     #
     # (in SfpLang.g)
-    # 513:1: constraint : 'constraint' ID '{' ( NL )* constraint_body '}' ;
+    # 517:1: constraint : 'constraint' ID '{' ( NL )* constraint_body '}' ;
     #
     def constraint
       # -> uncomment the next line to manually enable rule tracing
@@ -6200,7 +6204,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 514:4: 'constraint' ID '{' ( NL )* constraint_body '}'
+      # at line 518:4: 'constraint' ID '{' ( NL )* constraint_body '}'
       string_literal249 = match( T__47, TOKENS_FOLLOWING_T__47_IN_constraint_1505 )
       tree_for_string_literal249 = @adaptor.create_with_payload( string_literal249 )
       @adaptor.add_child( root_0, tree_for_string_literal249 )
@@ -6224,7 +6228,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal251 )
 
 
-      # at line 519:7: ( NL )*
+      # at line 523:7: ( NL )*
       while true # decision 101
         alt_101 = 2
         look_101_0 = @input.peek( 1 )
@@ -6235,7 +6239,7 @@ module SfpLang
         end
         case alt_101
         when 1
-          # at line 519:7: NL
+          # at line 523:7: NL
           __NL252__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_1517 )
           tree_for_NL252 = @adaptor.create_with_payload( __NL252__ )
           @adaptor.add_child( root_0, tree_for_NL252 )
@@ -6293,7 +6297,7 @@ module SfpLang
     # parser rule constraint_body
     #
     # (in SfpLang.g)
-    # 523:1: constraint_body : ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )* ;
+    # 527:1: constraint_body : ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )* ;
     #
     def constraint_body
       # -> uncomment the next line to manually enable rule tracing
@@ -6321,8 +6325,8 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 524:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )*
-      # at line 524:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )*
+      # at line 528:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )*
+      # at line 528:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )*
       while true # decision 104
         alt_104 = 2
         look_104_0 = @input.peek( 1 )
@@ -6333,13 +6337,13 @@ module SfpLang
         end
         case alt_104
         when 1
-          # at line 525:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+
-          # at line 525:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
+          # at line 529:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+
+          # at line 529:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
           alt_102 = 4
           alt_102 = @dfa102.predict( @input )
           case alt_102
           when 1
-            # at line 525:6: constraint_statement
+            # at line 529:6: constraint_statement
             @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_constraint_body_1544 )
             constraint_statement255 = constraint_statement
             @state.following.pop
@@ -6354,7 +6358,7 @@ module SfpLang
 
 
           when 2
-            # at line 529:6: constraint_namespace
+            # at line 533:6: constraint_namespace
             @state.following.push( TOKENS_FOLLOWING_constraint_namespace_IN_constraint_body_1557 )
             constraint_namespace256 = constraint_namespace
             @state.following.pop
@@ -6362,7 +6366,7 @@ module SfpLang
 
 
           when 3
-            # at line 530:6: constraint_iterator
+            # at line 534:6: constraint_iterator
             @state.following.push( TOKENS_FOLLOWING_constraint_iterator_IN_constraint_body_1564 )
             constraint_iterator257 = constraint_iterator
             @state.following.pop
@@ -6370,7 +6374,7 @@ module SfpLang
 
 
           when 4
-            # at line 531:6: constraint_class_quantification
+            # at line 535:6: constraint_class_quantification
             @state.following.push( TOKENS_FOLLOWING_constraint_class_quantification_IN_constraint_body_1571 )
             constraint_class_quantification258 = constraint_class_quantification
             @state.following.pop
@@ -6378,7 +6382,7 @@ module SfpLang
 
 
           end
-          # at file 533:3: ( NL )+
+          # at file 537:3: ( NL )+
           match_count_103 = 0
           while true
             alt_103 = 2
@@ -6390,7 +6394,7 @@ module SfpLang
             end
             case alt_103
             when 1
-              # at line 533:3: NL
+              # at line 537:3: NL
               __NL259__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_body_1580 )
               tree_for_NL259 = @adaptor.create_with_payload( __NL259__ )
               @adaptor.add_child( root_0, tree_for_NL259 )
@@ -6445,7 +6449,7 @@ module SfpLang
     # parser rule constraint_namespace
     #
     # (in SfpLang.g)
-    # 536:1: constraint_namespace : path ( NL )* '{' ( NL )* ( constraint_statement ( NL )+ )* '}' ;
+    # 540:1: constraint_namespace : path ( NL )* '{' ( NL )* ( constraint_statement ( NL )+ )* '}' ;
     #
     def constraint_namespace
       # -> uncomment the next line to manually enable rule tracing
@@ -6479,13 +6483,13 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 537:4: path ( NL )* '{' ( NL )* ( constraint_statement ( NL )+ )* '}'
+      # at line 541:4: path ( NL )* '{' ( NL )* ( constraint_statement ( NL )+ )* '}'
       @state.following.push( TOKENS_FOLLOWING_path_IN_constraint_namespace_1594 )
       path260 = path
       @state.following.pop
       @adaptor.add_child( root_0, path260.tree )
 
-      # at line 537:9: ( NL )*
+      # at line 541:9: ( NL )*
       while true # decision 105
         alt_105 = 2
         look_105_0 = @input.peek( 1 )
@@ -6496,7 +6500,7 @@ module SfpLang
         end
         case alt_105
         when 1
-          # at line 537:9: NL
+          # at line 541:9: NL
           __NL261__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_namespace_1596 )
           tree_for_NL261 = @adaptor.create_with_payload( __NL261__ )
           @adaptor.add_child( root_0, tree_for_NL261 )
@@ -6513,7 +6517,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal262 )
 
 
-      # at line 537:17: ( NL )*
+      # at line 541:17: ( NL )*
       while true # decision 106
         alt_106 = 2
         look_106_0 = @input.peek( 1 )
@@ -6524,7 +6528,7 @@ module SfpLang
         end
         case alt_106
         when 1
-          # at line 537:17: NL
+          # at line 541:17: NL
           __NL263__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_namespace_1601 )
           tree_for_NL263 = @adaptor.create_with_payload( __NL263__ )
           @adaptor.add_child( root_0, tree_for_NL263 )
@@ -6536,7 +6540,7 @@ module SfpLang
         end
       end # loop for decision 106
 
-      # at line 537:21: ( constraint_statement ( NL )+ )*
+      # at line 541:21: ( constraint_statement ( NL )+ )*
       while true # decision 108
         alt_108 = 2
         look_108_0 = @input.peek( 1 )
@@ -6547,7 +6551,7 @@ module SfpLang
         end
         case alt_108
         when 1
-          # at line 537:22: constraint_statement ( NL )+
+          # at line 541:22: constraint_statement ( NL )+
           @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_constraint_namespace_1605 )
           constraint_statement264 = constraint_statement
           @state.following.pop
@@ -6561,7 +6565,7 @@ module SfpLang
           		
           # <-- action
 
-          # at file 542:3: ( NL )+
+          # at file 546:3: ( NL )+
           match_count_107 = 0
           while true
             alt_107 = 2
@@ -6573,7 +6577,7 @@ module SfpLang
             end
             case alt_107
             when 1
-              # at line 542:3: NL
+              # at line 546:3: NL
               __NL265__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_namespace_1613 )
               tree_for_NL265 = @adaptor.create_with_payload( __NL265__ )
               @adaptor.add_child( root_0, tree_for_NL265 )
@@ -6633,7 +6637,7 @@ module SfpLang
     # parser rule constraint_iterator
     #
     # (in SfpLang.g)
-    # 545:1: constraint_iterator : 'foreach' '(' path 'as' ID ')' ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ )* '}' ;
+    # 549:1: constraint_iterator : 'foreach' '(' path 'as' ID ')' ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ )* '}' ;
     #
     def constraint_iterator
       # -> uncomment the next line to manually enable rule tracing
@@ -6677,7 +6681,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 546:4: 'foreach' '(' path 'as' ID ')' ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ )* '}'
+      # at line 550:4: 'foreach' '(' path 'as' ID ')' ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ )* '}'
       string_literal267 = match( T__57, TOKENS_FOLLOWING_T__57_IN_constraint_iterator_1629 )
       tree_for_string_literal267 = @adaptor.create_with_payload( string_literal267 )
       @adaptor.add_child( root_0, tree_for_string_literal267 )
@@ -6708,7 +6712,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal272 )
 
 
-      # at line 546:35: ( NL )*
+      # at line 550:35: ( NL )*
       while true # decision 109
         alt_109 = 2
         look_109_0 = @input.peek( 1 )
@@ -6719,7 +6723,7 @@ module SfpLang
         end
         case alt_109
         when 1
-          # at line 546:35: NL
+          # at line 550:35: NL
           __NL273__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_iterator_1641 )
           tree_for_NL273 = @adaptor.create_with_payload( __NL273__ )
           @adaptor.add_child( root_0, tree_for_NL273 )
@@ -6736,7 +6740,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal274 )
 
 
-      # at file 546:43: ( NL )+
+      # at file 550:43: ( NL )+
       match_count_110 = 0
       while true
         alt_110 = 2
@@ -6748,7 +6752,7 @@ module SfpLang
         end
         case alt_110
         when 1
-          # at line 546:43: NL
+          # at line 550:43: NL
           __NL275__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_iterator_1646 )
           tree_for_NL275 = @adaptor.create_with_payload( __NL275__ )
           @adaptor.add_child( root_0, tree_for_NL275 )
@@ -6781,7 +6785,7 @@ module SfpLang
       		
       # <-- action
 
-      # at line 558:3: ( constraint_statement ( NL )+ )*
+      # at line 562:3: ( constraint_statement ( NL )+ )*
       while true # decision 112
         alt_112 = 2
         look_112_0 = @input.peek( 1 )
@@ -6792,7 +6796,7 @@ module SfpLang
         end
         case alt_112
         when 1
-          # at line 558:4: constraint_statement ( NL )+
+          # at line 562:4: constraint_statement ( NL )+
           @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_constraint_iterator_1656 )
           constraint_statement276 = constraint_statement
           @state.following.pop
@@ -6805,7 +6809,7 @@ module SfpLang
           		
           # <-- action
 
-          # at file 562:3: ( NL )+
+          # at file 566:3: ( NL )+
           match_count_111 = 0
           while true
             alt_111 = 2
@@ -6817,7 +6821,7 @@ module SfpLang
             end
             case alt_111
             when 1
-              # at line 562:3: NL
+              # at line 566:3: NL
               __NL277__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_iterator_1664 )
               tree_for_NL277 = @adaptor.create_with_payload( __NL277__ )
               @adaptor.add_child( root_0, tree_for_NL277 )
@@ -6885,7 +6889,7 @@ module SfpLang
     # parser rule quantification_keyword
     #
     # (in SfpLang.g)
-    # 570:1: quantification_keyword : ( 'forall' | 'exist' | 'forsome' );
+    # 574:1: quantification_keyword : ( 'forall' | 'exist' | 'forsome' );
     #
     def quantification_keyword
       # -> uncomment the next line to manually enable rule tracing
@@ -6956,7 +6960,7 @@ module SfpLang
     # parser rule constraint_class_quantification
     #
     # (in SfpLang.g)
-    # 576:1: constraint_class_quantification : quantification_keyword '(' path 'as' ID ')' ( ( binary_comp | '=' ) NUMBER )? ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )* '}' ;
+    # 580:1: constraint_class_quantification : quantification_keyword '(' path 'as' ID ')' ( ( binary_comp | '=' ) NUMBER )? ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )* '}' ;
     #
     def constraint_class_quantification
       # -> uncomment the next line to manually enable rule tracing
@@ -7010,7 +7014,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 577:4: quantification_keyword '(' path 'as' ID ')' ( ( binary_comp | '=' ) NUMBER )? ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )* '}'
+      # at line 581:4: quantification_keyword '(' path 'as' ID ')' ( ( binary_comp | '=' ) NUMBER )? ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )* '}'
       @state.following.push( TOKENS_FOLLOWING_quantification_keyword_IN_constraint_class_quantification_1707 )
       quantification_keyword280 = quantification_keyword
       @state.following.pop
@@ -7060,7 +7064,7 @@ module SfpLang
       		
       # <-- action
 
-      # at line 593:3: ( ( binary_comp | '=' ) NUMBER )?
+      # at line 597:3: ( ( binary_comp | '=' ) NUMBER )?
       alt_114 = 2
       look_114_0 = @input.peek( 1 )
 
@@ -7069,8 +7073,8 @@ module SfpLang
       end
       case alt_114
       when 1
-        # at line 593:5: ( binary_comp | '=' ) NUMBER
-        # at line 593:5: ( binary_comp | '=' )
+        # at line 597:5: ( binary_comp | '=' ) NUMBER
+        # at line 597:5: ( binary_comp | '=' )
         alt_113 = 2
         look_113_0 = @input.peek( 1 )
 
@@ -7084,7 +7088,7 @@ module SfpLang
         end
         case alt_113
         when 1
-          # at line 593:7: binary_comp
+          # at line 597:7: binary_comp
           @state.following.push( TOKENS_FOLLOWING_binary_comp_IN_constraint_class_quantification_1729 )
           binary_comp286 = binary_comp
           @state.following.pop
@@ -7097,7 +7101,7 @@ module SfpLang
 
 
         when 2
-          # at line 595:6: '='
+          # at line 599:6: '='
           char_literal287 = match( T__31, TOKENS_FOLLOWING_T__31_IN_constraint_class_quantification_1742 )
           tree_for_char_literal287 = @adaptor.create_with_payload( char_literal287 )
           @adaptor.add_child( root_0, tree_for_char_literal287 )
@@ -7122,7 +7126,7 @@ module SfpLang
 
 
       end
-      # at line 601:3: ( NL )*
+      # at line 605:3: ( NL )*
       while true # decision 115
         alt_115 = 2
         look_115_0 = @input.peek( 1 )
@@ -7133,7 +7137,7 @@ module SfpLang
         end
         case alt_115
         when 1
-          # at line 601:3: NL
+          # at line 605:3: NL
           __NL289__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1772 )
           tree_for_NL289 = @adaptor.create_with_payload( __NL289__ )
           @adaptor.add_child( root_0, tree_for_NL289 )
@@ -7150,7 +7154,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal290 )
 
 
-      # at file 601:11: ( NL )+
+      # at file 605:11: ( NL )+
       match_count_116 = 0
       while true
         alt_116 = 2
@@ -7162,7 +7166,7 @@ module SfpLang
         end
         case alt_116
         when 1
-          # at line 601:11: NL
+          # at line 605:11: NL
           __NL291__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1777 )
           tree_for_NL291 = @adaptor.create_with_payload( __NL291__ )
           @adaptor.add_child( root_0, tree_for_NL291 )
@@ -7180,7 +7184,7 @@ module SfpLang
       end
 
 
-      # at line 602:3: ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )*
+      # at line 606:3: ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )*
       while true # decision 120
         alt_120 = 4
         case look_120 = @input.peek( 1 )
@@ -7190,7 +7194,7 @@ module SfpLang
         end
         case alt_120
         when 1
-          # at line 602:5: constraint_statement ( NL )+
+          # at line 606:5: constraint_statement ( NL )+
           @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_constraint_class_quantification_1784 )
           constraint_statement292 = constraint_statement
           @state.following.pop
@@ -7201,7 +7205,7 @@ module SfpLang
           	@now[( constraint_statement292.nil? ? nil : constraint_statement292.key )] = ( constraint_statement292.nil? ? nil : constraint_statement292.val )	
           # <-- action
 
-          # at file 604:4: ( NL )+
+          # at file 608:4: ( NL )+
           match_count_117 = 0
           while true
             alt_117 = 2
@@ -7213,7 +7217,7 @@ module SfpLang
             end
             case alt_117
             when 1
-              # at line 604:4: NL
+              # at line 608:4: NL
               __NL293__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1794 )
               tree_for_NL293 = @adaptor.create_with_payload( __NL293__ )
               @adaptor.add_child( root_0, tree_for_NL293 )
@@ -7233,13 +7237,13 @@ module SfpLang
 
 
         when 2
-          # at line 605:5: constraint_different ( NL )+
+          # at line 609:5: constraint_different ( NL )+
           @state.following.push( TOKENS_FOLLOWING_constraint_different_IN_constraint_class_quantification_1801 )
           constraint_different294 = constraint_different
           @state.following.pop
           @adaptor.add_child( root_0, constraint_different294.tree )
 
-          # at file 605:26: ( NL )+
+          # at file 609:26: ( NL )+
           match_count_118 = 0
           while true
             alt_118 = 2
@@ -7251,7 +7255,7 @@ module SfpLang
             end
             case alt_118
             when 1
-              # at line 605:26: NL
+              # at line 609:26: NL
               __NL295__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1803 )
               tree_for_NL295 = @adaptor.create_with_payload( __NL295__ )
               @adaptor.add_child( root_0, tree_for_NL295 )
@@ -7271,13 +7275,13 @@ module SfpLang
 
 
         when 3
-          # at line 606:5: constraint_iterator ( NL )+
+          # at line 610:5: constraint_iterator ( NL )+
           @state.following.push( TOKENS_FOLLOWING_constraint_iterator_IN_constraint_class_quantification_1810 )
           constraint_iterator296 = constraint_iterator
           @state.following.pop
           @adaptor.add_child( root_0, constraint_iterator296.tree )
 
-          # at file 606:25: ( NL )+
+          # at file 610:25: ( NL )+
           match_count_119 = 0
           while true
             alt_119 = 2
@@ -7289,7 +7293,7 @@ module SfpLang
             end
             case alt_119
             when 1
-              # at line 606:25: NL
+              # at line 610:25: NL
               __NL297__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1812 )
               tree_for_NL297 = @adaptor.create_with_payload( __NL297__ )
               @adaptor.add_child( root_0, tree_for_NL297 )
@@ -7359,7 +7363,7 @@ module SfpLang
     # parser rule constraint_different
     #
     # (in SfpLang.g)
-    # 612:1: constraint_different : ':different' '(' path ')' ;
+    # 616:1: constraint_different : ':different' '(' path ')' ;
     #
     def constraint_different
       # -> uncomment the next line to manually enable rule tracing
@@ -7388,7 +7392,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 613:4: ':different' '(' path ')'
+      # at line 617:4: ':different' '(' path ')'
       string_literal299 = match( T__28, TOKENS_FOLLOWING_T__28_IN_constraint_different_1839 )
       tree_for_string_literal299 = @adaptor.create_with_payload( string_literal299 )
       @adaptor.add_child( root_0, tree_for_string_literal299 )
@@ -7453,7 +7457,7 @@ module SfpLang
     # parser rule constraint_statement
     #
     # (in SfpLang.g)
-    # 625:1: constraint_statement returns [key, val] : ( reference | 'not' reference | reference equals_op value | reference equals_op NULL | reference not_equals_op value | reference not_equals_op NULL | conditional_constraint | reference ( 'is' )? 'in' set_value | reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value | reference 'has' value | reference binary_comp comp_value | total_constraint );
+    # 629:1: constraint_statement returns [key, val] : ( reference | 'not' reference | reference equals_op value | reference equals_op NULL | reference not_equals_op value | reference not_equals_op NULL | conditional_constraint | reference ( 'is' )? 'in' set_value | reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value | reference 'has' value | reference binary_comp comp_value | total_constraint );
     #
     def constraint_statement
       # -> uncomment the next line to manually enable rule tracing
@@ -7511,7 +7515,7 @@ module SfpLang
       tree_for_string_literal328 = nil
 
       begin
-      # at line 626:2: ( reference | 'not' reference | reference equals_op value | reference equals_op NULL | reference not_equals_op value | reference not_equals_op NULL | conditional_constraint | reference ( 'is' )? 'in' set_value | reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value | reference 'has' value | reference binary_comp comp_value | total_constraint )
+      # at line 630:2: ( reference | 'not' reference | reference equals_op value | reference equals_op NULL | reference not_equals_op value | reference not_equals_op NULL | conditional_constraint | reference ( 'is' )? 'in' set_value | reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value | reference 'has' value | reference binary_comp comp_value | total_constraint )
       alt_122 = 12
       alt_122 = @dfa122.predict( @input )
       case alt_122
@@ -7519,7 +7523,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 626:4: reference
+        # at line 630:4: reference
         @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1864 )
         reference303 = reference
         @state.following.pop
@@ -7538,7 +7542,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 631:4: 'not' reference
+        # at line 635:4: 'not' reference
         string_literal304 = match( T__72, TOKENS_FOLLOWING_T__72_IN_constraint_statement_1873 )
         tree_for_string_literal304 = @adaptor.create_with_payload( string_literal304 )
         @adaptor.add_child( root_0, tree_for_string_literal304 )
@@ -7562,7 +7566,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 636:4: reference equals_op value
+        # at line 640:4: reference equals_op value
         @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1884 )
         reference306 = reference
         @state.following.pop
@@ -7591,7 +7595,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 641:4: reference equals_op NULL
+        # at line 645:4: reference equals_op NULL
         @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1897 )
         reference309 = reference
         @state.following.pop
@@ -7620,7 +7624,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 646:4: reference not_equals_op value
+        # at line 650:4: reference not_equals_op value
         @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1910 )
         reference312 = reference
         @state.following.pop
@@ -7649,7 +7653,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 651:4: reference not_equals_op NULL
+        # at line 655:4: reference not_equals_op NULL
         @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1923 )
         reference315 = reference
         @state.following.pop
@@ -7678,7 +7682,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 656:4: conditional_constraint
+        # at line 660:4: conditional_constraint
         @state.following.push( TOKENS_FOLLOWING_conditional_constraint_IN_constraint_statement_1936 )
         conditional_constraint318 = conditional_constraint
         @state.following.pop
@@ -7697,13 +7701,13 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 661:4: reference ( 'is' )? 'in' set_value
+        # at line 665:4: reference ( 'is' )? 'in' set_value
         @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1945 )
         reference319 = reference
         @state.following.pop
         @adaptor.add_child( root_0, reference319.tree )
 
-        # at line 661:14: ( 'is' )?
+        # at line 665:14: ( 'is' )?
         alt_121 = 2
         look_121_0 = @input.peek( 1 )
 
@@ -7712,7 +7716,7 @@ module SfpLang
         end
         case alt_121
         when 1
-          # at line 661:14: 'is'
+          # at line 665:14: 'is'
           string_literal320 = match( T__65, TOKENS_FOLLOWING_T__65_IN_constraint_statement_1947 )
           tree_for_string_literal320 = @adaptor.create_with_payload( string_literal320 )
           @adaptor.add_child( root_0, tree_for_string_literal320 )
@@ -7750,7 +7754,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 673:4: reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value
+        # at line 677:4: reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value
         @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1961 )
         reference323 = reference
         @state.following.pop
@@ -7805,7 +7809,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 688:4: reference 'has' value
+        # at line 692:4: reference 'has' value
         @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1982 )
         reference327 = reference
         @state.following.pop
@@ -7838,7 +7842,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 697:4: reference binary_comp comp_value
+        # at line 701:4: reference binary_comp comp_value
         @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1995 )
         reference330 = reference
         @state.following.pop
@@ -7867,7 +7871,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 702:4: total_constraint
+        # at line 706:4: total_constraint
         @state.following.push( TOKENS_FOLLOWING_total_constraint_IN_constraint_statement_2008 )
         total_constraint333 = total_constraint
         @state.following.pop
@@ -7905,7 +7909,7 @@ module SfpLang
     # parser rule total_constraint
     #
     # (in SfpLang.g)
-    # 705:1: total_constraint : 'total(' total_statement ')' binary_comp NUMBER ;
+    # 709:1: total_constraint : 'total(' total_statement ')' binary_comp NUMBER ;
     #
     def total_constraint
       # -> uncomment the next line to manually enable rule tracing
@@ -7935,7 +7939,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 706:4: 'total(' total_statement ')' binary_comp NUMBER
+      # at line 710:4: 'total(' total_statement ')' binary_comp NUMBER
       string_literal334 = match( T__82, TOKENS_FOLLOWING_T__82_IN_total_constraint_2019 )
       tree_for_string_literal334 = @adaptor.create_with_payload( string_literal334 )
       @adaptor.add_child( root_0, tree_for_string_literal334 )
@@ -7992,7 +7996,7 @@ module SfpLang
     # parser rule total_statement
     #
     # (in SfpLang.g)
-    # 709:1: total_statement : reference equals_op value ;
+    # 713:1: total_statement : reference equals_op value ;
     #
     def total_statement
       # -> uncomment the next line to manually enable rule tracing
@@ -8017,7 +8021,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 710:4: reference equals_op value
+      # at line 714:4: reference equals_op value
       @state.following.push( TOKENS_FOLLOWING_reference_IN_total_statement_2038 )
       reference339 = reference
       @state.following.pop
@@ -8064,7 +8068,7 @@ module SfpLang
     # parser rule comp_value
     #
     # (in SfpLang.g)
-    # 713:1: comp_value returns [val] : ( NUMBER | reference );
+    # 717:1: comp_value returns [val] : ( NUMBER | reference );
     #
     def comp_value
       # -> uncomment the next line to manually enable rule tracing
@@ -8086,7 +8090,7 @@ module SfpLang
       tree_for_NUMBER342 = nil
 
       begin
-      # at line 714:2: ( NUMBER | reference )
+      # at line 718:2: ( NUMBER | reference )
       alt_123 = 2
       look_123_0 = @input.peek( 1 )
 
@@ -8103,7 +8107,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 714:4: NUMBER
+        # at line 718:4: NUMBER
         __NUMBER342__ = match( NUMBER, TOKENS_FOLLOWING_NUMBER_IN_comp_value_2057 )
         tree_for_NUMBER342 = @adaptor.create_with_payload( __NUMBER342__ )
         @adaptor.add_child( root_0, tree_for_NUMBER342 )
@@ -8119,7 +8123,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 716:4: reference
+        # at line 720:4: reference
         @state.following.push( TOKENS_FOLLOWING_reference_IN_comp_value_2066 )
         reference343 = reference
         @state.following.pop
@@ -8162,7 +8166,7 @@ module SfpLang
     # parser rule conditional_constraint
     #
     # (in SfpLang.g)
-    # 720:1: conditional_constraint returns [key, val] : 'if' conditional_constraint_if_part conditional_constraint_then_part ;
+    # 724:1: conditional_constraint returns [key, val] : 'if' conditional_constraint_if_part conditional_constraint_then_part ;
     #
     def conditional_constraint
       # -> uncomment the next line to manually enable rule tracing
@@ -8188,7 +8192,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 721:4: 'if' conditional_constraint_if_part conditional_constraint_then_part
+      # at line 725:4: 'if' conditional_constraint_if_part conditional_constraint_then_part
       string_literal344 = match( T__62, TOKENS_FOLLOWING_T__62_IN_conditional_constraint_2085 )
       tree_for_string_literal344 = @adaptor.create_with_payload( string_literal344 )
       @adaptor.add_child( root_0, tree_for_string_literal344 )
@@ -8249,7 +8253,7 @@ module SfpLang
     # parser rule conditional_constraint_if_part
     #
     # (in SfpLang.g)
-    # 732:1: conditional_constraint_if_part : ( constraint_statement ( NL )* | '{' ( NL )+ constraint_body '}' ( NL )* );
+    # 736:1: conditional_constraint_if_part : ( constraint_statement ( NL )* | '{' ( NL )+ constraint_body '}' ( NL )* );
     #
     def conditional_constraint_if_part
       # -> uncomment the next line to manually enable rule tracing
@@ -8280,7 +8284,7 @@ module SfpLang
       tree_for_NL353 = nil
 
       begin
-      # at line 733:2: ( constraint_statement ( NL )* | '{' ( NL )+ constraint_body '}' ( NL )* )
+      # at line 737:2: ( constraint_statement ( NL )* | '{' ( NL )+ constraint_body '}' ( NL )* )
       alt_127 = 2
       look_127_0 = @input.peek( 1 )
 
@@ -8297,13 +8301,13 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 733:4: constraint_statement ( NL )*
+        # at line 737:4: constraint_statement ( NL )*
         @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_conditional_constraint_if_part_2112 )
         constraint_statement347 = constraint_statement
         @state.following.pop
         @adaptor.add_child( root_0, constraint_statement347.tree )
 
-        # at line 733:25: ( NL )*
+        # at line 737:25: ( NL )*
         while true # decision 124
           alt_124 = 2
           look_124_0 = @input.peek( 1 )
@@ -8314,7 +8318,7 @@ module SfpLang
           end
           case alt_124
           when 1
-            # at line 733:25: NL
+            # at line 737:25: NL
             __NL348__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditional_constraint_if_part_2114 )
             tree_for_NL348 = @adaptor.create_with_payload( __NL348__ )
             @adaptor.add_child( root_0, tree_for_NL348 )
@@ -8341,7 +8345,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 740:4: '{' ( NL )+ constraint_body '}' ( NL )*
+        # at line 744:4: '{' ( NL )+ constraint_body '}' ( NL )*
         char_literal349 = match( T__84, TOKENS_FOLLOWING_T__84_IN_conditional_constraint_if_part_2124 )
         tree_for_char_literal349 = @adaptor.create_with_payload( char_literal349 )
         @adaptor.add_child( root_0, tree_for_char_literal349 )
@@ -8357,7 +8361,7 @@ module SfpLang
         		
         # <-- action
 
-        # at file 747:3: ( NL )+
+        # at file 751:3: ( NL )+
         match_count_125 = 0
         while true
           alt_125 = 2
@@ -8369,7 +8373,7 @@ module SfpLang
           end
           case alt_125
           when 1
-            # at line 747:3: NL
+            # at line 751:3: NL
             __NL350__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditional_constraint_if_part_2132 )
             tree_for_NL350 = @adaptor.create_with_payload( __NL350__ )
             @adaptor.add_child( root_0, tree_for_NL350 )
@@ -8397,7 +8401,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal352 )
 
 
-        # at line 748:7: ( NL )*
+        # at line 752:7: ( NL )*
         while true # decision 126
           alt_126 = 2
           look_126_0 = @input.peek( 1 )
@@ -8408,7 +8412,7 @@ module SfpLang
           end
           case alt_126
           when 1
-            # at line 748:7: NL
+            # at line 752:7: NL
             __NL353__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditional_constraint_if_part_2141 )
             tree_for_NL353 = @adaptor.create_with_payload( __NL353__ )
             @adaptor.add_child( root_0, tree_for_NL353 )
@@ -8457,7 +8461,7 @@ module SfpLang
     # parser rule conditional_constraint_then_part
     #
     # (in SfpLang.g)
-    # 752:1: conditional_constraint_then_part : ( 'then' constraint_statement | 'then' '{' ( NL )+ constraint_body '}' );
+    # 756:1: conditional_constraint_then_part : ( 'then' constraint_statement | 'then' '{' ( NL )+ constraint_body '}' );
     #
     def conditional_constraint_then_part
       # -> uncomment the next line to manually enable rule tracing
@@ -8488,7 +8492,7 @@ module SfpLang
       tree_for_char_literal360 = nil
 
       begin
-      # at line 753:2: ( 'then' constraint_statement | 'then' '{' ( NL )+ constraint_body '}' )
+      # at line 757:2: ( 'then' constraint_statement | 'then' '{' ( NL )+ constraint_body '}' )
       alt_129 = 2
       look_129_0 = @input.peek( 1 )
 
@@ -8512,7 +8516,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 753:4: 'then' constraint_statement
+        # at line 757:4: 'then' constraint_statement
         string_literal354 = match( T__81, TOKENS_FOLLOWING_T__81_IN_conditional_constraint_then_part_2157 )
         tree_for_string_literal354 = @adaptor.create_with_payload( string_literal354 )
         @adaptor.add_child( root_0, tree_for_string_literal354 )
@@ -8538,7 +8542,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 760:4: 'then' '{' ( NL )+ constraint_body '}'
+        # at line 764:4: 'then' '{' ( NL )+ constraint_body '}'
         string_literal356 = match( T__81, TOKENS_FOLLOWING_T__81_IN_conditional_constraint_then_part_2168 )
         tree_for_string_literal356 = @adaptor.create_with_payload( string_literal356 )
         @adaptor.add_child( root_0, tree_for_string_literal356 )
@@ -8559,7 +8563,7 @@ module SfpLang
         @adaptor.add_child( root_0, tree_for_char_literal357 )
 
 
-        # at file 767:7: ( NL )+
+        # at file 771:7: ( NL )+
         match_count_128 = 0
         while true
           alt_128 = 2
@@ -8571,7 +8575,7 @@ module SfpLang
           end
           case alt_128
           when 1
-            # at line 767:7: NL
+            # at line 771:7: NL
             __NL358__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditional_constraint_then_part_2178 )
             tree_for_NL358 = @adaptor.create_with_payload( __NL358__ )
             @adaptor.add_child( root_0, tree_for_NL358 )
@@ -8636,7 +8640,7 @@ module SfpLang
     # parser rule effect_body
     #
     # (in SfpLang.g)
-    # 771:1: effect_body : ( ( mutation | mutation_iterator ) ( NL )+ )* ;
+    # 775:1: effect_body : ( ( mutation | mutation_iterator ) ( NL )+ )* ;
     #
     def effect_body
       # -> uncomment the next line to manually enable rule tracing
@@ -8662,8 +8666,8 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 772:4: ( ( mutation | mutation_iterator ) ( NL )+ )*
-      # at line 772:4: ( ( mutation | mutation_iterator ) ( NL )+ )*
+      # at line 776:4: ( ( mutation | mutation_iterator ) ( NL )+ )*
+      # at line 776:4: ( ( mutation | mutation_iterator ) ( NL )+ )*
       while true # decision 132
         alt_132 = 2
         look_132_0 = @input.peek( 1 )
@@ -8674,8 +8678,8 @@ module SfpLang
         end
         case alt_132
         when 1
-          # at line 773:4: ( mutation | mutation_iterator ) ( NL )+
-          # at line 773:4: ( mutation | mutation_iterator )
+          # at line 777:4: ( mutation | mutation_iterator ) ( NL )+
+          # at line 777:4: ( mutation | mutation_iterator )
           alt_130 = 2
           look_130_0 = @input.peek( 1 )
 
@@ -8689,7 +8693,7 @@ module SfpLang
           end
           case alt_130
           when 1
-            # at line 773:6: mutation
+            # at line 777:6: mutation
             @state.following.push( TOKENS_FOLLOWING_mutation_IN_effect_body_2205 )
             mutation361 = mutation
             @state.following.pop
@@ -8702,7 +8706,7 @@ module SfpLang
 
 
           when 2
-            # at line 775:6: mutation_iterator
+            # at line 779:6: mutation_iterator
             @state.following.push( TOKENS_FOLLOWING_mutation_iterator_IN_effect_body_2218 )
             mutation_iterator362 = mutation_iterator
             @state.following.pop
@@ -8710,7 +8714,7 @@ module SfpLang
 
 
           end
-          # at file 777:3: ( NL )+
+          # at file 781:3: ( NL )+
           match_count_131 = 0
           while true
             alt_131 = 2
@@ -8722,7 +8726,7 @@ module SfpLang
             end
             case alt_131
             when 1
-              # at line 777:3: NL
+              # at line 781:3: NL
               __NL363__ = match( NL, TOKENS_FOLLOWING_NL_IN_effect_body_2227 )
               tree_for_NL363 = @adaptor.create_with_payload( __NL363__ )
               @adaptor.add_child( root_0, tree_for_NL363 )
@@ -8777,7 +8781,7 @@ module SfpLang
     # parser rule mutation_iterator
     #
     # (in SfpLang.g)
-    # 780:1: mutation_iterator : 'foreach' path 'as' ID ( NL )* '{' ( NL )+ ( mutation ( NL )+ )* '}' ;
+    # 784:1: mutation_iterator : 'foreach' path 'as' ID ( NL )* '{' ( NL )+ ( mutation ( NL )+ )* '}' ;
     #
     def mutation_iterator
       # -> uncomment the next line to manually enable rule tracing
@@ -8817,7 +8821,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 781:4: 'foreach' path 'as' ID ( NL )* '{' ( NL )+ ( mutation ( NL )+ )* '}'
+      # at line 785:4: 'foreach' path 'as' ID ( NL )* '{' ( NL )+ ( mutation ( NL )+ )* '}'
       string_literal364 = match( T__57, TOKENS_FOLLOWING_T__57_IN_mutation_iterator_2242 )
       tree_for_string_literal364 = @adaptor.create_with_payload( string_literal364 )
       @adaptor.add_child( root_0, tree_for_string_literal364 )
@@ -8838,7 +8842,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_ID367 )
 
 
-      # at line 781:27: ( NL )*
+      # at line 785:27: ( NL )*
       while true # decision 133
         alt_133 = 2
         look_133_0 = @input.peek( 1 )
@@ -8849,7 +8853,7 @@ module SfpLang
         end
         case alt_133
         when 1
-          # at line 781:27: NL
+          # at line 785:27: NL
           __NL368__ = match( NL, TOKENS_FOLLOWING_NL_IN_mutation_iterator_2250 )
           tree_for_NL368 = @adaptor.create_with_payload( __NL368__ )
           @adaptor.add_child( root_0, tree_for_NL368 )
@@ -8866,7 +8870,7 @@ module SfpLang
       @adaptor.add_child( root_0, tree_for_char_literal369 )
 
 
-      # at file 781:35: ( NL )+
+      # at file 785:35: ( NL )+
       match_count_134 = 0
       while true
         alt_134 = 2
@@ -8878,7 +8882,7 @@ module SfpLang
         end
         case alt_134
         when 1
-          # at line 781:35: NL
+          # at line 785:35: NL
           __NL370__ = match( NL, TOKENS_FOLLOWING_NL_IN_mutation_iterator_2255 )
           tree_for_NL370 = @adaptor.create_with_payload( __NL370__ )
           @adaptor.add_child( root_0, tree_for_NL370 )
@@ -8909,7 +8913,7 @@ module SfpLang
       		
       # <-- action
 
-      # at line 791:3: ( mutation ( NL )+ )*
+      # at line 795:3: ( mutation ( NL )+ )*
       while true # decision 136
         alt_136 = 2
         look_136_0 = @input.peek( 1 )
@@ -8920,7 +8924,7 @@ module SfpLang
         end
         case alt_136
         when 1
-          # at line 791:4: mutation ( NL )+
+          # at line 795:4: mutation ( NL )+
           @state.following.push( TOKENS_FOLLOWING_mutation_IN_mutation_iterator_2265 )
           mutation371 = mutation
           @state.following.pop
@@ -8931,7 +8935,7 @@ module SfpLang
           	@now[( mutation371.nil? ? nil : mutation371.key )] = ( mutation371.nil? ? nil : mutation371.val )	
           # <-- action
 
-          # at file 793:3: ( NL )+
+          # at file 797:3: ( NL )+
           match_count_135 = 0
           while true
             alt_135 = 2
@@ -8943,7 +8947,7 @@ module SfpLang
             end
             case alt_135
             when 1
-              # at line 793:3: NL
+              # at line 797:3: NL
               __NL372__ = match( NL, TOKENS_FOLLOWING_NL_IN_mutation_iterator_2273 )
               tree_for_NL372 = @adaptor.create_with_payload( __NL372__ )
               @adaptor.add_child( root_0, tree_for_NL372 )
@@ -9008,7 +9012,7 @@ module SfpLang
     # parser rule mutation
     #
     # (in SfpLang.g)
-    # 798:1: mutation returns [key, val] : ( reference equals_op value | reference equals_op NULL | reference binary_op NUMBER | reference 'is' 'new' path ( object_body )? | 'delete' path | reference 'add(' value ')' | reference 'remove(' value ')' );
+    # 802:1: mutation returns [key, val] : ( reference equals_op value | reference equals_op NULL | reference binary_op NUMBER | reference 'is' 'new' path ( object_body )? | 'delete' path | reference 'add(' value ')' | reference 'remove(' value ')' );
     #
     def mutation
       # -> uncomment the next line to manually enable rule tracing
@@ -9060,7 +9064,7 @@ module SfpLang
       tree_for_char_literal397 = nil
 
       begin
-      # at line 799:2: ( reference equals_op value | reference equals_op NULL | reference binary_op NUMBER | reference 'is' 'new' path ( object_body )? | 'delete' path | reference 'add(' value ')' | reference 'remove(' value ')' )
+      # at line 803:2: ( reference equals_op value | reference equals_op NULL | reference binary_op NUMBER | reference 'is' 'new' path ( object_body )? | 'delete' path | reference 'add(' value ')' | reference 'remove(' value ')' )
       alt_138 = 7
       alt_138 = @dfa138.predict( @input )
       case alt_138
@@ -9068,7 +9072,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 799:4: reference equals_op value
+        # at line 803:4: reference equals_op value
         @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2299 )
         reference374 = reference
         @state.following.pop
@@ -9100,7 +9104,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 807:4: reference equals_op NULL
+        # at line 811:4: reference equals_op NULL
         @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2312 )
         reference377 = reference
         @state.following.pop
@@ -9132,7 +9136,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 815:4: reference binary_op NUMBER
+        # at line 819:4: reference binary_op NUMBER
         @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2325 )
         reference380 = reference
         @state.following.pop
@@ -9164,7 +9168,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 823:4: reference 'is' 'new' path ( object_body )?
+        # at line 827:4: reference 'is' 'new' path ( object_body )?
         @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2338 )
         reference383 = reference
         @state.following.pop
@@ -9198,7 +9202,7 @@ module SfpLang
         		
         # <-- action
 
-        # at line 833:3: ( object_body )?
+        # at line 837:3: ( object_body )?
         alt_137 = 2
         look_137_0 = @input.peek( 1 )
 
@@ -9207,7 +9211,7 @@ module SfpLang
         end
         case alt_137
         when 1
-          # at line 833:3: object_body
+          # at line 837:3: object_body
           @state.following.push( TOKENS_FOLLOWING_object_body_IN_mutation_2352 )
           object_body387 = object_body
           @state.following.pop
@@ -9230,7 +9234,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 840:4: 'delete' path
+        # at line 844:4: 'delete' path
         string_literal388 = match( T__49, TOKENS_FOLLOWING_T__49_IN_mutation_2362 )
         tree_for_string_literal388 = @adaptor.create_with_payload( string_literal388 )
         @adaptor.add_child( root_0, tree_for_string_literal388 )
@@ -9258,7 +9262,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 849:4: reference 'add(' value ')'
+        # at line 853:4: reference 'add(' value ')'
         @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2373 )
         reference390 = reference
         @state.following.pop
@@ -9295,7 +9299,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 857:4: reference 'remove(' value ')'
+        # at line 861:4: reference 'remove(' value ')'
         @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2388 )
         reference394 = reference
         @state.following.pop
@@ -9359,7 +9363,7 @@ module SfpLang
     # parser rule set_value
     #
     # (in SfpLang.g)
-    # 867:1: set_value returns [val] : '(' ( set_item ( ',' ( NL )* set_item )* )? ')' ;
+    # 871:1: set_value returns [val] : '(' ( set_item ( ',' ( NL )* set_item )* )? ')' ;
     #
     def set_value
       # -> uncomment the next line to manually enable rule tracing
@@ -9391,7 +9395,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 868:4: '(' ( set_item ( ',' ( NL )* set_item )* )? ')'
+      # at line 872:4: '(' ( set_item ( ',' ( NL )* set_item )* )? ')'
       char_literal398 = match( T__19, TOKENS_FOLLOWING_T__19_IN_set_value_2413 )
       tree_for_char_literal398 = @adaptor.create_with_payload( char_literal398 )
       @adaptor.add_child( root_0, tree_for_char_literal398 )
@@ -9402,7 +9406,7 @@ module SfpLang
       	@set = Array.new	
       # <-- action
 
-      # at line 870:3: ( set_item ( ',' ( NL )* set_item )* )?
+      # at line 874:3: ( set_item ( ',' ( NL )* set_item )* )?
       alt_141 = 2
       look_141_0 = @input.peek( 1 )
 
@@ -9411,13 +9415,13 @@ module SfpLang
       end
       case alt_141
       when 1
-        # at line 870:4: set_item ( ',' ( NL )* set_item )*
+        # at line 874:4: set_item ( ',' ( NL )* set_item )*
         @state.following.push( TOKENS_FOLLOWING_set_item_IN_set_value_2422 )
         set_item399 = set_item
         @state.following.pop
         @adaptor.add_child( root_0, set_item399.tree )
 
-        # at line 870:13: ( ',' ( NL )* set_item )*
+        # at line 874:13: ( ',' ( NL )* set_item )*
         while true # decision 140
           alt_140 = 2
           look_140_0 = @input.peek( 1 )
@@ -9428,13 +9432,13 @@ module SfpLang
           end
           case alt_140
           when 1
-            # at line 870:14: ',' ( NL )* set_item
+            # at line 874:14: ',' ( NL )* set_item
             char_literal400 = match( T__23, TOKENS_FOLLOWING_T__23_IN_set_value_2425 )
             tree_for_char_literal400 = @adaptor.create_with_payload( char_literal400 )
             @adaptor.add_child( root_0, tree_for_char_literal400 )
 
 
-            # at line 870:18: ( NL )*
+            # at line 874:18: ( NL )*
             while true # decision 139
               alt_139 = 2
               look_139_0 = @input.peek( 1 )
@@ -9445,7 +9449,7 @@ module SfpLang
               end
               case alt_139
               when 1
-                # at line 870:18: NL
+                # at line 874:18: NL
                 __NL401__ = match( NL, TOKENS_FOLLOWING_NL_IN_set_value_2427 )
                 tree_for_NL401 = @adaptor.create_with_payload( __NL401__ )
                 @adaptor.add_child( root_0, tree_for_NL401 )
@@ -9511,7 +9515,7 @@ module SfpLang
     # parser rule set_item
     #
     # (in SfpLang.g)
-    # 875:1: set_item : value ;
+    # 879:1: set_item : value ;
     #
     def set_item
       # -> uncomment the next line to manually enable rule tracing
@@ -9534,7 +9538,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 876:4: value
+      # at line 880:4: value
       @state.following.push( TOKENS_FOLLOWING_value_IN_set_item_2453 )
       value404 = value
       @state.following.pop
@@ -9576,7 +9580,7 @@ module SfpLang
     # parser rule value
     #
     # (in SfpLang.g)
-    # 880:1: value returns [val, type] : ( primitive_value | reference | set_value | 'any' );
+    # 884:1: value returns [val, type] : ( primitive_value | reference | set_value | 'any' );
     #
     def value
       # -> uncomment the next line to manually enable rule tracing
@@ -9600,7 +9604,7 @@ module SfpLang
       tree_for_string_literal408 = nil
 
       begin
-      # at line 881:2: ( primitive_value | reference | set_value | 'any' )
+      # at line 885:2: ( primitive_value | reference | set_value | 'any' )
       alt_142 = 4
       case look_142 = @input.peek( 1 )
       when BOOLEAN, MULTILINE_STRING, NUMBER, STRING then alt_142 = 1
@@ -9616,7 +9620,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 881:4: primitive_value
+        # at line 885:4: primitive_value
         @state.following.push( TOKENS_FOLLOWING_primitive_value_IN_value_2472 )
         primitive_value405 = primitive_value
         @state.following.pop
@@ -9635,7 +9639,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 886:4: reference
+        # at line 890:4: reference
         @state.following.push( TOKENS_FOLLOWING_reference_IN_value_2481 )
         reference406 = reference
         @state.following.pop
@@ -9654,7 +9658,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 891:4: set_value
+        # at line 895:4: set_value
         @state.following.push( TOKENS_FOLLOWING_set_value_IN_value_2490 )
         set_value407 = set_value
         @state.following.pop
@@ -9673,7 +9677,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 896:4: 'any'
+        # at line 900:4: 'any'
         string_literal408 = match( T__40, TOKENS_FOLLOWING_T__40_IN_value_2499 )
         tree_for_string_literal408 = @adaptor.create_with_payload( string_literal408 )
         @adaptor.add_child( root_0, tree_for_string_literal408 )
@@ -9719,7 +9723,7 @@ module SfpLang
     # parser rule primitive_value
     #
     # (in SfpLang.g)
-    # 903:1: primitive_value returns [val, type] : ( BOOLEAN | NUMBER | STRING | MULTILINE_STRING );
+    # 907:1: primitive_value returns [val, type] : ( BOOLEAN | NUMBER | STRING | MULTILINE_STRING );
     #
     def primitive_value
       # -> uncomment the next line to manually enable rule tracing
@@ -9746,7 +9750,7 @@ module SfpLang
       tree_for_MULTILINE_STRING412 = nil
 
       begin
-      # at line 904:2: ( BOOLEAN | NUMBER | STRING | MULTILINE_STRING )
+      # at line 908:2: ( BOOLEAN | NUMBER | STRING | MULTILINE_STRING )
       alt_143 = 4
       case look_143 = @input.peek( 1 )
       when BOOLEAN then alt_143 = 1
@@ -9762,7 +9766,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 904:4: BOOLEAN
+        # at line 908:4: BOOLEAN
         __BOOLEAN409__ = match( BOOLEAN, TOKENS_FOLLOWING_BOOLEAN_IN_primitive_value_2518 )
         tree_for_BOOLEAN409 = @adaptor.create_with_payload( __BOOLEAN409__ )
         @adaptor.add_child( root_0, tree_for_BOOLEAN409 )
@@ -9785,7 +9789,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 913:4: NUMBER
+        # at line 917:4: NUMBER
         __NUMBER410__ = match( NUMBER, TOKENS_FOLLOWING_NUMBER_IN_primitive_value_2527 )
         tree_for_NUMBER410 = @adaptor.create_with_payload( __NUMBER410__ )
         @adaptor.add_child( root_0, tree_for_NUMBER410 )
@@ -9804,7 +9808,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 918:4: STRING
+        # at line 922:4: STRING
         __STRING411__ = match( STRING, TOKENS_FOLLOWING_STRING_IN_primitive_value_2536 )
         tree_for_STRING411 = @adaptor.create_with_payload( __STRING411__ )
         @adaptor.add_child( root_0, tree_for_STRING411 )
@@ -9823,7 +9827,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 923:4: MULTILINE_STRING
+        # at line 927:4: MULTILINE_STRING
         __MULTILINE_STRING412__ = match( MULTILINE_STRING, TOKENS_FOLLOWING_MULTILINE_STRING_IN_primitive_value_2545 )
         tree_for_MULTILINE_STRING412 = @adaptor.create_with_payload( __MULTILINE_STRING412__ )
         @adaptor.add_child( root_0, tree_for_MULTILINE_STRING412 )
@@ -9869,7 +9873,7 @@ module SfpLang
     # parser rule path
     #
     # (in SfpLang.g)
-    # 930:1: path : ID ( '.' ID )* ;
+    # 934:1: path : ID ( '.' ID )* ;
     #
     def path
       # -> uncomment the next line to manually enable rule tracing
@@ -9897,13 +9901,13 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 931:4: ID ( '.' ID )*
+      # at line 935:4: ID ( '.' ID )*
       __ID413__ = match( ID, TOKENS_FOLLOWING_ID_IN_path_2560 )
       tree_for_ID413 = @adaptor.create_with_payload( __ID413__ )
       @adaptor.add_child( root_0, tree_for_ID413 )
 
 
-      # at line 931:6: ( '.' ID )*
+      # at line 935:6: ( '.' ID )*
       while true # decision 144
         alt_144 = 2
         look_144_0 = @input.peek( 1 )
@@ -9914,7 +9918,7 @@ module SfpLang
         end
         case alt_144
         when 1
-          # at line 931:7: '.' ID
+          # at line 935:7: '.' ID
           char_literal414 = match( T__25, TOKENS_FOLLOWING_T__25_IN_path_2562 )
           tree_for_char_literal414 = @adaptor.create_with_payload( char_literal414 )
           @adaptor.add_child( root_0, tree_for_char_literal414 )
@@ -9962,7 +9966,7 @@ module SfpLang
     # parser rule path_with_index
     #
     # (in SfpLang.g)
-    # 934:1: path_with_index : id_ref ( '.' id_ref )* ;
+    # 938:1: path_with_index : id_ref ( '.' id_ref )* ;
     #
     def path_with_index
       # -> uncomment the next line to manually enable rule tracing
@@ -9988,13 +9992,13 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 935:4: id_ref ( '.' id_ref )*
+      # at line 939:4: id_ref ( '.' id_ref )*
       @state.following.push( TOKENS_FOLLOWING_id_ref_IN_path_with_index_2576 )
       id_ref416 = id_ref
       @state.following.pop
       @adaptor.add_child( root_0, id_ref416.tree )
 
-      # at line 935:10: ( '.' id_ref )*
+      # at line 939:10: ( '.' id_ref )*
       while true # decision 145
         alt_145 = 2
         look_145_0 = @input.peek( 1 )
@@ -10005,7 +10009,7 @@ module SfpLang
         end
         case alt_145
         when 1
-          # at line 935:11: '.' id_ref
+          # at line 939:11: '.' id_ref
           char_literal417 = match( T__25, TOKENS_FOLLOWING_T__25_IN_path_with_index_2578 )
           tree_for_char_literal417 = @adaptor.create_with_payload( char_literal417 )
           @adaptor.add_child( root_0, tree_for_char_literal417 )
@@ -10053,7 +10057,7 @@ module SfpLang
     # parser rule id_ref
     #
     # (in SfpLang.g)
-    # 938:1: id_ref : ID ( '[' NUMBER ']' )? ;
+    # 942:1: id_ref : ID ( '[' NUMBER ']' )? ;
     #
     def id_ref
       # -> uncomment the next line to manually enable rule tracing
@@ -10083,13 +10087,13 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 939:4: ID ( '[' NUMBER ']' )?
+      # at line 943:4: ID ( '[' NUMBER ']' )?
       __ID419__ = match( ID, TOKENS_FOLLOWING_ID_IN_id_ref_2592 )
       tree_for_ID419 = @adaptor.create_with_payload( __ID419__ )
       @adaptor.add_child( root_0, tree_for_ID419 )
 
 
-      # at line 939:6: ( '[' NUMBER ']' )?
+      # at line 943:6: ( '[' NUMBER ']' )?
       alt_146 = 2
       look_146_0 = @input.peek( 1 )
 
@@ -10098,7 +10102,7 @@ module SfpLang
       end
       case alt_146
       when 1
-        # at line 939:7: '[' NUMBER ']'
+        # at line 943:7: '[' NUMBER ']'
         char_literal420 = match( T__34, TOKENS_FOLLOWING_T__34_IN_id_ref_2594 )
         tree_for_char_literal420 = @adaptor.create_with_payload( char_literal420 )
         @adaptor.add_child( root_0, tree_for_char_literal420 )
@@ -10147,7 +10151,7 @@ module SfpLang
     # parser rule reference
     #
     # (in SfpLang.g)
-    # 942:1: reference returns [val] : path_with_index ;
+    # 946:1: reference returns [val] : path_with_index ;
     #
     def reference
       # -> uncomment the next line to manually enable rule tracing
@@ -10170,7 +10174,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 943:4: path_with_index
+      # at line 947:4: path_with_index
       @state.following.push( TOKENS_FOLLOWING_path_with_index_IN_reference_2615 )
       path_with_index423 = path_with_index
       @state.following.pop
@@ -10212,7 +10216,7 @@ module SfpLang
     # parser rule reference_type
     #
     # (in SfpLang.g)
-    # 947:1: reference_type returns [val] : 'isref' path ;
+    # 951:1: reference_type returns [val] : 'isref' path ;
     #
     def reference_type
       # -> uncomment the next line to manually enable rule tracing
@@ -10237,7 +10241,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 948:4: 'isref' path
+      # at line 952:4: 'isref' path
       string_literal424 = match( T__69, TOKENS_FOLLOWING_T__69_IN_reference_type_2634 )
       tree_for_string_literal424 = @adaptor.create_with_payload( string_literal424 )
       @adaptor.add_child( root_0, tree_for_string_literal424 )
@@ -10288,7 +10292,7 @@ module SfpLang
     # parser rule set_type
     #
     # (in SfpLang.g)
-    # 956:1: set_type returns [val] : 'isset' path ;
+    # 960:1: set_type returns [val] : 'isset' path ;
     #
     def set_type
       # -> uncomment the next line to manually enable rule tracing
@@ -10313,7 +10317,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 957:4: 'isset' path
+      # at line 961:4: 'isset' path
       string_literal426 = match( T__70, TOKENS_FOLLOWING_T__70_IN_set_type_2655 )
       tree_for_string_literal426 = @adaptor.create_with_payload( string_literal426 )
       @adaptor.add_child( root_0, tree_for_string_literal426 )
@@ -10365,7 +10369,7 @@ module SfpLang
     # parser rule probability_op
     #
     # (in SfpLang.g)
-    # 966:1: probability_op : 'either' ;
+    # 970:1: probability_op : 'either' ;
     #
     def probability_op
       # -> uncomment the next line to manually enable rule tracing
@@ -10389,7 +10393,7 @@ module SfpLang
       root_0 = @adaptor.create_flat_list
 
 
-      # at line 967:4: 'either'
+      # at line 971:4: 'either'
       string_literal428 = match( T__52, TOKENS_FOLLOWING_T__52_IN_probability_op_2672 )
       tree_for_string_literal428 = @adaptor.create_with_payload( string_literal428 )
       @adaptor.add_child( root_0, tree_for_string_literal428 )
@@ -10426,7 +10430,7 @@ module SfpLang
     # parser rule equals_op
     #
     # (in SfpLang.g)
-    # 970:1: equals_op : ( '=' | 'is' );
+    # 974:1: equals_op : ( '=' | 'is' );
     #
     def equals_op
       # -> uncomment the next line to manually enable rule tracing
@@ -10497,7 +10501,7 @@ module SfpLang
     # parser rule not_equals_op
     #
     # (in SfpLang.g)
-    # 975:1: not_equals_op : ( '!=' | 'isnt' | 'isnot' );
+    # 979:1: not_equals_op : ( '!=' | 'isnt' | 'isnot' );
     #
     def not_equals_op
       # -> uncomment the next line to manually enable rule tracing
@@ -10568,7 +10572,7 @@ module SfpLang
     # parser rule binary_op
     #
     # (in SfpLang.g)
-    # 981:1: binary_op : ( '+=' | '-=' | '*=' | '/=' );
+    # 985:1: binary_op : ( '+=' | '-=' | '*=' | '/=' );
     #
     def binary_op
       # -> uncomment the next line to manually enable rule tracing
@@ -10639,7 +10643,7 @@ module SfpLang
     # parser rule binary_comp
     #
     # (in SfpLang.g)
-    # 988:1: binary_comp : ( '>' | '>=' | '<' | '<=' );
+    # 992:1: binary_comp : ( '>' | '>=' | '<' | '<=' );
     #
     def binary_comp
       # -> uncomment the next line to manually enable rule tracing
@@ -10732,7 +10736,7 @@ module SfpLang
 
       def description
         <<-'__dfa_description__'.strip!
-          ()* loopback of 262:3: ( ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}' )*
+          ()* loopback of 266:3: ( ( NL )* 'or' ( NL )* '{' ( NL )* constraint_body '}' )*
         __dfa_description__
       end
 
@@ -10774,7 +10778,7 @@ module SfpLang
 
       def description
         <<-'__dfa_description__'.strip!
-          424:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
+          428:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
         __dfa_description__
       end
 
@@ -10815,7 +10819,7 @@ module SfpLang
 
       def description
         <<-'__dfa_description__'.strip!
-          525:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
+          529:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
         __dfa_description__
       end
 
@@ -10885,7 +10889,7 @@ module SfpLang
 
       def description
         <<-'__dfa_description__'.strip!
-          625:1: constraint_statement returns [key, val] : ( reference | 'not' reference | reference equals_op value | reference equals_op NULL | reference not_equals_op value | reference not_equals_op NULL | conditional_constraint | reference ( 'is' )? 'in' set_value | reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value | reference 'has' value | reference binary_comp comp_value | total_constraint );
+          629:1: constraint_statement returns [key, val] : ( reference | 'not' reference | reference equals_op value | reference equals_op NULL | reference not_equals_op value | reference not_equals_op NULL | conditional_constraint | reference ( 'is' )? 'in' set_value | reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value | reference 'has' value | reference binary_comp comp_value | total_constraint );
         __dfa_description__
       end
 
@@ -10941,7 +10945,7 @@ module SfpLang
 
       def description
         <<-'__dfa_description__'.strip!
-          798:1: mutation returns [key, val] : ( reference equals_op value | reference equals_op NULL | reference binary_op NUMBER | reference 'is' 'new' path ( object_body )? | 'delete' path | reference 'add(' value ')' | reference 'remove(' value ')' );
+          802:1: mutation returns [key, val] : ( reference equals_op value | reference equals_op NULL | reference binary_op NUMBER | reference 'is' 'new' path ( object_body )? | 'delete' path | reference 'add(' value ')' | reference 'remove(' value ')' );
         __dfa_description__
       end