[Pntool-developers] SF.net SVN: pntool:[66] translator
Brought to you by:
compaqdrew,
miordache
Menu
▾
▴
[Pntool-developers] SF.net SVN: pntool:[66] translator
|
From: <the...@us...> - 2009-06-17 22:49:07
|
Revision: 66
http://pntool.svn.sourceforge.net/pntool/?rev=66&view=rev
Author: thecodeweasel
Date: 2009-06-17 22:46:03 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
Adding debug names to the pns structure
Modified Paths:
--------------
translator/dataStructures.c
translator/dataStructures.h
translator/pngenerator.c
translator/pngenerator.g
translator/pngenerator.h
Modified: translator/dataStructures.c
===================================================================
--- translator/dataStructures.c 2009-06-17 22:08:28 UTC (rev 65)
+++ translator/dataStructures.c 2009-06-17 22:46:03 UTC (rev 66)
@@ -3,14 +3,15 @@
#include "general.h"
//ints are 4 bytes wide, chars are 1 byte wide
-static void arrayDelete (ASSOC_ARRAY* array, void* key);
-static void* arrayRemove (ASSOC_ARRAY* array, void* key);
-static void* arrayGet (ASSOC_ARRAY* array, void* key);
-static ANTLR3_INT32 arrayAdd (ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*));
-static ANTLR3_UINT32 arraySet (ASSOC_ARRAY* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*));
-static void arrayFree (ASSOC_ARRAY* array);
-static ANTLR3_UINT32 arraySize (ASSOC_ARRAY* array);
-static void* arrayIter (ASSOC_ARRAY* array, int i);
+static void arrayDelete (ASSOC_ARRAY* array, void* key);
+static void* arrayRemove (ASSOC_ARRAY* array, void* key);
+static void* arrayGet (ASSOC_ARRAY* array, void* key);
+static ANTLR3_INT32 arrayAdd (ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*));
+static ANTLR3_UINT32 arraySet (ASSOC_ARRAY* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*));
+static void arrayFree (ASSOC_ARRAY* array);
+static ANTLR3_UINT32 arraySize (ASSOC_ARRAY* array);
+static void* arrayIter (ASSOC_ARRAY* array, int i);
+static char* arrayIterKeys (ASSOC_ARRAY* array, int i);
ASSOC_ARRAY* newAssocArray(ANTLR3_UINT32 sizeHint) {
ASSOC_ARRAY* ret;
@@ -29,6 +30,7 @@
ret->free = arrayFree;
ret->size = arraySize;
ret->iter = arrayIter;
+ ret->iterKeys = arrayIterKeys;
return ret;
}
@@ -93,4 +95,8 @@
void* arrayIter(ASSOC_ARRAY* array, int i) {
return array->table->get(array->table, (char*) array->list->get(array->list, i));
+}
+
+char* arrayIterKeys(ASSOC_ARRAY* array, int i) {
+ return (char*) array->list->get(array->list, i);
}
\ No newline at end of file
Modified: translator/dataStructures.h
===================================================================
--- translator/dataStructures.h 2009-06-17 22:08:28 UTC (rev 65)
+++ translator/dataStructures.h 2009-06-17 22:46:03 UTC (rev 66)
@@ -25,6 +25,7 @@
//based off the vector size to ensure iterating never goes awry
ANTLR3_UINT32 (*size) (struct ASSOC_ARRAY_struct* array);
void* (*iter) (struct ASSOC_ARRAY_struct* array, int i);
+ void* (*iterKeys) (struct ASSOC_ARRAY_struct* array, int i);
} ASSOC_ARRAY;
#endif
\ No newline at end of file
Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c 2009-06-17 22:08:28 UTC (rev 65)
+++ translator/pngenerator.c 2009-06-17 22:46:03 UTC (rev 66)
@@ -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-06-17 17:07:20
+ * - On : 2009-06-17 17:42:55
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
@@ -1576,12 +1576,25 @@
ASSOC_ARRAY* places;
ASSOC_ARRAY* trans;
- pANTLR3_LIST list = processes->get(processes, (ID1->getText(ID1))->chars);
+ pANTLR3_LIST list;
+ int i;
+ char* key;
+
+ list = processes->get(processes, (ID1->getText(ID1))->chars);
(SCOPE_TOP(proc_definitions))->proc= (process*) list->get(list, kPROC);
places = (ASSOC_ARRAY*) list->get(list, kPLACES);
trans = (ASSOC_ARRAY*) list->get(list, kTRANS);
pn = createpn("pnum tnum", (int) places->size(places), (int) trans->size(trans));
(SCOPE_TOP(proc_definitions))->proc->pn = &pn;
+ //setup debug names
+ for(i = 0; i < places->size(places); i++) {
+ key = places->iterKeys(places, i);
+ updatepn(&pn, "place_name", i, key);
+ }
+ for(i = 0; i < trans->size(trans); i++) {
+ key = trans->iterKeys(trans, i);
+ updatepn(&pn, "trans_name", i, key);
+ }
}
@@ -1607,7 +1620,7 @@
/**
* $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:93:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:106:1: trans_defs : ( extern_trans_def | trans_def );
*/
static void
trans_defs(ppngenerator ctx)
@@ -1618,7 +1631,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:94:2: ( extern_trans_def | trans_def )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:107:2: ( extern_trans_def | trans_def )
ANTLR3_UINT32 alt8;
@@ -1656,7 +1669,7 @@
switch (alt8)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:94:4: extern_trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:107:4: extern_trans_def
{
FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs136);
extern_trans_def(ctx);
@@ -1674,7 +1687,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:95:4: trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:108:4: trans_def
{
FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs141);
trans_def(ctx);
@@ -1714,7 +1727,7 @@
/**
* $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:96:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:109:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) );
*/
static void
extern_trans_def(ppngenerator ctx)
@@ -1725,7 +1738,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:97:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:110:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) )
ANTLR3_UINT32 alt11;
@@ -1763,7 +1776,7 @@
switch (alt11)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:97:4: ^( TO ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:110:4: ^( TO ( ID )+ )
{
MATCHT(TO, &FOLLOW_TO_in_extern_trans_def151);
if (HASEXCEPTION())
@@ -1784,7 +1797,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:97:9: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:110:9: ( ID )+
{
int cnt9=0;
@@ -1857,7 +1870,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:98:4: ^( FROM ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:111:4: ^( FROM ( ID )+ )
{
MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def161);
if (HASEXCEPTION())
@@ -1878,7 +1891,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:98:11: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:111:11: ( ID )+
{
int cnt10=0;
@@ -1973,7 +1986,7 @@
/**
* $ANTLR start trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:99:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:112:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) );
*/
static void
trans_def(ppngenerator ctx)
@@ -1984,7 +1997,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:100:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:113:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) )
ANTLR3_UINT32 alt14;
@@ -2070,7 +2083,7 @@
switch (alt14)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:100:4: ^( ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:113:4: ^( ID CODE_BLOCK )
{
MATCHT(ID, &FOLLOW_ID_in_trans_def175);
if (HASEXCEPTION())
@@ -2114,7 +2127,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:101:4: ^( ID ( ID )+ ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:114:4: ^( ID ( ID )+ ( CODE_BLOCK )? )
{
MATCHT(ID, &FOLLOW_ID_in_trans_def184);
if (HASEXCEPTION())
@@ -2135,7 +2148,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:101:9: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:114:9: ( ID )+
{
int cnt12=0;
@@ -2195,7 +2208,7 @@
loop12: ; /* Jump to here if this rule does not match */
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:101:13: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:114:13: ( CODE_BLOCK )?
{
int alt13=2;
{
@@ -2261,7 +2274,7 @@
/**
* $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:102:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:115:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
*/
static void
select_functions(ppngenerator ctx)
@@ -2271,8 +2284,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:103:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:103:4: ^( SELECT_DEF ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:116:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:116:4: ^( SELECT_DEF ID CODE_BLOCK )
{
MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions200);
if (HASEXCEPTION())
@@ -2344,7 +2357,7 @@
/**
* $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:104:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:117:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
*/
static void
nondeterm(ppngenerator ctx)
@@ -2354,8 +2367,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:105:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:105:4: ^( 'nondeterministic places: ' ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:118:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:118:4: ^( 'nondeterministic places: ' ( ID )+ )
{
MATCHT(44, &FOLLOW_44_in_nondeterm215);
if (HASEXCEPTION())
@@ -2376,7 +2389,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:105:34: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:118:34: ( ID )+
{
int cnt15=0;
@@ -2468,7 +2481,7 @@
/**
* $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:107:1: proc_instantiations : ( proc_init | sync_def | proc_start );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:120:1: proc_instantiations : ( proc_init | sync_def | proc_start );
*/
static void
proc_instantiations(ppngenerator ctx)
@@ -2479,7 +2492,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:108:2: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:121:2: ( proc_init | sync_def | proc_start )
ANTLR3_UINT32 alt16;
@@ -2522,7 +2535,7 @@
switch (alt16)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:108:4: proc_init
+ // /Users/bion/projects/iordache/translator/pngenerator.g:121:4: proc_init
{
FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations229);
proc_init(ctx);
@@ -2540,7 +2553,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:108:16: sync_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:121:16: sync_def
{
FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations233);
sync_def(ctx);
@@ -2558,7 +2571,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:108:27: proc_start
+ // /Users/bion/projects/iordache/translator/pngenerator.g:121:27: proc_start
{
FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations237);
proc_start(ctx);
@@ -2598,7 +2611,7 @@
/**
* $ANTLR start proc_init
- * /Users/bion/projects/iordache/translator/pngenerator.g:109:1: proc_init : ^( ID ID ( numbered_ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:122:1: proc_init : ^( ID ID ( numbered_ID )+ ) ;
*/
static void
proc_init(ppngenerator ctx)
@@ -2608,8 +2621,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:110:2: ( ^( ID ID ( numbered_ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:110:4: ^( ID ID ( numbered_ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:123:2: ( ^( ID ID ( numbered_ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:123:4: ^( ID ID ( numbered_ID )+ )
{
MATCHT(ID, &FOLLOW_ID_in_proc_init247);
if (HASEXCEPTION())
@@ -2639,7 +2652,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:110:12: ( numbered_ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:123:12: ( numbered_ID )+
{
int cnt17=0;
@@ -2734,7 +2747,7 @@
/**
* $ANTLR start sync_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:111:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:124:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
*/
static void
sync_def(ppngenerator ctx)
@@ -2744,8 +2757,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:112:2: ( ^( SYNC_TOK ( group_elements )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:112:4: ^( SYNC_TOK ( group_elements )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:125:2: ( ^( SYNC_TOK ( group_elements )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:125:4: ^( SYNC_TOK ( group_elements )+ )
{
MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def263);
if (HASEXCEPTION())
@@ -2766,7 +2779,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:112:15: ( group_elements )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:125:15: ( group_elements )+
{
int cnt18=0;
@@ -2861,7 +2874,7 @@
/**
* $ANTLR start constraints
- * /Users/bion/projects/iordache/translator/pngenerator.g:114:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:127:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ;
*/
static void
constraints(ppngenerator ctx)
@@ -2871,8 +2884,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:115:2: ( ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:115:4: ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:128:2: ( ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:128:4: ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? )
{
FOLLOWPUSH(FOLLOW_constraint_block_in_constraints278);
constraint_block(ctx);
@@ -2898,7 +2911,7 @@
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:115:23: ( eq )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:128:23: ( eq )*
for (;;)
{
@@ -2942,7 +2955,7 @@
loop19: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:115:27: ( live_def )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:128:27: ( live_def )?
{
int alt20=2;
{
@@ -2976,7 +2989,7 @@
}
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:115:37: ( uncontrol )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:128:37: ( uncontrol )?
{
int alt21=2;
{
@@ -3010,7 +3023,7 @@
}
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:115:48: ( unobserve )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:128:48: ( unobserve )?
{
int alt22=2;
{
@@ -3077,7 +3090,7 @@
/**
* $ANTLR start proc_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:117:1: proc_start : ^( START ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:130:1: proc_start : ^( START ( ID )+ ) ;
*/
static void
proc_start(ppngenerator ctx)
@@ -3087,8 +3100,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:118:2: ( ^( START ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:118:4: ^( START ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:131:2: ( ^( START ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:131:4: ^( START ( ID )+ )
{
MATCHT(START, &FOLLOW_START_in_proc_start302);
if (HASEXCEPTION())
@@ -3109,7 +3122,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:118:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:131:12: ( ID )+
{
int cnt23=0;
@@ -3201,7 +3214,7 @@
/**
* $ANTLR start constraint_block
- * /Users/bion/projects/iordache/translator/pngenerator.g:119:2: constraint_block : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:132:2: constraint_block : ID ;
*/
static void
constraint_block(ppngenerator ctx)
@@ -3211,8 +3224,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:120:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:120:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:133:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:133:4: ID
{
MATCHT(ID, &FOLLOW_ID_in_constraint_block315);
if (HASEXCEPTION())
@@ -3246,7 +3259,7 @@
/**
* $ANTLR start eq
- * /Users/bion/projects/iordache/translator/pngenerator.g:122:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:135:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) );
*/
static void
eq(ppngenerator ctx)
@@ -3257,7 +3270,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:123:2: ( relationalExpression | ^( EQS_OP eq eq ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:136:2: ( relationalExpression | ^( EQS_OP eq eq ) )
ANTLR3_UINT32 alt24;
@@ -3295,7 +3308,7 @@
switch (alt24)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:123:4: relationalExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:136:4: relationalExpression
{
FOLLOWPUSH(FOLLOW_relationalExpression_in_eq325);
relationalExpression(ctx);
@@ -3313,7 +3326,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:124:4: ^( EQS_OP eq eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:137:4: ^( EQS_OP eq eq )
{
MATCHT(EQS_OP, &FOLLOW_EQS_OP_in_eq331);
if (HASEXCEPTION())
@@ -3394,7 +3407,7 @@
/**
* $ANTLR start relationalExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:126:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:139:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) );
*/
static void
relationalExpression(ppngenerator ctx)
@@ -3405,7 +3418,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:127:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:140:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) )
ANTLR3_UINT32 alt25;
@@ -3443,7 +3456,7 @@
switch (alt25)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: additiveExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:140:9: additiveExpression
{
FOLLOWPUSH(FOLLOW_additiveExpression_in_relationalExpression351);
additiveExpression(ctx);
@@ -3461,7 +3474,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( EQ_OP relationalExpression relationalExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:141:7: ^( EQ_OP relationalExpression relationalExpression )
{
MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression360);
if (HASEXCEPTION())
@@ -3542,7 +3555,7 @@
/**
* $ANTLR start additiveExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:130:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:143:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) );
*/
static void
additiveExpression(ppngenerator ctx)
@@ -3553,7 +3566,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:131:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:144:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) )
ANTLR3_UINT32 alt26;
@@ -3655,7 +3668,7 @@
switch (alt26)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: primary
+ // /Users/bion/projects/iordache/translator/pngenerator.g:144:9: primary
{
FOLLOWPUSH(FOLLOW_primary_in_additiveExpression380);
primary(ctx);
@@ -3673,7 +3686,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ^( ADD additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:145:7: ^( ADD additiveExpression additiveExpression )
{
MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression389);
if (HASEXCEPTION())
@@ -3732,7 +3745,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: ^( SUB additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:146:7: ^( SUB additiveExpression additiveExpression )
{
MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression403);
if (HASEXCEPTION())
@@ -3813,7 +3826,7 @@
/**
* $ANTLR start primary
- * /Users/bion/projects/iordache/translator/pngenerator.g:135:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:148:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) );
*/
static void
primary(ppngenerator ctx)
@@ -3824,7 +3837,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:136:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:149:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) )
ANTLR3_UINT32 alt27;
@@ -3910,7 +3923,7 @@
switch (alt27)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:149:9: ID
{
MATCHT(ID, &FOLLOW_ID_in_primary422);
if (HASEXCEPTION())
@@ -3925,7 +3938,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:150:7: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_primary430);
group_elements(ctx);
@@ -3943,7 +3956,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:138:7: NUM
+ // /Users/bion/projects/iordache/translator/pngenerator.g:151:7: NUM
{
MATCHT(NUM, &FOLLOW_NUM_in_primary438);
if (HASEXCEPTION())
@@ -3958,7 +3971,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:139:7: ^( MULT NUM primary )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:152:7: ^( MULT NUM primary )
{
MATCHT(MULT, &FOLLOW_MULT_in_primary447);
if (HASEXCEPTION())
@@ -4014,7 +4027,7 @@
}
break;
case 5:
- // /Users/bion/projects/iordache/translator/pngenerator.g:140:7: ^( ADD additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:153:7: ^( ADD additiveExpression additiveExpression )
{
MATCHT(ADD, &FOLLOW_ADD_in_primary461);
if (HASEXCEPTION())
@@ -4073,7 +4086,7 @@
}
break;
case 6:
- // /Users/bion/projects/iordache/translator/pngenerator.g:141:7: ^( SUB additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:154:7: ^( SUB additiveExpression additiveExpression )
{
MATCHT(SUB, &FOLLOW_SUB_in_primary475);
if (HASEXCEPTION())
@@ -4154,7 +4167,7 @@
/**
* $ANTLR start live_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:142:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:155:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
*/
static void
live_def(ppngenerator ctx)
@@ -4165,7 +4178,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:143:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:156:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
ANTLR3_UINT32 alt30;
@@ -4251,7 +4264,7 @@
switch (alt30)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:143:4: ^( LIVE ALL ( ID )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ^( LIVE ALL ( ID )* )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def490);
if (HASEXCEPTION())
@@ -4282,7 +4295,7 @@
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:143:15: ( ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:156:15: ( ID )*
for (;;)
{
@@ -4336,7 +4349,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:144:4: ^( LIVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: ^( LIVE ( ID )+ )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def502);
if (HASEXCEPTION())
@@ -4357,7 +4370,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:144:11: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:11: ( ID )+
{
int cnt29=0;
@@ -4452,7 +4465,7 @@
/**
* $ANTLR start uncontrol
- * /Users/bion/projects/iordache/translator/pngenerator.g:145:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:158:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
*/
static void
uncontrol(ppngenerator ctx)
@@ -4462,8 +4475,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:146:2: ( ^( UNCONTROL ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:146:4: ^( UNCONTROL ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:2: ( ^( UNCONTROL ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:4: ^( UNCONTROL ( ID )+ )
{
MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol516);
if (HASEXCEPTION())
@@ -4484,7 +4497,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:146:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:16: ( ID )+
{
int cnt31=0;
@@ -4576,7 +4589,7 @@
/**
* $ANTLR start unobserve
- * /Users/bion/projects/iordache/translator/pngenerator.g:147:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:160:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
*/
static void
unobserve(ppngenerator ctx)
@@ -4586,8 +4599,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:148:2: ( ^( UNOBSERVE ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:148:4: ^( UNOBSERVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:161:2: ( ^( UNOBSERVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:161:4: ^( UNOBSERVE ( ID )+ )
{
MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve530);
if (HASEXCEPTION())
@@ -4608,7 +4621,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:148:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:161:16: ( ID )+
{
int cnt32=0;
@@ -4700,7 +4713,7 @@
/**
* $ANTLR start other_commands
- * /Users/bion/projects/iordache/translator/pngenerator.g:150:1: other_commands : print ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:163:1: other_commands : print ;
*/
static void
other_commands(ppngenerator ctx)
@@ -4710,8 +4723,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:151:2: ( print )
- // /Users/bion/projects/iordache/translator/pngenerator.g:151:4: print
+ // /Users/bion/projects/iordache/translator/pngenerator.g:164:2: ( print )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:164:4: print
{
FOLLOWPUSH(FOLLOW_print_in_other_commands544);
print(ctx);
@@ -4748,7 +4761,7 @@
/**
* $ANTLR start print
- * /Users/bion/projects/iordache/translator/pngenerator.g:152:1: print : ^( PRINT ID group_elements ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:165:1: print : ^( PRINT ID group_elements ) ;
*/
static void
print(ppngenerator ctx)
@@ -4758,8 +4771,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:153:2: ( ^( PRINT ID group_elements ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:153:4: ^( PRINT ID group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:166:2: ( ^( PRINT ID group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:166:4: ^( PRINT ID group_elements )
{
MATCHT(PRINT, &FOLLOW_PRINT_in_print554);
if (HASEXCEPTION())
@@ -4834,7 +4847,7 @@
/**
* $ANTLR start group_elements
- * /Users/bion/projects/iordache/translator/pngenerator.g:155:1: group_elements : ( ID | ^( DOT group_elements ID ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:168:1: group_elements : ( ID | ^( DOT group_elements ID ) );
*/
static void
group_elements(ppngenerator ctx)
@@ -4845,7 +4858,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:2: ( ID | ^( DOT group_elements ID ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:169:2: ( ID | ^( DOT group_elements ID ) )
ANTLR3_UINT32 alt33;
@@ -4883,7 +4896,7 @@
switch (alt33)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:169:4: ID
{
MATCHT(ID, &FOLLOW_ID_in_group_elements569);
if (HASEXCEPTION())
@@ -4898,7 +4911,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: ^( DOT group_elements ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:170:4: ^( DOT group_elements ID )
{
MATCHT(DOT, &FOLLOW_DOT_in_group_elements575);
if (HASEXCEPTION())
@@ -4976,7 +4989,7 @@
/**
* $ANTLR start numbered_ID
- * /Users/bion/projects/iordache/translator/pngenerator.g:158:1: numbered_ID : ( ID | ^( ID INT ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:171:1: numbered_ID : ( ID | ^( ID INT ) );
*/
static void
numbered_ID(ppngenerator ctx)
@@ -4987,7 +5000,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:159:2: ( ID | ^( ID INT ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:172:2: ( ID | ^( ID INT ) )
ANTLR3_UINT32 alt34;
@@ -5049,7 +5062,7 @@
switch (alt34)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:159:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:172:4: ID
{
MATCHT(ID, &FOLLOW_ID_in_numbered_ID589);
if (HASEXCEPTION())
@@ -5064,7 +5077,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:160:4: ^( ID INT )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:173:4: ^( ID INT )
{
MATCHT(ID, &FOLLOW_ID_in_numbered_ID595);
if (HASEXCEPTION())
@@ -5160,8 +5173,8 @@
// $ANTLR start synpred27_pngenerator
static void synpred27_pngenerator_fragment(ppngenerator ctx )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: ( primary )
- // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: primary
+ // /Users/bion/projects/iordache/translator/pngenerator.g:144:9: ( primary )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:144:9: primary
{
FOLLOWPUSH(FOLLOW_primary_in_synpred27_pngenerator380);
primary(ctx);
@@ -5189,8 +5202,8 @@
// $ANTLR start synpred28_pngenerator
static void synpred28_pngenerator_fragment(ppngenerator ctx )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ( ^( ADD additiveExpression additiveExpression ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ^( ADD additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:145:7: ( ^( ADD additiveExpression additiveExpression ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:145:7: ^( ADD additiveExpression additiveExpression )
{
MATCHT(ADD, &FOLLOW_ADD_in_synpred28_pngenerator389);
if (HASEXCEPTION())
@@ -5259,8 +5272,8 @@
// $ANTLR start synpred29_pngenerator
static void synpred29_pngenerator_fragment(ppngenerator ctx )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:149:9: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:149:9: ID
{
MATCHT(ID, &FOLLOW_ID_in_synpred29_pngenerator422);
if (HASEXCEPTION())
@@ -5285,8 +5298,8 @@
// $ANTLR start synpred30_pngenerator
static void synpred30_pngenerator_fragment(ppngenerator ctx )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: ( group_elements )
- // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:150:7: ( group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:150:7: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_synpred30_pngenerator430);
group_elements(ctx);
Modified: translator/pngenerator.g
===================================================================
--- translator/pngenerator.g 2009-06-17 22:08:28 UTC (rev 65)
+++ translator/pngenerator.g 2009-06-17 22:46:03 UTC (rev 66)
@@ -83,12 +83,25 @@
: ID {
ASSOC_ARRAY* places;
ASSOC_ARRAY* trans;
- pANTLR3_LIST list = processes->get(processes, $ID.text->chars);
+ pANTLR3_LIST list;
+ int i;
+ char* key;
+
+ list = processes->get(processes, $ID.text->chars);
$proc_definitions::proc = (process*) list->get(list, kPROC);
places = (ASSOC_ARRAY*) list->get(list, kPLACES);
trans = (ASSOC_ARRAY*) list->get(list, kTRANS);
pn = createpn("pnum tnum", (int) places->size(places), (int) trans->size(trans));
$proc_definitions::proc->pn = &pn;
+ //setup debug names
+ for(i = 0; i < places->size(places); i++) {
+ key = places->iterKeys(places, i);
+ updatepn(&pn, "place_name", i, key);
+ }
+ for(i = 0; i < trans->size(trans); i++) {
+ key = trans->iterKeys(trans, i);
+ updatepn(&pn, "trans_name", i, key);
+ }
};
trans_defs
: extern_trans_def
Modified: translator/pngenerator.h
===================================================================
--- translator/pngenerator.h 2009-06-17 22:08:28 UTC (rev 65)
+++ translator/pngenerator.h 2009-06-17 22:46:03 UTC (rev 66)
@@ -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-06-17 17:07:20
+ * - On : 2009-06-17 17:42:55
* - 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.
|
