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

ChangeLog 20000507-14:15 GMT+1

Browse Source
This commit is contained in:
Ryszard Glab
2000-05-07 11:57:32 +00:00
parent ea269fabd5
commit 902545e657
5 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -1,3 +1,13 @@
20000507-14:05 GMT+1 Ryszard Glab <rglab@imid.med.pl>
*include/hbapi.h
*include/hbmacro.h
*source/rtl/macro.c
*source/rtl/memvars.c
* hb_memvarScope() function has now a global scope
* fixed the value returned by TYPE() function for variables
not visible at runtime (now returns 'U' instead of 'UE')
20000507-09:40 GMT+1 Victor Szakats <info@szelvesz.hu>
* tests/gnu_test.bat

1
harbour/include/hbapi.h
View File

@@ -449,6 +449,7 @@ extern void hb_memvarSetPrivatesBase( ULONG );
extern void hb_memvarNewParameter( PHB_SYMB, HB_ITEM_PTR );
extern char * hb_memvarGetStrValuePtr( char *, ULONG * );
extern void hb_memvarCreateFromItem( PHB_ITEM pMemvar, BYTE bScope, PHB_ITEM pValue );
extern int hb_memvarScope( char *, ULONG );
/* console I/O subsystem */
extern void hb_conInit( void );

1
harbour/include/hbmacro.h
View File

