refactor: consolidate string utilities on sstr and remove legacy SStr (#325)

This branch removes the parallel `SStr`/`sstr` string utility split and standardizes the codebase on `sstr` plus straightforward standard C++ helpers where custom wrappers were no longer needed.

The goal is to reduce duplication, shrink the maintenance surface, and make string/path/env handling easier to follow and evolve. `SStr` and `sstr` had overlapping responsibilities, which made it unclear which API should be preferred and kept legacy patterns alive longer than necessary.

This refactor migrates the remaining `SStr` call sites to `sstr`, `spath`, `ssys`, and simple `std::string`/stream-based code, then removes the obsolete `SStr` implementation, tests, and build references. The result is a smaller and more consistent utility layer with no intended functional change.

Author: plexoos

CSG/CSGFoundry.cc

@@ -19,7 +19,6 @@
 
 #include "smeta.h"
 #include "SSim.hh"
-#include "SStr.hh"
 
 // TODO: migrate to spath.h
 #include "SPath.hh"
@@ -1152,7 +1151,7 @@ void CSGFoundry::findSolidIdx(std::vector<unsigned>& solid_idx, const char* labe
     std::vector<unsigned>& ss = solid_idx ;
 
     std::vector<std::string> elem ;
-    SStr::Split(label, ',', elem );
+    sstr::Split(label, ',', elem);
 
     for(unsigned i=0 ; i < elem.size() ; i++)
     {
@@ -1161,7 +1160,7 @@ void CSGFoundry::findSolidIdx(std::vector<unsigned>& solid_idx, const char* labe
         {
             const CSGSolid& so = solid[j];
 
-            bool match = SStr::SimpleMatch(so.label, ele.c_str()) ;
+            bool     match = sstr::SimpleMatch(so.label, ele.c_str());
             unsigned count = std::count(ss.begin(), ss.end(), j );  // count if j is already collected
             if(match && count == 0) ss.push_back(j) ;
         }
@@ -1318,23 +1317,26 @@ std::string CSGFoundry::detailPrim(unsigned primIdx) const
     float4 ce = pr->ce();
 
     std::stringstream ss ;
+
+    auto label_value = [](const char* label, int value) {
+        return sstr::Format_("%s:%d", label, value);
+    };
     ss
-        << std::setw(10) << SStr::Format(" pri:%d", primIdx )
-        << std::setw(10) << SStr::Format(" lpr:%d", pr_primIdx )
-        << std::setw(8)  << SStr::Format(" gas:%d", gasIdx )
-        << std::setw(8)  << SStr::Format(" msh:%d", meshIdx)
-        << std::setw(8)  << SStr::Format(" bnd:%d", boundary)
-        << std::setw(8)  << SStr::Format(" nno:%d", numNode )
-        << std::setw(10)  << SStr::Format(" nod:%d", nodeOffset )
+        << std::setw(10) << label_value("pri", primIdx)
+        << std::setw(10) << label_value("lpr", pr_primIdx)
+        << std::setw(8) << label_value("gas", gasIdx)
+        << std::setw(8) << label_value("msh", meshIdx)
+        << std::setw(8) << label_value("bnd", boundary)
+        << std::setw(8) << label_value("nno", numNode)
+        << std::setw(10) << label_value("nod", nodeOffset)
         << " ce "
         << "(" << std::setw(10) << std::fixed << std::setprecision(2) << ce.x
         << "," << std::setw(10) << std::fixed << std::setprecision(2) << ce.y
         << "," << std::setw(10) << std::fixed << std::setprecision(2) << ce.z
         << "," << std::setw(10) << std::fixed << std::setprecision(2) << ce.w
         << ")"
-        << " meshName " << std::setw(15) << ( meshName ? meshName : "-" )
-        << " bndName "  << std::setw(15) << ( bndName  ? bndName  : "-" )
-        ;
+        << " meshName " << std::setw(15) << (meshName ? meshName : "-")
+        << " bndName " << std::setw(15) << (bndName ? bndName : "-");
 
     std::string s = ss.str();
     return s ;
@@ -4033,4 +4035,3 @@ void CSGFoundry::kludgeScalePrimBBox( unsigned solidIdx, float dscale )
 
 
 
-

CSG/tests/CSGFoundry_getCenterExtent_Test.cc

@@ -20,29 +20,28 @@ See also CSGTargetTest.cc
 
 **/
 
-#include <csignal>
-#include "SSys.hh"
-#include "SStr.hh"
-#include "SSim.hh"
 #include "CSGFoundry.h"
+#include "SSim.hh"
+#include "SSys.hh"
+#include "sstr.h"
+#include <csignal>
 
 #include "OPTICKS_LOG.hh"
 
 int main(int argc, char** argv)
 {
-    OPTICKS_LOG(argc, argv); 
+    OPTICKS_LOG(argc, argv);
 
-    SSim::Create(); 
-    CSGFoundry* fd = CSGFoundry::Load(); 
+    SSim::Create();
+    CSGFoundry* fd = CSGFoundry::Load();
 
-    LOG(info) 
-        << "foundry " << fd->desc() 
-        ; 
-    fd->summary(); 
+    LOG(info)
+        << "foundry " << fd->desc();
+    fd->summary();
 
-    const char* MOI = SSys::getenvvar("MOI", "sWorld:0:0"); 
-    std::vector<std::string> vmoi ; 
-    SStr::Split(MOI, ',',  vmoi );  
+    const char*              MOI = SSys::getenvvar("MOI", "sWorld:0:0");
+    std::vector<std::string> vmoi;
+    sstr::Split(MOI, ',', vmoi);
     LOG(info) << " MOI " << MOI << " vmoi.size " << vmoi.size() ; 
 
     qat4 q ; 
@@ -77,4 +76,3 @@ int main(int argc, char** argv)
 
 
 
-

CSG/tests/CSGNodeScanTest.cc

@@ -13,11 +13,11 @@ For lower level tests see::
 #include <vector>
 #include <cmath>
 
+#include "NP.hh"
 #include "OPTICKS_LOG.hh"
-#include "SSys.hh"
-#include "SStr.hh"
 #include "SPath.hh"
-#include "NP.hh"
+#include "SSys.hh"
+#include "sstr.h"
 
 #include "scuda.h"
 #include "squad.h"
@@ -28,42 +28,52 @@ For lower level tests see::
 #include "csg_intersect_node.h"
 #include "csg_intersect_tree.h"
 
+namespace
+{
+std::vector<int>* ParseIntList(const char* spec, char delim)
+{
+    auto* values = new std::vector<int>();
+    if (spec)
+        sstr::split<int>(*values, spec, delim);
+    return values;
+}
+} // namespace
+
 struct Scan 
 {
-    const char* geom ; 
-    CSGNode nd ; 
-    float t_min ; 
-    int num ; 
-    bool shifted ; 
-    const char* modes_ ; 
-    const char* axes_ ; 
-    std::vector<int>* modes ; 
-    std::vector<int>* axes ; 
-
-    NP* simtrace ; 
-    quad4* qq ;  
-    const char* fold ; 
-
-    Scan(); 
-    void init(); 
-    std::string desc() const ; 
-    void save() const ; 
-}; 
-
-Scan::Scan()
-    :
+    const char*       geom;
+    CSGNode           nd;
+    float             t_min;
+    int               num;
+    bool              shifted;
+    const char*       modes_;
+    const char*       axes_;
+    std::vector<int>* modes;
+    std::vector<int>* axes;
+
+    NP*         simtrace;
+    quad4*      qq;
+    const char* fold;
+
+    Scan();
+    void init();
+    std::string desc() const;
+    void save() const;
+};
+
+Scan::Scan() :
     geom(SSys::getenvvar("CSGNodeScanTest_GEOM", "iphi")),
-    nd(CSGNode::MakeDemo(geom)),  
-    t_min(SSys::getenvfloat("TMIN",0.f)),
+    nd(CSGNode::MakeDemo(geom)),
+    t_min(SSys::getenvfloat("TMIN", 0.f)),
     num(SSys::getenvint("NUM", 200)),
     shifted(true),
     modes_(SSys::getenvvar("MODES", "0,1,2,3")),
-    axes_(SSys::getenvvar("AXES", "0,2,1")),  // X,Z,Y  3rd gets set to zero 
-    modes(SStr::ISplit(modes_, ',')),
-    axes(SStr::ISplit(axes_, ',')),
-    simtrace(NP::Make<float>(modes->size(),num,4,4)),
+    axes_(SSys::getenvvar("AXES", "0,2,1")), // X,Z,Y  3rd gets set to zero
+    modes(ParseIntList(modes_, ',')),
+    axes(ParseIntList(axes_, ',')),
+    simtrace(NP::Make<float>(modes->size(), num, 4, 4)),
     qq((quad4*)simtrace->values<float>()),
-    fold(SPath::Resolve("$TMP/CSGNodeScanTest", geom, DIRPATH )) 
+    fold(SPath::Resolve("$TMP/CSGNodeScanTest", geom, DIRPATH))
 {
     init(); 
 }

CSG/tests/CSGTargetGlobalTest.cc

@@ -11,7 +11,6 @@ MOI=solidXJfixture:64 CSGTargetGlobalTest
 #include "SPath.hh"
 #include "SSys.hh"
 #include "SSim.hh"
-#include "SStr.hh"
 #include "OPTICKS_LOG.hh"
 
 #include "scuda.h"
@@ -93,4 +92,3 @@ int main(int argc, char** argv)
 }
 
 
-

CSG/tests/CSGTargetTest.cc

@@ -24,10 +24,10 @@ Check a few different iidx of midx 120::
 
 
 **/
-#include <csignal>
-#include "SSys.hh"
-#include "SStr.hh"
 #include "SSim.hh"
+#include "SSys.hh"
+#include "sstr.h"
+#include <csignal>
 
 #include "OPTICKS_LOG.hh"
 
@@ -69,8 +69,8 @@ CSGTargetTest::CSGTargetTest()
 
 void CSGTargetTest::dumpMOI( const char* MOI )
 {
-    std::vector<std::string> vmoi ; 
-    SStr::Split(MOI, ',',  vmoi ); 
+    std::vector<std::string> vmoi;
+    sstr::Split(MOI, ',', vmoi);
 
     LOG(info) << " MOI " << MOI << " vmoi.size " << vmoi.size() ; 
 
@@ -201,4 +201,3 @@ int main(int argc, char** argv)
 }
 
 
-

CSG/tests/DemoGeo.cc

@@ -1,15 +1,15 @@
-#include <iostream>
-#include <iomanip>
-#include <cstring>
+#include <algorithm>
 #include <array>
-
+#include <cstring>
+#include <iomanip>
+#include <iostream>
 
 //#include <vector_types.h>
 
-#include "SStr.hh"
-#include "ssys.h"
 #include "NP.hh"
 #include "SLOG.hh"
+#include "sstr.h"
+#include "ssys.h"
 
 #include "scuda.h"
 #include "CSGFoundry.h"
@@ -19,6 +19,19 @@
 #include "DemoGeo.h"
 #include "DemoGrid.h"
 
+namespace
+{
+void ParseGridSpec(std::array<int, 9>& grid, const char* spec)
+{
+    std::vector<int>  values;
+    std::stringstream ss(spec ? spec : "");
+    std::string       item;
+    while (std::getline(ss, item, ',')) sstr::split<int>(values, item.c_str(), ':');
+    assert(values.size() == grid.size());
+    std::copy(values.begin(), values.end(), grid.begin());
+}
+} // namespace
+
 DemoGeo::DemoGeo(CSGFoundry* foundry_, const char* geom)
     :
     foundry(foundry_),
@@ -45,15 +58,15 @@ void DemoGeo::init(const char* geom)
     {
         init_parade();
     }
-    else if(SStr::StartsWith(geom, "clustered_"))
+    else if (sstr::StartsWith(geom, "clustered_"))
     {
         init_clustered( geom + strlen("clustered_"));
     }
-    else if(SStr::StartsWith(geom, "scaled_"))
+    else if (sstr::StartsWith(geom, "scaled_"))
     {
         init_scaled( geom, geom + strlen("scaled_"), outer, layers, numgas );
     }
-    else if(SStr::StartsWith(geom, "layered_"))
+    else if (sstr::StartsWith(geom, "layered_"))
     {
         init_layered( geom + strlen("layered_"), outer, layers );
     }
@@ -142,7 +155,7 @@ void DemoGeo::init_clustered(const char* name)
 
     bool inbox = false ;
     std::array<int,9> cl ;
-    SStr::ParseGridSpec(cl, clusterspec); // string parsed into array of 9 ints
+    ParseGridSpec(cl, clusterspec);
     CSGSolid* so = maker->makeClustered(name, cl[0],cl[1],cl[2],cl[3],cl[4],cl[5],cl[6],cl[7],cl[8], unit, inbox );
     std::cout << "DemoGeo::init_layered" << name << " so.center_extent " << so->center_extent << std::endl ;
 
@@ -218,4 +231,3 @@ std::string DemoGeo::desc() const
     std::string s = ss.str();
     return s ;
 }
-