Index: /trunk/src/bldprogs/VBoxCPP.cpp =================================================================== --- /trunk/src/bldprogs/VBoxCPP.cpp (revision 41296) +++ /trunk/src/bldprogs/VBoxCPP.cpp (revision 41297) @@ -105,12 +105,12 @@ /** - * A define. - */ -typedef struct VBCPPDEF + * A macro (aka define). + */ +typedef struct VBCPPMACRO { /** The string space core. */ RTSTRSPACECORE Core; /** For linking macros that have the fExpanding flag set. */ - struct VBCPPDEF *pUpExpanding; + struct VBCPPMACRO *pUpExpanding; /** Whether it's a function. */ bool fFunction; @@ -132,7 +132,7 @@ /** The define value. (This is followed by the name and arguments.) */ char szValue[1]; -} VBCPPDEF; -/** Pointer to a define. */ -typedef VBCPPDEF *PVBCPPDEF; +} VBCPPMACRO; +/** Pointer to a macro. */ +typedef VBCPPMACRO *PVBCPPMACRO; @@ -145,5 +145,5 @@ VBCPPSTRBUF StrBuf; /** List of expanding macros (Stack). */ - PVBCPPDEF pMacroStack; + PVBCPPMACRO pMacroStack; /** The input stream (in case we want to look for parameter lists). */ PSCMSTREAM pStrmInput; @@ -518,6 +518,6 @@ * Internal Functions * *******************************************************************************/ -static PVBCPPDEF vbcppMacroLookup(PVBCPP pThis, const char *pszDefine, size_t cchDefine); -static RTEXITCODE vbcppMacroExpandIt(PVBCPP pThis, PVBCPPMACROEXP pExp, size_t offMacro, PVBCPPDEF pMacro, size_t *poffParameters); +static PVBCPPMACRO vbcppMacroLookup(PVBCPP pThis, const char *pszDefine, size_t cchDefine); +static RTEXITCODE vbcppMacroExpandIt(PVBCPP pThis, PVBCPPMACROEXP pExp, size_t offMacro, PVBCPPMACRO pMacro, size_t *poffParameters); static RTEXITCODE vbcppMacroExpandReScan(PVBCPP pThis, PVBCPPMACROEXP pExp, VBCPPMACRORESCANMODE enmMode, size_t *pcReplacements); static void vbcppMacroExpandCleanup(PVBCPPMACROEXP pExp); @@ -1555,5 +1555,5 @@ * Does this look like a define we know? */ - PVBCPPDEF pMacro = vbcppMacroLookup(pThis, pchDefine, cchDefine); + PVBCPPMACRO pMacro = vbcppMacroLookup(pThis, pchDefine, cchDefine); if ( pMacro && ( !pMacro->fFunction @@ -1656,5 +1656,5 @@ * @param cchDefine The length of the name. RTSTR_MAX is ok. */ -static PVBCPPDEF vbcppMacroLookup(PVBCPP pThis, const char *pszDefine, size_t cchDefine) +static PVBCPPMACRO vbcppMacroLookup(PVBCPP pThis, const char *pszDefine, size_t cchDefine) { if (!cchDefine) @@ -1662,9 +1662,9 @@ if (!VBCPP_BITMAP_IS_SET(pThis->bmDefined, *pszDefine)) return NULL; - return (PVBCPPDEF)RTStrSpaceGetN(&pThis->StrSpace, pszDefine, cchDefine); -} - - -static uint32_t vbcppMacroLookupArg(PVBCPPDEF pMacro, const char *pchName, size_t cchName) + return (PVBCPPMACRO)RTStrSpaceGetN(&pThis->StrSpace, pszDefine, cchDefine); +} + + +static uint32_t vbcppMacroLookupArg(PVBCPPMACRO pMacro, const char *pchName, size_t cchName) { Assert(cchName > 0); @@ -2035,5 +2035,5 @@ * should initialize and destroy this! */ -static RTEXITCODE vbcppMacroExpandValueWithArguments(PVBCPP pThis, PVBCPPMACROEXP pExp, PVBCPPDEF pMacro, +static RTEXITCODE vbcppMacroExpandValueWithArguments(PVBCPP pThis, PVBCPPMACROEXP pExp, PVBCPPMACRO pMacro, PVBCPPSTRBUF pStrBuf) { @@ -2199,5 +2199,5 @@ * failure. */ -static RTEXITCODE vbcppMacroExpandIt(PVBCPP pThis, PVBCPPMACROEXP pExp, size_t offMacro, PVBCPPDEF pMacro, +static RTEXITCODE vbcppMacroExpandIt(PVBCPP pThis, PVBCPPMACROEXP pExp, size_t offMacro, PVBCPPMACRO pMacro, size_t *poffParameters) { @@ -2434,5 +2434,5 @@ size_t cchDefine = off - offDefine; - PVBCPPDEF pMacro = vbcppMacroLookup(pThis, &pExp->StrBuf.pszBuf[offDefine], cchDefine); + PVBCPPMACRO pMacro = vbcppMacroLookup(pThis, &pExp->StrBuf.pszBuf[offDefine], cchDefine); if ( pMacro && ( !pMacro->fFunction @@ -2473,5 +2473,5 @@ while (pExp->pMacroStack) { - PVBCPPDEF pMacro = pExp->pMacroStack; + PVBCPPMACRO pMacro = pExp->pMacroStack; pExp->pMacroStack = pMacro->pUpExpanding; @@ -2498,5 +2498,5 @@ * * @returns VINF_SUCCESS (used when called by RTStrSpaceDestroy) - * @param pStr Pointer to the VBCPPDEF::Core member. + * @param pStr Pointer to the VBCPPMACRO::Core member. * @param pvUser Unused. */ @@ -2555,5 +2555,5 @@ * @param pMacro The define to insert. */ -static RTEXITCODE vbcppMacroInsert(PVBCPP pThis, PVBCPPDEF pMacro) +static RTEXITCODE vbcppMacroInsert(PVBCPP pThis, PVBCPPMACRO pMacro) { /* @@ -2589,5 +2589,5 @@ * line take precendece. */ - PVBCPPDEF pOld = (PVBCPPDEF)RTStrSpaceGet(&pThis->StrSpace, pMacro->Core.pszString); Assert(pOld); + PVBCPPMACRO pOld = (PVBCPPMACRO)RTStrSpaceGet(&pThis->StrSpace, pMacro->Core.pszString); Assert(pOld); if ( pThis->fAllowRedefiningCmdLineDefines || pMacro->fCmdLine == pOld->fCmdLine) @@ -2676,8 +2676,8 @@ * Allocate a structure. */ - size_t cbDef = RT_OFFSETOF(VBCPPDEF, szValue[cchValue + 1 + cchDefine + 1 + cchArgNames]) + size_t cbDef = RT_OFFSETOF(VBCPPMACRO, szValue[cchValue + 1 + cchDefine + 1 + cchArgNames]) + sizeof(const char *) * cArgs; cbDef = RT_ALIGN_Z(cbDef, sizeof(const char *)); - PVBCPPDEF pMacro = (PVBCPPDEF)RTMemAlloc(cbDef); + PVBCPPMACRO pMacro = (PVBCPPMACRO)RTMemAlloc(cbDef); if (!pMacro) return RTMsgErrorExit(RTEXITCODE_FAILURE, "out of memory"); @@ -2688,11 +2688,12 @@ pszDst += cchDefine; *pszDst++ = '\0'; - pMacro->fFunction = true; - pMacro->fVarArg = false; - pMacro->fCmdLine = fCmdLine; - pMacro->cArgs = cArgs; - pMacro->papszArgs = (const char **)((uintptr_t)pMacro + cbDef - sizeof(const char *) * cArgs); + pMacro->fFunction = true; + pMacro->fVarArg = false; + pMacro->fCmdLine = fCmdLine; + pMacro->fExpanding = false; + pMacro->cArgs = cArgs; + pMacro->papszArgs = (const char **)((uintptr_t)pMacro + cbDef - sizeof(const char *) * cArgs); VBCPP_BITMAP_EMPTY(pMacro->bmArgs); - pMacro->cchValue = cchValue; + pMacro->cchValue = cchValue; memcpy(pMacro->szValue, pszValue, cchValue); pMacro->szValue[cchValue] = '\0'; @@ -2793,5 +2794,5 @@ return RTEXITCODE_FAILURE; - PVBCPPDEF pMacro = (PVBCPPDEF)RTMemAlloc(RT_OFFSETOF(VBCPPDEF, szValue[cchValue + 1 + cchDefine + 1])); + PVBCPPMACRO pMacro = (PVBCPPMACRO)RTMemAlloc(RT_OFFSETOF(VBCPPMACRO, szValue[cchValue + 1 + cchDefine + 1])); if (!pMacro) return RTMsgErrorExit(RTEXITCODE_FAILURE, "out of memory"); @@ -2800,11 +2801,12 @@ memcpy((char *)pMacro->Core.pszString, pszDefine, cchDefine); ((char *)pMacro->Core.pszString)[cchDefine] = '\0'; - pMacro->fFunction = false; - pMacro->fVarArg = false; - pMacro->fCmdLine = fCmdLine; - pMacro->cArgs = 0; - pMacro->papszArgs = NULL; + pMacro->fFunction = false; + pMacro->fVarArg = false; + pMacro->fCmdLine = fCmdLine; + pMacro->fExpanding = false; + pMacro->cArgs = 0; + pMacro->papszArgs = NULL; VBCPP_BITMAP_EMPTY(pMacro->bmArgs); - pMacro->cchValue = cchValue; + pMacro->cchValue = cchValue; memcpy(pMacro->szValue, pszValue, cchValue); pMacro->szValue[cchValue] = '\0'; @@ -2821,5 +2823,5 @@ * @param pMacro The macro. */ -static RTEXITCODE vbcppMacroTryConvertToInlineD(PVBCPP pThis, PVBCPPDEF pMacro) +static RTEXITCODE vbcppMacroTryConvertToInlineD(PVBCPP pThis, PVBCPPMACRO pMacro) { AssertReturn(pMacro, vbcppError(pThis, "Internal error")); @@ -2834,6 +2836,6 @@ size_t cchValue = pMacro->cchValue; - unsigned i = 0; - PVBCPPDEF pMacro2; + unsigned i = 0; + PVBCPPMACRO pMacro2; while ( i < 10 && cchValue > 0 @@ -3095,5 +3097,5 @@ * Take action. */ - PVBCPPDEF pMacro = vbcppMacroLookup(pThis, pchDefine, cchDefine); + PVBCPPMACRO pMacro = vbcppMacroLookup(pThis, pchDefine, cchDefine); if ( pMacro && pThis->fRespectSourceDefines @@ -4498,5 +4500,4 @@ else { - PVBCPPCOND pCond = pThis->pCondStack; if ( pCond->enmResult != kVBCppEval_Undecided