Update all findRecbyNmXX() calls to basAnc::FindRecByName

Author: chipbarnaby

src/ancrec.cpp

@@ -82,7 +82,7 @@ class basAnc    	// base class for record anchors: basAnc<recordName>
     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)
+    virtual record* ptr() const = 0;					// access block ptr (in drv class: typed)
 	virtual void** pptr() = 0;
 	virtual void setPtr( record* r) = 0;
     virtual record& rec(TI i) = 0;   // { return (record)((char *)ptr() + i*eSz); }	// access record i
@@ -100,12 +100,27 @@ class basAnc    	// base class for record anchors: basAnc<recordName>
     static BP FC anc4n( USI an, int erOp=ABT);   				// access anchor by anchor #
     static RC FC findAnchorByNm( char *what, BP *b);
     static int FC ancNext( size_t &an, BP *_b);						// iterate anchors
-    RC validate( const char* fcnName, int erOp=ABT, SI noStat=0);		// check for valid anchor
+	static RC ba_ValidateSafe(const basAnc* _this, const char* fcnName, int erOp = ABT, bool noStat = false);
+    RC ba_Validate( const char* fcnName, int erOp=ABT, bool noStat=false) const;		// check for valid anchor
 	record* Get1stForOwner(int ss);
     RC findRecByNm1( const char* _name, TI *_i, record **_r);    		// find record by 1st match on name
+	RC findRecByNm1X( const char* _name, TI *_i, record **_r);    		// find record by 1st match on name
+
     RC findRecByNmU( const char* _name, TI *_i, record **_r);  			// find record by unique name match
+	RC findRecByNmUX( const char* _name, TI *_i, record **_r);  			// find record by unique name match
+
     RC findRecByNmO( const char* _name, TI ownTi, TI *_i, record **_r);	// find record by name and owner subscript
+	RC findRecByNmOX( const char* _name, TI ownTi, TI *_i, record **_r);	// find record by name and owner subscript
+
     RC findRecByNmDefO( const char* _name, TI ownTi, record **_r1, record **_r2 );	// find record by name, and owner if ambiguous
+    RC findRecByNmDefOX( const char* _name, TI ownTi, record **_r1, record **_r2 );	// find record by name, and owner if ambiguous
+
+
+	static constexpr int frn1STMATCH = 0;
+	static constexpr int frnUNIQUE  = 0x40000000;
+	static constexpr int frnACCEPTNONOWNER = 0x20000000;
+	static constexpr int frnTIMASK = 0x01ffffff;
+	static RC FindRecByName(const basAnc* _b, const char* _name, int ownerTIOpt=0, record** pr1=nullptr, TI* pTi=nullptr, record** pr2=nullptr);
 	const char* getChoiTx( int fn, int options=0, SI chan=-1, BOOL* bIsHid=NULL) const;
 	const char* culMbrIdTx(int fn) const;
 	int culMbrArrayDim(int fn) const;
@@ -363,7 +378,7 @@ template <class T>  class anc : public basAnc
 		}
 	}	// GetAtGud
 
-    virtual record* ptr()		{ return p; } 		// access block ptr (in base class / generic code)
+    virtual record* ptr() const { return p; } 		// access block ptr (in base class / generic code)
 	virtual void** pptr()		{ return (void **)&p; }
 	virtual void setPtr( record* r) { p = (T*)r; }
     virtual record& rec(TI i)	{ return p[i]; }		// access record i in base/generic code
@@ -402,13 +417,12 @@ template <class T>  class anc : public basAnc
 //-----  variant with condition
 #define RLUPC( B, rp, C) for (rp=(B).p+(B).mn;  rp <= (B).p + (B).n;  rp++) if (rp->r_status > 0 && (C))
 
-#if 0
-0 unused
-0 //----- macro to loop over records of generic anchor (record type not known) (hook to change re skipping deleted records)
-0 #define RLUPGEN( B, rp)  for ( rp = (record *)( (char *)(B).ptr() + (B).eSz*(B).mn );  \
-0                               rp <= (record *)( (char *)(B).ptr() + (B).eSz*(B).n );  \
-0                               (char *)rp += (B).eSz )    \
-0                         if (((record *)rp)->r_status > 0)
+#if 1
+ //----- macro to loop over records of generic anchor (record type not known) (hook to change re skipping deleted records)
+ #define RLUPGEN( B, rp)  for ( rp = (record *)( (char *)(B).ptr() + (B).eSz*(B).mn );  \
+                               rp <= (record *)( (char *)(B).ptr() + (B).eSz*(B).n );  \
+                               IncP( DMPP( rp), (B).eSz) )    \
+                         if (((record *)rp)->r_status > 0)
 #endif
 
 //----- macro to loop over records of generic anchor in member fcn (hook to change re skipping deleted records)

