sfp 0.3.4 → 0.3.5

data/lib/sfp/SfpLangParser.rb

@@ -5,7 +5,7 @@
 # Generated using ANTLR version: 3.2.1-SNAPSHOT Jul 31, 2010 19:34:52
 # Ruby runtime library version: 1.8.11
 # Input grammar file: SfpLang.g
-# Generated at: 2013-07-15 00:24:26
+# Generated at: 2013-07-18 06:07:23
 # 
 
 # ~~~> start load path setup
@@ -5543,11 +5543,7 @@ module SfpLang
 
         # --> action
 
-        			@now[__ID249__.text] = { '_self' => __ID249__.text,
-        				'_context' => 'constraint',
-        				'_type' => 'and',
-        				'_parent' => @now
-        			}
+        			@now[__ID249__.text] = self.create_constraint(__ID249__.text, 'and')
         			@now = @now[__ID249__.text]
         		
         # <-- action
@@ -5556,7 +5552,7 @@ module SfpLang
         tree_for_char_literal251 = @adaptor.create_with_payload( char_literal251 )
         @adaptor.add_child( root_0, tree_for_char_literal251 )
 
-        # at line 532:7: ( NL )*
+        # at line 528:7: ( NL )*
         while true # decision 102
           alt_102 = 2
           look_102_0 = @input.peek( 1 )
@@ -5567,7 +5563,7 @@ module SfpLang
           end
           case alt_102
           when 1
-            # at line 532:7: NL
+            # at line 528:7: NL
             __NL252__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_1489 )
 
             tree_for_NL252 = @adaptor.create_with_payload( __NL252__ )
@@ -5587,7 +5583,7 @@ module SfpLang
         tree_for_char_literal254 = @adaptor.create_with_payload( char_literal254 )
         @adaptor.add_child( root_0, tree_for_char_literal254 )
 
-        # at file 532:31: ( NL )+
+        # at file 528:31: ( NL )+
         match_count_103 = 0
         while true
           alt_103 = 2
@@ -5599,7 +5595,7 @@ module SfpLang
           end
           case alt_103
           when 1
-            # at line 532:31: NL
+            # at line 528:31: NL
             __NL255__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_1496 )
 
             tree_for_NL255 = @adaptor.create_with_payload( __NL255__ )
@@ -5646,7 +5642,7 @@ module SfpLang
     # parser rule constraint_body
     # 
     # (in SfpLang.g)
-    # 536:1: constraint_body : ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )* ;
+    # 532: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
@@ -5669,8 +5665,8 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 537:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )*
-        # at line 537:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )*
+        # at line 533:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )*
+        # at line 533:4: ( ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+ )*
         while true # decision 106
           alt_106 = 2
           look_106_0 = @input.peek( 1 )
@@ -5681,13 +5677,13 @@ module SfpLang
           end
           case alt_106
           when 1
-            # at line 538:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+
-            # at line 538:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
+            # at line 534:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification ) ( NL )+
+            # at line 534:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
             alt_104 = 4
             alt_104 = @dfa104.predict( @input )
             case alt_104
             when 1
-              # at line 538:6: constraint_statement
+              # at line 534:6: constraint_statement
               @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_constraint_body_1519 )
               constraint_statement256 = constraint_statement
               @state.following.pop
@@ -5699,28 +5695,28 @@ module SfpLang
               # <-- action
 
             when 2
-              # at line 542:6: constraint_namespace
+              # at line 538:6: constraint_namespace
               @state.following.push( TOKENS_FOLLOWING_constraint_namespace_IN_constraint_body_1532 )
               constraint_namespace257 = constraint_namespace
               @state.following.pop
               @adaptor.add_child( root_0, constraint_namespace257.tree )
 
             when 3
-              # at line 543:6: constraint_iterator
+              # at line 539:6: constraint_iterator
               @state.following.push( TOKENS_FOLLOWING_constraint_iterator_IN_constraint_body_1539 )
               constraint_iterator258 = constraint_iterator
               @state.following.pop
               @adaptor.add_child( root_0, constraint_iterator258.tree )
 
             when 4
-              # at line 544:6: constraint_class_quantification
+              # at line 540:6: constraint_class_quantification
               @state.following.push( TOKENS_FOLLOWING_constraint_class_quantification_IN_constraint_body_1546 )
               constraint_class_quantification259 = constraint_class_quantification
               @state.following.pop
               @adaptor.add_child( root_0, constraint_class_quantification259.tree )
 
             end
-            # at file 546:3: ( NL )+
+            # at file 542:3: ( NL )+
             match_count_105 = 0
             while true
               alt_105 = 2
@@ -5732,7 +5728,7 @@ module SfpLang
               end
               case alt_105
               when 1
-                # at line 546:3: NL
+                # at line 542:3: NL
                 __NL260__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_body_1555 )
 
                 tree_for_NL260 = @adaptor.create_with_payload( __NL260__ )
@@ -5781,7 +5777,7 @@ module SfpLang
     # parser rule constraint_namespace
     # 
     # (in SfpLang.g)
-    # 549:1: constraint_namespace : path ( NL )* '{' ( NL )* ( constraint_statement ( NL )+ )* '}' ;
+    # 545:1: constraint_namespace : path ( NL )* '{' ( NL )* ( constraint_statement ( NL )+ )* '}' ;
     # 
     def constraint_namespace
       # -> uncomment the next line to manually enable rule tracing
@@ -5810,12 +5806,12 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 550:4: path ( NL )* '{' ( NL )* ( constraint_statement ( NL )+ )* '}'
+        # at line 546:4: path ( NL )* '{' ( NL )* ( constraint_statement ( NL )+ )* '}'
         @state.following.push( TOKENS_FOLLOWING_path_IN_constraint_namespace_1569 )
         path261 = path
         @state.following.pop
         @adaptor.add_child( root_0, path261.tree )
-        # at line 550:9: ( NL )*
+        # at line 546:9: ( NL )*
         while true # decision 107
           alt_107 = 2
           look_107_0 = @input.peek( 1 )
@@ -5826,7 +5822,7 @@ module SfpLang
           end
           case alt_107
           when 1
-            # at line 550:9: NL
+            # at line 546:9: NL
             __NL262__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_namespace_1571 )
 
             tree_for_NL262 = @adaptor.create_with_payload( __NL262__ )
@@ -5842,7 +5838,7 @@ module SfpLang
         tree_for_char_literal263 = @adaptor.create_with_payload( char_literal263 )
         @adaptor.add_child( root_0, tree_for_char_literal263 )
 
-        # at line 550:17: ( NL )*
+        # at line 546:17: ( NL )*
         while true # decision 108
           alt_108 = 2
           look_108_0 = @input.peek( 1 )
@@ -5853,7 +5849,7 @@ module SfpLang
           end
           case alt_108
           when 1
-            # at line 550:17: NL
+            # at line 546:17: NL
             __NL264__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_namespace_1576 )
 
             tree_for_NL264 = @adaptor.create_with_payload( __NL264__ )
@@ -5864,7 +5860,7 @@ module SfpLang
             break # out of loop for decision 108
           end
         end # loop for decision 108
-        # at line 550:21: ( constraint_statement ( NL )+ )*
+        # at line 546:21: ( constraint_statement ( NL )+ )*
         while true # decision 110
           alt_110 = 2
           look_110_0 = @input.peek( 1 )
@@ -5875,7 +5871,7 @@ module SfpLang
           end
           case alt_110
           when 1
-            # at line 550:22: constraint_statement ( NL )+
+            # at line 546:22: constraint_statement ( NL )+
             @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_constraint_namespace_1580 )
             constraint_statement265 = constraint_statement
             @state.following.pop
