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

2012-06-07 00:23 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/xhb/bkgtsks.c
  * doc/en/hb_api.txt
  * doc/en/hb_apird.txt
  * include/hbapi.h
  * include/hbapicls.h
  * include/hbapierr.h
  * include/hbapirdd.h
  * include/hbcompdf.h
  * include/hbstack.h
  * include/hbtypes.h
  * include/hbvmpub.h
  * src/rdd/nulsys/nulsys.c
  * src/rdd/wafunc.c
  * src/rtl/idle.c
  * src/rtl/type.c
  * src/vm/arrays.c
  * src/vm/classes.c
  * src/vm/estack.c
  * src/vm/garbage.c
  * src/vm/hvm.c
  * src/vm/itemapi.c
  * src/vm/macro.c
  * src/vm/maindllp/dllext.c
  * src/vm/memvars.c
    % HB_ITEM_PTR -> PHB_ITEM
    * HB_ITEM_PTR, PHB_CODEBLOCK and HB_BASEARRAY_PTR marked
      with HB_LEGACY_LEVEL4, latter two were unused
      inside Harbour SVN.

  * contrib/xhb/bkgtsks.c
  * src/vm/dynsym.c
    % two more local pointer type synonyms deleted
This commit is contained in:
Viktor Szakats
2012-06-06 22:26:21 +00:00
parent d0234ae015
commit e43cdcc5cd
26 changed files with 228 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
harbour/ChangeLog
View File

@@ -16,6 +16,40 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-06-07 00:23 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/xhb/bkgtsks.c
* doc/en/hb_api.txt
* doc/en/hb_apird.txt
* include/hbapi.h
* include/hbapicls.h
* include/hbapierr.h
* include/hbapirdd.h
* include/hbcompdf.h
* include/hbstack.h
* include/hbtypes.h
* include/hbvmpub.h
* src/rdd/nulsys/nulsys.c
* src/rdd/wafunc.c
* src/rtl/idle.c
* src/rtl/type.c
* src/vm/arrays.c
* src/vm/classes.c
* src/vm/estack.c
* src/vm/garbage.c
* src/vm/hvm.c
* src/vm/itemapi.c
* src/vm/macro.c
* src/vm/maindllp/dllext.c
* src/vm/memvars.c
% HB_ITEM_PTR -> PHB_ITEM
* HB_ITEM_PTR, PHB_CODEBLOCK and HB_BASEARRAY_PTR marked
with HB_LEGACY_LEVEL4, latter two were unused
inside Harbour SVN.
* contrib/xhb/bkgtsks.c
* src/vm/dynsym.c
% two more local pointer type synonyms deleted
2012-06-06 19:17 UTC+0200 Viktor Szakats (harbour syenar.net)
* include/hbapi.h
- deleted unused old HB_BASEARRAY_PTR type. INCOMPATIBLE.
@@ -27,7 +61,7 @@
; TODO: rename all HB_ITEM_PTR to PHB_ITEM and delete former.
pls shout if there is any difference in usage between
these two.
these two. [DONE]
2012-06-06 16:02 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/make.hb
@@ -136249,7 +136283,7 @@
; NOTE2: I'd also like to move the *_PTR (like HB_ITEM_PTR)
names to legacy status as we don't really use
them except in a few VM files, and we have PHB_*
as a wide-spread (and shorter) replacement.
as a wide-spread (and shorter) replacement. [~DONE]
; NOTE3: We may also use HB_LEGACY_LEVEL to obolete other
legacy or unsafe functions, with better new
alternatives.

16
harbour/contrib/xhb/bkgtsks.c
View File

@@ -50,14 +50,6 @@
*
*/
/*
* The following parts are Copyright of the individual authors.
* www - http://harbour-project.org
*
* See COPYING for licensing terms.
*
*/
#include "hbapi.h"
#include "hbapiitm.h"
#include "hbstack.h"
@@ -106,7 +98,7 @@ static HB_ULONG s_ulBackgroundID = 0;
/* list of background tasks
* A pointer into an array of pointers to items with a codeblock
*/
static HB_BACKGROUNDTASK_PTR * s_pBackgroundTasks = NULL;
static PHB_BACKGROUNDTASK * s_pBackgroundTasks = NULL;
static HB_BOOL s_bEnabled = HB_FALSE;
@@ -411,9 +403,9 @@ HB_FUNC( HB_BACKGROUNDRESET )
/* add a new background task and return its handle */
HB_FUNC( HB_BACKGROUNDADD )
{
HB_ITEM_PTR pBlock = hb_param( 1, HB_IT_ANY );
HB_ITEM_PTR pMillisec = hb_param( 2, HB_IT_NUMERIC );
HB_ITEM_PTR pActive = hb_param( 3, HB_IT_LOGICAL );
PHB_ITEM pBlock = hb_param( 1, HB_IT_ANY );
PHB_ITEM pMillisec = hb_param( 2, HB_IT_NUMERIC );
PHB_ITEM pActive = hb_param( 3, HB_IT_LOGICAL );
if( HB_IS_BLOCK( pBlock ) || HB_IS_ARRAY( pBlock ) )
{

34
harbour/doc/en/hb_api.txt
View File

@@ -4313,7 +4313,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_codeblockDelete( HB_ITEM_PTR pItem )
* hb_codeblockDelete( PHB_ITEM pItem )
* $ARGUMENTS$
* <pItem>
* $DESCRIPTION$
@@ -4426,7 +4426,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_codeblockEvaluate( HB_ITEM_PTR pItem )
* hb_codeblockEvaluate( PHB_ITEM pItem )
* $ARGUMENTS$
* <pItem>
* $DESCRIPTION$
@@ -4498,7 +4498,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_memvarValueNew( HB_ITEM_PTR pSource, HB_BOOL bTrueMemvar ) --> ( HB_HANDLE )hResult
* hb_memvarValueNew( PHB_ITEM pSource, HB_BOOL bTrueMemvar ) --> ( HB_HANDLE )hResult
* $ARGUMENTS$
* <pSource>
*
@@ -4749,7 +4749,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_memvarSetValue( PHB_SYMB pMemvarSymb, HB_ITEM_PTR pItem )
* hb_memvarSetValue( PHB_SYMB pMemvarSymb, PHB_ITEM pItem )
* $ARGUMENTS$
* <pMemvarSymb>
*
@@ -4786,7 +4786,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ) --> ( HB_ERRCODE )hResult
* hb_memvarGet( PHB_ITEM pItem, PHB_SYMB pMemvarSymb ) --> ( HB_ERRCODE )hResult
* $ARGUMENTS$
* <pItem>
*
@@ -4825,7 +4825,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_memvarGetValue( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
* hb_memvarGetValue( PHB_ITEM pItem, PHB_SYMB pMemvarSymb )
* $ARGUMENTS$
* <pItem>
*
@@ -4862,7 +4862,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_memvarGetRefer( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
* hb_memvarGetRefer( PHB_ITEM pItem, PHB_SYMB pMemvarSymb )
* $ARGUMENTS$
* <pItem>
*
@@ -5493,7 +5493,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_macroGetValue( HB_ITEM_PTR pItem )
* hb_macroGetValue( PHB_ITEM pItem )
* $ARGUMENTS$
* <pItem>
* $DESCRIPTION$
@@ -5528,7 +5528,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_macroSetValue( HB_ITEM_PTR pItem )
* hb_macroSetValue( PHB_ITEM pItem )
* $ARGUMENTS$
* <pItem>
* $DESCRIPTION$
@@ -5563,7 +5563,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_macroTextValue( HB_ITEM_PTR pItem )
* hb_macroTextValue( PHB_ITEM pItem )
* $ARGUMENTS$
* <pItem>
* $DESCRIPTION$
@@ -5598,7 +5598,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_macroPushSymbol( HB_ITEM_PTR pItem )
* hb_macroPushSymbol( PHB_ITEM pItem )
* $ARGUMENTS$
* <pItem>
* $DESCRIPTION$
@@ -5816,7 +5816,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_macroPopAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar )
* hb_macroPopAliasedValue( PHB_ITEM pAlias, PHB_ITEM pVar )
* $ARGUMENTS$
* <pAlias>
*
@@ -5853,7 +5853,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_macroPushAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar )
* hb_macroPushAliasedValue( PHB_ITEM pAlias, PHB_ITEM pVar )
* $ARGUMENTS$
* <pAlias>
*
@@ -5890,7 +5890,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_macroGetType( HB_ITEM_PTR pItem ) --> ( char * )pszResult
* hb_macroGetType( PHB_ITEM pItem ) --> ( char * )pszResult
* $ARGUMENTS$
* <pItem>
* $RETURNS$
@@ -6075,7 +6075,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_gcLockItem( HB_ITEM_PTR pItem )
* hb_gcLockItem( PHB_ITEM pItem )
* $ARGUMENTS$
* <pItem>
* $DESCRIPTION$
@@ -6110,7 +6110,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_gcUnlockItem( HB_ITEM_PTR pItem )
* hb_gcUnlockItem( PHB_ITEM pItem )
* $ARGUMENTS$
* <pItem>
* $DESCRIPTION$
@@ -6215,7 +6215,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_gcItemRef( HB_ITEM_PTR pItem )
* hb_gcItemRef( PHB_ITEM pItem )
* $ARGUMENTS$
* <pItem>
* $DESCRIPTION$

8
harbour/doc/en/hb_apird.txt
View File

@@ -250,7 +250,7 @@
* C Prototype
*
* #include <hbapirdd.h>
* hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) --> ( HB_ERRCODE )hResult
* hb_rddGetFieldValue( PHB_ITEM pItem, PHB_SYMB pFieldSymbol ) --> ( HB_ERRCODE )hResult
* $ARGUMENTS$
* <pItem>
*
@@ -289,7 +289,7 @@
* C Prototype
*
* #include <hbapirdd.h>
* hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) --> ( HB_ERRCODE )hResult
* hb_rddPutFieldValue( PHB_ITEM pItem, PHB_SYMB pFieldSymbol ) --> ( HB_ERRCODE )hResult
* $ARGUMENTS$
* <pItem>
*
@@ -328,7 +328,7 @@
* C Prototype
*
* #include <hbapirdd.h>
* hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) --> ( HB_ERRCODE )hResult
* hb_rddFieldGet( PHB_ITEM pItem, PHB_SYMB pFieldSymbol ) --> ( HB_ERRCODE )hResult
* $ARGUMENTS$
* <pItem>
*
@@ -367,7 +367,7 @@
* C Prototype
*
* #include <hbapirdd.h>
* hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) --> ( HB_ERRCODE )hResult
* hb_rddFieldPut( PHB_ITEM pItem, PHB_SYMB pFieldSymbol ) --> ( HB_ERRCODE )hResult
* $ARGUMENTS$
* <pItem>
*

