diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5117f46bc3..73aeb48fc6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,16 @@ +19990612-08:00 CET Eddie Runia + * tests/working/debugtst.prg, tests/working/clasinit.prg, + * tests/working/funcarr.prg, tests/working/objarr.prg, + * tests/working/objasign.prg + Reference to HBDebug() renamed to Debug() + * tests/working/run_exp.h, tests/working/runner.c + all reference now correct + * source/tools/debug.c + HB_Static -> HB___Static + * source/tools/stringp.prg + HBDebug() renamed to Debug() + + Fri Jun 11 1999 19:35 PST Ron Pinkas * source/compiler/harbour.y Moved code to check non used declared variable from GenReturn() to FunDef() diff --git a/harbour/source/tools/debug.c b/harbour/source/tools/debug.c index 788214fea5..00dcd63208 100644 --- a/harbour/source/tools/debug.c +++ b/harbour/source/tools/debug.c @@ -20,7 +20,7 @@ PHB_ITEM ArrayClone( PHB_ITEM ); * * Please aClone before assignments * $End$ */ -HARBOUR HB___ASTATIC(void) +HARBOUR __ASTATIC() { PHB_ITEM pStatics = hb_arrayClone( &aStatics ); @@ -33,7 +33,7 @@ HARBOUR HB___ASTATIC(void) * $FuncName$ __Static() * $Description$ Return a specified statics * $End$ */ -HARBOUR HB_STATIC(void) +HARBOUR __STATIC() { PHB_ITEM pStatic; WORD wStatic; @@ -83,7 +83,7 @@ WORD GlobalStackLen( void ) for( pItem = stack.pItems; pItem++ <= stack.pPos; nCount++ ); return( nCount ); } -HARBOUR HB___GLOBALSTACKLEN(void) +HARBOUR __GLOBALSTACKLEN() { _retni( GlobalStackLen() ); } @@ -93,7 +93,7 @@ HARBOUR HB___GLOBALSTACKLEN(void) * $FuncName$ __aGlobalStack() * $Description$ Returns the global stack * $End$ */ -HARBOUR HB___AGLOBALSTACK(void) +HARBOUR __AGLOBALSTACK() { PHB_ITEM pReturn; PHB_ITEM pItem; @@ -124,7 +124,7 @@ WORD StackLen( void ) for( pItem = pBase; pItem < stack.pBase; pItem++, nCount++ ); return( nCount ); } -HARBOUR HB___STACKLEN(void) +HARBOUR __STACKLEN() { _retni( StackLen() ); } @@ -141,7 +141,7 @@ HARBOUR HB___STACKLEN(void) * [x+1 .. y] Locals * [y+1 ..] Pushed data * $End$ */ -HARBOUR HB___ASTACK(void) +HARBOUR __ASTACK() { PHB_ITEM pReturn; PHB_ITEM pItem; @@ -166,7 +166,7 @@ HARBOUR HB___ASTACK(void) /* TODO : put bLocals / bParams */ /* somewhere for declared parameters */ /* and locals */ -HARBOUR HB___APARAM(void) +HARBOUR __APARAM() { PHB_ITEM pReturn; PHB_ITEM pItem; diff --git a/harbour/tests/working/clasinit.prg b/harbour/tests/working/clasinit.prg index 1e9dff6ff6..0eef0ac537 100644 --- a/harbour/tests/working/clasinit.prg +++ b/harbour/tests/working/clasinit.prg @@ -6,16 +6,16 @@ function Main() local oSecond QOut( "What's the default oForm and calculate area" ) - HBDebug( oForm ) + Debug( oForm ) QOut( oForm:CalcArea() ) QOut( "Set nTop to 5 and recalculate" ) oForm:nTop := 5 - HBDebug( oForm ) + Debug( oForm ) QOut( oForm:CalcArea() ) QOut( "Create a new instance and calculate area" ) oSecond := TForm():New() - HBDebug( oSecond ) + Debug( oSecond ) QOut( oSecond:CalcArea() ) return nil diff --git a/harbour/tests/working/debugtst.prg b/harbour/tests/working/debugtst.prg index fd520535aa..738ba8eb1d 100644 --- a/harbour/tests/working/debugtst.prg +++ b/harbour/tests/working/debugtst.prg @@ -18,7 +18,7 @@ function Main() QOut( "-OBJECT additions-" ) QOut( "What is in oForm ? " ) - HBDebug( oForm:Transfer() ) + Debug( oForm:Transfer() ) QOut( "Does transfer exists ? ", IsMessage( oForm, "Transfer" ) ) QOut( "Is transfer DATA ? ", IsData ( oForm, "Transfer" ) ) @@ -32,23 +32,23 @@ function Main() QOut( "Set nLeft to 50 and nRight to 100" ) oForm:Transfer( {"nLeft", 50}, {"nRight", 100} ) - HBDebug( oForm:Transfer() ) + Debug( oForm:Transfer() ) Pause() QOut( "-DEBUG Functions-") QOut( "-Statics-" ) - HBDebug( __aStatic() ) + Debug( __aStatic() ) QOut( "-Global Stack-" ) - HBDebug ( __aGlobalStack() ) + Debug ( __aGlobalStack() ) QOut( "-Local Stack-" ) - HBDebug ( __aStack() ) + Debug ( __aStack() ) QOut( "-Parameters-" ) - HBDebug ( __aParam() ) + Debug ( __aParam() ) Pause() @@ -73,19 +73,19 @@ function FuncSecond( nParam, cParam, uParam ) QOut() QOut( "-Statics-" ) - HBDebug ( __aStatic() ) + Debug ( __aStatic() ) QOut() QOut( "-Global Stack- Len=", __GlobalStackLen() ) - HBDebug ( __aGlobalStack() ) + Debug ( __aGlobalStack() ) QOut() QOut( "-Local Stack- Len=", __StackLen() ) - xStack := HBDebug ( __aStack() ) + xStack := Debug ( __aStack() ) QOut() QOut( "-Parameters-" ) - xParam := HBDebug( __aParam() ) + xParam := Debug( __aParam() ) if xParam[ xStack[ 7 ] ] == "Hello" QOut( ":-)" ) endif diff --git a/harbour/tests/working/funcarr.prg b/harbour/tests/working/funcarr.prg index 493234a242..b3f77c9817 100644 --- a/harbour/tests/working/funcarr.prg +++ b/harbour/tests/working/funcarr.prg @@ -41,9 +41,9 @@ Function Main QOut( "To the power 3 : ", aFunc()[1] ) QOut( "Global stack" ) - HBDebug( __aGlobalStack() ) // Please note a is a reference to aArray ! + Debug( __aGlobalStack() ) // Please note a is a reference to aArray ! QOut( "Statics") - HBDebug( __aStatic() ) + Debug( __aStatic() ) return NIL Function aFunc() diff --git a/harbour/tests/working/objarr.prg b/harbour/tests/working/objarr.prg index 4371fa0754..13862f3a9d 100644 --- a/harbour/tests/working/objarr.prg +++ b/harbour/tests/working/objarr.prg @@ -46,9 +46,9 @@ Function Main QOut( "To the power 3 : ", ToChar( o:x ) ) QOut( "Global stack" ) - HBDebug( __aGlobalStack() ) // Please note a is a reference to aArray ! + Debug( __aGlobalStack() ) QOut( "Statics") - HBDebug( __aStatic() ) + Debug( __aStatic() ) return NIL Function TNumber() // Very simple class diff --git a/harbour/tests/working/objasign.prg b/harbour/tests/working/objasign.prg index d5131a0061..41704553cb 100644 --- a/harbour/tests/working/objasign.prg +++ b/harbour/tests/working/objasign.prg @@ -38,9 +38,9 @@ Function Main QOut( "To the power 3 : ", o:x ) QOut( "Global stack" ) - HBDebug( __aGlobalStack() ) // Please note a is a reference to aArray ! + Debug( __aGlobalStack() ) QOut( "Statics") - HBDebug( __aStatic() ) + Debug( __aStatic() ) return NIL Function TNumber() // Very simple class diff --git a/harbour/tests/working/run_exp.h b/harbour/tests/working/run_exp.h index 5d1920e320..cb8a507d3b 100644 --- a/harbour/tests/working/run_exp.h +++ b/harbour/tests/working/run_exp.h @@ -7,117 +7,117 @@ * If the discussion has finished, it can be removed from here. * */ -HARBOUR __ACCEPT(); -HARBOUR OUTSTD(); -HARBOUR OUTERR(); -HARBOUR DEVPOS(); -HARBOUR DEVOUT(); -HARBOUR EJECT(); -HARBOUR QQOUT(); -HARBOUR QOUT(); -HARBOUR ERRORSYS(); -HARBOUR ERRORNEW(); -HARBOUR EVAL(); -HARBOUR VALTYPE(); -HARBOUR ASORT(); -HARBOUR STOD(); +HARBOUR HB___ACCEPT(); +HARBOUR HB_OUTSTD(); +HARBOUR HB_OUTERR(); +HARBOUR HB_DEVPOS(); +HARBOUR HB_DEVOUT(); +HARBOUR HB_EJECT(); +HARBOUR HB_QQOUT(); +HARBOUR HB_QOUT(); +HARBOUR HB_ERRORSYS(); +HARBOUR HB_ERRORNEW(); +HARBOUR HB_EVAL(); +HARBOUR HB_VALTYPE(); +HARBOUR HB_ASORT(); +HARBOUR HB_STOD(); HARBOUR HB_SETCENTURY(); -HARBOUR SET(); -HARBOUR OS(); -HARBOUR FOPEN(); -HARBOUR FCREATE(); -HARBOUR FREAD(); -HARBOUR FWRITE(); -HARBOUR FERROR(); -HARBOUR FCLOSE(); -HARBOUR FERASE(); -HARBOUR FRENAME(); -HARBOUR FSEEK(); +HARBOUR HB_SET(); +HARBOUR HB_OS(); +HARBOUR HB_FOPEN(); +HARBOUR HB_FCREATE(); +HARBOUR HB_FREAD(); +HARBOUR HB_FWRITE(); +HARBOUR HB_FERROR(); +HARBOUR HB_FCLOSE(); +HARBOUR HB_FERASE(); +HARBOUR HB_FRENAME(); +HARBOUR HB_FSEEK(); HARBOUR HB_FILE(); -HARBOUR FREADSTR(); -HARBOUR BIN2I(); -HARBOUR BIN2L(); -HARBOUR BIN2W(); -HARBOUR I2BIN(); -HARBOUR L2BIN(); -HARBOUR W2BIN(); -HARBOUR EXP(); -HARBOUR LOG(); -HARBOUR MOD(); -HARBOUR DEFAULT(); -HARBOUR TOCHAR(); -HARBOUR HBDEBUG(); -HARBOUR ISALPHA(); -HARBOUR ISDIGIT(); -HARBOUR ISUPPER(); -HARBOUR ISLOWER(); -HARBOUR LTRIM(); -HARBOUR TRIM(); -HARBOUR ALLTRIM(); -HARBOUR PADR(); -HARBOUR PAD(); -HARBOUR PADL(); -HARBOUR PADC(); -HARBOUR RAT(); -HARBOUR RIGHT(); -HARBOUR SPACE(); -HARBOUR STUFF(); -HARBOUR STRTRAN(); -HARBOUR DATETIME(); -HARBOUR DOW(); -HARBOUR __ASTATIC(); -HARBOUR __STATIC(); -HARBOUR __GLOBALSTACKLEN(); -HARBOUR __AGLOBALSTACK(); -HARBOUR __STACKLEN(); -HARBOUR __ASTACK(); -HARBOUR __APARAM(); -HARBOUR ACOS(); -HARBOUR ASIN(); -HARBOUR ATAN(); -HARBOUR COS(); -HARBOUR COSH(); -HARBOUR LOG10(); -HARBOUR SIN(); -HARBOUR SINH(); -HARBOUR TAN(); -HARBOUR TANH(); -HARBOUR STRDUMP(); -HARBOUR STRTOKEN(); -HARBOUR ROT13(); -HARBOUR PVALUE(); -HARBOUR HB_FUSE(); -HARBOUR HB_FRECNO(); -HARBOUR HB_FLASTREC(); -HARBOUR HB_FGOTOP(); -HARBOUR HB_FGOBOTTOM(); -HARBOUR HB_FGOTO(); -HARBOUR HB_FEOF(); -HARBOUR HB_FREADLN(); -HARBOUR HB_FSKIP(); -HARBOUR GETENV(); -HARBOUR DIRECTORY(); -HARBOUR GT_ASCPOS(); -HARBOUR GT_ATDIFF(); -HARBOUR GT_CHAREVEN(); -HARBOUR GT_CHARODD(); -HARBOUR GT_CHRCOUNT(); -HARBOUR GT_CHRTOTAL(); -HARBOUR GT_CHARMIX(); -HARBOUR GT_ASCIISUM(); -HARBOUR GT_CHRFIRST(); -HARBOUR GT_STRCOUNT(); -HARBOUR GT_STRCSPN(); -HARBOUR GT_STRDIFF(); -HARBOUR GT_STREXPAND(); -HARBOUR GT_STRLEFT(); -HARBOUR GT_STRPBRK(); -HARBOUR GT_STRRIGHT(); -HARBOUR MAXROW(); -HARBOUR MAXCOL(); -HARBOUR SETPRC(); -HARBOUR SCROLL(); -HARBOUR VERSION(); +HARBOUR HB_FREADSTR(); +HARBOUR HB_BIN2I(); +HARBOUR HB_BIN2L(); +HARBOUR HB_BIN2W(); +HARBOUR HB_I2BIN(); +HARBOUR HB_L2BIN(); +HARBOUR HB_W2BIN(); +HARBOUR HB_EXP(); +HARBOUR HB_LOG(); +HARBOUR HB_MOD(); +HARBOUR HB_DEFAULT(); +HARBOUR HB_TOCHAR(); +HARBOUR HB_DEBUG(); +HARBOUR HB_ISALPHA(); +HARBOUR HB_ISDIGIT(); +HARBOUR HB_ISUPPER(); +HARBOUR HB_ISLOWER(); +HARBOUR HB_LTRIM(); +HARBOUR HB_TRIM(); +HARBOUR HB_ALLTRIM(); +HARBOUR HB_PADR(); +HARBOUR HB_PAD(); +HARBOUR HB_PADL(); +HARBOUR HB_PADC(); +HARBOUR HB_RAT(); +HARBOUR HB_RIGHT(); +HARBOUR HB_SPACE(); +HARBOUR HB_STUFF(); +HARBOUR HB_STRTRAN(); +HARBOUR HB_DATETIME(); +HARBOUR HB_DOW(); +HARBOUR HB___ASTATIC(); +HARBOUR HB___STATIC(); +HARBOUR HB___GLOBALSTACKLEN(); +HARBOUR HB___AGLOBALSTACK(); +HARBOUR HB___STACKLEN(); +HARBOUR HB___ASTACK(); +HARBOUR HB___APARAM(); +HARBOUR HB_ACOS(); +HARBOUR HB_ASIN(); +HARBOUR HB_ATAN(); +HARBOUR HB_COS(); +HARBOUR HB_COSH(); +HARBOUR HB_LOG10(); +HARBOUR HB_SIN(); +HARBOUR HB_SINH(); +HARBOUR HB_TAN(); +HARBOUR HB_TANH(); +HARBOUR HB_STRDUMP(); +HARBOUR HB_STRTOKEN(); +HARBOUR HB_ROT13(); +HARBOUR HB_PVALUE(); +HARBOUR HB_HB_FUSE(); +HARBOUR HB_HB_FRECNO(); +HARBOUR HB_HB_FLASTREC(); +HARBOUR HB_HB_FGOTOP(); +HARBOUR HB_HB_FGOBOTTOM(); +HARBOUR HB_HB_FGOTO(); +HARBOUR HB_HB_FEOF(); +HARBOUR HB_HB_FREADLN(); +HARBOUR HB_HB_FSKIP(); +HARBOUR HB_GETENV(); +HARBOUR HB_DIRECTORY(); +HARBOUR HB_GT_ASCPOS(); +HARBOUR HB_GT_ATDIFF(); +HARBOUR HB_GT_CHAREVEN(); +HARBOUR HB_GT_CHARODD(); +HARBOUR HB_GT_CHRCOUNT(); +HARBOUR HB_GT_CHRTOTAL(); +HARBOUR HB_GT_CHARMIX(); +HARBOUR HB_GT_ASCIISUM(); +HARBOUR HB_GT_CHRFIRST(); +HARBOUR HB_GT_STRCOUNT(); +HARBOUR HB_GT_STRCSPN(); +HARBOUR HB_GT_STRDIFF(); +HARBOUR HB_GT_STREXPAND(); +HARBOUR HB_GT_STRLEFT(); +HARBOUR HB_GT_STRPBRK(); +HARBOUR HB_GT_STRRIGHT(); +HARBOUR HB_MAXROW(); +HARBOUR HB_MAXCOL(); +HARBOUR HB_SETPRC(); +HARBOUR HB_SCROLL(); +HARBOUR HB_VERSION(); HARBOUR HB_SETFIXED(); /* Same story. @@ -127,119 +127,119 @@ HARBOUR HB_SETFIXED(); */ static SYMBOL symbols[] = { -{ "HB_RUN", FS_PUBLIC, HB_RUN , 0 }, -{ "__ACCEPT", FS_PUBLIC, __ACCEPT , 0 }, -{ "OUTSTD", FS_PUBLIC, OUTSTD , 0 }, -{ "OUTERR", FS_PUBLIC, OUTERR , 0 }, -{ "DEVPOS", FS_PUBLIC, DEVPOS , 0 }, -{ "DEVOUT", FS_PUBLIC, DEVOUT , 0 }, -{ "EJECT", FS_PUBLIC, EJECT , 0 }, -{ "QQOUT", FS_PUBLIC, QQOUT , 0 }, -{ "QOUT", FS_PUBLIC, QOUT , 0 }, -{ "ERRORSYS", FS_PUBLIC, ERRORSYS , 0 }, -{ "ERRORNEW", FS_PUBLIC, ERRORNEW , 0 }, -{ "EVAL", FS_PUBLIC, EVAL , 0 }, -{ "VALTYPE", FS_PUBLIC, VALTYPE , 0 }, -{ "ASORT", FS_PUBLIC, ASORT , 0 }, -{ "STOD", FS_PUBLIC, STOD , 0 }, -{ "HB_SETCENTURY", FS_PUBLIC, HB_SETCENTURY , 0 }, -{ "SET", FS_PUBLIC, SET , 0 }, -{ "OS", FS_PUBLIC, OS , 0 }, -{ "FOPEN", FS_PUBLIC, FOPEN , 0 }, -{ "FCREATE", FS_PUBLIC, FCREATE , 0 }, -{ "FREAD", FS_PUBLIC, FREAD , 0 }, -{ "FWRITE", FS_PUBLIC, FWRITE , 0 }, -{ "FERROR", FS_PUBLIC, FERROR , 0 }, -{ "FCLOSE", FS_PUBLIC, FCLOSE , 0 }, -{ "FERASE", FS_PUBLIC, FERASE , 0 }, -{ "FRENAME", FS_PUBLIC, FRENAME , 0 }, -{ "FSEEK", FS_PUBLIC, FSEEK , 0 }, -{ "HB_FILE", FS_PUBLIC, HB_FILE , 0 }, -{ "FREADSTR", FS_PUBLIC, FREADSTR , 0 }, -{ "BIN2I", FS_PUBLIC, BIN2I , 0 }, -{ "BIN2L", FS_PUBLIC, BIN2L , 0 }, -{ "BIN2W", FS_PUBLIC, BIN2W , 0 }, -{ "I2BIN", FS_PUBLIC, I2BIN , 0 }, -{ "L2BIN", FS_PUBLIC, L2BIN , 0 }, -{ "W2BIN", FS_PUBLIC, W2BIN , 0 }, -{ "EXP", FS_PUBLIC, EXP , 0 }, -{ "LOG", FS_PUBLIC, LOG , 0 }, -{ "MOD", FS_PUBLIC, MOD , 0 }, -{ "DEFAULT", FS_PUBLIC, DEFAULT , 0 }, -{ "TOCHAR", FS_PUBLIC, TOCHAR , 0 }, -{ "HBDEBUG", FS_PUBLIC, HBDEBUG , 0 }, -{ "ISALPHA", FS_PUBLIC, ISALPHA , 0 }, -{ "ISDIGIT", FS_PUBLIC, ISDIGIT , 0 }, -{ "ISUPPER", FS_PUBLIC, ISUPPER , 0 }, -{ "ISLOWER", FS_PUBLIC, ISLOWER , 0 }, -{ "LTRIM", FS_PUBLIC, LTRIM , 0 }, -{ "TRIM", FS_PUBLIC, TRIM , 0 }, -{ "ALLTRIM", FS_PUBLIC, ALLTRIM , 0 }, -{ "PADR", FS_PUBLIC, PADR , 0 }, -{ "PAD", FS_PUBLIC, PAD , 0 }, -{ "PADL", FS_PUBLIC, PADL , 0 }, -{ "PADC", FS_PUBLIC, PADC , 0 }, -{ "RAT", FS_PUBLIC, RAT , 0 }, -{ "RIGHT", FS_PUBLIC, RIGHT , 0 }, -{ "SPACE", FS_PUBLIC, SPACE , 0 }, -{ "STUFF", FS_PUBLIC, STUFF , 0 }, -{ "STRTRAN", FS_PUBLIC, STRTRAN , 0 }, -{ "DATETIME", FS_PUBLIC, DATETIME , 0 }, -{ "DOW", FS_PUBLIC, DOW , 0 }, -{ "__ASTATIC", FS_PUBLIC, __ASTATIC , 0 }, -{ "__STATIC", FS_PUBLIC, __STATIC , 0 }, -{ "__GLOBALSTACKLEN", FS_PUBLIC, __GLOBALSTACKLEN, 0 }, -{ "__AGLOBALSTACK", FS_PUBLIC, __AGLOBALSTACK, 0 }, -{ "__STACKLEN", FS_PUBLIC, __STACKLEN , 0 }, -{ "__ASTACK", FS_PUBLIC, __ASTACK , 0 }, -{ "__APARAM", FS_PUBLIC, __APARAM , 0 }, -{ "ACOS", FS_PUBLIC, ACOS , 0 }, -{ "ASIN", FS_PUBLIC, ASIN , 0 }, -{ "ATAN", FS_PUBLIC, ATAN , 0 }, -{ "COS", FS_PUBLIC, COS , 0 }, -{ "COSH", FS_PUBLIC, COSH , 0 }, -{ "LOG10", FS_PUBLIC, LOG10 , 0 }, -{ "SIN", FS_PUBLIC, SIN , 0 }, -{ "SINH", FS_PUBLIC, SINH , 0 }, -{ "TAN", FS_PUBLIC, TAN , 0 }, -{ "TANH", FS_PUBLIC, TANH , 0 }, -{ "STRDUMP", FS_PUBLIC, STRDUMP , 0 }, -{ "STRTOKEN", FS_PUBLIC, STRTOKEN , 0 }, -{ "ROT13", FS_PUBLIC, ROT13 , 0 }, -{ "PVALUE", FS_PUBLIC, PVALUE , 0 }, -{ "HB_FUSE", FS_PUBLIC, HB_FUSE , 0 }, -{ "HB_FRECNO", FS_PUBLIC, HB_FRECNO , 0 }, -{ "HB_FLASTREC", FS_PUBLIC, HB_FLASTREC , 0 }, -{ "HB_FGOTOP", FS_PUBLIC, HB_FGOTOP , 0 }, -{ "HB_FGOBOTTOM", FS_PUBLIC, HB_FGOBOTTOM , 0 }, -{ "HB_FGOTO", FS_PUBLIC, HB_FGOTO , 0 }, -{ "HB_FEOF", FS_PUBLIC, HB_FEOF , 0 }, -{ "HB_FREADLN", FS_PUBLIC, HB_FREADLN , 0 }, -{ "HB_FSKIP", FS_PUBLIC, HB_FSKIP , 0 }, -{ "GETENV", FS_PUBLIC, GETENV , 0 }, -{ "DIRECTORY", FS_PUBLIC, DIRECTORY , 0 }, -{ "GT_ASCPOS", FS_PUBLIC, GT_ASCPOS , 0 }, -{ "GT_ATDIFF", FS_PUBLIC, GT_ATDIFF , 0 }, -{ "GT_CHAREVEN", FS_PUBLIC, GT_CHAREVEN , 0 }, -{ "GT_CHARODD", FS_PUBLIC, GT_CHARODD , 0 }, -{ "GT_CHRCOUNT", FS_PUBLIC, GT_CHRCOUNT , 0 }, -{ "GT_CHRTOTAL", FS_PUBLIC, GT_CHRTOTAL , 0 }, -{ "GT_CHARMIX", FS_PUBLIC, GT_CHARMIX , 0 }, -{ "GT_ASCIISUM", FS_PUBLIC, GT_ASCIISUM , 0 }, -{ "GT_CHRFIRST", FS_PUBLIC, GT_CHRFIRST , 0 }, -{ "GT_STRCOUNT", FS_PUBLIC, GT_STRCOUNT , 0 }, -{ "GT_STRCSPN", FS_PUBLIC, GT_STRCSPN , 0 }, -{ "GT_STRDIFF", FS_PUBLIC, GT_STRDIFF , 0 }, -{ "GT_STREXPAND", FS_PUBLIC, GT_STREXPAND , 0 }, -{ "GT_STRLEFT", FS_PUBLIC, GT_STRLEFT , 0 }, -{ "GT_STRPBRK", FS_PUBLIC, GT_STRPBRK , 0 }, -{ "GT_STRRIGHT", FS_PUBLIC, GT_STRRIGHT , 0 }, -{ "MAXROW", FS_PUBLIC, MAXROW , 0 }, -{ "MAXCOL", FS_PUBLIC, MAXCOL , 0 }, -{ "SETPRC", FS_PUBLIC, SETPRC , 0 }, -{ "SCROLL", FS_PUBLIC, SCROLL , 0 }, -{ "VERSION", FS_PUBLIC, VERSION , 0 }, -{ "HB_SETFIXED", FS_PUBLIC, HB_SETFIXED , 0 } +{ "HB_RUN", FS_PUBLIC, HB_HB_RUN , 0 }, +{ "__ACCEPT", FS_PUBLIC, HB___ACCEPT , 0 }, +{ "OUTSTD", FS_PUBLIC, HB_OUTSTD , 0 }, +{ "OUTERR", FS_PUBLIC, HB_OUTERR , 0 }, +{ "DEVPOS", FS_PUBLIC, HB_DEVPOS , 0 }, +{ "DEVOUT", FS_PUBLIC, HB_DEVOUT , 0 }, +{ "EJECT", FS_PUBLIC, HB_EJECT , 0 }, +{ "QQOUT", FS_PUBLIC, HB_QQOUT , 0 }, +{ "QOUT", FS_PUBLIC, HB_QOUT , 0 }, +{ "ERRORSYS", FS_PUBLIC, HB_ERRORSYS , 0 }, +{ "ERRORNEW", FS_PUBLIC, HB_ERRORNEW , 0 }, +{ "EVAL", FS_PUBLIC, HB_EVAL , 0 }, +{ "VALTYPE", FS_PUBLIC, HB_VALTYPE , 0 }, +{ "ASORT", FS_PUBLIC, HB_ASORT , 0 }, +{ "STOD", FS_PUBLIC, HB_STOD , 0 }, +{ "SETCENTURY", FS_PUBLIC, HB_SETCENTURY , 0 }, +{ "SET", FS_PUBLIC, HB_SET , 0 }, +{ "OS", FS_PUBLIC, HB_OS , 0 }, +{ "FOPEN", FS_PUBLIC, HB_FOPEN , 0 }, +{ "FCREATE", FS_PUBLIC, HB_FCREATE , 0 }, +{ "FREAD", FS_PUBLIC, HB_FREAD , 0 }, +{ "FWRITE", FS_PUBLIC, HB_FWRITE , 0 }, +{ "FERROR", FS_PUBLIC, HB_FERROR , 0 }, +{ "FCLOSE", FS_PUBLIC, HB_FCLOSE , 0 }, +{ "FERASE", FS_PUBLIC, HB_FERASE , 0 }, +{ "FRENAME", FS_PUBLIC, HB_FRENAME , 0 }, +{ "FSEEK", FS_PUBLIC, HB_FSEEK , 0 }, +{ "FILE", FS_PUBLIC, HB_FILE , 0 }, +{ "FREADSTR", FS_PUBLIC, HB_FREADSTR , 0 }, +{ "BIN2I", FS_PUBLIC, HB_BIN2I , 0 }, +{ "BIN2L", FS_PUBLIC, HB_BIN2L , 0 }, +{ "BIN2W", FS_PUBLIC, HB_BIN2W , 0 }, +{ "I2BIN", FS_PUBLIC, HB_I2BIN , 0 }, +{ "L2BIN", FS_PUBLIC, HB_L2BIN , 0 }, +{ "W2BIN", FS_PUBLIC, HB_W2BIN , 0 }, +{ "EXP", FS_PUBLIC, HB_EXP , 0 }, +{ "LOG", FS_PUBLIC, HB_LOG , 0 }, +{ "MOD", FS_PUBLIC, HB_MOD , 0 }, +{ "DEFAULT", FS_PUBLIC, HB_DEFAULT , 0 }, +{ "TOCHAR", FS_PUBLIC, HB_TOCHAR , 0 }, +{ "DEBUG", FS_PUBLIC, HB_DEBUG , 0 }, +{ "ISALPHA", FS_PUBLIC, HB_ISALPHA , 0 }, +{ "ISDIGIT", FS_PUBLIC, HB_ISDIGIT , 0 }, +{ "ISUPPER", FS_PUBLIC, HB_ISUPPER , 0 }, +{ "ISLOWER", FS_PUBLIC, HB_ISLOWER , 0 }, +{ "LTRIM", FS_PUBLIC, HB_LTRIM , 0 }, +{ "TRIM", FS_PUBLIC, HB_TRIM , 0 }, +{ "ALLTRIM", FS_PUBLIC, HB_ALLTRIM , 0 }, +{ "PADR", FS_PUBLIC, HB_PADR , 0 }, +{ "PAD", FS_PUBLIC, HB_PAD , 0 }, +{ "PADL", FS_PUBLIC, HB_PADL , 0 }, +{ "PADC", FS_PUBLIC, HB_PADC , 0 }, +{ "RAT", FS_PUBLIC, HB_RAT , 0 }, +{ "RIGHT", FS_PUBLIC, HB_RIGHT , 0 }, +{ "SPACE", FS_PUBLIC, HB_SPACE , 0 }, +{ "STUFF", FS_PUBLIC, HB_STUFF , 0 }, +{ "STRTRAN", FS_PUBLIC, HB_STRTRAN , 0 }, +{ "DATETIME", FS_PUBLIC, HB_DATETIME , 0 }, +{ "DOW", FS_PUBLIC, HB_DOW , 0 }, +{ "__ASTATIC", FS_PUBLIC, HB___ASTATIC , 0 }, +{ "__STATIC", FS_PUBLIC, HB___STATIC , 0 }, +{ "__GLOBALSTACKLEN", FS_PUBLIC, HB___GLOBALSTACKLEN, 0 }, +{ "__AGLOBALSTACK", FS_PUBLIC, HB___AGLOBALSTACK, 0 }, +{ "__STACKLEN", FS_PUBLIC, HB___STACKLEN , 0 }, +{ "__ASTACK", FS_PUBLIC, HB___ASTACK , 0 }, +{ "__APARAM", FS_PUBLIC, HB___APARAM , 0 }, +{ "ACOS", FS_PUBLIC, HB_ACOS , 0 }, +{ "ASIN", FS_PUBLIC, HB_ASIN , 0 }, +{ "ATAN", FS_PUBLIC, HB_ATAN , 0 }, +{ "COS", FS_PUBLIC, HB_COS , 0 }, +{ "COSH", FS_PUBLIC, HB_COSH , 0 }, +{ "LOG10", FS_PUBLIC, HB_LOG10 , 0 }, +{ "SIN", FS_PUBLIC, HB_SIN , 0 }, +{ "SINH", FS_PUBLIC, HB_SINH , 0 }, +{ "TAN", FS_PUBLIC, HB_TAN , 0 }, +{ "TANH", FS_PUBLIC, HB_TANH , 0 }, +{ "STRDUMP", FS_PUBLIC, HB_STRDUMP , 0 }, +{ "STRTOKEN", FS_PUBLIC, HB_STRTOKEN , 0 }, +{ "ROT13", FS_PUBLIC, HB_ROT13 , 0 }, +{ "PVALUE", FS_PUBLIC, HB_PVALUE , 0 }, +{ "HB_FUSE", FS_PUBLIC, HB_HB_FUSE , 0 }, +{ "HB_FRECNO", FS_PUBLIC, HB_HB_FRECNO , 0 }, +{ "HB_FLASTREC", FS_PUBLIC, HB_HB_FLASTREC , 0 }, +{ "HB_FGOTOP", FS_PUBLIC, HB_HB_FGOTOP , 0 }, +{ "HB_FGOBOTTOM", FS_PUBLIC, HB_HB_FGOBOTTOM , 0 }, +{ "HB_FGOTO", FS_PUBLIC, HB_HB_FGOTO , 0 }, +{ "HB_FEOF", FS_PUBLIC, HB_HB_FEOF , 0 }, +{ "HB_FREADLN", FS_PUBLIC, HB_HB_FREADLN , 0 }, +{ "HB_FSKIP", FS_PUBLIC, HB_HB_FSKIP , 0 }, +{ "GETENV", FS_PUBLIC, HB_GETENV , 0 }, +{ "DIRECTORY", FS_PUBLIC, HB_DIRECTORY , 0 }, +{ "GT_ASCPOS", FS_PUBLIC, HB_GT_ASCPOS , 0 }, +{ "GT_ATDIFF", FS_PUBLIC, HB_GT_ATDIFF , 0 }, +{ "GT_CHAREVEN", FS_PUBLIC, HB_GT_CHAREVEN , 0 }, +{ "GT_CHARODD", FS_PUBLIC, HB_GT_CHARODD , 0 }, +{ "GT_CHRCOUNT", FS_PUBLIC, HB_GT_CHRCOUNT , 0 }, +{ "GT_CHRTOTAL", FS_PUBLIC, HB_GT_CHRTOTAL , 0 }, +{ "GT_CHARMIX", FS_PUBLIC, HB_GT_CHARMIX , 0 }, +{ "GT_ASCIISUM", FS_PUBLIC, HB_GT_ASCIISUM , 0 }, +{ "GT_CHRFIRST", FS_PUBLIC, HB_GT_CHRFIRST , 0 }, +{ "GT_STRCOUNT", FS_PUBLIC, HB_GT_STRCOUNT , 0 }, +{ "GT_STRCSPN", FS_PUBLIC, HB_GT_STRCSPN , 0 }, +{ "GT_STRDIFF", FS_PUBLIC, HB_GT_STRDIFF , 0 }, +{ "GT_STREXPAND", FS_PUBLIC, HB_GT_STREXPAND , 0 }, +{ "GT_STRLEFT", FS_PUBLIC, HB_GT_STRLEFT , 0 }, +{ "GT_STRPBRK", FS_PUBLIC, HB_GT_STRPBRK , 0 }, +{ "GT_STRRIGHT", FS_PUBLIC, HB_GT_STRRIGHT , 0 }, +{ "MAXROW", FS_PUBLIC, HB_MAXROW , 0 }, +{ "MAXCOL", FS_PUBLIC, HB_MAXCOL , 0 }, +{ "SETPRC", FS_PUBLIC, HB_SETPRC , 0 }, +{ "SCROLL", FS_PUBLIC, HB_SCROLL , 0 }, +{ "VERSION", FS_PUBLIC, HB_VERSION , 0 }, +{ "SETFIXED", FS_PUBLIC, HB_SETFIXED , 0 } }; diff --git a/harbour/tests/working/runner.c b/harbour/tests/working/runner.c index bf5eca6770..9d61a4c348 100644 --- a/harbour/tests/working/runner.c +++ b/harbour/tests/working/runner.c @@ -48,7 +48,7 @@ typedef struct static PASM_CALL CreateFun( PSYMBOL, PBYTE ); /* Create a dynamic function*/ void Do( WORD ); static ULONG FindSymbol( char *, PDYNFUNC, ULONG ); - HARBOUR HB_RUN(); + HARBOUR HB_HB_RUN(); static void HRB_FileClose( FILE * ); static void HRB_FileRead ( char *, int, int, FILE * ); static FILE *HRB_FileOpen ( char * ); @@ -84,7 +84,7 @@ ULONG ulSymEntry = 0; /* Link enhancement */ In due time it should also be able to collect the data from the binary/executable itself */ -HARBOUR HB_RUN( void ) +HARBOUR HB_HB_RUN( void ) { char *szFileName;