tidy round1

.clang-tidy

@@ -0,0 +1,77 @@
+Checks: >
+  clang-diagnostic-*,
+  clang-analyzer-*,
+  -clang-analyzer-core.NonNullParamChecker,
+  -clang-analyzer-core.CallAndMessage,
+  -clang-analyzer-core.uninitialized.UndefReturn,
+  -clang-analyzer-cplusplus.NewDeleteLeaks,
+  -clang-analyzer-optin.performance.Padding,
+  readability-*,
+  -readability-identifier-naming,
+  -readability-braces-around-statements,
+  -readability-convert-member-functions-to-static,
+  -readability-else-after-return,
+  -readability-function-cognitive-complexity,
+  -readability-inconsistent-ifelse-braces,
+  -readability-identifier-length,
+  -readability-implicit-bool-conversion,
+  -readability-isolate-declaration,
+  -readability-magic-numbers,
+  -readability-make-member-function-const,
+  -readability-math-missing-parentheses,
+  -readability-named-parameter,
+  -readability-qualified-auto,
+  -readability-redundant-access-specifiers,
+  -readability-simplify-boolean-expr,
+  -readability-static-definition-in-anonymous-namespace,
+  -readability-suspicious-call-argument,
+  -readability-uppercase-literal-suffix,
+  -readability-use-anyofallof,
+  google-*,
+  -google-readability-avoid-underscore-in-googletest-name,
+  -google-readability-braces-around-statements,
+  -google-readability-casting,
+  -google-readability-todo,
+  -google-runtime-references,
+  -google-explicit-constructor,
+  performance-*,
+  -performance-enum-size,
+  bugprone-*,
+  -bugprone-branch-clone,
+  -bugprone-easily-swappable-parameters,
+  -bugprone-exception-escape,
+  -bugprone-macro-parentheses,
+  -bugprone-move-forwarding-reference,
+  -bugprone-narrowing-conversions,
+  -bugprone-suspicious-missing-comma,
+  -bugprone-throwing-static-initialization,
+  modernize-*,
+  -modernize-avoid-bind,
+  -modernize-avoid-c-arrays,
+  -modernize-concat-nested-namespaces,
+  -modernize-macro-to-enum,
+  -modernize-pass-by-value,
+  -modernize-raw-string-literal,
+  -modernize-return-braced-init-list,
+  -modernize-use-auto,
+  -modernize-use-nodiscard,
+  -modernize-use-trailing-return-type,
+  -modernize-use-transparent-functors,
+  misc-*,
+  -misc-const-correctness,
+  -misc-no-recursion,
+  -misc-non-private-member-variables-in-classes,
+  -misc-redundant-expression,
+  -misc-unused-parameters,
+  -misc-use-anonymous-namespace,
+  -misc-use-internal-linkage,
+  -misc-include-cleaner
+
+# Only report diagnostics in headers under this tree (app/, include/sta/, build-generated
+# headers, etc.).
+# Excludes system and third-party paths such as /opt/local/include.
+HeaderFilterRegex: '.*/(app|cmake|dcalc|graph|liberty|network|parasitics|power|sdc|sdf|search|spice|tcl|util|verilog|include/sta|build/include/sta)/.*'
+
+# Bison-generated parser headers (build/{Liberty,Verilog,...}Parse.hh); gzstream (e.g. util/gzstream.hh).
+ExcludeHeaderFilterRegex: '.*/(gzstream\.h(?:h)?|(?:Liberty|Verilog|Sdf|Spef|Saif|LibExpr)Parse\.hh)$'
+FormatStyle: none

.cursor/rules/cpp-coding-standards.mdc

@@ -31,3 +31,29 @@ alwaysApply: false
 
 - C++ source: `.cc`
 - C++ headers: `.hh`
+
+## Include order
+
+Sort `#include` lines **lexicographically by the path inside** `<>`
+or `""` (case-sensitive). Separate **groups** with a single blank line.
+
+### Translation units (`*.cc`)
+
+1. **Primary header(s)** for this file only:
+   - `#include "Stem.hh"` where `Stem` matches the basename of the `.cc` file (e.g. `Foo.cc` → `Foo.hh`).
+   - If the file uses a paired private header, include `#include "StemPvt.hh"` **immediately after** `Stem.hh` (e.g. `MakeTimingModel.cc` → `MakeTimingModel.hh` then `MakeTimingModelPvt.hh`).
+   - Do **not** pull in other headers just because their names share a prefix with `Stem` (e.g. `SearchClass.hh` is not a “primary” include for `Search.cc`; it belongs in the project group below).
+
+2. **System / standard library** headers: `#include <...>` lines, sorted alphabetically.
+
+3. **All other project** headers: `#include "..."` lines, sorted alphabetically (including `search/Crpr.hh`-style paths and includes from `liberty/`, etc.).
+
+If a **comment or special block** intentionally splits the include list (e.g. a third-party note before `#include "cudd.h"`), keep that structure; sort only within each contiguous run of `#include` lines unless merging groups is clearly safe.
+
+### Headers (`*.hh`)
+
+After `#pragma once` (and the file’s license block, if present):
+
+1. **System** `#include <...>` lines, sorted alphabetically.
+
+2. **Project** `#include "..."` lines, sorted alphabetically.

CMakeLists.txt

@@ -1,5 +1,5 @@
 # OpenSTA, Static Timing Analyzer
-# Copyright (c) 2025, Parallax Software, Inc.
+# Copyright (c) 2026, Parallax Software, Inc.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

app/StaMain.cc

@@ -148,4 +148,4 @@ unencode(const char *inits[])
   return unencoded;
 }
 
-} // namespace
+} // namespace sta

dcalc/ArcDcalcWaveforms.cc

@@ -83,4 +83,4 @@ ArcDcalcWaveforms::inputWaveform(ArcDcalcArg &dcalc_arg,
   return Waveform();
 }
 
-} // namespace
+} // namespace sta

dcalc/ArcDcalcWaveforms.hh

@@ -51,5 +51,5 @@ protected:
                          const StaState *sta);
 };
 
-} // namespace
+} // namespace sta
 

dcalc/ArcDelayCalc.cc

@@ -135,7 +135,7 @@ ArcDcalcArg::ArcDcalcArg(const Pin *in_pin,
                          const Pin *drvr_pin,
                          Edge *edge,
                          const TimingArc *arc,
-                         const Slew in_slew,
+                         Slew in_slew,
                          float load_cap,
                          const Parasitic *parasitic) :
   in_pin_(in_pin),
@@ -305,4 +305,4 @@ ArcDcalcResult::setLoadSlew(size_t load_idx,
   load_slews_[load_idx] = load_slew;
 }
 
-} // namespace
+} // namespace sta

dcalc/Arnoldi.hh

@@ -86,4 +86,4 @@ struct timing_table
   float in_slew;
 };
 
-} // namespace
+} // namespace sta

dcalc/ArnoldiDelayCalc.cc

@@ -1488,4 +1488,4 @@ ArnoldiDelayCalc::ar1_ceff_delay(delay_work *D,
   }
 }
 
-} // namespace
+} // namespace sta

dcalc/ArnoldiDelayCalc.hh

@@ -32,4 +32,4 @@ class StaState;
 ArcDelayCalc *
 makeArnoldiDelayCalc(StaState *sta);
 
-} // namespace
+} // namespace sta

dcalc/ArnoldiReduce.hh

@@ -120,4 +120,4 @@ protected:
   int order;
 };
 
-} // namespace
+} // namespace sta

dcalc/CcsCeffDelayCalc.hh

@@ -155,4 +155,4 @@ protected:
   ArcDelayCalc *table_dcalc_;
 };
 
-} // namespace
+} // namespace sta

dcalc/Delay.cc

@@ -1,5 +1,5 @@
 // OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
+// Copyright (c) 2026, Parallax Software, Inc.
 // 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -43,18 +43,18 @@ initDelayConstants()
   delay_init_values[MinMax::maxIndex()] = MinMax::max()->initValue();
 }
 
-Delay::Delay() :
+Delay::Delay() noexcept :
   values_{0.0, 0.0, 0.0, 0.0}
 {
 }
 
-Delay::Delay(float mean) :
+Delay::Delay(float mean) noexcept :
   values_{mean, 0.0, 0.0, 0.0}
 {
 }
 
 Delay::Delay(float mean,
-             float std_dev2) :
+             float std_dev2) noexcept :
   values_{mean, 0.0, std_dev2, 0.0}
 {
 }
@@ -62,18 +62,19 @@ Delay::Delay(float mean,
 Delay::Delay(float mean,
              float mean_shift,
              float std_dev2,
-             float skewness) :
+             float skewness) noexcept :
   values_{mean, mean_shift, std_dev2, skewness}
 {
 }
 
-void
+Delay &
 Delay::operator=(float delay)
 {
   values_[0] = delay;
   values_[1] = 0.0;
   values_[2] = 0.0;
   values_[3] = 0.0;
+  return *this;
 }
 
 void
@@ -126,12 +127,12 @@ Delay::setSkewness(float skewness)
 
 ////////////////////////////////////////////////////////////////
 
-DelayDbl::DelayDbl() :
+DelayDbl::DelayDbl() noexcept :
   values_{0.0, 0.0, 0.0, 0.0}
 {
 }
 
-DelayDbl::DelayDbl(double mean) :
+DelayDbl::DelayDbl(double mean) noexcept :
   values_{mean, 0.0, 0.0, 0.0}
 {
 }
@@ -166,13 +167,14 @@ DelayDbl::setValues(double mean,
   values_[3] = skewnes;  
 }
 
-void
+DelayDbl &
 DelayDbl::operator=(double delay)
 {
   values_[0] = delay;
   values_[1] = 0.0;
   values_[2] = 0.0;
   values_[3] = 0.0;
+  return *this;
 }
 
 ////////////////////////////////////////////////////////////////
@@ -520,4 +522,4 @@ delayStdDev2(const Delay &delay,
   return sta->delayOps()->stdDev2(delay, early_late);
 }
 
-} // namespace
+} // namespace sta

dcalc/DelayCalc.cc

@@ -93,4 +93,4 @@ delayCalcNames()
   return names;
 }
 
-} // namespace
+} // namespace sta

dcalc/DelayCalcBase.cc

@@ -239,4 +239,4 @@ DelayCalcBase::setDcalcArgParasiticSlew(ArcDcalcArgSeq &gates,
     setDcalcArgParasiticSlew(gate, scene, min_max);
 }
 
-} // namespace
+} // namespace sta

dcalc/DelayCalcBase.hh

@@ -89,4 +89,4 @@ protected:
   using ArcDelayCalc::reduceParasitic;
 };
 
-} // namespace
+} // namespace sta

dcalc/DelayNormal.cc

@@ -1,5 +1,5 @@
 // OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
+// Copyright (c) 2026, Parallax Software, Inc.
 // 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -229,4 +229,4 @@ DelayOpsNormal::asStringVariance(const Delay &delay,
                      unit->asString(delay.stdDev(), digits));
 }
 
-} // namespace
+} // namespace sta

dcalc/DelayScalar.cc

@@ -1,5 +1,5 @@
 // OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
+// Copyright (c) 2026, Parallax Software, Inc.
 // 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -202,5 +202,5 @@ DelayOpsScalar::asStringVariance(const Delay &delay,
   return unit->asString(delay.mean(), digits);
 }
 
-} // namespace
+} // namespace sta
 

dcalc/DelaySkewNormal.cc

@@ -1,5 +1,5 @@
 // OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
+// Copyright (c) 2026, Parallax Software, Inc.
 // 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -290,4 +290,4 @@ DelayOpsSkewNormal::asStringVariance(const Delay &delay,
                      sta->units()->scalarUnit()->asString(delay.skewness(), digits));
 }
 
-} // namespace
+} // namespace sta

dcalc/DmpCeff.hh

@@ -101,4 +101,4 @@ private:
   DmpAlg *dmp_alg_;
 };
 
-} // namespace
+} // namespace sta

dcalc/DmpDelayCalc.cc

@@ -436,4 +436,4 @@ DmpCeffTwoPoleDelayCalc::loadDelay(double vth,
   }
 }
 
-} // namespace
+} // namespace sta

dcalc/DmpDelayCalc.hh

@@ -34,4 +34,4 @@ makeDmpCeffElmoreDelayCalc(StaState *sta);
 ArcDelayCalc *
 makeDmpCeffTwoPoleDelayCalc(StaState *sta);
 
-} // namespace
+} // namespace sta

dcalc/FindRoot.cc

@@ -98,4 +98,4 @@ findRoot(FindRootFunc func,
   return {root, true};
 }
 
-} // namespace
+} // namespace sta

dcalc/FindRoot.hh

@@ -52,4 +52,4 @@ findRoot(FindRootFunc func,
          double x_tol,
          int max_iter);
 
-} // namespace
+} // namespace sta

dcalc/GraphDelayCalc.cc

@@ -1828,4 +1828,4 @@ MultiDrvrNet::parallelGates(const Network *network) const
   return network->direction(dcalc_drvr_->pin())->isOutput();
 }
 
-} // namespace
+} // namespace sta

dcalc/LumpedCapDelayCalc.cc

@@ -203,4 +203,4 @@ LumpedCapDelayCalc::reportGateDelay(const Pin *check_pin,
   return "";
 }
 
-} // namespace
+} // namespace sta

dcalc/LumpedCapDelayCalc.hh

@@ -84,4 +84,4 @@ protected:
 ArcDelayCalc *
 makeLumpedCapDelayCalc(StaState *sta);
 
-} // namespace
+} // namespace sta

dcalc/NetCaps.cc

@@ -53,4 +53,4 @@ NetCaps::init(float pin_cap,
   has_net_load_ = has_net_load;
 }
 
-} // namespace
+} // namespace sta

dcalc/NetCaps.hh

@@ -51,4 +51,4 @@ private:
   bool has_net_load_;
 };
 
-} // namespace
+} // namespace sta

dcalc/ParallelDelayCalc.cc

