diff --git a/ChangeLog.txt b/ChangeLog.txt index a86cab7192..75dc3c240b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,10 +10,18 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-04-06 12:04 UTC+0200 Viktor Szakats (harbour syenar.net) + * bin/check.hb + * tests/fixcase.hb + ! do not strip newlines from comments + + * include/hbrddnsx.h + ! fixcase fixups + 2013-04-06 11:54 UTC+0200 Viktor Szakats (harbour syenar.net) * src/compiler/cmdcheck.c ! fixed some code messed up by case fixup - ; TODO: fix case fixup code (getccomment()?) + ; TODO: fix case fixup code (getccomment()?) [CLOSED: can't reproduce it anymore] 2013-04-05 18:58 UTC+0200 Viktor Szakats (harbour syenar.net) * bin/check.hb diff --git a/bin/check.hb b/bin/check.hb index b28a4edac1..018a4b9ee2 100644 --- a/bin/check.hb +++ b/bin/check.hb @@ -539,9 +539,7 @@ STATIC FUNCTION GetCComments( cFile ) FOR tmp := 1 TO Len( aHits ) STEP 2 FOR tmp1 := aHits[ tmp ] TO aHits[ tmp + 1 ] - IF ! hb_BSubStr( cFile, tmp1, 1 ) $ Chr( 13 ) + Chr( 10 ) - hb_BPoke( @cComments, tmp1, hb_BPeek( cFile, tmp1 ) ) - ENDIF + hb_BPoke( @cComments, tmp1, hb_BPeek( cFile, tmp1 ) ) NEXT NEXT diff --git a/include/hbrddnsx.h b/include/hbrddnsx.h index 73f687565c..63c02550cb 100644 --- a/include/hbrddnsx.h +++ b/include/hbrddnsx.h @@ -235,15 +235,15 @@ HB_EXTERN_BEGIN #define NSX_TAG_MULTIKEY 0x20 /* -sx_chill() => if ( indexFlag & ( NSX_TAG_NOUPDATE | NSX_TAG_TEMPLATE ) == 0 ) +sx_Chill() => if ( indexFlag & ( NSX_TAG_NOUPDATE | NSX_TAG_TEMPLATE ) == 0 ) indexFlag |= NSX_TAG_CHGONLY | NSX_TAG_PARTIAL; -sx_warm() => if ( indexFlag & ( NSX_TAG_NOUPDATE | NSX_TAG_TEMPLATE ) == 0 ) +sx_Warm() => if ( indexFlag & ( NSX_TAG_NOUPDATE | NSX_TAG_TEMPLATE ) == 0 ) indexFlag &= ~NSX_TAG_CHGONLY indexFlag |= NSX_TAG_PARTIAL // I do not like this -sx_freeze() => indexFlag |= NSX_TAG_NOUPDATE | NSX_TAG_PARTIAL +sx_Freeze() => indexFlag |= NSX_TAG_NOUPDATE | NSX_TAG_PARTIAL indexFlag &= ~NSX_TAG_CHGONLY -sx_thermometer() => if ( NSX_TAG_NOUPDATE | NSX_TAG_TEMPLATE ) -> 4 +sx_Thermometer() => if ( NSX_TAG_NOUPDATE | NSX_TAG_TEMPLATE ) -> 4 if ( NSX_TAG_CHGONLY ) -> 3 if ( NSX_TAG_PARTIAL ) -> 2 else -> 1 diff --git a/tests/fixcase.hb b/tests/fixcase.hb index fe656d9ff2..9da64aceb3 100644 --- a/tests/fixcase.hb +++ b/tests/fixcase.hb @@ -242,9 +242,7 @@ STATIC FUNCTION GetCComments( cFile ) FOR tmp := 1 TO Len( aHits ) STEP 2 FOR tmp1 := aHits[ tmp ] TO aHits[ tmp + 1 ] - IF ! hb_BSubStr( cFile, tmp1, 1 ) $ Chr( 13 ) + Chr( 10 ) - hb_BPoke( @cComments, tmp1, hb_BPeek( cFile, tmp1 ) ) - ENDIF + hb_BPoke( @cComments, tmp1, hb_BPeek( cFile, tmp1 ) ) NEXT NEXT