More clang fixes; rework anc<T> special copy c'tor

Author: chipbarnaby

src/ancrec.cpp

@@ -845,7 +845,7 @@ basAnc::basAnc()		// default c'tor (for derived copy c'tor
 	memset( (char *)this+SZVFTP, 0, sizeof(*this)-SZVFTP); // SZVFTP: virtFcnTblPtr: cnglob.h.
 }			// basAnc::basAnc
 //---------------------------------------------------------------------------------------------------------------------------
-basAnc::basAnc( int flags, SFIR * _fir, USI _nFlds, const char * _what, USI _eSz, RCT _rt, USI _sOff, const CULT* pCULT, int dontRegister/*=0*/ )
+basAnc::basAnc( int flags, SFIR * _fir, USI _nFlds, const char * _what, USI _eSz, RCT _rt, USI _sOff, const CULT* pCULT, bool dontRegister/*=false*/ )
 {
 	memset( (char *)this+SZVFTP, 0, sizeof(basAnc)-SZVFTP);		// zero all basAnc members but virtFcnTblPtr at front
 	ba_flags = flags;
@@ -858,6 +858,7 @@ basAnc::basAnc( int flags, SFIR * _fir, USI _nFlds, const char * _what, USI _eSz
 	mn = 1;				// min record subscript 1 (overwritten with 0 if static)
 	// ptr() = 0;		// is done in derived class constructor (deriv vf not avail here; ptr is pure!)
 	ba_pCULT = pCULT;	// pointer to associated input CULT table, nullptr = unknown
+	// ba_probeModernizeTable = nullptr;	// done by memset
 	if (!dontRegister)
 		regis();					// conditionally include anchor for nextAnc() iteration
 }					// basAnc::basAnc

src/ancrec.h

@@ -4,18 +4,6 @@
 
 // ancrec.h: record and record anchor base class definitions for cse
 
-
-// before #include, #define NEEDLIKECTOR if including file calls the anc<T> like-another constructor
-
-
-//************************
-//  unsuccessful OPTIONS
-//************************
-
-
-//---------------------------------------------------------------------------------------------------------------------------
-
-
 #ifndef ANCREC_H	// endif at end file
 #define ANCREC_H
 
@@ -91,7 +79,7 @@ class basAnc    	// base class for record anchors: basAnc<recordName>
 													//   nullptr if none; see cuprobe.cpp
 
     basAnc();
-    basAnc( int flags, SFIR * fir, USI nFlds, const char * what, USI eSz, RCT rt, USI sOff, const CULT* pCult, int dontRegister=0 );
+    basAnc( int flags, SFIR * fir, USI nFlds, const char * what, USI eSz, RCT rt, USI sOff, const CULT* pCult, bool dontRegister=false );
     void FC regis();
     virtual ~basAnc();  								// destroyed in deriv classes, to use vf
     virtual record* ptr() = 0;							// access block ptr (in drv class: typed)
@@ -101,6 +89,7 @@ class basAnc    	// base class for record anchors: basAnc<recordName>
 	virtual const record& rec(TI i) const = 0;   // ditto const
 	virtual record* GetAtSafe( int i) const	= 0;				// typed pointer to ith record or NULL
     virtual void* recMbr(TI i, USI off) = 0;					// point record i member by offset
+	virtual basAnc* CloneForType(const char* what, int _flags, BP _ownB) const = 0;
     void * FC recFld(TI i, SI fn);								// point record i member by FIELD # 3-92
     RC FC al( TI n, int erOp=ABT, BP _ownB=NULL);				// allocate records block. destroys old recs.
     RC FC reAl( TI n, int erOp=ABT);							// (re)allocate records block. keeps old recs <= n.
@@ -340,12 +329,11 @@ class record		// base class for records
 
 template <class T>  class anc : public basAnc
 { public:
-    anc( const char *what, SFIR *sFir, USI nFlds, RCT rt, CULT* pCULT=nullptr) 		// cpp'tor used for static instances
-        : basAnc( 0, sFir, nFlds, what, sizeof(T), rt, offsetof( T, sstat), pCULT)
+    anc( const char *what, SFIR *sFir, USI nFlds, RCT rt, const CULT* pCULT=nullptr, bool dontregister=false) 		// cpp'tor used for static instances
+        : basAnc( 0, sFir, nFlds, what, sizeof(T), rt, offsetof( T, sstat), pCULT, dontregister)
         { p = 0; }
-    anc( const BP src, int flags, char  *_what,  			// like-another constructor,
-         BP _ownB, int dontRegister=0 );    				//  code included only ifdef NEEDLIKECTOR.
     virtual ~anc();							// destroys records, and types anchor & its recs.
+	virtual anc<T>* CloneForType(const char* _what, int _flags, BP _ownB) const;
 
     T* p;									// typed pointer to record array storage block
 	virtual T* GetAtSafe( int i) const		// typed pointer to ith record or NULL
@@ -428,27 +416,24 @@ template <class T>  class anc : public basAnc
                                rp <= (record *)( (char *)ptr() + eSz*n );  \
                                IncP( DMPP( rp), eSz) )    \
                          if (((record *)rp)->r_status > 0)
+
 //=============================================================================
-#ifdef NEEDLIKECTOR		// define where this constructor is USED: avoids generating for classes where not used.
-
-template <class T> anc<T>::anc( const BP src, int flags, char *_what, BP _ownB, int dontRegister/*=0*/)
-
-	// like-another-with-records-deleted constructor.
-
-	// Generates the same derived class as src, using generic code; assumes size of all anc<T>'s is the same.
-
-{				// for subsidiary types anchor, cul.cpp::ratTyR, 2-92; only used for one (arbitrary) T.
-    // must copy: virt fcns, fir,nFlds,eSz,sOff,rt.
-    memcpy( this, src, sizeof(anc<T>) );  		// bitwise copy ALL, to incude virt fcn table ptr.
-    ancN= nAl= n= 0; p= 0; tyB= 0; 			// clear what don't want: anchor #, records, ul stuff.
-    mn = 1;						// mn = 1 when no records allocated even if will be static
-    ba_flags = flags;  what = _what;  ownB = _ownB; 	// store members given by caller
-    if (!dontRegister)
-		regis();			// conditionally include in nextAnc iteration.
-							// CAUTION: don't regis() tyB's or any dm anc<T>'s without
-							// adding unregister logic to destructor, 10-93.
-}				// anc<T>::anc
-#endif	// NEEDLIKECTOR
+template <class T> anc<T>* anc<T>::CloneForType(		// copy c-tor-ish re creating anc<T> for DEFTYPE
+	const char*_what,	// new 'what' -- generally "<source what> type" (in DM)
+	int _flags,		// flags
+	BP _ownB) const	// owner
+{
+
+	// make new anc<T> with data from *this
+	// combined with defaults from anc<T>::anc<T> and basAnc::basAnc
+	anc<T>* pC = new anc<T>(_what, fir, nFlds, rt, ba_pCULT, true);
+	
+    pC->ba_flags = _flags;	// caller specific values
+	pC->ownB = _ownB;
+
+	return pC;
+
+}	// anc<T>::CloneForType
 //-------------------------------------------------------------------------------------------------------------------------
 template <class T> anc<T>::~anc()			// destroy anchor: destroy its records and types.
 

src/cnguts.cpp

@@ -2176,9 +2176,8 @@ void LOCAL accumulatorsAccum(
 }	// accumulatorsAccum
 //-----------------------------------------------------------------------------
 RC ACCUMULATOR::acm_CkF(
-	int options)
+	[[maybe_unused]] int options)
 {
-	options;
 	return RCOK;
 
 }	// ACCUMULATOR::acm_CkF

