[Pntool-developers] SF.net SVN: pntool:[178] translator

[<the...@us...>]

Revision: 178
          http://pntool.svn.sourceforge.net/pntool/?rev=178&view=rev
Author:   thecodeweasel
Date:     2009-07-07 04:04:54 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Reorganized specs display to aid in catching memory bugs

Modified Paths:
--------------
    translator/main.c
    translator/pngenerator.c
    translator/pngenerator.g
    translator/pngenerator.h

Modified: translator/main.c
===================================================================
--- translator/main.c	2009-07-07 03:48:56 UTC (rev 177)
+++ translator/main.c	2009-07-07 04:04:54 UTC (rev 178)
@@ -11,6 +11,10 @@
 #include    "dataStructures.h"
 #include    "pns.h"
 
+static void displaySpec(specs* spec);
+static bool displayExpression(expression* expr, pANTLR3_HASH_TABLE procs, int depth, bool indent);
+static void displayInequality(inequality* ineq, pANTLR3_HASH_TABLE procs, int depth, bool indent);
+
 // Main entry point for this example
 //
 specs* ScanInput(char* fName)
@@ -295,6 +299,151 @@
             }
         }
     }
+    
+    if(is_verbose() >= 5) {
+        displaySpec(output);
+    }
 
     return output;
+}
+
+static void displaySpec(specs* spec) {
+    pANTLR3_HASH_TABLE procs;
+    procs = antlr3HashTableNew(spec->pn_num);
+    int i;
+    constraint* constraints;
+    syncc* syncs;
+    process* proc1;
+    process* proc2;
+    printf("***********************\n");
+    //display name
+    printf("Spec Structure: \%s\n", spec->name);
+    //display pns
+    //display processes
+    if(spec->pn_num != spec->process_num) {
+        fprintf(stderr, "ERROR: pn count does not match process count\n\%i != \%i\n", spec->pn_num, spec->process_num);
+        exit(2);
+    }
+    printf("Found \%i Processes\n", spec->pn_num);
+    for(i = 0; i < spec->pn_num; i++) {
+        if(spec->pn_array[i] != spec->process_array[i]->pn) {
+            fprintf(stderr, "ERROR: pn \%i does not match the petri net in process \%i (\%s)\n", i, i, spec->process_array[i]->name);
+            exit(2);
+        }
+        procs->putI(procs, spec->process_array[i]->pn, spec->process_array[i], NULL);
+        printf("======================\n");
+        if(spec->process_array[i]->type != 0) {
+            printf("external ");
+        }
+        printf("Process: \%s:\%s\n", spec->process_array[i]->name, spec->process_array[i]->instance);
+        printf("Build: \%s\n", spec->process_array[i]->build);
+        printf("Include: \%s\n", spec->process_array[i]->include);
+        if(spec->process_array[i]->start) {
+            printf("Started\n");
+        } else {
+            printf("Not Started\n");
+        }
+        displaypn(*(spec->process_array[i]->pn), stdout);
+    }
+    printf("======================\n");
+    printf("Labels in parenthesis\n");
+    printf("======================\n");
+    //display constraints
+    constraints = spec->constraint_list;
+    i = 0;
+    while(constraints != 0) {
+        constraints = constraints->next;
+        i++;
+    }
+    printf("Found \%i constraints\n", i);
+    constraints = spec->constraint_list;
+    while(constraints != 0) {
+        displayExpression(constraints->expr, procs, 0, false);
+        constraints = constraints->next;
+    }
+    printf("======================\n");
+    //display sync list
+    syncs = spec->synclist;
+    i = 0;
+    while(syncs) {
+        syncs = syncs->next;
+        i++;
+    }
+    printf("Found \%i sync statements\n", i);
+    syncs = spec->synclist;
+    while(syncs) {
+        proc1 = (process*) procs->getI(procs, syncs->pn1);
+        proc2 = (process*) procs->getI(procs, syncs->pn2);
+        printf("Syncing \%s.t\%i(\%s) and \%s.t\%i(\%s)\n", proc1->instance, syncs->t1, proc1->pn->trans_name[syncs->t1], proc2->instance, syncs->t2, proc2->pn->trans_name[syncs->t2]);
+        syncs = syncs->next;
+    }
+    printf("***********************\n\n");
+}
+
+static bool displayExpression(expression* expr, pANTLR3_HASH_TABLE procs, int depth, bool indent) {
+    bool ret = false;
+    if(indent) {
+        int i;
+        //indentation
+        for(i = 0; i < depth; i++) {
+            printf("      ");
+        }
+    }
+    printf("expr->");
+    if(expr->left_expr) {
+        indent = displayExpression(expr->left_expr, procs, depth+1, false);
+    } else if(expr->left_ineq) {
+        displayInequality(expr->left_ineq, procs, depth+1, false);
+        indent = true;
+    } else {
+        fprintf(stderr, "ERROR: No left component to expression\n");
+        exit(2);
+    }
+    if(expr->right_expr) {
+        ret = displayExpression(expr->right_expr, procs, depth+1, true);
+    } else if(expr->right_ineq) {
+        displayInequality(expr->right_ineq, procs, depth+1, indent);
+        ret = true;
+    }
+    return ret;
+}
+
+static void displayInequality(inequality* ineq, pANTLR3_HASH_TABLE procs, int depth, bool indent) {
+    variable* var;
+    process* proc;
+    var = ineq->variable_list;
+    if(indent) {
+        int i;
+        //indentation
+        for(i = 0; i < depth; i++) {
+            printf("      ");
+        }
+    }
+    printf("ineq: ");
+    while(var) {
+        proc = (process*) procs->getI(procs, var->pn);
+        if(var->coefficient != 1) {
+            printf("\%i*", var->coefficient);
+        }
+        if(var->type == PARIKHV) {
+            printf("q.");
+        }
+        printf("\%s.", proc->instance);
+        if(var->type == MARKINGV) {
+            printf("p");
+        } else {
+            printf("t");
+        }
+        printf("\%i", var->index);
+        if(var->type == MARKINGV) {
+            printf("(\%s)", proc->pn->place_name[var->index]);
+        } else {
+            printf("(\%s)", proc->pn->trans_name[var->index]);
+        }
+        if(var->next) {
+            printf(" + ");
+        }
+        var = var->next;
+    }
+    printf(" <= \%i\n", ineq->free_term);
 }
