[Pntool-developers] SF.net SVN: pntool:[173] translator
Brought to you by:
compaqdrew,
miordache
Menu
▾
▴
[Pntool-developers] SF.net SVN: pntool:[173] translator
|
From: <the...@us...> - 2009-07-07 02:19:02
|
Revision: 173
http://pntool.svn.sourceforge.net/pntool/?rev=173&view=rev
Author: thecodeweasel
Date: 2009-07-07 02:18:52 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
Adding labels in parenthesis
Modified Paths:
--------------
translator/pngenerator.c
translator/pngenerator.g
translator/pngenerator.h
Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c 2009-07-07 02:07:10 UTC (rev 172)
+++ translator/pngenerator.c 2009-07-07 02:18:52 UTC (rev 173)
@@ -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:06:28
+ * - On : 2009-07-06 21:18:20
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
@@ -939,6 +939,8 @@
displaypn(*(spec->process_array[i]->pn), stdout);
}
printf("======================\n");
+ printf("Labels in parenthesis\n");
+ printf("======================\n");
//display constraints
constraints = spec->constraint_list;
i = 0;
@@ -965,7 +967,7 @@
while(syncs) {
proc1 = (process*) procs->getI(procs, syncs->pn1);
proc2 = (process*) procs->getI(procs, syncs->pn2);
- printf("Syncing %s.t%i and %s.t%i\n", proc1->instance, syncs->t1, proc2->instance, syncs->t2);
+ 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");
@@ -1026,6 +1028,11 @@
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(" + ");
}
@@ -1290,7 +1297,7 @@
*/
/**
* $ANTLR start pn
- * /Users/bion/projects/iordache/translator/pngenerator.g:277: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:284: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)
@@ -1317,10 +1324,10 @@
constraintList = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:293:2: ( ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* )
- // /Users/bion/projects/iordache/translator/pngenerator.g:293:4: ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )*
+ // /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:293:4: ( proc_definitions )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:4: ( proc_definitions )+
{
int cnt1=0;
@@ -1380,7 +1387,7 @@
switch (alt1)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:293:4: proc_definitions
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:4: proc_definitions
{
FOLLOWPUSH(FOLLOW_proc_definitions_in_pn71);
proc_definitions(ctx);
@@ -1414,7 +1421,7 @@
}
loop1: ; /* Jump to here if this rule does not match */
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:293:22: ( proc_instantiations )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:22: ( proc_instantiations )+
{
int cnt2=0;
@@ -1460,7 +1467,7 @@
switch (alt2)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:293:22: proc_instantiations
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:22: proc_instantiations
{
FOLLOWPUSH(FOLLOW_proc_instantiations_in_pn74);
proc_instantiations(ctx);
@@ -1495,7 +1502,7 @@
loop2: ; /* Jump to here if this rule does not match */
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:293:43: ( constraints )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:43: ( constraints )*
for (;;)
{
@@ -1513,7 +1520,7 @@
switch (alt3)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:293:43: constraints
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:43: constraints
{
FOLLOWPUSH(FOLLOW_constraints_in_pn77);
constraints(ctx);
@@ -1536,7 +1543,7 @@
loop3: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:293:56: ( other_commands )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:56: ( other_commands )*
for (;;)
{
@@ -1554,7 +1561,7 @@
switch (alt4)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:293:56: other_commands
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:56: other_commands
{
FOLLOWPUSH(FOLLOW_other_commands_in_pn80);
other_commands(ctx);
@@ -1625,7 +1632,7 @@
/**
* $ANTLR start proc_definitions
- * /Users/bion/projects/iordache/translator/pngenerator.g:318:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:325:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
*/
static void
proc_definitions(ppngenerator ctx)
@@ -1635,8 +1642,8 @@
ctx->ppngenerator_proc_definitionsTop = ppngenerator_proc_definitionsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:324:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:324:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? )
+ // /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 )? )
{
FOLLOWPUSH(FOLLOW_def_start_in_proc_definitions98);
def_start(ctx);
@@ -1656,7 +1663,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:324:16: ( trans_defs )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:331:16: ( trans_defs )*
for (;;)
{
@@ -1674,7 +1681,7 @@
switch (alt5)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:324:16: trans_defs
+ // /Users/bion/projects/iordache/translator/pngenerator.g:331:16: trans_defs
{
FOLLOWPUSH(FOLLOW_trans_defs_in_proc_definitions100);
trans_defs(ctx);
@@ -1697,7 +1704,7 @@
loop5: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:324:28: ( select_functions )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:331:28: ( select_functions )*
for (;;)
{
@@ -1715,7 +1722,7 @@
switch (alt6)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:324:28: select_functions
+ // /Users/bion/projects/iordache/translator/pngenerator.g:331:28: select_functions
{
FOLLOWPUSH(FOLLOW_select_functions_in_proc_definitions103);
select_functions(ctx);
@@ -1738,7 +1745,7 @@
loop6: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:324:46: ( nondeterm )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:331:46: ( nondeterm )?
{
int alt7=2;
{
@@ -1751,7 +1758,7 @@
switch (alt7)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:324:46: nondeterm
+ // /Users/bion/projects/iordache/translator/pngenerator.g:331:46: nondeterm
{
FOLLOWPUSH(FOLLOW_nondeterm_in_proc_definitions106);
nondeterm(ctx);
@@ -1801,7 +1808,7 @@
/**
* $ANTLR start def_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:325:1: def_start : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:332:1: def_start : ID ;
*/
static void
def_start(ppngenerator ctx)
@@ -1818,8 +1825,8 @@
ID1 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:329:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:329:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:336:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:336:4: ID
{
ID1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_def_start122);
if (HASEXCEPTION())
@@ -1875,7 +1882,7 @@
/**
* $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:352:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:359:1: trans_defs : ( extern_trans_def | trans_def );
*/
static void
trans_defs(ppngenerator ctx)
@@ -1886,7 +1893,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:353:2: ( extern_trans_def | trans_def )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:360:2: ( extern_trans_def | trans_def )
ANTLR3_UINT32 alt8;
@@ -1919,7 +1926,7 @@
switch (alt8)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:353:4: extern_trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:360:4: extern_trans_def
{
FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs132);
extern_trans_def(ctx);
@@ -1934,7 +1941,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:354:4: trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:361:4: trans_def
{
FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs137);
trans_def(ctx);
@@ -1971,7 +1978,7 @@
/**
* $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:355:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:362:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
*/
static void
extern_trans_def(ppngenerator ctx)
@@ -1994,11 +2001,11 @@
ID4 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:361:2: ( ^( ( TO | FROM ) ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:361:4: ^( ( TO | FROM ) ( ID )+ )
+ // /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:361:6: ( TO | FROM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:368:6: ( TO | FROM )
{
int alt9=2;
@@ -2028,7 +2035,7 @@
switch (alt9)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:361:7: TO
+ // /Users/bion/projects/iordache/translator/pngenerator.g:368:7: TO
{
TO2 = (pANTLR3_BASE_TREE) MATCHT(TO, &FOLLOW_TO_in_extern_trans_def153);
if (HASEXCEPTION())
@@ -2046,7 +2053,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:364:7: FROM
+ // /Users/bion/projects/iordache/translator/pngenerator.g:371:7: FROM
{
FROM3 = (pANTLR3_BASE_TREE) MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def159);
if (HASEXCEPTION())
@@ -2073,7 +2080,7 @@
goto ruleextern_trans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:367:6: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:374:6: ( ID )+
{
int cnt10=0;
@@ -2093,7 +2100,7 @@
switch (alt10)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:367:7: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:374:7: ID
{
ID4 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_extern_trans_def165);
if (HASEXCEPTION())
@@ -2160,7 +2167,7 @@
/**
* $ANTLR start trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:371: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:378: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)
@@ -2197,7 +2204,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:382:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) )
+ // /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 )? ) )
ANTLR3_UINT32 alt15;
@@ -2273,7 +2280,7 @@
switch (alt15)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:382:4: ^( ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:389:4: ^( ID CODE_BLOCK )
{
ID5 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def185);
if (HASEXCEPTION())
@@ -2315,7 +2322,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:391:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:398:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def201);
if (HASEXCEPTION())
@@ -2336,7 +2343,7 @@
goto ruletrans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:393:5: (place= ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:400:5: (place= ID )+
{
int cnt11=0;
@@ -2356,7 +2363,7 @@
switch (alt11)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:393:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:400:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def208);
if (HASEXCEPTION())
@@ -2410,7 +2417,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:409:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:416:5: ( CODE_BLOCK )?
{
int alt12=2;
{
@@ -2423,7 +2430,7 @@
switch (alt12)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:409:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:416:6: CODE_BLOCK
{
CODE_BLOCK7 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def217);
if (HASEXCEPTION())
@@ -2458,7 +2465,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:415:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:422:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def235);
if (HASEXCEPTION())
@@ -2491,7 +2498,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:419:5: (place= ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:426:5: (place= ID )*
for (;;)
{
@@ -2509,7 +2516,7 @@
switch (alt13)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:419:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:426:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def246);
if (HASEXCEPTION())
@@ -2550,7 +2557,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:434:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:441:5: ( CODE_BLOCK )?
{
int alt14=2;
{
@@ -2563,7 +2570,7 @@
switch (alt14)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:434:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:441:6: CODE_BLOCK
{
CODE_BLOCK9 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def255);
if (HASEXCEPTION())
@@ -2620,7 +2627,7 @@
/**
* $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:439:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:446:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
*/
static void
select_functions(ppngenerator ctx)
@@ -2636,8 +2643,8 @@
CODE_BLOCK11 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:440:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:440:4: ^( SELECT_DEF ID CODE_BLOCK )
+ // /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 )
{
MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions271);
if (HASEXCEPTION())
@@ -2703,7 +2710,7 @@
/**
* $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:447:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:454:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
*/
static void
nondeterm(ppngenerator ctx)
@@ -2717,8 +2724,8 @@
ID12 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:448:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:448:4: ^( 'nondeterministic places: ' ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:455:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:455:4: ^( 'nondeterministic places: ' ( ID )+ )
{
MATCHT(47, &FOLLOW_47_in_nondeterm288);
if (HASEXCEPTION())
@@ -2733,7 +2740,7 @@
goto rulenondetermEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:448:34: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:455:34: ( ID )+
{
int cnt16=0;
@@ -2753,7 +2760,7 @@
switch (alt16)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:448:35: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:455:35: ID
{
ID12 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_nondeterm291);
if (HASEXCEPTION())
@@ -2821,7 +2828,7 @@
/**
* $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:455:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:462:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
*/
static void
proc_instantiations(ppngenerator ctx)
@@ -2831,11 +2838,11 @@
ctx->ppngenerator_proc_instantiationsTop = ppngenerator_proc_instantiationsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:461:2: ( ( proc_init | sync_def | proc_start ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:461:4: ( proc_init | sync_def | proc_start )
+ // /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:461:4: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:468:4: ( proc_init | sync_def | proc_start )
{
int alt17=3;
switch ( LA(1) )
@@ -2870,7 +2877,7 @@
switch (alt17)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:461:5: proc_init
+ // /Users/bion/projects/iordache/translator/pngenerator.g:468:5: proc_init
{
FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations312);
proc_init(ctx);
@@ -2885,7 +2892,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:461:17: sync_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:468:17: sync_def
{
FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations316);
sync_def(ctx);
@@ -2900,7 +2907,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:461:28: proc_start
+ // /Users/bion/projects/iordache/translator/pngenerator.g:468:28: proc_start
{
FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations320);
proc_start(ctx);
@@ -2942,7 +2949,7 @@
/**
* $ANTLR start proc_init
- * /Users/bion/projects/iordache/translator/pngenerator.g:463:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:470:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
*/
static void
proc_init(ppngenerator ctx)
@@ -2967,7 +2974,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:468:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:475:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
ANTLR3_UINT32 alt19;
@@ -3019,7 +3026,7 @@
switch (alt19)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:468:4: name1= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:475:4: name1= ID
{
name1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init338);
if (HASEXCEPTION())
@@ -3050,7 +3057,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:485:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:492:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
{
name2 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init348);
if (HASEXCEPTION())
@@ -3081,7 +3088,7 @@
goto ruleproc_initEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:497:5: ( numbered_ID[$proc_instantiations::places] )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:504:5: ( numbered_ID[$proc_instantiations::places] )+
{
int cnt18=0;
@@ -3101,7 +3108,7 @@
switch (alt18)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:497:6: numbered_ID[$proc_instantiations::places]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:504:6: numbered_ID[$proc_instantiations::places]
{
FOLLOWPUSH(FOLLOW_numbered_ID_in_proc_init353);
numbered_ID13=numbered_ID(ctx, (SCOPE_TOP(proc_instantiations))->places);
@@ -3187,7 +3194,7 @@
/**
* $ANTLR start sync_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:512:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:519:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
*/
static void
sync_def(ppngenerator ctx)
@@ -3207,8 +3214,8 @@
group_elements14 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:517:2: ( ^( SYNC_TOK ( group_elements )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:517:4: ^( SYNC_TOK ( group_elements )+ )
+ // /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 )+ )
{
MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def379);
if (HASEXCEPTION())
@@ -3223,7 +3230,7 @@
goto rulesync_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:517:15: ( group_elements )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:524:15: ( group_elements )+
{
int cnt20=0;
@@ -3243,7 +3250,7 @@
switch (alt20)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:517:16: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:524:16: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_sync_def382);
group_elements14=group_elements(ctx);
@@ -3357,7 +3364,7 @@
/**
* $ANTLR start proc_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:562:1: proc_start : ^( START ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:569:1: proc_start : ^( START ( ID )+ ) ;
*/
static void
proc_start(ppngenerator ctx)
@@ -3371,8 +3378,8 @@
ID15 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:563:2: ( ^( START ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:563:4: ^( START ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:570:2: ( ^( START ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:570:4: ^( START ( ID )+ )
{
MATCHT(START, &FOLLOW_START_in_proc_start399);
if (HASEXCEPTION())
@@ -3387,7 +3394,7 @@
goto ruleproc_startEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:563:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:570:12: ( ID )+
{
int cnt21=0;
@@ -3407,7 +3414,7 @@
switch (alt21)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:563:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:570:13: ID
{
ID15 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_start402);
if (HASEXCEPTION())
@@ -3477,7 +3484,7 @@
/**
* $ANTLR start constraints
- * /Users/bion/projects/iordache/translator/pngenerator.g:571:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:578:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
*/
static void
constraints(ppngenerator ctx)
@@ -3491,8 +3498,8 @@
ctx->ppngenerator_constraintsTop = ppngenerator_constraintsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
+ // /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 )* )
{
FOLLOWPUSH(FOLLOW_constraint_block_in_constraints422);
constraint_block(ctx);
@@ -3512,7 +3519,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:23: ( ( eq ) | live_def | uncontrol | unobserve )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:585:23: ( ( eq ) | live_def | uncontrol | unobserve )*
for (;;)
{
@@ -3547,10 +3554,10 @@
switch (alt22)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:585:24: ( eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:24: ( eq )
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:25: eq
+ // /Users/bion/projects/iordache/translator/pngenerator.g:585:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:585:25: eq
{
FOLLOWPUSH(FOLLOW_eq_in_constraints426);
eq16=eq(ctx);
@@ -3592,7 +3599,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:599:6: live_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:606:6: live_def
{
FOLLOWPUSH(FOLLOW_live_def_in_constraints431);
live_def(ctx);
@@ -3607,7 +3614,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:599:15: uncontrol
+ // /Users/bion/projects/iordache/translator/pngenerator.g:606:15: uncontrol
{
FOLLOWPUSH(FOLLOW_uncontrol_in_constraints433);
uncontrol(ctx);
@@ -3622,7 +3629,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:599:25: unobserve
+ // /Users/bion/projects/iordache/translator/pngenerator.g:606:25: unobserve
{
FOLLOWPUSH(FOLLOW_unobserve_in_constraints435);
unobserve(ctx);
@@ -3677,7 +3684,7 @@
/**
* $ANTLR start constraint_block
- * /Users/bion/projects/iordache/translator/pngenerator.g:600:1: constraint_block : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:607:1: constraint_block : ID ;
*/
static void
constraint_block(ppngenerator ctx)
@@ -3691,8 +3698,8 @@
ID17 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:601:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:601:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:608:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:608:4: ID
{
ID17 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_constraint_block446);
if (HASEXCEPTION())
@@ -3743,7 +3750,7 @@
/**
* $ANTLR start eq
- * /Users/bion/projects/iordache/translator/pngenerator.g:620:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= 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 ) );
*/
static pngenerator_eq_return
eq(ppngenerator ctx)
@@ -3777,7 +3784,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:625:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:632:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
ANTLR3_UINT32 alt24;
@@ -3810,7 +3817,7 @@
switch (alt24)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:625:4: relationalExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:632:4: relationalExpression
{
FOLLOWPUSH(FOLLOW_relationalExpression_in_eq469);
relationalExpression18=relationalExpression(ctx);
@@ -3828,10 +3835,10 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:626:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:633:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:626:6: ( AND_OP | OR_OP )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:633:6: ( AND_OP | OR_OP )
{
int alt23=2;
@@ -3861,7 +3868,7 @@
switch (alt23)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:626:7: AND_OP
+ // /Users/bion/projects/iordache/translator/pngenerator.g:633:7: AND_OP
{
MATCHT(AND_OP, &FOLLOW_AND_OP_in_eq478);
if (HASEXCEPTION())
@@ -3878,7 +3885,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:628:7: OR_OP
+ // /Users/bion/projects/iordache/translator/pngenerator.g:635:7: OR_OP
{
MATCHT(OR_OP, &FOLLOW_OR_OP_in_eq484);
if (HASEXCEPTION())
@@ -3987,7 +3994,7 @@
/**
* $ANTLR start relationalExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:652:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:659:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
*/
static inequality*
relationalExpression(ppngenerator ctx)
@@ -4010,8 +4017,8 @@
NUM19 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:660:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:660:9: ^( EQ_OP additiveExpression[list, false] NUM )
+ // /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 )
{
MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression530);
if (HASEXCEPTION())
@@ -4085,7 +4092,7 @@
/**
* $ANTLR start additiveExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:673: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:680: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)
@@ -4102,7 +4109,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:674:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) )
+ // /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] ) )
ANTLR3_UINT32 alt25;
@@ -4141,7 +4148,7 @@
switch (alt25)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:674:9: primary[flip]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:681:9: primary[flip]
{
FOLLOWPUSH(FOLLOW_primary_in_additiveExpression554);
primary20=primary(ctx, flip);
@@ -4159,7 +4166,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:675:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:682:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
{
MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression566);
if (HASEXCEPTION())
@@ -4203,7 +4210,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:676:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:683:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
{
MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression582);
if (HASEXCEPTION())
@@ -4269,7 +4276,7 @@
/**
* $ANTLR start primary
- * /Users/bion/projects/iordache/translator/pngenerator.g:678:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:685:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
*/
static variable*
primary(ppngenerator ctx, bool flip)
@@ -4295,7 +4302,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:679:5: ( group_elements | ^( MULT NUM group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:686:5: ( group_elements | ^( MULT NUM group_elements ) )
ANTLR3_UINT32 alt26;
@@ -4328,7 +4335,7 @@
switch (alt26)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:679:9: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:686:9: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_primary609);
group_elements21=group_elements(ctx);
@@ -4352,7 +4359,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:686:7: ^( MULT NUM group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:693:7: ^( MULT NUM group_elements )
{
MATCHT(MULT, &FOLLOW_MULT_in_primary620);
if (HASEXCEPTION())
@@ -4424,7 +4431,7 @@
/**
* $ANTLR start live_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:693:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:700:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
*/
static void
live_def(ppngenerator ctx)
@@ -4444,7 +4451,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:697:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:704:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
ANTLR3_UINT32 alt29;
@@ -4515,7 +4522,7 @@
switch (alt29)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:697:4: ^( LIVE ALL ( ID )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:704:4: ^( LIVE ALL ( ID )* )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def642);
if (HASEXCEPTION())
@@ -4547,7 +4554,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:704:5: ( ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:711:5: ( ID )*
for (;;)
{
@@ -4565,7 +4572,7 @@
switch (alt27)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:704:6: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:711:6: ID
{
ID24 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def649);
if (HASEXCEPTION())
@@ -4613,7 +4620,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:717:4: ^( LIVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:724:4: ^( LIVE ( ID )+ )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def662);
if (HASEXCEPTION())
@@ -4628,7 +4635,7 @@
goto rulelive_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:717:11: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:724:11: ( ID )+
{
int cnt28=0;
@@ -4648,7 +4655,7 @@
switch (alt28)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:717:12: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:724:12: ID
{
ID25 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def665);
if (HASEXCEPTION())
@@ -4719,7 +4726,7 @@
/**
* $ANTLR start uncontrol
- * /Users/bion/projects/iordache/translator/pngenerator.g:722:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:729:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
*/
static void
uncontrol(ppngenerator ctx)
@@ -4733,8 +4740,8 @@
ID26 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:723:2: ( ^( UNCONTROL ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:723:4: ^( UNCONTROL ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:730:2: ( ^( UNCONTROL ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:730:4: ^( UNCONTROL ( ID )+ )
{
MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol680);
if (HASEXCEPTION())
@@ -4749,7 +4756,7 @@
goto ruleuncontrolEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:723:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:730:16: ( ID )+
{
int cnt30=0;
@@ -4769,7 +4776,7 @@
switch (alt30)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:723:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:730:17: ID
{
ID26 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_uncontrol683);
if (HASEXCEPTION())
@@ -4837,7 +4844,7 @@
/**
* $ANTLR start unobserve
- * /Users/bion/projects/iordache/translator/pngenerator.g:728:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:735:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
*/
static void
unobserve(ppngenerator ctx)
@@ -4851,8 +4858,8 @@
ID27 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:729:2: ( ^( UNOBSERVE ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:729:4: ^( UNOBSERVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:736:2: ( ^( UNOBSERVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:736:4: ^( UNOBSERVE ( ID )+ )
{
MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve698);
if (HASEXCEPTION())
@@ -4867,7 +4874,7 @@
goto ruleunobserveEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:729:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:736:16: ( ID )+
{
int cnt31=0;
@@ -4887,7 +4894,7 @@
switch (alt31)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:729:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:736:17: ID
{
ID27 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_unobserve701);
if (HASEXCEPTION())
@@ -4955,7 +4962,7 @@
/**
* $ANTLR start other_commands
- * /Users/bion/projects/iordache/translator/pngenerator.g:735:1: other_commands : print ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:742:1: other_commands : print ;
*/
static void
other_commands(ppngenerator ctx)
@@ -4965,8 +4972,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:736:2: ( print )
- // /Users/bion/projects/iordache/translator/pngenerator.g:736:4: print
+ // /Users/bion/projects/iordache/translator/pngenerator.g:743:2: ( print )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:743:4: print
{
FOLLOWPUSH(FOLLOW_print_in_other_commands716);
print(ctx);
@@ -5000,7 +5007,7 @@
/**
* $ANTLR start print
- * /Users/bion/projects/iordache/translator/pngenerator.g:737:1: print : ^( PRINT ID group_elements ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:744:1: print : ^( PRINT ID group_elements ) ;
*/
static void
print(ppngenerator ctx)
@@ -5010,8 +5017,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:738:2: ( ^( PRINT ID group_elements ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:738:4: ^( PRINT ID group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:745:2: ( ^( PRINT ID group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:745:4: ^( PRINT ID group_elements )
{
MATCHT(PRINT, &FOLLOW_PRINT_in_print727);
if (HASEXCEPTION())
@@ -5071,7 +5078,7 @@
/**
* $ANTLR start group_elements
- * /Users/bion/projects/iordache/translator/pngenerator.g:740:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:747:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
*/
static pANTLR3_VECTOR
group_elements(ppngenerator ctx)
@@ -5090,8 +5097,8 @@
ID28 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:744:2: ( ^( GROUP ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:744:4: ^( GROUP ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:751:2: ( ^( GROUP ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:751:4: ^( GROUP ( ID )+ )
{
MATCHT(GROUP, &FOLLOW_GROUP_in_group_elements752);
if (HASEXCEPTION())
@@ -5106,7 +5113,7 @@
goto rulegroup_elementsEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:744:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:751:12: ( ID )+
{
int cnt32=0;
@@ -5126,7 +5133,7 @@
switch (alt32)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:744:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:751:13: ID
{
ID28 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_group_elements755);
if (HASEXCEPTION())
@@ -5192,7 +5199,7 @@
/**
* $ANTLR start numbered_ID
- * /Users/bion/projects/iordache/translator/pngenerator.g:747:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:754:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
*/
static int*
numbered_ID(ppngenerator ctx, ASSOC_ARRAY* places)
@@ -5213,7 +5220,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:748:2: ( ID | ^( ID INT ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:755:2: ( ID | ^( ID INT ) )
ANTLR3_UINT32 alt33;
@@ -5265,7 +5272,7 @@
switch (alt33)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:748:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:755:4: ID
{
ID29 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_numbered_ID774);
if (HASEXCEPTION())
@@ -5284,7 +5291,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:753:4: ^( ID INT )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:760:4: ^( ID INT )
{
ID30 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_numbered_ID782);
if (HASEXCEPTION())
Modified: translator/pngenerator.g
===================================================================
--- translator/pngenerator.g 2009-07-07 02:07:10 UTC (rev 172)
+++ translator/pngenerator.g 2009-07-07 02:18:52 UTC (rev 173)
@@ -177,6 +177,8 @@
displaypn(*(spec->process_array[i]->pn), stdout);
}
printf("======================\n");
+ printf("Labels in parenthesis\n");
+ printf("======================\n");
//display constraints
constraints = spec->constraint_list;
i = 0;
@@ -203,7 +205,7 @@
while(syncs) {
proc1 = (process*) procs->getI(procs, syncs->pn1);
proc2 = (process*) procs->getI(procs, syncs->pn2);
- printf("Syncing \%s.t\%i and \%s.t\%i\n", proc1->instance, syncs->t1, proc2->instance, syncs->t2);
+ 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");
@@ -264,6 +266,11 @@
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(" + ");
}
Modified: translator/pngenerator.h
===================================================================
--- translator/pngenerator.h 2009-07-07 02:07:10 UTC (rev 172)
+++ translator/pngenerator.h 2009-07-07 02:18:52 UTC (rev 173)
@@ -2,7 +2,7 @@
* This C header 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:06:28
+ * - On : 2009-07-06 21:18:20
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
