diff --git a/.github/workflows/conda-dev.yml b/.github/workflows/conda-dev.yml index 4987b44c08..79e4792e23 100644 --- a/.github/workflows/conda-dev.yml +++ b/.github/workflows/conda-dev.yml @@ -82,11 +82,6 @@ jobs: conda devenv conda activate abc conda info --envs - conda list - echo $CONDA_PREFIX - find $CONDA_PREFIX -maxdepth 2 -type d -name bin - cat $(find $CONDA_PREFIX -maxdepth 5 -type f -name dirent.h) || true - echo $PATH ctest --build-generator "${{ matrix.generator }}" \ --build-and-test . build \ --build-options ${CMAKE_ARGS} ${{ matrix.extra_args }} \ diff --git a/environment.devenv.yml b/environment.devenv.yml index 252434ab01..d445458706 100644 --- a/environment.devenv.yml +++ b/environment.devenv.yml @@ -11,7 +11,6 @@ dependencies: - readline=8.1 # [unix] - zlib - libpng - - dirent # [win] environment: CPATH: diff --git a/src/base/cmd/cmd.c b/src/base/cmd/cmd.c index 55ad7f5c2c..949a6c3fad 100644 --- a/src/base/cmd/cmd.c +++ b/src/base/cmd/cmd.c @@ -18,7 +18,7 @@ ***********************************************************************/ -#if (defined(WIN32) || defined(__MINGW32__)) && !defined(__cplusplus) +#if (defined(WIN32) || defined(__MINGW32__)) #include #else #include @@ -26,7 +26,6 @@ #endif #include "base/abc/abc.h" -#include "base/io/ioInt.h" #include "base/main/mainInt.h" #include "cmdInt.h" #include "misc/util/utilSignal.h" @@ -51,7 +50,7 @@ static int CmdCommandUnsetVariable ( Abc_Frame_t * pAbc, int argc, char ** argv static int CmdCommandUndo ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int CmdCommandRecall ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int CmdCommandEmpty ( Abc_Frame_t * pAbc, int argc, char ** argv ); -#if (defined(WIN32) || defined(__MINGW32__)) && !defined(__cplusplus) +#if (defined(WIN32) || defined(__MINGW32__)) static int CmdCommandScanDir ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int CmdCommandRenameFiles ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int CmdCommandLs ( Abc_Frame_t * pAbc, int argc, char ** argv ); @@ -104,7 +103,7 @@ void Cmd_Init( Abc_Frame_t * pAbc ) Cmd_CommandAdd( pAbc, "Basic", "undo", CmdCommandUndo, 0 ); Cmd_CommandAdd( pAbc, "Basic", "recall", CmdCommandRecall, 0 ); Cmd_CommandAdd( pAbc, "Basic", "empty", CmdCommandEmpty, 0 ); -#if (defined(WIN32) || defined(__MINGW32__)) && !defined(__cplusplus) +#if (defined(WIN32) || defined(__MINGW32__)) Cmd_CommandAdd( pAbc, "Basic", "scandir", CmdCommandScanDir, 0 ); Cmd_CommandAdd( pAbc, "Basic", "renamefiles", CmdCommandRenameFiles, 0 ); Cmd_CommandAdd( pAbc, "Basic", "ls", CmdCommandLs, 0 ); @@ -1149,7 +1148,7 @@ int CmdCommandUndo( Abc_Frame_t * pAbc, int argc, char **argv ) #endif -#if (defined(WIN32) || defined(__MINGW32__)) && !defined(__cplusplus) +#if (defined(WIN32) || defined(__MINGW32__)) #include #include diff --git a/src/base/cmd/cmdInt.h b/src/base/cmd/cmdInt.h index dc6a46f659..dffdd27944 100644 --- a/src/base/cmd/cmdInt.h +++ b/src/base/cmd/cmdInt.h @@ -9,7 +9,7 @@ Synopsis [Internal declarations of the command package.] Author [Alan Mishchenko] - + Affiliation [UC Berkeley] Date [Ver. 1.0. Started - June 20, 2005.] @@ -26,6 +26,7 @@ /// INCLUDES /// //////////////////////////////////////////////////////////////////////// +#include "base/io/ioAbc.h" #include "base/main/mainInt.h" #include "cmd.h" @@ -42,8 +43,8 @@ ABC_NAMESPACE_HEADER_START struct MvCommand { - char * sName; // the command name - char * sGroup; // the group name + char * sName; // the command name + char * sGroup; // the group name Cmd_CommandFuncType pFunc; // the function to execute the command int fChange; // set to 1 to mark that the network is changed }; @@ -89,4 +90,3 @@ extern void CmdPrintTable( st__table * tTable, int fAliases ); ABC_NAMESPACE_HEADER_END #endif - diff --git a/src/base/io/ioAbc.h b/src/base/io/ioAbc.h index 9758f19631..d3a1b8bbcc 100644 --- a/src/base/io/ioAbc.h +++ b/src/base/io/ioAbc.h @@ -9,7 +9,7 @@ Synopsis [External declarations.] Author [Alan Mishchenko] - + Affiliation [UC Berkeley] Date [Ver. 1.0. Started - June 20, 2005.] @@ -44,27 +44,27 @@ ABC_NAMESPACE_HEADER_START //////////////////////////////////////////////////////////////////////// // network functionality -typedef enum { - IO_FILE_NONE = 0, - IO_FILE_AIGER, - IO_FILE_BAF, - IO_FILE_BBLIF, - IO_FILE_BLIF, - IO_FILE_BLIFMV, - IO_FILE_BENCH, +typedef enum { + IO_FILE_NONE = 0, + IO_FILE_AIGER, + IO_FILE_BAF, + IO_FILE_BBLIF, + IO_FILE_BLIF, + IO_FILE_BLIFMV, + IO_FILE_BENCH, IO_FILE_BOOK, - IO_FILE_CNF, - IO_FILE_DOT, - IO_FILE_EDIF, - IO_FILE_EQN, - IO_FILE_GML, - IO_FILE_JSON, - IO_FILE_LIST, - IO_FILE_PLA, - IO_FILE_MOPLA, - IO_FILE_SMV, - IO_FILE_VERILOG, - IO_FILE_UNKNOWN + IO_FILE_CNF, + IO_FILE_DOT, + IO_FILE_EDIF, + IO_FILE_EQN, + IO_FILE_GML, + IO_FILE_JSON, + IO_FILE_LIST, + IO_FILE_PLA, + IO_FILE_MOPLA, + IO_FILE_SMV, + IO_FILE_VERILOG, + IO_FILE_UNKNOWN } Io_FileType_t; //////////////////////////////////////////////////////////////////////// @@ -110,7 +110,7 @@ extern void Io_WriteBlifLogic( Abc_Ntk_t * pNtk, char * pFileName, extern void Io_WriteBlif( Abc_Ntk_t * pNtk, char * pFileName, int fWriteLatches, int fBb2Wb, int fSeq ); extern void Io_WriteTimingInfo( FILE * pFile, Abc_Ntk_t * pNtk ); extern void Io_WriteBlifSpecial( Abc_Ntk_t * pNtk, char * FileName, char * pLutStruct, int fUseHie ); -/*=== abcWriteBlifMv.c ==========================================================*/ +/*=== abcWriteBlifMv.c ==========================================================*/ extern void Io_WriteBlifMv( Abc_Ntk_t * pNtk, char * FileName ); /*=== abcWriteBench.c =========================================================*/ extern int Io_WriteBench( Abc_Ntk_t * pNtk, const char * FileName ); @@ -159,7 +159,8 @@ extern FILE * Io_FileOpen( const char * FileName, const char * PathV /*=== ioJson.c ===========================================================*/ extern void Io_ReadJson( char * pFileName ); extern void Io_WriteJson( char * pFileName ); - +/*=== ioReadBlifMv.c =====================================================*/ +extern char * Io_MvLoadFileBz2( char * pFileName, long * pnFileSize ); ABC_NAMESPACE_HEADER_END @@ -171,4 +172,3 @@ ABC_NAMESPACE_HEADER_END //////////////////////////////////////////////////////////////////////// /// END OF FILE /// //////////////////////////////////////////////////////////////////////// - diff --git a/src/base/io/ioInt.h b/src/base/io/ioInt.h index 383683e32d..b902c587cb 100644 --- a/src/base/io/ioInt.h +++ b/src/base/io/ioInt.h @@ -45,8 +45,6 @@ ABC_NAMESPACE_HEADER_START /// FUNCTION DECLARATIONS /// //////////////////////////////////////////////////////////////////////// -extern char * Io_MvLoadFileBz2( char * pFileName, int * pnFileSize ); - ABC_NAMESPACE_HEADER_END diff --git a/src/base/io/ioReadBlifMv.c b/src/base/io/ioReadBlifMv.c index 911c943b7d..e3f381534d 100644 --- a/src/base/io/ioReadBlifMv.c +++ b/src/base/io/ioReadBlifMv.c @@ -115,7 +115,7 @@ static int Io_MvParseLineMv( Io_MvMod_t * p, char * pLine ); static int Io_MvParseLineNamesMv( Io_MvMod_t * p, char * pLine, int fReset ); static int Io_MvParseLineNamesBlif( Io_MvMod_t * p, char * pLine ); static int Io_MvParseLineShortBlif( Io_MvMod_t * p, char * pLine ); -static int Io_MvParseLineLtlProperty( Io_MvMod_t * p, char * pLine ); +static int Io_MvParseLineLtlProperty( Io_MvMod_t * p, char * pLine ); static int Io_MvParseLineGateBlif( Io_MvMod_t * p, Vec_Ptr_t * vTokens ); static Io_MvVar_t * Abc_NtkMvVarDup( Abc_Ntk_t * pNtk, Io_MvVar_t * pVar );