@@ -5886,7 +5882,7 @@ module SfpLang
             			@now[key] = ( constraint_statement265.nil? ? nil : constraint_statement265.val )
             		
             # <-- action
-            # at file 555:3: ( NL )+
+            # at file 551:3: ( NL )+
             match_count_109 = 0
             while true
               alt_109 = 2
@@ -5898,7 +5894,7 @@ module SfpLang
               end
               case alt_109
               when 1
-                # at line 555:3: NL
+                # at line 551:3: NL
                 __NL266__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_namespace_1588 )
 
                 tree_for_NL266 = @adaptor.create_with_payload( __NL266__ )
@@ -5952,7 +5948,7 @@ module SfpLang
     # parser rule constraint_iterator
     # 
     # (in SfpLang.g)
-    # 558:1: constraint_iterator : 'foreach' '(' path 'as' ID ')' ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ )* '}' ;
+    # 554:1: constraint_iterator : 'foreach' '(' path 'as' ID ')' ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ )* '}' ;
     # 
     def constraint_iterator
       # -> uncomment the next line to manually enable rule tracing
@@ -5991,7 +5987,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 559:4: 'foreach' '(' path 'as' ID ')' ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ )* '}'
+        # at line 555:4: 'foreach' '(' path 'as' ID ')' ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ )* '}'
         string_literal268 = match( T__54, TOKENS_FOLLOWING_T__54_IN_constraint_iterator_1604 )
 
         tree_for_string_literal268 = @adaptor.create_with_payload( string_literal268 )
@@ -6021,7 +6017,7 @@ module SfpLang
         tree_for_char_literal273 = @adaptor.create_with_payload( char_literal273 )
         @adaptor.add_child( root_0, tree_for_char_literal273 )
 
-        # at line 559:35: ( NL )*
+        # at line 555:35: ( NL )*
         while true # decision 111
           alt_111 = 2
           look_111_0 = @input.peek( 1 )
@@ -6032,7 +6028,7 @@ module SfpLang
           end
           case alt_111
           when 1
-            # at line 559:35: NL
+            # at line 555:35: NL
             __NL274__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_iterator_1616 )
 
             tree_for_NL274 = @adaptor.create_with_payload( __NL274__ )
@@ -6048,7 +6044,7 @@ module SfpLang
         tree_for_char_literal275 = @adaptor.create_with_payload( char_literal275 )
         @adaptor.add_child( root_0, tree_for_char_literal275 )
 
-        # at file 559:43: ( NL )+
+        # at file 555:43: ( NL )+
         match_count_112 = 0
         while true
           alt_112 = 2
@@ -6060,7 +6056,7 @@ module SfpLang
           end
           case alt_112
           when 1
-            # at line 559:43: NL
+            # at line 555:43: NL
             __NL276__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_iterator_1621 )
 
             tree_for_NL276 = @adaptor.create_with_payload( __NL276__ )
@@ -6080,25 +6076,17 @@ module SfpLang
         # --> action
 
         			id = self.next_id.to_s
-        			@now[id] = { '_parent' => @now,
-        				'_context' => 'constraint',
-        				'_type' => 'iterator',
-        				'_self' => id,
-        				'_value' => '$.' + ( path270 && @input.to_s( path270.start, path270.stop ) ),
-        				'_variable' => __ID272__.text
-        			}
+        			@now[id] = self.create_constraint(id, 'iterator')
+        			@now[id]['_value'] = '$.' + ( path270 && @input.to_s( path270.start, path270.stop ) )
+        			@now[id]['_variable'] = __ID272__.text
         			@now = @now[id]
         			
         			id = '_template'
-        			@now[id] = { '_parent' => @now,
-        				'_context' => 'constraint',
-        				'_type' => 'and',
-        				'_self' => id,
-        			}
+        			@now[id] = self.create_constraint(id, 'and')
         			@now = @now[id]
         		
         # <-- action
-        # at line 579:3: ( constraint_statement ( NL )+ )*
+        # at line 567:3: ( constraint_statement ( NL )+ )*
         while true # decision 114
           alt_114 = 2
           look_114_0 = @input.peek( 1 )
@@ -6109,7 +6097,7 @@ module SfpLang
           end
           case alt_114
           when 1
-            # at line 579:4: constraint_statement ( NL )+
+            # at line 567:4: constraint_statement ( NL )+
             @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_constraint_iterator_1631 )
             constraint_statement277 = constraint_statement
             @state.following.pop
@@ -6119,7 +6107,7 @@ module SfpLang
             			@now[( constraint_statement277.nil? ? nil : constraint_statement277.key )] = ( constraint_statement277.nil? ? nil : constraint_statement277.val )
             		
             # <-- action
-            # at file 583:3: ( NL )+
+            # at file 571:3: ( NL )+
             match_count_113 = 0
             while true
               alt_113 = 2
@@ -6131,7 +6119,7 @@ module SfpLang
               end
               case alt_113
               when 1
-                # at line 583:3: NL
+                # at line 571:3: NL
                 __NL278__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_iterator_1639 )
 
                 tree_for_NL278 = @adaptor.create_with_payload( __NL278__ )
@@ -6191,7 +6179,7 @@ module SfpLang
     # parser rule quantification_keyword
     # 
     # (in SfpLang.g)
-    # 591:1: quantification_keyword : ( 'forall' | 'exist' | 'forsome' );
+    # 579:1: quantification_keyword : ( 'forall' | 'exist' | 'forsome' );
     # 
     def quantification_keyword
       # -> uncomment the next line to manually enable rule tracing
@@ -6249,7 +6237,7 @@ module SfpLang
     # parser rule constraint_class_quantification
     # 
     # (in SfpLang.g)
-    # 597:1: constraint_class_quantification : quantification_keyword '(' path 'as' ID ')' ( ( binary_comp | '=' ) NUMBER )? ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )* '}' ;
+    # 585: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
@@ -6298,7 +6286,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 598:4: quantification_keyword '(' path 'as' ID ')' ( ( binary_comp | '=' ) NUMBER )? ( NL )* '{' ( NL )+ ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )* '}'
+        # at line 586: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_1682 )
         quantification_keyword281 = quantification_keyword
         @state.following.pop
@@ -6340,15 +6328,11 @@ module SfpLang
         			@now = @now[id]
 
         			id = '_template'
-        			@now[id] = { '_parent' => @now,
-        				'_context' => 'constraint',
-        				'_type' => 'and',
-        				'_self' => id
-        			}
+        			@now[id] = self.create_constraint(id, 'and')
         			@now = @now[id]
         		
         # <-- action
-        # at line 618:3: ( ( binary_comp | '=' ) NUMBER )?
+        # at line 602:3: ( ( binary_comp | '=' ) NUMBER )?
         alt_116 = 2
         look_116_0 = @input.peek( 1 )
 
@@ -6357,8 +6341,8 @@ module SfpLang
         end
         case alt_116
         when 1
-          # at line 618:5: ( binary_comp | '=' ) NUMBER
-          # at line 618:5: ( binary_comp | '=' )
+          # at line 602:5: ( binary_comp | '=' ) NUMBER
+          # at line 602:5: ( binary_comp | '=' )
           alt_115 = 2
           look_115_0 = @input.peek( 1 )
 
@@ -6371,7 +6355,7 @@ module SfpLang
           end
           case alt_115
           when 1
-            # at line 618:7: binary_comp
+            # at line 602:7: binary_comp
             @state.following.push( TOKENS_FOLLOWING_binary_comp_IN_constraint_class_quantification_1704 )
             binary_comp287 = binary_comp
             @state.following.pop
@@ -6381,7 +6365,7 @@ module SfpLang
             # <-- action
 
           when 2
