From 11390867f13e211f1a3c251c37101f17c60b43a8 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 15 Mar 2021 23:45:33 +0100 Subject: [PATCH] A more compact string representation for Hurricane::Path. --- hurricane/src/hurricane/Path.cpp | 17 +++++++++++------ hurricane/src/hurricane/hurricane/Path.h | 2 +- hurricane/src/isobar/PyCell.cpp | 1 + 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/hurricane/src/hurricane/Path.cpp b/hurricane/src/hurricane/Path.cpp index 821d6a26..b4e66561 100644 --- a/hurricane/src/hurricane/Path.cpp +++ b/hurricane/src/hurricane/Path.cpp @@ -256,16 +256,21 @@ void Path::setNameSeparator(char nameSeparator) SharedPath::setNameSeparator(nameSeparator); } -string Path::getCompactString() const -// ********************************** +string Path::getCompactString( bool showBrackets ) const +// ***************************************************** { - if (isEmpty()) return ""; + if (isEmpty()) { + if (not showBrackets) return "__empty__"; + return ""; + } - string s = "<"; + string s; + if (showBrackets) s += "<"; s += getString(getOwnerCell()->getName()); s += ":"; - s += getString(_sharedPath->getName()) + ":"; - s += getString(getMasterCell()->getName()) + ">"; + s += getString(_sharedPath->getName()); + if (showBrackets) + s += ":" + getString(getMasterCell()->getName()) + ">"; return s; } diff --git a/hurricane/src/hurricane/hurricane/Path.h b/hurricane/src/hurricane/hurricane/Path.h index 0af8604c..e86e4db7 100644 --- a/hurricane/src/hurricane/hurricane/Path.h +++ b/hurricane/src/hurricane/hurricane/Path.h @@ -96,7 +96,7 @@ class Path { // Others // ****** - public: string getCompactString() const; + public: string getCompactString(bool showBrackets=true) const; public: string getJsonString(unsigned long flags) const; public: string _getTypeName() const { return _TName("Occurrence"); }; public: string _getString() const; diff --git a/hurricane/src/isobar/PyCell.cpp b/hurricane/src/isobar/PyCell.cpp index c6d1938d..efda9ffe 100644 --- a/hurricane/src/isobar/PyCell.cpp +++ b/hurricane/src/isobar/PyCell.cpp @@ -866,6 +866,7 @@ extern "C" { LoadObjectConstant(PyTypeCell.tp_dict,Cell::Flags::BuildClockRings ,"Flags_BuildClockRings"); LoadObjectConstant(PyTypeCell.tp_dict,Cell::Flags::BuildSupplyRings,"Flags_BuildSupplyRings"); LoadObjectConstant(PyTypeCell.tp_dict,Cell::Flags::NoClockFlatten ,"Flags_NoClockFlatten"); + LoadObjectConstant(PyTypeCell.tp_dict,Cell::Flags::TerminalNetlist ,"Flags_TerminalNetlist"); LoadObjectConstant(PyTypeCell.tp_dict,Cell::Flags::AbstractedSupply,"Flags_AbstractedSupply"); }