@@ -118,4 +118,4 @@ ParallelDelayCalc::gateDelaysParallel(ArcDcalcArgSeq &dcalc_args,
   return dcalc_results;
 }
 
-} // namespace
+} // namespace sta

dcalc/ParallelDelayCalc.hh

@@ -47,4 +47,4 @@ protected:
                                        const MinMax *min_max);
 };
 
-} // namespace
+} // namespace sta

dcalc/PrimaDelayCalc.hh

@@ -263,4 +263,4 @@ protected:
   using ArcDelayCalc::reduceParasitic;
 };
 
-} // namespace
+} // namespace sta

dcalc/UnitDelayCalc.cc

@@ -187,4 +187,4 @@ UnitDelayCalc::finishDrvrPin()
 {
 }
 
-} // namespace
+} // namespace sta

dcalc/UnitDelayCalc.hh

@@ -109,4 +109,4 @@ protected:
 ArcDelayCalc *
 makeUnitDelayCalc(StaState *sta);
 
-} // namespace
+} // namespace sta

doc/StaApi.txt

@@ -108,9 +108,6 @@ in a class derived from Sta. Because the components refer to each
 other, Sta::updateComponentsState() must be called to notify the
 components if any of them are changed after creation. 
 
-The file liberty/LibertyExt.cc contains an example that shows how the
-liberty reader is replaced with a custom one on the Sta object.
-
 Units
 -----
 
@@ -291,7 +288,7 @@ in this arc set:
   S r -> Z f
 
 The liberty file reader can be customized to read attributes that are
-not used by the STA. See liberty/LibertyExt.cc for an example.
+not used by the STA.
 
 Graph
 -----

graph/Graph.cc

@@ -1580,4 +1580,4 @@ VertexIdLess::operator()(const Vertex *vertex1,
 }
 
 
-} // namespace
+} // namespace sta

include/sta/ArcDelayCalc.hh

@@ -63,7 +63,7 @@ public:
               const Pin *drvr_pin,
               Edge *edge,
               const TimingArc *arc,
-              const Slew in_slew,
+              Slew in_slew,
               float load_cap,
               const Parasitic *parasitic);
   ArcDcalcArg(const Pin *in_pin,
@@ -160,7 +160,6 @@ class ArcDelayCalc : public StaState
 {
 public:
   ArcDelayCalc(StaState *sta);
-  virtual ~ArcDelayCalc() {}
   virtual ArcDelayCalc *copy() = 0;
   virtual std::string_view name() const = 0;
 
@@ -262,4 +261,4 @@ public:
   virtual void finishDrvrPin() = 0;
 };
 
-} // namespace
+} // namespace sta

include/sta/Bdd.hh

@@ -41,7 +41,7 @@ class Bdd : public StaState
 {
 public:
   Bdd(const StaState *sta);
-  ~Bdd();
+  ~Bdd() override;
   DdNode *funcBdd(const FuncExpr *expr);
   DdNode *findNode(const LibertyPort *port);
   const LibertyPort *nodePort(DdNode *node);
@@ -58,4 +58,4 @@ private:
   BddVarIdxPortMap bdd_var_idx_port_map_;
 };
 
-} // namespace
+} // namespace sta

include/sta/Bfs.hh

@@ -50,10 +50,10 @@ using LevelQueue = std::vector<VertexSeq>;
 // Vertices are marked as being in the queue by using a flag on
 // the vertex indexed by bfs_index.  A unique flag is only needed
 // if the BFS in in use when other BFS's are simultaneously in use.
-class BfsIterator : public StaState, Iterator<Vertex*>
+class BfsIterator : public StaState,
+                    public Iterator<Vertex*>
 {
 public:
-  virtual ~BfsIterator();
   // Make sure that the BFS queue is deep enough for the max logic level.
   void ensureSize();
   // Reset to virgin state.
@@ -130,7 +130,7 @@ public:
   BfsFwdIterator(BfsIndex bfs_index,
 		 SearchPred *search_pred,
 		 StaState *sta);
-  virtual ~BfsFwdIterator();
+  ~BfsFwdIterator() override;
   void enqueueAdjacentVertices(Vertex *vertex,
                               SearchPred *search_pred) override;
   void enqueueAdjacentVertices(Vertex *vertex,
@@ -152,7 +152,7 @@ public:
   BfsBkwdIterator(BfsIndex bfs_index,
 		  SearchPred *search_pred,
 		  StaState *sta);
-  virtual ~BfsBkwdIterator();
+  ~BfsBkwdIterator() override;
   void enqueueAdjacentVertices(Vertex *vertex,
                               SearchPred *search_pred) override;
   void enqueueAdjacentVertices(Vertex *vertex,
@@ -168,4 +168,4 @@ protected:
   void incrLevel(Level &level) const override;
 };
 
-} // namespace
+} // namespace sta

include/sta/CircuitSim.hh

@@ -28,4 +28,4 @@ namespace sta {
 
 enum class CircuitSim { hspice, ngspice, xyce };
 
-} // namespace
+} // namespace sta

include/sta/ClkNetwork.hh

@@ -44,7 +44,7 @@ class ClkNetwork : public StaState
 public:
   ClkNetwork(Mode *mode,
              StaState *sta);
-  ~ClkNetwork();
+  ~ClkNetwork() override;
   void ensureClkNetwork();
   void clear();
   bool isClock(const Pin *pin) const;
@@ -73,9 +73,9 @@ private:
 
   void findClkPins();
   void findClkPins(bool ideal_only,
-                   PinClksMap &clk_pin_map);
+                   PinClksMap &pin_clks_map);
 
-  bool clk_pins_valid_;
+  bool clk_pins_valid_{false};
   // pin -> clks
   PinClksMap pin_clks_map_;
   // pin -> ideal clks
@@ -84,4 +84,4 @@ private:
   ClkPinsMap clk_pins_map_;
 };
 
-} // namespace
+} // namespace sta

include/sta/Clock.hh

@@ -82,11 +82,11 @@ public:
   void removeSlew();
   const RiseFallMinMax &slews() const { return slews_; }
   void setSlewLimit(const RiseFallBoth *rf,
-                    const PathClkOrData clk_data,
+                    PathClkOrData clk_data,
                     const MinMax *min_max,
                     float slew);
   void slewLimit(const RiseFall *rf,
-                 const PathClkOrData clk_data,
+                 PathClkOrData clk_data,
                  const MinMax *min_max,
                  // Return values.
                  float &slew,
@@ -291,4 +291,4 @@ int
 compare(const ClockSet *set1,
         const ClockSet *set2);
 
-} // namespace
+} // namespace sta

include/sta/ClockGatingCheck.hh

@@ -42,4 +42,4 @@ private:
   LogicValue active_value_;
 };
 
-} // namespace
+} // namespace sta

include/sta/ClockGroups.hh

@@ -34,12 +34,12 @@ namespace sta {
 class ClockGroups : public SdcCmdComment
 {
 public:
-  ClockGroups(const std::string &name,
+  ClockGroups(std::string_view name,
               bool logically_exclusive,
               bool physically_exclusive,
               bool asynchronous,
               bool allow_paths,
-              std::string comment);
+              std::string_view comment);
   ~ClockGroups();
   void makeClockGroup(ClockSet *clks);
   const std::string &name() const { return name_; }
@@ -59,4 +59,4 @@ private:
   ClockGroupSet groups_;
 };
 
-} // namespace
+} // namespace sta

include/sta/ClockInsertion.hh

@@ -57,4 +57,4 @@ private:
   RiseFallMinMax delays_[EarlyLate::index_count];
 };
 
-} // namespace
+} // namespace sta

include/sta/ClockLatency.hh

@@ -61,4 +61,4 @@ private:
   RiseFallMinMax delays_;
 };
 
-} // namespace
+} // namespace sta

include/sta/ConcreteLibrary.hh

@@ -127,12 +127,12 @@ public:
   ConcretePort *makeBundlePort(std::string_view name,
                                ConcretePortSeq *members);
   // Group previously defined bus bit ports together.
-  void groupBusPorts(const char bus_brkt_left,
-                     const char bus_brkt_right,
+  void groupBusPorts(char bus_brkt_left,
+                     char bus_brkt_right,
                      std::function<bool(std::string_view)> port_msb_first);
   size_t portCount() const;
   void setName(std::string_view name);
-  void addPort(ConcretePort *port);
+  virtual void addPort(ConcretePort *port);
   void addPortBit(ConcretePort *port);
 
 protected:
@@ -275,4 +275,4 @@ private:
   ConcretePort *next_;
 };
 
-} // Namespace
+} // namespace sta

include/sta/ConcreteNetwork.hh

@@ -62,7 +62,7 @@ class ConcreteNetwork : public NetworkReader
 {
 public:
   ConcreteNetwork();
-  ~ConcreteNetwork();
+  ~ConcreteNetwork() override;
   void clear() override;
   bool linkNetwork(std::string_view top_cell_name,
                    bool make_black_boxes,
@@ -354,7 +354,7 @@ public:
   void setVertexId(VertexId id);
 
 protected:
-  ~ConcretePin() {}
+  ~ConcretePin() = default;
   ConcretePin(ConcreteInstance *instance,
               ConcretePort *port,
               ConcreteNet *net);
@@ -384,7 +384,7 @@ public:
   ConcretePin *pin() const { return pin_; }
 
 protected:
-  ~ConcreteTerm() {}
+  ~ConcreteTerm() = default;
   ConcreteTerm(ConcretePin *pin,
                ConcreteNet *net);
 
@@ -432,4 +432,4 @@ protected:
   friend class ConcreteNetPinIterator;
 };
 
-} // namespace
+} // namespace sta

include/sta/ContainerHelpers.hh