-            # at line 620:6: '='
+            # at line 604:6: '='
             char_literal288 = match( T__59, TOKENS_FOLLOWING_T__59_IN_constraint_class_quantification_1717 )
 
             tree_for_char_literal288 = @adaptor.create_with_payload( char_literal288 )
@@ -6402,7 +6386,7 @@ module SfpLang
           # <-- action
 
         end
-        # at line 626:3: ( NL )*
+        # at line 610:3: ( NL )*
         while true # decision 117
           alt_117 = 2
           look_117_0 = @input.peek( 1 )
@@ -6413,7 +6397,7 @@ module SfpLang
           end
           case alt_117
           when 1
-            # at line 626:3: NL
+            # at line 610:3: NL
             __NL290__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1747 )
 
             tree_for_NL290 = @adaptor.create_with_payload( __NL290__ )
@@ -6429,7 +6413,7 @@ module SfpLang
         tree_for_char_literal291 = @adaptor.create_with_payload( char_literal291 )
         @adaptor.add_child( root_0, tree_for_char_literal291 )
 
-        # at file 626:11: ( NL )+
+        # at file 610:11: ( NL )+
         match_count_118 = 0
         while true
           alt_118 = 2
@@ -6441,7 +6425,7 @@ module SfpLang
           end
           case alt_118
           when 1
-            # at line 626:11: NL
+            # at line 610:11: NL
             __NL292__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1752 )
 
             tree_for_NL292 = @adaptor.create_with_payload( __NL292__ )
@@ -6458,7 +6442,7 @@ module SfpLang
           match_count_118 += 1
         end
 
-        # at line 627:3: ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )*
+        # at line 611:3: ( constraint_statement ( NL )+ | constraint_different ( NL )+ | constraint_iterator ( NL )+ )*
         while true # decision 122
           alt_122 = 4
           case look_122 = @input.peek( 1 )
@@ -6468,7 +6452,7 @@ module SfpLang
           end
           case alt_122
           when 1
-            # at line 627:5: constraint_statement ( NL )+
+            # at line 611:5: constraint_statement ( NL )+
             @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_constraint_class_quantification_1759 )
             constraint_statement293 = constraint_statement
             @state.following.pop
@@ -6476,7 +6460,7 @@ module SfpLang
             # --> action
             	@now[( constraint_statement293.nil? ? nil : constraint_statement293.key )] = ( constraint_statement293.nil? ? nil : constraint_statement293.val )	
             # <-- action
-            # at file 629:4: ( NL )+
+            # at file 613:4: ( NL )+
             match_count_119 = 0
             while true
               alt_119 = 2
@@ -6488,7 +6472,7 @@ module SfpLang
               end
               case alt_119
               when 1
-                # at line 629:4: NL
+                # at line 613:4: NL
                 __NL294__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1769 )
 
                 tree_for_NL294 = @adaptor.create_with_payload( __NL294__ )
@@ -6507,12 +6491,12 @@ module SfpLang
 
 
           when 2
-            # at line 630:5: constraint_different ( NL )+
+            # at line 614:5: constraint_different ( NL )+
             @state.following.push( TOKENS_FOLLOWING_constraint_different_IN_constraint_class_quantification_1776 )
             constraint_different295 = constraint_different
             @state.following.pop
             @adaptor.add_child( root_0, constraint_different295.tree )
-            # at file 630:26: ( NL )+
+            # at file 614:26: ( NL )+
             match_count_120 = 0
             while true
               alt_120 = 2
@@ -6524,7 +6508,7 @@ module SfpLang
               end
               case alt_120
               when 1
-                # at line 630:26: NL
+                # at line 614:26: NL
                 __NL296__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1778 )
 
                 tree_for_NL296 = @adaptor.create_with_payload( __NL296__ )
@@ -6543,12 +6527,12 @@ module SfpLang
 
 
           when 3
-            # at line 631:5: constraint_iterator ( NL )+
+            # at line 615:5: constraint_iterator ( NL )+
             @state.following.push( TOKENS_FOLLOWING_constraint_iterator_IN_constraint_class_quantification_1785 )
             constraint_iterator297 = constraint_iterator
             @state.following.pop
             @adaptor.add_child( root_0, constraint_iterator297.tree )
-            # at file 631:25: ( NL )+
+            # at file 615:25: ( NL )+
             match_count_121 = 0
             while true
               alt_121 = 2
@@ -6560,7 +6544,7 @@ module SfpLang
               end
               case alt_121
               when 1
-                # at line 631:25: NL
+                # at line 615:25: NL
                 __NL298__ = match( NL, TOKENS_FOLLOWING_NL_IN_constraint_class_quantification_1787 )
 
                 tree_for_NL298 = @adaptor.create_with_payload( __NL298__ )
@@ -6620,7 +6604,7 @@ module SfpLang
     # parser rule constraint_different
     # 
     # (in SfpLang.g)
-    # 637:1: constraint_different : ':different' '(' path ')' ;
+    # 621:1: constraint_different : ':different' '(' path ')' ;
     # 
     def constraint_different
       # -> uncomment the next line to manually enable rule tracing
@@ -6644,7 +6628,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 638:4: ':different' '(' path ')'
+        # at line 622:4: ':different' '(' path ')'
         string_literal300 = match( T__60, TOKENS_FOLLOWING_T__60_IN_constraint_different_1814 )
 
         tree_for_string_literal300 = @adaptor.create_with_payload( string_literal300 )
@@ -6702,7 +6686,7 @@ module SfpLang
     # parser rule constraint_statement
     # 
     # (in SfpLang.g)
-    # 650: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 );
+    # 634: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
@@ -6755,7 +6739,7 @@ module SfpLang
       tree_for_string_literal329 = nil
 
       begin
-        # at line 651: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 635: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_124 = 12
         alt_124 = @dfa124.predict( @input )
         case alt_124
@@ -6763,7 +6747,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 651:4: reference
+          # at line 635:4: reference
           @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1839 )
           reference304 = reference
           @state.following.pop
@@ -6779,7 +6763,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 656:4: 'not' reference
+          # at line 640:4: 'not' reference
           string_literal305 = match( T__61, TOKENS_FOLLOWING_T__61_IN_constraint_statement_1848 )
 
           tree_for_string_literal305 = @adaptor.create_with_payload( string_literal305 )
@@ -6800,7 +6784,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 661:4: reference equals_op value
+          # at line 645:4: reference equals_op value
           @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1859 )
           reference307 = reference
           @state.following.pop
@@ -6824,7 +6808,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 666:4: reference equals_op NULL
+          # at line 650:4: reference equals_op NULL
           @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1872 )
           reference310 = reference
           @state.following.pop
@@ -6849,7 +6833,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 671:4: reference not_equals_op value
+          # at line 655:4: reference not_equals_op value
           @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1885 )
           reference313 = reference
           @state.following.pop
@@ -6873,7 +6857,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 676:4: reference not_equals_op NULL
+          # at line 660:4: reference not_equals_op NULL
           @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1898 )
           reference316 = reference
           @state.following.pop
@@ -6898,7 +6882,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 681:4: conditional_constraint
+          # at line 665:4: conditional_constraint
           @state.following.push( TOKENS_FOLLOWING_conditional_constraint_IN_constraint_statement_1911 )
           conditional_constraint319 = conditional_constraint
           @state.following.pop
@@ -6914,12 +6898,12 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 686:4: reference ( 'is' )? 'in' set_value
+          # at line 670:4: reference ( 'is' )? 'in' set_value
           @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1920 )
           reference320 = reference
           @state.following.pop
           @adaptor.add_child( root_0, reference320.tree )
