Replacing 'st_table' by 'st__table' to resolve linker problems.

6 files changed, 40 insertions, 40 deletions

diff --git a/src/base/cmd/cmd.c b/src/base/cmd/cmd.c
index 3180c3e4..bb6ba3dd 100644
--- a/src/base/cmd/cmd.c
+++ b/src/base/cmd/cmd.c
@@ -75,9 +75,9 @@ extern int Cmd_CommandAbcLoadPlugIn( Abc_Frame_t * pAbc, int argc, char ** argv
 ******************************************************************************/
 void Cmd_Init( Abc_Frame_t * pAbc )
 { 
-    pAbc->tCommands = st_init_table(strcmp, st_strhash);
-    pAbc->tAliases  = st_init_table(strcmp, st_strhash);
-    pAbc->tFlags    = st_init_table(strcmp, st_strhash);
+    pAbc->tCommands = st__init_table(strcmp, st__strhash);
+    pAbc->tAliases  = st__init_table(strcmp, st__strhash);
+    pAbc->tFlags    = st__init_table(strcmp, st__strhash);
     pAbc->aHistory  = Vec_PtrAlloc( 100 );
     Cmd_HistoryRead( pAbc );
 
@@ -120,25 +120,25 @@ void Cmd_Init( Abc_Frame_t * pAbc )
 ******************************************************************************/
 void Cmd_End( Abc_Frame_t * pAbc )
 {
-    st_generator * gen;
+    st__generator * gen;
     char * pKey, * pValue;
     Cmd_HistoryWrite( pAbc, ABC_INFINITY );
 
-//    st_free_table( pAbc->tCommands, (void (*)()) 0, CmdCommandFree );
-//    st_free_table( pAbc->tAliases,  (void (*)()) 0, CmdCommandAliasFree );
-//    st_free_table( pAbc->tFlags,    free, free );
+//    st__free_table( pAbc->tCommands, (void (*)()) 0, CmdCommandFree );
+//    st__free_table( pAbc->tAliases,  (void (*)()) 0, CmdCommandAliasFree );
+//    st__free_table( pAbc->tFlags,    free, free );
 
-    st_foreach_item( pAbc->tCommands, gen, (const char **)&pKey, (char **)&pValue )
+    st__foreach_item( pAbc->tCommands, gen, (const char **)&pKey, (char **)&pValue )
         CmdCommandFree( (Abc_Command *)pValue );
-    st_free_table( pAbc->tCommands );
+    st__free_table( pAbc->tCommands );
 
-    st_foreach_item( pAbc->tAliases, gen, (const char **)&pKey, (char **)&pValue )
+    st__foreach_item( pAbc->tAliases, gen, (const char **)&pKey, (char **)&pValue )
         CmdCommandAliasFree( (Abc_Alias *)pValue );
-    st_free_table( pAbc->tAliases );
+    st__free_table( pAbc->tAliases );
 
-    st_foreach_item( pAbc->tFlags, gen, (const char **)&pKey, (char **)&pValue )
+    st__foreach_item( pAbc->tFlags, gen, (const char **)&pKey, (char **)&pValue )
         ABC_FREE( pKey ), ABC_FREE( pValue );
-    st_free_table( pAbc->tFlags );
+    st__free_table( pAbc->tFlags );
 
     Vec_PtrFreeFree( pAbc->aHistory );
 }
@@ -420,14 +420,14 @@ int CmdCommandAlias( Abc_Frame_t * pAbc, int argc, char **argv )
     }
     else if ( argc == 2 )
     {
-        if ( st_lookup( pAbc->tAliases, argv[1], &value ) )
+        if ( st__lookup( pAbc->tAliases, argv[1], &value ) )
             CmdCommandAliasPrint( pAbc, ( Abc_Alias * ) value );
         return 0;
     }
 
     // delete any existing alias 
     key = argv[1];
-    if ( st_delete( pAbc->tAliases, &key, &value ) )
+    if ( st__delete( pAbc->tAliases, &key, &value ) )
         CmdCommandAliasFree( ( Abc_Alias * ) value );
     CmdCommandAliasAdd( pAbc, argv[1], argc - 2, argv + 2 );
     return 0;
@@ -477,7 +477,7 @@ int CmdCommandUnalias( Abc_Frame_t * pAbc, int argc, char **argv )
     for ( i = 1; i < argc; i++ )
     {
         key = argv[i];
-        if ( st_delete( pAbc->tAliases, &key, &value ) )
+        if ( st__delete( pAbc->tAliases, &key, &value ) )
         {
             CmdCommandAliasFree( ( Abc_Alias * ) value );
         }
@@ -762,7 +762,7 @@ int CmdCommandSetVariable( Abc_Frame_t * pAbc, int argc, char **argv )
     else
     {
         key = argv[1];
-        if ( st_delete( pAbc->tFlags, &key, &value ) )
+        if ( st__delete( pAbc->tFlags, &key, &value ) )
         {
             ABC_FREE( key );
             ABC_FREE( value );
@@ -770,7 +770,7 @@ int CmdCommandSetVariable( Abc_Frame_t * pAbc, int argc, char **argv )
 
         flag_value = argc == 2 ? Extra_UtilStrsav( "" ) : Extra_UtilStrsav( argv[2] );
 //        flag_value = argc == 2 ? NULL : Extra_UtilStrsav(argv[2]);
-        st_insert( pAbc->tFlags, Extra_UtilStrsav(argv[1]), flag_value );
+        st__insert( pAbc->tFlags, Extra_UtilStrsav(argv[1]), flag_value );
 
         if ( strcmp( argv[1], "abcout" ) == 0 )
         {
@@ -861,7 +861,7 @@ int CmdCommandUnsetVariable( Abc_Frame_t * pAbc, int argc, char **argv )
     for ( i = 1; i < argc; i++ )
     {
         key = argv[i];
-        if ( st_delete( pAbc->tFlags, &key, &value ) )
+        if ( st__delete( pAbc->tFlags, &key, &value ) )
         {
             ABC_FREE( key );
             ABC_FREE( value );
diff --git a/src/base/cmd/cmdAlias.c b/src/base/cmd/cmdAlias.c
index 5afef7c8..d3ac4194 100644
--- a/src/base/cmd/cmdAlias.c
+++ b/src/base/cmd/cmdAlias.c
@@ -54,7 +54,7 @@ void CmdCommandAliasAdd( Abc_Frame_t * pAbc, char * sName, int argc, char ** arg
     pAlias->argv = ABC_ALLOC(char *, pAlias->argc);
     for(i = 0; i < argc; i++) 
         pAlias->argv[i] = Extra_UtilStrsav(argv[i]);
-    fStatus = st_insert( pAbc->tAliases, pAlias->sName, (char *) pAlias );
+    fStatus = st__insert( pAbc->tAliases, pAlias->sName, (char *) pAlias );
     assert(!fStatus);  
 }
 
@@ -93,7 +93,7 @@ char * CmdCommandAliasLookup( Abc_Frame_t * pAbc, char * sCommand )
 {
   Abc_Alias * pAlias;
   char * value;
-  if (!st_lookup( pAbc->tAliases, sCommand, &value)) 
+  if (! st__lookup( pAbc->tAliases, sCommand, &value)) 
     return sCommand;
   pAlias = (Abc_Alias *) value;
   return pAlias->argv[0];
diff --git a/src/base/cmd/cmdApi.c b/src/base/cmd/cmdApi.c
index a2322c4c..6aa5b845 100644
--- a/src/base/cmd/cmdApi.c
+++ b/src/base/cmd/cmdApi.c
@@ -52,7 +52,7 @@ void Cmd_CommandAdd( Abc_Frame_t * pAbc, const char * sGroup, const char * sName
     int fStatus;
 
     key = sName;
-    if ( st_delete( pAbc->tCommands, &key, &value ) ) 
+    if ( st__delete( pAbc->tCommands, &key, &value ) ) 
     {
         // delete existing definition for this command 
         fprintf( pAbc->Err, "Cmd warning: redefining '%s'\n", sName );
@@ -65,7 +65,7 @@ void Cmd_CommandAdd( Abc_Frame_t * pAbc, const char * sGroup, const char * sName
     pCommand->sGroup  = Extra_UtilStrsav( sGroup );
     pCommand->pFunc   = pFunc;
     pCommand->fChange = fChanges;
-    fStatus = st_insert( pAbc->tCommands, pCommand->sName, (char *)pCommand );
+    fStatus = st__insert( pAbc->tCommands, pCommand->sName, (char *)pCommand );
     assert( !fStatus );  // the command should not be in the table
 }
 
diff --git a/src/base/cmd/cmdFlag.c b/src/base/cmd/cmdFlag.c
index f0ed38a1..33427b0e 100644
--- a/src/base/cmd/cmdFlag.c
+++ b/src/base/cmd/cmdFlag.c
@@ -47,7 +47,7 @@ ABC_NAMESPACE_IMPL_START
 char * Cmd_FlagReadByName( Abc_Frame_t * pAbc, char * flag )
 {
     char * value;
-    if ( st_lookup(pAbc->tFlags, flag, &value) )
+    if ( st__lookup(pAbc->tFlags, flag, &value) )
         return value;
     return NULL;
 }
@@ -72,9 +72,9 @@ void Cmd_FlagUpdateValue( Abc_Frame_t * pAbc, const char * key, char * value )
     else
         newValue = Extra_UtilStrsav("");
 //        newValue = NULL;
-    if ( st_delete(pAbc->tFlags, &key, &oldValue) )
+    if ( st__delete(pAbc->tFlags, &key, &oldValue) )
         ABC_FREE(oldValue);
-    st_insert( pAbc->tFlags, key, newValue );
+    st__insert( pAbc->tFlags, key, newValue );
 }
 
 
@@ -92,7 +92,7 @@ void Cmd_FlagDeleteByName( Abc_Frame_t * pAbc, const char * key )
     char *value;
     if ( !key )
         return;
-    if ( st_delete( pAbc->tFlags, &key, &value ) ) 
+    if ( st__delete( pAbc->tFlags, &key, &value ) ) 
     {
         ABC_FREE(key);
         ABC_FREE(value);
diff --git a/src/base/cmd/cmdInt.h b/src/base/cmd/cmdInt.h
index 149c26f1..2827e47b 100644
--- a/src/base/cmd/cmdInt.h
+++ b/src/base/cmd/cmdInt.h
@@ -78,7 +78,7 @@ extern void       CmdFreeArgv( int argc, char ** argv );
 extern char **    CmdAddToArgv( int argc, char ** argv );
 extern void       CmdCommandFree( Abc_Command * pCommand );
 extern void       CmdCommandPrint( Abc_Frame_t * pAbc, int fPrintAll );
-extern void       CmdPrintTable( st_table * tTable, int fAliases );
+extern void       CmdPrintTable( st__table * tTable, int fAliases );
 
 ////////////////////////////////////////////////////////////////////////
 ///                       END OF FILE                                ///
diff --git a/src/base/cmd/cmdUtils.c b/src/base/cmd/cmdUtils.c
index 10a97910..e65e2cb7 100644
--- a/src/base/cmd/cmdUtils.c
+++ b/src/base/cmd/cmdUtils.c
@@ -110,7 +110,7 @@ int CmdCommandDispatch( Abc_Frame_t * pAbc, int * pargc, char *** pargv )
         return 0;
 
     // get the command
-    if ( !st_lookup( pAbc->tCommands, argv[0], (char **)&pCommand ) )
+    if ( ! st__lookup( pAbc->tCommands, argv[0], (char **)&pCommand ) )
     {   // the command is not in the table
         // if there is only one word with an extension, assume this is file to be read
         if ( argc == 1 && strstr( argv[0], "." ) )
@@ -122,7 +122,7 @@ int CmdCommandDispatch( Abc_Frame_t * pAbc, int * pargc, char *** pargv )
             argv = argv2;
             *pargc = argc;
             *pargv = argv;
-            if ( !st_lookup( pAbc->tCommands, argv[0], (char **)&pCommand ) )
+            if ( ! st__lookup( pAbc->tCommands, argv[0], (char **)&pCommand ) )
                 assert( 0 );
         }
         else
@@ -157,7 +157,7 @@ int CmdCommandDispatch( Abc_Frame_t * pAbc, int * pargc, char *** pargv )
     // usually this is a passive command ... 
     if ( fError == 0 && !pAbc->fAutoexac )
     {
-        if ( st_lookup( pAbc->tFlags, "autoexec", &value ) )
+        if ( st__lookup( pAbc->tFlags, "autoexec", &value ) )
         {
             pAbc->fAutoexac = 1;
             fError = Cmd_CommandExecute( pAbc, value );
@@ -278,7 +278,7 @@ int CmdApplyAlias( Abc_Frame_t * pAbc, int *argcp, char ***argvp, int *loop )
     {
         if ( argc == 0 )
             return 0;
-        if ( stopit != 0 || st_lookup( pAbc->tAliases, argv[0],  (char **) &alias ) == 0 )
+        if ( stopit != 0 || st__lookup( pAbc->tAliases, argv[0],  (char **) &alias ) == 0 )
         {
             return 0;
         }
@@ -546,7 +546,7 @@ void CmdCommandPrint( Abc_Frame_t * pAbc, int fPrintAll )
 {
     const char *key;
     char *value;
-    st_generator * gen;
+    st__generator * gen;
     Abc_Command ** ppCommands;
     Abc_Command * pCommands;
     int nCommands, i;
@@ -554,10 +554,10 @@ void CmdCommandPrint( Abc_Frame_t * pAbc, int fPrintAll )
     int LenghtMax, nColumns, iCom = 0;
 
     // put all commands into one array
-    nCommands = st_count( pAbc->tCommands );
+    nCommands = st__count( pAbc->tCommands );
     ppCommands = ABC_ALLOC( Abc_Command *, nCommands );
     i = 0;
-    st_foreach_item( pAbc->tCommands, gen, &key, &value )
+    st__foreach_item( pAbc->tCommands, gen, &key, &value )
     {
         pCommands = (Abc_Command *)value;
         if ( fPrintAll || pCommands->sName[0] != '_' )
@@ -675,18 +675,18 @@ int CmdNamePrintCompare( char ** ppC1, char ** ppC2 )
   SeeAlso     []
 
 ***********************************************************************/
-void CmdPrintTable( st_table * tTable, int fAliases )
+void CmdPrintTable( st__table * tTable, int fAliases )
 {
-    st_generator * gen;
+    st__generator * gen;
     const char ** ppNames;
     const char * key;
     char* value;
     int nNames, i;
 
     // collect keys in the array
-    ppNames = ABC_ALLOC( const char *, st_count(tTable) );
+    ppNames = ABC_ALLOC( const char *, st__count(tTable) );
     nNames = 0;
-    st_foreach_item( tTable, gen, &key, &value )
+    st__foreach_item( tTable, gen, &key, &value )
         ppNames[nNames++] = key;
 
     // sort array by name
@@ -696,7 +696,7 @@ void CmdPrintTable( st_table * tTable, int fAliases )
     // print in this order
     for ( i = 0; i < nNames; i++ )
     {
-        st_lookup( tTable, ppNames[i], &value );
+        st__lookup( tTable, ppNames[i], &value );
         if ( fAliases )
             CmdCommandAliasPrint( Abc_FrameGetGlobalFrame(), (Abc_Alias *)value );
         else