42
harbour/include/hbapi.h
View File

@@ -417,7 +417,7 @@ typedef struct _HB_ITEM
struct hb_struSymbol asSymbol;
struct hb_struRecover asRecover;
} item;
} HB_ITEM, * PHB_ITEM, * HB_ITEM_PTR;
} HB_ITEM, * PHB_ITEM;
/* internal structure for arrays */
typedef struct _HB_BASEARRAY
@@ -447,7 +447,13 @@ typedef struct _HB_CODEBLOCK
void * pStatics; /* STATICs base frame */
HB_USHORT uiLocals; /* number of referenced local variables */
HB_SHORT dynBuffer; /* is pcode buffer allocated dynamically, SHORT used instead of HB_BOOL intentionally to force optimal alignment */
} HB_CODEBLOCK, * PHB_CODEBLOCK, * HB_CODEBLOCK_PTR;
} HB_CODEBLOCK, * HB_CODEBLOCK_PTR;
#if defined( HB_LEGACY_LEVEL4 )
# define HB_ITEM_PTR PHB_ITEM
# define HB_BASEARRAY_PTR PHB_BASEARRAY
# define PHB_CODEBLOCK HB_CODEBLOCK_PTR
#endif
typedef void ( * HB_EXTREF_FUNC0 )( void * );
typedef PHB_ITEM ( * HB_EXTREF_FUNC1 )( PHB_ITEM );
@@ -588,15 +594,15 @@ extern HB_EXPORT void hb_gcRefFree( void * pAlloc ); /* decrement reference
extern HB_EXPORT void hb_gcDummyMark( void * Cargo ); /* dummy GC mark function */
extern PHB_ITEM hb_gcGripGet( HB_ITEM_PTR pItem );
extern void hb_gcGripDrop( HB_ITEM_PTR pItem );
extern PHB_ITEM hb_gcGripGet( PHB_ITEM pItem );
extern void hb_gcGripDrop( PHB_ITEM pItem );
#ifdef _HB_API_INTERNAL_
extern const HB_GC_FUNCS * hb_gcFuncs( void *pBlock ); /* return cleanup function pointer */
extern void hb_gcAttach( void * pBlock );
extern void * hb_gcAllocRaw( HB_SIZE nSize, const HB_GC_FUNCS * pFuncs ); /* allocates a memory controlled by the garbage collector */
extern void hb_gcGripMark( void * Cargo ); /* mark complex variables inside given item as used */
extern void hb_gcItemRef( HB_ITEM_PTR pItem ); /* mark complex variables inside given item as used */
extern void hb_gcItemRef( PHB_ITEM pItem ); /* mark complex variables inside given item as used */
extern void hb_vmIsStackRef( void ); /* hvm.c - mark all local variables as used */
extern void hb_vmIsStaticRef( void ); /* hvm.c - mark all static variables as used */
extern void hb_gcReleaseAll( void ); /* release all memory blocks unconditionally */
@@ -1053,10 +1059,10 @@ extern PHB_ITEM hb_codeblockGetRef( HB_CODEBLOCK_PTR pCBlock, int iItemP
/* memvars subsystem */
extern void hb_memvarsClear( HB_BOOL fAll ); /* clear all PUBLIC and PRIVATE variables optionally without GetList PUBLIC variable */
extern HB_EXPORT void hb_memvarSetValue( PHB_SYMB pMemvarSymb, HB_ITEM_PTR pItem ); /* copy an item into a symbol */
extern HB_EXPORT HB_ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ); /* copy an symbol value into an item */
extern void hb_memvarGetValue( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ); /* copy an symbol value into an item, with error trapping */
extern void hb_memvarGetRefer( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ); /* copy a reference to a symbol value into an item, with error trapping */
extern HB_EXPORT void hb_memvarSetValue( PHB_SYMB pMemvarSymb, PHB_ITEM pItem ); /* copy an item into a symbol */
extern HB_EXPORT HB_ERRCODE hb_memvarGet( PHB_ITEM pItem, PHB_SYMB pMemvarSymb ); /* copy an symbol value into an item */
extern void hb_memvarGetValue( PHB_ITEM pItem, PHB_SYMB pMemvarSymb ); /* copy an symbol value into an item, with error trapping */
extern void hb_memvarGetRefer( PHB_ITEM pItem, PHB_SYMB pMemvarSymb ); /* copy a reference to a symbol value into an item, with error trapping */
extern HB_SIZE hb_memvarGetPrivatesBase( void ); /* retrieve current PRIVATE variables stack base */
extern void hb_memvarSetPrivatesBase( HB_SIZE nBase ); /* release PRIVATE variables created after specified base */
extern void hb_memvarUpdatePrivatesBase( void ); /* Update PRIVATE base ofsset so they will not be removed when function return */
@@ -1064,7 +1070,7 @@ extern void hb_memvarNewParameter( PHB_SYMB pSymbol, PHB_ITEM pV
extern char * hb_memvarGetStrValuePtr( char * szVarName, HB_SIZE * pnLen );
extern void hb_memvarCreateFromItem( PHB_ITEM pMemvar, int iScope, PHB_ITEM pValue );
extern int hb_memvarScope( const char * szVarName, HB_SIZE nLength ); /* retrieve scope of a dynamic variable symbol */
extern PHB_ITEM hb_memvarDetachLocal( HB_ITEM_PTR pLocal ); /* Detach a local variable from the eval stack */
extern PHB_ITEM hb_memvarDetachLocal( PHB_ITEM pLocal ); /* Detach a local variable from the eval stack */
extern HB_EXPORT PHB_ITEM hb_memvarGetValueBySym( PHB_DYNS pDynSym );
extern HB_EXPORT PHB_ITEM hb_memvarSaveInArray( int iScope, HB_BOOL fCopy ); /* create array with visible memvar references or copies respecting given memvars scope */
extern void hb_memvarRestoreFromArray( PHB_ITEM pArray );
@@ -1103,19 +1109,19 @@ typedef struct HB_MACRO_ * HB_MACRO_PTR;
#else
typedef void * HB_MACRO_PTR;
#endif
extern HB_EXPORT void hb_macroGetValue( HB_ITEM_PTR pItem, int iContext, int flags ); /* retrieve results of a macro expansion */
extern void hb_macroSetValue( HB_ITEM_PTR pItem, int flags ); /* assign a value to a macro-expression item */
extern void hb_macroPushReference( HB_ITEM_PTR pItem ); /* push reference to given expression */
extern void hb_macroTextValue( HB_ITEM_PTR pItem ); /* macro text substitution */
extern void hb_macroPushSymbol( HB_ITEM_PTR pItem ); /* handle a macro function calls, e.g. var := &macro() */
extern HB_EXPORT void hb_macroGetValue( PHB_ITEM pItem, int iContext, int flags ); /* retrieve results of a macro expansion */
extern void hb_macroSetValue( PHB_ITEM pItem, int flags ); /* assign a value to a macro-expression item */
extern void hb_macroPushReference( PHB_ITEM pItem ); /* push reference to given expression */
extern void hb_macroTextValue( PHB_ITEM pItem ); /* macro text substitution */
extern void hb_macroPushSymbol( PHB_ITEM pItem ); /* handle a macro function calls, e.g. var := &macro() */
extern void hb_macroRun( HB_MACRO_PTR pMacro ); /* executes pcode compiled by macro compiler */
extern HB_MACRO_PTR hb_macroCompile( const char * szString ); /* compile a string and return a pcode buffer */
extern void hb_macroDelete( HB_MACRO_PTR pMacro ); /* release all memory allocated for macro evaluation */
extern char * hb_macroTextSymbol( const char * szString, HB_SIZE nLength, HB_BOOL * pfNewString ); /* substitute macro variables occurences within a given string and check if result is a valid function or variable name */
extern char * hb_macroExpandString( const char * szString, HB_SIZE nLength, HB_BOOL * pfNewString ); /* expands valid '&' operator */
extern void hb_macroPopAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int flags ); /* compiles and evaluates an aliased macro expression */
extern void hb_macroPushAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int flags ); /* compiles and evaluates an aliased macro expression */
extern HB_EXPORT const char * hb_macroGetType( HB_ITEM_PTR pItem ); /* determine the type of an expression */
extern void hb_macroPopAliasedValue( PHB_ITEM pAlias, PHB_ITEM pVar, int flags ); /* compiles and evaluates an aliased macro expression */
extern void hb_macroPushAliasedValue( PHB_ITEM pAlias, PHB_ITEM pVar, int flags ); /* compiles and evaluates an aliased macro expression */
extern HB_EXPORT const char * hb_macroGetType( PHB_ITEM pItem ); /* determine the type of an expression */
/* idle states */
extern HB_EXPORT void hb_releaseCPU( void );

