From 4f150b0a59a0dcbe036a0574d93cb69a1db0e2d0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 4 Jun 2012 09:52:07 +0000 Subject: [PATCH] 2012-06-04 11:51 UTC+0200 Viktor Szakats (harbour syenar.net) * tests/rddtest/adscl52.prg * tests/rddtest/adscl53.prg * tests/rddtest/ntxcl52.prg * tests/rddtest/ntxcl53.prg * tests/rddtest/cdxcl52.prg * tests/rddtest/cdxcl53.prg * examples/gfspell/spell.prg * examples/httpsrv/uhttpd.prg * examples/httpsrv/cookie.prg * examples/httpsrv/cgifunc.prg * examples/httpsrv/session.prg * examples/terminal/trm_cli.prg * examples/terminal/terminal.prg * examples/terminal/trm_srv.prg * examples/terminal/trm_app.prg * examples/terminal/readme.txt * examples/gtwvw/tests/wvwmouse.prg * examples/gtwvw/tests/cbtest1.prg * examples/gtwvw/tests/maincoor.prg * examples/gtwvw/tests/cbtest6.prg * examples/gtwvw/tests/wvwtest9.prg * examples/gtwvw/tests/ebtest7.prg * examples/gtwvw/tests/maximize.prg * examples/gtwvw/tests/inpfocus.prg * '<>' -> '!=' --- harbour/ChangeLog | 27 ++++++++++++++ harbour/examples/gfspell/spell.prg | 10 +++--- harbour/examples/gtwvw/tests/cbtest1.prg | 2 +- harbour/examples/gtwvw/tests/cbtest6.prg | 4 +-- harbour/examples/gtwvw/tests/ebtest7.prg | 6 ++-- harbour/examples/gtwvw/tests/inpfocus.prg | 6 ++-- harbour/examples/gtwvw/tests/maincoor.prg | 2 +- harbour/examples/gtwvw/tests/maximize.prg | 12 +++---- harbour/examples/gtwvw/tests/wvwmouse.prg | 2 +- harbour/examples/gtwvw/tests/wvwtest9.prg | 4 +-- harbour/examples/httpsrv/cgifunc.prg | 10 +++--- harbour/examples/httpsrv/cookie.prg | 14 ++++---- harbour/examples/httpsrv/session.prg | 44 +++++++++++------------ harbour/examples/httpsrv/uhttpd.prg | 6 ++-- harbour/examples/terminal/readme.txt | 5 ++- harbour/examples/terminal/terminal.prg | 22 ++++++------ harbour/examples/terminal/trm_app.prg | 2 +- harbour/examples/terminal/trm_cli.prg | 26 +++++++------- harbour/examples/terminal/trm_srv.prg | 20 +++++------ harbour/tests/rddtest/adscl52.prg | 6 ++-- harbour/tests/rddtest/adscl53.prg | 6 ++-- harbour/tests/rddtest/cdxcl52.prg | 6 ++-- harbour/tests/rddtest/cdxcl53.prg | 8 ++--- harbour/tests/rddtest/ntxcl52.prg | 6 ++-- harbour/tests/rddtest/ntxcl53.prg | 6 ++-- 25 files changed, 146 insertions(+), 116 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c28118c547..2b3771b2ea 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,33 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-04 11:51 UTC+0200 Viktor Szakats (harbour syenar.net) + * tests/rddtest/adscl52.prg + * tests/rddtest/adscl53.prg + * tests/rddtest/ntxcl52.prg + * tests/rddtest/ntxcl53.prg + * tests/rddtest/cdxcl52.prg + * tests/rddtest/cdxcl53.prg + * examples/gfspell/spell.prg + * examples/httpsrv/uhttpd.prg + * examples/httpsrv/cookie.prg + * examples/httpsrv/cgifunc.prg + * examples/httpsrv/session.prg + * examples/terminal/trm_cli.prg + * examples/terminal/terminal.prg + * examples/terminal/trm_srv.prg + * examples/terminal/trm_app.prg + * examples/terminal/readme.txt + * examples/gtwvw/tests/wvwmouse.prg + * examples/gtwvw/tests/cbtest1.prg + * examples/gtwvw/tests/maincoor.prg + * examples/gtwvw/tests/cbtest6.prg + * examples/gtwvw/tests/wvwtest9.prg + * examples/gtwvw/tests/ebtest7.prg + * examples/gtwvw/tests/maximize.prg + * examples/gtwvw/tests/inpfocus.prg + * '<>' -> '!=' + 2012-06-04 11:41 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbformat/hbfmtcls.prg + use harbour.hbx as proper-casing database (instead of diff --git a/harbour/examples/gfspell/spell.prg b/harbour/examples/gfspell/spell.prg index 2ed5ffd4f8..aa2e8eb447 100644 --- a/harbour/examples/gfspell/spell.prg +++ b/harbour/examples/gfspell/spell.prg @@ -285,7 +285,7 @@ if sp_init() else ok := .F. endif -if !ok .and. EXTRA_CODE_BLOCK <> NIL +if !ok .and. EXTRA_CODE_BLOCK != NIL ok := eval( EXTRA_CODE_BLOCK,cWord ) endif return ok @@ -357,7 +357,7 @@ LOCAL xOld := NIL **DEBUG** @24,30 SAY "At SP_getset" -if nWhich <> NIL .and. (nWhich>0 .and. nWhich<=len(aGlobal)) +if nWhich != NIL .and. (nWhich>0 .and. nWhich<=len(aGlobal)) xOld := aGlobal[nWhich] if valtype(xNewSetting) == valtype(xOld) aGlobal[nWhich] := xNewSetting @@ -1269,7 +1269,7 @@ if nH >= 0 @ 10,41 say (nCurRec/nSize) * 100 picture "999.9%" color "W+/R" endif enddo - if !empty(temp) .or. cBits <> FOUR_BYTES + if !empty(temp) .or. cBits != FOUR_BYTES nWhere := fseek(nH,0,2) @@ -1588,8 +1588,8 @@ else if nPatSize == nStrSize lMatch := .T. for y := 1 to nPatSize - if substr(cPattern,y,1)<>"?" .and. ; - substr(cPattern,y,1)<> substr(cString,y,1) + if substr(cPattern,y,1)!="?" .and. ; + substr(cPattern,y,1)!= substr(cString,y,1) lMatch := .F. exit endif diff --git a/harbour/examples/gtwvw/tests/cbtest1.prg b/harbour/examples/gtwvw/tests/cbtest1.prg index 3b7428e093..f5acec2d3a 100644 --- a/harbour/examples/gtwvw/tests/cbtest1.prg +++ b/harbour/examples/gtwvw/tests/cbtest1.prg @@ -63,7 +63,7 @@ local ch,ncursor wvw_ShowWindow() nPos := 1 - do while (ch:=inkey(0))<>_SECRET_KEY + do while (ch:=inkey(0))!=_SECRET_KEY do case case ch==K_TAB .or. ch==K_ENTER if nPos==2 .and. ch==K_ENTER .and. wvw_pbEnable(NIL, nPBid) diff --git a/harbour/examples/gtwvw/tests/cbtest6.prg b/harbour/examples/gtwvw/tests/cbtest6.prg index 577c2025b1..ef5f9087e2 100644 --- a/harbour/examples/gtwvw/tests/cbtest6.prg +++ b/harbour/examples/gtwvw/tests/cbtest6.prg @@ -96,7 +96,7 @@ local __nCBid__,__temp__ //these two are temporary var required by CB get creat ? "Comboboxes have now been removed" ? "Now press ESC to exit" - do while inkey(0)<>K_ESC + do while inkey(0)!=K_ESC enddo return //main @@ -265,7 +265,7 @@ local oGet * leave current active get oGet := GetActive() - if oGet<>NIL .and. oGet:HasFocus + if oGet!=NIL .and. oGet:HasFocus if oGet:changed if GetPostValidate(oGet) oGet:updatebuffer() diff --git a/harbour/examples/gtwvw/tests/ebtest7.prg b/harbour/examples/gtwvw/tests/ebtest7.prg index a46255b1af..ab2eaadf8f 100644 --- a/harbour/examples/gtwvw/tests/ebtest7.prg +++ b/harbour/examples/gtwvw/tests/ebtest7.prg @@ -158,7 +158,7 @@ local ccallstack,i return NIL function WVW_SETFOCUS(nWinNum, hWnd) - if nwinnum<>0 + if nwinnum!=0 wvw_nsetcurwindow(nwinnum) endif return NIL @@ -290,7 +290,7 @@ local nfocus, lchangefocus do while !lDone if valtype(setkey(ch))=="B" eval(setkey(ch)) - elseif ch<>0 + elseif ch!=0 lchangefocus := .t. do case case ch==K_TAB .or. ch==K_DOWN .or. ch==K_ENTER @@ -516,7 +516,7 @@ local nwasfocus endif wvw_ebsetsel(nwinnum, nid, 0, -1) nwasFocus := nFocused(aEBGets) - if nwasFocus<>0 + if nwasFocus!=0 aEBGets[nwasFocus][__GET_LFOCUSED] := .f. endif aEBGets[nIndex][__GET_LFOCUSED] := .t. diff --git a/harbour/examples/gtwvw/tests/inpfocus.prg b/harbour/examples/gtwvw/tests/inpfocus.prg index b7f7d84929..25fd59ec72 100644 --- a/harbour/examples/gtwvw/tests/inpfocus.prg +++ b/harbour/examples/gtwvw/tests/inpfocus.prg @@ -60,7 +60,7 @@ local ch CreateStatusbar(0) ch := inkey(0) - do while ch<>K_ESC + do while ch!=K_ESC if ch==wvw_setMenuKeyEvent(0) MenuAction(0, wvw_GetLastMenuEvent(0)) endif @@ -143,7 +143,7 @@ local ch * open a window whose parent is Main Window setcolor("W+/N") - if wvw_nOpenWindow(ctitle, nrow1, ncol1, nrow2, ncol2, NIL, 0) <> nWinNum + if wvw_nOpenWindow(ctitle, nrow1, ncol1, nrow2, ncol2, NIL, 0) != nWinNum * currently wvw_nOpenWindow() will always return sequentially numbered window wvw_messagebox(0, "Something horrible has happened, program aborted",; "Internal Error", MB_OK+MB_ICONHAND) @@ -159,7 +159,7 @@ local ch * then echoing user input, until user press ESC setcursor(SC_NORMAL) ch := inkey(0) - do while ch<>K_ESC + do while ch!=K_ESC typing(ch) ch := inkey(0) enddo diff --git a/harbour/examples/gtwvw/tests/maincoor.prg b/harbour/examples/gtwvw/tests/maincoor.prg index 439c51323a..ea61f0b458 100644 --- a/harbour/examples/gtwvw/tests/maincoor.prg +++ b/harbour/examples/gtwvw/tests/maincoor.prg @@ -34,7 +34,7 @@ local i,j next next ?? "Done. Press ESC to exit." - do while inkey(0)<>27 + do while inkey(0)!=27 enddo WVW_lCloseWindow() WVW_lCloseWindow() diff --git a/harbour/examples/gtwvw/tests/maximize.prg b/harbour/examples/gtwvw/tests/maximize.prg index f48e41b806..a358dfd94e 100644 --- a/harbour/examples/gtwvw/tests/maximize.prg +++ b/harbour/examples/gtwvw/tests/maximize.prg @@ -31,7 +31,7 @@ local ch wvw_maximize(0) updatescr() - do while (ch := inkey(0))<>K_ESC + do while (ch := inkey(0))!=K_ESC * refresh screen, probably in a new dimension * (You may alternatively call updatescr() from WVW_SIZE instead) updatescr() @@ -76,7 +76,7 @@ local lNeedReset := .f., ; * (or this function is currently running) return NIL endif - if nWinNum<>0 + if nWinNum!=0 * only care about Main Window return NIL endif @@ -88,8 +88,8 @@ local lNeedReset := .f., ; case wParam == 2 //SIZE_MAXIMIZED //alert("MAXIMIZE") * reset is required only if we are changing size - lNeedReset := maxcol() <> wvw_maxmaxcol(); - .or. maxrow() <> wvw_maxmaxrow() + lNeedReset := maxcol() != wvw_maxmaxcol(); + .or. maxrow() != wvw_maxmaxrow() if lNeedReset maxsavedscrrow := min(min(s_nNormalMaxrow, wvw_maxmaxrow()),maxrow()) @@ -102,8 +102,8 @@ local lNeedReset := .f., ; endif case wParam == 0 //SIZE_RESTORED //alert("RESTORE") - lNeedReset := maxcol() <> s_nNormalMaxcol .or.; - maxrow() <> s_nNormalMaxrow + lNeedReset := maxcol() != s_nNormalMaxcol .or.; + maxrow() != s_nNormalMaxrow if lNeedReset maxsavedscrrow := min(s_nNormalMaxrow, maxrow()) maxsavedscrcol := min(s_nNormalMaxcol, maxcol()) diff --git a/harbour/examples/gtwvw/tests/wvwmouse.prg b/harbour/examples/gtwvw/tests/wvwmouse.prg index 9676229707..63175a1605 100644 --- a/harbour/examples/gtwvw/tests/wvwmouse.prg +++ b/harbour/examples/gtwvw/tests/wvwmouse.prg @@ -390,7 +390,7 @@ return s_amouseobjlist[ nWinNum+1 ][nObjNum][1] function wvwm_SetKeyRepeater( lSet ) * returns .t. if KeyRepeater is active * if lSet is supplied, KeyRepeater is enable/disable accordingly -local lWasSet := (s_nkeyrepeater <> NIL) +local lWasSet := (s_nkeyrepeater != NIL) if !(lSet==NIL) if lSet if !lWasSet diff --git a/harbour/examples/gtwvw/tests/wvwtest9.prg b/harbour/examples/gtwvw/tests/wvwtest9.prg index 027aec6c26..f0b630dba6 100644 --- a/harbour/examples/gtwvw/tests/wvwtest9.prg +++ b/harbour/examples/gtwvw/tests/wvwtest9.prg @@ -673,7 +673,7 @@ local nOldWin local lNeedStabilize //if we can't handle non topmost window we must return right away -//if nWinNum <> wvw_nNumWindows()-1 ; return ; endif +//if nWinNum != wvw_nNumWindows()-1 ; return ; endif nOldWin := wvw_nSetCurWindow(nWinNum) @@ -716,7 +716,7 @@ local nOldWin local lNeedStabilize //if we can't handle non topmost window we must return right away -//if nWinNum <> wvw_nNumWindows()-1 ; return ; endif +//if nWinNum != wvw_nNumWindows()-1 ; return ; endif nOldWin := wvw_nSetCurWindow(nWinNum) diff --git a/harbour/examples/httpsrv/cgifunc.prg b/harbour/examples/httpsrv/cgifunc.prg index 825c36a12c..89e5407ee5 100644 --- a/harbour/examples/httpsrv/cgifunc.prg +++ b/harbour/examples/httpsrv/cgifunc.prg @@ -442,7 +442,7 @@ FUNCTION uhttpd_AddSecondsToTime( cTime, nSecsToAdd, nDaysAdded ) DEFAULT nSecsToAdd TO 0 DEFAULT nDaysAdded TO 0 // nDaysAdded can be already valued, so below i add to this value - IF nSecsToAdd <> 0 + IF nSecsToAdd != 0 nSecs := Secs( cTime ) + nSecsToAdd nDaysAdded += Int( nSecs / nOneDaySeconds ) // Attention! nDaysAdded can be already filled nSecs := nSecs - nDaysAdded @@ -631,7 +631,7 @@ RETURN uhttpd_HtmlConvertChars( cString, cQuote_style, aTranslations ) PROCEDURE uhttpd_Die( cError ) LOCAL oErr, lError - IF cError <> NIL //THEN OutStd( cError ) + IF cError != NIL //THEN OutStd( cError ) //__OutDebug( "cError: ", cError ) //IF !oCGI:HeaderSent() // oCGI:WriteLN( CRLF2BR( cError ), CRLF2BR( CRLF() ) ) @@ -713,7 +713,7 @@ PROCEDURE uhttpd_WriteToLogFile( cString, cLog, lCreate ) DEFAULT cLog TO cSep + "tmp" + cSep + "logfile.log" DEFAULT lCreate TO .F. - IF cLog <> NIL + IF cLog != NIL IF !lCreate .AND. FILE( cLog ) nHandle := FOpen( cLog, FO_READWRITE + FO_SHARED ) @@ -835,7 +835,7 @@ FUNCTION uhttpd_GetField( cVar, cType ) IF Empty( xVal ) xVal := NIL ENDIF - IF cType <> NIL .AND. cType $ "NLD" + IF cType != NIL .AND. cType $ "NLD" xVal := uhttpd_CStrToVal( xVal, cType ) ENDIF ENDIF @@ -850,7 +850,7 @@ RETURN xVal FUNCTION uhttpd_HGetValue( hHash, cKey ) LOCAL nPos LOCAL xVal - IF hHash <> NIL + IF hHash != NIL xVal := IIF( ( nPos := hb_HPos( hHash, cKey )) == 0, NIL, hb_HValueAt( hHash, nPos) ) ENDIF //RETURN IIF( cKey IN hHash:Keys, hHash[ cKey ], NIL ) diff --git a/harbour/examples/httpsrv/cookie.prg b/harbour/examples/httpsrv/cookie.prg index cb320741dc..a20acf8cc9 100644 --- a/harbour/examples/httpsrv/cookie.prg +++ b/harbour/examples/httpsrv/cookie.prg @@ -90,10 +90,10 @@ ENDCLASS // ------------------------------ ***************************** ----------------------------------- METHOD SetCookieDefaults( cDomain, cPath, nExpireDays, nExpireSecs ) CLASS uhttpd_Cookie - IF cDomain <> NIL THEN ::cDomain := cDomain - IF cPath <> NIL THEN ::cPath := cPath - IF nExpireDays <> NIL THEN ::nExpireDays := nExpireDays - IF nExpireSecs <> NIL THEN ::nExpireSecs := nExpireSecs + IF cDomain != NIL THEN ::cDomain := cDomain + IF cPath != NIL THEN ::cPath := cPath + IF nExpireDays != NIL THEN ::nExpireDays := nExpireDays + IF nExpireSecs != NIL THEN ::nExpireSecs := nExpireSecs RETURN NIL METHOD SetCookie( cCookieName, xValue, cDomain, cPath, cExpires, lSecure, lHttpOnly ) CLASS uhttpd_Cookie @@ -127,13 +127,13 @@ METHOD SetCookie( cCookieName, xValue, cDomain, cPath, cExpires, lSecure, lHttpO //cStr := cCookieName + "=" + uhttpd_UrlEncode( hb_cStr( xValue ) ) - IF cDomain <> NIL + IF cDomain != NIL cStr += "; domain=" + cDomain ENDIF - IF cPath <> NIL + IF cPath != NIL cStr += "; path=" + cPath ENDIF - IF cExpires <> NIL + IF cExpires != NIL cStr += "; expires=" + cExpires ENDIF IF ValType( lSecure ) == "L" .AND. lSecure diff --git a/harbour/examples/httpsrv/session.prg b/harbour/examples/httpsrv/session.prg index e8db2af409..2ce7fdf7c8 100644 --- a/harbour/examples/httpsrv/session.prg +++ b/harbour/examples/httpsrv/session.prg @@ -61,7 +61,7 @@ #command IF THEN ELSE =>; IF () ; ; ELSE ; ; END -#xtranslate SetNewValueReturnOld(

, ) => LOCAL xOld, xOld :=

