From d784a205526d4e4bc7fe9aa0ccf1c1e5c5f0e11a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 26 Jan 2013 14:05:16 +0000 Subject: [PATCH] 2013-01-26 15:03 UTC+0100 Viktor Szakats (harbour syenar.net) * src/rdd/usrrdd/rdds/arrayrdd.prg ! more formatting fix to latest patch ; TOFIX: hbformat to uppercase 'NIL' and to add space between '!' operator and next token. Also to format #define code (old) and to not break with inline comments inside continued lines (old). --- harbour/ChangeLog.txt | 8 ++++++++ harbour/src/rdd/usrrdd/rdds/arrayrdd.prg | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 78cc1a0a75..486a54fc7d 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,14 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-01-26 15:03 UTC+0100 Viktor Szakats (harbour syenar.net) + * src/rdd/usrrdd/rdds/arrayrdd.prg + ! more formatting fix to latest patch + ; TOFIX: hbformat to uppercase 'NIL' and to add + space between '!' operator and next token. Also to + format #define code (old) and to not break with inline + comments inside continued lines (old). + 2013-01-26 15:00 UTC+0100 Viktor Szakats (harbour syenar.net) - contrib/hbhpdf/error.prg + contrib/hbhpdf/errstr.prg diff --git a/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg b/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg index 7875eee4cb..bd583aeb21 100644 --- a/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg +++ b/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg @@ -1469,16 +1469,16 @@ STATIC FUNCTION AR_LOCATE( nWA, lContinue ) IF lContinue AR_SKIPRAW( nWA, 1 ) ENDIF - IF bWhile == nil + IF bWhile == NIL bLocate := {|| ! Eval( bFor ) } - IF !lContinue .AND. aScopeInfo[ UR_SI_NEXT ] == nil .AND. aScopeInfo[ UR_SI_RECORD ] == nil .AND. !aScopeInfo[ UR_SI_REST ] + IF !lContinue .AND. aScopeInfo[ UR_SI_NEXT ] == NIL .AND. aScopeInfo[ UR_SI_RECORD ] == NIL .AND. !aScopeInfo[ UR_SI_REST ] AR_GOTOP( nWA ) ENDIF ELSE bLocate := {|| ! Eval( bFor ) .AND. Eval( bWhile ) } ENDIF dbEval( {|| NIL },, bLocate, aScopeInfo[ UR_SI_NEXT ], aScopeInfo[ UR_SI_RECORD ], aScopeInfo[ UR_SI_REST ] .OR. lContinue ) - aWAData[ WADATA_FOUND ] := !aWAData[ WADATA_EOF ] .AND. Eval( bFor ) + aWAData[ WADATA_FOUND ] := ! aWAData[ WADATA_EOF ] .AND. Eval( bFor ) RETURN HB_SUCCESS