2
harbour/include/hbapicls.h
View File

@@ -100,7 +100,7 @@ extern PHB_SYMB hb_clsMethodSym( PHB_ITEM pBaseSymbol ); /* returns the real m
extern PHB_SYMB hb_objGetMethod( PHB_ITEM pObject, PHB_SYMB pSymMsg, PHB_STACK_STATE pStack ); /* returns the method pointer of an object class */
extern HB_BOOL hb_objGetVarRef( PHB_ITEM pObject, PHB_SYMB pMessage, PHB_STACK_STATE pStack ); /* create object variable reference */
extern HB_BOOL hb_objHasOperator( PHB_ITEM pObject, HB_USHORT uiOperator );
extern HB_BOOL hb_objOperatorCall( HB_USHORT uiOperator, HB_ITEM_PTR pResult, PHB_ITEM pObject, PHB_ITEM pMsgArg1, PHB_ITEM pMsgArg2 );
extern HB_BOOL hb_objOperatorCall( HB_USHORT uiOperator, PHB_ITEM pResult, PHB_ITEM pObject, PHB_ITEM pMsgArg1, PHB_ITEM pMsgArg2 );
extern void hb_objDestructorCall( PHB_ITEM pObject );
#ifndef HB_NO_PROFILER

6
harbour/include/hbapierr.h
View File

@@ -172,17 +172,17 @@ extern void hb_errInternalRaw ( HB_ERRCODE errCode, const char
/* Low-level error handling */
struct HB_ERROR_INFO_; /* forward declaration */
#define HB_ERROR_HANDLE( hbfunc ) HB_ITEM_PTR hbfunc( struct HB_ERROR_INFO_ * ErrorInfo )
#define HB_ERROR_HANDLE( hbfunc ) PHB_ITEM hbfunc( struct HB_ERROR_INFO_ * ErrorInfo )
typedef HB_ERROR_HANDLE( HB_ERROR_HANDLER );
typedef HB_ERROR_HANDLER * HB_ERROR_HANDLER_PTR;
typedef struct HB_ERROR_INFO_
{
HB_ERROR_HANDLER_PTR Func;
HB_ITEM_PTR Error;
PHB_ITEM Error;
void * Cargo;
struct HB_ERROR_INFO_ * Previous;
HB_ITEM_PTR ErrorBlock;
PHB_ITEM ErrorBlock;
} HB_ERROR_INFO, * HB_ERROR_INFO_PTR;
/* set/get current error handler */

8
harbour/include/hbapirdd.h
View File

@@ -1158,10 +1158,10 @@ extern void hb_rddCloseDetachedAreas( void );
/* RDD virtual machine integration functions */
extern HB_EXPORT void hb_rddShutDown( void );
extern HB_EXPORT HB_ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol );
extern HB_EXPORT HB_ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol );
extern HB_EXPORT HB_ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol );
extern HB_EXPORT HB_ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol );
extern HB_EXPORT HB_ERRCODE hb_rddGetFieldValue( PHB_ITEM pItem, PHB_SYMB pFieldSymbol );
extern HB_EXPORT HB_ERRCODE hb_rddPutFieldValue( PHB_ITEM pItem, PHB_SYMB pFieldSymbol );
extern HB_EXPORT HB_ERRCODE hb_rddFieldGet( PHB_ITEM pItem, PHB_SYMB pFieldSymbol );
extern HB_EXPORT HB_ERRCODE hb_rddFieldPut( PHB_ITEM pItem, PHB_SYMB pFieldSymbol );
extern HB_EXPORT int hb_rddGetCurrentWorkAreaNumber( void );
extern HB_EXPORT HB_ERRCODE hb_rddSelectWorkAreaNumber( int iArea );
extern HB_EXPORT HB_ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias );

12
harbour/include/hbcompdf.h
View File

@@ -436,15 +436,15 @@ typedef struct HB_EXPR_
HB_SIZE nLength;
HB_EXPRTYPE ExprType; /* internal expression type */
HB_USHORT ValType; /* language level value type */
struct HB_EXPR_ *pNext; /* next expression in the list of expressions */
} HB_EXPR, *HB_EXPR_PTR;
struct HB_EXPR_ * pNext; /* next expression in the list of expressions */
} HB_EXPR, * HB_EXPR_PTR;
typedef struct HB_ENUMERATOR_
{
const char * szName;
HB_BOOL bForEach;
struct HB_ENUMERATOR_ *pNext;
} HB_ENUMERATOR, *HB_ENUMERATOR_PTR; /* support structure for FOR EACH statements */
} HB_ENUMERATOR, * HB_ENUMERATOR_PTR; /* support structure for FOR EACH statements */
/* support structure for else if pcode fixups */
typedef struct HB_ELSEIF_
@@ -483,7 +483,7 @@ typedef struct HB_SWITCHCMD_
HB_EXPR_PTR pExpr;
HB_SIZE nDefault;
struct HB_SWITCHCMD_ * pPrev;
} HB_SWITCHCMD, *HB_SWITCHCMD_PTR;
} HB_SWITCHCMD, * HB_SWITCHCMD_PTR;
/* support structure for PUBLIC and PRIVATE statements */
typedef struct HB_RTVAR_
@@ -492,7 +492,7 @@ typedef struct HB_RTVAR_
HB_BOOL bPopValue;
struct HB_RTVAR_ * pNext;
struct HB_RTVAR_ * pPrev;
} HB_RTVAR, *HB_RTVAR_PTR;
} HB_RTVAR, * HB_RTVAR_PTR;
/* structure to hold a Clipper defined function */
typedef struct __FUNC
@@ -673,7 +673,7 @@ typedef struct HB_MACRO_ /* a macro compiled pcode container */
HB_SIZE length; /* length of the string */
int Flags; /* some flags we may need */
int status; /* status of compilation */
HB_ITEM_PTR pError; /* error object returned from the parser */
PHB_ITEM pError; /* error object returned from the parser */
HB_PCODE_INFO_PTR pCodeInfo; /* pointer to pcode buffer and info */
void * pLex; /* lexer buffer pointer */
void * pExprLst; /* list with allocated expressions */

20
harbour/include/hbstack.h
View File