src/cul.cpp

@@ -50,9 +50,7 @@
 /*------------------------------- INCLUDES --------------------------------*/
 
 #include "srd.h"		// SFIR; sFdtab; GetDttab
-#define NEEDLIKECTOR	// say this .cpp file needs anc<T> like-another constructor: prevents generation for classes where not used.
 #include "ancrec.h"	// record: base class for rccn.h classes; anc<T> template definition.
-#undef NEEDLIKECTOR
 #include "rccn.h"		// SFI_  [VALNDT_]
 #include "msghans.h"	// MH_S0201 MH_S0202
 
@@ -3624,7 +3622,7 @@ LOCAL void FC adjOwTi(
 	BP b;
 	for (CULT *cc = c-1; nxOwRat( ownB, c, &cc, &b, 0); )	// loop over basAncs owned by ownB
 	{
-		for (SI i = 1;  i <= b->n;  i++)		// loop records in basAnc b
+		for (TI i = 1;  i <= b->n;  i++)		// loop records in basAnc b
 		{
 			record *e = &b->rec(i);	// point to record i (ancpak.cpp)
 			if (e->ownTi < minI)		// if owner out of range of interest
@@ -3645,8 +3643,6 @@ LOCAL RC FC ratTyR( BP b)		// if basAnc does not have secondary basAnc for types
 
 	if (b->tyB==0)			// if this anc does not already have secondary anc for types, make one
 	{
-		RC rc;
-
 		// generate constructor arguments: flags, what, ownB
 
 		int flags = RFTYS | RFNOEX;  				// say is "types" anchor, disable expression expansion
@@ -3657,14 +3653,15 @@ LOCAL RC FC ratTyR( BP b)		// if basAnc does not have secondary basAnc for types
 		BP _ownB = 0;
 		if (b->ownB)			// if basAnc is owned, then tyB's owner will be owners tyB
 		{
+			RC rc;
 			CSE_E( ratTyR(b->ownB) )    	// CALL SELF now to be sure owner already has tyB: if added later, ptr wd not get here
 			_ownB = b->ownB->tyB;
 		}
 
-		// make anc<T> of main anc's <T> (ie same derived class): use special constructor (of an arbitrary T)
-		// that COPIES given anc INCLUDING VIRTUAL FCNS.  Copies rt, eSz, sOff, etc; drops records, tyB.
+		// make anc<T> of main anc's <T> (ie same derived class): Copies rt, eSz, sOff, etc; drops records, tyB.
 		// CAUTION: must not register w/o adding unregister to d'tor.
-		b->tyB = (BP)new anc<ZNR>( b, flags, _what, _ownB, 1 );	// construct copy w/ no records; do not register.  ancrec.h.
+		b->tyB = b->CloneForType( _what, flags, _ownB);	// construct copy w/ no records; do not register
+
 		if (!b->tyB)
 		{
 			//  (known inconsistency: out of memory messages from

src/cuprobe.cpp

@@ -359,16 +359,18 @@ RC PROBEOBJECT::po_FindMember()	// parse and look up probe member name in po_inB
 		// if not found, issue error message.  syntax ok if here.
 
 		if (!po_inB && !po_runB) 					// if found in neither input nor run records basAnc
+		{
 			if (!m)							// if first token of name
-				return perNx( MH_U0011, po_what, cuToktx); 	// "U0011: %s member '%s' not found"
+				return perNx(MH_U0011, po_what, cuToktx); 	// "U0011: %s member '%s' not found"
 			else
 			{	// fancier error message for partial match
-				const char* foundPart = strncpy0( NULL, f1->fi_GetMName(), m+1);		// truncate to Tmpstr
-				return perNx( MH_U0012,
+				const char* foundPart = strncpy0(NULL, f1->fi_GetMName(), m+1);		// truncate to Tmpstr
+				return perNx(MH_U0012,
 					//"U0012: %s member '%s%s' not found: \n"
 					//"    matched \"%s\" but could not match \"%s\"."
-					po_what,  foundPart, cuToktx,  foundPart, cuToktx );
+					po_what, foundPart, cuToktx, foundPart, cuToktx);
 			}
+		}
 
 		// match found for current token.  Done if end fir table member text; error if tables continue differently.