@@ -42,7 +42,8 @@ namespace sta {
 // 1. Sequence containers (vector<T*>, list<T*>, deque<T*>, …)
 // ------------------------------------------------------------
 template <typename Container>
-std::enable_if_t<std::is_pointer_v<typename Container::value_type>>
+requires std::is_pointer_v<typename Container::value_type>
+void
 deleteContents(Container& c)
 {
   for (auto ptr : c)
@@ -51,7 +52,8 @@ deleteContents(Container& c)
 }
 
 template <typename Container>
-std::enable_if_t<std::is_pointer_v<typename Container::value_type>>
+requires std::is_pointer_v<typename Container::value_type>
+void
 deleteContents(Container *c)
 {
   for (auto ptr : *c)
@@ -63,8 +65,8 @@ deleteContents(Container *c)
 // 2. Maps (map<K, T*>, unordered_map<K, T*>)
 // ------------------------------------------------------------
 template <typename Map>
-std::enable_if_t<std::is_pointer_v<typename Map::mapped_type>
->
+requires std::is_pointer_v<typename Map::mapped_type>
+void
 deleteContents(Map& m)
 {
   for (auto& kv : m)
@@ -73,8 +75,8 @@ deleteContents(Map& m)
 }
 
 template <typename Map>
-std::enable_if_t<std::is_pointer_v<typename Map::mapped_type>
->
+requires std::is_pointer_v<typename Map::mapped_type>
+void
 deleteContents(Map *m)
 {
   for (auto& kv : *m)
@@ -86,10 +88,10 @@ deleteContents(Map *m)
 // 3. Sets (set<T*>, unordered_set<T*>)
 // ------------------------------------------------------------
 template <typename Set>
-std::enable_if_t<
-  std::is_pointer_v<typename Set::value_type> &&
-  !std::is_same_v<typename Set::value_type, typename Set::mapped_type>
->
+requires (std::is_pointer_v<typename Set::value_type> &&
+          requires { typename Set::mapped_type; } &&
+          !std::is_same_v<typename Set::value_type, typename Set::mapped_type>)
+void
 deleteContents(Set& s)
 {
   for (auto ptr : s)
@@ -119,28 +121,28 @@ struct find_return;
 template<typename C>
 struct find_return<C*, true>
 {
-  using type = typename C::mapped_type;
+  using type = C::mapped_type;
 };
 
 // pointer to set
 template<typename C>
 struct find_return<C*, false>
 {
-  using type = typename C::key_type;
+  using type = C::key_type;
 };
 
 // map ref
 template<typename C>
 struct find_return<C, true>
 {
-  using type = typename C::mapped_type;
+  using type = C::mapped_type;
 };
 
 // set ref
 template<typename C>
 struct find_return<C, false>
 {
-  using type = typename C::key_type;
+  using type = C::key_type;
 };
 
 
@@ -149,10 +151,10 @@ struct find_return<C, false>
 template<typename AssocContainer>
 auto
 findKey(const AssocContainer& c,
-        typename AssocContainer::key_type key)
-    -> typename find_return<AssocContainer>::type
+        const typename AssocContainer::key_type& key)
+    -> find_return<AssocContainer>::type
 {
-  using ReturnType = typename find_return<AssocContainer>::type;
+  using ReturnType = find_return<AssocContainer>::type;
 
   static_assert(std::is_pointer_v<ReturnType>,
                 "findKey requires pointer types");
@@ -173,9 +175,9 @@ template<typename AssocContainer>
 auto
 findStringKey(const AssocContainer& c,
               std::string_view key)
-    -> typename find_return<AssocContainer>::type
+    -> find_return<AssocContainer>::type
 {
-  using ReturnType = typename find_return<AssocContainer>::type;
+  using ReturnType = find_return<AssocContainer>::type;
 
   static_assert(std::is_pointer_v<ReturnType>,
                 "findStringKey requires pointer types");
@@ -194,8 +196,8 @@ findStringKey(const AssocContainer& c,
 template<typename AssocContainer>
 auto
 findKeyValue(const AssocContainer& c,
-             typename AssocContainer::key_type key)
-  -> const typename find_return<AssocContainer>::type &
+             const typename AssocContainer::key_type& key)
+  -> const find_return<AssocContainer>::type &
 {
   auto it = c.find(key);
   if (it != c.end()) {
@@ -213,7 +215,7 @@ findKeyValue(const AssocContainer& c,
 template<typename AssocContainer>
 void
 findKeyValue(const AssocContainer& c,
-             typename AssocContainer::key_type key,
+             const typename AssocContainer::key_type& key,
              typename find_return<AssocContainer>::type &value,
              bool &exists)
 {
@@ -240,7 +242,7 @@ findKeyValue(const AssocContainer& c,
 template<typename AssocContainer>
 void
 findKeyValue(const AssocContainer *c,
-             typename AssocContainer::key_type key,
+             const typename AssocContainer::key_type& key,
              typename find_return<AssocContainer>::type &value,
              bool &exists)
 {
@@ -269,8 +271,8 @@ findKeyValue(const AssocContainer *c,
 template<typename AssocContainer>
 auto
 findKeyValuePtr(AssocContainer& c,
-                typename AssocContainer::key_type key)
-  -> typename find_return<AssocContainer>::type*
+                 const typename AssocContainer::key_type& key)
+  -> find_return<AssocContainer>::type*
 {
   auto it = c.find(key);
   if (it == c.end())
@@ -289,8 +291,8 @@ findKeyValuePtr(AssocContainer& c,
 template<typename AssocContainer>
 auto
 findKeyValuePtr(const AssocContainer& c,
-                typename AssocContainer::key_type key)
-  -> typename find_return<AssocContainer>::type const*
+                 const typename AssocContainer::key_type& key)
+  -> find_return<AssocContainer>::type const*
 {
   auto it = c.find(key);
   if (it == c.end())
@@ -310,8 +312,8 @@ findKeyValuePtr(const AssocContainer& c,
 template<typename AssocContainer>
 auto
 findStringValuePtr(AssocContainer& c,
-                   std::string_view key)
-  -> typename find_return<AssocContainer>::type*
+                    std::string_view key)
+  -> find_return<AssocContainer>::type*
 {
   auto it = c.find(key);
   if (it == c.end())
@@ -326,8 +328,8 @@ findStringValuePtr(AssocContainer& c,
 template<typename AssocContainer>
 auto
 findStringValuePtr(const AssocContainer& c,
-                   std::string_view key)
-  -> typename find_return<AssocContainer>::type const*
+                    std::string_view key)
+  -> find_return<AssocContainer>::type const*
 {
   auto it = c.find(key);
   if (it == c.end())
@@ -435,7 +437,7 @@ requires std::predicate<Comp&,
                         std::ranges::range_reference_t<Range>>
 void
 sort(Range& r,
-     Comp comp = Comp{})
+     const Comp &comp = Comp{})
 {
   std::sort(std::ranges::begin(r), std::ranges::end(r), comp);
 }
@@ -450,9 +452,9 @@ requires std::ranges::random_access_range<Range> &&
                         std::ranges::range_reference_t<Range>>
 void
 sort(Range* r,
-     Comp comp = Comp{})
+     const Comp &comp = Comp{})
 {
   std::sort(std::ranges::begin(*r), std::ranges::end(*r), comp);
 }
 
-} // namespace
+} // namespace sta

include/sta/CycleAccting.hh

@@ -130,4 +130,4 @@ private:
   bool max_cycles_exceeded_;
 };
 
-} // namespace
+} // namespace sta

include/sta/DataCheck.hh

@@ -79,4 +79,4 @@ private:
   const Network *network_;
 };
 
-} // namespace
+} // namespace sta

include/sta/Debug.hh

@@ -64,9 +64,9 @@ public:
 protected:
   Report *report_;
   std::mutex buffer_lock_;
-  bool debug_on_;
+  bool debug_on_{false};
   DebugMap debug_map_;
-  int stats_level_;
+  int stats_level_{0};
 };
 
 // Inlining a varargs function would eval the args, which can
@@ -76,4 +76,4 @@ protected:
     debug->report(what, fmt __VA_OPT__(,) __VA_ARGS__); \
   }
 
-} // namespace
+} // namespace sta

include/sta/Delay.hh

@@ -37,16 +37,16 @@ class StaState;
 class Delay
 {
 public:
-  Delay();
-  Delay(float mean);
+  Delay() noexcept;
+  Delay(float mean) noexcept;
   Delay(float mean,
         // std_dev^2
-        float std_dev2);
+        float std_dev2) noexcept;
   Delay(float mean,
         float mean_shift,
         // std_dev^2
         float std_dev2,
-        float skewness);
+        float skewness) noexcept;
   void setValues(float mean,
                  float mean_shift,
                  float std_dev2,
@@ -62,7 +62,7 @@ public:
   float skewness() const { return values_[3]; }
   void setSkewness(float skewness);
 
-  void operator=(float delay);
+  Delay &operator=(float delay);
   // This allows applications that do not support statistical timing
   // to treat Delays as floats without explicitly converting with
   // delayAsFloat.
@@ -77,8 +77,8 @@ private:
 class DelayDbl
 {
 public:
-  DelayDbl();
-  DelayDbl(double value);
+  DelayDbl() noexcept;
+  DelayDbl(double value) noexcept;
   double mean() const { return values_[0]; }
   void setMean(double mean);
   double meanShift() const { return values_[1]; }
@@ -91,7 +91,7 @@ public:
                  double std_dev2,
                  double skewnes);
 
-  void operator=(double delay);
+  DelayDbl &operator=(double delay);
 
 private:
   std::array<double, 4> values_;
@@ -108,7 +108,7 @@ const Delay delay_zero(0.0);
 class DelayOps
 {
 public:
-  virtual ~DelayOps() {}
+  virtual ~DelayOps() = default;
   virtual float stdDev2(const Delay &delay,
                         const EarlyLate *early_late) const = 0;
   virtual float asFloat(const Delay &delay,
@@ -356,4 +356,4 @@ Delay
 delayRemove(const Delay &delay1,
             const Delay &delay2);
 
-} // namespace
+} // namespace sta

include/sta/DelayCalc.hh

@@ -55,4 +55,4 @@ ArcDelayCalc *
 makeDelayCalc(std::string_view name,
               StaState *sta);
 
-} // namespace
+} // namespace sta

include/sta/DelayNormal.hh

@@ -1,5 +1,5 @@
 // OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
+// Copyright (c) 2026, Parallax Software, Inc.
 // 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -87,4 +87,4 @@ public:
                                const StaState *sta) const override;
 };
 
-} // namespace
+} // namespace sta

include/sta/DelayScalar.hh

@@ -1,5 +1,5 @@
 // OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
+// Copyright (c) 2026, Parallax Software, Inc.
 // 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -87,4 +87,4 @@ public:
                                const StaState *sta) const override;
 };
 
-} // namespace
+} // namespace sta

include/sta/DelaySkewNormal.hh

@@ -1,5 +1,5 @@
 // OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
+// Copyright (c) 2026, Parallax Software, Inc.
 // 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -95,4 +95,4 @@ private:
                      double skewness2) const;
 };
 
-} // namespace
+} // namespace sta

include/sta/DeratingFactors.hh

@@ -117,4 +117,4 @@ public:
   DeratingFactorsNet();
 };
 
-} // namespace
+} // namespace sta

include/sta/DisabledPorts.hh

@@ -111,4 +111,4 @@ sortByPathName(const DisabledInstancePortsMap *inst_map,
 LibertyPortPairSeq
 sortByName(const LibertyPortPairSet *set);
 
-} // namespace
+} // namespace sta

include/sta/DispatchQueue.hh

@@ -18,10 +18,10 @@ namespace sta {
 
 class DispatchQueue
 {
-  typedef std::function<void(int thread)> fp_t;
+  using fp_t = std::function<void(int thread)>;
 
 public:
-  DispatchQueue(size_t thread_cnt);
+  DispatchQueue(size_t thread_count);
   ~DispatchQueue();
   void setThreadCount(size_t thread_count);
   size_t getThreadCount() const;
@@ -49,4 +49,4 @@ private:
   bool quit_ = false;
 };
 
-} // namespace
+} // namespace sta

include/sta/EnumNameMap.hh

@@ -34,7 +34,8 @@ template <class ENUM>
 class EnumNameMap
 {
 public:
-  EnumNameMap(std::initializer_list<std::pair<const ENUM, std::string>> enum_names);
+  EnumNameMap(std::initializer_list<std::pair<const ENUM,
+                                              std::string>> enum_names) noexcept;
   const std::string &find(ENUM key) const;
   ENUM find(std::string_view name,
             ENUM unknown_key) const;
@@ -49,7 +50,7 @@ private:
 };
 
 template <class ENUM>
-EnumNameMap<ENUM>::EnumNameMap(std::initializer_list<std::pair<const ENUM,std::string>> enum_names) :
+EnumNameMap<ENUM>::EnumNameMap(std::initializer_list<std::pair<const ENUM,std::string>> enum_names) noexcept :
   enum_map_(enum_names)
 {
   for (const auto& [key, name] : enum_map_)
@@ -97,4 +98,4 @@ EnumNameMap<ENUM>::find(std::string_view name,
     return unknown_key;
 }
 
-} // namespace
+} // namespace sta

include/sta/EquivCells.hh

@@ -87,4 +87,4 @@ bool
 equivCellSequentials(const LibertyCell *cell1,
                      const LibertyCell *cell2);
 
-} // namespace
+} // namespace sta

include/sta/Error.hh

@@ -36,7 +36,6 @@ class Exception : public std::exception
 {
 public:
   Exception();
-  virtual ~Exception() {}
   const char *what() const noexcept override = 0;
 };
 
@@ -44,7 +43,7 @@ class ExceptionMsg : public Exception
 {
 public:
   ExceptionMsg(const std::string &msg,
-               const bool suppressed);
+               bool suppressed);
   const char *what() const noexcept override;
   bool suppressed() const { return suppressed_; }
 
@@ -93,4 +92,4 @@ protected:
 #define criticalError(id, msg) \
   Report::defaultReport()->fileCritical(id, __FILE__, __LINE__, msg)
 
-} // namespace
+} // namespace sta

include/sta/ExceptionPath.hh

@@ -70,6 +70,7 @@ public:
   virtual bool isFilter() const { return false; }
   virtual ExceptionPathType type() const = 0;
   virtual std::string to_string(const Network *network) const;
+  virtual std::string_view typeString() const = 0;
   ExceptionFrom *from() const { return from_; }
   ExceptionThruSeq *thrus() const { return thrus_; }
   ExceptionTo *to() const { return to_; }
@@ -135,7 +136,6 @@ public:
   virtual bool breakPath() const { return false; }
 
 protected:
-  virtual const char *typeString() const = 0;
   std::string fromThruToString(const Network *network) const;
   void makeStates();
 
@@ -172,7 +172,7 @@ public:
                        bool own_pts) override;
   bool isFalse() const override { return true; }
   ExceptionPathType type() const override { return ExceptionPathType::false_path; }
-  const char *typeString() const override;
+  std::string_view typeString() const override;
   bool mergeable(ExceptionPath *exception) const override;
   bool overrides(ExceptionPath *exception) const override;
   int typePriority() const override;
@@ -188,7 +188,7 @@ public:
            bool own_pts);
   bool isLoop() const override { return true; }
   ExceptionPathType type() const override { return ExceptionPathType::loop; }
-  const char *typeString() const override;
+  std::string_view typeString() const override;
   bool mergeable(ExceptionPath *exception) const override;
 };
 
@@ -212,7 +212,7 @@ public:
   bool isPathDelay() const override { return true; }
   ExceptionPathType type() const override { return ExceptionPathType::path_delay; }
   std::string to_string(const Network *network) const override;
-  const char *typeString() const override;
+  std::string_view typeString() const override;
   bool mergeable(ExceptionPath *exception) const override;
   bool overrides(ExceptionPath *exception) const override;
   float delay() const override { return delay_; }
@@ -248,7 +248,7 @@ public:
   bool matches(const MinMax *min_max,
                bool exactly) const override;
   std::string to_string(const Network *network) const override;
-  const char *typeString() const override;
+  std::string_view typeString() const override;
   bool mergeable(ExceptionPath *exception) const override;
   bool overrides(ExceptionPath *exception) const override;
   bool useEndClk() const override { return use_end_clk_; }
@@ -279,7 +279,7 @@ public:
                        bool own_pts) override;
   bool isFilter() const override { return true; }
   ExceptionPathType type() const override { return ExceptionPathType::filter; }
-  const char *typeString() const override;
+  std::string_view typeString() const override;
   bool mergeable(ExceptionPath *exception) const override;
   bool overrides(ExceptionPath *exception) const override;
   bool resetMatch(ExceptionFrom *from,
@@ -308,7 +308,7 @@ public:
                        bool own_pts) override;
   bool isGroupPath() const override { return true; }
   ExceptionPathType type() const override { return ExceptionPathType::group_path; }
-  const char *typeString() const override;
+  std::string_view typeString() const override;
   bool mergeable(ExceptionPath *exception) const override;
   bool overrides(ExceptionPath *exception) const override;
   int typePriority() const override;
@@ -327,7 +327,7 @@ class ExceptionPt
 public:
   ExceptionPt(const RiseFallBoth *rf,
               bool own_pts);
-  virtual ~ExceptionPt() {};
+  virtual ~ExceptionPt() = default;
   virtual bool isFrom() const { return false; }
   virtual bool isThru() const { return false; }
   virtual bool isTo() const { return false; }
@@ -386,7 +386,7 @@ public:
                   const RiseFallBoth *rf,
                   bool own_pts,
                   const Network *network);
-  ~ExceptionFromTo();
+  ~ExceptionFromTo() override;
   PinSet *pins() override { return pins_; }
   bool hasPins() const;
   ClockSet *clks() override { return clks_; }
@@ -512,7 +512,7 @@ public:
                 const RiseFallBoth *rf,
                 bool own_pts,
                 const Network *network);
-  ~ExceptionThru();
+  ~ExceptionThru() override;
   ExceptionThru *clone(const Network *network);
   std::string to_string(const Network *network) const override;
   bool isThru() const override { return true; }
@@ -538,15 +538,6 @@ public:
                      const Network *network) const;
   int typePriority() const override { return 2; }
   size_t objectCount() const override;
