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

2016-09-22 15:47 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* include/hbapi.h
  * include/hbvmpub.h
    * removed casting C style casting from commonly used macros

  * contrib/gtqtc/gtqtc1.cpp
    * use C++ casting instead of C casting

  * contrib/rddads/ads1.c
  * contrib/rddads/adsx.c
  * contrib/rddsql/sqlmix.c
  * src/rdd/dbfcdx/dbfcdx1.c
  * src/rdd/dbfnsx/dbfnsx1.c
  * src/rdd/dbfntx/dbfntx1.c
  * src/rdd/dbsql.c
  * src/rdd/workarea.c
    * cleaned HB_IT_* usage

  * contrib/rddads/ads1.c
    ! fixed typo in low level code of ordDescend() / DBOI_ISDESC,
      now ordDescend() should work with ADS* RDDs just like with
      native RDDs

  * contrib/hbfoxpro/relfunc.c
    ! fixed typo in Between() function - thanks to Petr Chorney

  * src/rtl/gtwvt/gtwvt.c
    ! added workaround for keyboard drivers which sets CTRL key modifier
      flag when only ALTGR is pressed - thanks to Maurizio la Cecilia
This commit is contained in:
Przemysław Czerpak
2016-09-22 15:47:08 +02:00
parent 085b9d828e
commit 72016f2bc3
14 changed files with 164 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
include/hbapi.h
View File

@@ -66,37 +66,37 @@ HB_EXTERN_BEGIN
/* items types and type checking macros */
#define HB_IT_NIL ( ( HB_TYPE ) 0x00000 )
#define HB_IT_POINTER ( ( HB_TYPE ) 0x00001 )
#define HB_IT_INTEGER ( ( HB_TYPE ) 0x00002 )
#define HB_IT_HASH ( ( HB_TYPE ) 0x00004 )
#define HB_IT_LONG ( ( HB_TYPE ) 0x00008 )
#define HB_IT_DOUBLE ( ( HB_TYPE ) 0x00010 )
#define HB_IT_DATE ( ( HB_TYPE ) 0x00020 )
#define HB_IT_TIMESTAMP ( ( HB_TYPE ) 0x00040 )
#define HB_IT_LOGICAL ( ( HB_TYPE ) 0x00080 )
#define HB_IT_SYMBOL ( ( HB_TYPE ) 0x00100 )
#define HB_IT_ALIAS ( ( HB_TYPE ) 0x00200 )
#define HB_IT_STRING ( ( HB_TYPE ) 0x00400 )
#define HB_IT_MEMOFLAG ( ( HB_TYPE ) 0x00800 )
#define HB_IT_NIL 0x00000
#define HB_IT_POINTER 0x00001
#define HB_IT_INTEGER 0x00002
#define HB_IT_HASH 0x00004
#define HB_IT_LONG 0x00008
#define HB_IT_DOUBLE 0x00010
#define HB_IT_DATE 0x00020
#define HB_IT_TIMESTAMP 0x00040
#define HB_IT_LOGICAL 0x00080
#define HB_IT_SYMBOL 0x00100
#define HB_IT_ALIAS 0x00200
#define HB_IT_STRING 0x00400
#define HB_IT_MEMOFLAG 0x00800
#define HB_IT_MEMO ( HB_IT_MEMOFLAG | HB_IT_STRING )
#define HB_IT_BLOCK ( ( HB_TYPE ) 0x01000 )
#define HB_IT_BYREF ( ( HB_TYPE ) 0x02000 )
#define HB_IT_MEMVAR ( ( HB_TYPE ) 0x04000 )
#define HB_IT_ARRAY ( ( HB_TYPE ) 0x08000 )
#define HB_IT_ENUM ( ( HB_TYPE ) 0x10000 )
#define HB_IT_EXTREF ( ( HB_TYPE ) 0x20000 )
#define HB_IT_DEFAULT ( ( HB_TYPE ) 0x40000 )
#define HB_IT_RECOVER ( ( HB_TYPE ) 0x80000 )
#define HB_IT_BLOCK 0x01000
#define HB_IT_BYREF 0x02000
#define HB_IT_MEMVAR 0x04000
#define HB_IT_ARRAY 0x08000
#define HB_IT_ENUM 0x10000
#define HB_IT_EXTREF 0x20000
#define HB_IT_DEFAULT 0x40000
#define HB_IT_RECOVER 0x80000
#define HB_IT_OBJECT HB_IT_ARRAY
#define HB_IT_NUMERIC ( ( HB_TYPE ) ( HB_IT_INTEGER | HB_IT_LONG | HB_IT_DOUBLE ) )
#define HB_IT_NUMINT ( ( HB_TYPE ) ( HB_IT_INTEGER | HB_IT_LONG ) )
#define HB_IT_DATETIME ( ( HB_TYPE ) ( HB_IT_DATE | HB_IT_TIMESTAMP ) )
#define HB_IT_ANY ( ( HB_TYPE ) 0xFFFFFFFF )
#define HB_IT_COMPLEX ( ( HB_TYPE ) ( HB_IT_BLOCK | HB_IT_ARRAY | HB_IT_HASH | HB_IT_POINTER | /* HB_IT_MEMVAR | HB_IT_ENUM | HB_IT_EXTREF |*/ HB_IT_BYREF | HB_IT_STRING ) )
#define HB_IT_GCITEM ( ( HB_TYPE ) ( HB_IT_BLOCK | HB_IT_ARRAY | HB_IT_HASH | HB_IT_POINTER | HB_IT_BYREF ) )
#define HB_IT_EVALITEM ( ( HB_TYPE ) ( HB_IT_BLOCK | HB_IT_SYMBOL ) )
#define HB_IT_HASHKEY ( ( HB_TYPE ) ( HB_IT_INTEGER | HB_IT_LONG | HB_IT_DOUBLE | HB_IT_DATE | HB_IT_TIMESTAMP | HB_IT_STRING | HB_IT_POINTER ) )
#define HB_IT_NUMERIC ( HB_IT_INTEGER | HB_IT_LONG | HB_IT_DOUBLE )
#define HB_IT_NUMINT ( HB_IT_INTEGER | HB_IT_LONG )
#define HB_IT_DATETIME ( HB_IT_DATE | HB_IT_TIMESTAMP )
#define HB_IT_ANY 0xFFFFFFFF
#define HB_IT_COMPLEX ( HB_IT_BLOCK | HB_IT_ARRAY | HB_IT_HASH | HB_IT_POINTER | /* HB_IT_MEMVAR | HB_IT_ENUM | HB_IT_EXTREF |*/ HB_IT_BYREF | HB_IT_STRING )
#define HB_IT_GCITEM ( HB_IT_BLOCK | HB_IT_ARRAY | HB_IT_HASH | HB_IT_POINTER | HB_IT_BYREF )
#define HB_IT_EVALITEM ( HB_IT_BLOCK | HB_IT_SYMBOL )
#define HB_IT_HASHKEY ( HB_IT_INTEGER | HB_IT_LONG | HB_IT_DOUBLE | HB_IT_DATE | HB_IT_TIMESTAMP | HB_IT_STRING | HB_IT_POINTER )
#if 0