-          # at line 686:14: ( 'is' )?
+          # at line 670:14: ( 'is' )?
           alt_123 = 2
           look_123_0 = @input.peek( 1 )
 
@@ -6928,7 +6912,7 @@ module SfpLang
           end
           case alt_123
           when 1
-            # at line 686:14: 'is'
+            # at line 670:14: 'is'
             string_literal321 = match( T__62, TOKENS_FOLLOWING_T__62_IN_constraint_statement_1922 )
 
             tree_for_string_literal321 = @adaptor.create_with_payload( string_literal321 )
@@ -6963,7 +6947,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 698:4: reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value
+          # at line 682:4: reference ( 'isnot' | 'isnt' | 'not' ) 'in' set_value
           @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1936 )
           reference324 = reference
           @state.following.pop
@@ -7009,7 +6993,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 713:4: reference 'has' value
+          # at line 697:4: reference 'has' value
           @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1957 )
           reference328 = reference
           @state.following.pop
@@ -7038,7 +7022,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 722:4: reference binary_comp comp_value
+          # at line 706:4: reference binary_comp comp_value
           @state.following.push( TOKENS_FOLLOWING_reference_IN_constraint_statement_1970 )
           reference331 = reference
           @state.following.pop
@@ -7062,7 +7046,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 727:4: total_constraint
+          # at line 711:4: total_constraint
           @state.following.push( TOKENS_FOLLOWING_total_constraint_IN_constraint_statement_1983 )
           total_constraint334 = total_constraint
           @state.following.pop
@@ -7095,7 +7079,7 @@ module SfpLang
     # parser rule total_constraint
     # 
     # (in SfpLang.g)
-    # 730:1: total_constraint : 'total(' total_statement ')' binary_comp NUMBER ;
+    # 714:1: total_constraint : 'total(' total_statement ')' binary_comp NUMBER ;
     # 
     def total_constraint
       # -> uncomment the next line to manually enable rule tracing
@@ -7120,7 +7104,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 731:4: 'total(' total_statement ')' binary_comp NUMBER
+        # at line 715:4: 'total(' total_statement ')' binary_comp NUMBER
         string_literal335 = match( T__67, TOKENS_FOLLOWING_T__67_IN_total_constraint_1994 )
 
         tree_for_string_literal335 = @adaptor.create_with_payload( string_literal335 )
@@ -7171,7 +7155,7 @@ module SfpLang
     # parser rule total_statement
     # 
     # (in SfpLang.g)
-    # 734:1: total_statement : reference equals_op value ;
+    # 718:1: total_statement : reference equals_op value ;
     # 
     def total_statement
       # -> uncomment the next line to manually enable rule tracing
@@ -7191,7 +7175,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 735:4: reference equals_op value
+        # at line 719:4: reference equals_op value
         @state.following.push( TOKENS_FOLLOWING_reference_IN_total_statement_2013 )
         reference340 = reference
         @state.following.pop
@@ -7231,7 +7215,7 @@ module SfpLang
     # parser rule comp_value
     # 
     # (in SfpLang.g)
-    # 738:1: comp_value returns [val] : ( NUMBER | reference );
+    # 722:1: comp_value returns [val] : ( NUMBER | reference );
     # 
     def comp_value
       # -> uncomment the next line to manually enable rule tracing
@@ -7248,7 +7232,7 @@ module SfpLang
       tree_for_NUMBER343 = nil
 
       begin
-        # at line 739:2: ( NUMBER | reference )
+        # at line 723:2: ( NUMBER | reference )
         alt_125 = 2
         look_125_0 = @input.peek( 1 )
 
@@ -7264,7 +7248,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 739:4: NUMBER
+          # at line 723:4: NUMBER
           __NUMBER343__ = match( NUMBER, TOKENS_FOLLOWING_NUMBER_IN_comp_value_2032 )
 
           tree_for_NUMBER343 = @adaptor.create_with_payload( __NUMBER343__ )
@@ -7278,7 +7262,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 741:4: reference
+          # at line 725:4: reference
           @state.following.push( TOKENS_FOLLOWING_reference_IN_comp_value_2041 )
           reference344 = reference
           @state.following.pop
@@ -7314,7 +7298,7 @@ module SfpLang
     # parser rule conditional_constraint
     # 
     # (in SfpLang.g)
-    # 745:1: conditional_constraint returns [key, val] : 'if' conditional_constraint_if_part conditional_constraint_then_part ;
+    # 729: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
@@ -7335,7 +7319,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 746:4: 'if' conditional_constraint_if_part conditional_constraint_then_part
+        # at line 730:4: 'if' conditional_constraint_if_part conditional_constraint_then_part
         string_literal345 = match( T__32, TOKENS_FOLLOWING_T__32_IN_conditional_constraint_2060 )
 
         tree_for_string_literal345 = @adaptor.create_with_payload( string_literal345 )
@@ -7344,10 +7328,7 @@ module SfpLang
         # --> action
 
         			return_value.key = id = self.next_id.to_s
-        			@now[id] = { '_parent' => @now,
-        				'_context' => 'constraint',
-        				'_type' => 'or'
-        			}
+        			@now[id] = self.create_constraint(id, 'imply')
         			@now = @now[id]
         		
         # <-- action
@@ -7389,7 +7370,7 @@ module SfpLang
     # parser rule conditional_constraint_if_part
     # 
     # (in SfpLang.g)
-    # 760:1: conditional_constraint_if_part : ( constraint_statement ( NL )* | '{' ( NL )+ constraint_body '}' ( NL )* );
+    # 741: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
@@ -7415,7 +7396,7 @@ module SfpLang
       tree_for_NL354 = nil
 
       begin
-        # at line 761:2: ( constraint_statement ( NL )* | '{' ( NL )+ constraint_body '}' ( NL )* )
+        # at line 742:2: ( constraint_statement ( NL )* | '{' ( NL )+ constraint_body '}' ( NL )* )
         alt_129 = 2
         look_129_0 = @input.peek( 1 )
 
@@ -7431,12 +7412,12 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 761:4: constraint_statement ( NL )*
+          # at line 742:4: constraint_statement ( NL )*
           @state.following.push( TOKENS_FOLLOWING_constraint_statement_IN_conditional_constraint_if_part_2087 )
           constraint_statement348 = constraint_statement
           @state.following.pop
           @adaptor.add_child( root_0, constraint_statement348.tree )
-          # at line 761:25: ( NL )*
+          # at line 742:25: ( NL )*
           while true # decision 126
             alt_126 = 2
             look_126_0 = @input.peek( 1 )
@@ -7447,7 +7428,7 @@ module SfpLang
             end
             case alt_126
             when 1
-              # at line 761:25: NL
+              # at line 742:25: NL
               __NL349__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditional_constraint_if_part_2089 )
 
               tree_for_NL349 = @adaptor.create_with_payload( __NL349__ )
@@ -7461,10 +7442,8 @@ module SfpLang
           # --> action
 
           			id = self.next_id
-          			@now[id] = { '_parent' => @now,
-          				'_context' => 'constraint',
-          				'_type' => 'not'
-          			}
+          			@now[id] = self.create_constraint(id, 'and')
+          			@now[id]['_subtype'] = 'premise'
           			@now[id][( constraint_statement348.nil? ? nil : constraint_statement348.key )] = ( constraint_statement348.nil? ? nil : constraint_statement348.val )
           		
           # <-- action
@@ -7473,7 +7452,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 770:4: '{' ( NL )+ constraint_body '}' ( NL )*
+          # at line 749:4: '{' ( NL )+ constraint_body '}' ( NL )*
           char_literal350 = match( T__20, TOKENS_FOLLOWING_T__20_IN_conditional_constraint_if_part_2099 )
 
           tree_for_char_literal350 = @adaptor.create_with_payload( char_literal350 )
