2 files changed, 15 insertions, 15 deletions

diff --git a/src/aig/aig/aigSplit.c b/src/aig/aig/aigSplit.c
index 5c6b833c..7f89638a 100644
--- a/src/aig/aig/aigSplit.c
+++ b/src/aig/aig/aigSplit.c
@@ -44,21 +44,21 @@ ABC_NAMESPACE_IMPL_START
   SeeAlso     []
 
 ***********************************************************************/
-Aig_Obj_t * Aig_NodeBddToMuxes_rec( DdManager * dd, DdNode * bFunc, Aig_Man_t * pNew, st_table * tBdd2Node )
+Aig_Obj_t * Aig_NodeBddToMuxes_rec( DdManager * dd, DdNode * bFunc, Aig_Man_t * pNew, st__table * tBdd2Node )
 {
     Aig_Obj_t * pNode, * pNode0, * pNode1, * pNodeC;
     assert( !Cudd_IsComplement(bFunc) );
-    if ( st_lookup( tBdd2Node, (char *)bFunc, (char **)&pNode ) )
+    if ( st__lookup( tBdd2Node, (char *)bFunc, (char **)&pNode ) )
         return pNode;
     // solve for the children nodes
     pNode0 = Aig_NodeBddToMuxes_rec( dd, Cudd_Regular(cuddE(bFunc)), pNew, tBdd2Node );
     pNode0 = Aig_NotCond( pNode0, Cudd_IsComplement(cuddE(bFunc)) );
     pNode1 = Aig_NodeBddToMuxes_rec( dd, cuddT(bFunc), pNew, tBdd2Node );
-    if ( !st_lookup( tBdd2Node, (char *)Cudd_bddIthVar(dd, bFunc->index), (char **)&pNodeC ) )
+    if ( ! st__lookup( tBdd2Node, (char *)Cudd_bddIthVar(dd, bFunc->index), (char **)&pNodeC ) )
         assert( 0 );
     // create the MUX node
     pNode = Aig_Mux( pNew, pNodeC, pNode1, pNode0 );
-    st_insert( tBdd2Node, (char *)bFunc, (char *)pNode );
+    st__insert( tBdd2Node, (char *)bFunc, (char *)pNode );
     return pNode;
 }
 
