[Pntool-developers] SF.net SVN: pntool:[188] translator
Brought to you by:
compaqdrew,
miordache
Menu
▾
▴
[Pntool-developers] SF.net SVN: pntool:[188] translator
|
From: <the...@us...> - 2009-07-08 16:32:09
|
Revision: 188
http://pntool.svn.sourceforge.net/pntool/?rev=188&view=rev
Author: thecodeweasel
Date: 2009-07-08 16:32:00 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
Removing file path from the spec structure name
Modified Paths:
--------------
translator/pngenerator.c
translator/pngenerator.g
translator/pngenerator.h
Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c 2009-07-08 16:20:34 UTC (rev 187)
+++ translator/pngenerator.c 2009-07-08 16:32:00 UTC (rev 188)
@@ -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 11:18:31
+ * - On : 2009-07-08 11:30:44
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
@@ -1176,6 +1176,7 @@
threads = threadData;
output = tmalloc(sizeof(specs));
//copy the file name into the specs structure
+ fileName = strrchr(fileName, '/')+sizeof(char);
output->name = tcalloc(strlen(fileName), sizeof(char));
strncpy(output->name, fileName, strcspn(fileName, "."));
//prep the pn array
@@ -1186,10 +1187,10 @@
constraintList = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:2: ( ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* )
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:2: ( ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )*
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ( proc_definitions )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: ( proc_definitions )+
{
int cnt1=0;
@@ -1249,7 +1250,7 @@
switch (alt1)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: proc_definitions
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: proc_definitions
{
FOLLOWPUSH(FOLLOW_proc_definitions_in_pn71);
proc_definitions(ctx);
@@ -1283,7 +1284,7 @@
}
loop1: ; /* Jump to here if this rule does not match */
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:22: ( proc_instantiations )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:22: ( proc_instantiations )+
{
int cnt2=0;
@@ -1329,7 +1330,7 @@
switch (alt2)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:22: proc_instantiations
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:22: proc_instantiations
{
FOLLOWPUSH(FOLLOW_proc_instantiations_in_pn74);
proc_instantiations(ctx);
@@ -1364,7 +1365,7 @@
loop2: ; /* Jump to here if this rule does not match */
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:43: ( constraints )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:43: ( constraints )*
for (;;)
{
@@ -1382,7 +1383,7 @@
switch (alt3)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:43: constraints
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:43: constraints
{
FOLLOWPUSH(FOLLOW_constraints_in_pn77);
constraints(ctx);
@@ -1405,7 +1406,7 @@
loop3: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:56: ( other_commands )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:56: ( other_commands )*
for (;;)
{
@@ -1423,7 +1424,7 @@
switch (alt4)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:56: other_commands
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:56: other_commands
{
FOLLOWPUSH(FOLLOW_other_commands_in_pn80);
other_commands(ctx);
@@ -1491,7 +1492,7 @@
/**
* $ANTLR start proc_definitions
- * /Users/bion/projects/iordache/translator/pngenerator.g:178:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:179:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
*/
static void
proc_definitions(ppngenerator ctx)
@@ -1501,8 +1502,8 @@
ctx->ppngenerator_proc_definitionsTop = ppngenerator_proc_definitionsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:184:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:184:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:185:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:185:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? )
{
FOLLOWPUSH(FOLLOW_def_start_in_proc_definitions98);
def_start(ctx);
@@ -1522,7 +1523,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:184:16: ( trans_defs )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:185:16: ( trans_defs )*
for (;;)
{
@@ -1540,7 +1541,7 @@
switch (alt5)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:184:16: trans_defs
+ // /Users/bion/projects/iordache/translator/pngenerator.g:185:16: trans_defs
{
FOLLOWPUSH(FOLLOW_trans_defs_in_proc_definitions100);
trans_defs(ctx);
@@ -1563,7 +1564,7 @@
loop5: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:184:28: ( select_functions )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:185:28: ( select_functions )*
for (;;)
{
@@ -1581,7 +1582,7 @@
switch (alt6)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:184:28: select_functions
+ // /Users/bion/projects/iordache/translator/pngenerator.g:185:28: select_functions
{
FOLLOWPUSH(FOLLOW_select_functions_in_proc_definitions103);
select_functions(ctx);
@@ -1604,7 +1605,7 @@
loop6: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:184:46: ( nondeterm )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:185:46: ( nondeterm )?
{
int alt7=2;
{
@@ -1617,7 +1618,7 @@
switch (alt7)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:184:46: nondeterm
+ // /Users/bion/projects/iordache/translator/pngenerator.g:185:46: nondeterm
{
FOLLOWPUSH(FOLLOW_nondeterm_in_proc_definitions106);
nondeterm(ctx);
@@ -1667,7 +1668,7 @@
/**
* $ANTLR start def_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:185:1: def_start : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:186:1: def_start : ID ;
*/
static void
def_start(ppngenerator ctx)
@@ -1684,8 +1685,8 @@
ID1 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:189:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:190:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:190:4: ID
{
ID1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_def_start122);
if (HASEXCEPTION())
@@ -1741,7 +1742,7 @@
/**
* $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:212:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:213:1: trans_defs : ( extern_trans_def | trans_def );
*/
static void
trans_defs(ppngenerator ctx)
@@ -1752,7 +1753,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:213:2: ( extern_trans_def | trans_def )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:214:2: ( extern_trans_def | trans_def )
ANTLR3_UINT32 alt8;
@@ -1785,7 +1786,7 @@
switch (alt8)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:213:4: extern_trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:214:4: extern_trans_def
{
FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs132);
extern_trans_def(ctx);
@@ -1800,7 +1801,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:214:4: trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:215:4: trans_def
{
FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs137);
trans_def(ctx);
@@ -1837,7 +1838,7 @@
/**
* $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:215:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:216:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
*/
static void
extern_trans_def(ppngenerator ctx)
@@ -1860,11 +1861,11 @@
ID4 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:221:2: ( ^( ( TO | FROM ) ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:221:4: ^( ( TO | FROM ) ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:222:2: ( ^( ( TO | FROM ) ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:222:4: ^( ( TO | FROM ) ( ID )+ )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:221:6: ( TO | FROM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:222:6: ( TO | FROM )
{
int alt9=2;
@@ -1894,7 +1895,7 @@
switch (alt9)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:221:7: TO
+ // /Users/bion/projects/iordache/translator/pngenerator.g:222:7: TO
{
TO2 = (pANTLR3_BASE_TREE) MATCHT(TO, &FOLLOW_TO_in_extern_trans_def153);
if (HASEXCEPTION())
@@ -1912,7 +1913,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:224:7: FROM
+ // /Users/bion/projects/iordache/translator/pngenerator.g:225:7: FROM
{
FROM3 = (pANTLR3_BASE_TREE) MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def159);
if (HASEXCEPTION())
@@ -1939,7 +1940,7 @@
goto ruleextern_trans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:227:6: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:228:6: ( ID )+
{
int cnt10=0;
@@ -1959,7 +1960,7 @@
switch (alt10)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:227:7: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:228:7: ID
{
ID4 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_extern_trans_def165);
if (HASEXCEPTION())
@@ -2026,7 +2027,7 @@
/**
* $ANTLR start trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:231:1: trans_def : ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:232: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 +2064,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:242:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:243:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? ) )
ANTLR3_UINT32 alt15;
@@ -2139,7 +2140,7 @@
switch (alt15)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:242:4: ^( ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:243:4: ^( ID CODE_BLOCK )
{
ID5 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def185);
if (HASEXCEPTION())
@@ -2181,7 +2182,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:251:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:252:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def201);
if (HASEXCEPTION())
@@ -2202,7 +2203,7 @@
goto ruletrans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:253:5: (place= ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:254:5: (place= ID )+
{
int cnt11=0;
@@ -2222,7 +2223,7 @@
switch (alt11)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:253:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:254:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def208);
if (HASEXCEPTION())
@@ -2276,7 +2277,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:269:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:270:5: ( CODE_BLOCK )?
{
int alt12=2;
{
@@ -2289,7 +2290,7 @@
switch (alt12)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:269:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:270:6: CODE_BLOCK
{
CODE_BLOCK7 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def217);
if (HASEXCEPTION())
@@ -2324,7 +2325,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:275:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:276:4: ^(tran= ID PLACE (place= ID )* ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def235);
if (HASEXCEPTION())
@@ -2357,7 +2358,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:279:5: (place= ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:280:5: (place= ID )*
for (;;)
{
@@ -2375,7 +2376,7 @@
switch (alt13)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:279:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:280:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def246);
if (HASEXCEPTION())
@@ -2416,7 +2417,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:294:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:295:5: ( CODE_BLOCK )?
{
int alt14=2;
{
@@ -2429,7 +2430,7 @@
switch (alt14)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:294:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:295:6: CODE_BLOCK
{
CODE_BLOCK9 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def255);
if (HASEXCEPTION())
@@ -2486,7 +2487,7 @@
/**
* $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:299:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:300:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
*/
static void
select_functions(ppngenerator ctx)
@@ -2502,8 +2503,8 @@
CODE_BLOCK11 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:300:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:300:4: ^( SELECT_DEF ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:301:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:301:4: ^( SELECT_DEF ID CODE_BLOCK )
{
MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions271);
if (HASEXCEPTION())
@@ -2569,7 +2570,7 @@
/**
* $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:307:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:308:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
*/
static void
nondeterm(ppngenerator ctx)
@@ -2583,8 +2584,8 @@
ID12 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:4: ^( 'nondeterministic places: ' ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:309:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:309:4: ^( 'nondeterministic places: ' ( ID )+ )
{
MATCHT(47, &FOLLOW_47_in_nondeterm288);
if (HASEXCEPTION())
@@ -2599,7 +2600,7 @@
goto rulenondetermEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:34: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:309:34: ( ID )+
{
int cnt16=0;
@@ -2619,7 +2620,7 @@
switch (alt16)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:35: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:309:35: ID
{
ID12 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_nondeterm291);
if (HASEXCEPTION())
@@ -2687,7 +2688,7 @@
/**
* $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:315:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:316:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
*/
static void
proc_instantiations(ppngenerator ctx)
@@ -2697,11 +2698,11 @@
ctx->ppngenerator_proc_instantiationsTop = ppngenerator_proc_instantiationsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:321:2: ( ( proc_init | sync_def | proc_start ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:321:4: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:322:2: ( ( proc_init | sync_def | proc_start ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:322:4: ( proc_init | sync_def | proc_start )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:321:4: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:322:4: ( proc_init | sync_def | proc_start )
{
int alt17=3;
switch ( LA(1) )
@@ -2736,7 +2737,7 @@
switch (alt17)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:321:5: proc_init
+ // /Users/bion/projects/iordache/translator/pngenerator.g:322:5: proc_init
{
FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations312);
proc_init(ctx);
@@ -2751,7 +2752,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:321:17: sync_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:322:17: sync_def
{
FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations316);
sync_def(ctx);
@@ -2766,7 +2767,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:321:28: proc_start
+ // /Users/bion/projects/iordache/translator/pngenerator.g:322:28: proc_start
{
FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations320);
proc_start(ctx);
@@ -2808,7 +2809,7 @@
/**
* $ANTLR start proc_init
- * /Users/bion/projects/iordache/translator/pngenerator.g:323:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:324:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
*/
static void
proc_init(ppngenerator ctx)
@@ -2833,7 +2834,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:328:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:329:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
ANTLR3_UINT32 alt19;
@@ -2885,7 +2886,7 @@
switch (alt19)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:328:4: name1= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:329:4: name1= ID
{
name1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init338);
if (HASEXCEPTION())
@@ -2916,7 +2917,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:345:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:346:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
{
name2 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init348);
if (HASEXCEPTION())
@@ -2947,7 +2948,7 @@
goto ruleproc_initEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:357:5: ( numbered_ID[$proc_instantiations::places] )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:358:5: ( numbered_ID[$proc_instantiations::places] )+
{
int cnt18=0;
@@ -2967,7 +2968,7 @@
switch (alt18)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:357:6: numbered_ID[$proc_instantiations::places]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:358:6: numbered_ID[$proc_instantiations::places]
{
FOLLOWPUSH(FOLLOW_numbered_ID_in_proc_init353);
numbered_ID13=numbered_ID(ctx, (SCOPE_TOP(proc_instantiations))->places);
@@ -3053,7 +3054,7 @@
/**
* $ANTLR start sync_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:372:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:373:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
*/
static void
sync_def(ppngenerator ctx)
@@ -3073,8 +3074,8 @@
group_elements14 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:377:2: ( ^( SYNC_TOK ( group_elements )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:377:4: ^( SYNC_TOK ( group_elements )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:378:2: ( ^( SYNC_TOK ( group_elements )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:378:4: ^( SYNC_TOK ( group_elements )+ )
{
MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def379);
if (HASEXCEPTION())
@@ -3089,7 +3090,7 @@
goto rulesync_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:377:15: ( group_elements )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:378:15: ( group_elements )+
{
int cnt20=0;
@@ -3109,7 +3110,7 @@
switch (alt20)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:377:16: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:378:16: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_sync_def382);
group_elements14=group_elements(ctx);
@@ -3223,7 +3224,7 @@
/**
* $ANTLR start proc_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:422:1: proc_start : ^( START ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:423:1: proc_start : ^( START ( ID )+ ) ;
*/
static void
proc_start(ppngenerator ctx)
@@ -3237,8 +3238,8 @@
ID15 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:423:2: ( ^( START ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:423:4: ^( START ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:424:2: ( ^( START ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:424:4: ^( START ( ID )+ )
{
MATCHT(START, &FOLLOW_START_in_proc_start399);
if (HASEXCEPTION())
@@ -3253,7 +3254,7 @@
goto ruleproc_startEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:423:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:424:12: ( ID )+
{
int cnt21=0;
@@ -3273,7 +3274,7 @@
switch (alt21)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:423:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:424:13: ID
{
ID15 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_start402);
if (HASEXCEPTION())
@@ -3343,7 +3344,7 @@
/**
* $ANTLR start constraints
- * /Users/bion/projects/iordache/translator/pngenerator.g:431:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:432:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
*/
static void
constraints(ppngenerator ctx)
@@ -3357,8 +3358,8 @@
ctx->ppngenerator_constraintsTop = ppngenerator_constraintsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:438:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:438:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:439:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:439:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
{
FOLLOWPUSH(FOLLOW_constraint_block_in_constraints422);
constraint_block(ctx);
@@ -3378,7 +3379,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:438:23: ( ( eq ) | live_def | uncontrol | unobserve )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:439:23: ( ( eq ) | live_def | uncontrol | unobserve )*
for (;;)
{
@@ -3413,10 +3414,10 @@
switch (alt22)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:438:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:439:24: ( eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:438:24: ( eq )
- // /Users/bion/projects/iordache/translator/pngenerator.g:438:25: eq
+ // /Users/bion/projects/iordache/translator/pngenerator.g:439:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:439:25: eq
{
FOLLOWPUSH(FOLLOW_eq_in_constraints426);
eq16=eq(ctx);
@@ -3458,7 +3459,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:459:6: live_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:460:6: live_def
{
FOLLOWPUSH(FOLLOW_live_def_in_constraints431);
live_def(ctx);
@@ -3473,7 +3474,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:459:15: uncontrol
+ // /Users/bion/projects/iordache/translator/pngenerator.g:460:15: uncontrol
{
FOLLOWPUSH(FOLLOW_uncontrol_in_constraints433);
uncontrol(ctx);
@@ -3488,7 +3489,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:459:25: unobserve
+ // /Users/bion/projects/iordache/translator/pngenerator.g:460:25: unobserve
{
FOLLOWPUSH(FOLLOW_unobserve_in_constraints435);
unobserve(ctx);
@@ -3543,7 +3544,7 @@
/**
* $ANTLR start constraint_block
- * /Users/bion/projects/iordache/translator/pngenerator.g:460:1: constraint_block : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:461:1: constraint_block : ID ;
*/
static void
constraint_block(ppngenerator ctx)
@@ -3557,8 +3558,8 @@
ID17 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:461:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:461:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:462:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:462:4: ID
{
ID17 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_constraint_block446);
if (HASEXCEPTION())
@@ -3609,7 +3610,7 @@
/**
* $ANTLR start eq
- * /Users/bion/projects/iordache/translator/pngenerator.g:480:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:481:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) );
*/
static pngenerator_eq_return
eq(ppngenerator ctx)
@@ -3643,7 +3644,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:485:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:486:2: ( relationalExpression | ^( ( AND_OP | OR_OP ) leq= eq req= eq ) )
ANTLR3_UINT32 alt24;
@@ -3676,7 +3677,7 @@
switch (alt24)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:485:4: relationalExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:486:4: relationalExpression
{
FOLLOWPUSH(FOLLOW_relationalExpression_in_eq469);
relationalExpression18=relationalExpression(ctx);
@@ -3694,10 +3695,10 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:486:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:487:4: ^( ( AND_OP | OR_OP ) leq= eq req= eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:486:6: ( AND_OP | OR_OP )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:487:6: ( AND_OP | OR_OP )
{
int alt23=2;
@@ -3727,7 +3728,7 @@
switch (alt23)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:486:7: AND_OP
+ // /Users/bion/projects/iordache/translator/pngenerator.g:487:7: AND_OP
{
MATCHT(AND_OP, &FOLLOW_AND_OP_in_eq478);
if (HASEXCEPTION())
@@ -3744,7 +3745,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:488:7: OR_OP
+ // /Users/bion/projects/iordache/translator/pngenerator.g:489:7: OR_OP
{
MATCHT(OR_OP, &FOLLOW_OR_OP_in_eq484);
if (HASEXCEPTION())
@@ -3853,7 +3854,7 @@
/**
* $ANTLR start relationalExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:512:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:513:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
*/
static inequality*
relationalExpression(ppngenerator ctx)
@@ -3876,8 +3877,8 @@
NUM19 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:520:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:520:9: ^( EQ_OP additiveExpression[list, false] NUM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:521:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:521:9: ^( EQ_OP additiveExpression[list, false] NUM )
{
MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression530);
if (HASEXCEPTION())
@@ -3951,7 +3952,7 @@
/**
* $ANTLR start additiveExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:533:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) | ^( MINUS additiveExpression[list, true] ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:534:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) | ^( MINUS additiveExpression[list, true] ) );
*/
static void
additiveExpression(ppngenerator ctx, pANTLR3_VECTOR list, bool flip)
@@ -3968,7 +3969,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:534:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) | ^( MINUS additiveExpression[list, true] ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:535:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) | ^( MINUS additiveExpression[list, true] ) )
ANTLR3_UINT32 alt25;
@@ -4012,7 +4013,7 @@
switch (alt25)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:534:9: primary[flip]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:535:9: primary[flip]
{
FOLLOWPUSH(FOLLOW_primary_in_additiveExpression554);
primary20=primary(ctx, flip);
@@ -4030,7 +4031,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:535:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:536:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
{
MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression566);
if (HASEXCEPTION())
@@ -4074,7 +4075,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:536:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:537:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
{
MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression582);
if (HASEXCEPTION())
@@ -4118,7 +4119,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:537:7: ^( MINUS additiveExpression[list, true] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:538:7: ^( MINUS additiveExpression[list, true] )
{
MATCHT(MINUS, &FOLLOW_MINUS_in_additiveExpression598);
if (HASEXCEPTION())
@@ -4175,7 +4176,7 @@
/**
* $ANTLR start primary
- * /Users/bion/projects/iordache/translator/pngenerator.g:539:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:540:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
*/
static variable*
primary(ppngenerator ctx, bool flip)
@@ -4201,7 +4202,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:540:5: ( group_elements | ^( MULT NUM group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:541:5: ( group_elements | ^( MULT NUM group_elements ) )
ANTLR3_UINT32 alt26;
@@ -4234,7 +4235,7 @@
switch (alt26)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:540:9: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:541:9: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_primary622);
group_elements21=group_elements(ctx);
@@ -4258,7 +4259,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:547:7: ^( MULT NUM group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:548:7: ^( MULT NUM group_elements )
{
MATCHT(MULT, &FOLLOW_MULT_in_primary633);
if (HASEXCEPTION())
@@ -4330,7 +4331,7 @@
/**
* $ANTLR start live_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:554:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:555:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
*/
static void
live_def(ppngenerator ctx)
@@ -4350,7 +4351,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:558:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:559:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
ANTLR3_UINT32 alt29;
@@ -4421,7 +4422,7 @@
switch (alt29)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:558:4: ^( LIVE ALL ( ID )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:559:4: ^( LIVE ALL ( ID )* )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def655);
if (HASEXCEPTION())
@@ -4453,7 +4454,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:565:5: ( ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:566:5: ( ID )*
for (;;)
{
@@ -4471,7 +4472,7 @@
switch (alt27)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:565:6: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:566:6: ID
{
ID24 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def662);
if (HASEXCEPTION())
@@ -4519,7 +4520,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:4: ^( LIVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:579:4: ^( LIVE ( ID )+ )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def675);
if (HASEXCEPTION())
@@ -4534,7 +4535,7 @@
goto rulelive_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:11: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:579:11: ( ID )+
{
int cnt28=0;
@@ -4554,7 +4555,7 @@
switch (alt28)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:12: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:579:12: ID
{
ID25 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def678);
if (HASEXCEPTION())
@@ -4625,7 +4626,7 @@
/**
* $ANTLR start uncontrol
- * /Users/bion/projects/iordache/translator/pngenerator.g:583:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:584:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
*/
static void
uncontrol(ppngenerator ctx)
@@ -4639,8 +4640,8 @@
ID26 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:584:2: ( ^( UNCONTROL ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:584:4: ^( UNCONTROL ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:585:2: ( ^( UNCONTROL ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:585:4: ^( UNCONTROL ( ID )+ )
{
MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol693);
if (HASEXCEPTION())
@@ -4655,7 +4656,7 @@
goto ruleuncontrolEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:584:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:585:16: ( ID )+
{
int cnt30=0;
@@ -4675,7 +4676,7 @@
switch (alt30)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:584:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:585:17: ID
{
ID26 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_uncontrol696);
if (HASEXCEPTION())
@@ -4743,7 +4744,7 @@
/**
* $ANTLR start unobserve
- * /Users/bion/projects/iordache/translator/pngenerator.g:589:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:590:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
*/
static void
unobserve(ppngenerator ctx)
@@ -4757,8 +4758,8 @@
ID27 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:2: ( ^( UNOBSERVE ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:4: ^( UNOBSERVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:591:2: ( ^( UNOBSERVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:591:4: ^( UNOBSERVE ( ID )+ )
{
MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve711);
if (HASEXCEPTION())
@@ -4773,7 +4774,7 @@
goto ruleunobserveEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:591:16: ( ID )+
{
int cnt31=0;
@@ -4793,7 +4794,7 @@
switch (alt31)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:591:17: ID
{
ID27 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_unobserve714);
if (HASEXCEPTION())
@@ -4861,7 +4862,7 @@
/**
* $ANTLR start other_commands
- * /Users/bion/projects/iordache/translator/pngenerator.g:596:1: other_commands : print ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:597:1: other_commands : print ;
*/
static void
other_commands(ppngenerator ctx)
@@ -4871,8 +4872,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:597:2: ( print )
- // /Users/bion/projects/iordache/translator/pngenerator.g:597:4: print
+ // /Users/bion/projects/iordache/translator/pngenerator.g:598:2: ( print )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:598:4: print
{
FOLLOWPUSH(FOLLOW_print_in_other_commands729);
print(ctx);
@@ -4906,7 +4907,7 @@
/**
* $ANTLR start print
- * /Users/bion/projects/iordache/translator/pngenerator.g:598:1: print : ^( PRINT ID group_elements ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:599:1: print : ^( PRINT ID group_elements ) ;
*/
static void
print(ppngenerator ctx)
@@ -4916,8 +4917,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:599:2: ( ^( PRINT ID group_elements ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:599:4: ^( PRINT ID group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:600:2: ( ^( PRINT ID group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:600:4: ^( PRINT ID group_elements )
{
MATCHT(PRINT, &FOLLOW_PRINT_in_print740);
if (HASEXCEPTION())
@@ -4977,7 +4978,7 @@
/**
* $ANTLR start group_elements
- * /Users/bion/projects/iordache/translator/pngenerator.g:601:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:602:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
*/
static pANTLR3_VECTOR
group_elements(ppngenerator ctx)
@@ -4996,8 +4997,8 @@
ID28 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:605:2: ( ^( GROUP ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:605:4: ^( GROUP ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:606:2: ( ^( GROUP ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:606:4: ^( GROUP ( ID )+ )
{
MATCHT(GROUP, &FOLLOW_GROUP_in_group_elements765);
if (HASEXCEPTION())
@@ -5012,7 +5013,7 @@
goto rulegroup_elementsEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:605:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:606:12: ( ID )+
{
int cnt32=0;
@@ -5032,7 +5033,7 @@
switch (alt32)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:605:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:606:13: ID
{
ID28 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_group_elements768);
if (HASEXCEPTION())
@@ -5098,7 +5099,7 @@
/**
* $ANTLR start numbered_ID
- * /Users/bion/projects/iordache/translator/pngenerator.g:608:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:609:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
*/
static int*
numbered_ID(ppngenerator ctx, ASSOC_ARRAY* places)
@@ -5119,7 +5120,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:609:2: ( ID | ^( ID INT ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:610:2: ( ID | ^( ID INT ) )
ANTLR3_UINT32 alt33;
@@ -5171,7 +5172,7 @@
switch (alt33)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:609:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:610:4: ID
{
ID29 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_numbered_ID787);
if (HASEXCEPTION())
@@ -5190,7 +5191,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:614:4: ^( ID INT )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:615:4: ^( ID INT )
{
ID30 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_numbered_ID795);
if (HASEXCEPTION())
Modified: translator/pngenerator.g
===================================================================
--- translator/pngenerator.g 2009-07-08 16:20:34 UTC (rev 187)
+++ translator/pngenerator.g 2009-07-08 16:32:00 UTC (rev 188)
@@ -144,6 +144,7 @@
threads = threadData;
output = tmalloc(sizeof(specs));
//copy the file name into the specs structure
+ fileName = strrchr(fileName, '/')+sizeof(char);
output->name = tcalloc(strlen(fileName), sizeof(char));
strncpy(output->name, fileName, strcspn(fileName, "."));
//prep the pn array
Modified: translator/pngenerator.h
===================================================================
--- translator/pngenerator.h 2009-07-08 16:20:34 UTC (rev 187)
+++ translator/pngenerator.h 2009-07-08 16:32:00 UTC (rev 188)
@@ -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 11:18:31
+ * - On : 2009-07-08 11:30:44
* - 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.
|