-  void connectPinAfter(PinSet *drvrs,
-		       Network *network) override;
-  void deletePinBefore(const Pin *pin,
-                       Network *network) override;
-  void deleteInstance(const Instance *inst,
-                      const Network *network);
-
-protected:
-  void findHash(const Network *network);
   void addPin(const Pin *pin,
               const Network *network) override;
   void addEdge(const EdgePins &edge,
@@ -556,6 +547,15 @@ protected:
   void addInstance(const Instance *inst,
                    const Network *network) override;
   void addClock(Clock *) override {}
+  void connectPinAfter(PinSet *drvrs,
+		       Network *network) override;
+  void deletePinBefore(const Pin *pin,
+                       Network *network) override;
+  void deleteInstance(const Instance *inst,
+                      const Network *network);
+
+protected:
+  void findHash(const Network *network);
   void deletePin(const Pin *pin,
                  const Network *network);
   void deleteEdge(const EdgePins &edge);
@@ -620,7 +620,6 @@ class ExpandedExceptionVisitor
 public:
   ExpandedExceptionVisitor(ExceptionPath *exception,
                            const Network *network);
-  virtual ~ExpandedExceptionVisitor() {}
   void visitExpansions();
   // From/thrus/to have a single exception point (pin/instance/net/clock).
   virtual void visit(ExceptionFrom *from,
@@ -678,7 +677,7 @@ exceptionStateCmp(const ExceptionState *state1,
 class EmptyExpceptionPt : public Exception
 {
 public:
-  virtual const char *what() const noexcept;
+  const char *what() const noexcept override;
 };
 
 class ExceptionPathLess
@@ -698,4 +697,4 @@ checkFromThrusTo(ExceptionFrom *from,
                  ExceptionThruSeq *thrus,
                  ExceptionTo *to);
 
-} // namespace
+} // namespace sta

include/sta/FilterObjects.hh

@@ -1,5 +1,5 @@
 // OpenSTA, Static Timing Analyzer
-// Copyright (c) 2025, Parallax Software, Inc.
+// Copyright (c) 2026, Parallax Software, Inc.
 // 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 #include <string_view>
 #include <vector>
 
+#include "GraphClass.hh"
 #include "NetworkClass.hh"
 #include "SdcClass.hh"
 #include "SearchClass.hh"
@@ -93,4 +94,4 @@ StringSeq
 filterExprToPostfix(std::string_view expr,
                     Report *report);
 
-} // namespace
+} // namespace sta

include/sta/FuncExpr.hh

@@ -105,4 +105,4 @@ private:
 FuncExpr *
 funcExprNot(FuncExpr *expr);
 
-} // namespace
+} // namespace sta

include/sta/Fuzzy.hh

@@ -48,4 +48,4 @@ fuzzyGreaterEqual(float v1,
 bool
 fuzzyInf(float value);
 
-} // namespace
+} // namespace sta

include/sta/Graph.hh

@@ -61,7 +61,7 @@ public:
   Graph(StaState *sta,
         DcalcAPIndex ap_count);
   void makeGraph();
-  ~Graph();
+  ~Graph() override;
 
   // Number of arc delays and slews from sdf or delay calculation.
   void setDelayCount(DcalcAPIndex ap_count);
@@ -291,8 +291,8 @@ protected:
             bool is_bidirect_drvr,
             bool is_reg_clk);
   void clear();
-  Slew *slews() { return std::bit_cast<Slew*>(slews_); }
-  const Slew *slews() const { return std::bit_cast<const Slew*>(slews_); }
+  Slew *slews() { return reinterpret_cast<Slew*>(slews_); }
+  const Slew *slews() const { return reinterpret_cast<const Slew*>(slews_); }
   float *slewsFloat() { return slews_; }
   const float *slewsFloat() const { return slews_; }
   void setSlews(float *slews);
@@ -491,4 +491,4 @@ makeVertexSet(StaState *sta)
   return VertexSet(VertexIdLess(sta->graphRef()));
 }
 
-} // namespace
+} // namespace sta

include/sta/GraphClass.hh

@@ -76,4 +76,4 @@ static constexpr int slew_annotated_bits = MinMax::index_count * RiseFall::index
 // Bit shifts used to mark vertices in a Bfs queue.
 enum class BfsIndex { dcalc, arrival, required, other, bits };
 
-} // namespace
+} // namespace sta

include/sta/GraphCmp.hh

@@ -59,4 +59,4 @@ sortEdges(EdgeSeq *edges,
           Network *network,
           Graph *graph);
 
-} // namespace
+} // namespace sta

include/sta/GraphDelayCalc.hh

@@ -53,8 +53,8 @@ class GraphDelayCalc : public StaState
 {
 public:
   GraphDelayCalc(StaState *sta);
-  virtual ~GraphDelayCalc();
-  virtual void copyState(const StaState *sta);
+  ~GraphDelayCalc() override;
+  void copyState(const StaState *sta) override;
   // Set the observer for edge delay changes.
   virtual void setObserver(DelayCalcObserver *observer);
   // Invalidate all delays/slews.
@@ -323,8 +323,7 @@ protected:
 class DelayCalcObserver
 {
 public:
-  DelayCalcObserver() {}
-  virtual ~DelayCalcObserver() {}
+  virtual ~DelayCalcObserver() = default;
   virtual void delayChangedFrom(Vertex *vertex) = 0;
   virtual void delayChangedTo(Vertex *vertex) = 0;
   virtual void checkDelayChangedTo(Vertex *vertex) = 0;
@@ -359,4 +358,4 @@ private:
   std::vector<NetCaps> net_caps_;
 };
 
-} // namespace
+} // namespace sta

include/sta/Hash.hh

@@ -67,4 +67,4 @@ hashString(std::string_view str);
   #define hashPtr(ptr) (reinterpret_cast<intptr_t>(ptr) >> 2)
 #endif
 
-} // namespace
+} // namespace sta

include/sta/HpinDrvrLoad.hh

@@ -47,8 +47,7 @@ public:
 class HpinDrvrLoadVisitor
 {
 public:
-  HpinDrvrLoadVisitor() {}
-  virtual ~HpinDrvrLoadVisitor() {}
+  virtual ~HpinDrvrLoadVisitor() = default;
   virtual void visit(HpinDrvrLoad *drvr_load) = 0;
 };
 
@@ -76,4 +75,4 @@ private:
   PinSet *hpins_to_load_;
 };
 
-} // namespace
+} // namespace sta

include/sta/InputDrive.hh

@@ -116,4 +116,4 @@ private:
   const LibertyPort *to_port_;
 };
 
-} // namespace
+} // namespace sta

include/sta/InternalPower.hh

@@ -94,4 +94,4 @@ protected:
   InternalPowerModels models_;
 };
 
-} // namespace
+} // namespace sta

include/sta/Iterator.hh

@@ -35,7 +35,7 @@ template <class OBJ>
 class Iterator
 {
 public:
-  virtual ~Iterator() {}
+  virtual ~Iterator() = default;
   virtual bool hasNext() = 0;
   virtual OBJ next() = 0;
 };
@@ -116,4 +116,4 @@ protected:
   SET_TYPE::const_iterator itr_;
 };
 
-} // namespace
+} // namespace sta

include/sta/LeakagePower.hh

@@ -50,4 +50,4 @@ protected:
   float power_;
 };
 
-} // namespace
+} // namespace sta

include/sta/Liberty.hh

@@ -80,7 +80,7 @@ public:
 
 private:
   std::string value_;
-  FuncExpr *cond_;
+  FuncExpr *cond_{nullptr};
   std::string sdf_cond_;
 };
 
@@ -159,10 +159,10 @@ enum class PwrGndType { none,
                         deepnwell, deeppwell};
 
 enum class ScaleFactorPvt { process, volt, temp, unknown };
-constexpr int scale_factor_pvt_count = int(ScaleFactorPvt::unknown) + 1;
+constexpr int scale_factor_pvt_count = static_cast<int>(ScaleFactorPvt::unknown) + 1;
 
 enum class TableTemplateType { delay, power, output_current, capacitance, ocv };
-constexpr int table_template_type_count = int(TableTemplateType::ocv) + 1;
+constexpr int table_template_type_count = static_cast<int>(TableTemplateType::ocv) + 1;
 
 enum class LevelShifterType { HL, LH, HL_LH };
 
@@ -206,7 +206,7 @@ class LibertyLibrary : public ConcreteLibrary
 public:
   LibertyLibrary(std::string_view name,
                  std::string_view filename);
-  virtual ~LibertyLibrary();
+  ~LibertyLibrary() override;
   LibertyCell *findLibertyCell(std::string_view name) const;
   LibertyCellSeq findLibertyCellsMatching(PatternMatch *pattern);
   // Liberty cells that are buffers.
@@ -269,7 +269,7 @@ public:
 
   void defaultIntrinsic(const RiseFall *rf,
                         // Return values.
-                        float &intrisic,
+                        float &intrinsic,
                         bool &exists) const;
   void setDefaultIntrinsic(const RiseFall *rf,
                            float value);
@@ -360,7 +360,7 @@ public:
   void setDefaultOcvDerate(OcvDerate *derate);
   OcvDerate *makeOcvDerate(std::string_view name);
   OcvDerate *findOcvDerate(std::string_view derate_name);