@@ -78,6 +78,7 @@ extern "C" {
#define HB_MACRO_TOO_COMPLEX 2 /* compiled expression is too complex */
#define HB_MACRO_UDF 4 /* code uses UDF function (info used by TYPE function) */
#define HB_MACRO_UNKN_SYM 8 /* requested symbol was not found in runtime symbol table */
#define HB_MACRO_UNKN_VAR 16 /* requested variable doesn't exist */

61
harbour/source/vm/macro.c
View File

@@ -39,6 +39,7 @@
#include "hbmacro.h"
#include "hbcomp.h"
#include "hbmemvar.ch" /* for values returned by hb_memvarScope() */
/* TODO:
* include this variable in SET subsystem ?
@@ -46,6 +47,7 @@
BOOL hb_comp_bShortCuts = TRUE; /* .and. & .or. expressions shortcuts */
static void hb_macroUseAliased( HB_ITEM_PTR, HB_ITEM_PTR, int );
static void hb_compMemvarCheck( char * szVarName, HB_MACRO_DECL );
/* ************************************************************************* */
@@ -666,16 +668,17 @@ char * hb_macroGetType( HB_ITEM_PTR pItem )
{
/* passed string was successfully compiled
*/
if( struMacro.exprType == HB_ET_CODEBLOCK )
{
/* Clipper ignores any undeclared symbols or UDFs if the
* compiled expression is a valid codeblock
*/
szType ="B";
}
else if( struMacro.status & HB_MACRO_UNKN_SYM )
if( struMacro.exprType == HB_ET_CODEBLOCK )
{
/* Clipper ignores any undeclared symbols or UDFs if the
* compiled expression is a valid codeblock
*/
szType ="B";
}
else if( struMacro.status & ( HB_MACRO_UNKN_SYM | HB_MACRO_UNKN_VAR) )
{
/* request for a symbol that is not in a symbol table
/* request for a symbol that is not in a symbol table or
* for a variable that is not visible
*/
szType = "U";
}
@@ -815,6 +818,25 @@ ULONG hb_compGenJumpTrue( LONG lOffset, HB_MACRO_DECL )
return HB_PCODE_DATA->lPCodePos - 2;
}
/* Checks if there is a visible memvar variable
* szVarName = variable name
*/
static void hb_compMemvarCheck( char * szVarName, HB_MACRO_DECL )
{
if( !( HB_MACRO_DATA->status & (HB_MACRO_UNKN_VAR | HB_MACRO_UNKN_SYM) ) )
{
/* checking for variable is quite expensive than don't check it
* if there are already some undefined symbols or variables
*/
if( hb_memvarScope( szVarName, strlen( szVarName ) ) <= HB_MV_ERROR )
{
/* there is no memvar variable visible at this moment */
HB_MACRO_DATA->status |= HB_MACRO_UNKN_VAR;
HB_MACRO_DATA->status &= ~HB_MACRO_CONT; /* don't run this pcode */
}
}
}
/*
* Function generates pcode for passed memvar name
*/
@@ -931,11 +953,8 @@ void hb_compGenPopVar( char * szVarName, HB_MACRO_DECL )
}
else
{
/* NOTE: In clipper all undeclared variables are assumed MEMVAR if
* they are popped however there is nno such assumption if avariable
* is pushed on the eval stack
*/
hb_compMemvarGenPCode( HB_P_MPOPMEMVAR, szVarName, HB_MACRO_PARAM );
hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
}
}
@@ -956,6 +975,7 @@ void hb_compGenPopAliasedVar( char * szVarName,
if( szAlias[ 0 ] == 'M' && szAlias[ 1 ] == '\0' )
{ /* M->variable */
hb_compMemvarGenPCode( HB_P_MPOPMEMVAR, szVarName, HB_MACRO_PARAM );
hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
}
else
{
@@ -965,6 +985,7 @@ void hb_compGenPopAliasedVar( char * szVarName,
if( iCmp == 0 )
{ /* MEMVAR-> or MEMVA-> or MEMV-> */
hb_compMemvarGenPCode( HB_P_MPOPMEMVAR, szVarName, HB_MACRO_PARAM );
hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
}
else
{ /* field variable */
@@ -990,11 +1011,14 @@ void hb_compGenPopAliasedVar( char * szVarName,
}
}
else
{
/* Alias is already placed on stack
* NOTE: An alias will be determined at runtime then we cannot decide
* here if passed name is either a field or a memvar
*/
hb_compMemvarGenPCode( HB_P_MPOPALIASEDVAR, szVarName, HB_MACRO_PARAM );
hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
}
}
/* generates the pcode to push a nonaliased variable value to the virtual
@@ -1012,11 +1036,8 @@ void hb_compGenPushVar( char * szVarName, HB_MACRO_DECL )
}
else
{
/* NOTE: In clipper all undeclared variables are assumed MEMVAR if
* they are popped however there is no such assumption if a variable
* is pushed on the eval stack
*/
hb_compMemvarGenPCode( HB_P_MPUSHVARIABLE, szVarName, HB_MACRO_PARAM );
hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
}
}
@@ -1031,6 +1052,7 @@ void hb_compGenPushVarRef( char * szVarName, HB_MACRO_DECL )
else
{
hb_compMemvarGenPCode( HB_P_MPUSHMEMVARREF, szVarName, HB_MACRO_PARAM );
hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
}
}
@@ -1055,6 +1077,7 @@ void hb_compGenPushAliasedVar( char * szVarName,
if( szAlias[ 0 ] == 'M' && szAlias[ 1 ] == '\0' )
{ /* M->variable */
hb_compMemvarGenPCode( HB_P_MPUSHMEMVAR, szVarName, HB_MACRO_PARAM );
hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
}
else
{
@@ -1064,6 +1087,7 @@ void hb_compGenPushAliasedVar( char * szVarName,
if( iCmp == 0 )
{ /* MEMVAR-> or MEMVA-> or MEMV-> */
hb_compMemvarGenPCode( HB_P_MPUSHMEMVAR, szVarName, HB_MACRO_PARAM );
hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
}
else
{ /* field variable */
@@ -1089,11 +1113,14 @@ void hb_compGenPushAliasedVar( char * szVarName,
}
}
else
{
/* Alias is already placed on stack
* NOTE: An alias will be determined at runtime then we cannot decide
* here if passed name is either a field or a memvar
*/
hb_compMemvarGenPCode( HB_P_MPUSHALIASEDVAR, szVarName, HB_MACRO_PARAM );
hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
}
}
/* pushes a logical value on the virtual machine stack , */

2
harbour/source/vm/memvars.c
View File

@@ -732,7 +732,7 @@ static int hb_memvarScopeGet( PHB_DYNS pDynVar )
/* This function checks the scope of passed variable name
*/
static int hb_memvarScope( char * szVarName, ULONG ulLength )
int hb_memvarScope( char * szVarName, ULONG ulLength )
{
int iMemvar = HB_MV_ERROR;
char * szName;