[Pntool-developers] SF.net SVN: pntool:[65] translator
Brought to you by:
compaqdrew,
miordache
Menu
▾
▴
[Pntool-developers] SF.net SVN: pntool:[65] translator
|
From: <the...@us...> - 2009-06-17 22:08:31
|
Revision: 65
http://pntool.svn.sourceforge.net/pntool/?rev=65&view=rev
Author: thecodeweasel
Date: 2009-06-17 22:08:28 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
The associative arrays had to be more primitive :(
Restored functionality from r62
Modified Paths:
--------------
translator/dataStructures.c
translator/dataStructures.h
translator/pngenerator.c
translator/pngenerator.g
translator/pngenerator.h
translator/pnscript.g
translator/pnscriptLexer.c
translator/pnscriptLexer.h
translator/pnscriptParser.c
translator/pnscriptParser.h
Modified: translator/dataStructures.c
===================================================================
--- translator/dataStructures.c 2009-06-17 21:14:16 UTC (rev 64)
+++ translator/dataStructures.c 2009-06-17 22:08:28 UTC (rev 65)
@@ -10,6 +10,7 @@
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);
ASSOC_ARRAY* newAssocArray(ANTLR3_UINT32 sizeHint) {
ASSOC_ARRAY* ret;
@@ -27,56 +28,29 @@
ret->set = arraySet;
ret->free = arrayFree;
ret->size = arraySize;
+ ret->iter = arrayIter;
return ret;
}
-bool isInt(void* key) {
- if(sizeof(*key) == 4)
- return true;
- return false;
-}
-
void arrayDelete(ASSOC_ARRAY* array, void* key) {
- if(isInt(key)) {
- char* strKey;
- strKey = (char*) array->list->get(array->list, *((int*)key));
- array->list->del(array->list, *((int*)key));
- array->table->del(array->table, strKey);
- } else {
- int intKey;
- intKey = *((int*) array->table->get(array->table, (char*) key));
- array->list->del(array->list, intKey);
- array->table->del(array->table, (char*) key);
- }
+ int intKey;
+ intKey = *((int*) array->table->get(array->table, (char*) key));
+ array->list->del(array->list, intKey);
+ array->table->del(array->table, (char*) key);
}
void* arrayRemove(ASSOC_ARRAY* array, void* key) {
void* ret;
- if(isInt(key)) {
- char* strKey;
- strKey = (char*) array->list->get(array->list, *((int*)key));
- array->list->del(array->list, *((int*)key));
- ret = array->table->remove(array->table, strKey);
- } else {
- int intKey;
- intKey = *((int*) array->table->get(array->table, (char*) key));
- array->list->del(array->list, intKey);
- ret = array->table->remove(array->table, (char*) key);
- }
+ int intKey;
+ intKey = *((int*) array->table->get(array->table, (char*) key));
+ array->list->del(array->list, intKey);
+ ret = array->table->remove(array->table, (char*) key);
return ret;
}
void* arrayGet(ASSOC_ARRAY* array, void* key) {
- void* ret;
- if(isInt(key)) {
- char* strKey;
- strKey = (char*) array->list->get(array->list, *((int*)key));
- ret = array->table->get(array->table, strKey);
- } else {
- ret = array->table->get(array->table, (char*) key);
- }
- return ret;
+ return array->table->get(array->table, (char*) key);
}
ANTLR3_INT32 arrayAdd(ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)) {
@@ -93,20 +67,16 @@
ANTLR3_UINT32 ret;
char* strKey;
static int intKey;
+ int i;
- if(isInt((void*) key)) {
- intKey = *((int*) key);
- strKey = (char*) array->list->get(array->list, intKey);
- } else {
- int i;
- strKey = (char*) key;
- for(i = 0; i < array->list->size(array->list); i++) {
- if(strcmp((char*) array->list->get(array->list, i), strKey)) {
- intKey = i;
- break;
- }
+ strKey = (char*) key;
+ for(i = 0; i < array->list->size(array->list); i++) {
+ if(strcmp((char*) array->list->get(array->list, i), strKey)) {
+ intKey = i;
+ break;
}
}
+
array->list->set(array->list, intKey, strKey, NULL, false);
ret = array->table->put(array->table, strKey, element, freeptr);
return ret;
@@ -119,4 +89,8 @@
ANTLR3_UINT32 arraySize(ASSOC_ARRAY* array) {
return array->list->size(array->list);
+}
+
+void* arrayIter(ASSOC_ARRAY* array, int i) {
+ return array->table->get(array->table, (char*) array->list->get(array->list, i));
}
\ No newline at end of file
Modified: translator/dataStructures.h
===================================================================
--- translator/dataStructures.h 2009-06-17 21:14:16 UTC (rev 64)
+++ translator/dataStructures.h 2009-06-17 22:08:28 UTC (rev 65)
@@ -24,6 +24,7 @@
ANTLR3_UINT32 (*set) (struct ASSOC_ARRAY_struct* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*));
//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);
} ASSOC_ARRAY;
#endif
\ No newline at end of file
Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c 2009-06-17 21:14:16 UTC (rev 64)
+++ translator/pngenerator.c 2009-06-17 22:08:28 UTC (rev 65)
@@ -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 16:11:12
+ * - On : 2009-06-17 17:07:20
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
@@ -1574,9 +1574,13 @@
if ( BACKTRACKING==0 )
{
+ ASSOC_ARRAY* places;
+ ASSOC_ARRAY* trans;
pANTLR3_LIST list = processes->get(processes, (ID1->getText(ID1))->chars);
(SCOPE_TOP(proc_definitions))->proc= (process*) list->get(list, kPROC);
- // pn = createpn("pnum tnum", *((int*) list->get(list, kNUM_PLACES)), *((int*) list->get(list, kNUM_TRANS)));
+ 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;
}
@@ -1603,7 +1607,7 @@
/**
* $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:89:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:93:1: trans_defs : ( extern_trans_def | trans_def );
*/
static void
trans_defs(ppngenerator ctx)
@@ -1614,7 +1618,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:90:2: ( extern_trans_def | trans_def )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:94:2: ( extern_trans_def | trans_def )
ANTLR3_UINT32 alt8;
@@ -1652,7 +1656,7 @@
switch (alt8)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:90:4: extern_trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:94:4: extern_trans_def
{
FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs136);
extern_trans_def(ctx);
@@ -1670,7 +1674,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:91:4: trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:95:4: trans_def
{
FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs141);
trans_def(ctx);
@@ -1710,7 +1714,7 @@
/**
* $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:92:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:96:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) );
*/
static void
extern_trans_def(ppngenerator ctx)
@@ -1721,7 +1725,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:93:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:97:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) )
ANTLR3_UINT32 alt11;
@@ -1759,7 +1763,7 @@
switch (alt11)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:93:4: ^( TO ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:97:4: ^( TO ( ID )+ )
{
MATCHT(TO, &FOLLOW_TO_in_extern_trans_def151);
if (HASEXCEPTION())
@@ -1780,7 +1784,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:93:9: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:97:9: ( ID )+
{
int cnt9=0;
@@ -1853,7 +1857,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:94:4: ^( FROM ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:98:4: ^( FROM ( ID )+ )
{
MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def161);
if (HASEXCEPTION())
@@ -1874,7 +1878,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:94:11: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:98:11: ( ID )+
{
int cnt10=0;
@@ -1969,7 +1973,7 @@
/**
* $ANTLR start trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:95:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:99:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) );
*/
static void
trans_def(ppngenerator ctx)
@@ -1980,7 +1984,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:96:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:100:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) )
ANTLR3_UINT32 alt14;
@@ -2066,7 +2070,7 @@
switch (alt14)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:96:4: ^( ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:100:4: ^( ID CODE_BLOCK )
{
MATCHT(ID, &FOLLOW_ID_in_trans_def175);
if (HASEXCEPTION())
@@ -2110,7 +2114,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:97:4: ^( ID ( ID )+ ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:101:4: ^( ID ( ID )+ ( CODE_BLOCK )? )
{
MATCHT(ID, &FOLLOW_ID_in_trans_def184);
if (HASEXCEPTION())
@@ -2131,7 +2135,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:97:9: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:101:9: ( ID )+
{
int cnt12=0;
@@ -2191,7 +2195,7 @@
loop12: ; /* Jump to here if this rule does not match */
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:97:13: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:101:13: ( CODE_BLOCK )?
{
int alt13=2;
{
@@ -2257,7 +2261,7 @@
/**
* $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:98:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:102:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
*/
static void
select_functions(ppngenerator ctx)
@@ -2267,8 +2271,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:99:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:99:4: ^( SELECT_DEF ID CODE_BLOCK )
+ // /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 )
{
MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions200);
if (HASEXCEPTION())
@@ -2340,7 +2344,7 @@
/**
* $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:100:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:104:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
*/
static void
nondeterm(ppngenerator ctx)
@@ -2350,8 +2354,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:101:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:101:4: ^( 'nondeterministic places: ' ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:105:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:105:4: ^( 'nondeterministic places: ' ( ID )+ )
{
MATCHT(44, &FOLLOW_44_in_nondeterm215);
if (HASEXCEPTION())
@@ -2372,7 +2376,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:101:34: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:105:34: ( ID )+
{
int cnt15=0;
@@ -2464,7 +2468,7 @@
/**
* $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:103:1: proc_instantiations : ( proc_init | sync_def | proc_start );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:107:1: proc_instantiations : ( proc_init | sync_def | proc_start );
*/
static void
proc_instantiations(ppngenerator ctx)
@@ -2475,7 +2479,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:104:2: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:108:2: ( proc_init | sync_def | proc_start )
ANTLR3_UINT32 alt16;
@@ -2518,7 +2522,7 @@
switch (alt16)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:104:4: proc_init
+ // /Users/bion/projects/iordache/translator/pngenerator.g:108:4: proc_init
{
FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations229);
proc_init(ctx);
@@ -2536,7 +2540,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:104:16: sync_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:108:16: sync_def
{
FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations233);
sync_def(ctx);
@@ -2554,7 +2558,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:104:27: proc_start
+ // /Users/bion/projects/iordache/translator/pngenerator.g:108:27: proc_start
{
FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations237);
proc_start(ctx);
@@ -2594,7 +2598,7 @@
/**
* $ANTLR start proc_init
- * /Users/bion/projects/iordache/translator/pngenerator.g:105:1: proc_init : ^( ID ID ( numbered_ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:109:1: proc_init : ^( ID ID ( numbered_ID )+ ) ;
*/
static void
proc_init(ppngenerator ctx)
@@ -2604,8 +2608,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:106:2: ( ^( ID ID ( numbered_ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:106:4: ^( ID ID ( numbered_ID )+ )
+ // /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 )+ )
{
MATCHT(ID, &FOLLOW_ID_in_proc_init247);
if (HASEXCEPTION())
@@ -2635,7 +2639,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:106:12: ( numbered_ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:110:12: ( numbered_ID )+
{
int cnt17=0;
@@ -2730,7 +2734,7 @@
/**
* $ANTLR start sync_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:107:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:111:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
*/
static void
sync_def(ppngenerator ctx)
@@ -2740,8 +2744,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:108:2: ( ^( SYNC_TOK ( group_elements )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:108:4: ^( SYNC_TOK ( group_elements )+ )
+ // /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 )+ )
{
MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def263);
if (HASEXCEPTION())
@@ -2762,7 +2766,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:108:15: ( group_elements )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:112:15: ( group_elements )+
{
int cnt18=0;
@@ -2857,7 +2861,7 @@
/**
* $ANTLR start constraints
- * /Users/bion/projects/iordache/translator/pngenerator.g:110:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:114:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ;
*/
static void
constraints(ppngenerator ctx)
@@ -2867,8 +2871,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:111:2: ( ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:111:4: ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? )
+ // /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 )? )
{
FOLLOWPUSH(FOLLOW_constraint_block_in_constraints278);
constraint_block(ctx);
@@ -2894,7 +2898,7 @@
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:111:23: ( eq )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:115:23: ( eq )*
for (;;)
{
@@ -2938,7 +2942,7 @@
loop19: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:111:27: ( live_def )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:115:27: ( live_def )?
{
int alt20=2;
{
@@ -2972,7 +2976,7 @@
}
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:111:37: ( uncontrol )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:115:37: ( uncontrol )?
{
int alt21=2;
{
@@ -3006,7 +3010,7 @@
}
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:111:48: ( unobserve )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:115:48: ( unobserve )?
{
int alt22=2;
{
@@ -3073,7 +3077,7 @@
/**
* $ANTLR start proc_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:113:1: proc_start : ^( START ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:117:1: proc_start : ^( START ( ID )+ ) ;
*/
static void
proc_start(ppngenerator ctx)
@@ -3083,8 +3087,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:114:2: ( ^( START ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:114:4: ^( START ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:118:2: ( ^( START ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:118:4: ^( START ( ID )+ )
{
MATCHT(START, &FOLLOW_START_in_proc_start302);
if (HASEXCEPTION())
@@ -3105,7 +3109,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:114:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:118:12: ( ID )+
{
int cnt23=0;
@@ -3197,7 +3201,7 @@
/**
* $ANTLR start constraint_block
- * /Users/bion/projects/iordache/translator/pngenerator.g:115:2: constraint_block : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:119:2: constraint_block : ID ;
*/
static void
constraint_block(ppngenerator ctx)
@@ -3207,8 +3211,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:116:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:116:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:120:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:120:4: ID
{
MATCHT(ID, &FOLLOW_ID_in_constraint_block315);
if (HASEXCEPTION())
@@ -3242,7 +3246,7 @@
/**
* $ANTLR start eq
- * /Users/bion/projects/iordache/translator/pngenerator.g:118:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:122:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) );
*/
static void
eq(ppngenerator ctx)
@@ -3253,7 +3257,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:119:2: ( relationalExpression | ^( EQS_OP eq eq ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:123:2: ( relationalExpression | ^( EQS_OP eq eq ) )
ANTLR3_UINT32 alt24;
@@ -3291,7 +3295,7 @@
switch (alt24)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:119:4: relationalExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:123:4: relationalExpression
{
FOLLOWPUSH(FOLLOW_relationalExpression_in_eq325);
relationalExpression(ctx);
@@ -3309,7 +3313,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:120:4: ^( EQS_OP eq eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:124:4: ^( EQS_OP eq eq )
{
MATCHT(EQS_OP, &FOLLOW_EQS_OP_in_eq331);
if (HASEXCEPTION())
@@ -3390,7 +3394,7 @@
/**
* $ANTLR start relationalExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:122:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:126:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) );
*/
static void
relationalExpression(ppngenerator ctx)
@@ -3401,7 +3405,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:123:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:127:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) )
ANTLR3_UINT32 alt25;
@@ -3439,7 +3443,7 @@
switch (alt25)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:123:9: additiveExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: additiveExpression
{
FOLLOWPUSH(FOLLOW_additiveExpression_in_relationalExpression351);
additiveExpression(ctx);
@@ -3457,7 +3461,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:124:7: ^( EQ_OP relationalExpression relationalExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( EQ_OP relationalExpression relationalExpression )
{
MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression360);
if (HASEXCEPTION())
@@ -3538,7 +3542,7 @@
/**
* $ANTLR start additiveExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:126:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:130:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) );
*/
static void
additiveExpression(ppngenerator ctx)
@@ -3549,7 +3553,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:127:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:131:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) )
ANTLR3_UINT32 alt26;
@@ -3651,7 +3655,7 @@
switch (alt26)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: primary
+ // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: primary
{
FOLLOWPUSH(FOLLOW_primary_in_additiveExpression380);
primary(ctx);
@@ -3669,7 +3673,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( ADD additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ^( ADD additiveExpression additiveExpression )
{
MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression389);
if (HASEXCEPTION())
@@ -3728,7 +3732,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:129:7: ^( SUB additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: ^( SUB additiveExpression additiveExpression )
{
MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression403);
if (HASEXCEPTION())
@@ -3809,7 +3813,7 @@
/**
* $ANTLR start primary
- * /Users/bion/projects/iordache/translator/pngenerator.g:131:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:135:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) );
*/
static void
primary(ppngenerator ctx)
@@ -3820,7 +3824,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:132:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:136:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) )
ANTLR3_UINT32 alt27;
@@ -3906,7 +3910,7 @@
switch (alt27)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:132:9: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ID
{
MATCHT(ID, &FOLLOW_ID_in_primary422);
if (HASEXCEPTION())
@@ -3921,7 +3925,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_primary430);
group_elements(ctx);
@@ -3939,7 +3943,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:134:7: NUM
+ // /Users/bion/projects/iordache/translator/pngenerator.g:138:7: NUM
{
MATCHT(NUM, &FOLLOW_NUM_in_primary438);
if (HASEXCEPTION())
@@ -3954,7 +3958,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:135:7: ^( MULT NUM primary )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:139:7: ^( MULT NUM primary )
{
MATCHT(MULT, &FOLLOW_MULT_in_primary447);
if (HASEXCEPTION())
@@ -4010,7 +4014,7 @@
}
break;
case 5:
- // /Users/bion/projects/iordache/translator/pngenerator.g:136:7: ^( ADD additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:140:7: ^( ADD additiveExpression additiveExpression )
{
MATCHT(ADD, &FOLLOW_ADD_in_primary461);
if (HASEXCEPTION())
@@ -4069,7 +4073,7 @@
}
break;
case 6:
- // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: ^( SUB additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:141:7: ^( SUB additiveExpression additiveExpression )
{
MATCHT(SUB, &FOLLOW_SUB_in_primary475);
if (HASEXCEPTION())
@@ -4150,7 +4154,7 @@
/**
* $ANTLR start live_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:138:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:142:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
*/
static void
live_def(ppngenerator ctx)
@@ -4161,7 +4165,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:139:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:143:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
ANTLR3_UINT32 alt30;
@@ -4247,7 +4251,7 @@
switch (alt30)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:139:4: ^( LIVE ALL ( ID )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:143:4: ^( LIVE ALL ( ID )* )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def490);
if (HASEXCEPTION())
@@ -4278,7 +4282,7 @@
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:139:15: ( ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:143:15: ( ID )*
for (;;)
{
@@ -4332,7 +4336,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:140:4: ^( LIVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:144:4: ^( LIVE ( ID )+ )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def502);
if (HASEXCEPTION())
@@ -4353,7 +4357,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:140:11: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:144:11: ( ID )+
{
int cnt29=0;
@@ -4448,7 +4452,7 @@
/**
* $ANTLR start uncontrol
- * /Users/bion/projects/iordache/translator/pngenerator.g:141:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:145:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
*/
static void
uncontrol(ppngenerator ctx)
@@ -4458,8 +4462,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:142:2: ( ^( UNCONTROL ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:142:4: ^( UNCONTROL ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:146:2: ( ^( UNCONTROL ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:146:4: ^( UNCONTROL ( ID )+ )
{
MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol516);
if (HASEXCEPTION())
@@ -4480,7 +4484,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:142:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:146:16: ( ID )+
{
int cnt31=0;
@@ -4572,7 +4576,7 @@
/**
* $ANTLR start unobserve
- * /Users/bion/projects/iordache/translator/pngenerator.g:143:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:147:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
*/
static void
unobserve(ppngenerator ctx)
@@ -4582,8 +4586,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:144:2: ( ^( UNOBSERVE ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:144:4: ^( UNOBSERVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:148:2: ( ^( UNOBSERVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:148:4: ^( UNOBSERVE ( ID )+ )
{
MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve530);
if (HASEXCEPTION())
@@ -4604,7 +4608,7 @@
{
return ;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:144:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:148:16: ( ID )+
{
int cnt32=0;
@@ -4696,7 +4700,7 @@
/**
* $ANTLR start other_commands
- * /Users/bion/projects/iordache/translator/pngenerator.g:146:1: other_commands : print ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:150:1: other_commands : print ;
*/
static void
other_commands(ppngenerator ctx)
@@ -4706,8 +4710,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:147:2: ( print )
- // /Users/bion/projects/iordache/translator/pngenerator.g:147:4: print
+ // /Users/bion/projects/iordache/translator/pngenerator.g:151:2: ( print )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:151:4: print
{
FOLLOWPUSH(FOLLOW_print_in_other_commands544);
print(ctx);
@@ -4744,7 +4748,7 @@
/**
* $ANTLR start print
- * /Users/bion/projects/iordache/translator/pngenerator.g:148:1: print : ^( PRINT ID group_elements ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:152:1: print : ^( PRINT ID group_elements ) ;
*/
static void
print(ppngenerator ctx)
@@ -4754,8 +4758,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:149:2: ( ^( PRINT ID group_elements ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:149:4: ^( PRINT ID group_elements )
+ // /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 )
{
MATCHT(PRINT, &FOLLOW_PRINT_in_print554);
if (HASEXCEPTION())
@@ -4830,7 +4834,7 @@
/**
* $ANTLR start group_elements
- * /Users/bion/projects/iordache/translator/pngenerator.g:151:1: group_elements : ( ID | ^( DOT group_elements ID ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:155:1: group_elements : ( ID | ^( DOT group_elements ID ) );
*/
static void
group_elements(ppngenerator ctx)
@@ -4841,7 +4845,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:152:2: ( ID | ^( DOT group_elements ID ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:156:2: ( ID | ^( DOT group_elements ID ) )
ANTLR3_UINT32 alt33;
@@ -4879,7 +4883,7 @@
switch (alt33)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:152:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ID
{
MATCHT(ID, &FOLLOW_ID_in_group_elements569);
if (HASEXCEPTION())
@@ -4894,7 +4898,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:153:4: ^( DOT group_elements ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: ^( DOT group_elements ID )
{
MATCHT(DOT, &FOLLOW_DOT_in_group_elements575);
if (HASEXCEPTION())
@@ -4972,7 +4976,7 @@
/**
* $ANTLR start numbered_ID
- * /Users/bion/projects/iordache/translator/pngenerator.g:154:1: numbered_ID : ( ID | ^( ID INT ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:158:1: numbered_ID : ( ID | ^( ID INT ) );
*/
static void
numbered_ID(ppngenerator ctx)
@@ -4983,7 +4987,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:155:2: ( ID | ^( ID INT ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:2: ( ID | ^( ID INT ) )
ANTLR3_UINT32 alt34;
@@ -5045,7 +5049,7 @@
switch (alt34)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:155:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:159:4: ID
{
MATCHT(ID, &FOLLOW_ID_in_numbered_ID589);
if (HASEXCEPTION())
@@ -5060,7 +5064,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ^( ID INT )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:160:4: ^( ID INT )
{
MATCHT(ID, &FOLLOW_ID_in_numbered_ID595);
if (HASEXCEPTION())
@@ -5156,8 +5160,8 @@
// $ANTLR start synpred27_pngenerator
static void synpred27_pngenerator_fragment(ppngenerator ctx )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: ( primary )
- // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: primary
+ // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: ( primary )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: primary
{
FOLLOWPUSH(FOLLOW_primary_in_synpred27_pngenerator380);
primary(ctx);
@@ -5185,8 +5189,8 @@
// $ANTLR start synpred28_pngenerator
static void synpred28_pngenerator_fragment(ppngenerator ctx )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ( ^( ADD additiveExpression additiveExpression ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( ADD additiveExpression additiveExpression )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ( ^( ADD additiveExpression additiveExpression ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ^( ADD additiveExpression additiveExpression )
{
MATCHT(ADD, &FOLLOW_ADD_in_synpred28_pngenerator389);
if (HASEXCEPTION())
@@ -5255,8 +5259,8 @@
// $ANTLR start synpred29_pngenerator
static void synpred29_pngenerator_fragment(ppngenerator ctx )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:132:9: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:132:9: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ID
{
MATCHT(ID, &FOLLOW_ID_in_synpred29_pngenerator422);
if (HASEXCEPTION())
@@ -5281,8 +5285,8 @@
// $ANTLR start synpred30_pngenerator
static void synpred30_pngenerator_fragment(ppngenerator ctx )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: ( group_elements )
- // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: ( group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_synpred30_pngenerator430);
group_elements(ctx);
Modified: translator/pngenerator.g
===================================================================
--- translator/pngenerator.g 2009-06-17 21:14:16 UTC (rev 64)
+++ translator/pngenerator.g 2009-06-17 22:08:28 UTC (rev 65)
@@ -81,9 +81,13 @@
static pns pn;
}
: ID {
+ ASSOC_ARRAY* places;
+ ASSOC_ARRAY* trans;
pANTLR3_LIST list = processes->get(processes, $ID.text->chars);
$proc_definitions::proc = (process*) list->get(list, kPROC);
-// pn = createpn("pnum tnum", *((int*) list->get(list, kNUM_PLACES)), *((int*) list->get(list, kNUM_TRANS)));
+ 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;
};
trans_defs
Modified: translator/pngenerator.h
===================================================================
--- translator/pngenerator.h 2009-06-17 21:14:16 UTC (rev 64)
+++ translator/pngenerator.h 2009-06-17 22:08:28 UTC (rev 65)
@@ -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 16:11:12
+ * - On : 2009-06-17 17:07:20
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
Modified: translator/pnscript.g
===================================================================
--- translator/pnscript.g 2009-06-17 21:14:16 UTC (rev 64)
+++ translator/pnscript.g 2009-06-17 22:08:28 UTC (rev 65)
@@ -78,13 +78,15 @@
}
: proc_declarations!+ proc_definitions+ {
//make sure every process was defined
-/* int i;
+ int i;
pANTLR3_LIST list;
process* proc;
- char* key;
- for(i = 0; i < procDeclarations->size(procDeclarations); i++) {
- key = (char*) procDeclarations->get(procDeclarations, i);
- list = (pANTLR3_LIST) processes->get(processes, key);
+ for(i = 0; i < processes->size(processes); i++) {
+ list = (pANTLR3_LIST) processes->iter(processes, i);
+ if(list == NULL) {
+ printf("List is null...:(\n");
+ continue;
+ }
proc = (process*) list->get(list, kPROC);
if(proc->start) {
proc->start = false;
@@ -92,7 +94,7 @@
fprintf(stderr, "ERROR: Process \%s declared but not defined...?\n", (char*) list->get(list, kNAME));
exit(1);
}
- }*/
+ }
} proc_instantiations+ constraints* other_commands*;
//-------------------
proc_declarations
Modified: translator/pnscriptLexer.c
===================================================================
--- translator/pnscriptLexer.c 2009-06-17 21:14:16 UTC (rev 64)
+++ translator/pnscriptLexer.c 2009-06-17 22:08:28 UTC (rev 65)
@@ -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/pnscript.g
- * - On : 2009-06-17 16:10:42
+ * - On : 2009-06-17 17:02:21
* - for the lexer : pnscriptLexerLexer *
* Editing it, at least manually, is not wise.
*
@@ -1275,7 +1275,7 @@
}
// $ANTLR end T__45
-// Comes from: 494:2: ( 'extern' )
+// Comes from: 496:2: ( 'extern' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start EXTERN
@@ -1295,8 +1295,8 @@
_type = EXTERN;
- // /Users/bion/projects/iordache/translator/pnscript.g:494:2: ( 'extern' )
- // /Users/bion/projects/iordache/translator/pnscript.g:494:4: 'extern'
+ // /Users/bion/projects/iordache/translator/pnscript.g:496:2: ( 'extern' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:496:4: 'extern'
{
MATCHS(lit_4);
if (HASEXCEPTION())
@@ -1318,7 +1318,7 @@
}
// $ANTLR end EXTERN
-// Comes from: 496:2: ( 'process' )
+// Comes from: 498:2: ( 'process' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start PROCESS
@@ -1338,8 +1338,8 @@
_type = PROCESS;
- // /Users/bion/projects/iordache/translator/pnscript.g:496:2: ( 'process' )
- // /Users/bion/projects/iordache/translator/pnscript.g:496:4: 'process'
+ // /Users/bion/projects/iordache/translator/pnscript.g:498:2: ( 'process' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:498:4: 'process'
{
MATCHS(lit_5);
if (HASEXCEPTION())
@@ -1361,7 +1361,7 @@
}
// $ANTLR end PROCESS
-// Comes from: 498:2: ( 'build' ':' )
+// Comes from: 500:2: ( 'build' ':' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start BUILD
@@ -1381,8 +1381,8 @@
_type = BUILD;
- // /Users/bion/projects/iordache/translator/pnscript.g:498:2: ( 'build' ':' )
- // /Users/bion/projects/iordache/translator/pnscript.g:498:4: 'build' ':'
+ // /Users/bion/projects/iordache/translator/pnscript.g:500:2: ( 'build' ':' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:500:4: 'build' ':'
{
MATCHS(lit_6);
if (HASEXCEPTION())
@@ -1410,7 +1410,7 @@
}
// $ANTLR end BUILD
-// Comes from: 500:2: ( 'include' ':' )
+// Comes from: 502:2: ( 'include' ':' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start INCLUDE
@@ -1430,8 +1430,8 @@
_type = INCLUDE;
- // /Users/bion/projects/iordache/translator/pnscript.g:500:2: ( 'include' ':' )
- // /Users/bion/projects/iordache/translator/pnscript.g:500:4: 'include' ':'
+ // /Users/bion/projects/iordache/translator/pnscript.g:502:2: ( 'include' ':' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:502:4: 'include' ':'
{
MATCHS(lit_7);
if (HASEXCEPTION())
@@ -1459,7 +1459,7 @@
}
// $ANTLR end INCLUDE
-// Comes from: 503:2: ( '.PN:' )
+// Comes from: 505:2: ( '.PN:' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start PNDEF
@@ -1479,8 +1479,8 @@
_type = PNDEF;
- // /Users/bion/projects/iordache/translator/pnscript.g:503:2: ( '.PN:' )
- // /Users/bion/projects/iordache/translator/pnscript.g:503:4: '.PN:'
+ // /Users/bion/projects/iordache/translator/pnscript.g:505:2: ( '.PN:' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:505:4: '.PN:'
{
MATCHS(lit_8);
if (HASEXCEPTION())
@@ -1502,7 +1502,7 @@
}
// $ANTLR end PNDEF
-// Comes from: 505:2: ( 'places' ':' )
+// Comes from: 507:2: ( 'places' ':' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start PLACES
@@ -1522,8 +1522,8 @@
_type = PLACES;
- // /Users/bion/projects/iordache/translator/pnscript.g:505:2: ( 'places' ':' )
- // /Users/bion/projects/iordache/translator/pnscript.g:505:4: 'places' ':'
+ // /Users/bion/projects/iordache/translator/pnscript.g:507:2: ( 'places' ':' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:507:4: 'places' ':'
{
MATCHS(lit_9);
if (HASEXCEPTION())
@@ -1551,7 +1551,7 @@
}
// $ANTLR end PLACES
-// Comes from: 507:2: ( 'trans' ( 'itions' )? ':' )
+// Comes from: 509:2: ( 'trans' ( 'itions' )? ':' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start TRANS
@@ -1571,8 +1571,8 @@
_type = TRANS;
- // /Users/bion/projects/iordache/translator/pnscript.g:507:2: ( 'trans' ( 'itions' )? ':' )
- // /Users/bion/projects/iordache/translator/pnscript.g:507:4: 'trans' ( 'itions' )? ':'
+ // /Users/bion/projects/iordache/translator/pnscript.g:509:2: ( 'trans' ( 'itions' )? ':' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:509:4: 'trans' ( 'itions' )? ':'
{
MATCHS(lit_10);
if (HASEXCEPTION())
@@ -1582,7 +1582,7 @@
- // /Users/bion/projects/iordache/translator/pnscript.g:507:12: ( 'itions' )?
+ // /Users/bion/projects/iordache/translator/pnscript.g:509:12: ( 'itions' )?
{
int alt1=2;
{
@@ -1595,7 +1595,7 @@
switch (alt1)
{
case 1:
- // /Users/bion/projects/iordache/translator/pnscript.g:507:12: 'itions'
+ // /Users/bion/projects/iordache/translator/pnscript.g:509:12: 'itions'
{
MATCHS(lit_11);
if (HASEXCEPTION())
@@ -1629,7 +1629,7 @@
}
// $ANTLR end TRANS
-// Comes from: 509:2: ( '.code:' )
+// Comes from: 511:2: ( '.code:' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start CODE
@@ -1649,8 +1649,8 @@
_type = CODE;
- // /Users/bion/projects/iordache/translator/pnscript.g:509:2: ( '.code:' )
- // /Users/bion/projects/iordache/translator/pnscript.g:509:4: '.code:'
+ // /Users/bion/projects/iordache/translator/pnscript.g:511:2: ( '.code:' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:511:4: '.code:'
{
MATCHS(lit_12);
if (HASEXCEPTION())
@@ -1672,7 +1672,7 @@
}
// $ANTLR end CODE
-// Comes from: 511:2: ( 'select function' )
+// Comes from: 513:2: ( 'select function' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start SELECT_DEF
@@ -1692,8 +1692,8 @@
_type = SELECT_DEF;
- // /Users/bion/projects/iordache/translator/pnscript.g:511:2: ( 'select function' )
- // /Users/bion/projects/iordache/translator/pnscript.g:511:4: 'select function'
+ // /Users/bion/projects/iordache/translator/pnscript.g:513:2: ( 'select function' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:513:4: 'select function'
{
MATCHS(lit_13);
if (HASEXCEPTION())
@@ -1715,7 +1715,7 @@
}
// $ANTLR end SELECT_DEF
-// Comes from: 514:2: ( 'sync' )
+// Comes from: 516:2: ( 'sync' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start SYNC_TOK
@@ -1735,8 +1735,8 @@
_type = SYNC_TOK;
- // /Users/bion/projects/iordache/translator/pnscript.g:514:2: ( 'sync' )
- // /Users/bion/projects/iordache/translator/pnscript.g:514:4: 'sync'
+ // /Users/bion/projects/iordache/translator/pnscript.g:516:2: ( 'sync' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:516:4: 'sync'
{
MATCHS(lit_14);
if (HASEXCEPTION())
@@ -1758,7 +1758,7 @@
}
// $ANTLR end SYNC_TOK
-// Comes from: 516:2: ( 'start' )
+// Comes from: 518:2: ( 'start' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start START
@@ -1778,8 +1778,8 @@
_type = START;
- // /Users/bion/projects/iordache/translator/pnscript.g:516:2: ( 'start' )
- // /Users/bion/projects/iordache/translator/pnscript.g:516:4: 'start'
+ // /Users/bion/projects/iordache/translator/pnscript.g:518:2: ( 'start' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:518:4: 'start'
{
MATCHS(lit_15);
if (HASEXCEPTION())
@@ -1801,7 +1801,7 @@
}
// $ANTLR end START
-// Comes from: 519:2: ( '.constraints:' )
+// Comes from: 521:2: ( '.constraints:' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start CONSTRAINTS
@@ -1821,8 +1821,8 @@
_type = CONSTRAINTS;
- // /Users/bion/projects/iordache/translator/pnscript.g:519:2: ( '.constraints:' )
- // /Users/bion/projects/iordache/translator/pnscript.g:519:4: '.constraints:'
+ // /Users/bion/projects/iordache/translator/pnscript.g:521:2: ( '.constraints:' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:521:4: '.constraints:'
{
MATCHS(lit_16);
if (HASEXCEPTION())
@@ -1844,7 +1844,7 @@
}
// $ANTLR end CONSTRAINTS
-// Comes from: 521:2: ( '||' | '&&' | 'or' | 'OR' | 'and' | 'AND' )
+// Comes from: 523:2: ( '||' | '&&' | 'or' | 'OR' | 'and' | 'AND' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start EQS_OP
@@ -1865,7 +1865,7 @@
{
- // /Users/bion/projects/iordache/translator/pnscript.g:521:2: ( '||' | '&&' | 'or' | 'OR' | 'and' | 'AND' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:523:2: ( '||' | '&&' | 'or' | 'OR' | 'and' | 'AND' )
ANTLR3_UINT32 alt2;
@@ -1918,7 +1918,7 @@
switch (alt2)
{
case 1:
- // /Users/bion/projects/iordache/translator/pnscript.g:521:4: '||'
+ // /Users/bion/projects/iordache/translator/pnscript.g:523:4: '||'
{
MATCHS(lit_17);
if (HASEXCEPTION())
@@ -1931,7 +1931,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pnscript.g:521:9: '&&'
+ // /Users/bion/projects/iordache/translator/pnscript.g:523:9: '&&'
{
MATCHS(lit_18);
if (HASEXCEPTION())
@@ -1944,7 +1944,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pnscript.g:521:14: 'or'
+ // /Users/bion/projects/iordache/translator/pnscript.g:523:14: 'or'
{
MATCHS(lit_19);
if (HASEXCEPTION())
@@ -1957,7 +1957,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pnscript.g:521:19: 'OR'
+ // /Users/bion/projects/iordache/translator/pnscript.g:523:19: 'OR'
{
MATCHS(lit_20);
if (HASEXCEPTION())
@@ -1970,7 +1970,7 @@
}
break;
case 5:
- // /Users/bion/projects/iordache/translator/pnscript.g:521:24: 'and'
+ // /Users/bion/projects/iordache/translator/pnscript.g:523:24: 'and'
{
MATCHS(lit_21);
if (HASEXCEPTION())
@@ -1983,7 +1983,7 @@
}
break;
case 6:
- // /Users/bion/projects/iordache/translator/pnscript.g:521:30: 'AND'
+ // /Users/bion/projects/iordache/translator/pnscript.g:523:30: 'AND'
{
MATCHS(lit_22);
if (HASEXCEPTION())
@@ -2008,7 +2008,7 @@
}
// $ANTLR end EQS_OP
-// Comes from: 523:2: ( '<' | '<=' | '=' | '!=' | '>=' | '>' )
+// Comes from: 525:2: ( '<' | '<=' | '=' | '!=' | '>=' | '>' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start EQ_OP
@@ -2029,7 +2029,7 @@
{
- // /Users/bion/projects/iordache/translator/pnscript.g:523:2: ( '<' | '<=' | '=' | '!=' | '>=' | '>' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:525:2: ( '<' | '<=' | '=' | '!=' | '>=' | '>' )
ANTLR3_UINT32 alt3;
@@ -2092,7 +2092,7 @@
switch (alt3)
{
case 1:
- // /Users/bion/projects/iordache/translator/pnscript.g:523:4: '<'
+ // /Users/bion/projects/iordache/translator/pnscript.g:525:4: '<'
{
MATCHC('<');
if (HASEXCEPTION())
@@ -2104,7 +2104,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pnscript.g:523:8: '<='
+ // /Users/bion/projects/iordache/translator/pnscript.g:525:8: '<='
{
MATCHS(lit_23);
if (HASEXCEPTION())
@@ -2117,7 +2117,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pnscript.g:523:13: '='
+ // /Users/bion/projects/iordache/translator/pnscript.g:525:13: '='
{
MATCHC('=');
if (HASEXCEPTION())
@@ -2129,7 +2129,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pnscript.g:523:17: '!='
+ // /Users/bion/projects/iordache/translator/pnscript.g:525:17: '!='
{
MATCHS(lit_24);
if (HASEXCEPTION())
@@ -2142,7 +2142,7 @@
}
break;
case 5:
- // /Users/bion/projects/iordache/translator/pnscript.g:523:22: '>='
+ // /Users/bion/projects/iordache/translator/pnscript.g:525:22: '>='
{
MATCHS(lit_25);
if (HASEXCEPTION())
@@ -2155,7 +2155,7 @@
}
break;
case 6:
- // /Users/bion/projects/iordache/translator/pnscript.g:523:27: '>'
+ // /Users/bion/projects/iordache/translator/pnscript.g:525:27: '>'
{
MATCHC('>');
if (HASEXCEPTION())
@@ -2179,7 +2179,7 @@
}
// $ANTLR end EQ_OP
-// Comes from: 525:2: ( '*' )
+// Comes from: 527:2: ( '*' )
/** \brief Lexer rule generated by ANTLR3
*
* $ANTLR start MULT
@@ -2199,8 +2199,8 @@
_type = MULT;
- // /Users/bion/projects/iordache/translator/pnscript.g:525:2: ( '*' )
- // /Users/bion/projects/iordache/translator/pnscript.g:525:4: '*'
+ // /Users/bion/projects/iordache/translator/pnscript.g:527:2: ( '*' )
+ // /Users/bion/projects/iordache/translator/pnscript.g:527:4: '*'
{
MATCHC('*');
if (HASEXCEPTION())
@@ -2221,7 +2221,7 @@
}
// $ANTLR end MULT
-// Co...
[truncated message content] |