@@ -277,13 +277,13 @@ typedef struct
#endif /* _HB_API_INTERNAL_ */
extern HB_EXPORT void * hb_stackId( void );
extern HB_EXPORT HB_ITEM_PTR hb_stackItemFromTop( int nFromTop );
extern HB_EXPORT HB_ITEM_PTR hb_stackItemFromBase( int nFromBase );
extern HB_EXPORT HB_ITEM_PTR hb_stackBaseItem( void );
extern HB_EXPORT HB_ITEM_PTR hb_stackSelfItem( void ); /* returns Self object at C function level */
extern HB_EXPORT HB_ITEM_PTR hb_stackReturnItem( void ); /* returns RETURN Item from stack */
extern HB_EXPORT PHB_ITEM hb_stackItemFromTop( int nFromTop );
extern HB_EXPORT PHB_ITEM hb_stackItemFromBase( int nFromBase );
extern HB_EXPORT PHB_ITEM hb_stackBaseItem( void );
extern HB_EXPORT PHB_ITEM hb_stackSelfItem( void ); /* returns Self object at C function level */
extern HB_EXPORT PHB_ITEM hb_stackReturnItem( void ); /* returns RETURN Item from stack */
extern HB_EXPORT HB_ITEM_PTR hb_stackAllocItem( void ); /* allocates new item on the top of stack, returns pointer to it */
extern HB_EXPORT PHB_ITEM hb_stackAllocItem( void ); /* allocates new item on the top of stack, returns pointer to it */
extern HB_EXPORT void hb_stackPop( void ); /* pops an item from the stack */
extern void hb_stackPush( void ); /* pushes an item on to the stack */
@@ -294,7 +294,7 @@ extern void hb_stackRemove( HB_ISIZ nUntilPos );
extern HB_ISIZ hb_stackTopOffset( void );
extern HB_EXPORT HB_ISIZ hb_stackBaseOffset( void );
extern HB_ISIZ hb_stackTotalItems( void );
extern HB_EXPORT HB_ITEM_PTR hb_stackItem( HB_ISIZ nItemPos );
extern HB_EXPORT PHB_ITEM hb_stackItem( HB_ISIZ nItemPos );
extern char * hb_stackDateBuffer( void );
/* stack management functions */
@@ -323,12 +323,12 @@ extern HB_EXPORT void ** hb_stackDebugInfo( void );
#ifdef _HB_API_INTERNAL_
extern void hb_stackDec( void );
extern void hb_stackDecrease( HB_SIZE nItems );
extern HB_ITEM_PTR hb_stackNewFrame( PHB_STACK_STATE pFrame, HB_USHORT uiParams );
extern PHB_ITEM hb_stackNewFrame( PHB_STACK_STATE pFrame, HB_USHORT uiParams );
extern void hb_stackOldFrame( PHB_STACK_STATE pFrame );
extern void hb_stackClearMemvarsBase( void );
extern HB_ITEM_PTR hb_stackLocalVariable( int iLocal );
extern HB_ITEM_PTR hb_stackLocalVariableAt( int * piFromBase );
extern PHB_ITEM hb_stackLocalVariable( int iLocal );
extern PHB_ITEM hb_stackLocalVariableAt( int * piFromBase );
extern PHB_ITEM ** hb_stackItemBasePtr( void );
extern HB_EXPORT HB_ISIZ hb_stackGetRecoverBase( void );

2
harbour/include/hbtypes.h
View File

@@ -118,7 +118,7 @@ typedef void * ( * HB_XGRAB )( HB_SIZE nSize ); /* allocates
typedef void ( * HB_XFREE )( void * pMem ); /* frees memory */
typedef void * ( * HB_XREALLOC )( void * pMem, HB_SIZE nSize ); /* reallocates memory */
typedef void ( * HB_MACROTEXTVALUE )( HB_ITEM_PTR pItem );
typedef void ( * HB_MACROTEXTVALUE )( PHB_ITEM pItem );
HB_EXTERN_END

1
harbour/include/hbvmpub.h
View File

@@ -172,7 +172,6 @@ struct _HB_SYMB;
/* basic types */
typedef void * PHB_ITEM;
typedef void * HB_ITEM_PTR;
typedef void * HB_CODEBLOCK_PTR;
typedef void * PHB_PCODEFUNC;

8
harbour/src/rdd/nulsys/nulsys.c
View File