@@ -7482,11 +7461,12 @@ module SfpLang
           # --> action
 
           			id = self.next_id
-          			@now[id] = self.create_constraint(id, 'not')
+          			@now[id] = self.create_constraint(id, 'and')
+          			@now[id]['_subtype'] = 'premise'
           			@now = @now[id]
           		
           # <-- action
-          # at file 776:3: ( NL )+
+          # at file 756:3: ( NL )+
           match_count_127 = 0
           while true
             alt_127 = 2
@@ -7498,7 +7478,7 @@ module SfpLang
             end
             case alt_127
             when 1
-              # at line 776:3: NL
+              # at line 756:3: NL
               __NL351__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditional_constraint_if_part_2107 )
 
               tree_for_NL351 = @adaptor.create_with_payload( __NL351__ )
@@ -7524,7 +7504,7 @@ module SfpLang
           tree_for_char_literal353 = @adaptor.create_with_payload( char_literal353 )
           @adaptor.add_child( root_0, tree_for_char_literal353 )
 
-          # at line 777:7: ( NL )*
+          # at line 757:7: ( NL )*
           while true # decision 128
             alt_128 = 2
             look_128_0 = @input.peek( 1 )
@@ -7535,7 +7515,7 @@ module SfpLang
             end
             case alt_128
             when 1
-              # at line 777:7: NL
+              # at line 757:7: NL
               __NL354__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditional_constraint_if_part_2116 )
 
               tree_for_NL354 = @adaptor.create_with_payload( __NL354__ )
@@ -7577,7 +7557,7 @@ module SfpLang
     # parser rule conditional_constraint_then_part
     # 
     # (in SfpLang.g)
-    # 781:1: conditional_constraint_then_part : ( 'then' constraint_statement | 'then' '{' ( NL )+ constraint_body '}' );
+    # 761: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
@@ -7603,7 +7583,7 @@ module SfpLang
       tree_for_char_literal361 = nil
 
       begin
-        # at line 782:2: ( 'then' constraint_statement | 'then' '{' ( NL )+ constraint_body '}' )
+        # at line 762:2: ( 'then' constraint_statement | 'then' '{' ( NL )+ constraint_body '}' )
         alt_131 = 2
         look_131_0 = @input.peek( 1 )
 
@@ -7625,7 +7605,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 782:4: 'then' constraint_statement
+          # at line 762:4: 'then' constraint_statement
           string_literal355 = match( T__33, TOKENS_FOLLOWING_T__33_IN_conditional_constraint_then_part_2132 )
 
           tree_for_string_literal355 = @adaptor.create_with_payload( string_literal355 )
@@ -7638,10 +7618,8 @@ module SfpLang
           # --> action
 
           			id = self.next_id
-          			@now[id] = { '_parent' => @now,
-          				'_context' => 'constraint',
-          				'_type' => 'and'
-          			}
+          			@now[id] = self.create_constraint(id, 'and')
+          			@now[id]['_subtype'] = 'conclusion'
           			@now[id][( constraint_statement356.nil? ? nil : constraint_statement356.key )] = ( constraint_statement356.nil? ? nil : constraint_statement356.val )
           		
           # <-- action
@@ -7650,7 +7628,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 791:4: 'then' '{' ( NL )+ constraint_body '}'
+          # at line 769:4: 'then' '{' ( NL )+ constraint_body '}'
           string_literal357 = match( T__33, TOKENS_FOLLOWING_T__33_IN_conditional_constraint_then_part_2143 )
 
           tree_for_string_literal357 = @adaptor.create_with_payload( string_literal357 )
@@ -7659,10 +7637,8 @@ module SfpLang
           # --> action
 
           			id = self.next_id
-          			@now[id] = { '_parent' => @now,
-          				'_context' => 'constraint',
-          				'_type' => 'and'
-          			}
+          			@now[id] = self.create_constraint(id, 'and')
+          			@now[id]['_subtype'] = 'conclusion'
           			@now = @now[id]
           		
           # <-- action
@@ -7671,7 +7647,7 @@ module SfpLang
           tree_for_char_literal358 = @adaptor.create_with_payload( char_literal358 )
           @adaptor.add_child( root_0, tree_for_char_literal358 )
 
-          # at file 800:7: ( NL )+
+          # at file 776:7: ( NL )+
           match_count_130 = 0
           while true
             alt_130 = 2
@@ -7683,7 +7659,7 @@ module SfpLang
             end
             case alt_130
             when 1
-              # at line 800:7: NL
+              # at line 776:7: NL
               __NL359__ = match( NL, TOKENS_FOLLOWING_NL_IN_conditional_constraint_then_part_2153 )
 
               tree_for_NL359 = @adaptor.create_with_payload( __NL359__ )
@@ -7740,7 +7716,7 @@ module SfpLang
     # parser rule effect_body
     # 
     # (in SfpLang.g)
-    # 804:1: effect_body : ( ( mutation | mutation_iterator ) ( NL )+ )* ;
+    # 780:1: effect_body : ( ( mutation | mutation_iterator ) ( NL )+ )* ;
     # 
     def effect_body
       # -> uncomment the next line to manually enable rule tracing
@@ -7761,8 +7737,8 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 805:4: ( ( mutation | mutation_iterator ) ( NL )+ )*
-        # at line 805:4: ( ( mutation | mutation_iterator ) ( NL )+ )*
+        # at line 781:4: ( ( mutation | mutation_iterator ) ( NL )+ )*
+        # at line 781:4: ( ( mutation | mutation_iterator ) ( NL )+ )*
         while true # decision 134
           alt_134 = 2
           look_134_0 = @input.peek( 1 )
@@ -7773,8 +7749,8 @@ module SfpLang
           end
           case alt_134
           when 1
-            # at line 806:4: ( mutation | mutation_iterator ) ( NL )+
-            # at line 806:4: ( mutation | mutation_iterator )
+            # at line 782:4: ( mutation | mutation_iterator ) ( NL )+
+            # at line 782:4: ( mutation | mutation_iterator )
             alt_132 = 2
             look_132_0 = @input.peek( 1 )
 
@@ -7787,7 +7763,7 @@ module SfpLang
             end
             case alt_132
             when 1
-              # at line 806:6: mutation
+              # at line 782:6: mutation
               @state.following.push( TOKENS_FOLLOWING_mutation_IN_effect_body_2180 )
               mutation362 = mutation
               @state.following.pop
@@ -7797,14 +7773,14 @@ module SfpLang
               # <-- action
 
             when 2
-              # at line 808:6: mutation_iterator
+              # at line 784:6: mutation_iterator
               @state.following.push( TOKENS_FOLLOWING_mutation_iterator_IN_effect_body_2193 )
               mutation_iterator363 = mutation_iterator
               @state.following.pop
               @adaptor.add_child( root_0, mutation_iterator363.tree )
 
             end
-            # at file 810:3: ( NL )+
+            # at file 786:3: ( NL )+
             match_count_133 = 0
             while true
               alt_133 = 2
@@ -7816,7 +7792,7 @@ module SfpLang
               end
               case alt_133
               when 1
-                # at line 810:3: NL
+                # at line 786:3: NL
                 __NL364__ = match( NL, TOKENS_FOLLOWING_NL_IN_effect_body_2202 )
 
                 tree_for_NL364 = @adaptor.create_with_payload( __NL364__ )
@@ -7865,7 +7841,7 @@ module SfpLang
     # parser rule mutation_iterator
     # 
     # (in SfpLang.g)
