diff --git a/ChangeLog.txt b/ChangeLog.txt index 181cdb1bd8..5995510af7 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,11 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2025-10-16 22:04 UTC+0200 Aleksander Czajczynski (hb fki.pl) + * utils/hbmk2/hbmk2.prg + * remaining LEFTEQUAL() changed to hb_LeftEq() calls + - removed LEFTEQUAL() macro + 2025-10-16 21:40 UTC+0200 Aleksander Czajczynski (hb fki.pl) * config/global.mk * follow up to previous, define __ARCH64BIT__ for .prg files diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg index 7066b23617..2ae3eb1306 100644 --- a/utils/hbmk2/hbmk2.prg +++ b/utils/hbmk2/hbmk2.prg @@ -323,7 +323,6 @@ EXTERNAL hbmk_KEYW #define HB_ISFIRSTIDCHAR( c ) ( HB_ISALPHA( c ) .OR. ( c ) == "_" ) #define HB_ISNEXTIDCHAR( c ) ( HB_ISFIRSTIDCHAR( c ) .OR. hb_asciiIsDigit( c ) ) -#define LEFTEQUAL( l, r ) ( Left( l, Len( r ) ) == r ) #define hb_RightEq( s, c ) ( Right( s, Len( c ) ) == c ) /* Logic (hack) to automatically add some libs to their @@ -1276,15 +1275,15 @@ STATIC PROCEDURE hbmk_harbour_dirlayout_init( hbmk ) /* Detect system locations to enable shared library option by default */ IF hbmk[ _HBMK_cPLAT ] == "beos" hbmk[ _HBMK_lSysLoc ] := ; - LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/common" ) .OR. ; - LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/system" ) .OR. ; - LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/home/config" ) .OR. ; - AScan( ListToArray( GetEnv( "LIBRARY_PATH" ), ":" ), {| tmp | LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_LIB ], tmp ) } ) > 0 + hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/common" ) .OR. ; + hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/system" ) .OR. ; + hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/home/config" ) .OR. ; + AScan( ListToArray( GetEnv( "LIBRARY_PATH" ), ":" ), {| tmp | hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_LIB ], tmp ) } ) > 0 ELSE hbmk[ _HBMK_lSysLoc ] := ; - LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/usr/local/bin" ) .OR. ; - LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/usr/bin" ) .OR. ; - AScan( ListToArray( GetEnv( "LD_LIBRARY_PATH" ), ":" ), {| tmp | LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_LIB ], tmp ) } ) > 0 + hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/usr/local/bin" ) .OR. ; + hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/usr/bin" ) .OR. ; + AScan( ListToArray( GetEnv( "LD_LIBRARY_PATH" ), ":" ), {| tmp | hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_LIB ], tmp ) } ) > 0 ENDIF #endif @@ -5982,7 +5981,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit ENDCASE l_aPRG_TO_DO := {} FOR EACH tmp IN hbmk[ _HBMK_aPRG ] - IF LEFTEQUAL( tmp, "@" ) .AND. Lower( hb_FNameExt( tmp ) ) == ".clp" + IF hb_LeftEq( tmp, "@" ) .AND. Lower( hb_FNameExt( tmp ) ) == ".clp" tmp3 := SubStr( tmp, 1 + 1 ) ELSE tmp3 := tmp @@ -6883,7 +6882,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit l_aPRG_TO_DO := {} FOR EACH tmp IN hbmk[ _HBMK_aPRG ] - IF LEFTEQUAL( tmp, "@" ) .AND. Lower( hb_FNameExt( tmp ) ) == ".clp" + IF hb_LeftEq( tmp, "@" ) .AND. Lower( hb_FNameExt( tmp ) ) == ".clp" tmp3 := SubStr( tmp, 2 ) ELSE tmp3 := tmp @@ -8527,7 +8526,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, tTimeParent, lCMode, cBin_Com IF ! Empty( cModule ) FOR EACH cDependency IN hb_ATokens( cModule, " " ) IF ( cDependency:__enumIndex() > 1 .OR. ; /* Skip own (module) name */ - ( LEFTEQUAL( cFileName, "@" ) .AND. cExt == ".clp" ) ) .AND. ; + ( hb_LeftEq( cFileName, "@" ) .AND. cExt == ".clp" ) ) .AND. ; ! Empty( cDependency ) IF hbmk[ _HBMK_lDEBUGINC ] _hbmk_OutStd( hbmk, hb_StrFormat( "debuginc: HEADER (NATIVE) %1$s", cDependency ) ) @@ -8580,7 +8579,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, tTimeParent, lCMode, cBin_Com ENDIF NEXT ELSE - IF ! lCMode .AND. LEFTEQUAL( cFileName, "@" ) .AND. cExt == ".clp" + IF ! lCMode .AND. hb_LeftEq( cFileName, "@" ) .AND. cExt == ".clp" FOR EACH cDependency IN clpfile_read( SubStr( cFileName, 2 ) ) IF ! Empty( cDependency ) IF hbmk[ _HBMK_lDEBUGINC ] @@ -11469,7 +11468,7 @@ STATIC FUNCTION hbmk_builtin_Is( cFileName ) cFileName := hb_FNameNameExt( cFileName ) - RETURN LEFTEQUAL( cFileName, _HBMK_BUILTIN_FILENAME_MARKER_ ) .AND. ; + RETURN hb_LeftEq( cFileName, _HBMK_BUILTIN_FILENAME_MARKER_ ) .AND. ; Len( cFileName ) > Len( _HBMK_BUILTIN_FILENAME_MARKER_ ) STATIC FUNCTION hbmk_builtin_Exists( cFileName ) @@ -11956,7 +11955,7 @@ STATIC FUNCTION getFirstFunc( hbmk, cFile ) IF cExt == ".c" FOR EACH cLine IN hb_ATokens( StrTran( hb_MemoRead( cFile ), Chr( 13 ), Chr( 10 ) ), Chr( 10 ) ) cLine := AllTrim( cLine ) - IF LEFTEQUAL( cLine, '{ "' ) .AND. "HB_FS_FIRST" $ cLine .AND. !( "HB_FS_STATIC" $ cLine ) + IF hb_LeftEq( cLine, '{ "' ) .AND. "HB_FS_FIRST" $ cLine .AND. !( "HB_FS_STATIC" $ cLine ) n := 4 WHILE ( c := SubStr( cLine, n++, 1 ) ) != '"' cFuncName += c @@ -12351,7 +12350,7 @@ STATIC FUNCTION rtlnk_process( hbmk, cCommands, cFileOut, aFileList, ; IF ! Empty( cLine ) FOR EACH cWord IN rtlnk_tokens( cLine ) DO CASE - CASE LEFTEQUAL( cWord, "#" ) + CASE hb_LeftEq( cWord, "#" ) EXIT CASE nMode == RTLNK_MODE_OUT cFileOut := hb_DirSepToOS( cWord ) @@ -12387,7 +12386,7 @@ STATIC FUNCTION rtlnk_process( hbmk, cCommands, cFileOut, aFileList, ; CASE nMode == RTLNK_MODE_SKIPNEXT nMode := RTLNK_MODE_SKIP ENDCASE - CASE LEFTEQUAL( cWord, "@" ) + CASE hb_LeftEq( cWord, "@" ) cWord := SubStr( cWord, 2 ) cCommands := rtlnk_read( @cWord, aPrevFiles ) IF cCommands == NIL @@ -12401,28 +12400,28 @@ STATIC FUNCTION rtlnk_process( hbmk, cCommands, cFileOut, aFileList, ; cWord := Upper( cWord ) IF Len( cWord ) >= 2 DO CASE - CASE LEFTEQUAL( "OUTPUT", cWord ) + CASE hb_LeftEq( "OUTPUT", cWord ) nMode := RTLNK_MODE_OUT - CASE LEFTEQUAL( "FILE", cWord ) + CASE hb_LeftEq( "FILE", cWord ) nMode := RTLNK_MODE_FILE - CASE LEFTEQUAL( "LIBRARY", cWord ) + CASE hb_LeftEq( "LIBRARY", cWord ) nMode := RTLNK_MODE_LIB - CASE LEFTEQUAL( "MODULE", cWord ) .OR. ; - LEFTEQUAL( "EXCLUDE", cWord ) .OR. ; - LEFTEQUAL( "REFER", cWord ) .OR. ; - LEFTEQUAL( "INTO", cWord ) + CASE hb_LeftEq( "MODULE", cWord ) .OR. ; + hb_LeftEq( "EXCLUDE", cWord ) .OR. ; + hb_LeftEq( "REFER", cWord ) .OR. ; + hb_LeftEq( "INTO", cWord ) nMode := RTLNK_MODE_SKIP /* Blinker extension */ - CASE LEFTEQUAL( "BLINKER", cWord ) + CASE hb_LeftEq( "BLINKER", cWord ) /* skip Blinker commands */ EXIT - CASE LEFTEQUAL( "ECHO", cWord ) + CASE hb_LeftEq( "ECHO", cWord ) _hbmk_OutStd( hbmk, hb_StrFormat( I_( "Blinker ECHO: %1$s" ), SubStr( cLine, 6 ) ) ) EXIT - CASE LEFTEQUAL( "MAP", cWord ) + CASE hb_LeftEq( "MAP", cWord ) hbmk[ _HBMK_lMAP ] := .T. EXIT - CASE LEFTEQUAL( "NOBELL", cWord ) + CASE hb_LeftEq( "NOBELL", cWord ) hbmk[ _HBMK_lBEEP ] := .F. EXIT OTHERWISE /* TODO: add other Blinker commands */ @@ -14283,7 +14282,7 @@ STATIC PROCEDURE __hbshell_ext_static_init() nCount := __dynsCount() FOR tmp := 1 TO nCount cName := __dynsGetName( tmp ) - IF LEFTEQUAL( cName, "__HBEXTERN__" ) .AND. ; + IF hb_LeftEq( cName, "__HBEXTERN__" ) .AND. ; ! HBMK_IS_IN( cName, "__HBEXTERN__HBCPAGE__" ) hbsh[ _HBSH_hLibExt ][ Lower( SubStr( cName, Len( "__HBEXTERN__" ) + 1, Len( cName ) - Len( "__HBEXTERN__" ) - Len( "__" ) ) ) ] := NIL ENDIF