@@ -80,7 +80,7 @@ int hb_rddGetCurrentWorkAreaNumber( void )
return 0;
}
HB_ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
HB_ERRCODE hb_rddFieldGet( PHB_ITEM pItem, PHB_SYMB pFieldSymbol )
{
HB_SYMBOL_UNUSED( pItem );
HB_SYMBOL_UNUSED( pFieldSymbol );
@@ -88,7 +88,7 @@ HB_ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
return HB_FAILURE;
}
HB_ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
HB_ERRCODE hb_rddFieldPut( PHB_ITEM pItem, PHB_SYMB pFieldSymbol )
{
HB_SYMBOL_UNUSED( pItem );
HB_SYMBOL_UNUSED( pFieldSymbol );
@@ -96,7 +96,7 @@ HB_ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
return HB_FAILURE;
}
HB_ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
HB_ERRCODE hb_rddGetFieldValue( PHB_ITEM pItem, PHB_SYMB pFieldSymbol )
{
HB_SYMBOL_UNUSED( pItem );
HB_SYMBOL_UNUSED( pFieldSymbol );
@@ -104,7 +104,7 @@ HB_ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
return HB_FAILURE;
}
HB_ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
HB_ERRCODE hb_rddPutFieldValue( PHB_ITEM pItem, PHB_SYMB pFieldSymbol )
{
HB_SYMBOL_UNUSED( pItem );
HB_SYMBOL_UNUSED( pFieldSymbol );

12
harbour/src/rdd/wafunc.c
View File

@@ -349,7 +349,7 @@ HB_ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea )
*/
HB_ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias )
{
HB_ITEM_PTR pError;
PHB_ITEM pError;
HB_ERRCODE errCode;
const char * szName;
int iArea;
@@ -428,7 +428,7 @@ HB_ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias )
* generate an error with retry possibility
* (user created error handler can open a missing database)
*/
HB_ITEM_PTR pError = hb_errRT_New( ES_ERROR, NULL, EG_NOALIAS, EDBCMD_NOALIAS, NULL, szAlias, 0, EF_CANRETRY );
PHB_ITEM pError = hb_errRT_New( ES_ERROR, NULL, EG_NOALIAS, EDBCMD_NOALIAS, NULL, szAlias, 0, EF_CANRETRY );
do
{
@@ -455,7 +455,7 @@ HB_ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias )
/*
* Obtain the current value of a field.
*/
HB_ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
HB_ERRCODE hb_rddFieldGet( PHB_ITEM pItem, PHB_SYMB pFieldSymbol )
{
AREAP pArea;
@@ -484,7 +484,7 @@ HB_ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
/*
* Assign a value to a field.
*/
HB_ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
HB_ERRCODE hb_rddFieldPut( PHB_ITEM pItem, PHB_SYMB pFieldSymbol )
{
AREAP pArea;
@@ -513,7 +513,7 @@ HB_ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
/*
* Obtain the current value of a field.
*/
HB_ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
HB_ERRCODE hb_rddGetFieldValue( PHB_ITEM pItem, PHB_SYMB pFieldSymbol )
{
HB_ERRCODE errCode;
@@ -546,7 +546,7 @@ HB_ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
/*
* Assign a value to a field.
*/
HB_ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
HB_ERRCODE hb_rddPutFieldValue( PHB_ITEM pItem, PHB_SYMB pFieldSymbol )
{
HB_ERRCODE errCode;

12
harbour/src/rtl/idle.c
View File

@@ -183,7 +183,7 @@ HB_FUNC( HB_IDLESLEEP )
/* add a new background task and return its handle */
HB_FUNC( HB_IDLEADD )
{
HB_ITEM_PTR pBlock = hb_param( 1, HB_IT_BLOCK );
PHB_ITEM pBlock = hb_param( 1, HB_IT_BLOCK );
if( pBlock )
{
@@ -192,9 +192,9 @@ HB_FUNC( HB_IDLEADD )
++pIdleData->iIdleMaxTask;
if( ! pIdleData->pIdleTasks )
pIdleData->pIdleTasks = ( HB_ITEM_PTR * ) hb_xgrab( sizeof( HB_ITEM_PTR ) );
pIdleData->pIdleTasks = ( PHB_ITEM * ) hb_xgrab( sizeof( PHB_ITEM ) );
else
pIdleData->pIdleTasks = ( HB_ITEM_PTR * ) hb_xrealloc( pIdleData->pIdleTasks, sizeof( HB_ITEM_PTR ) * pIdleData->iIdleMaxTask );
pIdleData->pIdleTasks = ( PHB_ITEM * ) hb_xrealloc( pIdleData->pIdleTasks, sizeof( PHB_ITEM ) * pIdleData->iIdleMaxTask );
/* store a copy of passed codeblock
*/
@@ -218,7 +218,7 @@ HB_FUNC( HB_IDLEDEL )
while( iTask < pIdleData->iIdleMaxTask )
{
HB_ITEM_PTR pItem = pIdleData->pIdleTasks[ iTask ];
PHB_ITEM pItem = pIdleData->pIdleTasks[ iTask ];
if( pID == hb_codeblockId( pItem ) )
{
@@ -231,9 +231,9 @@ HB_FUNC( HB_IDLEDEL )
if( iTask != pIdleData->iIdleMaxTask )
{
memmove( &pIdleData->pIdleTasks[ iTask ], &pIdleData->pIdleTasks[ iTask + 1 ],
sizeof( HB_ITEM_PTR ) * ( pIdleData->iIdleMaxTask - iTask ) );
sizeof( PHB_ITEM ) * ( pIdleData->iIdleMaxTask - iTask ) );
}
pIdleData->pIdleTasks = ( HB_ITEM_PTR * ) hb_xrealloc( pIdleData->pIdleTasks, sizeof( HB_ITEM_PTR ) * pIdleData->iIdleMaxTask );
pIdleData->pIdleTasks = ( PHB_ITEM * ) hb_xrealloc( pIdleData->pIdleTasks, sizeof( PHB_ITEM ) * pIdleData->iIdleMaxTask );
if( pIdleData->iIdleTask >= pIdleData->iIdleMaxTask )
pIdleData->iIdleTask = 0;
}

2
harbour/src/rtl/type.c
View File

@@ -55,7 +55,7 @@
HB_FUNC( TYPE )
{
HB_ITEM_PTR pItem = hb_param( 1, HB_IT_STRING );
PHB_ITEM pItem = hb_param( 1, HB_IT_STRING );
if( pItem )
{

4
harbour/src/vm/arrays.c
View File

@@ -81,7 +81,7 @@ static void hb_arrayReleaseItems( PHB_BASEARRAY pBaseArray )
{
if( pBaseArray->nLen )
{
HB_ITEM_PTR pItems = pBaseArray->pItems;
PHB_ITEM pItems = pBaseArray->pItems;
HB_SIZE nLen = pBaseArray->nLen;
/*
@@ -162,7 +162,7 @@ static HB_GARBAGE_FUNC( hb_arrayGarbageMark )
if( pBaseArray->nLen )
{
HB_SIZE nLen = pBaseArray->nLen;
HB_ITEM_PTR pItems = pBaseArray->pItems;
PHB_ITEM pItems = pBaseArray->pItems;
while( nLen-- )
{

2
harbour/src/vm/classes.c
View File

@@ -2292,7 +2292,7 @@ HB_BOOL hb_objHasOperator( PHB_ITEM pObject, HB_USHORT uiOperator )
* Function return HB_TRUE when object class overloads given operator
* and HB_FALSE otherwise. [druzus]
*/
HB_BOOL hb_objOperatorCall( HB_USHORT uiOperator, HB_ITEM_PTR pResult, PHB_ITEM pObject,
HB_BOOL hb_objOperatorCall( HB_USHORT uiOperator, PHB_ITEM pResult, PHB_ITEM pObject,
PHB_ITEM pMsgArg1, PHB_ITEM pMsgArg2 )
{
HB_TRACE(HB_TR_DEBUG, ("hb_objOperatorCall(%hu,%p,%p,%p,%p)", uiOperator, pResult, pObject, pMsgArg1, pMsgArg2));

2
harbour/src/vm/dynsym.c
View File

@@ -59,7 +59,7 @@
typedef struct
{
PHB_DYNS pDynSym; /* Pointer to dynamic symbol */
} DYNHB_ITEM, * PDYNHB_ITEM, * DYNHB_ITEM_PTR;
} DYNHB_ITEM, * PDYNHB_ITEM;
typedef struct _HB_SYM_HOLDER
{

28
harbour/src/vm/estack.c
View File

@@ -614,7 +614,7 @@ void hb_stackPush( void )
}
#undef hb_stackAllocItem
HB_ITEM_PTR hb_stackAllocItem( void )
PHB_ITEM hb_stackAllocItem( void )
{
HB_STACK_TLS_PRELOAD
@@ -674,7 +674,7 @@ void hb_stackIncrease( void )
void hb_stackRemove( HB_ISIZ nUntilPos )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR * pEnd = hb_stack.pItems + nUntilPos;
PHB_ITEM * pEnd = hb_stack.pItems + nUntilPos;
while( hb_stack.pPos > pEnd )
{
@@ -781,10 +781,10 @@ static void hb_stackDispLocal( void )
#endif
HB_ITEM_PTR hb_stackNewFrame( PHB_STACK_STATE pFrame, HB_USHORT uiParams )
PHB_ITEM hb_stackNewFrame( PHB_STACK_STATE pFrame, HB_USHORT uiParams )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR * pBase, pItem;
PHB_ITEM * pBase, pItem;
pBase = hb_stack.pPos - uiParams - 2;
pItem = * pBase; /* procedure symbol */
@@ -835,7 +835,7 @@ void hb_stackOldFrame( PHB_STACK_STATE pFrame )
}
#undef hb_stackItem
HB_ITEM_PTR hb_stackItem( HB_ISIZ nItemPos )
PHB_ITEM hb_stackItem( HB_ISIZ nItemPos )
{
HB_STACK_TLS_PRELOAD
if( nItemPos < 0 )
@@ -845,7 +845,7 @@ HB_ITEM_PTR hb_stackItem( HB_ISIZ nItemPos )
}
#undef hb_stackItemFromTop
HB_ITEM_PTR hb_stackItemFromTop( int iFromTop )
PHB_ITEM hb_stackItemFromTop( int iFromTop )
{
HB_STACK_TLS_PRELOAD
if( iFromTop >= 0 )
@@ -855,7 +855,7 @@ HB_ITEM_PTR hb_stackItemFromTop( int iFromTop )
}
#undef hb_stackItemFromBase
HB_ITEM_PTR hb_stackItemFromBase( int iFromBase )
PHB_ITEM hb_stackItemFromBase( int iFromBase )
{
HB_STACK_TLS_PRELOAD
if( iFromBase < 0 )
@@ -865,10 +865,10 @@ HB_ITEM_PTR hb_stackItemFromBase( int iFromBase )
}
#undef hb_stackLocalVariable
HB_ITEM_PTR hb_stackLocalVariable( int iLocal )
PHB_ITEM hb_stackLocalVariable( int iLocal )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR pBase = *hb_stack.pBase;
PHB_ITEM pBase = *hb_stack.pBase;
/*
if( iLocal <= 0 )
@@ -889,10 +889,10 @@ HB_ITEM_PTR hb_stackLocalVariable( int iLocal )
}
#undef hb_stackLocalVariableAt
HB_ITEM_PTR hb_stackLocalVariableAt( int * piFromBase )
PHB_ITEM hb_stackLocalVariableAt( int * piFromBase )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR pBase = *hb_stack.pBase;
PHB_ITEM pBase = *hb_stack.pBase;
/*
if( *piFromBase <= 0 )
@@ -913,7 +913,7 @@ HB_ITEM_PTR hb_stackLocalVariableAt( int * piFromBase )
}
#undef hb_stackBaseItem
HB_ITEM_PTR hb_stackBaseItem( void )
PHB_ITEM hb_stackBaseItem( void )
{
HB_STACK_TLS_PRELOAD
return * hb_stack.pBase;
@@ -922,14 +922,14 @@ HB_ITEM_PTR hb_stackBaseItem( void )
/* Returns SELF object, an evaluated codeblock or NIL for normal func/proc
*/
#undef hb_stackSelfItem
HB_ITEM_PTR hb_stackSelfItem( void )
PHB_ITEM hb_stackSelfItem( void )
{
HB_STACK_TLS_PRELOAD
return * ( hb_stack.pBase + 1 );
}
#undef hb_stackReturnItem
HB_ITEM_PTR hb_stackReturnItem( void )
PHB_ITEM hb_stackReturnItem( void )
{
HB_STACK_TLS_PRELOAD

14
harbour/src/vm/garbage.c
View File

@@ -364,13 +364,13 @@ HB_GARBAGE_FUNC( hb_gcDummyMark )
HB_GARBAGE_FUNC( hb_gcGripMark )
{
hb_gcItemRef( ( HB_ITEM_PTR ) Cargo );
hb_gcItemRef( ( PHB_ITEM ) Cargo );
}
static HB_GARBAGE_FUNC( hb_gcGripRelease )
{
if( HB_IS_COMPLEX( ( HB_ITEM_PTR ) Cargo ) )
hb_itemClear( ( HB_ITEM_PTR ) Cargo );
if( HB_IS_COMPLEX( ( PHB_ITEM ) Cargo ) )
hb_itemClear( ( PHB_ITEM ) Cargo );
}
static const HB_GC_FUNCS s_gcGripFuncs =
@@ -379,10 +379,10 @@ static const HB_GC_FUNCS s_gcGripFuncs =
hb_gcGripMark
};
HB_ITEM_PTR hb_gcGripGet( HB_ITEM_PTR pOrigin )
PHB_ITEM hb_gcGripGet( PHB_ITEM pOrigin )
{
HB_GARBAGE_PTR pAlloc = HB_GARBAGE_NEW( sizeof( HB_ITEM ) );
HB_ITEM_PTR pItem = ( HB_ITEM_PTR ) HB_BLOCK_PTR( pAlloc );
PHB_ITEM pItem = ( PHB_ITEM ) HB_BLOCK_PTR( pAlloc );
pAlloc->pFuncs = &s_gcGripFuncs;
pAlloc->locked = 1;
@@ -400,7 +400,7 @@ HB_ITEM_PTR hb_gcGripGet( HB_ITEM_PTR pOrigin )
return pItem;
}
void hb_gcGripDrop( HB_ITEM_PTR pItem )
void hb_gcGripDrop( PHB_ITEM pItem )
{
hb_gcRefFree( pItem );
}
@@ -496,7 +496,7 @@ void hb_gcMark( void * pBlock )
/* Mark a passed item as used so it will be not released by the GC
*/
void hb_gcItemRef( HB_ITEM_PTR pItem )
void hb_gcItemRef( PHB_ITEM pItem )
{
while( HB_IS_BYREF( pItem ) )
{

96
harbour/src/vm/hvm.c
View File

@@ -104,16 +104,16 @@ HB_FUNC_EXTERN( SYSINIT );
/* Operators (mathematical / character / misc) */
static void hb_vmNegate( void ); /* negates (-) the latest value on the stack */
static void hb_vmInc( HB_ITEM_PTR pItem ); /* increment the latest numeric value on the stack */
static void hb_vmDec( HB_ITEM_PTR pItem ); /* decrements the latest numeric value on the stack */
static void hb_vmInc( PHB_ITEM pItem ); /* increment the latest numeric value on the stack */
static void hb_vmDec( PHB_ITEM pItem ); /* decrements the latest numeric value on the stack */
static void hb_vmFuncPtr( void ); /* pushes a function address pointer. Removes the symbol from the satck */
static void hb_vmAddInt( HB_ITEM_PTR pResult, HB_LONG lAdd ); /* add integer to given item */
static void hb_vmPlus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 ); /* sums given values */
static void hb_vmMinus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 ); /* substracts given values */
static void hb_vmMult( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 ); /* multiplies given values */
static void hb_vmDivide( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 ); /* divides the given values */
static void hb_vmModulus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 ); /* calculates modulus given values */
static void hb_vmPower( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 ); /* power given values */
static void hb_vmAddInt( PHB_ITEM pResult, HB_LONG lAdd ); /* add integer to given item */
static void hb_vmPlus( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 ); /* sums given values */
static void hb_vmMinus( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 ); /* substracts given values */
static void hb_vmMult( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 ); /* multiplies given values */
static void hb_vmDivide( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 ); /* divides the given values */
static void hb_vmModulus( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 ); /* calculates modulus given values */
static void hb_vmPower( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 ); /* power given values */
/* Operators (relational) */
static void hb_vmEqual( void ); /* checks if the two latest values on the stack are equal, removes both and leaves result */
@@ -1300,7 +1300,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_PLUSEQ:
{
HB_ITEM_PTR pResult, pValue;
PHB_ITEM pResult, pValue;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
pValue = hb_stackItemFromTop( -1 );
hb_vmPlus( pResult, pResult, pValue );
@@ -1313,7 +1313,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_PLUSEQPOP:
{
HB_ITEM_PTR pResult;
PHB_ITEM pResult;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
hb_vmPlus( pResult, pResult, hb_stackItemFromTop( -1 ) );
hb_stackPop();
@@ -1330,7 +1330,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_MINUSEQ:
{
HB_ITEM_PTR pResult, pValue;
PHB_ITEM pResult, pValue;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
pValue = hb_stackItemFromTop( -1 );
hb_vmMinus( pResult, pResult, pValue );
@@ -1343,7 +1343,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_MINUSEQPOP:
{
HB_ITEM_PTR pResult;
PHB_ITEM pResult;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
hb_vmMinus( pResult, pResult, hb_stackItemFromTop( -1 ) );
hb_stackPop();
@@ -1360,7 +1360,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_MULTEQ:
{
HB_ITEM_PTR pResult, pValue;
PHB_ITEM pResult, pValue;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
pValue = hb_stackItemFromTop( -1 );
hb_vmMult( pResult, pResult, pValue );
@@ -1373,7 +1373,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_MULTEQPOP:
{
HB_ITEM_PTR pResult;
PHB_ITEM pResult;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
hb_vmMult( pResult, pResult, hb_stackItemFromTop( -1 ) );
hb_stackPop();
@@ -1390,7 +1390,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_DIVEQ:
{
HB_ITEM_PTR pResult, pValue;
PHB_ITEM pResult, pValue;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
pValue = hb_stackItemFromTop( -1 );
hb_vmDivide( pResult, pResult, pValue );
@@ -1403,7 +1403,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_DIVEQPOP:
{
HB_ITEM_PTR pResult;
PHB_ITEM pResult;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
hb_vmDivide( pResult, pResult, hb_stackItemFromTop( -1 ) );
hb_stackPop();
@@ -1420,7 +1420,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_MODEQ:
{
HB_ITEM_PTR pResult, pValue;
PHB_ITEM pResult, pValue;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
pValue = hb_stackItemFromTop( -1 );
hb_vmModulus( pResult, pResult, pValue );
@@ -1433,7 +1433,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_MODEQPOP:
{
HB_ITEM_PTR pResult;
PHB_ITEM pResult;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
hb_vmModulus( pResult, pResult, hb_stackItemFromTop( -1 ) );
hb_stackPop();
@@ -1450,7 +1450,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_EXPEQ:
{
HB_ITEM_PTR pResult, pValue;
PHB_ITEM pResult, pValue;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
pValue = hb_stackItemFromTop( -1 );
hb_vmPower( pResult, pResult, pValue );
@@ -1463,7 +1463,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_EXPEQPOP:
{
HB_ITEM_PTR pResult;
PHB_ITEM pResult;
pResult = hb_itemUnRef( hb_stackItemFromTop( -2 ) );
hb_vmPower( pResult, pResult, hb_stackItemFromTop( -1 ) );
hb_stackPop();
@@ -1479,7 +1479,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_INCEQ:
{
HB_ITEM_PTR pResult, pValue, pTemp;
PHB_ITEM pResult, pValue, pTemp;
pResult = hb_stackItemFromTop( -1 );
pValue = hb_itemUnRef( pResult );
hb_vmInc( pValue );
@@ -1504,7 +1504,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_DECEQ:
{
HB_ITEM_PTR pResult, pValue, pTemp;
PHB_ITEM pResult, pValue, pTemp;
pResult = hb_stackItemFromTop( -1 );
pValue = hb_itemUnRef( pResult );
hb_vmDec( pValue );
@@ -2983,7 +2983,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
/* character / misc ) */
/* ------------------------------- */
static void hb_vmAddInt( HB_ITEM_PTR pResult, HB_LONG lAdd )
static void hb_vmAddInt( PHB_ITEM pResult, HB_LONG lAdd )
{
HB_TRACE(HB_TR_DEBUG, ("hb_vmAddInt(%p,%ld)", pResult, lAdd));
@@ -3117,7 +3117,7 @@ static void hb_vmNegate( void )
}
}
static void hb_vmTimeStampPut( HB_ITEM_PTR pItem, long lJulian, long lMilliSec )
static void hb_vmTimeStampPut( PHB_ITEM pItem, long lJulian, long lMilliSec )
{
HB_TRACE(HB_TR_DEBUG, ("hb_vmTimeStampPut(%p,%ld,%ld)", pItem, lJulian, lMilliSec));
@@ -3162,7 +3162,7 @@ static void hb_vmTimeStampPut( HB_ITEM_PTR pItem, long lJulian, long lMilliSec )
hb_itemPutTDT( pItem, lJulian, lMilliSec );
}
static void hb_vmTimeStampAdd( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem, double dValue )
static void hb_vmTimeStampAdd( PHB_ITEM pResult, PHB_ITEM pItem, double dValue )
{
long lJulian, lMilliSec;
@@ -3176,7 +3176,7 @@ static void hb_vmTimeStampAdd( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem, double dV
hb_vmTimeStampPut( pResult, lJulian, lMilliSec );
}
static void hb_vmPlus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 )
static void hb_vmPlus( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 )
{
HB_TRACE(HB_TR_DEBUG, ("hb_vmPlus(%p,%p,%p)", pResult, pItem1, pItem2));
@@ -3292,7 +3292,7 @@ static void hb_vmPlus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pIte
}
}
static void hb_vmMinus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 )
static void hb_vmMinus( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 )
{
HB_TRACE(HB_TR_DEBUG, ("hb_vmMinus(%p,%p,%p)", pResult, pItem1, pItem2));
@@ -3401,7 +3401,7 @@ static void hb_vmMinus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pIt
}
}
static void hb_vmMult( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 )
static void hb_vmMult( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 )
{
HB_TRACE(HB_TR_DEBUG, ("hb_vmMult(%p,%p,%p)", pResult, pItem1, pItem2));
@@ -3438,7 +3438,7 @@ static void hb_vmMult( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pIte
}
}
static void hb_vmDivide( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 )
static void hb_vmDivide( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 )
{
HB_TRACE(HB_TR_DEBUG, ("hb_vmDivide(%p,%p,%p)", pResult, pItem1, pItem2));
@@ -3500,7 +3500,7 @@ static void hb_vmDivide( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pI
}
}
static void hb_vmModulus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 )
static void hb_vmModulus( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 )
{
HB_TRACE(HB_TR_DEBUG, ("hb_vmModulus(%p,%p,%p)", pResult, pItem1, pItem2));
@@ -3558,7 +3558,7 @@ static void hb_vmModulus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR p
}
}
static void hb_vmPower( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 )
static void hb_vmPower( PHB_ITEM pResult, PHB_ITEM pItem1, PHB_ITEM pItem2 )
{
HB_TRACE(HB_TR_DEBUG, ("hb_vmPower(%p,%p,%p)", pResult, pItem1, pItem2));
@@ -4618,7 +4618,7 @@ static void hb_vmEnumStart( int nVars, int nDescend )
for( i = ( int ) nVars << 1; i > 0 && fStart; i -= 2 )
{
HB_ITEM_PTR pBase, pValue, pEnumRef, pEnum;
PHB_ITEM pBase, pValue, pEnumRef, pEnum;
pValue = hb_stackItemFromTop( -i );
/* create extended reference for enumerator destructor */
@@ -4715,7 +4715,7 @@ static void hb_vmEnumStart( int nVars, int nDescend )
static void hb_vmEnumNext( void )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR pEnumRef, pEnum, pBase;
PHB_ITEM pEnumRef, pEnum, pBase;
int i;
for( i = ( int ) hb_stackItemFromTop( -1 )->item.asInteger.value; i > 0; --i )
@@ -4795,7 +4795,7 @@ static void hb_vmEnumNext( void )
static void hb_vmEnumPrev( void )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR pEnumRef, pEnum, pBase;
PHB_ITEM pEnumRef, pEnum, pBase;
int i;
for( i = hb_stackItemFromTop( -1 )->item.asInteger.value; i > 0; --i )
@@ -4893,7 +4893,7 @@ static PHB_ITEM hb_vmSwitchGet( void )
if( !( HB_IS_NUMINT( pSwitch ) || HB_IS_STRING( pSwitch ) ) )
{
HB_ITEM_PTR pResult = hb_errRT_BASE_Subst( EG_ARG, 3104, NULL, "SWITCH", 1, pSwitch );
PHB_ITEM pResult = hb_errRT_BASE_Subst( EG_ARG, 3104, NULL, "SWITCH", 1, pSwitch );
if( !pResult )
return NULL;
@@ -4908,7 +4908,7 @@ static PHB_ITEM hb_vmSwitchGet( void )
static const HB_BYTE * hb_vmSwitch( const HB_BYTE * pCode, HB_USHORT casesCnt )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR pSwitch = hb_vmSwitchGet();
PHB_ITEM pSwitch = hb_vmSwitchGet();
if( pSwitch )
{
@@ -5386,11 +5386,11 @@ static void hb_vmArrayGen( HB_SIZE nElements ) /* generates an nElements Array a
/* This function creates an array item using 'uiDimension' as an index
* to retrieve the number of elements from the stack
*/
static void hb_vmArrayNew( HB_ITEM_PTR pArray, HB_USHORT uiDimension )
static void hb_vmArrayNew( PHB_ITEM pArray, HB_USHORT uiDimension )
{
HB_STACK_TLS_PRELOAD
HB_SIZE nElements;
HB_ITEM_PTR pDim;
PHB_ITEM pDim;
HB_TRACE(HB_TR_DEBUG, ("hb_vmArrayNew(%p, %hu)", pArray, uiDimension));
@@ -5775,8 +5775,8 @@ static HB_ERRCODE hb_vmSelectWorkarea( PHB_ITEM pAlias, PHB_SYMB pField )
static void hb_vmSwapAlias( void )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR pItem;
HB_ITEM_PTR pWorkArea;
PHB_ITEM pItem;
PHB_ITEM pWorkArea;
HB_TRACE(HB_TR_DEBUG, ("hb_vmSwapAlias()"));
@@ -6085,7 +6085,7 @@ static HARBOUR hb_vmDoBlock( void )
/* Evaluates a passed codeblock item with no arguments passed to a codeblock
*/
HB_ITEM_PTR hb_vmEvalBlock( HB_ITEM_PTR pBlock )
PHB_ITEM hb_vmEvalBlock( PHB_ITEM pBlock )
{
HB_STACK_TLS_PRELOAD
@@ -6105,7 +6105,7 @@ HB_ITEM_PTR hb_vmEvalBlock( HB_ITEM_PTR pBlock )
* for example:
* retVal = hb_vmEvalBlockV( pBlock, 2, pParam1, pParam2 );
*/
HB_ITEM_PTR hb_vmEvalBlockV( HB_ITEM_PTR pBlock, HB_ULONG ulArgCount, ... )
PHB_ITEM hb_vmEvalBlockV( PHB_ITEM pBlock, HB_ULONG ulArgCount, ... )
{
HB_STACK_TLS_PRELOAD
va_list va;
@@ -7079,7 +7079,7 @@ static void hb_vmPushLocal( int iLocal )
static void hb_vmPushLocalByRef( int iLocal )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR pTop;
PHB_ITEM pTop;
HB_TRACE(HB_TR_DEBUG, ("hb_vmPushLocalByRef(%d)", iLocal));
@@ -7160,9 +7160,9 @@ static void hb_vmPushVariable( PHB_SYMB pVarSymb )
if( hb_rddFieldGet( pItem, pVarSymb ) != HB_SUCCESS &&
hb_memvarGet( pItem, pVarSymb ) != HB_SUCCESS )
{
HB_ITEM_PTR pError = hb_errRT_New( ES_ERROR, NULL, EG_NOVAR, 1003,
NULL, pVarSymb->szName,
0, EF_CANRETRY );
PHB_ITEM pError = hb_errRT_New( ES_ERROR, NULL, EG_NOVAR, 1003,
NULL, pVarSymb->szName,
0, EF_CANRETRY );
while( hb_errLaunch( pError ) == E_RETRY )
{
@@ -7291,7 +7291,7 @@ static void hb_vmPopAliasedField( PHB_SYMB pSym )
static void hb_vmPopAliasedVar( PHB_SYMB pSym )
{
HB_STACK_TLS_PRELOAD
HB_ITEM_PTR pAlias = hb_stackItemFromTop( -1 );
PHB_ITEM pAlias = hb_stackItemFromTop( -1 );
HB_TRACE(HB_TR_DEBUG, ("hb_vmPopAliasedVar(%p)", pSym));

2
harbour/src/vm/itemapi.c
View File

@@ -1937,7 +1937,7 @@ PHB_ITEM hb_itemUnRefOnce( PHB_ITEM pItem )
else
{
/* a reference to a local variable */
HB_ITEM_PTR * pLocal;
PHB_ITEM * pLocal;
pLocal = *( pItem->item.asRefer.BasePtr.itemsbasePtr ) +
pItem->item.asRefer.offset + pItem->item.asRefer.value;

22
harbour/src/vm/macro.c
View File

@@ -151,7 +151,7 @@ void hb_macroDelete( HB_MACRO_PTR pMacro )
/* checks if a correct ITEM was passed from the virtual machine eval stack
*/
static HB_BOOL hb_macroCheckParam( HB_ITEM_PTR pItem )
static HB_BOOL hb_macroCheckParam( PHB_ITEM pItem )
{
HB_BOOL bValid = HB_TRUE;
@@ -159,7 +159,7 @@ static HB_BOOL hb_macroCheckParam( HB_ITEM_PTR pItem )
if( ! HB_IS_STRING( pItem ) )
{
HB_ITEM_PTR pResult = hb_errRT_BASE_Subst( EG_ARG, 1065, NULL, "&", 1, pItem );
PHB_ITEM pResult = hb_errRT_BASE_Subst( EG_ARG, 1065, NULL, "&", 1, pItem );
bValid = HB_FALSE;
if( pResult )
@@ -414,7 +414,7 @@ static char * hb_macroTextSubst( const char * szString, HB_SIZE * pnStringLen )
*
*/
void hb_macroGetValue( HB_ITEM_PTR pItem, int iContext, int flags )
void hb_macroGetValue( PHB_ITEM pItem, int iContext, int flags )
{
HB_STACK_TLS_PRELOAD
@@ -501,7 +501,7 @@ void hb_macroGetValue( HB_ITEM_PTR pItem, int iContext, int flags )
* placed on the left side of the assignment
* POP operation
*/
void hb_macroSetValue( HB_ITEM_PTR pItem, int flags )
void hb_macroSetValue( PHB_ITEM pItem, int flags )
{
HB_STACK_TLS_PRELOAD
@@ -545,7 +545,7 @@ void hb_macroSetValue( HB_ITEM_PTR pItem, int flags )
* passed by reference or used in optimized left side of the <op>=
* expression or as argument of ++ or -- operation
*/
void hb_macroPushReference( HB_ITEM_PTR pItem )
void hb_macroPushReference( PHB_ITEM pItem )
{
HB_STACK_TLS_PRELOAD
@@ -592,7 +592,7 @@ void hb_macroPushReference( HB_ITEM_PTR pItem )
* instead of
* &( "M + M" ) -> &( "M + M" )
*/
static void hb_macroUseAliased( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int iFlag, int iSupported )
static void hb_macroUseAliased( PHB_ITEM pAlias, PHB_ITEM pVar, int iFlag, int iSupported )
{
HB_STACK_TLS_PRELOAD
@@ -674,7 +674,7 @@ static void hb_macroUseAliased( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int iFlag,
* &alias->var := any
* alias->&var := any
*/
void hb_macroPopAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int flags )
void hb_macroPopAliasedValue( PHB_ITEM pAlias, PHB_ITEM pVar, int flags )
{
HB_TRACE(HB_TR_DEBUG, ("hb_macroPopAliasedValue(%p, %p)", pAlias, pVar));
@@ -686,7 +686,7 @@ void hb_macroPopAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int flags )
* any := &alias->var
* any := alias->&var
*/
void hb_macroPushAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int flags )
void hb_macroPushAliasedValue( PHB_ITEM pAlias, PHB_ITEM pVar, int flags )
{
HB_TRACE(HB_TR_DEBUG, ("hb_macroPushAliasedValue(%p, %p)", pAlias, pVar));
@@ -855,7 +855,7 @@ HB_FUNC( HB_MACROBLOCK )
* 'pItem' points to a ITEM that contains a string value which after
* text substitution will return a function name
*/
void hb_macroPushSymbol( HB_ITEM_PTR pItem )
void hb_macroPushSymbol( PHB_ITEM pItem )
{
HB_STACK_TLS_PRELOAD
HB_TRACE(HB_TR_DEBUG, ("hb_macroPushSymbol(%p)", pItem));
@@ -898,7 +898,7 @@ void hb_macroPushSymbol( HB_ITEM_PTR pItem )
* 'pItem' points to a ITEM that contains a string value which after
* text substitution will be returned
*/
void hb_macroTextValue( HB_ITEM_PTR pItem )
void hb_macroTextValue( PHB_ITEM pItem )
{
HB_TRACE(HB_TR_DEBUG, ("hb_macroTextValue(%p)", pItem));
@@ -923,7 +923,7 @@ void hb_macroTextValue( HB_ITEM_PTR pItem )
}
}
const char * hb_macroGetType( HB_ITEM_PTR pItem )
const char * hb_macroGetType( PHB_ITEM pItem )
{
HB_STACK_TLS_PRELOAD
const char * szType;

2
harbour/src/vm/maindllp/dllext.c
View File

@@ -1030,7 +1030,7 @@ void * hb_xrealloc( void * pMem, HB_SIZE nSize )
return s_xrealloc ? s_xrealloc( pMem, nSize ) : NULL;
}
void hb_macroTextValue( HB_ITEM_PTR pItem )
void hb_macroTextValue( PHB_ITEM pItem )
{
static HB_MACROTEXTVALUE s_macroTextValue = NULL;

30
harbour/src/vm/memvars.c
View File

@@ -159,7 +159,7 @@ static void hb_memvarDetachDynSym( PHB_DYNS pDynSym, PHB_ITEM pPrevMemvar )
/*
* Detach local variable (swap current value with a memvar handle)
*/
HB_ITEM_PTR hb_memvarDetachLocal( PHB_ITEM pLocal )
PHB_ITEM hb_memvarDetachLocal( PHB_ITEM pLocal )
{
HB_TRACE(HB_TR_DEBUG, ("hb_memvarDetachLocal(%p)", pLocal));
@@ -362,7 +362,7 @@ static void hb_memvarResetPrivatesBase( void )
* pItem - value to store in memvar
*
*/
void hb_memvarSetValue( PHB_SYMB pMemvarSymb, HB_ITEM_PTR pItem )
void hb_memvarSetValue( PHB_SYMB pMemvarSymb, PHB_ITEM pItem )
{
PHB_DYNS pDyn;
@@ -395,7 +395,7 @@ void hb_memvarSetValue( PHB_SYMB pMemvarSymb, HB_ITEM_PTR pItem )
hb_errInternal( HB_EI_MVBADSYMBOL, NULL, pMemvarSymb->szName, NULL );
}
HB_ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
HB_ERRCODE hb_memvarGet( PHB_ITEM pItem, PHB_SYMB pMemvarSymb )
{
PHB_DYNS pDyn;
HB_ERRCODE bSuccess = HB_FAILURE;
@@ -429,7 +429,7 @@ HB_ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
return bSuccess;
}
void hb_memvarGetValue( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
void hb_memvarGetValue( PHB_ITEM pItem, PHB_SYMB pMemvarSymb )
{
HB_TRACE(HB_TR_DEBUG, ("hb_memvarGetValue(%p, %p)", pItem, pMemvarSymb));
@@ -438,7 +438,7 @@ void hb_memvarGetValue( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
/* Generate an error with retry possibility
* (user created error handler can create this variable)
*/
HB_ITEM_PTR pError;
PHB_ITEM pError;
pError = hb_errRT_New( ES_ERROR, NULL, EG_NOVAR, 1003,
NULL, pMemvarSymb->szName, 0, EF_CANRETRY );
@@ -453,7 +453,7 @@ void hb_memvarGetValue( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
}
}
void hb_memvarGetRefer( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
void hb_memvarGetRefer( PHB_ITEM pItem, PHB_SYMB pMemvarSymb )
{
PHB_DYNS pDyn;
@@ -485,7 +485,7 @@ void hb_memvarGetRefer( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
/* Generate an error with retry possibility
* (user created error handler can make this variable accessible)
*/
HB_ITEM_PTR pError;
PHB_ITEM pError;
pError = hb_errRT_New( ES_ERROR, NULL, EG_NOVAR, 1003,
NULL, pMemvarSymb->szName, 0, EF_CANRETRY );
@@ -700,7 +700,7 @@ static void hb_memvarCreateFromDynSymbol( PHB_DYNS pDynVar, int iScope, PHB_ITEM
* It also restores the value that was hidden if there is another
* PRIVATE variable with the same name.
*/
static void hb_memvarRelease( HB_ITEM_PTR pMemvar )
static void hb_memvarRelease( PHB_ITEM pMemvar )
{
HB_TRACE(HB_TR_DEBUG, ("hb_memvarRelease(%p)", pMemvar));
@@ -935,7 +935,7 @@ static HB_DYNS_FUNC( hb_memvarFindPublicByPos )
* Both pointers points to existing and used data - they shouldn't be
* deallocated.
*/
static HB_ITEM_PTR hb_memvarDebugVariable( int iScope, int iPos, const char ** pszName )
static PHB_ITEM hb_memvarDebugVariable( int iScope, int iPos, const char ** pszName )
{
PHB_ITEM pValue = NULL;
*pszName = NULL;
@@ -1220,7 +1220,7 @@ HB_FUNC( __MVDBGINFO )
else if( iCount > 2 ) /* request for a value of variable */
{
HB_ITEM_PTR pValue;
PHB_ITEM pValue;
const char * szName;
pValue = hb_memvarDebugVariable( hb_parni( 1 ), hb_parni( 2 ), &szName );
@@ -1248,7 +1248,7 @@ HB_FUNC( __MVEXIST )
HB_FUNC( __MVGET )
{
HB_ITEM_PTR pName = hb_param( 1, HB_IT_STRING );
PHB_ITEM pName = hb_param( 1, HB_IT_STRING );
if( pName )
{
@@ -1269,7 +1269,7 @@ HB_FUNC( __MVGET )
/* Generate an error with retry possibility
* (user created error handler can create this variable)
*/
HB_ITEM_PTR pError;
PHB_ITEM pError;
pError = hb_errRT_New( ES_ERROR, NULL, EG_NOVAR, 1003,
NULL, pName->item.asString.value, 0, EF_CANRETRY );
@@ -1303,8 +1303,8 @@ HB_FUNC( __MVGET )
HB_FUNC( __MVPUT )
{
HB_ITEM_PTR pName = hb_param( 1, HB_IT_STRING );
HB_ITEM_PTR pValue = hb_paramError( 2 );
PHB_ITEM pName = hb_param( 1, HB_IT_STRING );
PHB_ITEM pValue = hb_paramError( 2 );
if( pName )
{
@@ -1334,7 +1334,7 @@ HB_FUNC( __MVPUT )
* (it must be a string)
* This is not a critical error - we can continue normal processing
*/
HB_ITEM_PTR pRetValue = hb_errRT_BASE_Subst( EG_ARG, 3010, NULL, NULL, HB_ERR_ARGS_BASEPARAMS );
PHB_ITEM pRetValue = hb_errRT_BASE_Subst( EG_ARG, 3010, NULL, NULL, HB_ERR_ARGS_BASEPARAMS );
if( pRetValue )
hb_itemRelease( pRetValue );