\ No newline at end of file

Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c	2009-07-07 03:48:56 UTC (rev 177)
+++ translator/pngenerator.c	2009-07-07 04:04:54 UTC (rev 178)
@@ -2,7 +2,7 @@
  *  This C source file was generated by $ANTLR version 3.1.2
  *
  *     -  From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g
- *     -                            On : 2009-07-06 21:18:20
+ *     -                            On : 2009-07-06 23:03:05
  *     -           for the tree parser : pngeneratorTreeParser *
  * Editing it, at least manually, is not wise. 
  *
@@ -803,9 +803,6 @@
     	static void showContext(pANTLR3_BASE_TREE tree);
     	static process* copyProcess(process* proc);
     	static variable* handlePrimary(pANTLR3_VECTOR data, int coef, pns* pn, ASSOC_ARRAY* places, ASSOC_ARRAY* trans);
-    	static void displaySpec(specs* spec);
-    	static bool displayExpression(expression* expr, pANTLR3_HASH_TABLE procs, int depth, bool indent);
-    	static void displayInequality(inequality* ineq, pANTLR3_HASH_TABLE procs, int depth, bool indent);
     	
     	//see kDEFINES in pnscript.g
     	ASSOC_ARRAY* processes;
@@ -899,147 +896,6 @@
        		
        		return ret;
     	}
-    	
-    	static void displaySpec(specs* spec) {
-    		pANTLR3_HASH_TABLE procs;
-    		procs = antlr3HashTableNew(spec->pn_num);
-    		int i;
-    		constraint* constraints;
-    		syncc* syncs;
-    		process* proc1;
-    		process* proc2;
-    		printf("***********************\n");
-    		//display name
-    		printf("Spec Structure: %s\n", spec->name);
-    		//display pns
-    		//display processes
-    		if(spec->pn_num != spec->process_num) {
-    			fprintf(stderr, "ERROR: pn count does not match process count\n%i != %i\n", spec->pn_num, spec->process_num);
-    			exit(2);
-    		}
-    		printf("Found %i Processes\n", spec->pn_num);
-    		for(i = 0; i < spec->pn_num; i++) {
-    			if(spec->pn_array[i] != spec->process_array[i]->pn) {
-    				fprintf(stderr, "ERROR: pn %i does not match the petri net in process %i (%s)\n", i, i, spec->process_array[i]->name);
-    				exit(2);
-    			}
-    			procs->putI(procs, spec->process_array[i]->pn, spec->process_array[i], NULL);
-    			printf("======================\n");
-    			if(spec->process_array[i]->type != 0) {
-    				printf("external ");
-    			}
-    			printf("Process: %s:%s\n", spec->process_array[i]->name, spec->process_array[i]->instance);
-    			printf("Build: %s\n", spec->process_array[i]->build);
-    			printf("Include: %s\n", spec->process_array[i]->include);
-    			if(spec->process_array[i]->start) {
-    				printf("Started\n");
-    			} else {
-    				printf("Not Started\n");
-    			}
-    			displaypn(*(spec->process_array[i]->pn), stdout);
-    		}
-    		printf("======================\n");
-    		printf("Labels in parenthesis\n");
-    		printf("======================\n");
-    		//display constraints
-    		constraints = spec->constraint_list;
-    		i = 0;
-    		while(constraints != 0) {
-    			constraints = constraints->next;
-    			i++;
-    		}
-    		printf("Found %i constraints\n", i);
-    		constraints = spec->constraint_list;
-    		while(constraints != 0) {
-    			displayExpression(constraints->expr, procs, 0, false);
-    			constraints = constraints->next;
-    		}
-    		printf("======================\n");
-    		//display sync list
-    		syncs = spec->synclist;
-    		i = 0;
-    		while(syncs) {
-    			syncs = syncs->next;
-    			i++;
-    		}
-    		printf("Found %i sync statements\n", i);
-    		syncs = spec->synclist;
-    		while(syncs) {
-    			proc1 = (process*) procs->getI(procs, syncs->pn1);
-    			proc2 = (process*) procs->getI(procs, syncs->pn2);
-    			printf("Syncing %s.t%i(%s) and %s.t%i(%s)\n", proc1->instance, syncs->t1, proc1->pn->trans_name[syncs->t1], proc2->instance, syncs->t2, proc2->pn->trans_name[syncs->t2]);
-    			syncs = syncs->next;
-    		}
-    		printf("***********************\n\n");
-    	}
-    	
-    	static bool displayExpression(expression* expr, pANTLR3_HASH_TABLE procs, int depth, bool indent) {
-    		bool ret = false;
-    		if(indent) {
-    			int i;
-    			//indentation
-    			for(i = 0; i < depth; i++) {
-    				printf("      ");
-    			}
-    		}
-    		printf("expr->");
-    		if(expr->left_expr) {
-    			indent = displayExpression(expr->left_expr, procs, depth+1, false);
-    		} else if(expr->left_ineq) {
-    			displayInequality(expr->left_ineq, procs, depth+1, false);
-    			indent = true;
-    		} else {
-    			fprintf(stderr, "ERROR: No left component to expression\n");
-    			exit(2);
-    		}
-    		if(expr->right_expr) {
-    			ret = displayExpression(expr->right_expr, procs, depth+1, true);
-    		} else if(expr->right_ineq) {
-    			displayInequality(expr->right_ineq, procs, depth+1, indent);
-    			ret = true;
-    		}
-    		return ret;
-    	}
-    	
-    	static void displayInequality(inequality* ineq, pANTLR3_HASH_TABLE procs, int depth, bool indent) {
-    		variable* var;
-    		process* proc;
-    		var = ineq->variable_list;
-    		if(indent) {
-    			int i;
-    			//indentation
-    			for(i = 0; i < depth; i++) {
-    				printf("      ");
-    			}
-    		}
-    		printf("ineq: ");
-    		while(var) {
-    			proc = (process*) procs->getI(procs, var->pn);
-    			if(var->coefficient != 1) {
-    				printf("%i*", var->coefficient);
-    			}
-    			if(var->type == PARIKHV) {
-    				printf("q.");
-    			}
-    			printf("%s.", proc->instance);
-    			if(var->type == MARKINGV) {
-    				printf("p");
-    			} else {
-    				printf("t");
-    			}
-    			printf("%i", var->index);
-    			if(var->type == MARKINGV) {
-    				printf("(%s)", proc->pn->place_name[var->index]);
-    			} else {
-    				printf("(%s)", proc->pn->trans_name[var->index]);
-    			}
-    			if(var->next) {
-    				printf(" + ");
-    			}
-    			var = var->next;
-    		}
-    		printf(" <= %i\n", ineq->free_term);
-    	}
 
     
 /* Declare the bitsets
@@ -1297,7 +1153,7 @@
  */
 /** 
  * $ANTLR start pn
- * /Users/bion/projects/iordache/translator/pngenerator.g:284:1: pn[ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData, char* fileName] returns [specs* ret] : ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:140:1: pn[ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData, char* fileName] returns [specs* ret] : ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* ;
  */
 static specs*
 pn(ppngenerator ctx, ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData, char* fileName)
