From 59eae7c33fee318f76a54e7cda6caa08f4f24aa5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 15 Dec 2012 23:36:31 +0000 Subject: [PATCH] 2012-12-16 00:35 UTC+0100 Viktor Szakats (harbour syenar.net) * include/hbcomp.h * include/hbcompdf.h * src/compiler/genc.c * src/compiler/genhrb.c * src/compiler/harbour.y * src/compiler/harbour.yyc * src/compiler/hbmain.c * few more type renames to have std Harbour prefix --- harbour/ChangeLog.txt | 16 ++++-- harbour/include/hbcomp.h | 10 ++-- harbour/include/hbcompdf.h | 58 ++++++++++----------- harbour/src/compiler/genc.c | 4 +- harbour/src/compiler/genhrb.c | 4 +- harbour/src/compiler/harbour.y | 10 ++-- harbour/src/compiler/harbour.yyc | 10 ++-- harbour/src/compiler/hbmain.c | 88 ++++++++++++++++---------------- 8 files changed, 105 insertions(+), 95 deletions(-) diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 81a9c85dd9..df67675a7b 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,16 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-12-16 00:35 UTC+0100 Viktor Szakats (harbour syenar.net) + * include/hbcomp.h + * include/hbcompdf.h + * src/compiler/genc.c + * src/compiler/genhrb.c + * src/compiler/harbour.y + * src/compiler/harbour.yyc + * src/compiler/hbmain.c + * few more type renames to have std Harbour prefix + 2012-12-16 00:17 UTC+0100 Viktor Szakats (harbour syenar.net) * include/hbcomp.h * include/hbcompdf.h @@ -29,9 +39,9 @@ VU_* -> HB_VU_* VT_* -> HB_VT_* FUN_* -> HB_FUN_* - *COMDECLARED -> [P]HB_HDECLARED - *COMCLASS -> [P]HB_HCLASS - *COMSYMBOL -> [P]HB_HSYMBOL + *COMDECLARED -> [P]HB_HDECLARED [DONE] + *COMCLASS -> [P]HB_HCLASS [DONE] + *COMSYMBOL -> [P]HB_HSYMBOL [DONE] VAR, PVAR -> [P]HB_HVAR _FUNC, PFUNCTION -> [P]HB_HFUNC _FUNCALL, PFUNCALL -> [P]HB_HFUNCALL diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h index 7f43994320..a59c448569 100644 --- a/harbour/include/hbcomp.h +++ b/harbour/include/hbcomp.h @@ -156,12 +156,12 @@ extern const char * hb_compStaticVariableName( HB_COMP_DECL, HB_USHORT wVar ); #define HB_SYM_FUNCNAME HB_TRUE extern const char * hb_compSymbolName( HB_COMP_DECL, HB_USHORT ); /* returns a symbol name based on its index on the symbol table */ -extern PCOMDECLARED hb_compDeclaredAdd( HB_COMP_DECL, const char * ); +extern PHB_HDECLARED hb_compDeclaredAdd( HB_COMP_DECL, const char * ); -extern PCOMCLASS hb_compClassAdd( HB_COMP_DECL, const char *, const char * ); -extern PCOMCLASS hb_compClassFind( HB_COMP_DECL, const char * ); -extern PCOMDECLARED hb_compMethodAdd( HB_COMP_DECL, PCOMCLASS pClass, const char * ); -extern PCOMDECLARED hb_compMethodFind( PCOMCLASS pClass, const char * ); +extern PHB_HCLASS hb_compClassAdd( HB_COMP_DECL, const char *, const char * ); +extern PHB_HCLASS hb_compClassFind( HB_COMP_DECL, const char * ); +extern PHB_HDECLARED hb_compMethodAdd( HB_COMP_DECL, PHB_HCLASS pClass, const char * ); +extern PHB_HDECLARED hb_compMethodFind( PHB_HCLASS pClass, const char * ); extern void hb_compDeclaredParameterAdd( HB_COMP_DECL, const char * szVarName, PHB_VARTYPE pVarType ); extern void hb_compGenBreak( HB_COMP_DECL ); /* generate code for BREAK statement */ diff --git a/harbour/include/hbcompdf.h b/harbour/include/hbcompdf.h index 3fc0ea6cde..f3d1dedae1 100644 --- a/harbour/include/hbcompdf.h +++ b/harbour/include/hbcompdf.h @@ -77,28 +77,28 @@ typedef enum HB_ERRORFMT_IDE } HB_ERRORFMT; -struct _COMCLASS; /* forward declaration */ +struct _HB_HCLASS; /* forward declaration */ /* Declared Function/Method support structure */ -typedef struct _COMDECLARED +typedef struct _HB_HDECLARED { - const char * szName; /* the name of the symbol */ + const char * szName; /* the name of the symbol */ HB_BYTE cType; HB_USHORT iParamCount; - HB_BYTE * cParamTypes; - struct _COMCLASS * pClass; - struct _COMCLASS * ( * pParamClasses ); - struct _COMDECLARED * pNext; /* pointer to the next declared function */ -} COMDECLARED, * PCOMDECLARED; + HB_BYTE * cParamTypes; + struct _HB_HCLASS * pClass; + struct _HB_HCLASS * ( * pParamClasses ); + struct _HB_HDECLARED * pNext; /* pointer to the next declared function */ +} HB_HDECLARED, * PHB_HDECLARED; /* Declared Class support structure */ -typedef struct _COMCLASS +typedef struct _HB_HCLASS { - const char * szName; - PCOMDECLARED pMethod; - PCOMDECLARED pLastMethod; - struct _COMCLASS * pNext; -} COMCLASS, * PCOMCLASS; + const char * szName; + PHB_HDECLARED pMethod; + PHB_HDECLARED pLastMethod; + struct _HB_HCLASS * pNext; +} HB_HCLASS, * PHB_HCLASS; /* locals, static, public variables support */ typedef struct _VAR @@ -109,7 +109,7 @@ typedef struct _VAR int iDeclLine; /* declaration line number */ HB_USHORT uiFlags; /* optional falgs, f.e. THREAD STATIC */ HB_BYTE cType; /* optional strong typing */ - PCOMCLASS pClass; + PHB_HCLASS pClass; struct _VAR * pNext; /* pointer to next defined variable */ } VAR, * PVAR; @@ -573,21 +573,21 @@ typedef struct } INLINES; /* compiler symbol support structure */ -typedef struct _COMSYMBOL +typedef struct _HB_HSYMBOL { const char * szName; /* the name of the symbol */ HB_SYMBOLSCOPE cScope; /* the scope of the symbol */ int iFunc; /* is it a function name (TRUE) or memvar (FALSE) */ PFUNCTION pFunc; - struct _COMSYMBOL * pNext; /* pointer to the next defined symbol */ -} COMSYMBOL, * PCOMSYMBOL; + struct _HB_HSYMBOL * pNext; /* pointer to the next defined symbol */ +} HB_HSYMBOL, * PHB_HSYMBOL; /* symbol table support structures */ typedef struct { - PCOMSYMBOL pFirst; /* pointer to the first defined symbol */ - PCOMSYMBOL pLast; /* pointer to the last defined symbol */ - int iCount; /* number of defined symbols */ + PHB_HSYMBOL pFirst; /* pointer to the first defined symbol */ + PHB_HSYMBOL pLast; /* pointer to the last defined symbol */ + int iCount; /* number of defined symbols */ } SYMBOLS; typedef struct __EXTERN @@ -726,14 +726,14 @@ HB_COMP_LEX, * PHB_COMP_LEX; typedef struct _HB_EXPRLST { HB_EXPR Expression; - struct _HB_EXPRLST *pPrev; - struct _HB_EXPRLST *pNext; + struct _HB_EXPRLST * pPrev; + struct _HB_EXPRLST * pNext; } HB_EXPRLST, * PHB_EXPRLST; typedef struct _HB_INCLST { - struct _HB_INCLST *pNext; + struct _HB_INCLST * pNext; char szFileName[ 1 ]; } HB_INCLST, * PHB_INCLST; @@ -758,11 +758,11 @@ typedef struct _HB_COMP PHB_VARTYPE pVarType; PHB_INCLST incfiles; - PCOMDECLARED pFirstDeclared; - PCOMDECLARED pLastDeclared; - PCOMDECLARED pLastMethod; - PCOMCLASS pFirstClass; - PCOMCLASS pLastClass; + PHB_HDECLARED pFirstDeclared; + PHB_HDECLARED pLastDeclared; + PHB_HDECLARED pLastMethod; + PHB_HCLASS pFirstClass; + PHB_HCLASS pLastClass; PFUNCTION pInitFunc; PFUNCTION pLineFunc; diff --git a/harbour/src/compiler/genc.c b/harbour/src/compiler/genc.c index 8e2ae4fe42..37106bb9ee 100644 --- a/harbour/src/compiler/genc.c +++ b/harbour/src/compiler/genc.c @@ -159,7 +159,7 @@ static void hb_compGenCStdHeaders( HB_COMP_DECL, FILE * yyc, HB_BOOL fHbInLine ) } } -static void hb_compFuncUsed( HB_COMP_DECL, PCOMSYMBOL pSym ) +static void hb_compFuncUsed( HB_COMP_DECL, PHB_HSYMBOL pSym ) { if( ( pSym->cScope & HB_FS_USED ) == 0 ) hb_compGenWarning( HB_COMP_PARAM, hb_comp_szWarnings, 'W', HB_COMP_WARN_STATIC_FUNC_UNUSED, pSym->szName, NULL ); @@ -168,7 +168,7 @@ static void hb_compFuncUsed( HB_COMP_DECL, PCOMSYMBOL pSym ) void hb_compGenCCode( HB_COMP_DECL, PHB_FNAME pFileName ) /* generates the C language output */ { char szFileName[ HB_PATH_MAX ]; - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; PFUNCTION pFunc; PHB_HINLINE pInline; FILE * yyc; /* file handle for C output */ diff --git a/harbour/src/compiler/genhrb.c b/harbour/src/compiler/genhrb.c index 6f43f13e3c..7c254bc555 100644 --- a/harbour/src/compiler/genhrb.c +++ b/harbour/src/compiler/genhrb.c @@ -39,7 +39,7 @@ static HB_SIZE hb_compHrbSize( HB_COMP_DECL, HB_ULONG * pulSymbols, HB_ULONG * pulFunctions ) { PFUNCTION pFunc; - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; HB_SIZE nSize; *pulSymbols = *pulFunctions = 0; @@ -72,7 +72,7 @@ static HB_SIZE hb_compHrbSize( HB_COMP_DECL, HB_ULONG * pulSymbols, HB_ULONG * p void hb_compGenBufPortObj( HB_COMP_DECL, HB_BYTE ** pBufPtr, HB_SIZE * pnSize ) { PFUNCTION pFunc; - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; HB_ULONG ulSymbols, ulFunctions; HB_SIZE nLen; HB_BYTE * ptr; diff --git a/harbour/src/compiler/harbour.y b/harbour/src/compiler/harbour.y index 1f80b89bb9..312a980d97 100644 --- a/harbour/src/compiler/harbour.y +++ b/harbour/src/compiler/harbour.y @@ -1287,10 +1287,10 @@ DecData : IdentName { HB_COMP_PARAM->pLastMethod = hb_compMethodAdd( HB_COMP_ { if( HB_COMP_PARAM->pLastMethod ) { - PCOMCLASS pClass; - char szSetData[ HB_SYMBOL_NAME_LEN + 1 ]; - int iLen; - char cVarType = $3->cVarType; + PHB_HCLASS pClass; + char szSetData[ HB_SYMBOL_NAME_LEN + 1 ]; + int iLen; + char cVarType = $3->cVarType; /* List Type overrides if exists. */ if( HB_COMP_PARAM->cDataListType ) @@ -1323,7 +1323,7 @@ DecData : IdentName { HB_COMP_PARAM->pLastMethod = hb_compMethodAdd( HB_COMP_ HB_COMP_PARAM->pLastMethod->iParamCount = 1; HB_COMP_PARAM->pLastMethod->cParamTypes = ( HB_BYTE * ) hb_xgrab( 1 ); - HB_COMP_PARAM->pLastMethod->pParamClasses = ( PCOMCLASS * ) hb_xgrab( sizeof( COMCLASS ) ); + HB_COMP_PARAM->pLastMethod->pParamClasses = ( PHB_HCLASS * ) hb_xgrab( sizeof( HB_HCLASS ) ); HB_COMP_PARAM->pLastMethod->cParamTypes[0] = cVarType; HB_COMP_PARAM->pLastMethod->pParamClasses[0] = pClass; diff --git a/harbour/src/compiler/harbour.yyc b/harbour/src/compiler/harbour.yyc index 197e84a2fd..f8b48a1a68 100644 --- a/harbour/src/compiler/harbour.yyc +++ b/harbour/src/compiler/harbour.yyc @@ -6587,10 +6587,10 @@ yyreduce: { if( HB_COMP_PARAM->pLastMethod ) { - PCOMCLASS pClass; - char szSetData[ HB_SYMBOL_NAME_LEN + 1 ]; - int iLen; - char cVarType = (yyvsp[(3) - (3)].asVarType)->cVarType; + PHB_HCLASS pClass; + char szSetData[ HB_SYMBOL_NAME_LEN + 1 ]; + int iLen; + char cVarType = (yyvsp[(3) - (3)].asVarType)->cVarType; /* List Type overrides if exists. */ if( HB_COMP_PARAM->cDataListType ) @@ -6623,7 +6623,7 @@ yyreduce: HB_COMP_PARAM->pLastMethod->iParamCount = 1; HB_COMP_PARAM->pLastMethod->cParamTypes = ( HB_BYTE * ) hb_xgrab( 1 ); - HB_COMP_PARAM->pLastMethod->pParamClasses = ( PCOMCLASS * ) hb_xgrab( sizeof( COMCLASS ) ); + HB_COMP_PARAM->pLastMethod->pParamClasses = ( PHB_HCLASS * ) hb_xgrab( sizeof( HB_HCLASS ) ); HB_COMP_PARAM->pLastMethod->cParamTypes[0] = cVarType; HB_COMP_PARAM->pLastMethod->pParamClasses[0] = pClass; diff --git a/harbour/src/compiler/hbmain.c b/harbour/src/compiler/hbmain.c index d013860dbe..68b70f8af5 100644 --- a/harbour/src/compiler/hbmain.c +++ b/harbour/src/compiler/hbmain.c @@ -272,11 +272,11 @@ static int hb_compReadClpFile( HB_COMP_DECL, const char * szClpFile ) /* ------------------------------------------------------------------------- */ -static PCOMSYMBOL hb_compSymbolAdd( HB_COMP_DECL, const char * szSymbolName, HB_USHORT * pwPos, HB_BOOL bFunction ) +static PHB_HSYMBOL hb_compSymbolAdd( HB_COMP_DECL, const char * szSymbolName, HB_USHORT * pwPos, HB_BOOL bFunction ) { - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; - pSym = ( PCOMSYMBOL ) hb_xgrab( sizeof( COMSYMBOL ) ); + pSym = ( PHB_HSYMBOL ) hb_xgrab( sizeof( HB_HSYMBOL ) ); pSym->szName = szSymbolName; pSym->cScope = 0; @@ -302,9 +302,9 @@ static PCOMSYMBOL hb_compSymbolAdd( HB_COMP_DECL, const char * szSymbolName, HB_ return pSym; } -static PCOMSYMBOL hb_compSymbolFind( HB_COMP_DECL, const char * szSymbolName, HB_USHORT * pwPos, HB_BOOL bFunction ) +static PHB_HSYMBOL hb_compSymbolFind( HB_COMP_DECL, const char * szSymbolName, HB_USHORT * pwPos, HB_BOOL bFunction ) { - PCOMSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst; + PHB_HSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst; HB_USHORT wCnt = 0; int iFunc = bFunction ? HB_COMP_PARAM->iModulesCount : 0; @@ -334,7 +334,7 @@ static PCOMSYMBOL hb_compSymbolFind( HB_COMP_DECL, const char * szSymbolName, HB */ const char * hb_compSymbolName( HB_COMP_DECL, HB_USHORT uiSymbol ) { - PCOMSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst; + PHB_HSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst; while( pSym ) { @@ -483,7 +483,7 @@ void hb_compVariableAdd( HB_COMP_DECL, const char * szVarName, PHB_VARTYPE pVarT if( HB_COMP_PARAM->iVarScope & VS_MEMVAR ) { - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; HB_USHORT wPos; if( HB_COMP_PARAM->fAutoMemvarAssume || HB_COMP_PARAM->iVarScope == VS_MEMVAR ) @@ -1012,7 +1012,7 @@ static void hb_compDeclaredReset( HB_COMP_DECL ) { while( HB_COMP_PARAM->pFirstDeclared ) { - PCOMDECLARED pDeclared = HB_COMP_PARAM->pFirstDeclared; + PHB_HDECLARED pDeclared = HB_COMP_PARAM->pFirstDeclared; HB_COMP_PARAM->pFirstDeclared = pDeclared->pNext; if( pDeclared->cParamTypes ) hb_xfree( pDeclared->cParamTypes ); @@ -1024,11 +1024,11 @@ static void hb_compDeclaredReset( HB_COMP_DECL ) while( HB_COMP_PARAM->pFirstClass ) { - PCOMCLASS pClass = HB_COMP_PARAM->pFirstClass; + PHB_HCLASS pClass = HB_COMP_PARAM->pFirstClass; HB_COMP_PARAM->pFirstClass = pClass->pNext; while( pClass->pMethod ) { - PCOMDECLARED pDeclared = pClass->pMethod; + PHB_HDECLARED pDeclared = pClass->pMethod; pClass->pMethod = pDeclared->pNext; if( pDeclared->cParamTypes ) hb_xfree( pDeclared->cParamTypes ); @@ -1042,9 +1042,9 @@ static void hb_compDeclaredReset( HB_COMP_DECL ) HB_COMP_PARAM->pLastMethod = NULL; } -PCOMCLASS hb_compClassFind( HB_COMP_DECL, const char * szClassName ) +PHB_HCLASS hb_compClassFind( HB_COMP_DECL, const char * szClassName ) { - PCOMCLASS pClass = HB_COMP_PARAM->pFirstClass; + PHB_HCLASS pClass = HB_COMP_PARAM->pFirstClass; if( HB_COMP_PARAM->iWarnings < 3 ) return NULL; @@ -1058,10 +1058,10 @@ PCOMCLASS hb_compClassFind( HB_COMP_DECL, const char * szClassName ) return NULL; } -PCOMCLASS hb_compClassAdd( HB_COMP_DECL, const char * szClassName, const char * szClassFunc ) +PHB_HCLASS hb_compClassAdd( HB_COMP_DECL, const char * szClassName, const char * szClassFunc ) { - PCOMCLASS pClass; - PCOMDECLARED pDeclared; + PHB_HCLASS pClass; + PHB_HDECLARED pDeclared; /*printf( "Declaring Class: %s\n", szClassName );*/ @@ -1074,7 +1074,7 @@ PCOMCLASS hb_compClassAdd( HB_COMP_DECL, const char * szClassName, const char * return pClass; } - pClass = ( PCOMCLASS ) hb_xgrab( sizeof( COMCLASS ) ); + pClass = ( PHB_HCLASS ) hb_xgrab( sizeof( HB_HCLASS ) ); pClass->szName = szClassName; pClass->pMethod = NULL; @@ -1095,11 +1095,11 @@ PCOMCLASS hb_compClassAdd( HB_COMP_DECL, const char * szClassName, const char * return pClass; } -PCOMDECLARED hb_compMethodFind( PCOMCLASS pClass, const char * szMethodName ) +PHB_HDECLARED hb_compMethodFind( PHB_HCLASS pClass, const char * szMethodName ) { if( pClass ) { - PCOMDECLARED pMethod = pClass->pMethod; + PHB_HDECLARED pMethod = pClass->pMethod; while( pMethod ) { @@ -1112,9 +1112,9 @@ PCOMDECLARED hb_compMethodFind( PCOMCLASS pClass, const char * szMethodName ) return NULL; } -PCOMDECLARED hb_compMethodAdd( HB_COMP_DECL, PCOMCLASS pClass, const char * szMethodName ) +PHB_HDECLARED hb_compMethodAdd( HB_COMP_DECL, PHB_HCLASS pClass, const char * szMethodName ) { - PCOMDECLARED pMethod; + PHB_HDECLARED pMethod; /*printf( "\nDeclaring Method: %s of Class: %s Pointer: %li\n", szMethodName, pClass->szName, pClass );*/ @@ -1137,7 +1137,7 @@ PCOMDECLARED hb_compMethodAdd( HB_COMP_DECL, PCOMCLASS pClass, const char * szMe return pMethod; } - pMethod = ( PCOMDECLARED ) hb_xgrab( sizeof( COMDECLARED ) ); + pMethod = ( PHB_HDECLARED ) hb_xgrab( sizeof( HB_HDECLARED ) ); pMethod->szName = szMethodName; pMethod->cType = ' '; /* Not known yet */ @@ -1162,9 +1162,9 @@ PCOMDECLARED hb_compMethodAdd( HB_COMP_DECL, PCOMCLASS pClass, const char * szMe * and sets its position in the symbol table. * NOTE: symbol's position number starts from 0 */ -static PCOMDECLARED hb_compDeclaredFind( HB_COMP_DECL, const char * szDeclaredName ) +static PHB_HDECLARED hb_compDeclaredFind( HB_COMP_DECL, const char * szDeclaredName ) { - PCOMDECLARED pSym = HB_COMP_PARAM->pFirstDeclared; + PHB_HDECLARED pSym = HB_COMP_PARAM->pFirstDeclared; while( pSym ) { @@ -1175,9 +1175,9 @@ static PCOMDECLARED hb_compDeclaredFind( HB_COMP_DECL, const char * szDeclaredNa return NULL; } -PCOMDECLARED hb_compDeclaredAdd( HB_COMP_DECL, const char * szDeclaredName ) +PHB_HDECLARED hb_compDeclaredAdd( HB_COMP_DECL, const char * szDeclaredName ) { - PCOMDECLARED pDeclared; + PHB_HDECLARED pDeclared; if( HB_COMP_PARAM->iWarnings < 3 ) return NULL; @@ -1201,7 +1201,7 @@ PCOMDECLARED hb_compDeclaredAdd( HB_COMP_DECL, const char * szDeclaredName ) return pDeclared; } - pDeclared = ( PCOMDECLARED ) hb_xgrab( sizeof( COMDECLARED ) ); + pDeclared = ( PHB_HDECLARED ) hb_xgrab( sizeof( HB_HDECLARED ) ); pDeclared->szName = szDeclaredName; pDeclared->cType = ' '; /* Not known yet */ @@ -1233,7 +1233,7 @@ void hb_compDeclaredParameterAdd( HB_COMP_DECL, const char * szVarName, PHB_VART if( HB_COMP_PARAM->szDeclaredFun ) { /* Find the Declared Function owner of this parameter. */ - PCOMDECLARED pDeclared = hb_compDeclaredFind( HB_COMP_PARAM, HB_COMP_PARAM->szDeclaredFun ); + PHB_HDECLARED pDeclared = hb_compDeclaredFind( HB_COMP_PARAM, HB_COMP_PARAM->szDeclaredFun ); if( pDeclared ) { @@ -1242,12 +1242,12 @@ void hb_compDeclaredParameterAdd( HB_COMP_DECL, const char * szVarName, PHB_VART if( pDeclared->cParamTypes ) { pDeclared->cParamTypes = ( HB_BYTE * ) hb_xrealloc( pDeclared->cParamTypes, pDeclared->iParamCount ); - pDeclared->pParamClasses = ( PCOMCLASS * ) hb_xrealloc( pDeclared->pParamClasses, pDeclared->iParamCount * sizeof( PCOMCLASS ) ); + pDeclared->pParamClasses = ( PHB_HCLASS * ) hb_xrealloc( pDeclared->pParamClasses, pDeclared->iParamCount * sizeof( PHB_HCLASS ) ); } else { pDeclared->cParamTypes = ( HB_BYTE * ) hb_xgrab( 1 ); - pDeclared->pParamClasses = ( PCOMCLASS * ) hb_xgrab( sizeof( PCOMCLASS ) ); + pDeclared->pParamClasses = ( PHB_HCLASS * ) hb_xgrab( sizeof( PHB_HCLASS ) ); } pDeclared->cParamTypes[ pDeclared->iParamCount - 1 ] = pVarType->cVarType; @@ -1267,12 +1267,12 @@ void hb_compDeclaredParameterAdd( HB_COMP_DECL, const char * szVarName, PHB_VART if( HB_COMP_PARAM->pLastMethod->cParamTypes ) { HB_COMP_PARAM->pLastMethod->cParamTypes = ( HB_BYTE * ) hb_xrealloc( HB_COMP_PARAM->pLastMethod->cParamTypes, HB_COMP_PARAM->pLastMethod->iParamCount ); - HB_COMP_PARAM->pLastMethod->pParamClasses = ( PCOMCLASS * ) hb_xrealloc( HB_COMP_PARAM->pLastMethod->pParamClasses, HB_COMP_PARAM->pLastMethod->iParamCount * sizeof( COMCLASS ) ); + HB_COMP_PARAM->pLastMethod->pParamClasses = ( PHB_HCLASS * ) hb_xrealloc( HB_COMP_PARAM->pLastMethod->pParamClasses, HB_COMP_PARAM->pLastMethod->iParamCount * sizeof( HB_HCLASS ) ); } else { HB_COMP_PARAM->pLastMethod->cParamTypes = ( HB_BYTE * ) hb_xgrab( 1 ); - HB_COMP_PARAM->pLastMethod->pParamClasses = ( PCOMCLASS * ) hb_xgrab( sizeof( COMCLASS ) ); + HB_COMP_PARAM->pLastMethod->pParamClasses = ( PHB_HCLASS * ) hb_xgrab( sizeof( HB_HCLASS ) ); } HB_COMP_PARAM->pLastMethod->cParamTypes[ HB_COMP_PARAM->pLastMethod->iParamCount - 1 ] = pVarType->cVarType; @@ -2146,7 +2146,7 @@ static HB_BOOL hb_compRegisterFunc( HB_COMP_DECL, PFUNCTION pFunc, HB_BOOL fErro { if( ! hb_compCheckReservedNames( HB_COMP_PARAM, pFunc->szName, fError ) ) { - PCOMSYMBOL pSym = hb_compSymbolFind( HB_COMP_PARAM, pFunc->szName, NULL, HB_SYM_FUNCNAME ); + PHB_HSYMBOL pSym = hb_compSymbolFind( HB_COMP_PARAM, pFunc->szName, NULL, HB_SYM_FUNCNAME ); if( ! pSym ) pSym = hb_compSymbolAdd( HB_COMP_PARAM, pFunc->szName, NULL, HB_SYM_FUNCNAME ); pSym->cScope |= pFunc->cScope | HB_FS_LOCAL; @@ -2233,7 +2233,7 @@ static void hb_compAnnounce( HB_COMP_DECL, const char * szFunName ) } else { - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; /* create a new procedure */ @@ -2256,7 +2256,7 @@ static void hb_compAnnounce( HB_COMP_DECL, const char * szFunName ) void hb_compFunctionMarkStatic( HB_COMP_DECL, const char * szFunName ) { - PCOMSYMBOL pSym = hb_compSymbolFind( HB_COMP_PARAM, szFunName, NULL, HB_SYM_FUNCNAME ); + PHB_HSYMBOL pSym = hb_compSymbolFind( HB_COMP_PARAM, szFunName, NULL, HB_SYM_FUNCNAME ); if( pSym ) { @@ -2268,7 +2268,7 @@ void hb_compFunctionMarkStatic( HB_COMP_DECL, const char * szFunName ) PHB_HINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine ) { PHB_HINLINE pInline; - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; if( szFunName ) { @@ -2308,7 +2308,7 @@ static void hb_compExternGen( HB_COMP_DECL ) while( HB_COMP_PARAM->externs ) { HB_SYMBOLSCOPE cScope = HB_COMP_PARAM->externs->cScope; - PCOMSYMBOL pSym = hb_compSymbolFind( HB_COMP_PARAM, HB_COMP_PARAM->externs->szName, NULL, HB_SYM_FUNCNAME ); + PHB_HSYMBOL pSym = hb_compSymbolFind( HB_COMP_PARAM, HB_COMP_PARAM->externs->szName, NULL, HB_SYM_FUNCNAME ); if( pSym ) { @@ -2520,7 +2520,7 @@ void hb_compGenStaticName( const char * szVarName, HB_COMP_DECL ) static void hb_compGenVarPCode( HB_BYTE bPCode, const char * szVarName, HB_COMP_DECL ) { HB_USHORT wVar; - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; /* Check if this variable name is placed into the symbol table */ @@ -2601,7 +2601,7 @@ static void hb_compGenFieldPCode( HB_COMP_DECL, HB_BYTE bPCode, PVAR pField ) void hb_compGenMessage( const char * szMsgName, HB_BOOL bIsObject, HB_COMP_DECL ) { HB_USHORT wSym; - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; if( szMsgName ) { @@ -2987,7 +2987,7 @@ void hb_compGenPushDouble( double dNumber, HB_BYTE bWidth, HB_BYTE bDec, HB_COMP void hb_compGenPushFunCall( const char * szFunName, int iFlags, HB_COMP_DECL ) { - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; HB_USHORT wSym; HB_SYMBOL_UNUSED( iFlags ); @@ -3015,7 +3015,7 @@ void hb_compGenPushFunRef( const char * szFunName, HB_COMP_DECL ) /* generates the pcode to push a symbol on the virtual machine stack */ void hb_compGenPushSymbol( const char * szSymbolName, HB_BOOL bFunction, HB_COMP_DECL ) { - PCOMSYMBOL pSym; + PHB_HSYMBOL pSym; HB_USHORT wSym; pSym = hb_compSymbolFind( HB_COMP_PARAM, szSymbolName, &wSym, bFunction ); @@ -3871,7 +3871,7 @@ static void hb_compOutputFile( HB_COMP_DECL ) static void hb_compAddInitFunc( HB_COMP_DECL, PFUNCTION pFunc ) { - PCOMSYMBOL pSym = hb_compSymbolAdd( HB_COMP_PARAM, pFunc->szName, NULL, HB_SYM_FUNCNAME ); + PHB_HSYMBOL pSym = hb_compSymbolAdd( HB_COMP_PARAM, pFunc->szName, NULL, HB_SYM_FUNCNAME ); pSym->cScope |= pFunc->cScope; pSym->pFunc = pFunc; @@ -3971,7 +3971,7 @@ void hb_compCompileEnd( HB_COMP_DECL ) while( HB_COMP_PARAM->symbols.pFirst ) { - PCOMSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst; + PHB_HSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst; HB_COMP_PARAM->symbols.pFirst = pSym->pNext; hb_xfree( pSym ); } @@ -4437,8 +4437,8 @@ static int hb_compCompile( HB_COMP_DECL, const char * szPrg, const char * szBuff if( szFirstFunction ) { - PCOMSYMBOL pSym = hb_compSymbolFind( HB_COMP_PARAM, szFirstFunction, - NULL, HB_SYM_FUNCNAME ); + PHB_HSYMBOL pSym = hb_compSymbolFind( HB_COMP_PARAM, szFirstFunction, + NULL, HB_SYM_FUNCNAME ); if( pSym ) pSym->cScope |= HB_FS_FIRST; }