-    # 813:1: mutation_iterator : 'foreach' path 'as' ID ( NL )* '{' ( NL )+ ( mutation ( NL )+ )* '}' ;
+    # 789:1: mutation_iterator : 'foreach' path 'as' ID ( NL )* '{' ( NL )+ ( mutation ( NL )+ )* '}' ;
     # 
     def mutation_iterator
       # -> uncomment the next line to manually enable rule tracing
@@ -7900,7 +7876,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 814:4: 'foreach' path 'as' ID ( NL )* '{' ( NL )+ ( mutation ( NL )+ )* '}'
+        # at line 790:4: 'foreach' path 'as' ID ( NL )* '{' ( NL )+ ( mutation ( NL )+ )* '}'
         string_literal365 = match( T__54, TOKENS_FOLLOWING_T__54_IN_mutation_iterator_2217 )
 
         tree_for_string_literal365 = @adaptor.create_with_payload( string_literal365 )
@@ -7920,7 +7896,7 @@ module SfpLang
         tree_for_ID368 = @adaptor.create_with_payload( __ID368__ )
         @adaptor.add_child( root_0, tree_for_ID368 )
 
-        # at line 814:27: ( NL )*
+        # at line 790:27: ( NL )*
         while true # decision 135
           alt_135 = 2
           look_135_0 = @input.peek( 1 )
@@ -7931,7 +7907,7 @@ module SfpLang
           end
           case alt_135
           when 1
-            # at line 814:27: NL
+            # at line 790:27: NL
             __NL369__ = match( NL, TOKENS_FOLLOWING_NL_IN_mutation_iterator_2225 )
 
             tree_for_NL369 = @adaptor.create_with_payload( __NL369__ )
@@ -7947,7 +7923,7 @@ module SfpLang
         tree_for_char_literal370 = @adaptor.create_with_payload( char_literal370 )
         @adaptor.add_child( root_0, tree_for_char_literal370 )
 
-        # at file 814:35: ( NL )+
+        # at file 790:35: ( NL )+
         match_count_136 = 0
         while true
           alt_136 = 2
@@ -7959,7 +7935,7 @@ module SfpLang
           end
           case alt_136
           when 1
-            # at line 814:35: NL
+            # at line 790:35: NL
             __NL371__ = match( NL, TOKENS_FOLLOWING_NL_IN_mutation_iterator_2230 )
 
             tree_for_NL371 = @adaptor.create_with_payload( __NL371__ )
@@ -7987,7 +7963,7 @@ module SfpLang
         			@now = @now[id]
         		
         # <-- action
-        # at line 824:3: ( mutation ( NL )+ )*
+        # at line 800:3: ( mutation ( NL )+ )*
         while true # decision 138
           alt_138 = 2
           look_138_0 = @input.peek( 1 )
@@ -7998,7 +7974,7 @@ module SfpLang
           end
           case alt_138
           when 1
-            # at line 824:4: mutation ( NL )+
+            # at line 800:4: mutation ( NL )+
             @state.following.push( TOKENS_FOLLOWING_mutation_IN_mutation_iterator_2240 )
             mutation372 = mutation
             @state.following.pop
@@ -8006,7 +7982,7 @@ module SfpLang
             # --> action
             	@now[( mutation372.nil? ? nil : mutation372.key )] = ( mutation372.nil? ? nil : mutation372.val )	
             # <-- action
-            # at file 826:3: ( NL )+
+            # at file 802:3: ( NL )+
             match_count_137 = 0
             while true
               alt_137 = 2
@@ -8018,7 +7994,7 @@ module SfpLang
               end
               case alt_137
               when 1
-                # at line 826:3: NL
+                # at line 802:3: NL
                 __NL373__ = match( NL, TOKENS_FOLLOWING_NL_IN_mutation_iterator_2248 )
 
                 tree_for_NL373 = @adaptor.create_with_payload( __NL373__ )
@@ -8075,7 +8051,7 @@ module SfpLang
     # parser rule mutation
     # 
     # (in SfpLang.g)
-    # 831: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 ')' );
+    # 807: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
@@ -8122,7 +8098,7 @@ module SfpLang
       tree_for_char_literal398 = nil
 
       begin
-        # at line 832: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 808: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_140 = 7
         alt_140 = @dfa140.predict( @input )
         case alt_140
@@ -8130,7 +8106,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 832:4: reference equals_op value
+          # at line 808:4: reference equals_op value
           @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2274 )
           reference375 = reference
           @state.following.pop
@@ -8157,7 +8133,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 840:4: reference equals_op NULL
+          # at line 816:4: reference equals_op NULL
           @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2287 )
           reference378 = reference
           @state.following.pop
@@ -8185,7 +8161,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 848:4: reference binary_op NUMBER
+          # at line 824:4: reference binary_op NUMBER
           @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2300 )
           reference381 = reference
           @state.following.pop
@@ -8213,7 +8189,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 856:4: reference 'is' 'new' path ( object_body )?
+          # at line 832:4: reference 'is' 'new' path ( object_body )?
           @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2313 )
           reference384 = reference
           @state.following.pop
@@ -8243,7 +8219,7 @@ module SfpLang
           			@now = @now[id]
           		
           # <-- action
-          # at line 866:3: ( object_body )?
+          # at line 842:3: ( object_body )?
           alt_139 = 2
           look_139_0 = @input.peek( 1 )
 
@@ -8252,7 +8228,7 @@ module SfpLang
           end
           case alt_139
           when 1
-            # at line 866:3: object_body
+            # at line 842:3: object_body
             @state.following.push( TOKENS_FOLLOWING_object_body_IN_mutation_2327 )
             object_body388 = object_body
             @state.following.pop
@@ -8272,7 +8248,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 873:4: 'delete' path
+          # at line 849:4: 'delete' path
           string_literal389 = match( T__69, TOKENS_FOLLOWING_T__69_IN_mutation_2337 )
 
           tree_for_string_literal389 = @adaptor.create_with_payload( string_literal389 )
@@ -8297,7 +8273,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 882:4: reference 'add(' value ')'
+          # at line 858:4: reference 'add(' value ')'
           @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2348 )
           reference391 = reference
           @state.following.pop
@@ -8330,7 +8306,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 890:4: reference 'remove(' value ')'
+          # at line 866:4: reference 'remove(' value ')'
           @state.following.push( TOKENS_FOLLOWING_reference_IN_mutation_2363 )
           reference395 = reference
           @state.following.pop
@@ -8386,7 +8362,7 @@ module SfpLang
     # parser rule set_value
     # 
     # (in SfpLang.g)
-    # 900:1: set_value returns [val] : '(' ( set_item ( ',' ( NL )* set_item )* )? ')' ;
+    # 876:1: set_value returns [val] : '(' ( set_item ( ',' ( NL )* set_item )* )? ')' ;
     # 
     def set_value
       # -> uncomment the next line to manually enable rule tracing
@@ -8413,7 +8389,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 901:4: '(' ( set_item ( ',' ( NL )* set_item )* )? ')'
+        # at line 877:4: '(' ( set_item ( ',' ( NL )* set_item )* )? ')'
         char_literal399 = match( T__42, TOKENS_FOLLOWING_T__42_IN_set_value_2388 )
 
         tree_for_char_literal399 = @adaptor.create_with_payload( char_literal399 )
@@ -8422,7 +8398,7 @@ module SfpLang
         # --> action
         	@set = Array.new	
         # <-- action
-        # at line 903:3: ( set_item ( ',' ( NL )* set_item )* )?
+        # at line 879:3: ( set_item ( ',' ( NL )* set_item )* )?
         alt_143 = 2
         look_143_0 = @input.peek( 1 )
 
