More clang fixes including use of promoted types in va_arg()

Author: chipbarnaby

src/ashwface.cpp

@@ -175,16 +175,18 @@ bool CFSTYX::cfx_CalcRatings(
 //-----------------------------------------------------------------------------
 CFSTYX::CFSTYX(			// build a CFS
 	const char* id,			// unique ID (max len = CFSIDLEN)
-	float _UcogNFRC,		// externally calculated NFRC cog U-factor, Btuh/ft2-F
-	float _SHGCcogNFRC,		// externally calculated NFRC cog SHGC
+	double _UcogNFRC,		// externally calculated NFRC cog U-factor, Btuh/ft2-F
+	double _SHGCcogNFRC,	// externally calculated NFRC cog SHGC
 	...)					// add'l gap / layer info
+// NOTE: double not float for _UcogNFRC and _SHGCcogNFRC for consistency
+//    with other numeric args (which will be promoted to double)
 // call = id, U, SHGC, layerID, gasID, gapT (inches), layerID, ...
 //   layer order = outside -> inside
 {
 	Clear();
 	FCSET( ID, id);
-	UcogNFRC = _UcogNFRC;
-	SHGCcogNFRC = _SHGCcogNFRC;
+	UcogNFRC = float(_UcogNFRC);
+	SHGCcogNFRC = float(_SHGCcogNFRC);
 	va_list ap;
 	va_start( ap, _SHGCcogNFRC);
 	RC rc = RCBAD;

src/ashwface.h

@@ -38,7 +38,7 @@ struct CFSTYX : public CFSTY
 	float SHGCcogAW;	// ASHWAT cog SHGC
 
 	CFSTYX() { Clear(); }
-	CFSTYX( const char* id, float _UcogNFRC, float _SHGCcogNFRC, ...);
+	CFSTYX( const char* id, double _UcogNFRC, double _SHGCcogNFRC, ...);
 	void Clear();
 	// wrappers for CFSTY mbrs that to facilitate C++ <-> DLL comparisons
 	bool cfx_CalcRatings( float& Urat, float& SHGCrat);

src/cnloads.cpp

@@ -1278,7 +1278,7 @@ RC ZNR::zn_AirRequest(		// determine air requirement given rs_asSup
 		orWarn("Flipped tSup  RSYS='%s', tPln=%0.3f, tSup=%0.3f, tSP=%0.1f, tZn=%0.3f\n",
 			rs->Name(), rs->rs_asOut.as_tdb, tSup0, zn_tzsp, tz);
 	}
-	if (zn_hcMode != RSYS::rsmOFF && zn_tzsp > 0.f)
+	if (zn_hcMode == RSYS::rsmOFF && zn_tzsp > 0.f)
 		orWarn("Inconsistent hcMode  RSYS='%s', hcMode=%d, tSP=%0.1f, tZn=%0.3f\n",
 			rs->Name(), zn_hcMode, zn_tzsp, tz);
 #endif

src/cpgbuild.cpp

@@ -75,20 +75,19 @@ LOCAL void pbLabel( SI pgfmt, SI row, SI col, SI wid, const char *label);
 
 //=========================================================================
 void CDEC pgbuildr(
-	/* declared new way for passing FLOATs 2-90. DOES *NOT* WORK: MSC 5.1 passes floats in variable arg list double. */
 
 	// Add text to a pgpak page per tables; optionally allocs, outputs (via cpnat.c), frees.
 
 	char **ppp,	/* NULL to use internal page ptr (2-90), or ptr to page ptr (may be updated on return).
 		   CAUTION: if ptr ptr given but page is alloc here (row nz), ptr must contain NULL or valid, freeable DM ptr. */
 	RC *prc,	/* If *prc is not RCOK, pgbuildr() does *NOTHING*;
 		   otherwise outcome of this operation is returned in *prc (non-RCOK if console interrupt, printer error, etc). */
-	SI rows, 	/* Size of page to alloc, or row 0 if *ppp already alloc'd. */
-	SI cols,	/* .. */
-	SI rOff,	/* Row offset for *ALL* rows specified in all actions in this call: shifts display down w/o changing
+	int rows, 	/* Size of page to alloc, or row 0 if *ppp already alloc'd. */
+	int cols,	/* .. */
+	int rOff,	/* Row offset for *ALL* rows specified in all actions in this call: shifts display down w/o changing
 		   many table entries.  Typical use: make blank space above title (idx'd methods).
 		   [ CAUTION: avoid both nz rOff and > 1 PGCUR in table rows.  fixing this bug 2-90.] */
-	char *title,	/* NULL or Title to appear PGLJ at position (1+rOff,1).
+	const char *title,	/* NULL or Title to appear PGLJ at position (1+rOff,1).
 		   " continued" is appended if table head repeated on continuation print page.
 		   Allow for row used by title in PBHEAD.val2 with PBTABLE, PBFILLREC. */
 
@@ -119,12 +118,6 @@ void CDEC pgbuildr(
 
 // *prc remains RCOK if allocation, addition, and output completed ok; else nz.  Errors have been reported (using WRN).
 {
-	va_list argp;   // Working pointer for variable args
-	USI meth;
-	SI keepgoing;
-	RC rc;
-	char *rp = nullptr;
-	char *tp;
 	/* Size table -- !! MUST match PBxxxx method type defns in cpgbuild.c.  Used to increment pointer through method driver tables.
 	   Currently not used by methods involving PBM_IDX (such as PB_TABCOL and PB_FILLREC), but they are in table anyway */
 	static char sizetab[] = {
@@ -141,7 +134,10 @@ void CDEC pgbuildr(
 	if (*prc != RCOK)
 		return;
 
+	char *rp = nullptr;
+
 	/* Initialize */
+	va_list argp;   // Working pointer for variable args
 	va_start( argp, title);
 
 	/* some arguments to file-globals for use by internal subfunctions */
@@ -166,10 +162,10 @@ void CDEC pgbuildr(
 
 	/* Loop over arguments */
 
-	keepgoing = TRUE;     		/* Loop termination flag, tested at end of loop */
+	bool keepgoing = true;     		/* Loop termination flag, tested at end of loop */
 	do
 	{
-		rc = RCOK;				/* no error yet this arg */
+		RC rc = RCOK;				/* no error yet this arg */
 		pbHd = va_arg( argp, PBHEAD *);		/* Ptr to PBHEAD, or spec fcn. file-global used by callees. */
 		if (pbHd==NULL)
 			continue;				/* skip NULL args */
@@ -202,8 +198,8 @@ void CDEC pgbuildr(
 			/* Other arguments: output per method */
 
 		{
-			meth = (pbHd->methopt) & PBMTHMASK;		/* Formatting method */
-			tp = (char *)pbHd->methtab;			/* method table pointer, actual type depends on meth. */
+			int meth = (pbHd->methopt) & PBMTHMASK;		/* Formatting method */
+			char* tp = (char *)pbHd->methtab;			/* method table pointer, actual type depends on meth. */
 			if (meth & PBM_RP)				/* method bit says rp arg follows */
 				rp = va_arg(argp, char *);			/* Pick up record pointer */
 			/* pbIdxMth() and its callees also picks up additional arguments */
@@ -222,16 +218,16 @@ void CDEC pgbuildr(
 
 				while ( ((PB_TEXT *)tp)->pgfmt != PBMETHEND )
 				{
-					SI wid = 0;
-					SI units, cvfmt;
-					SI off;
-					USI dt;
+					int wid = 0;
+					int units, cvfmt;
+					int off;
+					int dt;
 					char *p;
 
 					/* prefetch .pgfmt,.row,.col for cases where struct matches PBTEXT (all cases except those without .col, 2-90) */
-					SI pgfmt = ((PB_TEXT *)tp)->pgfmt | PGGROW;	/* pgpak format. PGGROW: say enlarge page if necess */
-					SI row = ROWOFF( ((PB_TEXT *)tp)->row);		/* ROWOFF: adds pbROff if not PGCUR-relative */
-					SI col = ((PB_TEXT *)tp)->col;
+					int pgfmt = ((PB_TEXT *)tp)->pgfmt | PGGROW;	/* pgpak format. PGGROW: say enlarge page if necess */
+					int row = ROWOFF( ((PB_TEXT *)tp)->row);		/* ROWOFF: adds pbROff if not PGCUR-relative */
+					int col = ((PB_TEXT *)tp)->col;
 
 					/* more common init */
 					const char* label = nullptr;	// default no label: for shared case code
@@ -297,17 +293,17 @@ void CDEC pgbuildr(
 						cvfmt = ((PB_DATA *)tp)->cvfmt;	/* get cvpak fmt */
 offJoin:			/* PBDATOFF/L join here */
 						if (dt==(USI)PBARGSI)		/* on special value get dt */
-							dt = va_arg( argp, USI);		/* ...from pgbuildr arg list*/
+							dt = va_arg( argp, int);		/* ...from pgbuildr arg list*/
 						if (p==NULL)				/* for NULL data ptr */
 							dt = DTUNDEF;			/* show '?' (historical) */
 						/* NB if both in arg list, dt precedes data */
 
 						if (units==PBARGSI)			/* spec value says */
-							units = va_arg( argp, SI);	/* get from arg list*/
+							units = va_arg( argp, int);	/* get from arg list*/
 						if (wid==PBARGSI)			/* spec value says */
-							wid = va_arg( argp, SI);		/* get from arg list*/
+							wid = va_arg( argp, int);		/* get from arg list*/
 						if (cvfmt==PBARGSI)			/* spec value says */
-							cvfmt = va_arg( argp, SI);	/* get from arg list*/
+							cvfmt = va_arg( argp, int);	/* get from arg list*/
 						if (p==PBOMITP)			/* ptr value omits output & label */
 						{
 							/* s is "" from above (write anyway for PGCUR) */

src/cpgbuild.h

@@ -306,7 +306,7 @@ struct PB_DATOFFL			/* code assumes same as PB_DATOFF + label at end */
 
 /*------------------------- FUNCTION DECLARATIONS -------------------------*/
 
-void CDEC pgbuildr( char **ppp, RC *prc, SI rows, SI cols, SI rOffs, char *title, ...);
+void CDEC pgbuildr( char **ppp, RC *prc, int rows, int cols, int rOffs, const char* title, ...);
 
                     // CAUTION: any FLOATs in variable arg list are passed as doubles
 

src/cpnat.cpp

@@ -179,7 +179,7 @@ f	}		/* pnSetFooter */
 #endif	/* FOOTERS */
 
 //===========================================================================
-RC FC pnAlloc( char **ppp, SI rows, SI cols, int erOp)
+RC FC pnAlloc( char **ppp, int rows, int cols, int erOp)
 
 /* allocate a pgpak PAGE for use thru cpnat.c */
 /* clears per-table stuff: "continued" posn, # head rows */
@@ -219,10 +219,10 @@ void FC pnTitle(
 
 	char **ppp,	/* (used to put s in page)
 		   CAUTION info retained for only 1 page at a time */
-	SI row,		/* 0 or title row */
-	SI col, 	/* 0 or title text left col if text given,
+	int row,		/* 0 or title row */
+	int col, 	/* 0 or title text left col if text given,
 		   or exact left col for "continued" if s is NULL */
-	char *s ) 	/* title text, NULL for none */
+	const char *s ) 	/* title text, NULL for none */
 {
 	thConRow = row;
 	thConCol = col;		/* strlen(s)+1 conditionally added below */

src/cuparse.cpp

@@ -570,7 +570,7 @@ LOCAL SYTBH symtab = { NULL, 0 };
 // many tentatively decl in cuparsex.h for [cumain.cpp 10-90 and now] cuprobe.cpp 12-91.
 
  /*--- CURRENT TOKEN INFO.  Set mainly by toke().  Not changed by unToke(). */
- SI tokTy = 0;   		// current token type (CUT__ define; cuTok ret val)
+ int tokTy = 0;   		// current token type (CUT__ define; cuTok ret val)
  SI prec = 0;    		// "prec" (precedence) from opTbl[]. PR__ defines.
  SI nextPrec = 0;		// "prec" of ungotten (ie next) token, ONLY valid after expTy()/expr()/unToke().
  LOCAL SI lastPrec = 0;	// "prec" of PRIOR token (0 at bof) NOT after unToke.
@@ -682,9 +682,9 @@ LOCAL RC   FC emitPtr( void** p);
 LOCAL RC   FC emitStr(const char* s, int sLen);
 #endif
 LOCAL RC   FC emiBufFull( void);
-LOCAL SI   FC tokeTest( SI tokTyPar);
-LOCAL SI   FC tokeIf2( SI tokTy1, SI tokTy2);
-LOCAL SI CDEC tokeIfn( SI tokTy1, ... );
+LOCAL bool tokeTest( int tokTyPar);
+LOCAL bool tokeIf2( int tokTy1, int tokTy2);
+LOCAL bool tokeIfn( int tokTy1, ... );
 LOCAL void FC cuptokeClean( CLEANCASE cs);
 LOCAL RC   FC addLocalSyms( void);
 LOCAL const char* FC before( const char* tx, int aN);
@@ -4107,52 +4107,54 @@ LOCAL RC FC emiBufFull( void)		// pseudo-code buffer full handler
 
 
 //===========================================================================
-LOCAL SI FC tokeTest( SI tokTyPar)		// get next token, return nz if it is token of specified type.
+LOCAL bool tokeTest( int tokTyPar)		// get next token, return nz if it is token of specified type.
 {
 	return (toke()		// get token, cuparse.cpp. sets cutok.cpp:cuToktx.
 	== tokTyPar);   	// true if is specified token type
 }			// tokeTest
 //===========================================================================
-SI FC tokeNot( SI tokTyPar)			// get next token, return nz if it is NOT token of specified type.
+bool tokeNot( int tokTyPar)			// get next token, return nz if it is NOT token of specified type.
 {
 	return (toke()		// get token, cuparse.cpp. sets cutok.cpp:cuToktx.
 	!= tokTyPar);   	// false if is specified token type
 }			// tokeNot
 //===========================================================================
-SI FC tokeIf( SI tokTyPar)			// return nz if next token is token of specified type, else unget token.
+bool tokeIf( int tokTyPar)			// return nz if next token is token of specified type, else unget token.
 {
 	if (toke()			// get token, cuparse.cpp. sets cutok.cpp:cuToktx.
 	== tokTyPar)   	// if is requested token type
-		return 1;
+		return true;
 	unToke();			// wrong type.  unget token (cuparse.cpp)
-	return 0;
+	return false;
 }		// tokeIf
 //===========================================================================
-LOCAL SI FC tokeIf2( SI tokTy1, SI tokTy2)  	// return nz if next token is token of either specified type, else unget.
+LOCAL bool tokeIf2( int tokTy1, int tokTy2)  	// return nz if next token is token of either specified type, else unget.
 {
 	if ( toke()			// get token, cuparse.cpp. sets cutok.cpp:tokTy.
-	== tokTy1   	// if is requested token type
+    	== tokTy1   	// if is requested token type
 	|| tokTy==tokTy2 )	// or other requested type
-		return 1;		// return TRUE
+		return true;		// return TRUE
 	unToke();			// wrong type.  unget token (cuparse.cpp)
-	return 0;
+	return false;
 }		// tokeIf2
 //===========================================================================
-LOCAL SI CDEC tokeIfn( SI tokTy1, ...)	// return nz if next token is of any type in 0-terminated list, else unget token.
+LOCAL bool tokeIfn( int tokTy1, ...)	// return nz if next token is of any type in 0-terminated list, else unget token.
 {
-	va_list list;   SI thisArg;
 
 	toke();			// get token, cuparse.cpp. sets cutok.cpp:tokTy.
-	thisArg = tokTy1;			// 1st arg
+
+	va_list list;
 	va_start( list, tokTy1);		// set up to fetch more args
+
+	int thisArg{ tokTy1 };
 	while (thisArg > 0)			// 0 (or -1) arg terminates list
 	{
 		if (tokTy==thisArg)    		// if token type matches
-			return 1;			// say found
-		thisArg = va_arg( list, SI);	// next arg (stdarg.h)
+			return true;			// say found
+		thisArg = va_arg( list, int);	// next arg (stdarg.h)
 	}
 	unToke();				// unget token (cuparse.cpp)
-	return 0;				// not found
+	return false;				// not found
 }		// tokeIfn
 
 /*==================== VARIABLES for toke() - unToke() ====================*/
@@ -4189,7 +4191,7 @@ LOCAL void FC cuptokeClean([[maybe_unused]] CLEANCASE cs)	// cleanup for toke -
 
 }		// cuptokeClean
 //==========================================================================
-SI FC toke()	/* local token-getter -- cutok.cpp:cuTok + unary/binary resolution +
+int toke()	/* local token-getter -- cutok.cpp:cuTok + unary/binary resolution +
 		                         symbol table lookup + other refinements */
 
 /* sets: tokTy: token type: CUTxxx defines, cutok.h.

src/cuparse.h

@@ -21,7 +21,7 @@ RC FC exOrk( SI toprec, USI wanTy, USI choiDt, USI evfOkPar, const char* ermTx,
 RC FC itPile( PSOP *dest, USI sizeofDest);
 RC FC finPile( USI *pCodeSize);
 RC FC expTy( SI toprec, USI wanTy, const char* tx, SI aN);
-SI FC toke();
+int toke();
 void FC unToke();
 
 RC FC cuAddItSyms( SI tokTyPar, SI casi, STBK *tbl, USI entLen, int op);

src/cuparsex.h

@@ -20,7 +20,7 @@
 /*----------------- cuparse.cpp's "mostly LOCAL" VARIABLES ----------------*/
 
 /*--- CURRENT TOKEN INFO.  Set mainly by toke().  Not changed by unToke(). */
-extern SI tokTy;   		// current token type (CUT__ define; cuTok ret val)
+extern int tokTy;   		// current token type (CUT__ define; cuTok ret val)
 extern SI prec;    		// "prec" (precedence) from opTbl[]. PR__ defines.
 extern SI nextPrec;		// "prec" of ungotten (ie next) token, only valid after expTy()/expr()/unToke().
 //extern SI lastPrec;		// "prec" of PRIOR token (0 at bof).
@@ -73,8 +73,8 @@ RC FC dropSfs( SI k, SI n);
 RC CDEC emiKon( USI ty, void *p, SI inDm, char **pp);
 RC FC emit( PSOP op);
 RC FC emit2( SI i);
-SI FC tokeNot( SI tokTyPar);
-SI FC tokeIf( SI tokTyPar);
+bool tokeNot( int tokTyPar);
+bool tokeIf( int tokTyPar);
 
 // cuprobe.cpp
 RC FC probe();

src/pgpak.cpp

@@ -43,41 +43,24 @@ LOCAL SI     FC pgGenrRc( SI, SI);
 LOCAL USI       pgcByto( const char **ps, USI *pnMax, const char* cods, SI bsF);  // no FC: has check_stack
 LOCAL USI    FC pgcStrWid( const char *s, USI nMax, SI bsF);
 
-#if 0	// no calls in CSE, 11-91. use pgalloce.
-x //========================================================================
-x char * FC pgalloc( rows, cols)
-x
-x // Initialize a page for output, abort on error
-x
-x SI rows;    // Number of rows in page (max value 255)
-x SI cols;    // Number of columns in page (max value 255)
-x
-x // Returns pointer to area allocated for page
-x{
-x char *pp;
-x
-x     pgalloce( rows, cols, &pp, ABT);
-x     return pp;
-x}		// pgalloc
-#endif
-
 //========================================================================
 RC FC pgalloce( 		// Initialize a page for output with error handling, for pgalloc
 
-	SI rows,		// Number of rows in page (max value 255)
-	SI cols,		// # of columns (max 254) (note PP->cols is 1 larger 11-91)
+	int rows,		// Number of rows in page (max value 255)
+	int cols,		// # of columns (max 254) (note PP->cols is 1 larger 11-91)
 	char **ppp, 	// POINTER TO where to return pointer
 	int erOp )		// error action: ABT, WRN, etc
 
 // returns RCOK or RCBAD;  pointer is returned via argument ONLY if ok.
 {
-	char *pp;
 
 	/* Initial allocation includes space for line lengths, enhancement pointer values, and page buffer.
 	   [Space for enhancement flag values is not allocated until needed.]  See pgwe() */
 
+	char* pp{ nullptr };
 	if (dmal( DMPP( pp), PGSIZE( rows, cols), erOp | DMZERO) != RCOK)	// dmpak.cpp
 		return RCBAD;							// if memory full (and not ABT), return error to caller
+
 	// appropriate uses of PP->cols changed to cols-1, or <= changed to <, when this added: many if's below.
 	pgsetup( pp, rows, cols+1);		// store rows, cols, init offset to segments, etc
 	// cols+1: extra byte per row for \0 at row output, eg in pgprput.cpp, rob 11-91.