@@ -76,7 +76,7 @@ Aig_Obj_t * Aig_NodeBddToMuxes_rec( DdManager * dd, DdNode * bFunc, Aig_Man_t *
 Aig_Man_t * Aig_ManConvertBddsToAigs( Aig_Man_t * p, DdManager * dd, Vec_Ptr_t * vCofs )
 {
     DdNode * bFunc;
-    st_table * tBdd2Node;
+    st__table * tBdd2Node;
     Aig_Man_t * pNew;
     Aig_Obj_t * pObj;
     int i;
@@ -88,11 +88,11 @@ Aig_Man_t * Aig_ManConvertBddsToAigs( Aig_Man_t * p, DdManager * dd, Vec_Ptr_t *
     Aig_ManForEachCi( p, pObj, i )
         pObj->pData = Aig_ObjCreateCi( pNew );
     // create the table mapping BDD nodes into the ABC nodes
-    tBdd2Node = st_init_table( st_ptrcmp, st_ptrhash );
+    tBdd2Node = st__init_table( st__ptrcmp, st__ptrhash );
     // add the constant and the elementary vars
-    st_insert( tBdd2Node, (char *)Cudd_ReadOne(dd), (char *)Aig_ManConst1(pNew) );
+    st__insert( tBdd2Node, (char *)Cudd_ReadOne(dd), (char *)Aig_ManConst1(pNew) );
     Aig_ManForEachCi( p, pObj, i )
-        st_insert( tBdd2Node, (char *)Cudd_bddIthVar(dd, i), (char *)pObj->pData );
+        st__insert( tBdd2Node, (char *)Cudd_bddIthVar(dd, i), (char *)pObj->pData );
     // build primary outputs for the cofactors
     Vec_PtrForEachEntry( DdNode *, vCofs, bFunc, i )
     {
@@ -102,7 +102,7 @@ Aig_Man_t * Aig_ManConvertBddsToAigs( Aig_Man_t * p, DdManager * dd, Vec_Ptr_t *
         pObj = Aig_NotCond( pObj, Cudd_IsComplement(bFunc) );
         Aig_ObjCreateCo( pNew, pObj );
     }
-    st_free_table( tBdd2Node );
+    st__free_table( tBdd2Node );
 
     // duplicate the rest of the AIG
     // add the POs
diff --git a/src/aig/hop/cudd2.c b/src/aig/hop/cudd2.c
index 57a85dc8..682904f7 100644
--- a/src/aig/hop/cudd2.c
+++ b/src/aig/hop/cudd2.c
@@ -32,7 +32,7 @@ typedef struct Aig_CuddMan_t_        Aig_CuddMan_t;
 struct Aig_CuddMan_t_
 {
     Aig_Man_t *  pAig;   // internal AIG package
-    st_table *   pTable; // hash table mapping BDD nodes into AIG nodes
+    st__table *   pTable; // hash table mapping BDD nodes into AIG nodes
 };
 
 // static Cudd AIG manager used in this experiment
@@ -61,7 +61,7 @@ void Cudd2_Init( unsigned int numVars, unsigned int numVarsZ, unsigned int numSl
         return;
     s_pCuddMan = ALLOC( Aig_CuddMan_t, 1 );
     s_pCuddMan->pAig = Aig_ManStart();
-    s_pCuddMan->pTable = st_init_table( st_ptrcmp, st_ptrhash );
+    s_pCuddMan->pTable = st__init_table( st__ptrcmp, st__ptrhash );
     for ( v = 0; v < (int)numVars; v++ )
         Aig_ObjCreatePi( s_pCuddMan->pAig );
 }
@@ -82,7 +82,7 @@ void Cudd2_Quit( void * pCudd )
     assert( s_pCuddMan != NULL );
     Aig_ManDumpBlif( s_pCuddMan->pAig, "aig_temp.blif", NULL, NULL );
     Aig_ManStop( s_pCuddMan->pAig );
-    st_free_table( s_pCuddMan->pTable );
+    st__free_table( s_pCuddMan->pTable );
     free( s_pCuddMan );
     s_pCuddMan = NULL;
 }
@@ -102,7 +102,7 @@ static Aig_Obj_t * Cudd2_GetArg( void * pArg )
 {
     Aig_Obj_t * pNode;
     assert( s_pCuddMan != NULL );
-    if ( !st_lookup( s_pCuddMan->pTable, (char *)Aig_Regular(pArg), (char **)&pNode ) )
+    if ( ! st__lookup( s_pCuddMan->pTable, (char *)Aig_Regular(pArg), (char **)&pNode ) )
     {
         printf( "Cudd2_GetArg(): An argument BDD is not in the hash table.\n" );
         return NULL;
@@ -124,10 +124,10 @@ static Aig_Obj_t * Cudd2_GetArg( void * pArg )
 static void Cudd2_SetArg( Aig_Obj_t * pNode, void * pResult )
 {
     assert( s_pCuddMan != NULL );
-    if ( st_is_member( s_pCuddMan->pTable, (char *)Aig_Regular(pResult) ) )
+    if ( st__is_member( s_pCuddMan->pTable, (char *)Aig_Regular(pResult) ) )
         return;
     pNode = Aig_NotCond( pNode,  Aig_IsComplement(pResult) );
-    st_insert( s_pCuddMan->pTable, (char *)Aig_Regular(pResult), (char *)pNode );
+    st__insert( s_pCuddMan->pTable, (char *)Aig_Regular(pResult), (char *)pNode );
 }
 
 /**Function*************************************************************