-  void addSupplyVoltage(std::string_view suppy_name,
+  void addSupplyVoltage(std::string_view supply_name,
                         float voltage);
   bool supplyExists(std::string_view supply_name) const;
   void supplyVoltage(std::string_view supply_name,
@@ -374,19 +374,19 @@ public:
 
   static void
   makeSceneMap(LibertyLibrary *lib,
-               int ap_index,
+               size_t lib_ap_index,
                Network *network,
                Report *report);
   static void
   makeSceneMap(LibertyCell *link_cell,
-               LibertyCell *map_cell,
-               int ap_index,
+               LibertyCell *scene_cell,
+               size_t lib_ap_index,
                Report *report);
   static void
   makeSceneMap(LibertyCell *cell1,
                LibertyCell *cell2,
                bool link,
-               int ap_index,
+               size_t lib_ap_index,
                Report *report);
   static void
   checkScenes(LibertyCell *cell,
@@ -396,62 +396,66 @@ public:
   DriverWaveform *findDriverWaveform(std::string_view name);
   DriverWaveform *driverWaveformDefault() { return findDriverWaveform(""); }
   DriverWaveform *makeDriverWaveform(std::string_view name,
-                                     TablePtr waveforms);
+                                     const TablePtr &waveforms);
 
 protected:
   float degradeWireSlew(const TableModel *model,
                         float in_slew,
                         float wire_delay) const;
 
-  Units *units_;
-  DelayModelType delay_model_type_;
-  BusDclMap bus_dcls_;
-  TableTemplateMap template_maps_[table_template_type_count];
-  float nominal_process_;
-  float nominal_voltage_;
-  float nominal_temperature_;
-  ScaleFactors *scale_factors_;
-  ScaleFactorsMap scale_factors_map_;
-  TableModel *wire_slew_degradation_tbls_[RiseFall::index_count];
-  float default_input_pin_cap_;
-  float default_output_pin_cap_;
-  float default_bidirect_pin_cap_;
-  RiseFallValues default_intrinsic_;
-  RiseFallValues default_inout_pin_res_;
-  RiseFallValues default_output_pin_res_;
-  float default_fanout_load_;
-  bool default_fanout_load_exists_;
-  float default_max_cap_;
-  bool default_max_cap_exists_;
-  float default_max_fanout_;
-  bool default_max_fanout_exists_;
-  float default_max_slew_;
-  bool default_max_slew_exists_;
-  float input_threshold_[RiseFall::index_count];
-  float output_threshold_[RiseFall::index_count];
-  float slew_lower_threshold_[RiseFall::index_count];
-  float slew_upper_threshold_[RiseFall::index_count];
-  float slew_derate_from_library_;
-  WireloadMap wireloads_;
-  const Wireload *default_wire_load_;
-  WireloadMode default_wire_load_mode_;
-  const WireloadSelection *default_wire_load_selection_;
-  WireloadSelectionMap wire_load_selections_;
-  OperatingConditionsMap operating_conditions_;
-  OperatingConditions *default_operating_conditions_;
-  float ocv_arc_depth_;
-  OcvDerate *default_ocv_derate_;
-  OcvDerateMap ocv_derate_map_;
-  SupplyVoltageMap supply_voltage_map_;
-  LibertyCellSeq *buffers_;
-  LibertyCellSeq *inverters_;
-  DriverWaveformMap driver_waveform_map_;
-
   static constexpr float input_threshold_default_ = .5;
   static constexpr float output_threshold_default_ = .5;
   static constexpr float slew_lower_threshold_default_ = .2;
   static constexpr float slew_upper_threshold_default_ = .8;
 
+  Units *units_{nullptr};
+  DelayModelType delay_model_type_{DelayModelType::table};
+  BusDclMap bus_dcls_;
+  TableTemplateMap template_maps_[table_template_type_count];
+  float nominal_process_{0.0F};
+  float nominal_voltage_{0.0F};
+  float nominal_temperature_{0.0F};
+  ScaleFactors *scale_factors_{nullptr};
+  ScaleFactorsMap scale_factors_map_;
+  TableModel *wire_slew_degradation_tbls_[RiseFall::index_count]{nullptr, nullptr};
+  float default_input_pin_cap_{0.0F};
+  float default_output_pin_cap_{0.0F};
+  float default_bidirect_pin_cap_{0.0F};
+  RiseFallValues default_intrinsic_;
+  RiseFallValues default_inout_pin_res_;
+  RiseFallValues default_output_pin_res_;
+  float default_fanout_load_{0.0F};
+  bool default_fanout_load_exists_{false};
+  float default_max_cap_{0.0F};
+  bool default_max_cap_exists_{false};
+  float default_max_fanout_{0.0F};
+  bool default_max_fanout_exists_{false};
+  float default_max_slew_{0.0F};
+  bool default_max_slew_exists_{false};
+  float input_threshold_[RiseFall::index_count]{input_threshold_default_,
+                                                input_threshold_default_};
+  float output_threshold_[RiseFall::index_count]{output_threshold_default_,
+                                                 output_threshold_default_};
+  float slew_lower_threshold_[RiseFall::index_count]{slew_lower_threshold_default_,
+                                                     slew_lower_threshold_default_};
+  float slew_upper_threshold_[RiseFall::index_count]{slew_upper_threshold_default_,
+                                                     slew_upper_threshold_default_};
+  float slew_derate_from_library_{1.0F};
+  WireloadMap wireloads_;
+  const Wireload *default_wire_load_{nullptr};
+  WireloadMode default_wire_load_mode_{WireloadMode::unknown};
+  const WireloadSelection *default_wire_load_selection_{nullptr};
+  WireloadSelectionMap wire_load_selections_;
+  OperatingConditionsMap operating_conditions_;
+  OperatingConditions *default_operating_conditions_{nullptr};
+  float ocv_arc_depth_{0.0F};
+  OcvDerate *default_ocv_derate_{nullptr};
+  OcvDerateMap ocv_derate_map_;
+  SupplyVoltageMap supply_voltage_map_;
+  LibertyCellSeq *buffers_{nullptr};
+  LibertyCellSeq *inverters_{nullptr};
+  DriverWaveformMap driver_waveform_map_;
+
 private:
   friend class LibertyCell;
   friend class LibertyCellIterator;
@@ -476,12 +480,11 @@ public:
   LibertyCell(LibertyLibrary *library,
               std::string_view name,
               std::string_view filename);
-  virtual ~LibertyCell();
+  ~LibertyCell() override;
   LibertyLibrary *libertyLibrary() const { return liberty_library_; }
   LibertyLibrary *libertyLibrary() { return liberty_library_; }
   LibertyPort *findLibertyPort(std::string_view name) const;
   LibertyPortSeq findLibertyPortsMatching(PatternMatch *pattern) const;
-  bool hasInternalPorts() const { return has_internal_ports_; }
   ScaleFactors *scaleFactors() const { return scale_factors_; }
   void setScaleFactors(ScaleFactors *scale_factors);
   ModeDef *makeModeDef(std::string_view name);
@@ -524,7 +527,7 @@ public:
                                        const LibertyPort *to) const;
   size_t timingArcSetCount() const;
   // Find a timing arc set equivalent to key.
-  TimingArcSet *findTimingArcSet(TimingArcSet *key) const;
+  TimingArcSet *findTimingArcSet(TimingArcSet *arc_set) const;
   TimingArcSet *findTimingArcSet(size_t index) const;
   bool hasTimingArcs(LibertyPort *port) const;
 
@@ -552,7 +555,7 @@ public:
   // timing arcs.
   bool hasInferedRegTimingArcs() const { return has_infered_reg_timing_arcs_; }
   TestCell *testCell() const { return test_cell_; }
-  void latchEnable(const TimingArcSet *arc_set,
+  void latchEnable(const TimingArcSet *d_to_q_set,
                    // Return values.
                    const LibertyPort *&enable_port,
                    const FuncExpr *&enable_func,
@@ -560,7 +563,7 @@ public:
   const RiseFall *latchCheckEnableEdge(TimingArcSet *check_set);
   LibertyCell *sceneCell(const Scene *scene,
                          const MinMax *min_max);
-  LibertyCell *sceneCell(int ap_index);
+  LibertyCell *sceneCell(size_t lib_ap_index);
 
   // AOCV
   float ocvArcDepth() const;
@@ -604,7 +607,7 @@ public:
   void setTestCell(TestCell *test);
   void setHasInferedRegTimingArcs(bool infered);
   void setSceneCell(LibertyCell *scene_cell,
-                     int ap_index);
+                    size_t lib_ap_index);
   // Call after cell is finished being constructed.
   void finish(bool infer_latches,
               Report *report,
@@ -623,9 +626,9 @@ public:
   void setFootprint(std::string_view footprint);
   const std::string &userFunctionClass() const { return user_function_class_; }
   void setUserFunctionClass(std::string_view user_function_class);
+  void addPort(ConcretePort *port) override;
 
 protected:
-  void addPort(ConcretePort *port);
   void setHasInternalPorts(bool has_internal);
   void setLibertyLibrary(LibertyLibrary *library);
   void makeLatchEnables(Report *report,
@@ -661,35 +664,35 @@ protected:
   bool checkSceneCell(const Scene *scene,
                        const MinMax *min_max) const;
 
-  LibertyLibrary *liberty_library_;
-  float area_;
-  bool dont_use_;
-  bool is_macro_;
-  bool is_memory_;
-  bool is_pad_;
-  bool is_clock_cell_;
-  bool is_level_shifter_;
-  LevelShifterType level_shifter_type_;
-  bool is_isolation_cell_;
-  bool always_on_;
-  SwitchCellType switch_cell_type_;
-  bool interface_timing_;
-  ClockGateType clock_gate_type_;
+  LibertyLibrary *liberty_library_{nullptr};
+  float area_{0.0F};
+  bool dont_use_{false};
+  bool is_macro_{false};
+  bool is_memory_{false};
+  bool is_pad_{false};
+  bool is_clock_cell_{false};
+  bool is_level_shifter_{false};
+  LevelShifterType level_shifter_type_{LevelShifterType::HL_LH};
+  bool is_isolation_cell_{false};
+  bool always_on_{false};
+  SwitchCellType switch_cell_type_{SwitchCellType::fine_grain};
+  bool interface_timing_{false};
+  ClockGateType clock_gate_type_{ClockGateType::none};
   TimingArcSetSeq timing_arc_sets_;
   TimingArcSetSet timing_arc_set_set_;
   LibertyPortPairTimingArcMap port_timing_arc_set_map_;
-  bool has_infered_reg_timing_arcs_;
+  bool has_infered_reg_timing_arcs_{false};
   InternalPowerSeq internal_powers_;
   PortInternalPowerMap port_internal_powers_;
   LeakagePowerSeq leakage_powers_;
   SequentialSeq sequentials_;
   PortToSequentialMap port_to_seq_map_;
-  Statetable *statetable_;
+  Statetable *statetable_{nullptr};
   BusDclMap bus_dcls_;
   ModeDefMap mode_defs_;
-  ScaleFactors *scale_factors_;
+  ScaleFactors *scale_factors_{nullptr};
   ScaledCellMap scaled_cells_;
-  TestCell *test_cell_;
+  TestCell *test_cell_{nullptr};
   // Latch D->Q to LatchEnable index.
   LatchEnableIndexMap latch_d_to_q_map_;
   // Latch EN->D setup to LatchEnable index.
@@ -697,14 +700,14 @@ protected:
   LatchEnableSeq latch_enables_;
   // Ports that have latch D->Q timing arc sets from them.
   LibertyPortSet latch_data_ports_;
-  float ocv_arc_depth_;
-  OcvDerate *ocv_derate_;
+  float ocv_arc_depth_{0.0F};
+  OcvDerate *ocv_derate_{nullptr};
   OcvDerateMap ocv_derate_map_;
   std::vector<LibertyCell*> scene_cells_;
-  float leakage_power_;
-  bool leakage_power_exists_;
-  bool has_internal_ports_;
-  std::atomic<bool> have_voltage_waveforms_;
+  float leakage_power_{0.0F};
+  bool leakage_power_exists_{false};
+  bool has_internal_ports_{false};
+  std::atomic<bool> have_voltage_waveforms_{false};
   std::mutex waveform_lock_;
   std::string footprint_;
   std::string user_function_class_;
@@ -731,7 +734,7 @@ class LibertyCellPortBitIterator : public Iterator<LibertyPort*>
 {
 public:
   LibertyCellPortBitIterator(const LibertyCell *cell);
-  virtual ~LibertyCellPortBitIterator();
+  ~LibertyCellPortBitIterator() override;
   bool hasNext() override;
   LibertyPort *next() override;
 
@@ -748,9 +751,7 @@ public:
   LibertyLibrary *libertyLibrary() const { return liberty_cell_->libertyLibrary(); }
   LibertyPort *findLibertyMember(int index) const;
   LibertyPort *findLibertyBusBit(int index) const;
-  LibertyPort *bundlePort() const;
   BusDcl *busDcl() const { return bus_dcl_; }
-  void setDirection(PortDirection *dir);
 
   ////////////////////////////////////////////////////////////////
   // pg_pin functions
@@ -872,15 +873,15 @@ public:
   const RiseFall *pulseClkTrigger() const { return pulse_clk_trigger_; }
   // Rise for high, fall for low.
   const RiseFall *pulseClkSense() const { return pulse_clk_sense_; }
-  void setPulseClk(const RiseFall *rfigger,
+  void setPulseClk(const RiseFall *trigger,
                    const RiseFall *sense);
   LibertyPort *scenePort(const Scene *scene,
                          const MinMax *min_max);
   const LibertyPort *scenePort(const Scene *scene,
                                const MinMax *min_max) const;
-  const LibertyPort *scenePort(int ap_index) const;
+  const LibertyPort *scenePort(size_t lib_ap_index) const;
   void setScenePort(LibertyPort *scene_port,
-                     int ap_index);
+                    size_t lib_ap_index);
   LibertyPort *relatedGroundPort() const { return related_ground_port_; }
   void setRelatedGroundPort(LibertyPort *related_ground_port);
   LibertyPort *relatedPowerPort() const { return related_power_port_; }
@@ -913,7 +914,7 @@ protected:
               int to_index,
               bool is_bundle,
               ConcretePortSeq *members);
-  virtual ~LibertyPort();
+  ~LibertyPort() override;
   void setMinPort(LibertyPort *min);
   void addScaledPort(OperatingConditions *op_cond,
                      LibertyPort *scaled_port);
@@ -927,48 +928,48 @@ protected:
                                                      float,
                                                      const MinMax *)> &setter);
 
-  LibertyPort *scenePort(int ap_index);
+  LibertyPort *scenePort(size_t lib_ap_index);
 
-  LibertyCell *liberty_cell_;
-  BusDcl *bus_dcl_;
-  PwrGndType pwr_gnd_type_;
+  LibertyCell *liberty_cell_{nullptr};
+  BusDcl *bus_dcl_{nullptr};
+  PwrGndType pwr_gnd_type_{PwrGndType::none};
   std::string voltage_name_;
-  ScanSignalType scan_signal_type_;
-  FuncExpr *function_;
-  FuncExpr *tristate_enable_;
-  ScaledPortMap *scaled_ports_;
+  ScanSignalType scan_signal_type_{ScanSignalType::none};
+  FuncExpr *function_{nullptr};
+  FuncExpr *tristate_enable_{nullptr};
+  ScaledPortMap *scaled_ports_{nullptr};
   RiseFallMinMax capacitance_;
   MinMaxFloatValues slew_limit_;   // inputs and outputs
   MinMaxFloatValues cap_limit_;    // outputs
-  float fanout_load_;              // inputs
-  bool fanout_load_exists_;
+  float fanout_load_{0.0F};        // inputs
+  bool fanout_load_exists_{false};
   MinMaxFloatValues fanout_limit_; // outputs
-  float min_period_;
-  float min_pulse_width_[RiseFall::index_count];
-  const RiseFall *pulse_clk_trigger_;
-  const RiseFall *pulse_clk_sense_;
-  LibertyPort *related_ground_port_;
-  LibertyPort *related_power_port_;
+  float min_period_{0.0F};
+  float min_pulse_width_[RiseFall::index_count]{0.0F, 0.0F};
+  const RiseFall *pulse_clk_trigger_{nullptr};
+  const RiseFall *pulse_clk_sense_{nullptr};
+  LibertyPort *related_ground_port_{nullptr};
+  LibertyPort *related_power_port_{nullptr};
   std::vector<LibertyPort*> scene_ports_;
-  ReceiverModelPtr receiver_model_;
-  DriverWaveform *driver_waveform_[RiseFall::index_count];
+  ReceiverModelPtr receiver_model_{nullptr};
+  DriverWaveform *driver_waveform_[RiseFall::index_count]{nullptr, nullptr};
 
-  unsigned int min_pulse_width_exists_:RiseFall::index_count;
-  bool min_period_exists_:1;
-  bool is_clk_:1;
-  bool is_reg_clk_:1;
-  bool is_reg_output_:1;
-  bool is_latch_data_: 1;
-  bool is_check_clk_:1;
-  bool is_clk_gate_clk_:1;
-  bool is_clk_gate_enable_:1;
-  bool is_clk_gate_out_:1;
-  bool is_pll_feedback_:1;
-  bool isolation_cell_data_:1;
-  bool isolation_cell_enable_:1;
-  bool level_shifter_data_:1;
-  bool is_switch_:1;
-  bool is_pad_:1;
+  bool min_pulse_width_exists_:RiseFall::index_count {false};
+  bool min_period_exists_:1 {false};
+  bool is_clk_:1 {false};
+  bool is_reg_clk_:1 {false};
+  bool is_reg_output_:1 {false};
+  bool is_latch_data_: 1 {false};
+  bool is_check_clk_:1 {false};
+  bool is_clk_gate_clk_:1 {false};
+  bool is_clk_gate_enable_:1 {false};
+  bool is_clk_gate_out_:1 {false};
+  bool is_pll_feedback_:1 {false};
+  bool isolation_cell_data_:1 {false};
+  bool isolation_cell_enable_:1 {false};
+  bool level_shifter_data_:1 {false};
+  bool is_switch_:1 {false};
+  bool is_pad_:1 {false};
 
 private:
   friend class LibertyLibrary;
@@ -984,7 +985,7 @@ class LibertyPortMemberIterator : public Iterator<LibertyPort*>
 {
 public:
   LibertyPortMemberIterator(const LibertyPort *port);
-  virtual ~LibertyPortMemberIterator();
+  ~LibertyPortMemberIterator() override;
   bool hasNext() override;
   LibertyPort *next() override;
 
@@ -999,7 +1000,7 @@ public:
   Pvt(float process,
       float voltage,
       float temperature);
-  virtual ~Pvt() {}
+  virtual ~Pvt() = default;
   float process() const { return process_; }
   void setProcess(float process);
   float voltage() const { return voltage_; }
@@ -1023,7 +1024,7 @@ public:
 
 protected:
   std::string name_;
-  WireloadTree wire_load_tree_;
+  WireloadTree wire_load_tree_{WireloadTree::unknown};
 };
 
 class ScaleFactors
@@ -1112,7 +1113,7 @@ public:
 
 protected:
   std::string name_;
-  TableTemplateType type_;
+  TableTemplateType type_{TableTemplateType::delay};
   TableAxisPtr axis1_;
   TableAxisPtr axis2_;
   TableAxisPtr axis3_;
@@ -1124,15 +1125,12 @@ public:
   TestCell(LibertyLibrary *library,
            std::string_view name,
            std::string_view filename);
-
-protected:
 };
 
 class OcvDerate
 {
 public:
   OcvDerate(std::string_view name);
-  ~OcvDerate();
   const std::string &name() const { return name_; }
   const Table *derateTable(const RiseFall *rf,
                            const EarlyLate *early_late,
@@ -1153,8 +1151,8 @@ portLibertyToSta(std::string_view port_name);
 const std::string &
 scanSignalTypeName(ScanSignalType scan_type);
 const std::string &
-pwrGndTypeName(PwrGndType pwr_gnd_type);
+pwrGndTypeName(PwrGndType pg_type);
 PwrGndType
 findPwrGndType(std::string_view pg_name);
 
-} // namespace
+} // namespace sta

include/sta/LibertyClass.hh

@@ -85,7 +85,7 @@ enum class ScaleFactorType : unsigned {
   wire_cap,
   wire_res,
   min_period,
-  // Liberty attributes have rise/fall suffix.
+  // Liberty attributes with rise/fall suffix.
   cell,
   hold,
   setup,
@@ -95,13 +95,13 @@ enum class ScaleFactorType : unsigned {
   skew,
   leakage_power,
   internal_power,
-  // Liberty attributes have rise/fall prefix.
+  // Liberty attributes with rise/fall prefix.
   transition,
-  // Liberty attributes have low/high suffix (indexed as rise/fall).
+  // Liberty attributes with low/high suffix (indexed as rise/fall).
   min_pulse_width,
   unknown,
 };
-const int scale_factor_type_count = int(ScaleFactorType::unknown) + 1;
+const int scale_factor_type_count = static_cast<int>(ScaleFactorType::unknown) + 1;
 // Enough bits to hold a ScaleFactorType enum.
 const int scale_factor_bits = 4;
 
@@ -116,7 +116,7 @@ enum class TimingSense {
   none,
   unknown
 };
-const int timing_sense_count = int(TimingSense::unknown) + 1;
+const int timing_sense_count = static_cast<int>(TimingSense::unknown) + 1;
 const int timing_sense_bit_count = 3;
 
 enum class TableAxisVariable {
@@ -178,4 +178,4 @@ public:
   }
 };
 
-} // namespace
+} // namespace sta