src/ancrec.h

@@ -553,7 +553,7 @@ RC DESCOND::dc_CkF()		// check after input
 static void DCTauTest( int doy)
 {
 float ebnlist[] = { 150.f, 200.f, 250.f, 300.f, -1.f };
-float edflist[] = { 20.f, 30.f, 40.f };
+float edflist[] = { 20.f, 30.f, 40.f, -1.f };
 
 	DESCOND dc( &DcR, 1);
 	dc.dc_doy = doy;

src/cgwthr.cpp

@@ -1995,7 +1995,7 @@ RC ckRefPt(	// check / access ref from one RAT to another
 	record* p = NULL;
 
 // check argument
-	if (toBase->validate( "cncult2.cpp:ckRefPt", WRN))
+	if (basAnc::ba_ValidateSafe( toBase, "cncult2.cpp:ckRefPt", WRN) != RCOK)
 		rc = RCBAD;
 	else
 	{

src/cncult2.cpp

@@ -511,45 +511,45 @@ RC RI::ri_oneRxp()		// process one report or export for topRxp
 
 // topZn and topCol must be called first; buildUnspoolInfo must be called afterwards.
 {
-	RC rc=RCOK;
+	RC rc = RCOK;
 
 	int isEx = isExport;					// 1 for export, 0 for report
 	const char* exrp = isEx ? "ex" : "rp"; 				// to insert in member names in error messages
 	const char* exrePort = isEx ? "export" : "report";	// to insert in errmsgs
 
-// get field texts for errMsgs.  No errmsg (except in returned text) if value out of range.
+	// get field texts for errMsgs.  No errmsg (except in returned text) if value out of range.
 
-	const char* tyTx = getChoiTx( RI_RPTY, 1);
-	const char* whenTy = strtprintf( "when %sType=%s", exrp, tyTx);
+	const char* tyTx = getChoiTx(RI_RPTY, 1);
+	const char* whenTy = strtprintf("when %sType=%s", exrp, tyTx);
 
-// check RQD members set -- else can bomb with FPE
+	// check RQD members set -- else can bomb with FPE
 
-	if (CkSet( RI_RPTY))
+	if (CkSet(RI_RPTY))
 		return RCBAD;					// if not set, no run, terminate checking this report/export now
 
-// recall entry time check function 1) as it has not been called for pre-stuffed default reports entries;
-// 2) to recheck references (DELETE given after entry?)(if it checks any); and 3) general paranoia.
+	// recall entry time check function 1) as it has not been called for pre-stuffed default reports entries;
+	// 2) to recheck references (DELETE given after entry?)(if it checks any); and 3) general paranoia.
 
 	if (!errCount())	// but if already have errors (hence no run), do not recall:
-    					//   would issue duplicate messages for any errors it detected.
+		//   would issue duplicate messages for any errors it detected.
 		if (ri_CkF())	// note this is the ckf for exports as well as reports
 			return RCBAD;			// bad. done with entry.
 
-// default start and/or end days of report.  Don't set nz b4 other checks as not allowed with some rpt types & freq's.
-//					     and, doing here sets dates for monthly default reports.
+	// default start and/or end days of report.  Don't set nz b4 other checks as not allowed with some rpt types & freq's.
+	//					     and, doing here sets dates for monthly default reports.
 
-	if ( rpFreq==C_IVLCH_M				// monthly frequency: default days to start and end of run
-	 ||  rpFreq==C_IVLCH_Y )			// annual frequency: this sets dates
+	if (rpFreq==C_IVLCH_M				// monthly frequency: default days to start and end of run
+	 ||  rpFreq==C_IVLCH_Y)			// annual frequency: this sets dates
 	{
 		if (!rpDayBeg)   rpDayBeg = Topi.tp_begDay;
 		if (!rpDayEnd)   rpDayEnd = Topi.tp_endDay;
 	}
 	else if (!rpDayEnd)				// other frequencies; rpDayBeg is 0 if here and dates not used.
 		rpDayEnd = rpDayBeg;			// end day defaults to start day
 
-// disallow condition for types without repeated conditional lines
+	// disallow condition for types without repeated conditional lines
 
-	int rpCondGiven = IsSet( RI_RPCOND);			// 1 if rpCond entered by user, 0 if rpCond defaulted (to TRUE).
+	int rpCondGiven = IsSet(RI_RPCOND);			// 1 if rpCond entered by user, 0 if rpCond defaulted (to TRUE).
 	switch (rpTy)
 	{
 	case C_RPTYCH_SUM:
@@ -562,7 +562,7 @@ RC RI::ri_oneRxp()		// process one report or export for topRxp
 	case C_RPTYCH_TUSIZE:
 	case C_RPTYCH_TULOAD:			// 6-95
 		if (rpCondGiven)
-			rc = oer( MH_S0548, exrp, exrp, tyTx);			// "%sCond may not be given with %sType=%s"
+			rc = oer(MH_S0548, exrp, exrp, tyTx);			// "%sCond may not be given with %sType=%s"
 		break;
 	default:
 		;
@@ -574,70 +574,71 @@ RC RI::ri_oneRxp()		// process one report or export for topRxp
 	switch (rpTy)
 	{
 	case C_RPTYCH_MTR:							// "Meter" report/export requires rp/exMeter
-		rc |= require( whenTy, RI_MTRI);
-		rc |= disallowN( whenTy, RI_ZI, RI_AHI, RI_TUI, RI_DHWMTRI, RI_AFMTRI, 0);
+		rc |= require(whenTy, RI_MTRI);
+		rc |= disallowN(whenTy, RI_ZI, RI_AHI, RI_TUI, RI_DHWMTRI, RI_AFMTRI, 0);
 		break;
 
 	case C_RPTYCH_DHWMTR:							// "DHWMTR" report/export requires rp/exDHWMeter
-		rc |= require( whenTy, RI_DHWMTRI);
-		rc |= disallowN( whenTy, RI_ZI, RI_AHI, RI_TUI, RI_MTRI, RI_AFMTRI, 0);
+		rc |= require(whenTy, RI_DHWMTRI);
+		rc |= disallowN(whenTy, RI_ZI, RI_AHI, RI_TUI, RI_MTRI, RI_AFMTRI, 0);
 		break;
 
 	case C_RPTYCH_AFMTR:							// "AFMTR" report/export requires rp/exAFMeter
-		rc |= require( whenTy, RI_AFMTRI);
+		rc |= require(whenTy, RI_AFMTRI);
 		rc |= disallowN(whenTy, RI_ZI, RI_AHI, RI_TUI, RI_MTRI, RI_DHWMTRI, 0);
 		break;
 
 	case C_RPTYCH_AHSIZE:	// AH-specific reports
 	case C_RPTYCH_AHLOAD:
 	case C_RPTYCH_AH:
-		rc |= require( whenTy, RI_AHI);
-		rc |= disallowN( whenTy, RI_ZI, RI_TUI, RI_MTRI, RI_DHWMTRI, 0);
+		rc |= require(whenTy, RI_AHI);
+		rc |= disallowN(whenTy, RI_ZI, RI_TUI, RI_MTRI, RI_DHWMTRI, 0);
 		break;
 
 	case C_RPTYCH_TUSIZE:	// TU-specific reports
 	case C_RPTYCH_TULOAD:
-		rc |= require( whenTy, RI_TUI);
-		rc |= disallowN( whenTy, RI_ZI, RI_AHI, RI_MTRI, RI_DHWMTRI, 0);
+		rc |= require(whenTy, RI_TUI);
+		rc |= disallowN(whenTy, RI_ZI, RI_AHI, RI_MTRI, RI_DHWMTRI, 0);
 		break;
 
 	case C_RPTYCH_ZDD:	// zone-specific reports
 	case C_RPTYCH_ZEB:
 	case C_RPTYCH_ZST:
-		rc |= require( whenTy, RI_ZI);
-		rc |= disallowN( whenTy, RI_TUI, RI_AHI, RI_MTRI, RI_DHWMTRI, 0);
+		rc |= require(whenTy, RI_ZI);
+		rc |= disallowN(whenTy, RI_TUI, RI_AHI, RI_MTRI, RI_DHWMTRI, 0);
 		break;
 
 	case C_RPTYCH_SUM:	// non- zone -ah -tu -meter reports/exports
 	case C_RPTYCH_LOG:
 	case C_RPTYCH_ERR:
 	case C_RPTYCH_INP:
 	case C_RPTYCH_UDT:
-		rc |= disallowN( whenTy, RI_ZI, RI_TUI, RI_AHI, RI_MTRI, RI_DHWMTRI, 0);
+		rc |= disallowN(whenTy, RI_ZI, RI_TUI, RI_AHI, RI_MTRI, RI_DHWMTRI, 0);
 		break;
 
 	default:
 		if (!errCount())					// if other error has occurred, suppress msg: may be consequential
-			rc = oer( (const char *)MH_S0555, exrp, rpTy);  	// "cncult:topRp: Internal error: Bad %sType %d"
+			rc = oer((const char*)MH_S0555, exrp, rpTy);  	// "cncult:topRp: Internal error: Bad %sType %d"
 	}
 
-// default/check file reference. Defaulted to rp/exfile in which nested, else default here to "Primary" (supplied by TopStarPrf)
+	// default/check file reference. Defaulted to rp/exfile in which nested, else default here to "Primary" (supplied by TopStarPrf)
 
 	if (!ownTi)					// if no file given & not defaulted (note default does not set FsSET bit)
-	{	anc<RFI>* fb = isEx ? &XfiB : &RfiB;			// ptr to reportfile or exportfile input ratbase
-		if (fb->findRecByNm1("Primary", &ownTi, NULL))	// find first record by name (ancrec.cpp) / if not found
+	{
+		anc<RFI>* fb = isEx ? &XfiB : &RfiB;				// ptr to reportfile or exportfile input ratbase
+		if (basAnc::FindRecByName(fb, "Primary", 0, nullptr, &ownTi) != RCOK)	// find first record by name / if not found
 		{
 			if (fb->n)						// if not found, if there are ANY r/xport files,
 				ownTi = 1;					// use first one: is probably Primary renamed with ALTER
 			else							// no r/xport files at all
-				rc |= ooer(RI_OWNTI, 					// issue error once (cul.cpp), no run
-					   isEx ? MH_S0556 : MH_S0557);	// "No exExportfile given" or "No rpReportfile given"
+				rc |= ooer(RI_OWNTI, MH_S0556, 					// issue error once (cul.cpp), no run
+					   isEx ? "exExportFile" : "rpReportFile");	// "exExportFile/rpReportFile 'Primary' not found"
 		}
 	}
-	RFI* rfp=NULL;
-	if (ownTi)
-		if (ckRefPt( isEx ? &XfiB : &RfiB, ownTi,  isEx ? "exFile" : "rpFile",  NULL, (record **)&rfp ) )	// ck ref
-			return RCBAD;
+	RFI* rfp = NULL;
+	if (!ownTi
+	 || ckRefPt( isEx ? &XfiB : &RfiB, ownTi,  isEx ? "exFile" : "rpFile",  NULL, (record **)&rfp ) )	// ck ref
+		return RCBAD;
 
 // check zone reference or ALL or SUM
 	int isAll = 0;		// set nz iff ALL

src/cncult4.cpp

@@ -1043,12 +1043,14 @@ LOCAL RC FC cuEvalI(
 			defO = *IPI++;			// get 0 or default owner subscript for ambiquity resolution
 			p = *SPP;				// get ptr to name string from stack. no pop: will overwrite.
 			const char* pName = strTrim( (char *)p);	// trim in place
-			if (defO				// if defO given (owning input record subscript)
-			 && b->ownB )    		// if owning-basAnc pointer set in probed basAnc (should be set in run rat
-								   //    only if subscripts in owning run rat match input subscripts)
-				trc = b->findRecByNmDefO( pName, defO, SPPR, NULL);	// seek rcd by name & defO, repl ptr in stk.
-			else
-				trc = b->findRecByNmU( pName, NULL, SPPR);	// seek unique record by name, replace ptr in stk.
+			// if defO given (owning input record subscript)
+			// and owning-basAnc pointer set in probed basAnc (should be set in run rat
+			//    only if subscripts in owning run rat match input subscripts)
+			int ownerTIOpt = defO && b->ownB	
+				? defO | basAnc::frnACCEPTNONOWNER	// seek rcd by name & defO, accept alt owner if unique
+				: basAnc::frnUNIQUE;				// seek any rcd iff unique
+			trc = basAnc::FindRecByName(b, pName, ownerTIOpt, SPPR);
+
 			if (trc)
 			{
 				ms = strtprintf(

src/cueval.cpp

@@ -436,11 +436,13 @@ x	trace = 1;
 			err( PWRN, MH_S0204);     // "cul(): NULL RAT entry arg (e)"
 			return 1;
 		}
-		if (e->b->validate("cul.cpp:cul",WRN))  return 1;
+		if (basAnc::ba_ValidateSafe( e->b, "cul.cpp:cul", WRN) != RCOK)
+			return 1;
 
 		// autosize flag pointer and flag
 		pAuszF = _pAuszF;		// store argument pointer or NULL given by caller
-		if (pAuszF)  *pAuszF = FALSE;	// say no AUTOSIZE commands yet seen
+		if (pAuszF)
+			*pAuszF = FALSE;	// say no AUTOSIZE commands yet seen
 
 		// init top-level context stack frame
 		memset( xSp, 0, sizeof(XSTK) );	// zero it: inits many members
@@ -1224,26 +1226,30 @@ LOCAL RC FC culRATE(	// do RATE cult entry
 			// "owned" basAnc record names need only be unique for same owner:
 			if ( !defTy			// type names must be globally unique
 			  && xSp > xStk )		// insurance: if command is nested
-			{
-				if (b->findRecByNmO( name,   			// find basAnc record by name/owner, ancrec.cpp
-				xSp->i,  			//  owner subscript. always here??
-				NULL, NULL)==RCOK )  		//   if found
+			{	// find basAnc record by name/owner
+				//   old comment: xSp->i: owner subscript, always here?
+				if (basAnc::FindRecByName(b, name, xSp->i) == RCOK)
+				{	// record found: duplicate name
 					// if owner ti can be set != xSp->i, then check again at END.<<<<
 					perlc( 			// errMsg, show input line and ^. cuparse.cpp.
 						scWrapIf( 							// strtcat w conditional \n
-							strtprintf( MH_S0227, c->id, name.CStr() ),	// "duplicate %s name '%s' in "
-							xSp->b->rec(xSp->i).objIdTx( 1 ),	// owner class & obj name, etc
+							strtprintf(MH_S0227, c->id, name.CStr()),	// "duplicate %s name '%s' in "
+							xSp->b->rec(xSp->i).objIdTx(1),	// owner class & obj name, etc
 							"\n    "), getCpl()); 						// \n between if wd be longer
+				}
 				// and continue here (?) (perlc prevents RUN)
 			}
-			else 						// not ownable or not in ownable context
-				if ( (defTy  ?  b->tyB->findRecByNm1( name, NULL, NULL)  	// search basAnc's types basAnc if defining a type
-				:  b  ?  b->findRecByNm1( name, NULL, NULL)  	// else the basAnc itself
-				:  RCBAD )==RCOK )				// NULL b ??: unsure while converting code, sometime if possible
-					// if any record with same name found found
-					perlc( MH_S0228, c->id,  defTy ? " type" : "",  name.CStr());	// "duplicate %s%s name '%s'"
+			else
+			{	// not ownable or not in ownable context
+				// defining a type (defTy): search b->tyB (basAnc's types basAnc)
+				//    (Future: if necessary to avoid defTy ambiguity, also search b)
+				// else basAnc itself
+				if (basAnc::FindRecByName(defTy ? b->tyB : b, name) == RCOK)
+				{	// if any record with same name found found
+					perlc(MH_S0228, c->id, defTy ? " type" : "", name.CStr());	// "duplicate %s%s name '%s'"
+				}
+			}
 			// and continue here (?) (perlc prevents RUN)
-			// if necessary to avoid (future) ambiguity during defTy, also search regular table (b).
 		}
 
 // add record to specified basAnc
@@ -1280,7 +1286,7 @@ LOCAL RC FC culRATE(	// do RATE cult entry
 		if (typeName.IsSet())
 		{
 			record *typeE;
-			if (b->tyB->findRecByNm1( typeName, NULL, /*VV*/ &typeE) != RCOK)
+			if (basAnc::FindRecByName(b->tyB, typeName, basAnc::frn1STMATCH, &typeE) != RCOK)
 				perlc( MH_S0229, c->id, typeName.CStr());  		// "%s type '%s' not found"
 			// and continue here with raw record (perlc prevents RUN)
 			else					// found
@@ -3452,7 +3458,8 @@ LOCAL RC ratPutTy( record *e, CULT *c)
 
 #ifdef DEBUG
 // check argument
-	if (b->validate("cul:ratPutTy",WRN))  return RCBAD;
+	if (basAnc::ba_ValidateSafe( b, "cul:ratPutTy", WRN) != RCOK)
+		return RCBAD;
 #endif
 
 // require record to be LAST in basAnc -- else have no way to delete  ( <<<< believe no longer true 1-92, fix if need found)
@@ -3637,7 +3644,7 @@ LOCAL RC FC ratTyR( BP b)		// if basAnc does not have secondary basAnc for types
 // returns RCOK/RCFATAL
 {
 #ifdef DEBUG
-	if (b->validate("ratTyR",WRN))	// check argument
+	if (basAnc::ba_ValidateSafe( b, "ratTyR", WRN) != RCOK)	// check argument
 		return RCFATAL;
 #endif
 
@@ -4041,16 +4048,19 @@ LOCAL RC ratLuDefO(	// look up basAnc record by name, resolving ambiguities usin
 		what = b->what;
 	if (defO==0)						// if no default owner given
 	{
-		rc = b->findRecByNm1( name, NULL, /*VV*/ &e);		// find first record with given name, ancrec.cpp
+		rc = basAnc::FindRecByName(b, name, basAnc::frn1STMATCH, &e);	// find first record with given name
 		if (rc)
 			ms = strtprintf( MH_S0278, what, name);	// format ms "%s '%s' not found" to Tmpstr.  Also used below.
 	}
 	else
 	{
-		rc = b->findRecByNmDefO( name, defO, /*VV*/ &e, /*VV*/ &e2);	// find record by name & dfl owner, ancrec.cpp
-		if (rc)								// (RCBAD not found, RCBAD2 ambiguous 1-92)
+		// if (defO) err(PABT, "Hit");
+
+		rc = basAnc::FindRecByName( b, name, defO | basAnc::frnACCEPTNONOWNER, &e, nullptr, &e2);
+		// rc: RCOK: found, RCBAD=not found, RCBAD2=ambiguous
+		if (rc)
 		{
-			if (e)							// if bad and entrie(s) returned, is ambiguous match
+			if (e && e2)					// if bad and entrie(s) returned, is ambiguous match
 				ms = strtprintf( MH_S0279,				// "ambiguous name: \n"
 					what, name, e->whatIn(),			// "    %s '%s' exists in %s\n"
 					e2->whatIn() );				// "    and also in %s" */

src/cul.cpp

@@ -479,9 +479,10 @@ RC PROBEOBJECT::po_TryImInProbe()
 		TI defO = ratDefO(b);		/* get 0 or input record subscript in b->ownB of context in which current
 						   expr is being evaluated.  Returns 0 if not "owned record" basAnc, if its .ownB
 						   is 0, or cur expr not embedded in stmt group for such a record. cul.cpp. */
-		RC trc = defO
-			? b->findRecByNmDefO(name, defO, &e, NULL)	// seek record (ancrec.cpp) by name & defO, ret ptr if found.
-			: b->findRecByNmU(name, NULL, &e);    	// seek unique record (ancpak.cpp) by name, ret ptr if found.
+		int ownerTIOpt = defO
+			? defO | basAnc::frnACCEPTNONOWNER		// seek by owner, match non-owned iff owned not found
+			: basAnc::frnUNIQUE;					// search all / match iff unique
+		RC trc = basAnc::FindRecByName(b, name, ownerTIOpt, &e);
 		/*if (!evfOk)					as below; add if found ambiguity error occurs here
 									when caller fallthru to runtime probe could work */
 		if (trc==RCBAD2)							// if ambiguity (not resolved by defO)