32
include/hbvmpub.h
View File

@@ -156,7 +156,11 @@ struct _HB_SYMB;
# undef _HB_STACK_MACROS_
/* This is ugly trick but works without speed overhead */
# define HB_ITEM_TYPERAW( p ) ( * ( HB_TYPE * ) ( p ) )
#if defined( __cplusplus )
# define HB_ITEM_TYPERAW( p ) ( * static_cast< HB_TYPE * >( p ) )
#else
# define HB_ITEM_TYPERAW( p ) ( * ( HB_TYPE * ) ( p ) )
#endif
/* if you do not like it then use this definition */
/* # define HB_ITEM_TYPERAW( p ) ( hb_itemType( p ) ) */
@@ -228,19 +232,19 @@ typedef struct _HB_FUNC_LIST
} HB_FUNC_LIST, * PHB_FUNC_LIST;
/* Harbour Functions scope ( HB_SYMBOLSCOPE ) */
#define HB_FS_PUBLIC ( ( HB_SYMBOLSCOPE ) 0x0001 )
#define HB_FS_STATIC ( ( HB_SYMBOLSCOPE ) 0x0002 )
#define HB_FS_FIRST ( ( HB_SYMBOLSCOPE ) 0x0004 )
#define HB_FS_INIT ( ( HB_SYMBOLSCOPE ) 0x0008 )
#define HB_FS_EXIT ( ( HB_SYMBOLSCOPE ) 0x0010 )
#define HB_FS_MESSAGE ( ( HB_SYMBOLSCOPE ) 0x0020 )
#define HB_FS_MEMVAR ( ( HB_SYMBOLSCOPE ) 0x0080 )
#define HB_FS_PCODEFUNC ( ( HB_SYMBOLSCOPE ) 0x0100 )
#define HB_FS_LOCAL ( ( HB_SYMBOLSCOPE ) 0x0200 )
#define HB_FS_DYNCODE ( ( HB_SYMBOLSCOPE ) 0x0400 )
#define HB_FS_DEFERRED ( ( HB_SYMBOLSCOPE ) 0x0800 )
#define HB_FS_FRAME ( ( HB_SYMBOLSCOPE ) 0x1000 )
#define HB_FS_USED ( ( HB_SYMBOLSCOPE ) 0x2000 )
#define HB_FS_PUBLIC 0x0001
#define HB_FS_STATIC 0x0002
#define HB_FS_FIRST 0x0004
#define HB_FS_INIT 0x0008
#define HB_FS_EXIT 0x0010
#define HB_FS_MESSAGE 0x0020
#define HB_FS_MEMVAR 0x0080
#define HB_FS_PCODEFUNC 0x0100
#define HB_FS_LOCAL 0x0200
#define HB_FS_DYNCODE 0x0400
#define HB_FS_DEFERRED 0x0800
#define HB_FS_FRAME 0x1000
#define HB_FS_USED 0x2000
#define HB_FS_INITEXIT ( HB_FS_INIT | HB_FS_EXIT )