[Pntool-developers] SF.net SVN: pntool:[191] translator
Brought to you by:
compaqdrew,
miordache
Menu
▾
▴
[Pntool-developers] SF.net SVN: pntool:[191] translator
|
From: <the...@us...> - 2009-07-08 20:25:14
|
Revision: 191
http://pntool.svn.sourceforge.net/pntool/?rev=191&view=rev
Author: thecodeweasel
Date: 2009-07-08 20:25:11 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Cleaning up
Modified Paths:
--------------
translator/pngenerator.c
translator/pngenerator.g
translator/pngenerator.h
Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c 2009-07-08 20:22:28 UTC (rev 190)
+++ translator/pngenerator.c 2009-07-08 20:25:11 UTC (rev 191)
@@ -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-08 15:21:25
+ * - On : 2009-07-08 15:24:37
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
@@ -535,9 +535,9 @@
//
// If the user supplied the scope entries with a free function,then call it first
//
- if (SCOPE_TOP(proc_definitions)>free != NULL)
+ if (SCOPE_TOP(proc_definitions)->free != NULL)
{
- SCOPE_TOP(proc_definitions)>->free(SCOPE_TOP(proc_definitions));
+ SCOPE_TOP(proc_definitions)->free(SCOPE_TOP(proc_definitions));
}
// Now we decrement the scope's upper limit bound. We do not actually pop the scope as
@@ -559,9 +559,9 @@
//
// If the user supplied the scope entries with a free function,then call it first
//
- if (SCOPE_TOP(proc_instantiations)>free != NULL)
+ if (SCOPE_TOP(proc_instantiations)->free != NULL)
{
- SCOPE_TOP(proc_instantiations)>->free(SCOPE_TOP(proc_instantiations));
+ SCOPE_TOP(proc_instantiations)->free(SCOPE_TOP(proc_instantiations));
}
// Now we decrement the scope's upper limit bound. We do not actually pop the scope as
@@ -583,9 +583,9 @@
//
// If the user supplied the scope entries with a free function,then call it first
//
- if (SCOPE_TOP(constraints)>free != NULL)
+ if (SCOPE_TOP(constraints)->free != NULL)
{
- SCOPE_TOP(constraints)>->free(SCOPE_TOP(constraints));
+ SCOPE_TOP(constraints)->free(SCOPE_TOP(constraints));
}
// Now we decrement the scope's upper limit bound. We do not actually pop the scope as
@@ -1182,13 +1182,11 @@
threads = threadData;
output = tmalloc(sizeof(specs));
//copy the file name into the specs structure
- printf("Starting...\n");
if(strrchr(fileName, '/')) {
fileName = strrchr(fileName, '/')+sizeof(char);
}
output->name = tcalloc(strlen(fileName), sizeof(char));
strncpy(output->name, fileName, strcspn(fileName, "."));
- printf("Starting...\n");
//prep the pn array
output->pn_array = NULL;
output->pn_num = 0;
@@ -1197,10 +1195,10 @@
constraintList = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:2: ( ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* )
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:4: ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:2: ( ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:4: ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )*
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:4: ( proc_definitions )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:4: ( proc_definitions )+
{
int cnt1=0;
@@ -1260,7 +1258,7 @@
switch (alt1)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:4: proc_definitions
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:4: proc_definitions
{
FOLLOWPUSH(FOLLOW_proc_definitions_in_pn71);
proc_definitions(ctx);
@@ -1294,7 +1292,7 @@
}
loop1: ; /* Jump to here if this rule does not match */
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:22: ( proc_instantiations )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:22: ( proc_instantiations )+
{
int cnt2=0;
@@ -1340,7 +1338,7 @@
switch (alt2)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:22: proc_instantiations
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:22: proc_instantiations
{
FOLLOWPUSH(FOLLOW_proc_instantiations_in_pn74);
proc_instantiations(ctx);
@@ -1375,7 +1373,7 @@
loop2: ; /* Jump to here if this rule does not match */
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:43: ( constraints )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:43: ( constraints )*
for (;;)
{
@@ -1393,7 +1391,7 @@
switch (alt3)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:43: constraints
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:43: constraints
{
FOLLOWPUSH(FOLLOW_constraints_in_pn77);
constraints(ctx);
@@ -1416,7 +1414,7 @@
loop3: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:56: ( other_commands )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:56: ( other_commands )*
for (;;)
{
@@ -1434,7 +1432,7 @@
switch (alt4)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:161:56: other_commands
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:56: other_commands
{
FOLLOWPUSH(FOLLOW_other_commands_in_pn80);
other_commands(ctx);
@@ -1502,7 +1500,7 @@
/**
* $ANTLR start proc_definitions
- * /Users/bion/projects/iordache/translator/pngenerator.g:183:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:181:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
*/
static void
proc_definitions(ppngenerator ctx)
@@ -1512,8 +1510,8 @@
ctx->ppngenerator_proc_definitionsTop = ppngenerator_proc_definitionsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:187:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:187:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? )
{
FOLLOWPUSH(FOLLOW_def_start_in_proc_definitions98);
def_start(ctx);
@@ -1533,7 +1531,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:16: ( trans_defs )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:187:16: ( trans_defs )*
for (;;)
{
@@ -1551,7 +1549,7 @@
switch (alt5)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:16: trans_defs
+ // /Users/bion/projects/iordache/translator/pngenerator.g:187:16: trans_defs
{
FOLLOWPUSH(FOLLOW_trans_defs_in_proc_definitions100);
trans_defs(ctx);
@@ -1574,7 +1572,7 @@
loop5: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:28: ( select_functions )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:187:28: ( select_functions )*
for (;;)
{
@@ -1592,7 +1590,7 @@
switch (alt6)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:28: select_functions
+ // /Users/bion/projects/iordache/translator/pngenerator.g:187:28: select_functions
{
FOLLOWPUSH(FOLLOW_select_functions_in_proc_definitions103);
select_functions(ctx);
@@ -1615,7 +1613,7 @@
loop6: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:46: ( nondeterm )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:187:46: ( nondeterm )?
{
int alt7=2;
{
@@ -1628,7 +1626,7 @@
switch (alt7)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:46: nondeterm
+ // /Users/bion/projects/iordache/translator/pngenerator.g:187:46: nondeterm
{
FOLLOWPUSH(FOLLOW_nondeterm_in_proc_definitions106);
nondeterm(ctx);
@@ -1678,7 +1676,7 @@
/**
* $ANTLR start def_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:190:1: def_start : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:188:1: def_start : ID ;
*/
static void
def_start(ppngenerator ctx)
@@ -1695,8 +1693,8 @@
ID1 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:194:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:194:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:192:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:192:4: ID
{
ID1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_def_start122);
if (HASEXCEPTION())
@@ -1752,7 +1750,7 @@
/**
* $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:217:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:215:1: trans_defs : ( extern_trans_def | trans_def );
*/
static void
trans_defs(ppngenerator ctx)
@@ -1763,7 +1761,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:218:2: ( extern_trans_def | trans_def )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:216:2: ( extern_trans_def | trans_def )
ANTLR3_UINT32 alt8;
@@ -1796,7 +1794,7 @@
switch (alt8)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:218:4: extern_trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:216:4: extern_trans_def
{
FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs132);
extern_trans_def(ctx);
@@ -1811,7 +1809,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:219:4: trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:217:4: trans_def
{
FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs137);
trans_def(ctx);
@@ -1848,7 +1846,7 @@
/**
* $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:220:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:218:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
*/
static void
extern_trans_def(ppngenerator ctx)
@@ -1871,11 +1869,11 @@
ID4 = NULL;
{
- // /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:224:2: ( ^( ( TO | FROM ) ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:224:4: ^( ( TO | FROM ) ( ID )+ )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:226:6: ( TO | FROM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:224:6: ( TO | FROM )
{
int alt9=2;
@@ -1905,7 +1903,7 @@
switch (alt9)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:226:7: TO
+ // /Users/bion/projects/iordache/translator/pngenerator.g:224:7: TO
{
TO2 = (pANTLR3_BASE_TREE) MATCHT(TO, &FOLLOW_TO_in_extern_trans_def153);
if (HASEXCEPTION())
@@ -1923,7 +1921,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:229:7: FROM
+ // /Users/bion/projects/iordache/translator/pngenerator.g:227:7: FROM
{
FROM3 = (pANTLR3_BASE_TREE) MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def159);
if (HASEXCEPTION())
@@ -1950,7 +1948,7 @@
goto ruleextern_trans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:232:6: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:230:6: ( ID )+
{
int cnt10=0;
@@ -1970,7 +1968,7 @@
switch (alt10)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:232:7: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:230:7: ID
{
ID4 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_extern_trans_def165);
if (HASEXCEPTION())
@@ -2037,7 +2035,7 @@
/**
* $ANTLR start trans_def
- * /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 )? ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:234: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)
@@ -2074,7 +2072,7 @@
{
{
- // /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 )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:245:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) )
ANTLR3_UINT32 alt15;
@@ -2150,7 +2148,7 @@
switch (alt15)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:247:4: ^( ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:245:4: ^( ID CODE_BLOCK )
{
ID5 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def185);
if (HASEXCEPTION())
@@ -2192,7 +2190,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:256:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:254:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def201);
if (HASEXCEPTION())
@@ -2213,7 +2211,7 @@
goto ruletrans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:258:5: (place= ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:256:5: (place= ID )+
{
int cnt11=0;
@@ -2233,7 +2231,7 @@
switch (alt11)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:258:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:256:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def208);
if (HASEXCEPTION())
@@ -2287,7 +2285,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:274:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:272:5: ( CODE_BLOCK )?
{
int alt12=2;
{
@@ -2300,7 +2298,7 @@
switch (alt12)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:274:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:272:6: CODE_BLOCK
{
CODE_BLOCK7 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def217);
if (HASEXCEPTION())
@@ -2335,7 +2333,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:280:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:278:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def235);
if (HASEXCEPTION())
@@ -2368,7 +2366,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:284:5: (place= ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:282:5: (place= ID )*
for (;;)
{
@@ -2386,7 +2384,7 @@
switch (alt13)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:284:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:282:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def246);
if (HASEXCEPTION())
@@ -2427,7 +2425,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:299:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:297:5: ( CODE_BLOCK )?
{
int alt14=2;
{
@@ -2440,7 +2438,7 @@
switch (alt14)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:299:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:297:6: CODE_BLOCK
{
CODE_BLOCK9 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def255);
if (HASEXCEPTION())
@@ -2497,7 +2495,7 @@
/**
* $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:304:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:302:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
*/
static void
select_functions(ppngenerator ctx)
@@ -2513,8 +2511,8 @@
CODE_BLOCK11 = NULL;
{
- // /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 )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:303:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:303:4: ^( SELECT_DEF ID CODE_BLOCK )
{
MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions271);
if (HASEXCEPTION())
@@ -2580,7 +2578,7 @@
/**
* $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:312:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:310:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
*/
static void
nondeterm(ppngenerator ctx)
@@ -2594,8 +2592,8 @@
ID12 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:313:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:313:4: ^( 'nondeterministic places: ' ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:311:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:311:4: ^( 'nondeterministic places: ' ( ID )+ )
{
MATCHT(48, &FOLLOW_48_in_nondeterm288);
if (HASEXCEPTION())
@@ -2610,7 +2608,7 @@
goto rulenondetermEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:313:34: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:311:34: ( ID )+
{
int cnt16=0;
@@ -2630,7 +2628,7 @@
switch (alt16)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:313:35: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:311:35: ID
{
ID12 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_nondeterm291);
if (HASEXCEPTION())
@@ -2698,7 +2696,7 @@
/**
* $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:320:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:318:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
*/
static void
proc_instantiations(ppngenerator ctx)
@@ -2708,11 +2706,11 @@
ctx->ppngenerator_proc_instantiationsTop = ppngenerator_proc_instantiationsPush(ctx);
{
- // /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:324:2: ( ( proc_init | sync_def | proc_start ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:324:4: ( 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:324:4: ( proc_init | sync_def | proc_start )
{
int alt17=3;
switch ( LA(1) )
@@ -2747,7 +2745,7 @@
switch (alt17)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:326:5: proc_init
+ // /Users/bion/projects/iordache/translator/pngenerator.g:324:5: proc_init
{
FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations312);
proc_init(ctx);
@@ -2762,7 +2760,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:326:17: sync_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:324:17: sync_def
{
FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations316);
sync_def(ctx);
@@ -2777,7 +2775,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:326:28: proc_start
+ // /Users/bion/projects/iordache/translator/pngenerator.g:324:28: proc_start
{
FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations320);
proc_start(ctx);
@@ -2819,7 +2817,7 @@
/**
* $ANTLR start proc_init
- * /Users/bion/projects/iordache/translator/pngenerator.g:328:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:326:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
*/
static void
proc_init(ppngenerator ctx)
@@ -2844,7 +2842,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:333:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:331:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
ANTLR3_UINT32 alt19;
@@ -2896,7 +2894,7 @@
switch (alt19)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:333:4: name1= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:331:4: name1= ID
{
name1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init338);
if (HASEXCEPTION())
@@ -2927,7 +2925,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:350:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:348:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
{
name2 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init348);
if (HASEXCEPTION())
@@ -2958,7 +2956,7 @@
goto ruleproc_initEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:362:5: ( numbered_ID[$proc_instantiations::places] )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:360:5: ( numbered_ID[$proc_instantiations::places] )+
{
int cnt18=0;
@@ -2978,7 +2976,7 @@
switch (alt18)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:362:6: numbered_ID[$proc_instantiations::places]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:360:6: numbered_ID[$proc_instantiations::places]
{
FOLLOWPUSH(FOLLOW_numbered_ID_in_proc_init353);
numbered_ID13=numbered_ID(ctx, (SCOPE_TOP(proc_instantiations))->places);
@@ -3064,7 +3062,7 @@
/**
* $ANTLR start sync_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:377:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:375:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
*/
static void
sync_def(ppngenerator ctx)
@@ -3084,8 +3082,8 @@
group_elements14 = NULL;
{
- // /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 )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:380:2: ( ^( SYNC_TOK ( group_elements )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:380:4: ^( SYNC_TOK ( group_elements )+ )
{
MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def379);
if (HASEXCEPTION())
@@ -3100,7 +3098,7 @@
goto rulesync_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:382:15: ( group_elements )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:380:15: ( group_elements )+
{
int cnt20=0;
@@ -3120,7 +3118,7 @@
switch (alt20)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:382:16: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:380:16: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_sync_def382);
group_elements14=group_elements(ctx);
@@ -3234,7 +3232,7 @@
/**
* $ANTLR start proc_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:427:1: proc_start : ^( START ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:425:1: proc_start : ^( START ( ID )+ ) ;
*/
static void
proc_start(ppngenerator ctx)
@@ -3248,8 +3246,8 @@
ID15 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:428:2: ( ^( START ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:428:4: ^( START ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:426:2: ( ^( START ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:426:4: ^( START ( ID )+ )
{
MATCHT(START, &FOLLOW_START_in_proc_start399);
if (HASEXCEPTION())
@@ -3264,7 +3262,7 @@
goto ruleproc_startEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:428:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:426:12: ( ID )+
{
int cnt21=0;
@@ -3284,7 +3282,7 @@
switch (alt21)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:428:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:426:13: ID
{
ID15 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_start402);
if (HASEXCEPTION())
@@ -3354,7 +3352,7 @@
/**
* $ANTLR start constraints
- * /Users/bion/projects/iordache/translator/pngenerator.g:436:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:434:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
*/
static void
constraints(ppngenerator ctx)
@@ -3368,8 +3366,8 @@
ctx->ppngenerator_constraintsTop = ppngenerator_constraintsPush(ctx);
{
- // /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 )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:441:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:441:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
{
FOLLOWPUSH(FOLLOW_constraint_block_in_constraints422);
constraint_block(ctx);
@@ -3389,7 +3387,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:443:23: ( ( eq ) | live_def | uncontrol | unobserve )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:441:23: ( ( eq ) | live_def | uncontrol | unobserve )*
for (;;)
{
@@ -3424,10 +3422,10 @@
switch (alt22)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:443:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:441:24: ( eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:443:24: ( eq )
- // /Users/bion/projects/iordache/translator/pngenerator.g:443:25: eq
+ // /Users/bion/projects/iordache/translator/pngenerator.g:441:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:441:25: eq
{
FOLLOWPUSH(FOLLOW_eq_in_constraints426);
eq16=eq(ctx);
@@ -3469,7 +3467,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:464:6: live_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:462:6: live_def
{
FOLLOWPUSH(FOLLOW_live_def_in_constraints431);
live_def(ctx);
@@ -3484,7 +3482,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:464:15: uncontrol
+ // /Users/bion/projects/iordache/translator/pngenerator.g:462:15: uncontrol
{
FOLLOWPUSH(FOLLOW_uncontrol_in_constraints433);
uncontrol(ctx);
@@ -3499,7 +3497,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:464:25: unobserve
+ // /Users/bion/projects/iordache/translator/pngenerator.g:462:25: unobserve
{
FOLLOWPUSH(FOLLOW_unobserve_in_constraints435);
unobserve(ctx);
@@ -3554,7 +3552,7 @@
/**
* $ANTLR start constraint_block
- * /Users/bion/projects/iordache/translator/pngenerator.g:465:1: constraint_block : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:463:1: constraint_block : ID ;
*/
static void
constraint_block(ppngenerator ctx)
@@ -3568,8 +3566,8 @@
ID17 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:466:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:466:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:464:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:464:4: ID
{
ID17 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_constraint_block446);
if (HASEXCEPTION())
@@ -3620,7 +3618,7 @@
/**
* $ANTLR start 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 ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:483:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) );
*/
static pngenerator_eq_return
eq(ppngenerator ctx)
@@ -3654,7 +3652,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:490:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:488:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
ANTLR3_UINT32 alt24;
@@ -3687,7 +3685,7 @@
switch (alt24)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:490:4: relationalExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:488:4: relationalExpression
{
FOLLOWPUSH(FOLLOW_relationalExpression_in_eq469);
relationalExpression18=relationalExpression(ctx);
@@ -3705,10 +3703,10 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:491:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:489:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:491:6: ( AND_OP | OR_OP )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:489:6: ( AND_OP | OR_OP )
{
int alt23=2;
@@ -3738,7 +3736,7 @@
switch (alt23)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:491:7: AND_OP
+ // /Users/bion/projects/iordache/translator/pngenerator.g:489:7: AND_OP
{
MATCHT(AND_OP, &FOLLOW_AND_OP_in_eq478);
if (HASEXCEPTION())
@@ -3755,7 +3753,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:493:7: OR_OP
+ // /Users/bion/projects/iordache/translator/pngenerator.g:491:7: OR_OP
{
MATCHT(OR_OP, &FOLLOW_OR_OP_in_eq484);
if (HASEXCEPTION())
@@ -3864,7 +3862,7 @@
/**
* $ANTLR start relationalExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:517:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:515:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
*/
static inequality*
relationalExpression(ppngenerator ctx)
@@ -3887,8 +3885,8 @@
NUM19 = NULL;
{
- // /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 )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:523:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:523:9: ^( EQ_OP additiveExpression[list, false] NUM )
{
MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression530);
if (HASEXCEPTION())
@@ -3962,7 +3960,7 @@
/**
* $ANTLR start additiveExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:538:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, flip] additiveExpression[list, flip] ) | ^( SUB additiveExpression[list, flip] additiveExpression[list, !flip] ) | ^( PLUS additiveExpression[list, flip] ) | ^( MINUS additiveExpression[list, !flip] ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:536:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, flip] additiveExpression[list, flip] ) | ^( SUB additiveExpression[list, flip] additiveExpression[list, !flip] ) | ^( PLUS additiveExpression[list, flip] ) | ^( MINUS additiveExpression[list, !flip] ) );
*/
static void
additiveExpression(ppngenerator ctx, pANTLR3_VECTOR list, bool flip)
@@ -3979,7 +3977,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:539:5: ( primary[flip] | ^( ADD additiveExpression[list, flip] additiveExpression[list, flip] ) | ^( SUB additiveExpression[list, flip] additiveExpression[list, !flip] ) | ^( PLUS additiveExpression[list, flip] ) | ^( MINUS additiveExpression[list, !flip] ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:537:5: ( primary[flip] | ^( ADD additiveExpression[list, flip] additiveExpression[list, flip] ) | ^( SUB additiveExpression[list, flip] additiveExpression[list, !flip] ) | ^( PLUS additiveExpression[list, flip] ) | ^( MINUS additiveExpression[list, !flip] ) )
ANTLR3_UINT32 alt25;
@@ -4028,7 +4026,7 @@
switch (alt25)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:539:9: primary[flip]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:537:9: primary[flip]
{
FOLLOWPUSH(FOLLOW_primary_in_additiveExpression554);
primary20=primary(ctx, flip);
@@ -4046,7 +4044,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:540:7: ^( ADD additiveExpression[list, flip] additiveExpression[list, flip] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:538:7: ^( ADD additiveExpression[list, flip] additiveExpression[list, flip] )
{
MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression566);
if (HASEXCEPTION())
@@ -4090,7 +4088,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:541:7: ^( SUB additiveExpression[list, flip] additiveExpression[list, !flip] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:539:7: ^( SUB additiveExpression[list, flip] additiveExpression[list, !flip] )
{
MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression582);
if (HASEXCEPTION())
@@ -4134,7 +4132,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:542:7: ^( PLUS additiveExpression[list, flip] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:540:7: ^( PLUS additiveExpression[list, flip] )
{
MATCHT(PLUS, &FOLLOW_PLUS_in_additiveExpression598);
if (HASEXCEPTION())
@@ -4169,7 +4167,7 @@
}
break;
case 5:
- // /Users/bion/projects/iordache/translator/pngenerator.g:543:7: ^( MINUS additiveExpression[list, !flip] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:541:7: ^( MINUS additiveExpression[list, !flip] )
{
MATCHT(MINUS, &FOLLOW_MINUS_in_additiveExpression611);
if (HASEXCEPTION())
@@ -4226,7 +4224,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)
@@ -4252,7 +4250,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;
@@ -4285,7 +4283,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_primary635);
group_elements21=group_elements(ctx);
@@ -4309,7 +4307,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_primary646);
if (HASEXCEPTION())
@@ -4381,7 +4379,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)
@@ -4401,7 +4399,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;
@@ -4472,7 +4470,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_def668);
if (HASEXCEPTION())
@@ -4504,7 +4502,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:571:5: ( ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:569:5: ( ID )*
for (;;)
{
@@ -4522,7 +4520,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_def675);
if (HASEXCEPTION())
@@ -4570,7 +4568,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_def688);
if (HASEXCEPTION())
@@ -4585,7 +4583,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;
@@ -4605,7 +4603,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_def691);
if (HASEXCEPTION())
@@ -4676,7 +4674,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)
@@ -4690,8 +4688,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_uncontrol706);
if (HASEXCEPTION())
@@ -4706,7 +4704,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;
@@ -4726,7 +4724,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_uncontrol709);
if (HASEXCEPTION())
@@ -4794,7 +4792,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)
@@ -4808,8 +4806,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_unobserve724);
if (HASEXCEPTION())
@@ -4824,7 +4822,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;
@@ -4844,7 +4842,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_unobserve727);
if (HASEXCEPTION())
@@ -4912,7 +4910,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)
@@ -4922,8 +4920,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_commands742);
print(ctx);
@@ -4957,7 +4955,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)
@@ -4967,8 +4965,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_print753);
if (HASEXCEPTION())
@@ -5028,7 +5026,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)
@@ -5047,8 +5045,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_elements778);
if (HASEXCEPTION())
@@ -5063,7 +5061,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;
@@ -5083,7 +5081,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_elements781);
if (HASEXCEPTION())
@@ -5149,7 +5147,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)
@@ -5170,7 +5168,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;
@@ -5222,7 +5220,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_ID800);
if (HASEXCEPTION())
@@ -5241,7 +5239,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_ID808);
if (HASEXCEPTION())
Modified: translator/pngenerator.g
===================================================================
--- translator/pngenerator.g 2009-07-08 20:22:28 UTC (rev 190)
+++ translator/pngenerator.g 2009-07-08 20:25:11 UTC (rev 191)
@@ -144,13 +144,11 @@
threads = threadData;
output = tmalloc(sizeof(specs));
//copy the file name into the specs structure
- printf("Starting...\n");
if(strrchr(fileName, '/')) {
fileName = strrchr(fileName, '/')+sizeof(char);
}
output->name = tcalloc(strlen(fileName), sizeof(char));
strncpy(output->name, fileName, strcspn(fileName, "."));
- printf("Starting...\n");
//prep the pn array
output->pn_array = NULL;
output->pn_num = 0;
Modified: translator/pngenerator.h
===================================================================
--- translator/pngenerator.h 2009-07-08 20:22:28 UTC (rev 190)
+++ translator/pngenerator.h 2009-07-08 20:25:11 UTC (rev 191)
@@ -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-08 15:21:25
+ * - On : 2009-07-08 15:24:37
* - 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.
|
