fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-12-16 00:17 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* include/hbcomp.h
  * include/hbcompdf.h
  * src/compiler/genc.c
  * src/compiler/hbmain.c
  * src/compiler/ppcomp.c
    * renamed a non-prefixed Harbour type due to collision
      with bcc64 (as per xhb commit)
    ; TODO: Here is portion from my TODO backlog with a list of
            other remaining non-prefixed types to fix:
            FS_*                -> HB_FS_*
            FC_*                -> HB_FC_*
            FO_*                -> HB_FO_*
            FD_*                -> HB_FD_*
            F_ERROR             -> (-)
            VS_*                -> HB_VSCOMP_*
            VU_*                -> HB_VU_*
            VT_*                -> HB_VT_*
            FUN_*               -> HB_FUN_*
            *COMDECLARED        -> [P]HB_HDECLARED
            *COMCLASS           -> [P]HB_HCLASS
            *COMSYMBOL          -> [P]HB_HSYMBOL
            VAR, PVAR           -> [P]HB_HVAR
            _FUNC, PFUNCTION    -> [P]HB_HFUNC
            _FUNCALL, PFUNCALL  -> [P]HB_HFUNCALL
            _EXTERN, PEXTERN    -> [P]HB_HEXTERN
            AUTOOPEN, PAUTOOPEN -> [P]HB_HAUTOOPEN
            FUNCTIONS           -> HB_HFUNCTION_LIST
            INLINES             -> HB_HINLINE_LIST
            SYMBOLS             -> HB_HSYMBOL_LIST
This commit is contained in:
Viktor Szakats
2012-12-15 23:19:46 +00:00
parent dfbf06eae2
commit 141a0269ed
6 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
harbour/ChangeLog.txt
View File

@@ -10,6 +10,37 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-12-16 00:17 UTC+0100 Viktor Szakats (harbour syenar.net)
* include/hbcomp.h
* include/hbcompdf.h
* src/compiler/genc.c
* src/compiler/hbmain.c
* src/compiler/ppcomp.c
* renamed a non-prefixed Harbour type due to collision
with bcc64 (as per xhb commit)
; TODO: Here is portion from my TODO backlog with a list of
other remaining non-prefixed types to fix:
FS_* -> HB_FS_*
FC_* -> HB_FC_*
FO_* -> HB_FO_*
FD_* -> HB_FD_*
F_ERROR -> (-)
VS_* -> HB_VSCOMP_*
VU_* -> HB_VU_*
VT_* -> HB_VT_*
FUN_* -> HB_FUN_*
*COMDECLARED -> [P]HB_HDECLARED
*COMCLASS -> [P]HB_HCLASS
*COMSYMBOL -> [P]HB_HSYMBOL
VAR, PVAR -> [P]HB_HVAR
_FUNC, PFUNCTION -> [P]HB_HFUNC
_FUNCALL, PFUNCALL -> [P]HB_HFUNCALL
_EXTERN, PEXTERN -> [P]HB_HEXTERN
AUTOOPEN, PAUTOOPEN -> [P]HB_HAUTOOPEN
FUNCTIONS -> HB_HFUNCTION_LIST
INLINES -> HB_HINLINE_LIST
SYMBOLS -> HB_HSYMBOL_LIST
2012-12-16 00:06 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/3rd/sqlite3/sqlite3.hbp
* contrib/3rd/sqlite3/*

2
harbour/include/hbcomp.h
View File

@@ -139,7 +139,7 @@ extern int hb_compVariableScope( HB_COMP_DECL, const char * );
#define FUN_ATTACHED 0x0200 /* function attached to function list */
extern void hb_compFunctionAdd( HB_COMP_DECL, const char * szFunName, HB_SYMBOLSCOPE cScope, int iType ); /* starts a new Clipper language function definition */
extern PINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine );
extern PHB_HINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine );
extern void hb_compFunctionMarkStatic( HB_COMP_DECL, const char * szFunName );
extern HB_EXPORT_INT const char * hb_compGetFuncID( const char * szFuncName, HB_FUNC_ID * pFunID, int * piFlags );
extern HB_BOOL hb_compFunCallCheck( HB_COMP_DECL, const char *, int );

12
harbour/include/hbcompdf.h
View File