include/sta/LibertyWriter.hh

@@ -35,4 +35,4 @@ writeLiberty(LibertyLibrary *lib,
              const char *filename,
              StaState *sta);
 
-} // namespace
+} // namespace sta

include/sta/LinearModel.hh

@@ -55,10 +55,9 @@ public:
                               PocvMode pocv_mode,
                               int digits) const override;
   float driveResistance(const Pvt *pvt) const override;
-
-protected:
   void setIsScaled(bool is_scaled) override;
 
+protected:
   float intrinsic_;
   float resistance_;
 };
@@ -82,11 +81,10 @@ public:
                                const MinMax *min_max,
                                PocvMode pocv_mode,
                                int digits) const override;
-
-protected:
   void setIsScaled(bool is_scaled) override;
 
+protected:
   float intrinsic_;
 };
 
-} // namespace
+} // namespace sta

include/sta/Machine.hh

@@ -26,11 +26,6 @@
 
 // This header contains global os/port specific definitions.
 
-// Pragma placeholder for non-gcc compilers.
-#ifndef __GNUC__
-  #define __attribute__(x)
-#endif // __GNUC__
-
 #ifdef _MSC_VER
   // Microcruft Visual C++
   // Obtuse warning codes enabled by pragma.
@@ -48,6 +43,7 @@
   //   4611 = setjmp used in C++ function
   //   4701 = variable used but not initialized
   #pragma warning( 3 : 4018 4032 4132 4189 4201 4222 4234 4505 4611 4701 )
+
   // Disable security warnings for posix functions.
   // _CRT_SECURE_NO_WARNINGS does not seem to work
   #pragma warning( disable : 4996 )
@@ -65,7 +61,7 @@
   // Flex doesn't check for unistd.h.
   #define YY_NO_UNISTD_H
   namespace sta {
-    int vsnprint(char *str, size_t size, const char *fmt, va_list args);
+    int vsnprint(char *str, size_t size, const char *fmt, const va_list args);
     int vasprintf(char **str, const char *fmt, va_list args);
   }
 #else

include/sta/MakeConcreteNetwork.hh

@@ -31,4 +31,4 @@ class NetworkReader;
 NetworkReader *
 makeConcreteNetwork();
 
-} // namespace
+} // namespace sta

include/sta/MinMax.hh

@@ -52,12 +52,12 @@ public:
   static const MinMax *max() { return &max_; }
   static const EarlyLate *early() { return &min_; }
   static const EarlyLate *late() { return &max_; }
-  static int minIndex() { return min_.index_; }
-  static int earlyIndex() { return min_.index_; }
-  static int maxIndex() { return max_.index_; }
-  static int lateIndex() { return max_.index_; }
+  static size_t minIndex() { return min_.index_; }
+  static size_t earlyIndex() { return min_.index_; }
+  static size_t maxIndex() { return max_.index_; }
+  static size_t lateIndex() { return max_.index_; }
   const std::string &to_string() const { return name_; }
-  int index() const { return index_; }
+  size_t index() const { return index_; }
   float initValue() const { return init_value_; }
   int initValueInt() const { return init_value_int_; }
   // Max value1 > value2, Min value1 < value2.
@@ -72,18 +72,18 @@ public:
   // for (auto min_max : MinMax::range()) {}
   static const std::array<const MinMax*, 2> &range() { return range_; }
   // for (auto mm_index : MinMax::rangeIndex()) {}
-  static const std::array<int, 2> &rangeIndex() { return range_index_; }
+  static const std::array<size_t, 2> &rangeIndex() { return range_index_; }
   // Find MinMax from name.
-  static const MinMax *find(const char *min_max);
+  static const MinMax *find(std::string_view min_max);
   // Find MinMax from index.
-  static const MinMax *find(int index);
-  static const int index_max = 1;
-  static const int index_count = 2;
-  static const int index_bit_count = 1;
+  static const MinMax *find(size_t index);
+  static const size_t index_max = 1;
+  static const size_t  index_count = 2;
+  static const size_t  index_bit_count = 1;
 
 private:
-  MinMax(const char *name,
-         int index,
+  MinMax(std::string_view name,
+         size_t index,
          float init_value,
          int init_value_int,
          bool (*compare)(float value1,
@@ -99,7 +99,7 @@ private:
   static const MinMax min_;
   static const MinMax max_;
   static const std::array<const MinMax*, 2> range_;
-  static const std::array<int, 2> range_index_;
+  static const std::array<size_t, 2> range_index_;
 };
 
 // Min/Max/All, where "All" means use both min and max.
@@ -114,7 +114,7 @@ public:
   static const MinMaxAll *all() { return &all_; }
   static const MinMaxAll *minMax() { return &all_; }
   const std::string &to_string() const { return name_; }
-  int index() const { return index_; }
+  size_t index() const { return index_; }
   const MinMax *asMinMax() const;
   bool matches(const MinMax *min_max) const;
   bool matches(const MinMaxAll *min_max) const;
@@ -122,22 +122,22 @@ public:
   // for (const auto min_max : min_max->range()) {}
   const std::vector<const MinMax*> &range() const { return range_; }
   // for (const auto mm_index : min_max->rangeIndex()) {}
-  const std::vector<int> &rangeIndex() const { return range_index_; }
+  const std::vector<size_t> &rangeIndex() const { return range_index_; }
 
 private:
-  MinMaxAll(const char *name,
-            int index,
-            std::vector<const MinMax*> range,
-            std::vector<int> range_index);
+  MinMaxAll(std::string_view name,
+            size_t index,
+            const std::vector<const MinMax*> &range,
+            const std::vector<size_t> &range_index);
 
   const std::string name_;
-  int index_;
+  size_t index_;
   const std::vector<const MinMax*> range_;
-  const std::vector<int> range_index_;
+  const std::vector<size_t> range_index_;
 
   static const MinMaxAll min_;
   static const MinMaxAll max_;
   static const MinMaxAll all_;
 };
 
-} // namespace
+} // namespace sta

include/sta/MinMaxValues.hh

@@ -200,4 +200,4 @@ private:
 using MinMaxFloatValues = MinMaxValues<float>;
 using MinMaxIntValues = MinMaxValues<int>;
 
-} // namespace
+} // namespace sta

include/sta/Mode.hh

@@ -39,21 +39,22 @@ class PathGroups;
 using PathGroupSeq = std::vector<PathGroup*>;
 
 // Sdc and dependent state.
-class Mode : public StaState
+class Mode
 {
 public:
   Mode(std::string_view name,
        size_t mode_index,
        StaState *sta);
-  virtual ~Mode();
-  virtual void copyState(const StaState *sta);
+  ~Mode();
+  void copyState(const StaState *sta);
   void clear();
   const std::string &name() const { return name_; }
   size_t modeIndex() const { return mode_index_; }
   const SceneSeq &scenes() const { return scenes_; }
-  const SceneSet sceneSet() const;
+  SceneSet sceneSet() const;
   void addScene(Scene *scene);
   void removeScene(Scene *scene);
+  StaState *sta() const { return sta_; }
   Sdc *sdc() { return sdc_; }
   Sdc *sdc() const { return sdc_; }
   Sim *sim() { return sim_; }
@@ -69,8 +70,8 @@ public:
                              int endpoint_path_count,
                              bool unique_pins,
                              bool unique_edges,
-                             float min_slack,
-                             float max_slack,
+                             float slack_min,
+                             float slack_max,
                              StringSeq &group_names,
                              bool setup,
                              bool hold,
@@ -89,7 +90,8 @@ private:
   Sim *sim_;
   ClkNetwork *clk_network_;
   Genclks *genclks_;
-  PathGroups *path_groups_;
+  PathGroups *path_groups_{nullptr};
+  StaState *sta_;
 };
 
-} // namespace
+} // namespace sta

include/sta/Mutex.hh

@@ -29,6 +29,6 @@
 namespace sta {
 
 // Hide a bit of the std verbosity.
-using LockGuard = std::lock_guard<std::mutex>;
+using LockGuard = std::scoped_lock<std::mutex>;
 
-} // namespace
+} // namespace sta

include/sta/Network.hh

@@ -94,7 +94,7 @@ class Network : public StaState
 {
 public:
   Network();
-  virtual ~Network();
+  ~Network() override;
   virtual void clear();
 
   // Linking the hierarchy creates the instance/pin/net network hierarchy.
@@ -501,7 +501,7 @@ class NetworkEdit : public Network
 {
 public:
   NetworkEdit();
-  virtual bool isEditable() const { return true; }
+  bool isEditable() const override { return true; }
   virtual Instance *makeInstance(LibertyCell *cell,
                                  std::string_view name,
                                  Instance *parent) = 0;
@@ -533,7 +533,6 @@ public:
 class NetworkReader : public NetworkEdit
 {
 public:
-  NetworkReader() {}
   // Called before reading a netlist to delete any previously linked network.
   virtual void readNetlistBefore() = 0;
   virtual void setLinkFunc(LinkNetworkFunc link) = 0;
@@ -599,8 +598,7 @@ linkReaderNetwork(Cell *top_cell,
 class ConstantPinIterator
 {
 public:
-  ConstantPinIterator() {}
-  virtual ~ConstantPinIterator() {}
+  virtual ~ConstantPinIterator() = default;
   virtual bool hasNext() = 0;
   virtual void next(const Pin *&pin,
                     LogicValue &value) = 0;
@@ -613,9 +611,8 @@ public:
   NetworkConstantPinIterator(const Network *network,
                               NetSet &zero_nets,
                               NetSet &one_nets);
-  virtual ~NetworkConstantPinIterator() {}
-  virtual bool hasNext();
-  virtual void next(const Pin *&pin, LogicValue &value);
+  bool hasNext() override;
+  void next(const Pin *&pin, LogicValue &value) override;
 
 private:
   void findConstantPins(NetSet &nets,
@@ -631,8 +628,7 @@ private:
 class HierPinThruVisitor
 {
 public:
-  HierPinThruVisitor() {}
-  virtual ~HierPinThruVisitor() {}
+  virtual ~HierPinThruVisitor() = default;
   virtual void visit(const Pin *drvr,
                      const Pin *load) = 0;
 };
@@ -640,7 +636,7 @@ public:
 class PinVisitor
 {
 public:
-  virtual ~PinVisitor() {}
+  virtual ~PinVisitor() = default;
   virtual void operator()(const Pin *pin) = 0;
 };
 
@@ -652,7 +648,7 @@ public:
                    PinSeq &loads,
                    PinSeq &drvrs,
                    const Network *network);
-  virtual void operator()(const Pin *pin);
+  void operator()(const Pin *pin) override;
 
 protected:
   const Pin *drvr_pin_;
@@ -675,4 +671,4 @@ visitDrvrLoadsThruNet(const Net *net,
 char
 logicValueString(LogicValue value);
 
-} // namespace
+} // namespace sta

include/sta/NetworkClass.hh

@@ -173,4 +173,4 @@ public:
   NetSet(const Network *network);
 };
 
-} // namespace
+} // namespace sta

include/sta/NetworkCmp.hh

@@ -91,4 +91,4 @@ NetSeq
 sortByPathName(NetSet *set,
                const Network *network);
 
-} // namespace
+} // namespace sta

