Merge pull request #794 from os-fpga/pln_rename_file_readers

serge-dsa · web-flow · commit 8a8d01c870c2 · 2024-08-06T20:15:53.000-07:00
pln: rename file_readers to file_io
diff --git a/planning/src/RS/rsCheck.cpp b/planning/src/RS/rsCheck.cpp
@@ -1,6 +1,6 @@
 #include "RS/rsCheck.h"
-#include "file_readers/pln_blif_file.h"
-#include "file_readers/pln_csv_reader.h"
+#include "file_io/pln_blif_file.h"
+#include "file_io/pln_csv_reader.h"
 #include "util/nw/Nw.h"
 
 namespace pln {
diff --git a/planning/src/RS/rsOpts.cpp b/planning/src/RS/rsOpts.cpp
@@ -1,5 +1,5 @@
 #include "RS/rsOpts.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_Fio.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -21,7 +21,7 @@ static CStr _help_[] = {"H", "h", "help", "hel", "hlp", "he", nullptr};
 
 static CStr _fun_[] = {"F", "fu", "fun", "func", "funct", "function", nullptr};
 
-static CStr _check_[] = {"CH", "ch", "che", "chec", "check", nullptr};
+static CStr _check_[] = {"CH", "ch", "CC", "cc", "che", "chec", "check", nullptr};
 
 static CStr _csv_[] = {"CSV", "cs", "csv", nullptr};
 
diff --git a/planning/src/RS/sta_file_writer.cpp b/planning/src/RS/sta_file_writer.cpp
@@ -23,7 +23,7 @@
 #include "rsDB.h"
 #include "WriterVisitor.h"
 
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_Fio.h"
 #include <filesystem>
 
 namespace pln {
diff --git a/planning/src/file_io/blif_reader.cpp b/planning/src/file_io/blif_reader.cpp
@@ -1,5 +1,5 @@
-#include "file_readers/blif_reader.h"
-#include "file_readers/pln_blif_file.h"
+#include "file_io/blif_reader.h"
+#include "file_io/pln_blif_file.h"
 
 namespace pln {
 
diff --git a/planning/src/file_io/blif_reader.h b/planning/src/file_io/blif_reader.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _pln_file_readers_BLIF_READER_H
-#define _pln_file_readers_BLIF_READER_H
+#ifndef _pln_BLIF_READER_H_4e501fa40b33e91_
+#define _pln_BLIF_READER_H_4e501fa40b33e91_
 
 #include "util/pln_log.h"
 
diff --git a/planning/src/file_io/nlohmann3_11_2_json.h b/planning/src/file_io/nlohmann3_11_2_json.h
diff --git a/planning/src/file_io/pln_Fio.cpp b/planning/src/file_io/pln_Fio.cpp
@@ -1,6 +1,6 @@
 // File IO - namespace fio
-#include "file_readers/pln_Fio.h"
-#include "file_readers/pln_tinyxml2.h"
+#include "file_io/pln_Fio.h"
+#include "file_io/pln_tinyxml2.h"
 #include "util/geo/iv.h"
 
 #include <alloca.h>
diff --git a/planning/src/file_io/pln_Fio.h b/planning/src/file_io/pln_Fio.h
@@ -6,8 +6,8 @@
 // ======== 3. CSV_Reader ============
 // ======== 4. XML_Reader ============
 
-#ifndef _pln_file_readers_Fio_H_h_8b7b14eef966_
-#define _pln_file_readers_Fio_H_h_8b7b14eef966_
+#ifndef _pln_Fio_H_h_9d57dac53c06421_
+#define _pln_Fio_H_h_9d57dac53c06421_
 
 #include "util/pln_log.h"
 #include <string_view>
diff --git a/planning/src/file_io/pln_Fio_csv.cpp b/planning/src/file_io/pln_Fio_csv.cpp
@@ -1,4 +1,4 @@
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_Fio.h"
 #include <set>
 
 namespace fio {
diff --git a/planning/src/file_io/pln_blif_file.cpp b/planning/src/file_io/pln_blif_file.cpp
@@ -1,4 +1,4 @@
-#include "file_readers/pln_blif_file.h"
+#include "file_io/pln_blif_file.h"
 #include "util/nw/Nw.h"
 
 namespace pln {
diff --git a/planning/src/file_io/pln_blif_file.h b/planning/src/file_io/pln_blif_file.h
@@ -1,9 +1,9 @@
 #pragma once
-#ifndef _pln_frd_BLIF_FILE_H_e6f4ecdf41a2f915079_
-#define _pln_frd_BLIF_FILE_H_e6f4ecdf41a2f915079_
+#ifndef _pln_BLIF_FILE_H_e6f4df41a2f915079_
+#define _pln_BLIF_FILE_H_e6f4df41a2f915079_
 
-#include "file_readers/pln_Fio.h"
-#include "file_readers/pln_primitives.h"
+#include "file_io/pln_Fio.h"
+#include "file_io/pln_primitives.h"
 #include "util/geo/xyz.h"
 #include "util/nw/Nw.h"
 
diff --git a/planning/src/file_io/pln_csv_reader.cpp b/planning/src/file_io/pln_csv_reader.cpp
@@ -1,5 +1,5 @@
-#include "file_readers/pln_csv_reader.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_csv_reader.h"
+#include "file_io/pln_Fio.h"
 #include "pin_loc/pin.h"
 
 #include <iomanip>
diff --git a/planning/src/file_io/pln_csv_reader.h b/planning/src/file_io/pln_csv_reader.h
diff --git a/planning/src/file_io/pln_pcf_reader.cpp b/planning/src/file_io/pln_pcf_reader.cpp
@@ -1,5 +1,5 @@
-#include "file_readers/pln_pcf_reader.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_pcf_reader.h"
+#include "file_io/pln_Fio.h"
 
 namespace pln {
 
diff --git a/planning/src/file_io/pln_pcf_reader.h b/planning/src/file_io/pln_pcf_reader.h
diff --git a/planning/src/file_io/pln_primitives.cpp b/planning/src/file_io/pln_primitives.cpp
@@ -1,4 +1,4 @@
-#include "file_readers/pln_primitives.h"
+#include "file_io/pln_primitives.h"
 #include <regex>
 
 namespace pln {
diff --git a/planning/src/file_io/pln_primitives.h b/planning/src/file_io/pln_primitives.h
diff --git a/planning/src/file_io/pln_tinyxml2.cpp b/planning/src/file_io/pln_tinyxml2.cpp
@@ -22,8 +22,8 @@ distribution.
 */
 // Modified by serge-rs.
 
-#include "file_readers/pln_tinyxml2.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_tinyxml2.h"
+#include "file_io/pln_Fio.h"
 
 #include <new>
 #include <cstddef>
diff --git a/planning/src/file_io/pln_tinyxml2.h b/planning/src/file_io/pln_tinyxml2.h
diff --git a/planning/src/file_io/xml_reader.cpp b/planning/src/file_io/xml_reader.cpp
@@ -1,4 +1,4 @@
-#include "file_readers/xml_reader.h"
+#include "file_io/xml_reader.h"
 #include <fstream>
 
 namespace fileRd {
diff --git a/planning/src/file_io/xml_reader.h b/planning/src/file_io/xml_reader.h
diff --git a/planning/src/main.cpp b/planning/src/main.cpp
@@ -1,9 +1,9 @@
-static const char* _pln_VERSION_STR = "pln0310";
+static const char* _pln_VERSION_STR = "pln0311";
 
 #include "RS/rsEnv.h"
 #include "util/pln_log.h"
 #include "util/cmd_line.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_Fio.h"
 #include "pin_loc/pinc_main.h"
 
 #ifdef PLN_UNIT_TEST_ON
diff --git a/planning/src/nl_partition/nl_Par.cpp b/planning/src/nl_partition/nl_Par.cpp
@@ -1,5 +1,5 @@
 #include "nl_partition/nl_Par.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_Fio.h"
 #include "globals.h"
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/planning/src/nl_partition/nlp_api.cpp b/planning/src/nl_partition/nlp_api.cpp
@@ -1,6 +1,6 @@
 #include "nl_partition/nl_Par.h"
 #include "nl_partition/nlp_api.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_Fio.h"
 #include "globals.h"
 #include "vpr_types.h"
 
diff --git a/planning/src/pin_loc/map_clocks.cpp b/planning/src/pin_loc/map_clocks.cpp
@@ -7,10 +7,9 @@
 //
 
 #include "pin_loc/pin_placer.h"
-#include "file_readers/blif_reader.h"
-#include "file_readers/pln_csv_reader.h"
-#include "file_readers/xml_reader.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_csv_reader.h"
+#include "file_io/xml_reader.h"
+#include "file_io/pln_Fio.h"
 #include "util/cmd_line.h"
 
 #include <map>
diff --git a/planning/src/pin_loc/pcf_place.cpp b/planning/src/pin_loc/pcf_place.cpp
@@ -1,6 +1,6 @@
 #include "pin_loc/pin_placer.h"
-#include "file_readers/pln_csv_reader.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_csv_reader.h"
+#include "file_io/pln_Fio.h"
 
 #include "util/cmd_line.h"
 
diff --git a/planning/src/pin_loc/pin_placer.cpp b/planning/src/pin_loc/pin_placer.cpp
@@ -1,8 +1,8 @@
 #include "pin_loc/pin_placer.h"
 
-#include "file_readers/blif_reader.h"
-#include "file_readers/pln_csv_reader.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/blif_reader.h"
+#include "file_io/pln_csv_reader.h"
+#include "file_io/pln_Fio.h"
 #include "util/cmd_line.h"
 
 #include <set>
diff --git a/planning/src/pin_loc/pin_placer.h b/planning/src/pin_loc/pin_placer.h
@@ -8,7 +8,7 @@
 #include "util/cmd_line.h"
 #include "pin_loc/pinc_main.h"
 #include "pin_loc/pin.h"
-#include "file_readers/pln_pcf_reader.h"
+#include "file_io/pln_pcf_reader.h"
 
 namespace pln {
 
diff --git a/planning/src/pin_loc/read_ports.cpp b/planning/src/pin_loc/read_ports.cpp
@@ -1,7 +1,7 @@
 #include "pin_loc/pin_placer.h"
-#include "file_readers/blif_reader.h"
-#include "file_readers/pln_Fio.h"
-#include "file_readers/nlohmann3_11_2_json.h"
+#include "file_io/blif_reader.h"
+#include "file_io/pln_Fio.h"
+#include "file_io/nlohmann3_11_2_json.h"
 #include "util/cmd_line.h"
 #include <filesystem>
 
diff --git a/planning/src/util/nw/Nw_io.cpp b/planning/src/util/nw/Nw_io.cpp
@@ -1,5 +1,5 @@
 #include "util/nw/Nw_table.h"
-#include "file_readers/pln_Fio.h"
+#include "file_io/pln_Fio.h"
 
 //
 // --- Network NW can be stored in a custom CSV format.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "file_readers/pln_Fio.h"`
	`1`	`+#include "file_io/pln_Fio.h"`
`2`	`2`	`#include <set>`
`3`	`3`
`4`	`4`	`namespace fio {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "file_readers/pln_blif_file.h"`
	`1`	`+#include "file_io/pln_blif_file.h"`
`2`	`2`	`#include "util/nw/Nw.h"`
`3`	`3`
`4`	`4`	`namespace pln {`