@@ -8431,12 +8407,12 @@ module SfpLang
         end
         case alt_143
         when 1
-          # at line 903:4: set_item ( ',' ( NL )* set_item )*
+          # at line 879:4: set_item ( ',' ( NL )* set_item )*
           @state.following.push( TOKENS_FOLLOWING_set_item_IN_set_value_2397 )
           set_item400 = set_item
           @state.following.pop
           @adaptor.add_child( root_0, set_item400.tree )
-          # at line 903:13: ( ',' ( NL )* set_item )*
+          # at line 879:13: ( ',' ( NL )* set_item )*
           while true # decision 142
             alt_142 = 2
             look_142_0 = @input.peek( 1 )
@@ -8447,13 +8423,13 @@ module SfpLang
             end
             case alt_142
             when 1
-              # at line 903:14: ',' ( NL )* set_item
+              # at line 879:14: ',' ( NL )* set_item
               char_literal401 = match( T__30, TOKENS_FOLLOWING_T__30_IN_set_value_2400 )
 
               tree_for_char_literal401 = @adaptor.create_with_payload( char_literal401 )
               @adaptor.add_child( root_0, tree_for_char_literal401 )
 
-              # at line 903:18: ( NL )*
+              # at line 879:18: ( NL )*
               while true # decision 141
                 alt_141 = 2
                 look_141_0 = @input.peek( 1 )
@@ -8464,7 +8440,7 @@ module SfpLang
                 end
                 case alt_141
                 when 1
-                  # at line 903:18: NL
+                  # at line 879:18: NL
                   __NL402__ = match( NL, TOKENS_FOLLOWING_NL_IN_set_value_2402 )
 
                   tree_for_NL402 = @adaptor.create_with_payload( __NL402__ )
@@ -8521,7 +8497,7 @@ module SfpLang
     # parser rule set_item
     # 
     # (in SfpLang.g)
-    # 908:1: set_item : value ;
+    # 884:1: set_item : value ;
     # 
     def set_item
       # -> uncomment the next line to manually enable rule tracing
@@ -8539,7 +8515,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 909:4: value
+        # at line 885:4: value
         @state.following.push( TOKENS_FOLLOWING_value_IN_set_item_2428 )
         value405 = value
         @state.following.pop
@@ -8574,7 +8550,7 @@ module SfpLang
     # parser rule value
     # 
     # (in SfpLang.g)
-    # 913:1: value returns [val, type] : ( primitive_value | reference | set_value | 'any' );
+    # 889:1: value returns [val, type] : ( primitive_value | reference | set_value | 'any' );
     # 
     def value
       # -> uncomment the next line to manually enable rule tracing
@@ -8593,7 +8569,7 @@ module SfpLang
       tree_for_string_literal409 = nil
 
       begin
-        # at line 914:2: ( primitive_value | reference | set_value | 'any' )
+        # at line 890:2: ( primitive_value | reference | set_value | 'any' )
         alt_144 = 4
         case look_144 = @input.peek( 1 )
         when STRING, NUMBER, BOOLEAN, MULTILINE_STRING then alt_144 = 1
@@ -8608,7 +8584,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 914:4: primitive_value
+          # at line 890:4: primitive_value
           @state.following.push( TOKENS_FOLLOWING_primitive_value_IN_value_2447 )
           primitive_value406 = primitive_value
           @state.following.pop
@@ -8624,7 +8600,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 919:4: reference
+          # at line 895:4: reference
           @state.following.push( TOKENS_FOLLOWING_reference_IN_value_2456 )
           reference407 = reference
           @state.following.pop
@@ -8640,7 +8616,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 924:4: set_value
+          # at line 900:4: set_value
           @state.following.push( TOKENS_FOLLOWING_set_value_IN_value_2465 )
           set_value408 = set_value
           @state.following.pop
@@ -8656,7 +8632,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 929:4: 'any'
+          # at line 905:4: 'any'
           string_literal409 = match( T__72, TOKENS_FOLLOWING_T__72_IN_value_2474 )
 
           tree_for_string_literal409 = @adaptor.create_with_payload( string_literal409 )
@@ -8696,7 +8672,7 @@ module SfpLang
     # parser rule primitive_value
     # 
     # (in SfpLang.g)
-    # 936:1: primitive_value returns [val, type] : ( BOOLEAN | NUMBER | STRING | MULTILINE_STRING );
+    # 912:1: primitive_value returns [val, type] : ( BOOLEAN | NUMBER | STRING | MULTILINE_STRING );
     # 
     def primitive_value
       # -> uncomment the next line to manually enable rule tracing
@@ -8718,7 +8694,7 @@ module SfpLang
       tree_for_MULTILINE_STRING413 = nil
 
       begin
-        # at line 937:2: ( BOOLEAN | NUMBER | STRING | MULTILINE_STRING )
+        # at line 913:2: ( BOOLEAN | NUMBER | STRING | MULTILINE_STRING )
         alt_145 = 4
         case look_145 = @input.peek( 1 )
         when BOOLEAN then alt_145 = 1
@@ -8733,7 +8709,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 937:4: BOOLEAN
+          # at line 913:4: BOOLEAN
           __BOOLEAN410__ = match( BOOLEAN, TOKENS_FOLLOWING_BOOLEAN_IN_primitive_value_2493 )
 
           tree_for_BOOLEAN410 = @adaptor.create_with_payload( __BOOLEAN410__ )
@@ -8754,7 +8730,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 946:4: NUMBER
+          # at line 922:4: NUMBER
           __NUMBER411__ = match( NUMBER, TOKENS_FOLLOWING_NUMBER_IN_primitive_value_2502 )
 
           tree_for_NUMBER411 = @adaptor.create_with_payload( __NUMBER411__ )
@@ -8771,7 +8747,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 951:4: STRING
+          # at line 927:4: STRING
           __STRING412__ = match( STRING, TOKENS_FOLLOWING_STRING_IN_primitive_value_2511 )
 
           tree_for_STRING412 = @adaptor.create_with_payload( __STRING412__ )
@@ -8788,7 +8764,7 @@ module SfpLang
           root_0 = @adaptor.create_flat_list
 
 
-          # at line 956:4: MULTILINE_STRING
+          # at line 932:4: MULTILINE_STRING
           __MULTILINE_STRING413__ = match( MULTILINE_STRING, TOKENS_FOLLOWING_MULTILINE_STRING_IN_primitive_value_2520 )
 
           tree_for_MULTILINE_STRING413 = @adaptor.create_with_payload( __MULTILINE_STRING413__ )
@@ -8828,7 +8804,7 @@ module SfpLang
     # parser rule path
     # 
     # (in SfpLang.g)
-    # 963:1: path : ID ( '.' ID )* ;
+    # 939:1: path : ID ( '.' ID )* ;
     # 
     def path
       # -> uncomment the next line to manually enable rule tracing
@@ -8851,13 +8827,13 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 964:4: ID ( '.' ID )*
+        # at line 940:4: ID ( '.' ID )*
         __ID414__ = match( ID, TOKENS_FOLLOWING_ID_IN_path_2535 )
 
         tree_for_ID414 = @adaptor.create_with_payload( __ID414__ )
         @adaptor.add_child( root_0, tree_for_ID414 )
 
-        # at line 964:6: ( '.' ID )*
+        # at line 940:6: ( '.' ID )*
         while true # decision 146
           alt_146 = 2
           look_146_0 = @input.peek( 1 )
@@ -8868,7 +8844,7 @@ module SfpLang
           end
           case alt_146
           when 1
-            # at line 964:7: '.' ID
+            # at line 940:7: '.' ID
             char_literal415 = match( T__73, TOKENS_FOLLOWING_T__73_IN_path_2537 )
 
             tree_for_char_literal415 = @adaptor.create_with_payload( char_literal415 )
