odb/rcx: move parse.h/cpp odb->rcx

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>

src/odb/CMakeLists.txt

@@ -69,21 +69,6 @@ if (DOXYGEN_FOUND)
   doxygen_add_docs(docs include)
 endif()
 
-############################################################
-# Unit testing
-############################################################
-if(ENABLE_TESTS)
-  enable_testing()
-
-  add_executable(parseTest
-    ${PROJECT_SOURCE_DIR}/test/parseTest.cpp
-  )
-
-  target_link_libraries(parseTest
-    odb
-  )
-endif()
-
 messages(
   TARGET odb
 )

src/odb/src/db/dbBlock.cpp

@@ -131,7 +131,6 @@
 #include "odb/dbShape.h"
 #include "odb/defout.h"
 #include "odb/lefout.h"
-#include "odb/parse.h"
 #include "utl/Logger.h"
 
 namespace odb {

src/odb/src/zutil/CMakeLists.txt

@@ -1,5 +1,4 @@
 add_library(zutil
-    parse.cpp
     poly_decomp.cpp
     util.cpp
 )

src/odb/test/CMakeLists.txt

@@ -53,7 +53,6 @@ or_integration_tests(
     cpp_tests
     dump_netlists
     dump_netlists_withfill
-    parser_unit_test
     test_block
     test_bterm
     test_destroy

src/rcx/include/rcx/extRulesPattern.h

@@ -35,7 +35,6 @@
 
 #include "odb/array1.h"
 #include "odb/odb.h"
-#include "odb/parse.h"
 
 namespace utl {
 class Logger;

src/rcx/include/rcx/extSpef.h

@@ -40,7 +40,6 @@
 #include "odb/db.h"
 #include "odb/dbShape.h"
 #include "odb/odb.h"
-#include "odb/parse.h"
 
 namespace utl {
 class Logger;
@@ -53,6 +52,7 @@ using odb::uint;
 using utl::Logger;
 
 class NameTable;
+class Ath__parser;
 
 class extSpef
 {

src/rcx/include/rcx/extprocess.h

@@ -34,8 +34,6 @@
 
 #include "odb/array1.h"
 #include "odb/odb.h"
-#include "odb/parse.h"
-#include "rcx/extParse.h"
 
 namespace utl {
 class Logger;
@@ -44,11 +42,11 @@ class Logger;
 namespace rcx {
 
 using odb::Ath__array1D;
-using odb::Ath__parser;
 using odb::uint;
 using utl::Logger;
 
 class extProcess;
+class Ath__parser;
 
 class extConductor
 {

src/rcx/src/CMakeLists.txt

@@ -79,6 +79,7 @@ add_library(rcx_lib
   extmeasure_res_v2.cpp
   extmain_v2.cpp
   extmeasure_diag_opt.cpp
+  parse.cpp
   util.cpp
 )
 

src/rcx/src/ext.cpp

@@ -34,6 +34,7 @@
 #include "rcx/ext.h"
 
 #include "odb/wOrder.h"
+#include "parse.h"
 #include "rcx/extMeasureRC.h"
 #include "rcx/extPattern.h"
 #include "utl/Logger.h"

src/rcx/src/extBenchDB.cpp

@@ -35,6 +35,7 @@
 #include <vector>
 
 #include "odb/db.h"
+#include "parse.h"
 #include "rcx/extRCap.h"
 #include "rcx/extSpef.h"
 #include "rcx/extViaModel.h"

src/rcx/src/extCoords.cpp

@@ -30,7 +30,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "odb/parse.h"
+#include "parse.h"
 #include "rcx/extSpef.h"
 #include "utl/Logger.h"
 #include "wire.h"

src/rcx/src/extFlow_v2.cpp

@@ -33,6 +33,7 @@
 #include <map>
 #include <vector>
 
+#include "parse.h"
 #include "rcx/dbUtil.h"
 #include "rcx/extMeasureRC.h"
 #include "rcx/extRCap.h"

src/rcx/src/extModelGen.cpp

@@ -30,8 +30,11 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
+
 #include "rcx/extModelGen.h"
 
+#include "parse.h"
+
 namespace rcx {
 
 uint extRCModel::GenExtModel(std::list<std::string>& corner_list,

src/rcx/include/rcx/extParse.h → src/rcx/src/extParse.h

@@ -36,12 +36,10 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "rcx/extParse.h"
+#include "parse.h"
 #include "utl/Logger.h"
 
-namespace odb {
-
-using odb::Ath__parser;
+namespace rcx {
 
 class extParser : public Ath__parser
 {
@@ -54,4 +52,4 @@ class extParser : public Ath__parser
   int _dbg;
 };
 
-}  // namespace odb
+}  // namespace rcx

src/rcx/src/extRCmodel.cpp

@@ -33,6 +33,7 @@
 #include <map>
 #include <vector>
 
+#include "parse.h"
 #include "rcx/extRCap.h"
 #include "rcx/extprocess.h"
 #include "utl/Logger.h"

src/rcx/src/extRCmodel_solver.cpp

@@ -31,18 +31,14 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "rcx/extRCap.h"
-#include "rcx/extprocess.h"
-#include "wire.h"
-
-#ifdef _WIN32
-#include "direct.h"
-#endif
-
 #include <map>
 #include <vector>
 
+#include "parse.h"
+#include "rcx/extRCap.h"
+#include "rcx/extprocess.h"
 #include "utl/Logger.h"
+#include "wire.h"
 
 // #define SKIP_SOLVER
 namespace rcx {

src/rcx/src/extRulesVia.cpp

@@ -30,17 +30,13 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "rcx/extRCap.h"
-#include "rcx/extSpef.h"
-#include "rcx/extprocess.h"
-
-#ifdef _WIN32
-#include "direct.h"
-#endif
-
 #include <map>
 #include <vector>
 
+#include "parse.h"
+#include "rcx/extRCap.h"
+#include "rcx/extSpef.h"
+#include "rcx/extprocess.h"
 #include "utl/Logger.h"
 
 namespace rcx {

src/rcx/src/extSolverGen.cpp

@@ -30,6 +30,8 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 //
+
+#include "parse.h"
 #include "rcx/extModelGen.h"
 
 namespace rcx {

src/rcx/src/extSpef.cpp

@@ -37,7 +37,7 @@
 
 #include "name.h"
 #include "odb/dbExtControl.h"
-#include "odb/parse.h"
+#include "parse.h"
 #include "rcx/extRCap.h"
 #include "utl/Logger.h"
 

src/rcx/src/extSpefIn.cpp

@@ -33,6 +33,7 @@
 #include <vector>
 
 #include "name.h"
+#include "parse.h"
 #include "rcx/extRCap.h"
 #include "rcx/extSpef.h"
 #include "utl/Logger.h"

src/rcx/src/extprocess.cpp

@@ -32,11 +32,11 @@
 
 #include "rcx/extprocess.h"
 
+#include "parse.h"
 #include "utl/Logger.h"
 
 namespace rcx {
 
-using odb::extParser;
 using utl::RCX;
 
 void printInt(FILE* fp, const char* sep, const char* key, int v, bool pos)

src/rcx/src/netRC.cpp

@@ -34,6 +34,7 @@
 #include <map>
 #include <vector>
 
+#include "parse.h"
 #include "rcx/extRCap.h"
 #include "rcx/extSpef.h"
 #include "util.h"