Align PortSymbol naming; Derive from StructSymbol

lib/CMakeLists.txt

@@ -58,7 +58,6 @@ set(SOURCES
    ${LIB_SRC_DIR}/Structures/StructGraphicOleEmbedInst.cpp
    ${LIB_SRC_DIR}/Structures/StructGraphicPolygonInst.cpp
    ${LIB_SRC_DIR}/Structures/StructGraphicPolylineInst.cpp
-   ${LIB_SRC_DIR}/Structures/StructHierarchicSymbol.cpp
    ${LIB_SRC_DIR}/Structures/StructLibraryPart.cpp
    ${LIB_SRC_DIR}/Structures/StructNetDbIdMapping.cpp
    ${LIB_SRC_DIR}/Structures/StructOffPageConnector.cpp
@@ -68,6 +67,7 @@ set(SOURCES
    ${LIB_SRC_DIR}/Structures/StructPartInst.cpp
    ${LIB_SRC_DIR}/Structures/StructPinShapeSymbol.cpp
    ${LIB_SRC_DIR}/Structures/StructPort.cpp
+   ${LIB_SRC_DIR}/Structures/StructPortSymbol.cpp
    ${LIB_SRC_DIR}/Structures/StructSthInHierarchy1.cpp
    ${LIB_SRC_DIR}/Structures/StructSthInHierarchy2.cpp
    ${LIB_SRC_DIR}/Structures/StructSthInHierarchy3.cpp

repos.yaml

@@ -35,7 +35,7 @@ repositories:
   - errors: 0
     options: null
     path: ./library/GATE.OLB
-  - errors: 9
+  - errors: 1
     options: null
     path: ./library/CAPSYM.OLB
   - errors: 681
@@ -684,7 +684,7 @@ repositories:
   - errors: 0
     options: null
     path: ./orcad capture/unsorted/_archive/BusDriverTransceiver.olb
-  - errors: 9
+  - errors: 1
     options: null
     path: ./orcad capture/unsorted/_archive/capsym.olb
   - errors: 0
@@ -1434,7 +1434,7 @@ repositories:
   - errors: 1
     options: null
     path: ./orcad capture/unsorted/_archive/pspice/analog.olb
-  - errors: 1
+  - errors: 0
     options: null
     path: ./orcad capture/unsorted/_archive/pspice/anl_misc.olb
   - errors: 0
@@ -1473,7 +1473,7 @@ repositories:
   - errors: 0
     options: null
     path: ./orcad capture/unsorted/_archive/pspice/darlngtn.olb
-  - errors: 3
+  - errors: 0
     options: null
     path: ./orcad capture/unsorted/_archive/pspice/dataconv.olb
   - errors: 1
@@ -1575,7 +1575,7 @@ repositories:
   - errors: 0
     options: null
     path: ./orcad capture/unsorted/_archive/pspice/fairchild.olb
-  - errors: 13
+  - errors: 12
     options: null
     path: ./orcad capture/unsorted/_archive/pspice/filtsub.olb
   - errors: 0

src/RecordFactory.cpp

@@ -39,7 +39,6 @@
 #include "Structures/StructGraphicOleEmbedInst.hpp"
 #include "Structures/StructGraphicPolygonInst.hpp"
 #include "Structures/StructGraphicPolylineInst.hpp"
-#include "Structures/StructHierarchicSymbol.hpp"
 #include "Structures/StructLibraryPart.hpp"
 #include "Structures/StructNetDbIdMapping.hpp"
 #include "Structures/StructOffPageConnector.hpp"
@@ -49,6 +48,7 @@
 #include "Structures/StructPartInst.hpp"
 #include "Structures/StructPinShapeSymbol.hpp"
 #include "Structures/StructPort.hpp"
+#include "Structures/StructPortSymbol.hpp"
 #include "Structures/StructSthInHierarchy1.hpp"
 #include "Structures/StructSthInHierarchy2.hpp"
 #include "Structures/StructSthInHierarchy3.hpp"
@@ -99,7 +99,7 @@ std::unique_ptr<Record> RecordFactory::build(StreamContext& aCtx, Structure aStr
         case Structure::PinShapeSymbol:         return std::make_unique<StructPinShapeSymbol>(aCtx);         break;
         case Structure::PlacedInstance:         return std::make_unique<StructPartInst>(aCtx);               break;
         case Structure::Port:                   return std::make_unique<StructPort>(aCtx);                   break;
-        case Structure::PortSymbol:             return std::make_unique<StructHierarchicSymbol>(aCtx);       break;
+        case Structure::PortSymbol:             return std::make_unique<StructPortSymbol>(aCtx);             break;
         case Structure::SthInHierarchy1:        return std::make_unique<StructSthInHierarchy1>(aCtx);        break;
         case Structure::SthInHierarchy2:        return std::make_unique<StructSthInHierarchy2>(aCtx);        break;
         case Structure::SthInHierarchy3:        return std::make_unique<StructSthInHierarchy3>(aCtx);        break;

src/Structures/StructHierarchicSymbol.cpp → src/Structures/StructPortSymbol.cpp

@@ -5,11 +5,11 @@
 #include <nameof.hpp>
 
 #include "General.hpp"
-#include "Structures/StructHierarchicSymbol.hpp"
 #include "Structures/StructLibraryPart.hpp"
+#include "Structures/StructPortSymbol.hpp"
 
 
-void StructHierarchicSymbol::read(FileFormatVersion /* aVersion */)
+void StructPortSymbol::read(FileFormatVersion /* aVersion */)
 {
     auto& ds = mCtx.mDs;
 

src/Structures/StructHierarchicSymbol.hpp → src/Structures/StructPortSymbol.hpp

@@ -1,5 +1,5 @@
-#ifndef STRUCTHIERARCHICSYMBOL_HPP
-#define STRUCTHIERARCHICSYMBOL_HPP
+#ifndef STRUCTPORTSYMBOL_HPP
+#define STRUCTPORTSYMBOL_HPP
 
 
 #include <cstdint>
@@ -11,14 +11,14 @@
 #include <nameof.hpp>
 
 #include "General.hpp"
-#include "Record.hpp"
+#include "Structures/StructSymbol.hpp"
 
 
-class StructHierarchicSymbol : public Record
+class StructPortSymbol : public StructSymbol
 {
 public:
 
-    StructHierarchicSymbol(StreamContext& aCtx) : Record{aCtx}
+    StructPortSymbol(StreamContext& aCtx) : StructSymbol{aCtx}
     { }
 
     std::string to_string() const override;
@@ -38,7 +38,7 @@ class StructHierarchicSymbol : public Record
 
 
 [[maybe_unused]]
-static std::string to_string(const StructHierarchicSymbol& aObj)
+static std::string to_string(const StructPortSymbol& aObj)
 {
     std::string str;
 
@@ -48,19 +48,19 @@ static std::string to_string(const StructHierarchicSymbol& aObj)
 }
 
 
-inline std::string StructHierarchicSymbol::to_string() const
+inline std::string StructPortSymbol::to_string() const
 {
     return ::to_string(*this);
 }
 
 
 [[maybe_unused]]
-static std::ostream& operator<<(std::ostream& aOs, const StructHierarchicSymbol& aVal)
+static std::ostream& operator<<(std::ostream& aOs, const StructPortSymbol& aVal)
 {
     aOs << to_string(aVal);
 
     return aOs;
 }
 
 
-#endif // STRUCTHIERARCHICSYMBOL_HPP
+#endif // STRUCTPORTSYMBOL_HPP

src/VisitorPattern.hpp

@@ -49,7 +49,6 @@ class StructGraphicLineInst;
 class StructGraphicOleEmbedInst;
 class StructGraphicPolygonInst;
 class StructGraphicPolylineInst;
-class StructHierarchicSymbol;
 class StructLibraryPart;
 class StructNetDbIdMapping;
 class StructOffPageConnector;
@@ -59,6 +58,7 @@ class StructPartCell;
 class StructPartInst;
 class StructPinShapeSymbol;
 class StructPort;
+class StructPortSymbol;
 class StructSthInHierarchy1;
 class StructSthInHierarchy2;
 class StructSthInHierarchy3;
@@ -131,7 +131,6 @@ class Visitor
     virtual void visit(const StructGraphicOleEmbedInst& aObj) = 0;
     virtual void visit(const StructGraphicPolygonInst& aObj) = 0;
     virtual void visit(const StructGraphicPolylineInst& aObj) = 0;
-    virtual void visit(const StructHierarchicSymbol& aObj) = 0;
     virtual void visit(const StructLibraryPart& aObj) = 0;
     virtual void visit(const StructNetDbIdMapping& aObj) = 0;
     virtual void visit(const StructOffPageConnector& aObj) = 0;
@@ -141,6 +140,7 @@ class Visitor
     virtual void visit(const StructPartInst& aObj) = 0;
     virtual void visit(const StructPinShapeSymbol& aObj) = 0;
     virtual void visit(const StructPort& aObj) = 0;
+    virtual void visit(const StructPortSymbol& aObj) = 0;
     virtual void visit(const StructSthInHierarchy1& aObj) = 0;
     virtual void visit(const StructSthInHierarchy2& aObj) = 0;
     virtual void visit(const StructSthInHierarchy3& aObj) = 0;

src/XmlExporter.hpp

@@ -97,7 +97,6 @@ class XmlExporter : public Visitor
     virtual void visit(const StructGraphicOleEmbedInst& /* aObj */) override { }
     virtual void visit(const StructGraphicPolygonInst& /* aObj */) override { }
     virtual void visit(const StructGraphicPolylineInst& /* aObj */) override { }
-    virtual void visit(const StructHierarchicSymbol& /* aObj */) override { }
     virtual void visit(const StructLibraryPart& aObj) override;
     virtual void visit(const StructNetDbIdMapping& /* aObj */) override { }
     virtual void visit(const StructOffPageConnector& /* aObj */) override { }
@@ -107,6 +106,7 @@ class XmlExporter : public Visitor
     virtual void visit(const StructPartInst& /* aObj */) override { }
     virtual void visit(const StructPinShapeSymbol& /* aObj */) override { }
     virtual void visit(const StructPort& /* aObj */) override { }
+    virtual void visit(const StructPortSymbol& /* aObj */) override { }
     virtual void visit(const StructSthInHierarchy1& /* aObj */) override { }
     virtual void visit(const StructSthInHierarchy2& /* aObj */) override { }
     virtual void visit(const StructSthInHierarchy3& /* aObj */) override { }