include/sta/ObjectId.hh

@@ -40,4 +40,4 @@ static constexpr BlockIdx block_idx_null = 0;
 static constexpr ObjectId object_id_null = 0;
 static constexpr ObjectIdx object_idx_null = 0;
 
-} // Namespace
+} // namespace sta

include/sta/ObjectTable.hh

@@ -50,7 +50,6 @@ template <class TYPE>
 class ObjectTable
 {
 public:
-  ObjectTable();
   ~ObjectTable();
   TYPE *make();
   void destroy(TYPE *object);
@@ -70,20 +69,13 @@ private:
   void freePush(TYPE *object,
                 ObjectId id);
 
-  size_t size_;
+  size_t size_{0};
   // Object ID of next free object.
-  ObjectId free_;
+  ObjectId free_{object_id_null};
   std::vector<TableBlock<TYPE>*> blocks_;
   static constexpr ObjectId idx_mask_ = block_object_count - 1;
 };
 
-template <class TYPE>
-ObjectTable<TYPE>::ObjectTable() :
-  size_(0),
-  free_(object_id_null)
-{
-}
-
 template <class TYPE>
 ObjectTable<TYPE>::~ObjectTable()
 {
@@ -213,4 +205,4 @@ TableBlock<TYPE>::TableBlock(BlockIdx block_idx,
 {
 }
 
-} // Namespace
+} // namespace sta

include/sta/Parasitics.hh

@@ -52,7 +52,6 @@ class Parasitics : public StaState
 {
 public:
   Parasitics(StaState *sta);
-  virtual ~Parasitics() {}
   virtual const std::string &name() const = 0;
   virtual const std::string &filename() const = 0;
   virtual bool haveParasitics() = 0;
@@ -304,4 +303,4 @@ private:
   const Network *network_;
 };
 
-} // namespace
+} // namespace sta

include/sta/ParasiticsClass.hh

@@ -32,4 +32,4 @@ class ParasiticNode;
 class ParasiticResistor;
 class ParasiticCapacitor;
 
-} // namespace
+} // namespace sta

include/sta/ParseBus.hh

@@ -32,8 +32,8 @@ namespace sta {
 // Return true if name is a bus.
 bool
 isBusName(std::string_view name,
-          const char brkt_left,
-          const char brkt_right,
+          char brkt_left,
+          char brkt_right,
           char escape);
 
 // Parse name as a bus.
@@ -45,8 +45,8 @@ isBusName(std::string_view name,
 // Caller must delete returned bus_name string.
 void
 parseBusName(std::string_view name,
-             const char brkt_left,
-             const char brkt_right,
+             char brkt_left,
+             char brkt_right,
              char escape,
              // Return values.
              bool &is_bus,
@@ -68,8 +68,8 @@ parseBusName(std::string_view name,
 // Caller must delete returned bus_name string.
 void
 parseBusName(std::string_view name,
-             const char brkt_left,
-             const char brkt_right,
+             char brkt_left,
+             char brkt_right,
              char escape,
              // Return values.
              bool &is_bus,
@@ -85,7 +85,7 @@ void
 parseBusName(std::string_view name,
              std::string_view brkts_left,
              std::string_view brkts_right,
-             const char escape,
+             char escape,
              // Return values.
              bool &is_bus,
              bool &is_range,
@@ -97,8 +97,8 @@ parseBusName(std::string_view name,
 // Insert escapes before ch1 and ch2 in token.
 std::string
 escapeChars(std::string_view token,
-            const char ch1,
-            const char ch2,
-            const char escape);
+            char ch1,
+            char ch2,
+            char escape);
 
-} // namespace
+} // namespace sta

include/sta/Path.hh

@@ -103,7 +103,7 @@ public:
   const Required &required() const {return required_; }
   void setRequired(const Required &required);
   Slack slack(const StaState *sta) const;
-  const Slew slew(const StaState *sta) const;
+  Slew slew(const StaState *sta) const;
   // This takes the same time as prevPath and prevArc combined.
   Path *prevPath() const;
   void setPrevPath(Path *prev_path);
@@ -201,7 +201,6 @@ public:
                      const RiseFall *rf,
                      const MinMax *min_max,
                      const StaState *sta);
-  virtual ~VertexPathIterator();
   bool hasNext() override;
   Path *next() override;
 
@@ -219,4 +218,4 @@ private:
   Path *next_;
 };
 
-} // namespace
+} // namespace sta

include/sta/PathEnd.hh

@@ -69,7 +69,7 @@ public:
   };
 
   virtual PathEnd *copy() const = 0;
-  virtual ~PathEnd() {}
+  virtual ~PathEnd() = default;
   void deletePath();
   Path *path() { return path_; }
   const Path *path() const { return path_; }
@@ -147,9 +147,8 @@ public:
   virtual TimingArc *checkArc() const { return nullptr; }
   // PathEndDataCheck data clock path.
   virtual const Path *dataClkPath() const { return nullptr; }
-  virtual int setupDefaultCycles() const { return 1; }
   virtual Delay clkSkew(const StaState *sta);
-  virtual bool ignoreClkLatency(const StaState * /* sta */) const { return false; }
+  [[nodiscard]] virtual bool ignoreClkLatency(const StaState *) const { return false; }
 
   static bool less(const PathEnd *path_end1,
                    const PathEnd *path_end2,
@@ -219,53 +218,55 @@ protected:
   static bool ignoreClkLatency(const Path *path,
                                PathDelay *path_delay,
                                const StaState *sta);
+  virtual int setupDefaultCycles() const { return 1; }
+
   Path *path_;
-  PathGroup *path_group_;
+  PathGroup *path_group_{nullptr};
 };
 
 class PathEndUnconstrained : public PathEnd
 {
 public:
   PathEndUnconstrained(Path *path);
-  virtual Type type() const;
-  virtual const char *typeName() const;
-  virtual PathEnd *copy() const;
-  virtual void reportShort(const ReportPath *report) const;
-  virtual void reportFull(const ReportPath *report) const;
-  virtual bool isUnconstrained() const;
-  virtual Required requiredTime(const StaState *sta) const;
-  virtual Required requiredTimeOffset(const StaState *sta) const;
-  virtual ArcDelay margin(const StaState *sta) const;
-  virtual Slack slack(const StaState *sta) const;
-  virtual Slack slackNoCrpr(const StaState *sta) const;
-  virtual float sourceClkOffset(const StaState *sta) const;
+  Type type() const override;
+  const char *typeName() const override;
+  PathEnd *copy() const override;
+  void reportShort(const ReportPath *report) const override;
+  void reportFull(const ReportPath *report) const override;
+  bool isUnconstrained() const override;
+  Required requiredTime(const StaState *sta) const override;
+  Required requiredTimeOffset(const StaState *sta) const override;
+  ArcDelay margin(const StaState *sta) const override;
+  Slack slack(const StaState *sta) const override;
+  Slack slackNoCrpr(const StaState *sta) const override;
+  float sourceClkOffset(const StaState *sta) const override;
 };
 
 class PathEndClkConstrained : public PathEnd
 {
 public:
-  virtual float sourceClkOffset(const StaState *sta) const;
-  virtual Delay sourceClkLatency(const StaState *sta) const;
-  virtual Delay sourceClkInsertionDelay(const StaState *sta) const;
-  virtual const Clock *targetClk(const StaState *sta) const;
-  virtual const ClockEdge *targetClkEdge(const StaState *sta) const;
-  virtual Path *targetClkPath();
-  virtual const Path *targetClkPath() const;
-  virtual float targetClkTime(const StaState *sta) const;
-  virtual float targetClkOffset(const StaState *sta) const;
-  virtual Arrival targetClkArrival(const StaState *sta) const;
-  virtual Delay targetClkDelay(const StaState *sta) const;
-  virtual Delay targetClkInsertionDelay(const StaState *sta) const;
-  virtual float targetNonInterClkUncertainty(const StaState *sta) const;
-  virtual float interClkUncertainty(const StaState *sta) const;
-  virtual float targetClkUncertainty(const StaState *sta) const;
-  virtual Crpr crpr(const StaState *sta) const;
-  virtual Required requiredTime(const StaState *sta) const;
-  virtual Slack slack(const StaState *sta) const;
-  virtual Slack slackNoCrpr(const StaState *sta) const;
-  virtual int exceptPathCmp(const PathEnd *path_end,
-                            const StaState *sta) const;
-  virtual void setPath(Path *path);
+  float sourceClkOffset(const StaState *sta) const override;
+  Delay sourceClkLatency(const StaState *sta) const override;
+  Delay sourceClkInsertionDelay(const StaState *sta) const override;
+  const Clock *targetClk(const StaState *sta) const override;
+  const ClockEdge *targetClkEdge(const StaState *sta) const override;
+  Path *targetClkPath() override;
+  const Path *targetClkPath() const override;
+  float targetClkTime(const StaState *sta) const override;
+  float targetClkOffset(const StaState *sta) const override;
+  Arrival targetClkArrival(const StaState *sta) const override;
+  Delay targetClkDelay(const StaState *sta) const override;
+  Delay targetClkInsertionDelay(const StaState *sta) const override;
+  float targetNonInterClkUncertainty(const StaState *sta) const override;
+  float interClkUncertainty(const StaState *sta) const override;
+  float targetClkUncertainty(const StaState *sta) const override;
+  Crpr crpr(const StaState *sta) const override;
+  Required requiredTime(const StaState *sta) const override;
+  Slack slack(const StaState *sta) const override;
+  Slack slackNoCrpr(const StaState *sta) const override;
+  int exceptPathCmp(const PathEnd *path_end,
+                    const StaState *sta) const override;
+  void setPath(Path *path) override;
 
 protected:
   PathEndClkConstrained(Path *path,
@@ -280,16 +281,16 @@ protected:
 
   Path *clk_path_;
   mutable Crpr crpr_;
-  mutable bool crpr_valid_;
+  mutable bool crpr_valid_{false};
 };
 
 class PathEndClkConstrainedMcp : public PathEndClkConstrained
 {
 public:
-  virtual MultiCyclePath *multiCyclePath() const { return mcp_; }
-  virtual float targetClkMcpAdjustment(const StaState *sta) const;
-  virtual int exceptPathCmp(const PathEnd *path_end,
-                            const StaState *sta) const;
+  MultiCyclePath *multiCyclePath() const override { return mcp_; }
+  float targetClkMcpAdjustment(const StaState *sta) const override;
+  int exceptPathCmp(const PathEnd *path_end,
+                    const StaState *sta) const override;
 
 protected:
   PathEndClkConstrainedMcp(Path *path,
@@ -316,23 +317,23 @@ public:
                Path *clk_path,
                MultiCyclePath *mcp,
                const StaState *sta);
-  virtual PathEnd *copy() const;
-  virtual Type type() const;
-  virtual const char *typeName() const;
-  virtual void reportShort(const ReportPath *report) const;
-  virtual void reportFull(const ReportPath *report) const;
-  virtual bool isCheck() const { return true; }
-  virtual ArcDelay margin(const StaState *sta) const;
-  virtual float macroClkTreeDelay(const StaState *sta) const;
-  virtual const TimingRole *checkRole(const StaState *sta) const;
-  virtual TimingArc *checkArc() const { return check_arc_; }
-  virtual int exceptPathCmp(const PathEnd *path_end,
-                            const StaState *sta) const;
-  virtual Delay clkSkew(const StaState *sta);
+  PathEnd *copy() const override;
+  Type type() const override;
+  const char *typeName() const override;
+  void reportShort(const ReportPath *report) const override;
+  void reportFull(const ReportPath *report) const override;
+  bool isCheck() const override { return true; }
+  ArcDelay margin(const StaState *sta) const override;
+  float macroClkTreeDelay(const StaState *sta) const override;
+  const TimingRole *checkRole(const StaState *sta) const override;
+  TimingArc *checkArc() const override { return check_arc_; }
+  int exceptPathCmp(const PathEnd *path_end,
+                    const StaState *sta) const override;
+  Delay clkSkew(const StaState *sta) override;
 
 protected:
   Delay sourceClkDelay(const StaState *sta) const;
-  virtual Required requiredTimeNoCrpr(const StaState *sta) const;
+  Required requiredTimeNoCrpr(const StaState *sta) const override;
 
   TimingArc *check_arc_;
   Edge *check_edge_;
@@ -349,25 +350,25 @@ public:
                     MultiCyclePath *mcp,
                     PathDelay *path_delay,
                     const StaState *sta);
-  virtual Type type() const;
-  virtual const char *typeName() const;
-  virtual float sourceClkOffset(const StaState *sta) const;
-  virtual bool isCheck() const { return false; }
-  virtual bool isLatchCheck() const { return true; }
-  virtual PathDelay *pathDelay() const { return path_delay_; }
-  virtual PathEnd *copy() const;
+  Type type() const override;
+  const char *typeName() const override;
+  float sourceClkOffset(const StaState *sta) const override;
+  bool isCheck() const override { return false; }
+  bool isLatchCheck() const override { return true; }
+  PathDelay *pathDelay() const override { return path_delay_; }
+  PathEnd *copy() const override;
   Path *latchDisable();
   const Path *latchDisable() const;
-  virtual void reportShort(const ReportPath *report) const;
-  virtual void reportFull(const ReportPath *report) const;
-  virtual const TimingRole *checkRole(const StaState *sta) const;
-  virtual Required requiredTime(const StaState *sta) const;
-  virtual Arrival borrow(const StaState *sta) const;
-  virtual float targetClkTime(const StaState *sta) const;
-  virtual float targetClkOffset(const StaState *sta) const;
+  void reportShort(const ReportPath *report) const override;
+  void reportFull(const ReportPath *report) const override;
+  const TimingRole *checkRole(const StaState *sta) const override;
+  Required requiredTime(const StaState *sta) const override;
+  Arrival borrow(const StaState *sta) const override;
+  float targetClkTime(const StaState *sta) const override;
+  float targetClkOffset(const StaState *sta) const override;
   Arrival targetClkWidth(const StaState *sta) const;
-  virtual int exceptPathCmp(const PathEnd *path_end,
-                            const StaState *sta) const;
+  int exceptPathCmp(const PathEnd *path_end,
+                    const StaState *sta) const override;
   void latchRequired(const StaState *sta,
                      // Return values.
                      Required &required,
@@ -383,8 +384,8 @@ public:
                        Crpr &open_crpr,
                        Crpr &crpr_diff,
                        Delay &max_borrow,
-                       bool &borrow_limit_exists) const;  
-  virtual bool ignoreClkLatency(const StaState *sta) const;
+                       bool &borrow_limit_exists) const;
+  bool ignoreClkLatency(const StaState *sta) const override;
 
 protected:
   Path *disable_path_;
