[Pntool-developers] SF.net SVN: pntool:[167] translator
Brought to you by:
compaqdrew,
miordache
Menu
▾
▴
[Pntool-developers] SF.net SVN: pntool:[167] translator
|
From: <the...@us...> - 2009-07-06 05:26:22
|
Revision: 167
http://pntool.svn.sourceforge.net/pntool/?rev=167&view=rev
Author: thecodeweasel
Date: 2009-07-06 05:26:21 +0000 (Mon, 06 Jul 2009)
Log Message:
-----------
Accidentally left in some debug prints.
People seem confused by the configure script, so I "unmuted" it to show what it's doing.
Modified Paths:
--------------
translator/Makefile
translator/docs/TODO.rtf
translator/pngenerator.c
translator/pngenerator.g
translator/pngenerator.h
Modified: translator/Makefile
===================================================================
--- translator/Makefile 2009-07-06 04:54:14 UTC (rev 166)
+++ translator/Makefile 2009-07-06 05:26:21 UTC (rev 167)
@@ -10,7 +10,7 @@
#If the patch has already been applied it will fail.
#This fixes the problem as quietly as possible
patch -Ns -p0 < clibs.patch || true
- if ! test -e ../third-party/ANTLR3_ctarget_3_1_3/Makefile; then cd ../third-party/ANTLR3_ctarget_3_1_3/; ./configure --silent; make --silent; fi
+ if ! test -e ../third-party/ANTLR3_ctarget_3_1_3/Makefile; then cd ../third-party/ANTLR3_ctarget_3_1_3/; ./configure; make --silent; fi
if ! test -e ../pnheaders/pns.o; then cd ../pnheaders; make --silent; fi
$(COMPILER) -c dataStructures.c $(INCLUDES)
Modified: translator/docs/TODO.rtf
===================================================================
--- translator/docs/TODO.rtf 2009-07-06 04:54:14 UTC (rev 166)
+++ translator/docs/TODO.rtf 2009-07-06 05:26:21 UTC (rev 167)
@@ -43,6 +43,6 @@
\cf0 Look into bug with initial marking\strike0\striked0 \
\strike \strikec0 make sure labels are getting added correctly\strike0\striked0 \
\strike \strikec0 have the parser error at the end\strike0\striked0 \
-debug MANFLINE process structure issue\
+\strike \strikec0 debug MANFLINE process structure issue\strike0\striked0 \
\strike \strikec0 debug sync constraints\
\strike0\striked0 Why does the translator need GCC 4?}
\ No newline at end of file
Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c 2009-07-06 04:54:14 UTC (rev 166)
+++ translator/pngenerator.c 2009-07-06 05:26:21 UTC (rev 167)
@@ -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-05 23:46:13
+ * - On : 2009-07-06 00:24:29
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
@@ -1700,7 +1700,6 @@
list =(void**) processes->get(processes, (char*) (ID1->getText(ID1))->chars);
(SCOPE_TOP(proc_definitions))->proc= (process*) list[kPROC];
- printf("Starting process %s\n", (SCOPE_TOP(proc_definitions))->proc->name);
(SCOPE_TOP(proc_definitions))->places= (ASSOC_ARRAY*) list[kPLACES];
(SCOPE_TOP(proc_definitions))->trans= (ASSOC_ARRAY*) list[kTRANS];
int a = (int) (SCOPE_TOP(proc_definitions))->places->size( (SCOPE_TOP(proc_definitions))->places);
@@ -1741,7 +1740,7 @@
/**
* $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:218:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:217:1: trans_defs : ( extern_trans_def | trans_def );
*/
static void
trans_defs(ppngenerator ctx)
@@ -1752,7 +1751,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:219:2: ( extern_trans_def | trans_def )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:218:2: ( extern_trans_def | trans_def )
ANTLR3_UINT32 alt8;
@@ -1785,7 +1784,7 @@
switch (alt8)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:219:4: extern_trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:218:4: extern_trans_def
{
FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs132);
extern_trans_def(ctx);
@@ -1800,7 +1799,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:220:4: trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:219:4: trans_def
{
FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs137);
trans_def(ctx);
@@ -1837,7 +1836,7 @@
/**
* $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:221:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:220:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
*/
static void
extern_trans_def(ppngenerator ctx)
@@ -1860,11 +1859,11 @@
ID4 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:227:2: ( ^( ( TO | FROM ) ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:227:4: ^( ( TO | FROM ) ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:226:2: ( ^( ( TO | FROM ) ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:226:4: ^( ( TO | FROM ) ( ID )+ )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:227:6: ( TO | FROM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:226:6: ( TO | FROM )
{
int alt9=2;
@@ -1894,7 +1893,7 @@
switch (alt9)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:227:7: TO
+ // /Users/bion/projects/iordache/translator/pngenerator.g:226:7: TO
{
TO2 = (pANTLR3_BASE_TREE) MATCHT(TO, &FOLLOW_TO_in_extern_trans_def153);
if (HASEXCEPTION())
@@ -1912,7 +1911,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:230:7: FROM
+ // /Users/bion/projects/iordache/translator/pngenerator.g:229:7: FROM
{
FROM3 = (pANTLR3_BASE_TREE) MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def159);
if (HASEXCEPTION())
@@ -1939,7 +1938,7 @@
goto ruleextern_trans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:233:6: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:232:6: ( ID )+
{
int cnt10=0;
@@ -1959,7 +1958,7 @@
switch (alt10)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:233:7: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:232:7: ID
{
ID4 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_extern_trans_def165);
if (HASEXCEPTION())
@@ -2026,7 +2025,7 @@
/**
* $ANTLR start trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:237: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:236: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)
@@ -2063,7 +2062,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:248:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:247:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) )
ANTLR3_UINT32 alt15;
@@ -2139,7 +2138,7 @@
switch (alt15)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:248:4: ^( ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:247:4: ^( ID CODE_BLOCK )
{
ID5 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def185);
if (HASEXCEPTION())
@@ -2181,7 +2180,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:257:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:256:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def201);
if (HASEXCEPTION())
@@ -2202,7 +2201,7 @@
goto ruletrans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:259:5: (place= ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:258:5: (place= ID )+
{
int cnt11=0;
@@ -2222,7 +2221,7 @@
switch (alt11)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:259:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:258:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def208);
if (HASEXCEPTION())
@@ -2276,7 +2275,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:275:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:274:5: ( CODE_BLOCK )?
{
int alt12=2;
{
@@ -2289,7 +2288,7 @@
switch (alt12)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:275:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:274:6: CODE_BLOCK
{
CODE_BLOCK7 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def217);
if (HASEXCEPTION())
@@ -2324,7 +2323,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:281:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:280:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def235);
if (HASEXCEPTION())
@@ -2354,11 +2353,10 @@
{
arcList->in_place = *((int*) (SCOPE_TOP(proc_definitions))->places->get( (SCOPE_TOP(proc_definitions))->places, (char*) (PLACE8->getText(PLACE8))->chars));
- printf("Input place %s\n", (char*) (PLACE8->getText(PLACE8))->chars);
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:286:5: (place= ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:284:5: (place= ID )*
for (;;)
{
@@ -2376,7 +2374,7 @@
switch (alt13)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:286:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:284:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def246);
if (HASEXCEPTION())
@@ -2417,7 +2415,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:301:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:299:5: ( CODE_BLOCK )?
{
int alt14=2;
{
@@ -2430,7 +2428,7 @@
switch (alt14)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:301:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:299:6: CODE_BLOCK
{
CODE_BLOCK9 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def255);
if (HASEXCEPTION())
@@ -2487,7 +2485,7 @@
/**
* $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:306:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:304:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
*/
static void
select_functions(ppngenerator ctx)
@@ -2503,8 +2501,8 @@
CODE_BLOCK11 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:307:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:307:4: ^( SELECT_DEF ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:305:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:305:4: ^( SELECT_DEF ID CODE_BLOCK )
{
MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions271);
if (HASEXCEPTION())
@@ -2570,7 +2568,7 @@
/**
* $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:314:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:312:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
*/
static void
nondeterm(ppngenerator ctx)
@@ -2584,8 +2582,8 @@
ID12 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:315:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:315:4: ^( 'nondeterministic places: ' ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:313:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:313:4: ^( 'nondeterministic places: ' ( ID )+ )
{
MATCHT(47, &FOLLOW_47_in_nondeterm288);
if (HASEXCEPTION())
@@ -2600,7 +2598,7 @@
goto rulenondetermEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:315:34: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:313:34: ( ID )+
{
int cnt16=0;
@@ -2620,7 +2618,7 @@
switch (alt16)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:315:35: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:313:35: ID
{
ID12 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_nondeterm291);
if (HASEXCEPTION())
@@ -2688,7 +2686,7 @@
/**
* $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:322:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:320:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
*/
static void
proc_instantiations(ppngenerator ctx)
@@ -2698,11 +2696,11 @@
ctx->ppngenerator_proc_instantiationsTop = ppngenerator_proc_instantiationsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:328:2: ( ( proc_init | sync_def | proc_start ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:328:4: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:326:2: ( ( proc_init | sync_def | proc_start ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:326:4: ( proc_init | sync_def | proc_start )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:328:4: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:326:4: ( proc_init | sync_def | proc_start )
{
int alt17=3;
switch ( LA(1) )
@@ -2737,7 +2735,7 @@
switch (alt17)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:328:5: proc_init
+ // /Users/bion/projects/iordache/translator/pngenerator.g:326:5: proc_init
{
FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations312);
proc_init(ctx);
@@ -2752,7 +2750,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:328:17: sync_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:326:17: sync_def
{
FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations316);
sync_def(ctx);
@@ -2767,7 +2765,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:328:28: proc_start
+ // /Users/bion/projects/iordache/translator/pngenerator.g:326:28: proc_start
{
FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations320);
proc_start(ctx);
@@ -2809,7 +2807,7 @@
/**
* $ANTLR start proc_init
- * /Users/bion/projects/iordache/translator/pngenerator.g:330:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:328:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
*/
static void
proc_init(ppngenerator ctx)
@@ -2834,7 +2832,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:335:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:333:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
ANTLR3_UINT32 alt19;
@@ -2886,7 +2884,7 @@
switch (alt19)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:335:4: name1= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:333:4: name1= ID
{
name1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init338);
if (HASEXCEPTION())
@@ -2917,7 +2915,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:352:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:350:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
{
name2 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init348);
if (HASEXCEPTION())
@@ -2948,7 +2946,7 @@
goto ruleproc_initEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:364:5: ( numbered_ID[$proc_instantiations::places] )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:362:5: ( numbered_ID[$proc_instantiations::places] )+
{
int cnt18=0;
@@ -2968,7 +2966,7 @@
switch (alt18)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:364:6: numbered_ID[$proc_instantiations::places]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:362:6: numbered_ID[$proc_instantiations::places]
{
FOLLOWPUSH(FOLLOW_numbered_ID_in_proc_init353);
numbered_ID13=numbered_ID(ctx, (SCOPE_TOP(proc_instantiations))->places);
@@ -3054,7 +3052,7 @@
/**
* $ANTLR start sync_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:379:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:377:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
*/
static void
sync_def(ppngenerator ctx)
@@ -3074,8 +3072,8 @@
group_elements14 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:384:2: ( ^( SYNC_TOK ( group_elements )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:384:4: ^( SYNC_TOK ( group_elements )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:382:2: ( ^( SYNC_TOK ( group_elements )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:382:4: ^( SYNC_TOK ( group_elements )+ )
{
MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def379);
if (HASEXCEPTION())
@@ -3090,7 +3088,7 @@
goto rulesync_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:384:15: ( group_elements )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:382:15: ( group_elements )+
{
int cnt20=0;
@@ -3110,7 +3108,7 @@
switch (alt20)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:384:16: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:382:16: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_sync_def382);
group_elements14=group_elements(ctx);
@@ -3224,7 +3222,7 @@
/**
* $ANTLR start proc_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:429:1: proc_start : ^( START ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:427:1: proc_start : ^( START ( ID )+ ) ;
*/
static void
proc_start(ppngenerator ctx)
@@ -3238,8 +3236,8 @@
ID15 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:430:2: ( ^( START ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:430:4: ^( START ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:428:2: ( ^( START ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:428:4: ^( START ( ID )+ )
{
MATCHT(START, &FOLLOW_START_in_proc_start399);
if (HASEXCEPTION())
@@ -3254,7 +3252,7 @@
goto ruleproc_startEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:430:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:428:12: ( ID )+
{
int cnt21=0;
@@ -3274,7 +3272,7 @@
switch (alt21)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:430:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:428:13: ID
{
ID15 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_start402);
if (HASEXCEPTION())
@@ -3344,7 +3342,7 @@
/**
* $ANTLR start constraints
- * /Users/bion/projects/iordache/translator/pngenerator.g:438:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:436:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
*/
static void
constraints(ppngenerator ctx)
@@ -3358,8 +3356,8 @@
ctx->ppngenerator_constraintsTop = ppngenerator_constraintsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:445:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:445:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:443:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:443:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
{
FOLLOWPUSH(FOLLOW_constraint_block_in_constraints422);
constraint_block(ctx);
@@ -3379,7 +3377,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:445:23: ( ( eq ) | live_def | uncontrol | unobserve )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:443:23: ( ( eq ) | live_def | uncontrol | unobserve )*
for (;;)
{
@@ -3414,10 +3412,10 @@
switch (alt22)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:445:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:443:24: ( eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:445:24: ( eq )
- // /Users/bion/projects/iordache/translator/pngenerator.g:445:25: eq
+ // /Users/bion/projects/iordache/translator/pngenerator.g:443:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:443:25: eq
{
FOLLOWPUSH(FOLLOW_eq_in_constraints426);
eq16=eq(ctx);
@@ -3459,7 +3457,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:466:6: live_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:464:6: live_def
{
FOLLOWPUSH(FOLLOW_live_def_in_constraints431);
live_def(ctx);
@@ -3474,7 +3472,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:466:15: uncontrol
+ // /Users/bion/projects/iordache/translator/pngenerator.g:464:15: uncontrol
{
FOLLOWPUSH(FOLLOW_uncontrol_in_constraints433);
uncontrol(ctx);
@@ -3489,7 +3487,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:466:25: unobserve
+ // /Users/bion/projects/iordache/translator/pngenerator.g:464:25: unobserve
{
FOLLOWPUSH(FOLLOW_unobserve_in_constraints435);
unobserve(ctx);
@@ -3544,7 +3542,7 @@
/**
* $ANTLR start constraint_block
- * /Users/bion/projects/iordache/translator/pngenerator.g:467:1: constraint_block : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:465:1: constraint_block : ID ;
*/
static void
constraint_block(ppngenerator ctx)
@@ -3558,8 +3556,8 @@
ID17 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:468:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:468:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:466:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:466:4: ID
{
ID17 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_constraint_block446);
if (HASEXCEPTION())
@@ -3610,7 +3608,7 @@
/**
* $ANTLR start eq
- * /Users/bion/projects/iordache/translator/pngenerator.g:487:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:485:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) );
*/
static pngenerator_eq_return
eq(ppngenerator ctx)
@@ -3644,7 +3642,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:492:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:490:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
ANTLR3_UINT32 alt24;
@@ -3677,7 +3675,7 @@
switch (alt24)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:492:4: relationalExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:490:4: relationalExpression
{
FOLLOWPUSH(FOLLOW_relationalExpression_in_eq469);
relationalExpression18=relationalExpression(ctx);
@@ -3695,10 +3693,10 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:493:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:491:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:493:6: ( AND_OP | OR_OP )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:491:6: ( AND_OP | OR_OP )
{
int alt23=2;
@@ -3728,7 +3726,7 @@
switch (alt23)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:493:7: AND_OP
+ // /Users/bion/projects/iordache/translator/pngenerator.g:491:7: AND_OP
{
MATCHT(AND_OP, &FOLLOW_AND_OP_in_eq478);
if (HASEXCEPTION())
@@ -3745,7 +3743,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:495:7: OR_OP
+ // /Users/bion/projects/iordache/translator/pngenerator.g:493:7: OR_OP
{
MATCHT(OR_OP, &FOLLOW_OR_OP_in_eq484);
if (HASEXCEPTION())
@@ -3854,7 +3852,7 @@
/**
* $ANTLR start relationalExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:519:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:517:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
*/
static inequality*
relationalExpression(ppngenerator ctx)
@@ -3877,8 +3875,8 @@
NUM19 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:527:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:527:9: ^( EQ_OP additiveExpression[list, false] NUM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:525:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:525:9: ^( EQ_OP additiveExpression[list, false] NUM )
{
MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression530);
if (HASEXCEPTION())
@@ -3952,7 +3950,7 @@
/**
* $ANTLR start additiveExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:540: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:538: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)
@@ -3969,7 +3967,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:541:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:539:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) )
ANTLR3_UINT32 alt25;
@@ -4008,7 +4006,7 @@
switch (alt25)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:541:9: primary[flip]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:539:9: primary[flip]
{
FOLLOWPUSH(FOLLOW_primary_in_additiveExpression554);
primary20=primary(ctx, flip);
@@ -4026,7 +4024,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:542:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:540:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
{
MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression566);
if (HASEXCEPTION())
@@ -4070,7 +4068,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:543:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:541:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
{
MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression582);
if (HASEXCEPTION())
@@ -4136,7 +4134,7 @@
/**
* $ANTLR start primary
- * /Users/bion/projects/iordache/translator/pngenerator.g:545:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:543:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
*/
static variable*
primary(ppngenerator ctx, bool flip)
@@ -4162,7 +4160,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:546:5: ( group_elements | ^( MULT NUM group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:544:5: ( group_elements | ^( MULT NUM group_elements ) )
ANTLR3_UINT32 alt26;
@@ -4195,7 +4193,7 @@
switch (alt26)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:546:9: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:544:9: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_primary609);
group_elements21=group_elements(ctx);
@@ -4219,7 +4217,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:553:7: ^( MULT NUM group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:551:7: ^( MULT NUM group_elements )
{
MATCHT(MULT, &FOLLOW_MULT_in_primary620);
if (HASEXCEPTION())
@@ -4291,7 +4289,7 @@
/**
* $ANTLR start live_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:560:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:558:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
*/
static void
live_def(ppngenerator ctx)
@@ -4311,7 +4309,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:564:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:562:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
ANTLR3_UINT32 alt29;
@@ -4382,7 +4380,7 @@
switch (alt29)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:564:4: ^( LIVE ALL ( ID )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:562:4: ^( LIVE ALL ( ID )* )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def642);
if (HASEXCEPTION())
@@ -4414,7 +4412,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:571:5: ( ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:569:5: ( ID )*
for (;;)
{
@@ -4432,7 +4430,7 @@
switch (alt27)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:571:6: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:569:6: ID
{
ID24 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def649);
if (HASEXCEPTION())
@@ -4480,7 +4478,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:584:4: ^( LIVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:582:4: ^( LIVE ( ID )+ )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def662);
if (HASEXCEPTION())
@@ -4495,7 +4493,7 @@
goto rulelive_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:584:11: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:582:11: ( ID )+
{
int cnt28=0;
@@ -4515,7 +4513,7 @@
switch (alt28)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:584:12: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:582:12: ID
{
ID25 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def665);
if (HASEXCEPTION())
@@ -4586,7 +4584,7 @@
/**
* $ANTLR start uncontrol
- * /Users/bion/projects/iordache/translator/pngenerator.g:589:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:587:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
*/
static void
uncontrol(ppngenerator ctx)
@@ -4600,8 +4598,8 @@
ID26 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:2: ( ^( UNCONTROL ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:4: ^( UNCONTROL ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:588:2: ( ^( UNCONTROL ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:588:4: ^( UNCONTROL ( ID )+ )
{
MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol680);
if (HASEXCEPTION())
@@ -4616,7 +4614,7 @@
goto ruleuncontrolEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:588:16: ( ID )+
{
int cnt30=0;
@@ -4636,7 +4634,7 @@
switch (alt30)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:588:17: ID
{
ID26 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_uncontrol683);
if (HASEXCEPTION())
@@ -4704,7 +4702,7 @@
/**
* $ANTLR start unobserve
- * /Users/bion/projects/iordache/translator/pngenerator.g:595:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:593:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
*/
static void
unobserve(ppngenerator ctx)
@@ -4718,8 +4716,8 @@
ID27 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:596:2: ( ^( UNOBSERVE ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:596:4: ^( UNOBSERVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:594:2: ( ^( UNOBSERVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:594:4: ^( UNOBSERVE ( ID )+ )
{
MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve698);
if (HASEXCEPTION())
@@ -4734,7 +4732,7 @@
goto ruleunobserveEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:596:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:594:16: ( ID )+
{
int cnt31=0;
@@ -4754,7 +4752,7 @@
switch (alt31)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:596:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:594:17: ID
{
ID27 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_unobserve701);
if (HASEXCEPTION())
@@ -4822,7 +4820,7 @@
/**
* $ANTLR start other_commands
- * /Users/bion/projects/iordache/translator/pngenerator.g:602:1: other_commands : print ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:600:1: other_commands : print ;
*/
static void
other_commands(ppngenerator ctx)
@@ -4832,8 +4830,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:603:2: ( print )
- // /Users/bion/projects/iordache/translator/pngenerator.g:603:4: print
+ // /Users/bion/projects/iordache/translator/pngenerator.g:601:2: ( print )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:601:4: print
{
FOLLOWPUSH(FOLLOW_print_in_other_commands716);
print(ctx);
@@ -4867,7 +4865,7 @@
/**
* $ANTLR start print
- * /Users/bion/projects/iordache/translator/pngenerator.g:604:1: print : ^( PRINT ID group_elements ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:602:1: print : ^( PRINT ID group_elements ) ;
*/
static void
print(ppngenerator ctx)
@@ -4877,8 +4875,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:605:2: ( ^( PRINT ID group_elements ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:605:4: ^( PRINT ID group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:603:2: ( ^( PRINT ID group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:603:4: ^( PRINT ID group_elements )
{
MATCHT(PRINT, &FOLLOW_PRINT_in_print727);
if (HASEXCEPTION())
@@ -4938,7 +4936,7 @@
/**
* $ANTLR start group_elements
- * /Users/bion/projects/iordache/translator/pngenerator.g:607:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:605:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
*/
static pANTLR3_VECTOR
group_elements(ppngenerator ctx)
@@ -4957,8 +4955,8 @@
ID28 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:611:2: ( ^( GROUP ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:611:4: ^( GROUP ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:609:2: ( ^( GROUP ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:609:4: ^( GROUP ( ID )+ )
{
MATCHT(GROUP, &FOLLOW_GROUP_in_group_elements752);
if (HASEXCEPTION())
@@ -4973,7 +4971,7 @@
goto rulegroup_elementsEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:611:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:609:12: ( ID )+
{
int cnt32=0;
@@ -4993,7 +4991,7 @@
switch (alt32)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:611:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:609:13: ID
{
ID28 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_group_elements755);
if (HASEXCEPTION())
@@ -5059,7 +5057,7 @@
/**
* $ANTLR start numbered_ID
- * /Users/bion/projects/iordache/translator/pngenerator.g:614:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:612:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
*/
static int*
numbered_ID(ppngenerator ctx, ASSOC_ARRAY* places)
@@ -5080,7 +5078,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:615:2: ( ID | ^( ID INT ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:613:2: ( ID | ^( ID INT ) )
ANTLR3_UINT32 alt33;
@@ -5132,7 +5130,7 @@
switch (alt33)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:615:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:613:4: ID
{
ID29 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_numbered_ID774);
if (HASEXCEPTION())
@@ -5151,7 +5149,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:620:4: ^( ID INT )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:618: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-06 04:54:14 UTC (rev 166)
+++ translator/pngenerator.g 2009-07-06 05:26:21 UTC (rev 167)
@@ -198,7 +198,6 @@
list =(void**) processes->get(processes, (char*) $ID.text->chars);
$proc_definitions::proc = (process*) list[kPROC];
- printf("Starting process \%s\n", $proc_definitions::proc->name);
$proc_definitions::places = (ASSOC_ARRAY*) list[kPLACES];
$proc_definitions::trans = (ASSOC_ARRAY*) list[kTRANS];
int a = (int) $proc_definitions::places->size($proc_definitions::places);
@@ -282,7 +281,6 @@
trans = *((int*) $proc_definitions::trans->get($proc_definitions::trans, (char*) $tran.text->chars));
} PLACE {
arcList->in_place = *((int*) $proc_definitions::places->get($proc_definitions::places, (char*) $PLACE.text->chars));
- printf("Input place \%s\n", (char*) $PLACE.text->chars);
} (place=ID {
if(places == 0) {
currentPlace = tmalloc(sizeof(struct placelist));
Modified: translator/pngenerator.h
===================================================================
--- translator/pngenerator.h 2009-07-06 04:54:14 UTC (rev 166)
+++ translator/pngenerator.h 2009-07-06 05:26:21 UTC (rev 167)
@@ -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-05 23:46:13
+ * - On : 2009-07-06 00:24:29
* - 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.
|
