')
@@ -206,16 +206,16 @@ event/method. Handler has a structure:
STATIC FUNC proc_handler(cMethod)
IF cMethod == "INIT"
- // This code is executed on entering URL (first call to this URL)
- // Here we open databases used to process queries
+ // This code is executed on entering URL (first call to this URL)
+ // Here we open databases used to process queries
ELSEIF cMethod == "POST"
- // Process HTTP POST request
+ // Process HTTP POST request
ELSEIF cMethod == "GET"
- // Process HTTP GET request
+ // Process HTTP GET request
ELSEIF cMethod == "EXIT"
- // This code is executed on leaving URL (before first call to
- // another URL)
- // Here we close databases opened in INIT method, etc.
+ // This code is executed on leaving URL (before first call to
+ // another URL)
+ // Here we close databases opened in INIT method, etc.
ENDIF
RETURN .T.
@@ -236,7 +236,7 @@ GUI applications to web easier.
The widgets are created on INIT method. The main widget is UWMain
object. Creation of widgets is done using a function following
Clipper convention: New(). So,
- oM := UWMainNew()
+ oM := UWMainNew()
creates a main widget of web page. This main widget acts as a
layout/container in for example, GTK+ library. It has :Add() method
and other widgets can be included inside of it. Ex.,
@@ -263,16 +263,16 @@ methods are called only after you request of new page.
Ex.,
GET request "items" executes:
- page_items("INIT")
- page_items("GET")
+ page_items( "INIT" )
+ page_items( "GET" )
Next GET request "items" executes:
- page_items("GET")
+ page_items( "GET" )
If you issue a GET "account" request, it will execute:
- page_items("EXIT")
- page_account("INIT")
- page_account("GET")
+ page_items( "EXIT" )
+ page_account( "INIT" )
+ page_account( "GET" )
A tree structure of URL is transfered into page handles INIT, EXIT
logic. It helps make some feeling of modal structure of handler. I call
@@ -280,7 +280,7 @@ it "modal" because of idea how event are processed in event handlers of
modal dialogs. Let's have event handler function items_handler() for
items dialog, and items_edit_handler() function for item_edit dialog.
- PROC items_handler()
+ PROCEDURE items_handler()
...
IF event = "edit button pressed"
@@ -290,7 +290,7 @@ items dialog, and items_edit_handler() function for item_edit dialog.
destroy_dialog( dialog )
ENDIF
...
- RETURN
+ RETURN
during process_event_loop() events are processed inside
items_edit_handler() function, and this event handler can access
@@ -300,23 +300,23 @@ The similar effect was tried to reach in page hadlers. Let's continue our
sample (last query was "account").
GET request for "items" executes:
- page_account("EXIT")
- page_items("INIT")
- page_items("GET")
+ page_account( "EXIT" )
+ page_items( "INIT" )
+ page_items( "GET" )
GET request for "items/edit" executes:
- page_items_edit("INIT") // no page_items("EXIT") !!!
- page_items_edit("GET")
+ page_items_edit( "INIT" ) // no page_items( "EXIT" ) !!!
+ page_items_edit( "GET" )
GET request for "account" executes:
- page_items_edit("EXIT")
- page_items("EXIT")
- page_account("INIT")
- page_account("GET")
+ page_items_edit( "EXIT" )
+ page_items( "EXIT" )
+ page_account( "INIT" )
+ page_account( "GET" )
GET request for "account/edit" executes:
- page_account_edit("INIT")
- page_account_edit("GET")
+ page_account_edit( "INIT" )
+ page_account_edit( "GET" )
etc...
diff --git a/harbour/contrib/hbhttpd/widgets.prg b/harbour/contrib/hbhttpd/widgets.prg
index 8a21dc07f2..3402c75326 100644
--- a/harbour/contrib/hbhttpd/widgets.prg
+++ b/harbour/contrib/hbhttpd/widgets.prg
@@ -353,7 +353,7 @@ FUNC UWBrowseNew()
METHOD AddColumn( nID, cTitle, cField, lRaw ) CLASS UWBrowse
- AAdd( Self:aColumns, { nID, cTitle, cField, !Empty( lRaw ) } )
+ AAdd( Self:aColumns, { nID, cTitle, cField, ! Empty( lRaw ) } )
RETURN Self
diff --git a/harbour/contrib/hbmisc/fileread.prg b/harbour/contrib/hbmisc/fileread.prg
index cb21f984e8..9af452ae84 100644
--- a/harbour/contrib/hbmisc/fileread.prg
+++ b/harbour/contrib/hbmisc/fileread.prg
@@ -106,7 +106,7 @@ METHOD ReadLine() CLASS TFileRead
ELSE
// Is there a whole line in the readahead buffer?
nPos := ::EOL_pos()
- WHILE ( nPos <= 0 .OR. nPos > Len( ::cBuffer ) - 3 ) .AND. !::lEOF
+ WHILE ( nPos <= 0 .OR. nPos > Len( ::cBuffer ) - 3 ) .AND. ! ::lEOF
// Either no or maybe, but there is possibly more to be read.
// Maybe means that we found either a CR or an LF, but we don't
// have enough characters to discriminate between the three types
@@ -217,7 +217,7 @@ METHOD MoreToRead() CLASS TFileRead
// Returns .T. if there is more to be read from either the file or the
// readahead buffer. Only when both are exhausted is there no more to read.
- RETURN !::lEOF .OR. !Empty( ::cBuffer )
+ RETURN ! ::lEOF .OR. ! Empty( ::cBuffer )
METHOD Error() CLASS TFileRead
diff --git a/harbour/contrib/hbmisc/hbedit.prg b/harbour/contrib/hbmisc/hbedit.prg
index 63c74a2c0c..180c5aa799 100644
--- a/harbour/contrib/hbmisc/hbedit.prg
+++ b/harbour/contrib/hbmisc/hbedit.prg
@@ -468,7 +468,7 @@ STATIC PROCEDURE EditorKeys( oEdit, nKey )
NEXT
CASE nKey == K_INS
- oEdit[ E_INSERT ] := !oEdit[ E_INSERT ]
+ oEdit[ E_INSERT ] := ! oEdit[ E_INSERT ]
Set( _SET_INSERT, oEdit[ E_INSERT ] )
SetCursor( iif( oEdit[ E_INSERT ], SC_NORMAL, SC_SPECIAL1 ) )
// SayInsert()
diff --git a/harbour/contrib/hbmysql/diff-en.txt b/harbour/contrib/hbmysql/diff-en.txt
index 077f405fc8..b148678298 100644
--- a/harbour/contrib/hbmysql/diff-en.txt
+++ b/harbour/contrib/hbmysql/diff-en.txt
@@ -55,28 +55,28 @@ Class TMySQLQuery -------------------------------------------
- Method TMySQLQuery:Bof()
Change in definition to reproduce Clipper behaviour
- BOF() true is applied when is tryed an movement before of first logical record,
+ Bof() true is applied when is tryed an movement before of first logical record,
and must not be used to indicate record pointer is placed on record 1
Previous definition cause processes like this:
- WHILE ! oQuery:BOF()
- ...
- oQuery:SKIP(-1)
+ WHILE ! oQuery:Bof()
+ ...
+ oQuery:SKIP( -1 )
ENDD
do not show record 1
With new definition this behaviour are corrected
- Method TMySQLQuery:Eof()
Change in definition to reproduce Clipper behaviour
- EOF() true is applied when is tryed an movement beyond of last logical record,
+ Eof() true is applied when is tryed an movement beyond of last logical record,
and must not be used to indicate record pointer is placed on last record
Previous definition cause processes like this:
- WHILE ! oQuery:EOF()
- ...
- oQuery:SKIP()
- ENDD
+ WHILE ! oQuery:Eof()
+ ...
+ oQuery:SKIP()
+ ENDDO
do not show last record
With new definition this behaviour are corrected
- With EOF() true, record pointer is placed in LASTREC()+1
+ With Eof() true, record pointer is placed in LASTREC()+1
- TMySQLQuery:New()
Application of TMySQLQuery:lBof, TMySQLQuery:lEof, TMySQLQuery:lFieldAsData,
@@ -85,7 +85,7 @@ Class TMySQLQuery -------------------------------------------
- TMySQLQuery:Skip()
Application of TMySQLQuery:lBof, TMySQLQuery:lEof to determinate movements
before of first and beyond of last logical records
- Only SKIP movement can set BOF() true
+ Only SKIP movement can set Bof() true
- TMySQLQuery:Skip()
Apply NIL for return. DBSKIP() return NIL
@@ -94,7 +94,7 @@ Class TMySQLQuery -------------------------------------------
Application of TMySQLQuery:lBof, TMySQLQuery:lEof, TMySQLQuery:lFieldAsData,
TMySQLQuery:aRow
= TMySQLQuery:aRow is used in place of local variable aRow
- = Default row is applied to TMySQLQuery:nCurRow, in place to move record pointer
+ = Default row is applied to TMySQLQuery:nCurRow, in place to move record pointer
position
= TMySQLQuery:lBof, TMySQLQuery:lEof are determinated
TMySQLQuery:bof(): pointer is placed in row 1
@@ -124,18 +124,18 @@ Class TMySQLTable -------------------------------------------
- Method TMySQLTable:Update()
= Parameters added:
+ lOldRecord: Use original values of record for locate it
- + lRefresh: refresh query to MySQL server to update information
+ + lRefresh: refresh query to MySQL server to update information
selected for Client program
- Method TMySQLTable:Delete()
= Parameters added:
+ lOldRecord: Use original values of record for locate it
- + lRefresh: refresh query to MySQL server to update information
+ + lRefresh: refresh query to MySQL server to update information
selected for Client program
- Method TMySQLTable:Append()
= Parameters added:
- + lRefresh: refresh query to MySQL server to update information
+ + lRefresh: refresh query to MySQL server to update information
selected for Client program
- Method TMySQLTable:GetBlankRow()
@@ -155,13 +155,13 @@ Class TMySQLTable -------------------------------------------
In case of lOldRecord application:
* Using current row: Use values of TMySQLQuery:aOldValue
* Using given row: Use values of TMySQLRow:aOriValue
- Locating is based in matching of values of ALL fields,
+ Locating is based in matching of values of ALL fields,
using original values of row
WARNING: If there are more than one row matching in ALL fields, then
all this rows with common values will be changed
- This approach is applied to help in row locating when there are not indexes,
- or primary key are not enought to determinate record unicity.
+ This approach is applied to help in row locating when there are not indexes,
+ or primary key are not enought to determinate record unicity.
But, can not be guaranted record correspondence if there are many equals
This is an alternative to use of TMySQLRow/TMySQLTable:MakePrimaryKeyWhere(), because
this last is based in fields belonging to an primary key
@@ -171,7 +171,7 @@ Class TMySQLTable -------------------------------------------
Is very convenient in case of information changes
= Same record pointer is keep
-
+
= For an given row, TMySQLRow:aOriValue is updated with current values of
TMySQLRow:aRow
@@ -182,13 +182,13 @@ Class TMySQLTable -------------------------------------------
In case of lOldRecord application:
* Using current row: Use values of TMySQLQuery:aOldValue
* Using given row: Use values of TMySQLRow:aOriValue
- Locating is based in matching of values of ALL fields,
+ Locating is based in matching of values of ALL fields,
using original values of row
WARNING: If there are more than one row matching in ALL fields, then
all this rows with common values will be changed
- This approach is applied to help in row locating when there are not indexes,
- or primary key are not enought to determinate record unicity.
+ This approach is applied to help in row locating when there are not indexes,
+ or primary key are not enought to determinate record unicity.
But, can not be guaranted record correspondence if there are many equals
This is an alternative to use of TMySQLRow/TMySQLTable:MakePrimaryKeyWhere(), because
this last is based in fields belonging to an primary key
@@ -198,7 +198,7 @@ Class TMySQLTable -------------------------------------------
Is very convenient in case of information changes
= Same record pointer is keep
-
+
= For an given row, TMySQLRow:aOriValue is updated with current values of
TMySQLRow:aRow
@@ -243,6 +243,5 @@ Class TMySQLTable -------------------------------------------
Program TSqlBrw.prg ************************************
- Skipper()
- Modification of movement control in order to apply new definitions of
+ Modification of movement control in order to apply new definitions of
TMySQLQuery:Bof() and TMySQLQuery:Eof()
-
diff --git a/harbour/contrib/hbmysql/diff-es.txt b/harbour/contrib/hbmysql/diff-es.txt
index 39f35a746f..503e129c69 100644
--- a/harbour/contrib/hbmysql/diff-es.txt
+++ b/harbour/contrib/hbmysql/diff-es.txt
@@ -55,28 +55,28 @@ Clase TMySQLQuery -------------------------------------------
- Metodo TMySQLQuery:Bof()
Cambio en la definicion para reproducir el comportamiento con Clipper
- BOF() verdadero se aplica cuando se intenta ir antes del primer registro logico,
+ Bof() verdadero se aplica cuando se intenta ir antes del primer registro logico,
y no debe usarse para indicar que el puntero esta en el registro 1
La definicion anterior causa que procesos como:
- WHILE ! oQuery:BOF()
- ...
- oQuery:SKIP(-1)
+ WHILE ! oQuery:Bof()
+ ...
+ oQuery:SKIP( -1 )
ENDD
no muestren el registro 1
Con la nueva definicion se corrige este comportamiento
- Metodo TMySQLQuery:Eof()
Cambio en la definicion para reproducir el comportamiento con Clipper
- EOF() verdadero se aplica cuando se intenta ir despues del ultimo registro logico,
+ Eof() verdadero se aplica cuando se intenta ir despues del ultimo registro logico,
y no debe usarse para indicar que el puntero esta en el ultimo registro
La definicion anterior causa que procesos como:
- WHILE ! oQuery:EOF()
- ...
- oQuery:SKIP()
- ENDD
+ WHILE ! oQuery:Eof()
+ ...
+ oQuery:SKIP()
+ ENDDO
no muestren el ultimo registro
Con la nueva definicion se corrige este comportamiento
- Con EOF() verdadero, el puntero de registro se ubica en LASTREC()+1
+ Con Eof() verdadero, el puntero de registro se ubica en LASTREC()+1
- TMySQLQuery:New()
Aplicacion de TMySQLQuery:lBof, TMySQLQuery:lEof, TMySQLQuery:lFieldAsData,
@@ -85,7 +85,7 @@ Clase TMySQLQuery -------------------------------------------
- TMySQLQuery:Skip()
Aplicacion de TMySQLQuery:lBof, TMySQLQuery:lEof para determinar movimientos
antes del primer y despues del ultimo registros logicos
- Solamente el movimiento con SKIP puede establecer BOF() verdadero
+ Solamente el movimiento con SKIP puede establecer Bof() verdadero
- TMySQLQuery:Skip()
Aplicar NIL para retorno. DBSKIP() retorna NIL
@@ -94,7 +94,7 @@ Clase TMySQLQuery -------------------------------------------
Aplicacion de TMySQLQuery:lBof, TMySQLQuery:lEof, TMySQLQuery:lFieldAsData,
TMySQLQuery:aRow
= Se usar TMySQLQuery:aRow en lugar de la variable local aRow
- = La fila por omision se aplica a TMySQLQuery:nCurRow, en lugar de mover la
+ = La fila por omision se aplica a TMySQLQuery:nCurRow, en lugar de mover la
posicion del puntero
= Se determinan TMySQLQuery:lBof, TMySQLQuery:lEof
TMySQLQuery:bof(): el puntero queda ubicado en fila 1
@@ -156,13 +156,13 @@ Clase TMySQLTable -------------------------------------------
En caso de aplicar lOldRecord:
* Usando fila actual: Utiliza los valores TMySQLQuery:aOldValue
* Usando fila proporcionada: Utiliza los valores TMySQLRow:aOriValue
- La localizacion se basa en la coincidencia de valores de TODOS los campos,
+ La localizacion se basa en la coincidencia de valores de TODOS los campos,
usando los valores originales de la fila
ADVERTENCIA: Si hay mas de una fila que coincida en TODOS los campos, entonces
todas estas filas con valores comunes seran cambiadas
Se aplico esta aproximacion para auxiliar en la localizacion de filas cuando
- no existen indices, o la llave primaria es insuficiente para determinar la
+ no existen indices, o la llave primaria es insuficiente para determinar la
unicidad del registro. Sin embargo, no se puede garantizar la correspondencia
del registro si existen varios iguales
Es una alternativa al uso de TMySQLRow/TMySQLTable:MakePrimaryKeyWhere(), ya que
@@ -173,7 +173,7 @@ Clase TMySQLTable -------------------------------------------
para el programa Cliente. Es muy conveniente en caso de modificacion de informacion
= Se mantiene el mismo apuntador de registro
-
+
= Para una fila proporcionada, se actualiza TMySQLRow:aOriValue con los valores
actuales de TMySQLRow:aRow
@@ -190,7 +190,7 @@ Clase TMySQLTable -------------------------------------------
todas estas filas con valores comunes seran cambiadas
Se aplico esta aproximacion para auxiliar en la localizacion de filas cuando
- no existen indices, o la llave primaria es insuficiente para determinar la
+ no existen indices, o la llave primaria es insuficiente para determinar la
unicidad del registro. Sin embargo, no se puede garantizar la correspondencia
del registro si existen varios iguales
Es una alternativa al uso de TMySQLRow/TMySQLTable:MakePrimaryKeyWhere(), ya que
@@ -201,7 +201,7 @@ Clase TMySQLTable -------------------------------------------
para el programa Cliente. Es muy conveniente en caso de modificacion de informacion
= Se mantiene el mismo apuntador de registro
-
+
= Para una fila proporcionada, se actualiza TMySQLRow:aOriValue con los valores
actuales de TMySQLRow:aRow
@@ -216,10 +216,10 @@ Clase TMySQLTable -------------------------------------------
= Se ubica el apuntador en TMySQLTable:lastrec()+1, antes de renovar la consulta
Observacion: a pesar de reiteradas pruebas, no se pudo determinar en que manera
establece el servidor MySQL la posicion de la fila insertada. Sin usar indices, en
- ocasiones la insertaba adjunta al puntero actual, en tanto que en otras ocasiones
+ ocasiones la insertaba adjunta al puntero actual, en tanto que en otras ocasiones
la insertaba en posiciones ubicadas a 1200 o 1300 filas con respecto al puntero
actual, o al final de la tabla (alrededor de 2880 filas)
-
+
= Para una fila proporcionada, se actualiza TMySQLRow:aOriValue con los valores
actuales de TMySQLRow:aRow
Ademas, se inicializan TMySQLRow:aDirty y TMySQLRow:aOldValue
@@ -248,4 +248,3 @@ Programa TSqlBrw.prg ************************************
- Skipper()
Modificacion del control de movimiento para aplicar las nuevas definiciones para
TMySQLQuery:Bof() y TMySQLQuery:Eof()
-
diff --git a/harbour/contrib/hbmysql/tests/dbf2mysq.prg b/harbour/contrib/hbmysql/tests/dbf2mysq.prg
index 857d2595dc..e6411e4649 100644
--- a/harbour/contrib/hbmysql/tests/dbf2mysq.prg
+++ b/harbour/contrib/hbmysql/tests/dbf2mysq.prg
@@ -145,7 +145,7 @@ PROCEDURE Main( ... )
QUIT
ENDIF
- DO WHILE ! dbffile->( EOF() ) .AND. Inkey() != K_ESC
+ DO WHILE ! dbffile->( Eof() ) .AND. Inkey() != K_ESC
oRecord := oTable:GetBlankRow()
diff --git a/harbour/contrib/hbmysql/tmysql.prg b/harbour/contrib/hbmysql/tmysql.prg
index 1ff1ddde4f..6180b07f50 100644
--- a/harbour/contrib/hbmysql/tmysql.prg
+++ b/harbour/contrib/hbmysql/tmysql.prg
@@ -430,7 +430,7 @@ METHOD Skip( nRows ) CLASS TMySQLQuery
// DAVID: ::nCurRow := Max( ::nCurRow + nRows, 1 )
IF ( ( ::RecNo() + nRows ) + 0 ) < 1
nRows := - ::RecNo() + 1
- // Clipper: only SKIP movement can set BOF() to .T.
+ // Clipper: only SKIP movement can set Bof() to .T.
::lBof := .T. // Try to skip before first record
ENDIF
ELSE
@@ -445,7 +445,7 @@ METHOD Skip( nRows ) CLASS TMySQLQuery
::nCurRow := ::nCurRow + nRows
// DAVID: maintain ::bof() true until next movement
- // Clipper: only SKIP movement can set BOF() to .T.
+ // Clipper: only SKIP movement can set Bof() to .T.
lbof := ::Bof()
// mysql_data_seek( ::nResultHandle, ::nCurRow - 1 )
@@ -556,8 +556,8 @@ METHOD GetRow( nRow ) CLASS TMySQLQuery
OTHERWISE
- // DAVID: Alert( "Unknown type from SQL Server Field: " + hb_NToS( i ) + " is type " + hb_NToS( ::aFieldStruct[ i ][ MYSQL_FS_TYPE ] ) )
- // ? "Unknown type from SQL Server Field: " + hb_NToS( i ) + " is type " + hb_NToS( ::aFieldStruct[ i ][ MYSQL_FS_TYPE ] )
+ // DAVID: Alert( "Unknown type from SQL Server Field: " + hb_ntos( i ) + " is type " + hb_ntos( ::aFieldStruct[ i ][ MYSQL_FS_TYPE ] ) )
+ // ? "Unknown type from SQL Server Field: " + hb_ntos( i ) + " is type " + hb_ntos( ::aFieldStruct[ i ][ MYSQL_FS_TYPE ] )
ENDSWITCH
@@ -1429,9 +1429,9 @@ METHOD CreateTable( cTable, aStruct, cPrimaryKey, cUniqueKey, cAuto ) CLASS TMyS
CASE "N"
/*
IF aStruct[ i ][ DBS_DEC ] == 0
- ::cCreateQuery += aStruct[ i ][ DBS_NAME ] + " int(" + hb_NToS( aStruct[ i ][ DBS_LEN ] ) + ")" + Eval( cNN, aStruct[ i ] ) + iif( aStruct[ i ][ DBS_NAME ] == cPrimaryKey, " NOT NULL ", "" ) + iif( aStruct[ i ][ DBS_NAME ] == cAuto, " auto_increment ", "" ) + ","
+ ::cCreateQuery += aStruct[ i ][ DBS_NAME ] + " int(" + hb_ntos( aStruct[ i ][ DBS_LEN ] ) + ")" + Eval( cNN, aStruct[ i ] ) + iif( aStruct[ i ][ DBS_NAME ] == cPrimaryKey, " NOT NULL ", "" ) + iif( aStruct[ i ][ DBS_NAME ] == cAuto, " auto_increment ", "" ) + ","
ELSE
- ::cCreateQuery += aStruct[ i ][ DBS_NAME ] + " real(" + hb_NToS( aStruct[ i ][ DBS_LEN ] ) + "," + hb_NToS( aStruct[ i ][ DBS_DEC ] ) + ")" + Eval( cNN, aStruct[ i ] ) + ","
+ ::cCreateQuery += aStruct[ i ][ DBS_NAME ] + " real(" + hb_ntos( aStruct[ i ][ DBS_LEN ] ) + "," + hb_ntos( aStruct[ i ][ DBS_DEC ] ) + ")" + Eval( cNN, aStruct[ i ] ) + ","
ENDIF
*/
IF aStruct[ i ][ DBS_DEC ] == 0 .AND. aStruct[ i ][ DBS_LEN ] <= 18
diff --git a/harbour/contrib/hbmysql/tsqlbrw.prg b/harbour/contrib/hbmysql/tsqlbrw.prg
index 9fbf1ed23b..ea8f67ccda 100644
--- a/harbour/contrib/hbmysql/tsqlbrw.prg
+++ b/harbour/contrib/hbmysql/tsqlbrw.prg
@@ -272,7 +272,7 @@ METHOD EditField() CLASS TBrowseSQL
::oCurRow:FieldPut( oCol:nFieldNum, cMemo )
/* NOTE: To do in a better way */
- IF !::oQuery:Update( ::oCurRow )
+ IF ! ::oQuery:Update( ::oCurRow )
Alert( Left( ::oQuery:Error(), 60 ) )
ENDIF
ENDIF
@@ -301,7 +301,7 @@ METHOD EditField() CLASS TBrowseSQL
endif
- IF !::oQuery:Refresh()
+ IF ! ::oQuery:Refresh()
Alert( ::oQuery:Error() )
ENDIF
@@ -337,7 +337,7 @@ METHOD BrowseTable( lCanEdit, aExitKeys ) CLASS TBrowseSQL
DO WHILE lKeepGoing
- DO WHILE !::Stabilize() .AND. NextKey() == 0
+ DO WHILE ! ::Stabilize() .AND. NextKey() == 0
ENDDO
nKey := Inkey( 0 )
@@ -399,7 +399,7 @@ METHOD BrowseTable( lCanEdit, aExitKeys ) CLASS TBrowseSQL
IF ! ::oQuery:Delete( ::oCurRow )
Alert( "not deleted " + ::oQuery:Error() )
ENDIF
- IF !::oQuery:Refresh()
+ IF ! ::oQuery:Refresh()
Alert( ::oQuery:Error() )
ENDIF
diff --git a/harbour/contrib/hbnetio/tests/netiot03.prg b/harbour/contrib/hbnetio/tests/netiot03.prg
index 83596c1d90..6b615742f1 100644
--- a/harbour/contrib/hbnetio/tests/netiot03.prg
+++ b/harbour/contrib/hbnetio/tests/netiot03.prg
@@ -67,11 +67,11 @@ proc main()
nSec := seconds() + 3
while seconds() < nSec
xData := NETIO_GETDATA( nStream1 )
- if !empty( xData )
+ if ! empty( xData )
? hb_valToExp( xData )
endif
xData := NETIO_GETDATA( nStream2 )
- if !empty( xData )
+ if ! empty( xData )
?? "", hb_valToExp( xData )
endif
enddo
@@ -81,8 +81,8 @@ proc main()
wait
lExists := netio_funcexec( "HB_DirExists", "./data" )
- ? "Directory './data'", iif( !lExists, "not exists", "exists" )
- if !lExists
+ ? "Directory './data'", iif( ! lExists, "not exists", "exists" )
+ if ! lExists
? "Creating directory './data' ->", ;
iif( netio_funcexec( "hb_DirCreate", "./data" ) == -1, "error", "OK" )
endif
@@ -150,7 +150,7 @@ proc testdb( cName )
next
ordSetFocus( 1 )
dbgotop()
- while !eof()
+ while ! eof()
if ! field->F1 == field->F2
? "error at record:", recno()
? " ! '" + field->F1 + "' == '" + field->F2 + "'"
@@ -178,7 +178,7 @@ return nStream
static func rpc_timer( pConnSock, nStream )
while .t.
- if !netio_srvSendItem( pConnSock, nStream, time() )
+ if ! netio_srvSendItem( pConnSock, nStream, time() )
? "CLOSED STREAM:", nStream
exit
endif
@@ -189,7 +189,7 @@ return nil
static func rpc_charstream( pConnSock, nStream )
local n := 0
while .t.
- if !netio_srvSendData( pConnSock, nStream, chr( asc( "A" ) + n ) )
+ if ! netio_srvSendData( pConnSock, nStream, chr( asc( "A" ) + n ) )
? "CLOSED STREAM:", nStream
exit
endif
diff --git a/harbour/contrib/hbnetio/tests/netiotst.prg b/harbour/contrib/hbnetio/tests/netiotst.prg
index c728e544ed..2d618ea8a5 100644
--- a/harbour/contrib/hbnetio/tests/netiotst.prg
+++ b/harbour/contrib/hbnetio/tests/netiotst.prg
@@ -50,8 +50,8 @@ proc main()
?
lExists := netio_funcexec( "HB_DirExists", "./data" )
- ? "Directory './data'", iif( !lExists, "not exists", "exists" )
- if !lExists
+ ? "Directory './data'", iif( ! lExists, "not exists", "exists" )
+ if ! lExists
? "Creating directory './data' ->", ;
iif( netio_funcexec( "hb_DirCreate", "./data" ) == -1, "error", "OK" )
endif
@@ -116,7 +116,7 @@ proc testdb( cName )
next
ordSetFocus( 1 )
dbgotop()
- while !eof()
+ while ! eof()
if ! field->F1 == field->F2
? "error at record:", recno()
? " ! '" + field->F1 + "' == '" + field->F2 + "'"
diff --git a/harbour/contrib/hbnf/doc/en/fttext.txt b/harbour/contrib/hbnf/doc/en/fttext.txt
index 3c14857c2c..19bc5110d1 100644
--- a/harbour/contrib/hbnf/doc/en/fttext.txt
+++ b/harbour/contrib/hbnf/doc/en/fttext.txt
@@ -138,7 +138,7 @@
$EXAMPLES$
FT_FUSE( "text.c" ) // open text file
- DO WHILE !FT_FEOF()
+ DO WHILE ! FT_FEOF()
? FT_FREADLN() // read thru file
@@ -537,7 +537,7 @@
FT_FUSE( "config.sys" )
- DO WHILE Upper( FT_FREADLN() ) != "FILES=" .AND. !F_FEOF()
+ DO WHILE Upper( FT_FREADLN() ) != "FILES=" .AND. ! F_FEOF()
FT_FSKIP()
diff --git a/harbour/contrib/hbodbc/browodbc.prg b/harbour/contrib/hbodbc/browodbc.prg
index a108de35ca..d7fcbb28ae 100644
--- a/harbour/contrib/hbodbc/browodbc.prg
+++ b/harbour/contrib/hbodbc/browodbc.prg
@@ -110,7 +110,7 @@ FUNCTION BrowseODBC( nTop, nLeft, nBottom, nRight, oDataSource )
DO WHILE ! lExit
IF nKey == 0
- DO WHILE !oBrw:stabilize() .AND. NextKey() == 0
+ DO WHILE ! oBrw:stabilize() .AND. NextKey() == 0
ENDDO
ENDIF
diff --git a/harbour/contrib/hbodbc/tests/odbcdemo.prg b/harbour/contrib/hbodbc/tests/odbcdemo.prg
index cf310479f0..8b031ba7ee 100644
--- a/harbour/contrib/hbodbc/tests/odbcdemo.prg
+++ b/harbour/contrib/hbodbc/tests/odbcdemo.prg
@@ -69,7 +69,7 @@ PROCEDURE Main()
PadR( dsFunctions:FieldByName( "City" ):FieldName, 40 ) ;
COLOR "B/W"
- DO WHILE !dsFunctions:Eof()
+ DO WHILE ! dsFunctions:Eof()
? " " + ;
PadR( dsFunctions:FieldByName( "First" ):Value, 3 ), "|", ;
PadR( dsFunctions:FieldByName( "Last" ):Value, 15 ), "|", ;
diff --git a/harbour/contrib/hbodbc/todbc.prg b/harbour/contrib/hbodbc/todbc.prg
index e5816946ab..5f2283df02 100644
--- a/harbour/contrib/hbodbc/todbc.prg
+++ b/harbour/contrib/hbodbc/todbc.prg
@@ -531,7 +531,7 @@ METHOD Next() CLASS TODBC
IF ::nRecNo > ::nRecCount
::nRecCount := ::nRecNo
ENDIF
- ELSEIF nResult == SQL_NO_DATA_FOUND .AND. ::nRecNo == ::nRecCount // permit skip on last row, so that EOF() can work properly
+ ELSEIF nResult == SQL_NO_DATA_FOUND .AND. ::nRecNo == ::nRecCount // permit skip on last row, so that Eof() can work properly
::nRecno := ::nRecno + 1
ELSE
// TODO: Error handling
diff --git a/harbour/contrib/hbtip/ftpcli.prg b/harbour/contrib/hbtip/ftpcli.prg
index 22ea9b24b3..90f843ba96 100644
--- a/harbour/contrib/hbtip/ftpcli.prg
+++ b/harbour/contrib/hbtip/ftpcli.prg
@@ -416,7 +416,7 @@ METHOD UserCommand( cCommand, lPasv, lReadPort, lGetReply ) CLASS tIPClientFTP
hb_default( @lReadPort, .T. )
hb_default( @lGetReply, .F. )
- IF ::bUsePasv .AND. lPasv .AND. !::Pasv()
+ IF ::bUsePasv .AND. lPasv .AND. ! ::Pasv()
RETURN .F.
ENDIF
diff --git a/harbour/contrib/hbwin/tests/olesrv1.prg b/harbour/contrib/hbwin/tests/olesrv1.prg
index 682f5cdb56..00aac12485 100644
--- a/harbour/contrib/hbwin/tests/olesrv1.prg
+++ b/harbour/contrib/hbwin/tests/olesrv1.prg
@@ -134,7 +134,7 @@ METHOD Eval( cMethodName, ... ) CLASS OleNetioSrv
BEGIN SEQUENCE WITH {| oErr | Break( oErr ) }
SWITCH cMethodName
CASE "CONNECT"
- xRetVal := !Empty( ::pConn := NETIO_GETCONNECTION( ... ) )
+ xRetVal := ! Empty( ::pConn := NETIO_GETCONNECTION( ... ) )
EXIT
CASE "DISCONNECT"
::pConn := NIL
diff --git a/harbour/contrib/rddads/ads.ch b/harbour/contrib/rddads/ads.ch
index 271704631e..75f84158fb 100644
--- a/harbour/contrib/rddads/ads.ch
+++ b/harbour/contrib/rddads/ads.ch
@@ -309,14 +309,14 @@
=> IF AdsIsServerLoaded( <(db)> ) > 0 ;
; dbUseArea( ;
<.new.>, , <(db)>, <(a)>, ;
- iif( <.sh.> .OR. <.ex.>, !<.ex.>, NIL ), <.ro.> ;
+ iif( <.sh.> .OR. <.ex.>, ! <.ex.>, NIL ), <.ro.> ;
) ;
[; dbSetIndex( <(index1)> )] ;
[; dbSetIndex( <(indexn)> )] ;
; ELSE ;
; dbUseArea( ;
<.new.>, , <(db)>, <(a)>, ;
- iif( <.sh.> .OR. <.ex.>, !<.ex.>, NIL ), <.ro.> ;
+ iif( <.sh.> .OR. <.ex.>, ! <.ex.>, NIL ), <.ro.> ;
) ;
[; dbSetIndex( <(index1)> )] ;
[; dbSetIndex( <(indexn)> )] ;
diff --git a/harbour/contrib/rddsql/readme.txt b/harbour/contrib/rddsql/readme.txt
index d91e1b5459..4792d7c336 100644
--- a/harbour/contrib/rddsql/readme.txt
+++ b/harbour/contrib/rddsql/readme.txt
@@ -22,10 +22,10 @@ emulated by creating additional table columns to store delete flag. Some
record and file locks in DBF style. The idea of SQL query is also lost. If
you do a simple loop
- DBUSEAREA(, "select * from my_table")
- DO WHILE ! EOF()
- somefunc( FIELD->some_sql_field )
- DBSKIP()
+ dbUseArea(, "select * from my_table" )
+ DO WHILE ! Eof()
+ somefunc( FIELD->some_sql_field )
+ dbSkip()
ENDDO
RDD usualy will read SQL rows in portions, let's say 100 records per query.
@@ -59,7 +59,7 @@ queries should be made explicitly by programmer. SSI gives access to query
result via RDD interface, it does not tries to emulate DBF and be
"plug-and-play" solution for DBF to SQL migration. If you do
- DBUSEAREA(, "select * from my_table")
+ dbUseArea(, "select * from my_table")
all query (it could contain millions of records!) will be cached.
@@ -70,15 +70,15 @@ all query (it could contain millions of records!) will be cached.
about additional DELETED column, _RECNO in the end of index expression, etc.
Access of SQL database of other applications is sometimes not possible.
-- It's query oriented. That means a simple DO WHILE ! EOF() loop will iterate
+- It's query oriented. That means a simple DO WHILE ! Eof() loop will iterate
each records once and only once. This is not true for "plug-and-play" SQL
drivers, if indexing is used. Just like in the case of loop over DBF file.
It is not guaranteed that all records are included! Yes! If key value of the
first record in index is changed to be the last record in index during the
- phase of record processing, DO WHILE ! EOF() loop will iterate only this
+ phase of record processing, DO WHILE ! Eof() loop will iterate only this
single records even if the database contains millions of records. Your sould
do FLOCK() on DBF to guarantee the records are not changed. Do you use FLOCK()
- before readonly DO WHILE ! EOF() loops? :)
+ before readonly DO WHILE ! Eof() loops? :)
diff --git a/harbour/contrib/sddodbc/tests/test2.prg b/harbour/contrib/sddodbc/tests/test2.prg
index 2dd04ea23b..536ed415af 100644
--- a/harbour/contrib/sddodbc/tests/test2.prg
+++ b/harbour/contrib/sddodbc/tests/test2.prg
@@ -26,7 +26,7 @@ PROCEDURE Main()
? rddInfo( RDDI_EXECUTE, "INSERT INTO country values ('LTU', 'Lithuania', 3369600),('USA', 'United States of America', 305397000), ('POR', 'Portugal', 10617600), ('POL', 'Poland', 38115967), ('AUS', 'Australia', 21446187), ('FRA', 'France', 64473140), ('RUS', 'Russia', 141900000)" )
? dbUseArea( .T., , "SELECT * FROM country", "country" )
? "LASTREC:", LastRec()
- DO WHILE ! EOF()
+ DO WHILE ! Eof()
aI := Array( FCount() )
FOR nI := 1 TO FCount()
aI[nI] := FieldGet( nI )
diff --git a/harbour/contrib/xhb/dbf2txt.c b/harbour/contrib/xhb/dbf2txt.c
index 9be2d8b954..225eeabcfd 100644
--- a/harbour/contrib/xhb/dbf2txt.c
+++ b/harbour/contrib/xhb/dbf2txt.c
@@ -210,7 +210,7 @@ HB_FUNC( DBF2TEXT )
while( ( nCount == -1 || nCount > 0 ) &&
( ! pWhile || hb_itemGetL( hb_vmEvalBlock( pWhile ) ) ) )
{
- /* While !BOF() .AND. !EOF() */
+ /* WHILE ! Bof() .AND. ! Eof() */
SELF_EOF( pArea, &bEof );
SELF_BOF( pArea, &bBof );
diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch
index 8afe774236..6ef3100ab3 100644
--- a/harbour/contrib/xhb/hbcompat.ch
+++ b/harbour/contrib/xhb/hbcompat.ch
@@ -57,10 +57,10 @@
#ifdef __XHARBOUR__
- #if defined( __PLATFORM__Windows ) .AND. !defined( __PLATFORM__WINDOWS )
+ #if defined( __PLATFORM__Windows ) .AND. ! defined( __PLATFORM__WINDOWS )
#define __PLATFORM__WINDOWS
#endif
- #if defined( __PLATFORM__Linux ) .AND. !defined( __PLATFORM__LINUX )
+ #if defined( __PLATFORM__Linux ) .AND. ! defined( __PLATFORM__LINUX )
#define __PLATFORM__LINUX
#endif
@@ -257,10 +257,10 @@
#else
- #if defined( __PLATFORM__WINDOWS ) .AND. !defined( __PLATFORM__Windows )
+ #if defined( __PLATFORM__WINDOWS ) .AND. ! defined( __PLATFORM__Windows )
#define __PLATFORM__Windows
#endif
- #if defined( __PLATFORM__LINUX ) .AND. !defined( __PLATFORM__Linux )
+ #if defined( __PLATFORM__LINUX ) .AND. ! defined( __PLATFORM__Linux )
#define __PLATFORM__Linux
#endif
@@ -275,27 +275,27 @@
#xtranslate MaxRow(.T.) => hb_gtInfo( HB_GTI_VIEWPORTHEIGHT )
#xtranslate MaxCol(.T.) => hb_gtInfo( HB_GTI_VIEWPORTWIDTH )
- #xtranslate NextKey([]) => hb_keyNext()
+ #xtranslate NextKey( [] ) => hb_keyNext( )
- #xtranslate Str(,[],[],) => iif(, hb_NToS(), Str())
+ #xtranslate Str(,[],[],) => iif( , hb_ntos( ), Str( ) )
#xuntranslate NetName( =>
#xuntranslate MemoWrit( =>
- #xtranslate NetName() => iif( HB_ISNUMERIC( ) .AND. == 1, hb_UserName(), NetName() )
- #xtranslate MemoWrit(,,) => iif( HB_ISLOGICAL( ) .AND. ! , hb_MemoWrit(,), MemoWrit(,) )
+ #xtranslate NetName( ) => iif( HB_ISNUMERIC( ) .AND. == 1, hb_UserName(), NetName() )
+ #xtranslate MemoWrit( , , ) => iif( HB_ISLOGICAL( ) .AND. ! , hb_MemoWrit( , ), MemoWrit( , ) )
#xuntranslate AIns( =>
#xuntranslate ADel( =>
- #xtranslate AIns(,,[]) => hb_AIns(,,)
- #xtranslate ADel(,,) => hb_ADel(,,)
+ #xtranslate AIns(,,[]) => hb_AIns( , , )
+ #xtranslate ADel(,,) => hb_ADel( , , )
- #xtranslate AScan(,,[],[],) => hb_AScan(,,,,)
- #xtranslate At(,,[]) => hb_At(,,)
+ #xtranslate AScan(,,[],[],) => hb_AScan( , , , , )
+ #xtranslate At(,,[]) => hb_At( , , )
- #xtranslate GetEnv([]) => hb_GetEnv()
- #xtranslate SetKey([]) => hb_SetKey()
+ #xtranslate GetEnv([]) => hb_GetEnv( )
+ #xtranslate SetKey([]) => hb_SetKey( )
/* TEXT INTO */
#xcommand TEXT INTO => #pragma __text|+=%s+hb_eol();:=""
@@ -342,67 +342,67 @@
/* These also have wrapper function in xhb lib */
- #xtranslate gtSetClipboard() => hb_gtInfo( HB_GTI_CLIPBOARDDATA, )
+ #xtranslate gtSetClipboard( ) => hb_gtInfo( HB_GTI_CLIPBOARDDATA, )
#xtranslate gtGetClipboard() => hb_gtInfo( HB_GTI_CLIPBOARDDATA )
#xtranslate gtGetClipBoardSize() => Len( hb_gtInfo( HB_GTI_CLIPBOARDDATA ) )
#xtranslate gtPasteClipBoard() => hb_gtInfo( HB_GTI_CLIPBOARDPASTE )
#xtranslate gtProcessMessages() => NextKey()
#xtranslate SetInkeyBeforeBlock([]) => hb_gtInfo( HB_GTI_INKEYREAD [, ] ) <-x->
#xtranslate SetInkeyAfterBlock([]) => hb_gtInfo( HB_GTI_INKEYFILTER [, ] ) <-x->
- #xtranslate gfxPrimitive([]) => hb_gfxPrimitive()
- #xtranslate gfxText([]) => hb_gfxText()
+ #xtranslate gfxPrimitive([]) => hb_gfxPrimitive( )
+ #xtranslate gfxText([]) => hb_gfxText( )
- #xtranslate hb_openProcess([]) => hb_processOpen()
- #xtranslate hb_closeProcess([]) => hb_processClose()
+ #xtranslate hb_openProcess([]) => hb_processOpen( )
+ #xtranslate hb_closeProcess([]) => hb_processClose( )
- #xtranslate hb_isregexstring([]) => hb_isregex()
- #xtranslate methodName([]) => hb_methodName()
- #xtranslate libLoad([]) => hb_libLoad()
- #xtranslate libFree([]) => hb_libFree()
- #xtranslate hb_checksum([]) => hb_adler32()
- #xtranslate setLastKey([]) => hb_keySetLast()
- #xtranslate CStr([]) => hb_CStr()
- #xtranslate ValToPrgExp([]) => hb_valToExp()
- #xtranslate SecondsSleep([]) => hb_idleSleep()
- #xtranslate WildMatch([]) => hb_WildMatch()
- #xtranslate hb_bitIsSet([]) => hb_bitTest()
- #xtranslate hb_DeserialNext() => hb_Deserialize()
- #xtranslate hb_funcptr() => __dynsn2sym()
+ #xtranslate hb_isregexstring([]) => hb_isregex( )
+ #xtranslate methodName([]) => hb_methodName( )
+ #xtranslate libLoad([]) => hb_libLoad( )
+ #xtranslate libFree([]) => hb_libFree( )
+ #xtranslate hb_checksum([]) => hb_adler32( )
+ #xtranslate setLastKey([]) => hb_keySetLast( )
+ #xtranslate CStr([]) => hb_CStr( )
+ #xtranslate ValToPrgExp([]) => hb_valToExp( )
+ #xtranslate SecondsSleep([]) => hb_idleSleep( )
+ #xtranslate WildMatch([]) => hb_WildMatch( )
+ #xtranslate hb_bitIsSet([]) => hb_bitTest( )
+ #xtranslate hb_DeserialNext() => hb_Deserialize( )
+ #xtranslate hb_funcptr() => __dynsn2sym( )
- #xtranslate HexToNum([]) => hb_HexToNum()
- #xtranslate NumToHex([]) => hb_NumToHex()
- #xtranslate HexToStr([]) => hb_HexToStr()
- #xtranslate StrToHex([]) => hb_StrToHex()
+ #xtranslate HexToNum([]) => hb_HexToNum( )
+ #xtranslate NumToHex([]) => hb_NumToHex( )
+ #xtranslate HexToStr([]) => hb_HexToStr( )
+ #xtranslate StrToHex([]) => hb_StrToHex( )
#xtranslate ISPOINTER( ) => hb_ISPOINTER( )
- #xtranslate hb_SetIniComment([]) => hb_IniSetComment()
- #xtranslate hb_ReadIni([]) => hb_IniRead()
- #xtranslate hb_WriteIni([]) => hb_IniWrite()
+ #xtranslate hb_SetIniComment([]) => hb_IniSetComment( )
+ #xtranslate hb_ReadIni([]) => hb_IniRead( )
+ #xtranslate hb_WriteIni([]) => hb_IniWrite( )
- #xtranslate DisableWaitLocks([]) => hb_DisableWaitLocks()
+ #xtranslate DisableWaitLocks([]) => hb_DisableWaitLocks( )
#xtranslate HBCONSOLELOCK() => hb_gtLock()
#xtranslate HBCONSOLEUNLOCK() => hb_gtUnLock()
- #xtranslate hb_CMDARGARGV([]) => hb_ARGV()
+ #xtranslate hb_CMDARGARGV([]) => hb_ARGV( )
- #xtranslate RAScan([]) => hb_RAScan()
+ #xtranslate RAScan([]) => hb_RAScan( )
- #xtranslate AsizeAlloc( [, ] ) => AFill()
- #xtranslate ALenAlloc( [, ] ) => Len()
+ #xtranslate AsizeAlloc( [, ] ) => AFill( )
+ #xtranslate ALenAlloc( [, ] ) => Len( )
- #xtranslate DateTime([]) => hb_DateTime()
- #xtranslate Hour([]) => hb_Hour()
- #xtranslate Minute([]) => hb_Minute()
- #xtranslate TToS([]) => hb_TToS()
- #xtranslate SToT([]) => hb_SToT()
- #xtranslate TToC([]) => hb_TToC()
- #xtranslate CToT([]) => hb_CToT()
+ #xtranslate DateTime([