@@ -8911,7 +8887,7 @@ module SfpLang
     # parser rule path_with_index
     # 
     # (in SfpLang.g)
-    # 967:1: path_with_index : id_ref ( '.' id_ref )* ;
+    # 943:1: path_with_index : id_ref ( '.' id_ref )* ;
     # 
     def path_with_index
       # -> uncomment the next line to manually enable rule tracing
@@ -8932,12 +8908,12 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 968:4: id_ref ( '.' id_ref )*
+        # at line 944:4: id_ref ( '.' id_ref )*
         @state.following.push( TOKENS_FOLLOWING_id_ref_IN_path_with_index_2551 )
         id_ref417 = id_ref
         @state.following.pop
         @adaptor.add_child( root_0, id_ref417.tree )
-        # at line 968:10: ( '.' id_ref )*
+        # at line 944:10: ( '.' id_ref )*
         while true # decision 147
           alt_147 = 2
           look_147_0 = @input.peek( 1 )
@@ -8948,7 +8924,7 @@ module SfpLang
           end
           case alt_147
           when 1
-            # at line 968:11: '.' id_ref
+            # at line 944:11: '.' id_ref
             char_literal418 = match( T__73, TOKENS_FOLLOWING_T__73_IN_path_with_index_2553 )
 
             tree_for_char_literal418 = @adaptor.create_with_payload( char_literal418 )
@@ -8990,7 +8966,7 @@ module SfpLang
     # parser rule id_ref
     # 
     # (in SfpLang.g)
-    # 971:1: id_ref : ID ( '[' NUMBER ']' )? ;
+    # 947:1: id_ref : ID ( '[' NUMBER ']' )? ;
     # 
     def id_ref
       # -> uncomment the next line to manually enable rule tracing
@@ -9015,13 +8991,13 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 972:4: ID ( '[' NUMBER ']' )?
+        # at line 948:4: ID ( '[' NUMBER ']' )?
         __ID420__ = match( ID, TOKENS_FOLLOWING_ID_IN_id_ref_2567 )
 
         tree_for_ID420 = @adaptor.create_with_payload( __ID420__ )
         @adaptor.add_child( root_0, tree_for_ID420 )
 
-        # at line 972:6: ( '[' NUMBER ']' )?
+        # at line 948:6: ( '[' NUMBER ']' )?
         alt_148 = 2
         look_148_0 = @input.peek( 1 )
 
@@ -9030,7 +9006,7 @@ module SfpLang
         end
         case alt_148
         when 1
-          # at line 972:7: '[' NUMBER ']'
+          # at line 948:7: '[' NUMBER ']'
           char_literal421 = match( T__28, TOKENS_FOLLOWING_T__28_IN_id_ref_2569 )
 
           tree_for_char_literal421 = @adaptor.create_with_payload( char_literal421 )
@@ -9075,7 +9051,7 @@ module SfpLang
     # parser rule reference
     # 
     # (in SfpLang.g)
-    # 975:1: reference returns [val] : path_with_index ;
+    # 951:1: reference returns [val] : path_with_index ;
     # 
     def reference
       # -> uncomment the next line to manually enable rule tracing
@@ -9093,7 +9069,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 976:4: path_with_index
+        # at line 952:4: path_with_index
         @state.following.push( TOKENS_FOLLOWING_path_with_index_IN_reference_2590 )
         path_with_index424 = path_with_index
         @state.following.pop
@@ -9128,7 +9104,7 @@ module SfpLang
     # parser rule reference_type
     # 
     # (in SfpLang.g)
-    # 980:1: reference_type returns [val] : 'isref' path ;
+    # 956:1: reference_type returns [val] : 'isref' path ;
     # 
     def reference_type
       # -> uncomment the next line to manually enable rule tracing
@@ -9148,7 +9124,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 981:4: 'isref' path
+        # at line 957:4: 'isref' path
         string_literal425 = match( T__74, TOKENS_FOLLOWING_T__74_IN_reference_type_2609 )
 
         tree_for_string_literal425 = @adaptor.create_with_payload( string_literal425 )
@@ -9192,7 +9168,7 @@ module SfpLang
     # parser rule set_type
     # 
     # (in SfpLang.g)
-    # 989:1: set_type returns [val] : 'isset' path ;
+    # 965:1: set_type returns [val] : 'isset' path ;
     # 
     def set_type
       # -> uncomment the next line to manually enable rule tracing
@@ -9212,7 +9188,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 990:4: 'isset' path
+        # at line 966:4: 'isset' path
         string_literal427 = match( T__45, TOKENS_FOLLOWING_T__45_IN_set_type_2630 )
 
         tree_for_string_literal427 = @adaptor.create_with_payload( string_literal427 )
@@ -9257,7 +9233,7 @@ module SfpLang
     # parser rule probability_op
     # 
     # (in SfpLang.g)
-    # 999:1: probability_op : 'either' ;
+    # 975:1: probability_op : 'either' ;
     # 
     def probability_op
       # -> uncomment the next line to manually enable rule tracing
@@ -9276,7 +9252,7 @@ module SfpLang
         root_0 = @adaptor.create_flat_list
 
 
-        # at line 1000:4: 'either'
+        # at line 976:4: 'either'
         string_literal429 = match( T__75, TOKENS_FOLLOWING_T__75_IN_probability_op_2647 )
 
         tree_for_string_literal429 = @adaptor.create_with_payload( string_literal429 )
@@ -9309,7 +9285,7 @@ module SfpLang
     # parser rule equals_op
     # 
     # (in SfpLang.g)
-    # 1003:1: equals_op : ( '=' | 'is' );
+    # 979:1: equals_op : ( '=' | 'is' );
     # 
     def equals_op
       # -> uncomment the next line to manually enable rule tracing
@@ -9367,7 +9343,7 @@ module SfpLang
     # parser rule not_equals_op
     # 
     # (in SfpLang.g)
-    # 1008:1: not_equals_op : ( '!=' | 'isnt' | 'isnot' );
+    # 984:1: not_equals_op : ( '!=' | 'isnt' | 'isnot' );
     # 
     def not_equals_op
       # -> uncomment the next line to manually enable rule tracing
@@ -9425,7 +9401,7 @@ module SfpLang
     # parser rule binary_op
     # 
     # (in SfpLang.g)
-    # 1014:1: binary_op : ( '+=' | '-=' | '*=' | '/=' );
+    # 990:1: binary_op : ( '+=' | '-=' | '*=' | '/=' );
     # 
     def binary_op
       # -> uncomment the next line to manually enable rule tracing
@@ -9483,7 +9459,7 @@ module SfpLang
     # parser rule binary_comp
     # 
     # (in SfpLang.g)
-    # 1021:1: binary_comp : ( '>' | '>=' | '<' | '<=' );
+    # 997:1: binary_comp : ( '>' | '>=' | '<' | '<=' );
     # 
     def binary_comp
       # -> uncomment the next line to manually enable rule tracing
@@ -9640,7 +9616,7 @@ module SfpLang
 
       def description
         <<-'__dfa_description__'.strip!
-          538:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
+          534:4: ( constraint_statement | constraint_namespace | constraint_iterator | constraint_class_quantification )
         __dfa_description__
       end
     end
@@ -9707,7 +9683,7 @@ module SfpLang
 
       def description
         <<-'__dfa_description__'.strip!
-          650: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 );
+          634: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
     end
@@ -9759,7 +9735,7 @@ module SfpLang
 
       def description
         <<-'__dfa_description__'.strip!
-          831: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 ')' );
+          807: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
     end