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

2011-03-07 12:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed to recognize filters in options having ${} macros, 
      if the filter is placed after the macros.
This commit is contained in:
Viktor Szakats
2011-03-07 11:29:01 +00:00
parent 8ccafaceb9
commit 44ea214552
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-03-07 12:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
! Fixed to recognize filters in options having ${} macros,
if the filter is placed after the macros.
2011-03-06 18:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbpost.hbm
* config/postinst.hbs

17
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -9467,9 +9467,20 @@ STATIC FUNCTION ArchCompFilter( hbmk, cItem )
LOCAL cExprWithValue := "hbmk_KEYW( hbmk, '%1', '%2', '%3' )"
LOCAL tmp
IF ( nStart := At( _MACRO_OPEN, cItem ) ) > 0 .AND. ;
!( SubStr( cItem, nStart - 1, 1 ) $ _MACRO_PREFIX_ALL ) .AND. ;
( nEnd := hb_At( _MACRO_CLOSE, cItem, nStart + Len( _MACRO_OPEN ) ) ) > 0
nEnd := 1
DO WHILE .T.
IF ( nStart := hb_At( _MACRO_OPEN, cItem, nEnd ) ) == 0
EXIT
ENDIF
IF ( nEnd := hb_At( _MACRO_CLOSE, cItem, nStart + Len( _MACRO_OPEN ) ) ) == 0
EXIT
ENDIF
IF !( SubStr( cItem, nStart - 1, 1 ) $ _MACRO_PREFIX_ALL )
EXIT
ENDIF
ENDDO
IF nStart > 0
/* Separate filter from the rest of the item */
cFilterSrc := SubStr( cItem, nStart + Len( _MACRO_OPEN ), nEnd - nStart - Len( _MACRO_OPEN ) )