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

core/contrib: whitespace/minor [ci skip]

Browse Source
This commit is contained in:
Viktor Szakats
2017-09-11 19:56:57 +00:00
parent 2e235ee4d8
commit ff3fbd8e40
29 changed files with 385 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/common/expropt1.c
View File

@@ -119,64 +119,64 @@ static const char * s_OperTable[ HB_EXPR_COUNT ] = {
* HB_ET_NONE is used for invalid syntax, e.g. var := var1 += 2
*/
static const HB_BYTE s_PrecedTable[ HB_EXPR_COUNT ] = {
HB_ET_NIL, /* HB_ET_NONE = 0, */
HB_ET_NIL, /* HB_ET_NIL, */
HB_ET_NIL, /* HB_ET_NUMERIC, */
HB_ET_NIL, /* HB_ET_DATE, */
HB_ET_NIL, /* HB_ET_TIMESTAMP, */
HB_ET_NIL, /* HB_ET_STRING, */
HB_ET_NIL, /* HB_ET_CODEBLOCK, */
HB_ET_NIL, /* HB_ET_LOGICAL, */
HB_ET_NIL, /* HB_ET_SELF, */
HB_ET_NIL, /* HB_ET_ARRAY, */
HB_ET_NIL, /* HB_ET_HASH, */
HB_ET_NIL, /* HB_ET_FUNREF, */
HB_ET_NIL, /* HB_ET_VARREF, */
HB_ET_NIL, /* HB_ET_REFERENCE, */
HB_ET_NIL, /* HB_ET_IIF, */
HB_ET_NIL, /* HB_ET_LIST, */
HB_ET_NIL, /* HB_ET_ARGLIST, */
HB_ET_NIL, /* HB_ET_MACROARGLIST,*/
HB_ET_NIL, /* HB_ET_ARRAYAT, */
HB_ET_NIL, /* HB_ET_MACRO, */
HB_ET_NIL, /* HB_ET_FUNCALL, */
HB_ET_NIL, /* HB_ET_ALIASVAR, */
HB_ET_NIL, /* HB_ET_ALIASEXPR, */
HB_ET_NIL, /* HB_ET_SETGET, */
HB_ET_NIL, /* HB_ET_SEND, */
HB_ET_NIL, /* HB_ET_FUNNAME, */
HB_ET_NIL, /* HB_ET_ALIAS, */
HB_ET_NIL, /* HB_ET_RTVARIABLE, */
HB_ET_NIL, /* HB_ET_VARIABLE, */
HB_ET_NIL, /* HB_EO_POSTINC, post-operators */
HB_ET_NIL, /* HB_EO_POSTDEC, */
HB_ET_NONE, /* HB_EO_ASSIGN, assignments */
HB_ET_NONE, /* HB_EO_PLUSEQ, Invalid syntax */
HB_ET_NONE, /* HB_EO_MINUSEQ, */
HB_ET_NONE, /* HB_EO_MULTEQ, */
HB_ET_NONE, /* HB_EO_DIVEQ, */
HB_ET_NONE, /* HB_EO_MODEQ, */
HB_ET_NONE, /* HB_EO_EXPEQ, */
HB_EO_OR, /* HB_EO_OR, logical operators */
HB_EO_AND, /* HB_EO_AND, */
HB_ET_NIL, /* HB_EO_NOT, */
HB_EO_EQUAL, /* HB_EO_EQUAL, relational operators */
HB_EO_EQUAL, /* HB_EO_EQ, */
HB_EO_EQUAL, /* HB_EO_NE, */
HB_EO_LT, /* HB_EO_IN, */
HB_EO_LT, /* HB_EO_LT, */
HB_EO_LT, /* HB_EO_GT, */
HB_EO_LT, /* HB_EO_LE, */
HB_EO_LT, /* HB_EO_GE, */
HB_EO_PLUS, /* HB_EO_PLUS, addition */
HB_EO_PLUS, /* HB_EO_MINUS, */
HB_EO_MULT, /* HB_EO_MULT, multiple */
HB_EO_MULT, /* HB_EO_DIV, */
HB_EO_MULT, /* HB_EO_MOD, */
HB_EO_POWER, /* HB_EO_POWER, */
HB_ET_NIL, /* HB_EO_NEGATE, sign operator */
HB_ET_NIL, /* HB_EO_PREINC, */
HB_ET_NIL /* HB_EO_PREDEC, pre-operators */
HB_ET_NIL, /* HB_ET_NONE = 0, */
HB_ET_NIL, /* HB_ET_NIL, */
HB_ET_NIL, /* HB_ET_NUMERIC, */
HB_ET_NIL, /* HB_ET_DATE, */
HB_ET_NIL, /* HB_ET_TIMESTAMP, */
HB_ET_NIL, /* HB_ET_STRING, */
HB_ET_NIL, /* HB_ET_CODEBLOCK, */
HB_ET_NIL, /* HB_ET_LOGICAL, */
HB_ET_NIL, /* HB_ET_SELF, */
HB_ET_NIL, /* HB_ET_ARRAY, */
HB_ET_NIL, /* HB_ET_HASH, */
HB_ET_NIL, /* HB_ET_FUNREF, */
HB_ET_NIL, /* HB_ET_VARREF, */
HB_ET_NIL, /* HB_ET_REFERENCE, */
HB_ET_NIL, /* HB_ET_IIF, */
HB_ET_NIL, /* HB_ET_LIST, */
HB_ET_NIL, /* HB_ET_ARGLIST, */
HB_ET_NIL, /* HB_ET_MACROARGLIST,*/
HB_ET_NIL, /* HB_ET_ARRAYAT, */
HB_ET_NIL, /* HB_ET_MACRO, */
HB_ET_NIL, /* HB_ET_FUNCALL, */
HB_ET_NIL, /* HB_ET_ALIASVAR, */
HB_ET_NIL, /* HB_ET_ALIASEXPR, */
HB_ET_NIL, /* HB_ET_SETGET, */
HB_ET_NIL, /* HB_ET_SEND, */
HB_ET_NIL, /* HB_ET_FUNNAME, */
HB_ET_NIL, /* HB_ET_ALIAS, */
HB_ET_NIL, /* HB_ET_RTVARIABLE, */
HB_ET_NIL, /* HB_ET_VARIABLE, */
HB_ET_NIL, /* HB_EO_POSTINC, post-operators */
HB_ET_NIL, /* HB_EO_POSTDEC, */
HB_ET_NONE, /* HB_EO_ASSIGN, assignments */
HB_ET_NONE, /* HB_EO_PLUSEQ, Invalid syntax */
HB_ET_NONE, /* HB_EO_MINUSEQ, */
HB_ET_NONE, /* HB_EO_MULTEQ, */
HB_ET_NONE, /* HB_EO_DIVEQ, */
HB_ET_NONE, /* HB_EO_MODEQ, */
HB_ET_NONE, /* HB_EO_EXPEQ, */
HB_EO_OR, /* HB_EO_OR, logical operators */
HB_EO_AND, /* HB_EO_AND, */
HB_ET_NIL, /* HB_EO_NOT, */
HB_EO_EQUAL, /* HB_EO_EQUAL, relational operators */
HB_EO_EQUAL, /* HB_EO_EQ, */
HB_EO_EQUAL, /* HB_EO_NE, */
HB_EO_LT, /* HB_EO_IN, */
HB_EO_LT, /* HB_EO_LT, */
HB_EO_LT, /* HB_EO_GT, */
HB_EO_LT, /* HB_EO_LE, */
HB_EO_LT, /* HB_EO_GE, */
HB_EO_PLUS, /* HB_EO_PLUS, addition */
HB_EO_PLUS, /* HB_EO_MINUS, */
HB_EO_MULT, /* HB_EO_MULT, multiple */
HB_EO_MULT, /* HB_EO_DIV, */
HB_EO_MULT, /* HB_EO_MOD, */
HB_EO_POWER, /* HB_EO_POWER, */
HB_ET_NIL, /* HB_EO_NEGATE, sign operator */
HB_ET_NIL, /* HB_EO_PREINC, */
HB_ET_NIL /* HB_EO_PREDEC, pre-operators */
};
/* ************************************************************************* */
@@ -1285,7 +1285,7 @@ PHB_EXPR hb_compExprMacroAsAlias( PHB_EXPR pExpr )
return pExpr;
}
/* Return a number of elements on the linked list
/* Return a number of elements on the linked list
*/
HB_ULONG hb_compExprListLen( PHB_EXPR pExpr )
{
@@ -1319,7 +1319,7 @@ HB_BOOL hb_compExprListTypeCheck( PHB_EXPR pExpr, HB_EXPRTYPE ExprType )
return HB_FALSE;
}
/* Return a number of parameters passed to function or method
/* Return a number of parameters passed to function or method
*/
HB_ULONG hb_compExprParamListLen( PHB_EXPR pExpr )
{
@@ -1344,7 +1344,7 @@ HB_ULONG hb_compExprParamListLen( PHB_EXPR pExpr )
return nLen;
}
/* Check if expression is hb_ArrayToParams( aParams ) function call
/* Check if expression is hb_ArrayToParams( aParams ) function call
*/
HB_BOOL hb_compExprIsArrayToParams( PHB_EXPR pExpr )
{

20
src/common/hbstr.c
View File

@@ -371,16 +371,16 @@ char * hb_xstrcpy( char * szDest, const char * szSrc, ... )
static double hb_numPow10( int nPrecision )
{
static const double s_dPow10[ 16 ] = { 1.0, /* 0 */
10.0, /* 1 */
100.0, /* 2 */
1000.0, /* 3 */
10000.0, /* 4 */
100000.0, /* 5 */
1000000.0, /* 6 */
10000000.0, /* 7 */
100000000.0, /* 8 */
1000000000.0, /* 9 */
static const double s_dPow10[ 16 ] = { 1.0, /* 0 */
10.0, /* 1 */
100.0, /* 2 */
1000.0, /* 3 */
10000.0, /* 4 */
100000.0, /* 5 */
1000000.0, /* 6 */
10000000.0, /* 7 */
100000000.0, /* 8 */
1000000000.0, /* 9 */
10000000000.0, /* 10 */
100000000000.0, /* 11 */
1000000000000.0, /* 12 */

4
src/compiler/hbmain.c
View File

@@ -1693,7 +1693,9 @@ static void hb_compOptimizeFrames( HB_COMP_DECL, PHB_HFUNC pFunc )
/* NOTE: For some reason this will not work for the static init
function, so I'm using an ugly hack instead. [vszakats] */
/* if( !( pFunc->funFlags & HB_FUNF_USES_STATICS ) ) */
#if 0
if( !( pFunc->funFlags & HB_FUNF_USES_STATICS ) )
#endif
if( pFunc->pCode[ 8 ] == HB_P_ENDPROC )
{
pFunc->nPCodePos -= 3;

4
src/compiler/hbopt.c
View File

@@ -966,7 +966,7 @@ static HB_BOOL hb_compIsUncondJump( HB_BYTE bPCode )
return bPCode == HB_P_JUMPNEAR ||
bPCode == HB_P_JUMP ||
bPCode == HB_P_JUMPFAR;
/* || bPCode == HB_P_SEQEND;
/* || bPCode == HB_P_SEQEND;
BEGIN SEQUENCE/END SEQUENCE logic could not be processed using conditional/unconditional
jumps. I set HB_P_SEQEND as conditional jump though this PCode instruction is processed
as unconditional jump by Harbour VM. This hack solves 'Variable is assigned but not used'
@@ -1579,7 +1579,7 @@ static void hb_compPCodeEnumRenumberLocals( PHB_HFUNC pFunc, PHB_OPT_LOCAL pLoca
{
isVar = pLocals[ isVar - 1 ].isNumber;
assert( isVar > 0 ); /* We do not allow removal of detached locals */
assert( isVar > 0 ); /* We do not allow removal of detached locals */
pVar[ 0 ] = HB_LOBYTE( isVar );
pVar[ 1 ] = HB_HIBYTE( isVar );

7
src/rdd/dbffpt/dbffpt1.c
View File

@@ -516,10 +516,9 @@ static HB_ERRCODE hb_fptWriteGCitems( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, HB
if( ( pArea->uiMemoVersion == DB_MEMOVER_FLEX ||
pArea->uiMemoVersion == DB_MEMOVER_CLIP ) &&
/* TODO: check what FLEX/CL53 exactly does in such situations */
/* Tests show that FLEX/CL53 does not reuse larger blocks
* which can leave 8 or less dummy bytes so such problem
* does not exists. [druzus]
*/
/* Tests show that FLEX/CL53 does not reuse larger blocks
which can leave 8 or less dummy bytes so such problem
does not exists. [druzus] */
pGCtable->pGCitems[ i ].ulSize * pArea->ulMemoBlockSize >=
sizeof( FPTBLOCK ) )
{

22
src/rtl/gtcrs/gtcrs.c
View File

@@ -1933,20 +1933,20 @@ static InOutBase * create_ioBase( char * term, int infd, int outfd, int errfd,
ioBase->attr_mask = ( chtype ) -1;
if( has_colors() )
{
/* DOS->CURSES color mapping
/* DOS->CURSES color mapping
DOS -> curses
--------------------------------
0 black -> COLOR_BLACK
1 blue -> COLOR_BLUE
2 green -> COLOR_GREEN
3 cyan -> COLOR_CYAN
4 red -> COLOR_RED
5 magenta -> COLOR_MAGENTA
6 yellow -> COLOR_YELLOW
7 light gray -> COLOR_WHITE
0 black -> COLOR_BLACK
1 blue -> COLOR_BLUE
2 green -> COLOR_GREEN
3 cyan -> COLOR_CYAN
4 red -> COLOR_RED
5 magenta -> COLOR_MAGENTA
6 yellow -> COLOR_YELLOW
7 light gray -> COLOR_WHITE
8 gray -> BOLD/BLINK BLACK
9 light blue -> BOLD/BLINK BLUE
8 gray -> BOLD/BLINK BLACK
9 light blue -> BOLD/BLINK BLUE
10 light green -> BOLD/BLINK GREEN
11 light cyan -> BOLD/BLINK CYAN
12 light red -> BOLD/BLINK RED

4
src/rtl/gtdos/gtdos.c
View File

@@ -1107,7 +1107,7 @@ static void vmode43x80( void )
{
union REGS regs;
regs.HB_XREGS.ax = 0x1201; /* select 350 scan line mode */
regs.HB_XREGS.ax = 0x1201; /* select 350 scan line mode */
regs.h.bl = 0x30;
HB_DOS_INT86( INT_VIDEO, &regs, &regs );
regs.HB_XREGS.ax = 0x0003; /* mode in AL, if higher bit is on, No CLS */
@@ -1126,7 +1126,7 @@ static void vmode50x80( void )
{
union REGS regs;
regs.HB_XREGS.ax = 0x1202; /* select 400 scan line mode */
regs.HB_XREGS.ax = 0x1202; /* select 400 scan line mode */
regs.h.bl = 0x30;
HB_DOS_INT86( INT_VIDEO, &regs, &regs );
regs.HB_XREGS.ax = 0x0003; /* mode in AL, if bit 7 is on, No CLS */

6
src/rtl/gtkeycod.c
View File

@@ -328,12 +328,12 @@ int hb_gt_dos_keyCodeTranslate( int iKey, int iFlags, PHB_CODEPAGE cdp )
iFlags |= iKeyPad;
break;
case 370: /* Ctrl + Print */
case 370: /* Ctrl + Print */
iKey = HB_KX_PRTSCR;
iFlags |= HB_KF_CTRL;
break;
case 371: /* Ctrl + Left arrow */
case 371: /* Ctrl + Left arrow */
iKey = HB_KX_LEFT;
iFlags |= HB_KF_CTRL | iKeyPad;
break;
@@ -357,7 +357,7 @@ int hb_gt_dos_keyCodeTranslate( int iKey, int iFlags, PHB_CODEPAGE cdp )
iKey = HB_KX_PGUP;
iFlags |= HB_KF_CTRL | iKeyPad;
break;
case 397: /* Ctrl + Up arrow */
case 397: /* Ctrl + Up arrow */
iKey = HB_KX_UP;
iFlags |= HB_KF_CTRL | iKeyPad;
break;

136
src/rtl/inkeyapi.c
View File

@@ -109,74 +109,74 @@ static const HB_KEY_VALUE s_transKeyFun[] = {
};
static const HB_KEY_VALUE s_transKeyStd[] = {
{ K_SPACE, 0, 0, 0 }, /* 32 */
{ '!', 0, 0, 0 }, /* 33 */
{ '"', 0, 0, 0 }, /* 34 */
{ '#', 0, 0, 0 }, /* 35 */
{ '$', 0, 0, 0 }, /* 36 */
{ '%', 0, 0, 0 }, /* 37 */
{ '&', 0, 0, 0 }, /* 38 */
{ '\'', K_ALT_QUOTE, 7, 0 }, /* 39 */
{ '(', 0, 0, 0 }, /* 40 */
{ ')', 0, 0, 0 }, /* 41 */
{ '*', 0, 0, 0 }, /* 42 */
{ '+', 0, 0, 0 }, /* 43 */
{ ',', K_ALT_COMMA, 0, 0 }, /* 44 */
{ '-', K_ALT_MINUS, 31, 0 }, /* 45 */
{ '.', K_ALT_PERIOD, 0, 0 }, /* 46 */
{ '/', K_CTRL_QUESTION, K_CTRL_BS, 0 }, /* 47 */
{ '0', K_ALT_0, 0, 0 }, /* 48 */
{ '1', K_ALT_1, 0, 0 }, /* 49 */
{ '2', K_ALT_2, 259, 0 }, /* 50 */
{ '3', K_ALT_3, 27, 0 }, /* 51 */
{ '4', K_ALT_4, 28, 0 }, /* 52 */
{ '5', K_ALT_5, 29, 0 }, /* 53 */
{ '6', K_ALT_6, 30, 0 }, /* 54 */
{ '7', K_ALT_7, 31, 0 }, /* 55 */
{ '8', K_ALT_8, 127, 0 }, /* 56 */
{ '9', K_ALT_9, 0, 0 }, /* 57 */
{ ':', 0, 0, 0 }, /* 58 */
{ ';', K_ALT_SC, 0, 0 }, /* 59 */
{ '<', 0, 0, 0 }, /* 60 */
{ '=', K_ALT_EQUALS, 0, 0 }, /* 61 */
{ '>', 0, 0, 0 }, /* 62 */
{ '?', 0, K_CTRL_QUESTION, 0 }, /* 63 */
{ '@', 0, 259, 0 }, /* 64 */
{ 'A', K_ALT_A, K_CTRL_A, 0 }, /* 65 */
{ 'B', K_ALT_B, K_CTRL_B, 0 }, /* 66 */
{ 'C', K_ALT_C, K_CTRL_C, 0 }, /* 67 */
{ 'D', K_ALT_D, K_CTRL_D, 0 }, /* 68 */
{ 'E', K_ALT_E, K_CTRL_E, 0 }, /* 69 */
{ 'F', K_ALT_F, K_CTRL_F, 0 }, /* 70 */
{ 'G', K_ALT_G, K_CTRL_G, 0 }, /* 71 */
{ 'H', K_ALT_H, K_CTRL_H, 0 }, /* 72 */
{ 'I', K_ALT_I, K_CTRL_I, 0 }, /* 73 */
{ 'J', K_ALT_J, K_CTRL_J, 0 }, /* 74 */
{ 'K', K_ALT_K, K_CTRL_K, 0 }, /* 75 */
{ 'L', K_ALT_L, K_CTRL_L, 0 }, /* 76 */
{ 'M', K_ALT_M, K_CTRL_M, 0 }, /* 77 */
{ 'N', K_ALT_N, K_CTRL_N, 0 }, /* 78 */
{ 'O', K_ALT_O, K_CTRL_O, 0 }, /* 79 */
{ 'P', K_ALT_P, K_CTRL_P, 0 }, /* 80 */
{ 'Q', K_ALT_Q, K_CTRL_Q, 0 }, /* 81 */
{ 'R', K_ALT_R, K_CTRL_R, 0 }, /* 82 */
{ 'S', K_ALT_S, K_CTRL_S, 0 }, /* 83 */
{ 'T', K_ALT_T, K_CTRL_T, 0 }, /* 84 */
{ 'U', K_ALT_U, K_CTRL_U, 0 }, /* 85 */
{ 'V', K_ALT_V, K_CTRL_V, 0 }, /* 86 */
{ 'W', K_ALT_W, K_CTRL_W, 0 }, /* 87 */
{ 'X', K_ALT_X, K_CTRL_X, 0 }, /* 88 */
{ 'Y', K_ALT_Y, K_CTRL_Y, 0 }, /* 89 */
{ 'Z', K_ALT_Z, K_CTRL_Z, 0 }, /* 90 */
{ '[', K_ALT_OSB, 27, 0 }, /* 91 */
{ '\\', K_ALT_BACKSLASH, 28, 0 }, /* 92 */
{ ']', K_ALT_CSB, 29, 0 }, /* 93 */
{ '^', K_ALT_6, 30, 0 }, /* 94 */
{ '_', K_ALT_MINUS, 31, 0 }, /* 95 */
{ '`', K_ALT_BACKQUOTE, K_ALT_BACKQUOTE, 0 }, /* 96 */
{ 'a', K_ALT_A, K_CTRL_A, 0 }, /* 97 */
{ 'b', K_ALT_B, K_CTRL_B, 0 }, /* 98 */
{ 'c', K_ALT_C, K_CTRL_C, 0 }, /* 99 */
{ K_SPACE, 0, 0, 0 }, /* 32 */
{ '!', 0, 0, 0 }, /* 33 */
{ '"', 0, 0, 0 }, /* 34 */
{ '#', 0, 0, 0 }, /* 35 */
{ '$', 0, 0, 0 }, /* 36 */
{ '%', 0, 0, 0 }, /* 37 */
{ '&', 0, 0, 0 }, /* 38 */
{ '\'', K_ALT_QUOTE, 7, 0 }, /* 39 */
{ '(', 0, 0, 0 }, /* 40 */
{ ')', 0, 0, 0 }, /* 41 */
{ '*', 0, 0, 0 }, /* 42 */
{ '+', 0, 0, 0 }, /* 43 */
{ ',', K_ALT_COMMA, 0, 0 }, /* 44 */
{ '-', K_ALT_MINUS, 31, 0 }, /* 45 */
{ '.', K_ALT_PERIOD, 0, 0 }, /* 46 */
{ '/', K_CTRL_QUESTION, K_CTRL_BS, 0 }, /* 47 */
{ '0', K_ALT_0, 0, 0 }, /* 48 */
{ '1', K_ALT_1, 0, 0 }, /* 49 */
{ '2', K_ALT_2, 259, 0 }, /* 50 */
{ '3', K_ALT_3, 27, 0 }, /* 51 */
{ '4', K_ALT_4, 28, 0 }, /* 52 */
{ '5', K_ALT_5, 29, 0 }, /* 53 */
{ '6', K_ALT_6, 30, 0 }, /* 54 */
{ '7', K_ALT_7, 31, 0 }, /* 55 */
{ '8', K_ALT_8, 127, 0 }, /* 56 */
{ '9', K_ALT_9, 0, 0 }, /* 57 */
{ ':', 0, 0, 0 }, /* 58 */
{ ';', K_ALT_SC, 0, 0 }, /* 59 */
{ '<', 0, 0, 0 }, /* 60 */
{ '=', K_ALT_EQUALS, 0, 0 }, /* 61 */
{ '>', 0, 0, 0 }, /* 62 */
{ '?', 0, K_CTRL_QUESTION, 0 }, /* 63 */
{ '@', 0, 259, 0 }, /* 64 */
{ 'A', K_ALT_A, K_CTRL_A, 0 }, /* 65 */
{ 'B', K_ALT_B, K_CTRL_B, 0 }, /* 66 */
{ 'C', K_ALT_C, K_CTRL_C, 0 }, /* 67 */
{ 'D', K_ALT_D, K_CTRL_D, 0 }, /* 68 */
{ 'E', K_ALT_E, K_CTRL_E, 0 }, /* 69 */
{ 'F', K_ALT_F, K_CTRL_F, 0 }, /* 70 */
{ 'G', K_ALT_G, K_CTRL_G, 0 }, /* 71 */
{ 'H', K_ALT_H, K_CTRL_H, 0 }, /* 72 */
{ 'I', K_ALT_I, K_CTRL_I, 0 }, /* 73 */
{ 'J', K_ALT_J, K_CTRL_J, 0 }, /* 74 */
{ 'K', K_ALT_K, K_CTRL_K, 0 }, /* 75 */
{ 'L', K_ALT_L, K_CTRL_L, 0 }, /* 76 */
{ 'M', K_ALT_M, K_CTRL_M, 0 }, /* 77 */
{ 'N', K_ALT_N, K_CTRL_N, 0 }, /* 78 */
{ 'O', K_ALT_O, K_CTRL_O, 0 }, /* 79 */
{ 'P', K_ALT_P, K_CTRL_P, 0 }, /* 80 */
{ 'Q', K_ALT_Q, K_CTRL_Q, 0 }, /* 81 */
{ 'R', K_ALT_R, K_CTRL_R, 0 }, /* 82 */
{ 'S', K_ALT_S, K_CTRL_S, 0 }, /* 83 */
{ 'T', K_ALT_T, K_CTRL_T, 0 }, /* 84 */
{ 'U', K_ALT_U, K_CTRL_U, 0 }, /* 85 */
{ 'V', K_ALT_V, K_CTRL_V, 0 }, /* 86 */
{ 'W', K_ALT_W, K_CTRL_W, 0 }, /* 87 */
{ 'X', K_ALT_X, K_CTRL_X, 0 }, /* 88 */
{ 'Y', K_ALT_Y, K_CTRL_Y, 0 }, /* 89 */
{ 'Z', K_ALT_Z, K_CTRL_Z, 0 }, /* 90 */
{ '[', K_ALT_OSB, 27, 0 }, /* 91 */
{ '\\', K_ALT_BACKSLASH, 28, 0 }, /* 92 */
{ ']', K_ALT_CSB, 29, 0 }, /* 93 */
{ '^', K_ALT_6, 30, 0 }, /* 94 */
{ '_', K_ALT_MINUS, 31, 0 }, /* 95 */
{ '`', K_ALT_BACKQUOTE, K_ALT_BACKQUOTE, 0 }, /* 96 */
{ 'a', K_ALT_A, K_CTRL_A, 0 }, /* 97 */
{ 'b', K_ALT_B, K_CTRL_B, 0 }, /* 98 */
{ 'c', K_ALT_C, K_CTRL_C, 0 }, /* 99 */
{ 'd', K_ALT_D, K_CTRL_D, 0 }, /* 100 */
{ 'e', K_ALT_E, K_CTRL_E, 0 }, /* 101 */
{ 'f', K_ALT_F, K_CTRL_F, 0 }, /* 102 */

4
src/rtl/philes.c
View File

@@ -279,8 +279,8 @@ HB_FUNC( HB_FREADLEN )
hb_fsSetFError( uiError );
}
/* NOTE: This function should not return the leading and trailing */
/* (back)slashes. [vszakats] */
/* NOTE: This function should not return the leading and trailing
(back)slashes. [vszakats] */
/* TODO: Xbase++ is able to change to the specified directory. */

2
src/rtl/treport.prg
View File

@@ -811,7 +811,7 @@ METHOD PROCEDURE ExecuteReport() CLASS HBReportForm
// Tack on the spacing for double/triple/etc.
IF ::aReportData[ RPT_SPACING ] > 1
/* Double space problem in REPORT FORM at the bottom of the page */
/* Double space problem in REPORT FORM at the bottom of the page */
IF ::nLinesLeft >= ::aReportData[ RPT_SPACING ] - 1
FOR nLine := 2 TO ::aReportData[ RPT_SPACING ]

6
src/vm/fm.c
View File

@@ -1296,7 +1296,7 @@ HB_SIZE hb_xquery( int iMode )
switch( iMode )
{
case HB_MEM_CHAR: /* (Free Variable Space [KB]) */
case HB_MEM_CHAR: /* (Free Variable Space [KB]) */
#if defined( HB_OS_WIN )
{
MEMORYSTATUS memorystatus;
@@ -1317,7 +1317,7 @@ HB_SIZE hb_xquery( int iMode )
#endif
break;
case HB_MEM_BLOCK: /* (Largest String [KB]) */
case HB_MEM_BLOCK: /* (Largest String [KB]) */
#if defined( HB_OS_WIN )
{
MEMORYSTATUS memorystatus;
@@ -1338,7 +1338,7 @@ HB_SIZE hb_xquery( int iMode )
#endif
break;
case HB_MEM_RUN: /* (RUN Memory [KB]) */
case HB_MEM_RUN: /* (RUN Memory [KB]) */
#if defined( HB_OS_WIN )
{
MEMORYSTATUS memorystatus;

5
src/vm/hvm.c
View File

@@ -3082,10 +3082,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
}
}
/* ------------------------------- */
/* Operators ( mathematical */
/* character / misc ) */
/* ------------------------------- */
/* Operators (mathematical / character / misc) */
static void hb_vmAddInt( PHB_ITEM pResult, HB_LONG lAdd )
{

4
src/vm/memvars.c
View File

@@ -665,8 +665,8 @@ static void hb_memvarCreateFromDynSymbol( PHB_DYNS pDynVar, int iScope, PHB_ITEM
*/
pMemvar->type = HB_IT_LOGICAL;
/* NOTE: PUBLIC variables named CLIPPER and HARBOUR are initialized */
/* to .T., this is normal Clipper behaviour. [vszakats] */
/* NOTE: PUBLIC variables named CLIPPER and HARBOUR are initialized
to .T., this is normal Clipper behaviour. [vszakats] */
pMemvar->item.asLogical.value =
( strcmp( pDynVar->pSymbol->szName, "HARBOUR" ) == 0 ||