, IIF( <> NIL,

:= , ), xOld +#xtranslate SetNewValueReturnOld(

, ) => LOCAL xOld, xOld :=

, IIF( != NIL,

:= , ), xOld #xtranslate DEFAULT(

, ) => (

:= IIF(

== NIL, ,

) ) @@ -203,7 +203,7 @@ METHOD Start( cSID ) CLASS uhttpd_Session LOCAL xVal, nRand, nPos LOCAL hUrl - IF cSID <> NIL + IF cSID != NIL ::cSID := cSID ENDIF @@ -211,7 +211,7 @@ METHOD Start( cSID ) CLASS uhttpd_Session //TraceLog( "Active Sessions : " + hb_cStr( ::nActiveSessions ) ) - IF ::nActiveSessions <> 0 + IF ::nActiveSessions != 0 RETURN .F. ENDIF @@ -372,7 +372,7 @@ RETURN lRegistered METHOD CacheLimiter( cNewLimiter ) CLASS uhttpd_Session LOCAL cOldLimiter := ::cCache_Limiter - IF cNewLimiter <> NIL + IF cNewLimiter != NIL IF cNewLimiter $ "none/nocache/private/private_no_expire/public" ::cCache_Limiter := cNewLimiter ELSE @@ -382,10 +382,10 @@ METHOD CacheLimiter( cNewLimiter ) CLASS uhttpd_Session RETURN cOldLimiter METHOD SetCookieParams( nLifeTime, cPath, cDomain, lSecure ) CLASS uhttpd_Session - IF nLifeTime <> NIL THEN ::nCookie_LifeTime := nLifeTime - IF cPath <> NIL THEN ::cCookie_Path := cPath - IF cDomain <> NIL THEN ::cCookie_Domain := cDomain - IF lSecure <> NIL THEN ::lCookie_Secure := lSecure + IF nLifeTime != NIL THEN ::nCookie_LifeTime := nLifeTime + IF cPath != NIL THEN ::cCookie_Path := cPath + IF cDomain != NIL THEN ::cCookie_Domain := cDomain + IF lSecure != NIL THEN ::lCookie_Secure := lSecure RETURN NIL METHOD RegenerateID() CLASS uhttpd_Session @@ -566,18 +566,18 @@ RETURN lOk // -------------------------------*************************----------------------------------------- METHOD SetSaveHandler( bOpen, bClose, bRead, bWrite, bDestroy, bGC ) CLASS uhttpd_Session - IF bOpen <> NIL THEN ::bOpen := bOpen - IF bClose <> NIL THEN ::bClose := bClose - IF bRead <> NIL THEN ::bRead := bRead - IF bWrite <> NIL THEN ::bWrite := bWrite - IF bDestroy <> NIL THEN ::bDestroy := bDestroy - IF bGC <> NIL THEN ::bGC := bGC + IF bOpen != NIL THEN ::bOpen := bOpen + IF bClose != NIL THEN ::bClose := bClose + IF bRead != NIL THEN ::bRead := bRead + IF bWrite != NIL THEN ::bWrite := bWrite + IF bDestroy != NIL THEN ::bDestroy := bDestroy + IF bGC != NIL THEN ::bGC := bGC RETURN NIL METHOD SessionOpen( cPath, cName ) CLASS uhttpd_Session //TraceLog( "SessionOpen() - cName", cName ) - IF cPath <> NIL THEN ::cSavePath := cPath - IF cName <> NIL THEN ::cName := cName + IF cPath != NIL THEN ::cSavePath := cPath + IF cName != NIL THEN ::cName := cName RETURN .T. @@ -598,14 +598,14 @@ METHOD SessionRead( cID ) CLASS uhttpd_Session //TraceLog( "SessionRead: cFile", cFile ) IF File( cFile ) DO WHILE nRetry++ <= ::nFileRetry - IF ( nH := FOpen( cFile, FO_READ + FO_DENYWRITE ) ) <> -1 + IF ( nH := FOpen( cFile, FO_READ + FO_DENYWRITE ) ) != -1 nRetry := 0 DO WHILE nRetry++ <= ::nFileRetry nFileSize := FSeek( nH, 0, FS_END ) FSeek( nH, 0, FS_SET ) cBuffer := Space( nFileSize ) - IF ( FRead( nH, @cBuffer, nFileSize ) ) <> nFileSize + IF ( FRead( nH, @cBuffer, nFileSize ) ) != nFileSize //uhttpd_Die( "ERROR: On reading session file : " + cFile + ", File error : " + hb_cStr( FError() ) ) hb_idleSleep( ::nFileWait / 1000 ) LOOP @@ -642,8 +642,8 @@ METHOD SessionWrite( cID, cData ) CLASS uhttpd_Session //TraceLog( "SessionWrite() - cFile", cFile ) IF nFileSize > 0 DO WHILE nRetry++ <= ::nFileRetry - IF ( nH := hb_FCreate( cFile, FC_NORMAL, FO_READWRITE + FO_DENYWRITE ) ) <> -1 - IF ( FWrite( nH, @cData, nFileSize ) ) <> nFileSize + IF ( nH := hb_FCreate( cFile, FC_NORMAL, FO_READWRITE + FO_DENYWRITE ) ) != -1 + IF ( FWrite( nH, @cData, nFileSize ) ) != nFileSize uhttpd_Die( "ERROR: On writing session file : " + cFile + ", File error : " + hb_cStr( FError() ) ) ELSE lOk := .T. @@ -786,7 +786,7 @@ METHOD Encode() CLASS uhttpd_Session FOR EACH cKey IN _SESSION:Keys xVal := _SESSION[ cKey ] - IF xVal <> NIL THEN aAdd( aSerial, { cKey, xVal } ) + IF xVal != NIL THEN aAdd( aSerial, { cKey, xVal } ) NEXT ENDIF @@ -802,7 +802,7 @@ METHOD Decode( cData ) CLASS uhttpd_Session //TraceLog( "Decode - cSerial", cSerial ) //::oCGI:ToLogFile( "Decode - cSerial = " + hb_cStr( cSerial ), "/pointtoit/tmp/log.txt" ) - DO WHILE ( xVal := HB_Deserialize( @cSerial ) ) <> NIL + DO WHILE ( xVal := HB_Deserialize( @cSerial ) ) != NIL //TraceLog( "Decode - xVal", DumpValue( xVal ) ) //::oCGI:ToLogFile( "Decode - xVal = " + hb_cStr( xVal ) + ", ValType( xVal ) = " + ValType( xVal ), "/pointtoit/tmp/log.txt" ) diff --git a/harbour/examples/httpsrv/uhttpd.prg b/harbour/examples/httpsrv/uhttpd.prg index 6357573f2b..f94adc761b 100644 --- a/harbour/examples/httpsrv/uhttpd.prg +++ b/harbour/examples/httpsrv/uhttpd.prg @@ -2294,13 +2294,13 @@ STATIC FUNCTION ParseIni( cConfig ) IF cSection == "SCRIPTALIASES" xVal := hSect[ cKey ] - IF xVal <> NIL + IF xVal != NIL hDefault[ cSection ][ cKey ] := xVal ENDIF ELSEIF cSection == "ALIASES" xVal := hSect[ cKey ] - IF xVal <> NIL + IF xVal != NIL hDefault[ cSection ][ cKey ] := xVal ENDIF @@ -2361,7 +2361,7 @@ STATIC FUNCTION ParseIni( cConfig ) xVal := Val( cVal ) ENDCASE ENDCASE - IF xVal <> NIL + IF xVal != NIL hDefault[ cSection ][ cKey ] := xVal ENDIF ENDIF diff --git a/harbour/examples/terminal/readme.txt b/harbour/examples/terminal/readme.txt index e09056ccde..4a23cd0ae6 100644 --- a/harbour/examples/terminal/readme.txt +++ b/harbour/examples/terminal/readme.txt @@ -1,3 +1,6 @@ +/* + * $Id$ + */ Welcome in the world of Harbour Terminal Protocol ================================================= @@ -78,7 +81,7 @@ Harbour Application // RmtSvrSetInfo( cServerInfo ) - IF ( nServerPort := RmtSvrSetInfo( 1 ) ) <> NIL .and. nServerPort > 0 + IF ( nServerPort := RmtSvrSetInfo( 1 ) ) != NIL .and. nServerPort > 0 IF !RmtSvrInitialize( NTRIM( nServerPort ), 60/*nTimeoutClient*/, 0.5 /*nTimeRefresh*/ ) Quit ENDIF diff --git a/harbour/examples/terminal/terminal.prg b/harbour/examples/terminal/terminal.prg index b7b767ffea..8549b62b53 100644 --- a/harbour/examples/terminal/terminal.prg +++ b/harbour/examples/terminal/terminal.prg @@ -284,7 +284,7 @@ Function RmtSvrSendClient( nMode, xData ) nBytesToSend := len( cData ) nBytesSent := hb_INetSendAll( s_commSocket, cData, nBytesToSend ) - if nBytesSent <> nBytesToSend + if nBytesSent != nBytesToSend nError := hb_INetErrorCode( s_commSocket ) TrmDebug( n,'E','VouchServer - SvrSendClient : ', nError, nBytesSent, nBytesToSend ) @@ -451,34 +451,34 @@ Function TrmStr2A( cStr, cDel ) Function TrmDebug( p1,p2,p3,p4,p5,p6,p7,p8,p9,p10 ) Local cDebug := '' - if p1 <> nil + if p1 != nil cDebug += TrmXtoS( p1 ) endif - if p2 <> nil + if p2 != nil cDebug += ' ' + TrmXtoS( p2 ) endif - if p3 <> nil + if p3 != nil cDebug += ' ' + TrmXtoS( p3 ) endif - if p4 <> nil + if p4 != nil cDebug += ' ' + TrmXtoS( p4 ) endif - if p5 <> nil + if p5 != nil cDebug += ' ' + TrmXtoS( p5 ) endif - if p6 <> nil + if p6 != nil cDebug += ' ' + TrmXtoS( p6 ) endif - if p7 <> nil + if p7 != nil cDebug += ' ' + TrmXtoS( p7 ) endif - if p8 <> nil + if p8 != nil cDebug += ' ' + TrmXtoS( p8 ) endif - if p9 <> nil + if p9 != nil cDebug += ' ' + TrmXtoS( p9 ) endif - if p10 <> nil + if p10 != nil cDebug += ' ' + TrmXtoS( p10 ) endif diff --git a/harbour/examples/terminal/trm_app.prg b/harbour/examples/terminal/trm_app.prg index ac57bb2188..47382d66fe 100644 --- a/harbour/examples/terminal/trm_app.prg +++ b/harbour/examples/terminal/trm_app.prg @@ -100,7 +100,7 @@ FUNCTION Main( cServerInfo ) // RmtSvrSetInfo( cServerInfo ) - IF ( nServerPort := RmtSvrSetInfo( 1 ) ) <> NIL .and. nServerPort > 0 + IF ( nServerPort := RmtSvrSetInfo( 1 ) ) != NIL .and. nServerPort > 0 IF !RmtSvrInitialize( hb_ntos( nServerPort ), 60/*nTimeoutClient*/, 0.5 /*nTimeRefresh*/ ) Quit ENDIF diff --git a/harbour/examples/terminal/trm_cli.prg b/harbour/examples/terminal/trm_cli.prg index 2f51117f66..ab262cac5d 100644 --- a/harbour/examples/terminal/trm_cli.prg +++ b/harbour/examples/terminal/trm_cli.prg @@ -287,7 +287,7 @@ Function TrmServeServer( Socket, cAddress, cServerInfo ) do while .t. nKey := Inkey( 0, INKEY_ALL ) - IF s_commSocket <> NIL .AND. ! Empty( nKey ) + IF s_commSocket != NIL .AND. ! Empty( nKey ) s_lSending := .T. hb_inetSendAll( s_commSocket, hb_ntos( nKey ) + CR_LF ) s_lSending := .F. @@ -462,34 +462,34 @@ Static Function uiDebug( p1,p2,p3,p4,p5,p6,p7,p8,p9,p10 ) Local cDebug := "" - if p1 <> nil + if p1 != nil cDebug += uiXtos( p1 ) endif - if p2 <> nil + if p2 != nil cDebug += " " + uiXtos( p2 ) endif - if p3 <> nil + if p3 != nil cDebug += " " + uiXtos( p3 ) endif - if p4 <> nil + if p4 != nil cDebug += " " + uiXtos( p4 ) endif - if p5 <> nil + if p5 != nil cDebug += " " + uiXtos( p5 ) endif - if p6 <> nil + if p6 != nil cDebug += " " + uiXtos( p6 ) endif - if p7 <> nil + if p7 != nil cDebug += " " + uiXtos( p7 ) endif - if p8 <> nil + if p8 != nil cDebug += " " + uiXtos( p8 ) endif - if p9 <> nil + if p9 != nil cDebug += " " + uiXtos( p9 ) endif - if p10 <> nil + if p10 != nil cDebug += " " + uiXtos( p10 ) endif @@ -640,7 +640,7 @@ Static Function SetClockInfo( cData ) lInfo := aclone( aInfo ) - if cData <> NIL + if cData != NIL a_:= hb_aTokens( cData, ";" ) if len( a_ ) >= 3 aInfo := { val( a_[ 1 ] ), val( a_[ 2 ] ), a_[ 3 ] } @@ -796,7 +796,7 @@ Static Function dbgTraceLog( cString, cFile ) endif endif - if nHandle <> F_ERROR + if nHandle != F_ERROR fseek( nHandle, 0, FS_END ) nBytes := fwrite( nHandle, cString+chr(13)+chr(10), len( cString )+2 ) diff --git a/harbour/examples/terminal/trm_srv.prg b/harbour/examples/terminal/trm_srv.prg index 6cacc160c6..bccaa98853 100644 --- a/harbour/examples/terminal/trm_srv.prg +++ b/harbour/examples/terminal/trm_srv.prg @@ -382,34 +382,34 @@ Function BuildScreen() Function uiDebug( p1,p2,p3,p4,p5,p6,p7,p8,p9,p10 ) Local cDebug := '' - if p1 <> nil + if p1 != nil cDebug += uiXtos( p1 ) endif - if p2 <> nil + if p2 != nil cDebug += ' ' + uiXtos( p2 ) endif - if p3 <> nil + if p3 != nil cDebug += ' ' + uiXtos( p3 ) endif - if p4 <> nil + if p4 != nil cDebug += ' ' + uiXtos( p4 ) endif - if p5 <> nil + if p5 != nil cDebug += ' ' + uiXtos( p5 ) endif - if p6 <> nil + if p6 != nil cDebug += ' ' + uiXtos( p6 ) endif - if p7 <> nil + if p7 != nil cDebug += ' ' + uiXtos( p7 ) endif - if p8 <> nil + if p8 != nil cDebug += ' ' + uiXtos( p8 ) endif - if p9 <> nil + if p9 != nil cDebug += ' ' + uiXtos( p9 ) endif - if p10 <> nil + if p10 != nil cDebug += ' ' + uiXtos( p10 ) endif diff --git a/harbour/tests/rddtest/adscl52.prg b/harbour/tests/rddtest/adscl52.prg index e3b1f1ad79..58399dc9c4 100644 --- a/harbour/tests/rddtest/adscl52.prg +++ b/harbour/tests/rddtest/adscl52.prg @@ -218,7 +218,7 @@ RDDTESTF NIL, {14,.f.,.f.,.f.}, DBGOTO(14) RDDTESTF NIL, {12,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTO(16) RDDTESTF NIL, {12,.f.,.f.,.f.}, DBSKIP(-1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM<>2 .AND. FNUM<4 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM!=2 .AND. FNUM<4 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {2,.f.,.f.,.f.}, DBSKIP(1) RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) @@ -258,12 +258,12 @@ RDDTESTC {16,.t.,.t.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM==6 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTOP() RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOBOTTOM() -RDDTESTC {15,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()<>5 DESCEND +RDDTESTC {15,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()!=5 DESCEND RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {8,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {16,.f.,.t.,.f.}, DBSKIP(1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()<>5 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()!=5 RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {6,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) diff --git a/harbour/tests/rddtest/adscl53.prg b/harbour/tests/rddtest/adscl53.prg index d8c54a7e34..65dec81672 100644 --- a/harbour/tests/rddtest/adscl53.prg +++ b/harbour/tests/rddtest/adscl53.prg @@ -330,7 +330,7 @@ RDDTESTF NIL, {14,.f.,.f.,.f.}, DBGOTO(14) RDDTESTF NIL, {7,.t.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTO(16) RDDTESTF NIL, {12,.f.,.f.,.f.}, DBSKIP(-1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM<>2 .AND. FNUM<4 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM!=2 .AND. FNUM<4 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {2,.f.,.f.,.f.}, DBSKIP(1) RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) @@ -402,12 +402,12 @@ RDDTESTF "4", {16,.t.,.t.,.f.}, ORDSCOPE(1) RDDTESTF "4", {16,.t.,.t.,.f.}, ORDSCOPE(2) RDDTESTF "4", {16,.t.,.t.,.f.}, ORDSCOPE(3) RDDTESTF .t., {16,.t.,.t.,.f.}, ORDSCOPE(0,NIL) -RDDTESTC {15,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()<>5 DESCEND +RDDTESTC {15,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()!=5 DESCEND RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {6,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {4,.f.,.f.,.f.}, DBSKIP(1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()<>5 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()!=5 RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {4,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) diff --git a/harbour/tests/rddtest/cdxcl52.prg b/harbour/tests/rddtest/cdxcl52.prg index 1f55ce1487..a542b04efa 100644 --- a/harbour/tests/rddtest/cdxcl52.prg +++ b/harbour/tests/rddtest/cdxcl52.prg @@ -217,7 +217,7 @@ RDDTESTF NIL, {14,.f.,.f.,.f.}, DBGOTO(14) RDDTESTF NIL, {12,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTO(16) RDDTESTF NIL, {12,.f.,.f.,.f.}, DBSKIP(-1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM<>2 .AND. FNUM<4 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM!=2 .AND. FNUM<4 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {2,.f.,.f.,.f.}, DBSKIP(1) RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) @@ -257,12 +257,12 @@ RDDTESTC {16,.t.,.t.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM==6 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTOP() RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOBOTTOM() -RDDTESTC {15,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()<>5 DESCEND +RDDTESTC {15,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()!=5 DESCEND RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {8,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {16,.f.,.t.,.f.}, DBSKIP(1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()<>5 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()!=5 RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {6,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) diff --git a/harbour/tests/rddtest/cdxcl53.prg b/harbour/tests/rddtest/cdxcl53.prg index eec64c583a..a117860298 100644 --- a/harbour/tests/rddtest/cdxcl53.prg +++ b/harbour/tests/rddtest/cdxcl53.prg @@ -332,7 +332,7 @@ RDDTESTF NIL, {14,.f.,.f.,.f.}, DBGOTO(14) RDDTESTF NIL, {7,.t.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTO(16) RDDTESTF NIL, {12,.f.,.f.,.f.}, DBSKIP(-1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM<>2 .AND. FNUM<4 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM!=2 .AND. FNUM<4 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {2,.f.,.f.,.f.}, DBSKIP(1) RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) @@ -429,7 +429,7 @@ RDDTESTF "TG_C", {15,.f.,.f.,.f.}, ORDSETFOCUS(0) RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF .t., {2,.f.,.f.,.f.}, ORDSKIPUNIQUE() RDDTESTF .t., {1,.f.,.f.,.f.}, ORDSKIPUNIQUE(-1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM<>2 .AND. FNUM<4 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR FNUM!=2 .AND. FNUM<4 RDDTESTF NIL, {4,.f.,.f.,.f.}, DBGOTO(4) RDDTESTF .t., {3,.f.,.f.,.f.}, ORDSKIPUNIQUE(-1) RDDTESTF NIL, {4,.f.,.f.,.f.}, DBGOTO(4) @@ -438,7 +438,7 @@ RDDTESTF NIL, {13,.f.,.f.,.f.}, DBGOTO(13) RDDTESTF .t., {1,.t.,.f.,.f.}, ORDSKIPUNIQUE(-1) RDDTESTF NIL, {13,.f.,.f.,.f.}, DBGOTO(13) RDDTESTF .t., {16,.f.,.t.,.f.}, ORDSKIPUNIQUE() -RDDTESTC {15,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()<>5 DESCEND +RDDTESTC {15,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()!=5 DESCEND RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {6,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) @@ -447,7 +447,7 @@ RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF .t., {7,.f.,.f.,.f.}, ORDSKIPUNIQUE(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF .t., {3,.f.,.f.,.f.}, ORDSKIPUNIQUE() -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()<>5 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR tag TG_C to "_tst" FOR RECNO()!=5 RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {4,.f.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) diff --git a/harbour/tests/rddtest/ntxcl52.prg b/harbour/tests/rddtest/ntxcl52.prg index 9e9e3017c1..54113913f0 100644 --- a/harbour/tests/rddtest/ntxcl52.prg +++ b/harbour/tests/rddtest/ntxcl52.prg @@ -217,7 +217,7 @@ RDDTESTF NIL, {14,.f.,.f.,.f.}, DBGOTO(14) RDDTESTF NIL, {7,.t.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTO(16) RDDTESTF NIL, {12,.f.,.f.,.f.}, DBSKIP(-1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR FNUM<>2 .AND. FNUM<4 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR FNUM!=2 .AND. FNUM<4 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {2,.f.,.f.,.f.}, DBSKIP(1) RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) @@ -257,12 +257,12 @@ RDDTESTC {16,.t.,.t.,.f.}, INDEX on FSTR to TG_C FOR FNUM==6 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTOP() RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOBOTTOM() -RDDTESTC {13,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR RECNO()<>5 DESCEND +RDDTESTC {13,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR RECNO()!=5 DESCEND RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {13,.t.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {16,.f.,.t.,.f.}, DBSKIP(1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR RECNO()<>5 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR RECNO()!=5 RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {1,.t.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) diff --git a/harbour/tests/rddtest/ntxcl53.prg b/harbour/tests/rddtest/ntxcl53.prg index c95da627ea..4ca971e338 100644 --- a/harbour/tests/rddtest/ntxcl53.prg +++ b/harbour/tests/rddtest/ntxcl53.prg @@ -217,7 +217,7 @@ RDDTESTF NIL, {14,.f.,.f.,.f.}, DBGOTO(14) RDDTESTF NIL, {7,.t.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTO(16) RDDTESTF NIL, {12,.f.,.f.,.f.}, DBSKIP(-1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR FNUM<>2 .AND. FNUM<4 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR FNUM!=2 .AND. FNUM<4 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {2,.f.,.f.,.f.}, DBSKIP(1) RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) @@ -257,12 +257,12 @@ RDDTESTC {16,.t.,.t.,.f.}, INDEX on FSTR to TG_C FOR FNUM==6 RDDTESTF NIL, {1,.f.,.f.,.f.}, DBGOTO(1) RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOTOP() RDDTESTF NIL, {16,.t.,.t.,.f.}, DBGOBOTTOM() -RDDTESTC {13,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR RECNO()<>5 DESCEND +RDDTESTC {13,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR RECNO()!=5 DESCEND RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {13,.t.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {16,.f.,.t.,.f.}, DBSKIP(1) -RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR RECNO()<>5 +RDDTESTC {1,.f.,.f.,.f.}, INDEX on FSTR to TG_C FOR RECNO()!=5 RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5) RDDTESTF NIL, {1,.t.,.f.,.f.}, DBSKIP(-1) RDDTESTF NIL, {5,.f.,.f.,.f.}, DBGOTO(5)