@@ -1324,10 +1180,10 @@
     	constraintList = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:300:2: ( ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:300:4: ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )*
+        // /Users/bion/projects/iordache/translator/pngenerator.g:156:2: ( ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )*
         {
-            // /Users/bion/projects/iordache/translator/pngenerator.g:300:4: ( proc_definitions )+
+            // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ( proc_definitions )+
             {
                 int cnt1=0;
 
@@ -1387,7 +1243,7 @@
             	switch (alt1) 
             	{
             	    case 1:
-            	        // /Users/bion/projects/iordache/translator/pngenerator.g:300:4: proc_definitions
+            	        // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: proc_definitions
             	        {
             	            FOLLOWPUSH(FOLLOW_proc_definitions_in_pn71);
             	            proc_definitions(ctx);
@@ -1421,7 +1277,7 @@
                 }
                 loop1: ;	/* Jump to here if this rule does not match */
             }
-            // /Users/bion/projects/iordache/translator/pngenerator.g:300:22: ( proc_instantiations )+
+            // /Users/bion/projects/iordache/translator/pngenerator.g:156:22: ( proc_instantiations )+
             {
                 int cnt2=0;
 
@@ -1467,7 +1323,7 @@
             	switch (alt2) 
             	{
             	    case 1:
-            	        // /Users/bion/projects/iordache/translator/pngenerator.g:300:22: proc_instantiations
+            	        // /Users/bion/projects/iordache/translator/pngenerator.g:156:22: proc_instantiations
             	        {
             	            FOLLOWPUSH(FOLLOW_proc_instantiations_in_pn74);
             	            proc_instantiations(ctx);
@@ -1502,7 +1358,7 @@
                 loop2: ;	/* Jump to here if this rule does not match */
             }
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:300:43: ( constraints )*
+            // /Users/bion/projects/iordache/translator/pngenerator.g:156:43: ( constraints )*
 
             for (;;)
             {
@@ -1520,7 +1376,7 @@
                 switch (alt3) 
                 {
             	case 1:
-            	    // /Users/bion/projects/iordache/translator/pngenerator.g:300:43: constraints
+            	    // /Users/bion/projects/iordache/translator/pngenerator.g:156:43: constraints
             	    {
             	        FOLLOWPUSH(FOLLOW_constraints_in_pn77);
             	        constraints(ctx);
@@ -1543,7 +1399,7 @@
             loop3: ; /* Jump out to here if this rule does not match */
 
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:300:56: ( other_commands )*
+            // /Users/bion/projects/iordache/translator/pngenerator.g:156:56: ( other_commands )*
 
             for (;;)
             {
@@ -1561,7 +1417,7 @@
                 switch (alt4) 
                 {
             	case 1:
-            	    // /Users/bion/projects/iordache/translator/pngenerator.g:300:56: other_commands
+            	    // /Users/bion/projects/iordache/translator/pngenerator.g:156:56: other_commands
             	    {
             	        FOLLOWPUSH(FOLLOW_other_commands_in_pn80);
             	        other_commands(ctx);
@@ -1603,9 +1459,6 @@
                 			//tie off the synclist
                 			free(synclist->next);
                 			synclist->next = 0;
-                			if(is_verbose() >= 5) {
-                				displaySpec(output);
-                			}
                 			ret= output;
                 		
             }
@@ -1632,7 +1485,7 @@
 
 /** 
  * $ANTLR start proc_definitions
- * /Users/bion/projects/iordache/translator/pngenerator.g:325:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:178:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
  */
 static void
 proc_definitions(ppngenerator ctx)
@@ -1642,8 +1495,8 @@
 
     ctx->ppngenerator_proc_definitionsTop = ppngenerator_proc_definitionsPush(ctx);
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:331:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:331:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:184:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:184:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? )
         {
             FOLLOWPUSH(FOLLOW_def_start_in_proc_definitions98);
             def_start(ctx);
@@ -1663,7 +1516,7 @@
                 }
 
 
-                // /Users/bion/projects/iordache/translator/pngenerator.g:331:16: ( trans_defs )*
+                // /Users/bion/projects/iordache/translator/pngenerator.g:184:16: ( trans_defs )*
 
                 for (;;)
                 {
@@ -1681,7 +1534,7 @@
                     switch (alt5) 
                     {
                 	case 1:
-                	    // /Users/bion/projects/iordache/translator/pngenerator.g:331:16: trans_defs
+                	    // /Users/bion/projects/iordache/translator/pngenerator.g:184:16: trans_defs
                 	    {
                 	        FOLLOWPUSH(FOLLOW_trans_defs_in_proc_definitions100);
                 	        trans_defs(ctx);
@@ -1704,7 +1557,7 @@
                 loop5: ; /* Jump out to here if this rule does not match */
 
 
-                // /Users/bion/projects/iordache/translator/pngenerator.g:331:28: ( select_functions )*
+                // /Users/bion/projects/iordache/translator/pngenerator.g:184:28: ( select_functions )*
 
                 for (;;)
                 {
@@ -1722,7 +1575,7 @@
                     switch (alt6) 
                     {
                 	case 1:
-                	    // /Users/bion/projects/iordache/translator/pngenerator.g:331:28: select_functions
+                	    // /Users/bion/projects/iordache/translator/pngenerator.g:184:28: select_functions
                 	    {
                 	        FOLLOWPUSH(FOLLOW_select_functions_in_proc_definitions103);
                 	        select_functions(ctx);
@@ -1745,7 +1598,7 @@
                 loop6: ; /* Jump out to here if this rule does not match */
 
 
-                // /Users/bion/projects/iordache/translator/pngenerator.g:331:46: ( nondeterm )?
+                // /Users/bion/projects/iordache/translator/pngenerator.g:184:46: ( nondeterm )?
                 {
                     int alt7=2;
                     {
@@ -1758,7 +1611,7 @@
                     switch (alt7) 
                     {
                 	case 1:
-                	    // /Users/bion/projects/iordache/translator/pngenerator.g:331:46: nondeterm
+                	    // /Users/bion/projects/iordache/translator/pngenerator.g:184:46: nondeterm
                 	    {
                 	        FOLLOWPUSH(FOLLOW_nondeterm_in_proc_definitions106);
                 	        nondeterm(ctx);
@@ -1808,7 +1661,7 @@
 
 /** 
  * $ANTLR start def_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:332:1: def_start : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:185:1: def_start : ID ;
  */
 static void
 def_start(ppngenerator ctx)
@@ -1825,8 +1678,8 @@
     ID1       = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:336:2: ( ID )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:336:4: ID
+        // /Users/bion/projects/iordache/translator/pngenerator.g:189:2: ( ID )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:189:4: ID
         {
             ID1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_def_start122); 
             if  (HASEXCEPTION())
@@ -1882,7 +1735,7 @@
 
 /** 
  * $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:359:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:212:1: trans_defs : ( extern_trans_def | trans_def );
  */
 static void
 trans_defs(ppngenerator ctx)
@@ -1893,7 +1746,7 @@
 
     {
         {
-            //  /Users/bion/projects/iordache/translator/pngenerator.g:360:2: ( extern_trans_def | trans_def )
+            //  /Users/bion/projects/iordache/translator/pngenerator.g:213:2: ( extern_trans_def | trans_def )
             
             ANTLR3_UINT32 alt8;
 
@@ -1926,7 +1779,7 @@
             switch (alt8) 
             {
         	case 1:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:360:4: extern_trans_def
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:213:4: extern_trans_def
         	    {
         	        FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs132);
         	        extern_trans_def(ctx);
@@ -1941,7 +1794,7 @@
         	    }
         	    break;
         	case 2:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:361:4: trans_def
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:214:4: trans_def
         	    {
         	        FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs137);
         	        trans_def(ctx);
@@ -1978,7 +1831,7 @@
 
 /** 
  * $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:362:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:215:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
  */
 static void
 extern_trans_def(ppngenerator ctx)
@@ -2001,11 +1854,11 @@
     ID4       = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:368:2: ( ^( ( TO | FROM ) ( ID )+ ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:368:4: ^( ( TO | FROM ) ( ID )+ )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:221:2: ( ^( ( TO | FROM ) ( ID )+ ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:221:4: ^( ( TO | FROM ) ( ID )+ )
         {
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:368:6: ( TO | FROM )
+            // /Users/bion/projects/iordache/translator/pngenerator.g:221:6: ( TO | FROM )
             {
                 int alt9=2;
 
@@ -2035,7 +1888,7 @@
                 switch (alt9) 
                 {
             	case 1:
-            	    // /Users/bion/projects/iordache/translator/pngenerator.g:368:7: TO
+            	    // /Users/bion/projects/iordache/translator/pngenerator.g:221:7: TO
             	    {
             	        TO2 = (pANTLR3_BASE_TREE) MATCHT(TO, &FOLLOW_TO_in_extern_trans_def153); 
             	        if  (HASEXCEPTION())
@@ -2053,7 +1906,7 @@
             	    }
             	    break;
             	case 2:
-            	    // /Users/bion/projects/iordache/translator/pngenerator.g:371:7: FROM
+            	    // /Users/bion/projects/iordache/translator/pngenerator.g:224:7: FROM
             	    {
             	        FROM3 = (pANTLR3_BASE_TREE) MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def159); 
             	        if  (HASEXCEPTION())
@@ -2080,7 +1933,7 @@
                 goto ruleextern_trans_defEx;
             }
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:374:6: ( ID )+
+            // /Users/bion/projects/iordache/translator/pngenerator.g:227:6: ( ID )+
             {
                 int cnt10=0;
 
@@ -2100,7 +1953,7 @@
             	switch (alt10) 
             	{
             	    case 1:
-            	        // /Users/bion/projects/iordache/translator/pngenerator.g:374:7: ID
+            	        // /Users/bion/projects/iordache/translator/pngenerator.g:227:7: ID
             	        {
             	            ID4 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_extern_trans_def165); 
             	            if  (HASEXCEPTION())
@@ -2167,7 +2020,7 @@
 
 /** 
  * $ANTLR start trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:378:1: trans_def : ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:231:1: trans_def : ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) );
  */
 static void
 trans_def(ppngenerator ctx)
@@ -2204,7 +2057,7 @@
 
     {
         {
-            //  /Users/bion/projects/iordache/translator/pngenerator.g:389:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) )
+            //  /Users/bion/projects/iordache/translator/pngenerator.g:242:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) )
             
             ANTLR3_UINT32 alt15;
 
@@ -2280,7 +2133,7 @@
             switch (alt15) 
             {
         	case 1:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:389:4: ^( ID CODE_BLOCK )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:242:4: ^( ID CODE_BLOCK )
         	    {
         	        ID5 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def185); 
         	        if  (HASEXCEPTION())
@@ -2322,7 +2175,7 @@
         	    }
         	    break;
         	case 2:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:398:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:251:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
         	    {
         	        tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def201); 
         	        if  (HASEXCEPTION())
@@ -2343,7 +2196,7 @@
         	            goto ruletrans_defEx;
         	        }
 
-        	        // /Users/bion/projects/iordache/translator/pngenerator.g:400:5: (place= ID )+
+        	        // /Users/bion/projects/iordache/translator/pngenerator.g:253:5: (place= ID )+
         	        {
         	            int cnt11=0;
 
@@ -2363,7 +2216,7 @@
         	        	switch (alt11) 
         	        	{
         	        	    case 1:
-        	        	        // /Users/bion/projects/iordache/translator/pngenerator.g:400:6: place= ID
+        	        	        // /Users/bion/projects/iordache/translator/pngenerator.g:253:6: place= ID
         	        	        {
         	        	            place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def208); 
         	        	            if  (HASEXCEPTION())
@@ -2417,7 +2270,7 @@
         	            		
         	        }
 
-        	        // /Users/bion/projects/iordache/translator/pngenerator.g:416:5: ( CODE_BLOCK )?
+        	        // /Users/bion/projects/iordache/translator/pngenerator.g:269:5: ( CODE_BLOCK )?
         	        {
         	            int alt12=2;
         	            {
@@ -2430,7 +2283,7 @@
         	            switch (alt12) 
         	            {
         	        	case 1:
-        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:416:6: CODE_BLOCK
+        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:269:6: CODE_BLOCK
         	        	    {
         	        	        CODE_BLOCK7 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def217); 
         	        	        if  (HASEXCEPTION())
@@ -2465,7 +2318,7 @@
         	    }
         	    break;
         	case 3:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:422:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:275:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
         	    {
         	        tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def235); 
         	        if  (HASEXCEPTION())
@@ -2498,7 +2351,7 @@
         	            		
         	        }
 
-        	        // /Users/bion/projects/iordache/translator/pngenerator.g:426:5: (place= ID )*
+        	        // /Users/bion/projects/iordache/translator/pngenerator.g:279:5: (place= ID )*
 
         	        for (;;)
         	        {
@@ -2516,7 +2369,7 @@
         	            switch (alt13) 
         	            {
         	        	case 1:
-        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:426:6: place= ID
+        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:279:6: place= ID
         	        	    {
         	        	        place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def246); 
         	        	        if  (HASEXCEPTION())
@@ -2557,7 +2410,7 @@
         	            		
         	        }
 
-        	        // /Users/bion/projects/iordache/translator/pngenerator.g:441:5: ( CODE_BLOCK )?
+        	        // /Users/bion/projects/iordache/translator/pngenerator.g:294:5: ( CODE_BLOCK )?
         	        {
         	            int alt14=2;
         	            {
@@ -2570,7 +2423,7 @@
         	            switch (alt14) 
         	            {
         	        	case 1:
-        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:441:6: CODE_BLOCK
+        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:294:6: CODE_BLOCK
         	        	    {
         	        	        CODE_BLOCK9 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def255); 
         	        	        if  (HASEXCEPTION())
@@ -2627,7 +2480,7 @@
 
 /** 
  * $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:446:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:299:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
  */
 static void
 select_functions(ppngenerator ctx)
@@ -2643,8 +2496,8 @@
     CODE_BLOCK11       = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:447:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:447:4: ^( SELECT_DEF ID CODE_BLOCK )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:300:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:300:4: ^( SELECT_DEF ID CODE_BLOCK )
         {
              MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions271); 
             if  (HASEXCEPTION())
@@ -2710,7 +2563,7 @@
 
 /** 
  * $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:454:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:307:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
  */
 static void
 nondeterm(ppngenerator ctx)
@@ -2724,8 +2577,8 @@
     ID12       = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:455:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:455:4: ^( 'nondeterministic places: ' ( ID )+ )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:308:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:308:4: ^( 'nondeterministic places: ' ( ID )+ )
         {
              MATCHT(47, &FOLLOW_47_in_nondeterm288); 
             if  (HASEXCEPTION())
@@ -2740,7 +2593,7 @@
                 goto rulenondetermEx;
             }
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:455:34: ( ID )+
+            // /Users/bion/projects/iordache/translator/pngenerator.g:308:34: ( ID )+
             {
                 int cnt16=0;
 
@@ -2760,7 +2613,7 @@
             	switch (alt16) 
             	{
             	    case 1:
-            	        // /Users/bion/projects/iordache/translator/pngenerator.g:455:35: ID
+            	        // /Users/bion/projects/iordache/translator/pngenerator.g:308:35: ID
             	        {
             	            ID12 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_nondeterm291); 
             	            if  (HASEXCEPTION())
@@ -2828,7 +2681,7 @@
 
 /** 
  * $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:462:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:315:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
  */
 static void
 proc_instantiations(ppngenerator ctx)
@@ -2838,11 +2691,11 @@
 
     ctx->ppngenerator_proc_instantiationsTop = ppngenerator_proc_instantiationsPush(ctx);
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:468:2: ( ( proc_init | sync_def | proc_start ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:468:4: ( proc_init | sync_def | proc_start )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:321:2: ( ( proc_init | sync_def | proc_start ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:321:4: ( proc_init | sync_def | proc_start )
         {
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:468:4: ( proc_init | sync_def | proc_start )
+            // /Users/bion/projects/iordache/translator/pngenerator.g:321:4: ( proc_init | sync_def | proc_start )
             {
                 int alt17=3;
                 switch ( LA(1) ) 
@@ -2877,7 +2730,7 @@
                 switch (alt17) 
                 {
             	case 1:
-            	    // /Users/bion/projects/iordache/translator/pngenerator.g:468:5: proc_init
+            	    // /Users/bion/projects/iordache/translator/pngenerator.g:321:5: proc_init
             	    {
             	        FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations312);
             	        proc_init(ctx);
@@ -2892,7 +2745,7 @@
             	    }
             	    break;
             	case 2:
-            	    // /Users/bion/projects/iordache/translator/pngenerator.g:468:17: sync_def
+            	    // /Users/bion/projects/iordache/translator/pngenerator.g:321:17: sync_def
             	    {
             	        FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations316);
             	        sync_def(ctx);
@@ -2907,7 +2760,7 @@
             	    }
             	    break;
             	case 3:
-            	    // /Users/bion/projects/iordache/translator/pngenerator.g:468:28: proc_start
+            	    // /Users/bion/projects/iordache/translator/pngenerator.g:321:28: proc_start
             	    {
             	        FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations320);
             	        proc_start(ctx);
@@ -2949,7 +2802,7 @@
 
 /** 
  * $ANTLR start proc_init
- * /Users/bion/projects/iordache/translator/pngenerator.g:470:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:323:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
  */
 static void
 proc_init(ppngenerator ctx)
@@ -2974,7 +2827,7 @@
 
     {
         {
-            //  /Users/bion/projects/iordache/translator/pngenerator.g:475:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
+            //  /Users/bion/projects/iordache/translator/pngenerator.g:328:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
             
             ANTLR3_UINT32 alt19;
 
@@ -3026,7 +2879,7 @@
             switch (alt19) 
             {
         	case 1:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:475:4: name1= ID
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:328:4: name1= ID
         	    {
         	        name1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init338); 
         	        if  (HASEXCEPTION())
@@ -3057,7 +2910,7 @@
         	    }
         	    break;
         	case 2:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:492:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:345:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
         	    {
         	        name2 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init348); 
         	        if  (HASEXCEPTION())
@@ -3088,7 +2941,7 @@
         	            goto ruleproc_initEx;
         	        }
 
-        	        // /Users/bion/projects/iordache/translator/pngenerator.g:504:5: ( numbered_ID[$proc_instantiations::places] )+
+        	        // /Users/bion/projects/iordache/translator/pngenerator.g:357:5: ( numbered_ID[$proc_instantiations::places] )+
         	        {
         	            int cnt18=0;
 
@@ -3108,7 +2961,7 @@
         	        	switch (alt18) 
         	        	{
         	        	    case 1:
-        	        	        // /Users/bion/projects/iordache/translator/pngenerator.g:504:6: numbered_ID[$proc_instantiations::places]
+        	        	        // /Users/bion/projects/iordache/translator/pngenerator.g:357:6: numbered_ID[$proc_instantiations::places]
         	        	        {
         	        	            FOLLOWPUSH(FOLLOW_numbered_ID_in_proc_init353);
         	        	            numbered_ID13=numbered_ID(ctx, 	(SCOPE_TOP(proc_instantiations))->places);
@@ -3194,7 +3047,7 @@
 
 /** 
  * $ANTLR start sync_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:519:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:372:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
  */
 static void
 sync_def(ppngenerator ctx)
@@ -3214,8 +3067,8 @@
     group_elements14 = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:524:2: ( ^( SYNC_TOK ( group_elements )+ ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:524:4: ^( SYNC_TOK ( group_elements )+ )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:377:2: ( ^( SYNC_TOK ( group_elements )+ ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:377:4: ^( SYNC_TOK ( group_elements )+ )
         {
              MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def379); 
             if  (HASEXCEPTION())
@@ -3230,7 +3083,7 @@
                 goto rulesync_defEx;
             }
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:524:15: ( group_elements )+
+            // /Users/bion/projects/iordache/translator/pngenerator.g:377:15: ( group_elements )+
             {
                 int cnt20=0;
 
@@ -3250,7 +3103,7 @@
             	switch (alt20) 
             	{
             	    case 1:
-            	        // /Users/bion/projects/iordache/translator/pngenerator.g:524:16: group_elements
+            	        // /Users/bion/projects/iordache/translator/pngenerator.g:377:16: group_elements
             	        {
             	            FOLLOWPUSH(FOLLOW_group_elements_in_sync_def382);
             	            group_elements14=group_elements(ctx);
@@ -3364,7 +3217,7 @@
 
 /** 
  * $ANTLR start proc_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:569:1: proc_start : ^( START ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:422:1: proc_start : ^( START ( ID )+ ) ;
  */
 static void
 proc_start(ppngenerator ctx)
@@ -3378,8 +3231,8 @@
     ID15       = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:570:2: ( ^( START ( ID )+ ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:570:4: ^( START ( ID )+ )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:423:2: ( ^( START ( ID )+ ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:423:4: ^( START ( ID )+ )
         {
              MATCHT(START, &FOLLOW_START_in_proc_start399); 
             if  (HASEXCEPTION())
@@ -3394,7 +3247,7 @@
                 goto ruleproc_startEx;
             }
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:570:12: ( ID )+
+            // /Users/bion/projects/iordache/translator/pngenerator.g:423:12: ( ID )+
             {
                 int cnt21=0;
 
@@ -3414,7 +3267,7 @@
             	switch (alt21) 
             	{
             	    case 1:
-            	        // /Users/bion/projects/iordache/translator/pngenerator.g:570:13: ID
+            	        // /Users/bion/projects/iordache/translator/pngenerator.g:423:13: ID
             	        {
             	            ID15 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_start402); 
             	            if  (HASEXCEPTION())
@@ -3484,7 +3337,7 @@
 
 /** 
  * $ANTLR start constraints
- * /Users/bion/projects/iordache/translator/pngenerator.g:578:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:431:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
  */
 static void
 constraints(ppngenerator ctx)
@@ -3498,8 +3351,8 @@
 
     ctx->ppngenerator_constraintsTop = ppngenerator_constraintsPush(ctx);
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:585:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:585:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:438:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:438:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
         {
             FOLLOWPUSH(FOLLOW_constraint_block_in_constraints422);
             constraint_block(ctx);
@@ -3519,7 +3372,7 @@
                 }
 
 
-                // /Users/bion/projects/iordache/translator/pngenerator.g:585:23: ( ( eq ) | live_def | uncontrol | unobserve )*
+                // /Users/bion/projects/iordache/translator/pngenerator.g:438:23: ( ( eq ) | live_def | uncontrol | unobserve )*
 
                 for (;;)
                 {
@@ -3554,10 +3407,10 @@
                     switch (alt22) 
                     {
                 	case 1:
-                	    // /Users/bion/projects/iordache/translator/pngenerator.g:585:24: ( eq )
+                	    // /Users/bion/projects/iordache/translator/pngenerator.g:438:24: ( eq )
                 	    {
-                	        // /Users/bion/projects/iordache/translator/pngenerator.g:585:24: ( eq )
-                	        // /Users/bion/projects/iordache/translator/pngenerator.g:585:25: eq
+                	        // /Users/bion/projects/iordache/translator/pngenerator.g:438:24: ( eq )
+                	        // /Users/bion/projects/iordache/translator/pngenerator.g:438:25: eq
                 	        {
                 	            FOLLOWPUSH(FOLLOW_eq_in_constraints426);
                 	            eq16=eq(ctx);
@@ -3599,7 +3452,7 @@
                 	    }
                 	    break;
                 	case 2:
-                	    // /Users/bion/projects/iordache/translator/pngenerator.g:606:6: live_def
+                	    // /Users/bion/projects/iordache/translator/pngenerator.g:459:6: live_def
                 	    {
                 	        FOLLOWPUSH(FOLLOW_live_def_in_constraints431);
                 	        live_def(ctx);
@@ -3614,7 +3467,7 @@
                 	    }
                 	    break;
                 	case 3:
-                	    // /Users/bion/projects/iordache/translator/pngenerator.g:606:15: uncontrol
+                	    // /Users/bion/projects/iordache/translator/pngenerator.g:459:15: uncontrol
                 	    {
                 	        FOLLOWPUSH(FOLLOW_uncontrol_in_constraints433);
                 	        uncontrol(ctx);
@@ -3629,7 +3482,7 @@
                 	    }
                 	    break;
                 	case 4:
-                	    // /Users/bion/projects/iordache/translator/pngenerator.g:606:25: unobserve
+                	    // /Users/bion/projects/iordache/translator/pngenerator.g:459:25: unobserve
                 	    {
                 	        FOLLOWPUSH(FOLLOW_unobserve_in_constraints435);
                 	        unobserve(ctx);
@@ -3684,7 +3537,7 @@
 
 /** 
  * $ANTLR start constraint_block
- * /Users/bion/projects/iordache/translator/pngenerator.g:607:1: constraint_block : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:460:1: constraint_block : ID ;
  */
 static void
 constraint_block(ppngenerator ctx)
@@ -3698,8 +3551,8 @@
     ID17       = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:608:2: ( ID )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:608:4: ID
+        // /Users/bion/projects/iordache/translator/pngenerator.g:461:2: ( ID )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:461:4: ID
         {
             ID17 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_constraint_block446); 
             if  (HASEXCEPTION())
@@ -3750,7 +3603,7 @@
 
 /** 
  * $ANTLR start eq
- * /Users/bion/projects/iordache/translator/pngenerator.g:627:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:480:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) );
  */
 static pngenerator_eq_return
 eq(ppngenerator ctx)
@@ -3784,7 +3637,7 @@
 
     {
         {
-            //  /Users/bion/projects/iordache/translator/pngenerator.g:632:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
+            //  /Users/bion/projects/iordache/translator/pngenerator.g:485:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
             
             ANTLR3_UINT32 alt24;
 
@@ -3817,7 +3670,7 @@
             switch (alt24) 
             {
         	case 1:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:632:4: relationalExpression
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:485:4: relationalExpression
         	    {
         	        FOLLOWPUSH(FOLLOW_relationalExpression_in_eq469);
         	        relationalExpression18=relationalExpression(ctx);
@@ -3835,10 +3688,10 @@
         	    }
         	    break;
         	case 2:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:633:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:486:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
         	    {
 
-        	        // /Users/bion/projects/iordache/translator/pngenerator.g:633:6: ( AND_OP | OR_OP )
+        	        // /Users/bion/projects/iordache/translator/pngenerator.g:486:6: ( AND_OP | OR_OP )
         	        {
         	            int alt23=2;
 
@@ -3868,7 +3721,7 @@
         	            switch (alt23) 
         	            {
         	        	case 1:
-        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:633:7: AND_OP
+        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:486:7: AND_OP
         	        	    {
         	        	         MATCHT(AND_OP, &FOLLOW_AND_OP_in_eq478); 
         	        	        if  (HASEXCEPTION())
@@ -3885,7 +3738,7 @@
         	        	    }
         	        	    break;
         	        	case 2:
-        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:635:7: OR_OP
+        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:488:7: OR_OP
         	        	    {
         	        	         MATCHT(OR_OP, &FOLLOW_OR_OP_in_eq484); 
         	        	        if  (HASEXCEPTION())
@@ -3994,7 +3847,7 @@
 
 /** 
  * $ANTLR start relationalExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:659:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:512:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
  */
 static inequality*
 relationalExpression(ppngenerator ctx)
@@ -4017,8 +3870,8 @@
     NUM19       = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:667:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:667:9: ^( EQ_OP additiveExpression[list, false] NUM )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:520:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:520:9: ^( EQ_OP additiveExpression[list, false] NUM )
         {
              MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression530); 
             if  (HASEXCEPTION())
@@ -4092,7 +3945,7 @@
 
 /** 
  * $ANTLR start additiveExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:680:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:533:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) );
  */
 static void
 additiveExpression(ppngenerator ctx, pANTLR3_VECTOR list, bool flip)
@@ -4109,7 +3962,7 @@
 
     {
         {
-            //  /Users/bion/projects/iordache/translator/pngenerator.g:681:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) )
+            //  /Users/bion/projects/iordache/translator/pngenerator.g:534:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) )
             
             ANTLR3_UINT32 alt25;
 
@@ -4148,7 +4001,7 @@
             switch (alt25) 
             {
         	case 1:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:681:9: primary[flip]
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:534:9: primary[flip]
         	    {
         	        FOLLOWPUSH(FOLLOW_primary_in_additiveExpression554);
         	        primary20=primary(ctx, flip);
@@ -4166,7 +4019,7 @@
         	    }
         	    break;
         	case 2:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:682:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:535:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
         	    {
         	         MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression566); 
         	        if  (HASEXCEPTION())
@@ -4210,7 +4063,7 @@
         	    }
         	    break;
         	case 3:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:683:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:536:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
         	    {
         	         MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression582); 
         	        if  (HASEXCEPTION())
@@ -4276,7 +4129,7 @@
 
 /** 
  * $ANTLR start primary
- * /Users/bion/projects/iordache/translator/pngenerator.g:685:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:538:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
  */
 static variable*
 primary(ppngenerator ctx, bool flip)
@@ -4302,7 +4155,7 @@
 
     {
         {
-            //  /Users/bion/projects/iordache/translator/pngenerator.g:686:5: ( group_elements | ^( MULT NUM group_elements ) )
+            //  /Users/bion/projects/iordache/translator/pngenerator.g:539:5: ( group_elements | ^( MULT NUM group_elements ) )
             
             ANTLR3_UINT32 alt26;
 
@@ -4335,7 +4188,7 @@
             switch (alt26) 
             {
         	case 1:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:686:9: group_elements
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:539:9: group_elements
         	    {
         	        FOLLOWPUSH(FOLLOW_group_elements_in_primary609);
         	        group_elements21=group_elements(ctx);
@@ -4359,7 +4212,7 @@
         	    }
         	    break;
         	case 2:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:693:7: ^( MULT NUM group_elements )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:546:7: ^( MULT NUM group_elements )
         	    {
         	         MATCHT(MULT, &FOLLOW_MULT_in_primary620); 
         	        if  (HASEXCEPTION())
@@ -4431,7 +4284,7 @@
 
 /** 
  * $ANTLR start live_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:700:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:553:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
  */
 static void
 live_def(ppngenerator ctx)
@@ -4451,7 +4304,7 @@
 
     {
         {
-            //  /Users/bion/projects/iordache/translator/pngenerator.g:704:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
+            //  /Users/bion/projects/iordache/translator/pngenerator.g:557:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
             
             ANTLR3_UINT32 alt29;
 
@@ -4522,7 +4375,7 @@
             switch (alt29) 
             {
         	case 1:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:704:4: ^( LIVE ALL ( ID )* )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:557:4: ^( LIVE ALL ( ID )* )
         	    {
         	         MATCHT(LIVE, &FOLLOW_LIVE_in_live_def642); 
         	        if  (HASEXCEPTION())
@@ -4554,7 +4407,7 @@
         	            		
         	        }
 
-        	        // /Users/bion/projects/iordache/translator/pngenerator.g:711:5: ( ID )*
+        	        // /Users/bion/projects/iordache/translator/pngenerator.g:564:5: ( ID )*
 
         	        for (;;)
         	        {
@@ -4572,7 +4425,7 @@
         	            switch (alt27) 
         	            {
         	        	case 1:
-        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:711:6: ID
+        	        	    // /Users/bion/projects/iordache/translator/pngenerator.g:564:6: ID
         	        	    {
         	        	        ID24 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def649); 
         	        	        if  (HASEXCEPTION())
@@ -4620,7 +4473,7 @@
         	    }
         	    break;
         	case 2:
-        	    // /Users/bion/projects/iordache/translator/pngenerator.g:724:4: ^( LIVE ( ID )+ )
+        	    // /Users/bion/projects/iordache/translator/pngenerator.g:577:4: ^( LIVE ( ID )+ )
         	    {
         	         MATCHT(LIVE, &FOLLOW_LIVE_in_live_def662); 
         	        if  (HASEXCEPTION())
@@ -4635,7 +4488,7 @@
         	            goto rulelive_defEx;
         	        }
 
-        	        // /Users/bion/projects/iordache/translator/pngenerator.g:724:11: ( ID )+
+        	        // /Users/bion/projects/iordache/translator/pngenerator.g:577:11: ( ID )+
         	        {
         	            int cnt28=0;
 
@@ -4655,7 +4508,7 @@
         	        	switch (alt28) 
         	        	{
         	        	    case 1:
-        	        	        // /Users/bion/projects/iordache/translator/pngenerator.g:724:12: ID
+        	        	        // /Users/bion/projects/iordache/translator/pngenerator.g:577:12: ID
         	        	        {
         	        	            ID25 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def665); 
         	        	            if  (HASEXCEPTION())
@@ -4726,7 +4579,7 @@
 
 /** 
  * $ANTLR start uncontrol
- * /Users/bion/projects/iordache/translator/pngenerator.g:729:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:582:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
  */
 static void
 uncontrol(ppngenerator ctx)
@@ -4740,8 +4593,8 @@
     ID26       = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:730:2: ( ^( UNCONTROL ( ID )+ ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:730:4: ^( UNCONTROL ( ID )+ )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:583:2: ( ^( UNCONTROL ( ID )+ ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:583:4: ^( UNCONTROL ( ID )+ )
         {
              MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol680); 
             if  (HASEXCEPTION())
@@ -4756,7 +4609,7 @@
                 goto ruleuncontrolEx;
             }
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:730:16: ( ID )+
+            // /Users/bion/projects/iordache/translator/pngenerator.g:583:16: ( ID )+
             {
                 int cnt30=0;
 
@@ -4776,7 +4629,7 @@
             	switch (alt30) 
             	{
             	    case 1:
-            	        // /Users/bion/projects/iordache/translator/pngenerator.g:730:17: ID
+            	        // /Users/bion/projects/iordache/translator/pngenerator.g:583:17: ID
             	        {
             	            ID26 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_uncontrol683); 
             	            if  (HASEXCEPTION())
@@ -4844,7 +4697,7 @@
 
 /** 
  * $ANTLR start unobserve
- * /Users/bion/projects/iordache/translator/pngenerator.g:735:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:588:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
  */
 static void
 unobserve(ppngenerator ctx)
@@ -4858,8 +4711,8 @@
     ID27       = NULL;
 
     {
-        // /Users/bion/projects/iordache/translator/pngenerator.g:736:2: ( ^( UNOBSERVE ( ID )+ ) )
-        // /Users/bion/projects/iordache/translator/pngenerator.g:736:4: ^( UNOBSERVE ( ID )+ )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:589:2: ( ^( UNOBSERVE ( ID )+ ) )
+        // /Users/bion/projects/iordache/translator/pngenerator.g:589:4: ^( UNOBSERVE ( ID )+ )
         {
              MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve698); 
             if  (HASEXCEPTION())
@@ -4874,7 +4727,7 @@
                 goto ruleunobserveEx;
             }
 
-            // /Users/bion/projects/iordache/translator/pngenerator.g:736:16: ( ID )+
+            // /Users/bion/projects/iordache/translator/pngenerator.g:589:16: ( ID )+
             {
                 int cnt31=0;
 
@@ -4894,7 +4747,7 @@
            ...
 
[truncated message content]