@@ -404,23 +405,23 @@ public:
                      Path *clk_path,
                      MultiCyclePath *mcp,
                      const StaState *sta);
-  virtual PathEnd *copy() const;
-  virtual Type type() const;
-  virtual const char *typeName() const;
-  virtual void reportShort(const ReportPath *report) const;
-  virtual void reportFull(const ReportPath *report) const;
-  virtual bool isOutputDelay() const { return true; }
-  virtual ArcDelay margin(const StaState *sta) const;
-  virtual const TimingRole *checkRole(const StaState *sta) const;
-  virtual const ClockEdge *targetClkEdge(const StaState *sta) const;
-  virtual Arrival targetClkArrivalNoCrpr(const StaState *sta) const;
-  virtual Delay targetClkDelay(const StaState *sta) const;
-  virtual Delay targetClkInsertionDelay(const StaState *sta) const;
-  virtual Crpr crpr(const StaState *sta) const;
-  virtual int exceptPathCmp(const PathEnd *path_end,
-                            const StaState *sta) const;
+  PathEnd *copy() const override;
+  Type type() const override;
+  const char *typeName() const override;
+  void reportShort(const ReportPath *report) const override;
+  void reportFull(const ReportPath *report) const override;
+  bool isOutputDelay() const override { return true; }
+  ArcDelay margin(const StaState *sta) const override;
+  const TimingRole *checkRole(const StaState *sta) const override;
+  const ClockEdge *targetClkEdge(const StaState *sta) const override;
+  Delay targetClkDelay(const StaState *sta) const override;
+  Delay targetClkInsertionDelay(const StaState *sta) const override;
+  Crpr crpr(const StaState *sta) const override;
+  int exceptPathCmp(const PathEnd *path_end,
+                    const StaState *sta) const override;
 
 protected:
+  Arrival targetClkArrivalNoCrpr(const StaState *sta) const override;
   Arrival tgtClkDelay(const ClockEdge *tgt_clk_edge,
                       const TimingRole *check_role,
                       const StaState *sta) const;
@@ -444,16 +445,16 @@ public:
                     MultiCyclePath *mcp,
                     ArcDelay margin,
                     const StaState *sta);
-  virtual PathEnd *copy() const;
-  virtual Type type() const;
-  virtual const char *typeName() const;
-  virtual void reportShort(const ReportPath *report) const;
-  virtual void reportFull(const ReportPath *report) const;
-  virtual bool isGatedClock() const { return true; }
-  virtual ArcDelay margin(const StaState *) const { return margin_; }
-  virtual const TimingRole *checkRole(const StaState *sta) const;
-  virtual int exceptPathCmp(const PathEnd *path_end,
-                            const StaState *sta) const;
+  PathEnd *copy() const override;
+  Type type() const override;
+  const char *typeName() const override;
+  void reportShort(const ReportPath *report) const override;
+  void reportFull(const ReportPath *report) const override;
+  bool isGatedClock() const override { return true; }
+  ArcDelay margin(const StaState *) const override { return margin_; }
+  const TimingRole *checkRole(const StaState *sta) const override;
+  int exceptPathCmp(const PathEnd *path_end,
+                    const StaState *sta) const override;
 
 protected:
   const TimingRole *check_role_;
@@ -468,25 +469,25 @@ public:
                    Path *data_clk_path,
                    MultiCyclePath *mcp,
                    const StaState *sta);
-  virtual PathEnd *copy() const;
-  virtual Type type() const;
-  virtual const char *typeName() const;
-  virtual void reportShort(const ReportPath *report) const;
-  virtual void reportFull(const ReportPath *report) const;
-  virtual bool isDataCheck() const { return true; }
-  virtual const ClockEdge *targetClkEdge(const StaState *sta) const;
-  virtual const TimingRole *checkRole(const StaState *sta) const;
-  virtual ArcDelay margin(const StaState *sta) const;
-  virtual int exceptPathCmp(const PathEnd *path_end,
-                            const StaState *sta) const;
-  virtual const Path *dataClkPath() const { return data_clk_path_; }
+  PathEnd *copy() const override;
+  Type type() const override;
+  const char *typeName() const override;
+  void reportShort(const ReportPath *report) const override;
+  void reportFull(const ReportPath *report) const override;
+  bool isDataCheck() const override { return true; }
+  const ClockEdge *targetClkEdge(const StaState *sta) const override;
+  const TimingRole *checkRole(const StaState *sta) const override;
+  ArcDelay margin(const StaState *sta) const override;
+  int exceptPathCmp(const PathEnd *path_end,
+                    const StaState *sta) const override;
+  const Path *dataClkPath() const override { return data_clk_path_; }
 
 protected:
   Path *clkPath(Path *path,
                 const StaState *sta);
-  Arrival requiredTimeNoCrpr(const StaState *sta) const;
+  Arrival requiredTimeNoCrpr(const StaState *sta) const override;
   // setup uses zero cycle default
-  virtual int setupDefaultCycles() const { return 0; }
+  int setupDefaultCycles() const override { return 0; }
 
   Path *data_clk_path_;
   DataCheck *check_;
@@ -514,29 +515,29 @@ public:
                    Path *path,
                    OutputDelay *output_delay,
                    const StaState *sta);
-  virtual PathEnd *copy() const;
-  virtual Type type() const;
-  virtual const char *typeName() const;
-  virtual void reportShort(const ReportPath *report) const;
-  virtual void reportFull(const ReportPath *report) const;
-  virtual bool isPathDelay() const { return true; }
-  virtual const TimingRole *checkRole(const StaState *sta) const;
-  virtual bool pathDelayMarginIsExternal() const;
-  virtual PathDelay *pathDelay() const { return path_delay_; }
-  virtual ArcDelay margin(const StaState *sta) const;
-  virtual float sourceClkOffset(const StaState *sta) const;
-  virtual const ClockEdge *targetClkEdge(const StaState *sta) const;
-  virtual float targetClkTime(const StaState *sta) const;
-  virtual Arrival targetClkArrivalNoCrpr(const StaState *sta) const;
-  virtual float targetClkOffset(const StaState *sta) const;
-  virtual TimingArc *checkArc() const { return check_arc_; }
-  virtual Required requiredTime(const StaState *sta) const;
-  virtual int exceptPathCmp(const PathEnd *path_end,
-                            const StaState *sta) const;
+  PathEnd *copy() const override;
+  Type type() const override;
+  const char *typeName() const override;
+  void reportShort(const ReportPath *report) const override;
+  void reportFull(const ReportPath *report) const override;
+  bool isPathDelay() const override { return true; }
+  const TimingRole *checkRole(const StaState *sta) const override;
+  bool pathDelayMarginIsExternal() const override;
+  PathDelay *pathDelay() const override { return path_delay_; }
+  ArcDelay margin(const StaState *sta) const override;
+  float sourceClkOffset(const StaState *sta) const override;
+  const ClockEdge *targetClkEdge(const StaState *sta) const override;
+  float targetClkTime(const StaState *sta) const override;
+  float targetClkOffset(const StaState *sta) const override;
+  TimingArc *checkArc() const override { return check_arc_; }
+  Required requiredTime(const StaState *sta) const override;
+  int exceptPathCmp(const PathEnd *path_end,
+                    const StaState *sta) const override;
   [[nodiscard]] bool hasOutputDelay() const { return output_delay_ != nullptr; }
-  virtual bool ignoreClkLatency(const StaState *sta) const;
+  bool ignoreClkLatency(const StaState *sta) const override;
 
 protected:
+  Arrival targetClkArrivalNoCrpr(const StaState *sta) const override;
   void findSrcClkArrival(const StaState *sta);
 
   PathDelay *path_delay_;
@@ -590,4 +591,4 @@ protected:
   const StaState *sta_;
 };
 
-} // namespace
+} // namespace sta

include/sta/PathExpanded.hh

@@ -78,4 +78,4 @@ protected:
   const StaState *sta_;
 };
 
-} // namespace
+} // namespace sta

include/sta/PathGroup.hh

@@ -52,20 +52,20 @@ class PathGroup
 public:
   // Path group that compares compare slacks.
   static PathGroup *makePathGroupArrival(std::string_view name,
-                                         int group_path_count,
-                                         int endpoint_path_count,
+                                         size_t group_path_count,
+                                         size_t endpoint_path_count,
                                          bool unique_pins,
                                          bool unique_edges,
                                          const MinMax *min_max,
                                          const StaState *sta);
   // Path group that compares arrival time, sorted by min_max.
   static PathGroup *makePathGroupSlack(std::string_view name,
-                                       int group_path_count,
-                                       int endpoint_path_count,
+                                       size_t group_path_count,
+                                       size_t endpoint_path_count,
                                        bool unique_pins,
                                        bool unique_edges,
-                                       float min_slack,
-                                       float max_slack,
+                                       float slack_min,
+                                       float slack_max,
                                        const StaState *sta);
   ~PathGroup();
   const std::string &name() const { return name_; }
@@ -77,19 +77,19 @@ public:
   // Predicate to determine if a PathEnd is worth saving.
   bool saveable(PathEnd *path_end);
   bool enumMinSlackUnderMin(PathEnd *path_end);
-  int maxPaths() const { return group_path_count_; }
+  size_t maxPaths() const { return group_path_count_; }
   // This does NOT delete the path ends.
   void clear();
-  static int group_path_count_max;
+  static size_t group_path_count_max;
   
 protected:
   PathGroup(std::string_view name,
-            int group_path_count,
-            int endpoint_path_count,
+            size_t group_path_count,
+            size_t endpoint_path_count,
             bool unique_pins,
             bool unique_edges,
-            float min_slack,
-            float max_slack,
+            float slack_min,
+            float slack_max,
             bool cmp_slack,
             const MinMax *min_max,
             const StaState *sta);
@@ -98,8 +98,8 @@ protected:
   void sort();
 
   std::string name_;
-  int group_path_count_;
-  int endpoint_path_count_;
+  size_t group_path_count_;
+  size_t endpoint_path_count_;
   bool unique_pins_;
   bool unique_edges_;
   float slack_min_;
@@ -116,8 +116,8 @@ protected:
 class PathGroups : public StaState
 {
 public:
-  PathGroups(int group_path_count,
-             int endpoint_path_count,
+  PathGroups(size_t group_path_count,
+             size_t endpoint_path_count,
              bool unique_pins,
              bool unique_edges,
              float slack_min,
@@ -131,7 +131,7 @@ public:
              bool clk_gating_hold,
              bool unconstrained,
              const Mode *mode);
-  ~PathGroups();
+  ~PathGroups() override;
   // Use scene nullptr to make PathEnds for all scenes.
   // The PathEnds in the vector are owned by the PathGroups.
   void makePathEnds(ExceptionTo *to,
@@ -155,8 +155,8 @@ public:
 
 protected:
   void makeGroupPathEnds(ExceptionTo *to,
-                         int group_path_count,
-                         int endpoint_path_count,
+                         size_t group_path_count,
+                         size_t endpoint_path_count,
                          bool unique_pins,
                          bool unique_edges,
                          const SceneSeq &scenes,
@@ -170,8 +170,8 @@ protected:
                          const MinMaxAll *min_max,
                          PathEndVisitor *visitor);
   void enumPathEnds(PathGroup *group,
-                    int group_path_count,
-                    int endpoint_path_count,
+                    size_t group_path_count,
+                    size_t endpoint_path_count,
                     bool unique_pins,
                     bool unique_edges,
                     bool cmp_slack);
@@ -180,8 +180,8 @@ protected:
   void pushUnconstrainedPathEnds(PathEndSeq &path_ends,
                                  const MinMaxAll *min_max);
 
-  void makeGroups(int group_path_count,
-                  int endpoint_path_count,
+  void makeGroups(size_t group_path_count,
+                  size_t endpoint_path_count,
                   bool unique_pins,
                   bool unique_edges,
                   float slack_min,
@@ -199,8 +199,8 @@ protected:
   StringSeq pathGroupNames();
 
   const Mode *mode_;
-  int group_path_count_;
-  int endpoint_path_count_;
+  size_t group_path_count_;
+  size_t endpoint_path_count_;
   bool unique_pins_;
   bool unique_edges_;
   float slack_min_;
@@ -226,4 +226,4 @@ protected:
   static constexpr std::string_view unconstrained_group_name_ = "unconstrained";
 };
 
-} // namespace
+} // namespace sta

include/sta/PatternMatch.hh

@@ -77,8 +77,8 @@ class RegexpCompileError : public Exception
 {
 public:
   RegexpCompileError(std::string_view pattern);
-  virtual ~RegexpCompileError() noexcept {}
-  virtual const char *what() const noexcept;
+  ~RegexpCompileError() noexcept override = default;
+  const char *what() const noexcept override;
 
 private:
   std::string error_;
@@ -98,4 +98,4 @@ patternMatchNoCase(std::string_view pattern,
 bool
 patternWildcards(std::string_view pattern);
 
-} // namespace
+} // namespace sta