@@ -538,15 +538,15 @@ typedef struct __FUNC
} _FUNC, * PFUNCTION;
/* structure to hold an INLINE block of source */
typedef struct __INLINE
typedef struct _HB_HINLINE
{
const char * szName; /* name of a inline function */
HB_BYTE * pCode; /* pointer to a memory block where pcode is stored */
HB_SIZE nPCodeSize; /* total memory size for pcode */
const char * szFileName; /* Source file name */
int iLine; /* Source line number */
struct __INLINE * pNext; /* pointer to the next defined inline */
} _INLINE, * PINLINE;
struct _HB_HINLINE * pNext; /* pointer to the next defined inline */
} HB_HINLINE, * PHB_HINLINE;
/* structure to hold a called functions */
typedef struct __FUNCALL
@@ -567,9 +567,9 @@ typedef struct
/* structure to control all Clipper defined functions */
typedef struct
{
PINLINE pFirst; /* pointer to the first defined inline */
PINLINE pLast; /* pointer to the last defined inline */
int iCount; /* number of defined inlines */
PHB_HINLINE pFirst; /* pointer to the first defined inline */
PHB_HINLINE pLast; /* pointer to the last defined inline */
int iCount; /* number of defined inlines */
} INLINES;
/* compiler symbol support structure */

16
harbour/src/compiler/genc.c
View File

@@ -50,7 +50,7 @@ typedef HB_GENC_FUNC_ * HB_GENC_FUNC_PTR;
static void hb_compDumpFindCFunc( HB_COMP_DECL )
{
PINLINE pInline;
PHB_HINLINE pInline;
pInline = HB_COMP_PARAM->inlines.pFirst;
while( pInline )
@@ -167,13 +167,13 @@ 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;
PFUNCTION pFunc;
PINLINE pInline;
FILE * yyc; /* file handle for C output */
HB_BOOL fHasHbInline = HB_FALSE;
int iFuncSuffix;
char szFileName[ HB_PATH_MAX ];
PCOMSYMBOL pSym;
PFUNCTION pFunc;
PHB_HINLINE pInline;
FILE * yyc; /* file handle for C output */
HB_BOOL fHasHbInline = HB_FALSE;
int iFuncSuffix;
hb_fsFNameMerge( szFileName, pFileName );
if( ! pFileName->szExtension )

12
harbour/src/compiler/hbmain.c
View File

@@ -1901,11 +1901,11 @@ static PFUNCTION hb_compFunctionNew( HB_COMP_DECL, const char * szName, HB_SYMBO
return pFunc;
}
static PINLINE hb_compInlineNew( HB_COMP_DECL, const char * szName, int iLine )
static PHB_HINLINE hb_compInlineNew( HB_COMP_DECL, const char * szName, int iLine )
{
PINLINE pInline;
PHB_HINLINE pInline;
pInline = ( PINLINE ) hb_xgrab( sizeof( _INLINE ) );
pInline = ( PHB_HINLINE ) hb_xgrab( sizeof( HB_HINLINE ) );
pInline->szName = szName;
pInline->pCode = NULL;
@@ -2265,9 +2265,9 @@ void hb_compFunctionMarkStatic( HB_COMP_DECL, const char * szFunName )
}
}
PINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine )
PHB_HINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine )
{
PINLINE pInline;
PHB_HINLINE pInline;
PCOMSYMBOL pSym;
if( szFunName )
@@ -3961,7 +3961,7 @@ void hb_compCompileEnd( HB_COMP_DECL )
while( HB_COMP_PARAM->inlines.pFirst )
{
PINLINE pInline = HB_COMP_PARAM->inlines.pFirst;
PHB_HINLINE pInline = HB_COMP_PARAM->inlines.pFirst;
HB_COMP_PARAM->inlines.pFirst = pInline->pNext;
if( pInline->pCode )

4
harbour/src/compiler/ppcomp.c
View File

@@ -83,7 +83,7 @@ static void hb_pp_Disp( void * cargo, const char * szMessage )
static void hb_pp_PragmaDump( void * cargo, char * pBuffer, HB_SIZE nSize,
int iLine )
{
PINLINE pInline;
PHB_HINLINE pInline;
pInline = hb_compInlineAdd( ( HB_COMP_PTR ) cargo, NULL, iLine );
pInline->pCode = ( HB_BYTE * ) hb_xgrab( nSize + 1 );
@@ -107,7 +107,7 @@ static void hb_pp_hb_inLine( void * cargo, char * szFunc,
}
else
{
PINLINE pInline = hb_compInlineAdd( HB_COMP_PARAM,
PHB_HINLINE pInline = hb_compInlineAdd( HB_COMP_PARAM,
hb_compIdentifierNew( HB_COMP_PARAM, szFunc, HB_IDENT_COPY ), iLine );
pInline->pCode = ( HB_BYTE * ) hb_xgrab( nSize + 1 );
memcpy( pInline->pCode, pBuffer, nSize );