From 2242853a443002a7fbd3e6101f5519e6a6e0c042 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 22 Jul 2012 13:59:53 +0000 Subject: [PATCH] 2012-07-22 15:55 UTC+0200 Viktor Szakats (vszakats syenar.net) * contrib/hbide/idestylesheets.prg * contrib/hbide/idetags.prg ! fixed wrong usage of hb_B*() raw string functions * contrib/hbmysql/utils/dbf2mysq.prg * formatting * contrib/hbpgsql/tests/dbf2pg.prg * extras/httpsrv/session.prg * extras/hbvpdf/hbvpdf.prg * extras/hbvpdf/hbvpdft.prg * tests/rddtest/rddtst.prg * using F_ERROR instead of -1 * contrib/hbtip/tests/dnldftp.prg * contrib/hbtip/tests/upld_ftp.prg * tests/codebloc.prg * tests/recursiv.prg * tests/test_all.prg * tests/testdbf.prg * tests/teststr.prg * using hb_eol() instead of explict chr() values --- harbour/ChangeLog | 24 +++++++++ harbour/contrib/hbide/idestylesheets.prg | 2 +- harbour/contrib/hbide/idetags.prg | 10 ++-- harbour/contrib/hbmysql/utils/dbf2mysq.prg | 32 ++++++------ harbour/contrib/hbpgsql/tests/dbf2pg.prg | 7 +-- harbour/contrib/hbtip/tests/dnldftp.prg | 16 +++--- harbour/contrib/hbtip/tests/upld_ftp.prg | 8 +-- harbour/extras/hbvpdf/hbvpdf.prg | 4 +- harbour/extras/hbvpdf/hbvpdft.prg | 4 +- harbour/extras/httpsrv/session.prg | 4 +- harbour/tests/codebloc.prg | 4 +- harbour/tests/rddtest/rddtst.prg | 8 +-- harbour/tests/recursiv.prg | 2 +- harbour/tests/test_all.prg | 2 +- harbour/tests/testdbf.prg | 3 +- harbour/tests/teststr.prg | 60 ++++++++++------------ 16 files changed, 105 insertions(+), 85 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d40a078e0a..9e3caea5ba 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,30 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-22 15:55 UTC+0200 Viktor Szakats (vszakats syenar.net) + * contrib/hbide/idestylesheets.prg + * contrib/hbide/idetags.prg + ! fixed wrong usage of hb_B*() raw string functions + + * contrib/hbmysql/utils/dbf2mysq.prg + * formatting + + * contrib/hbpgsql/tests/dbf2pg.prg + * extras/httpsrv/session.prg + * extras/hbvpdf/hbvpdf.prg + * extras/hbvpdf/hbvpdft.prg + * tests/rddtest/rddtst.prg + * using F_ERROR instead of -1 + + * contrib/hbtip/tests/dnldftp.prg + * contrib/hbtip/tests/upld_ftp.prg + * tests/codebloc.prg + * tests/recursiv.prg + * tests/test_all.prg + * tests/testdbf.prg + * tests/teststr.prg + * using hb_eol() instead of explict chr() values + 2012-07-21 19:21 UTC+0200 Viktor Szakats (harbour syenar.net) + extras/hbapollo/LICENCE + added license diff --git a/harbour/contrib/hbide/idestylesheets.prg b/harbour/contrib/hbide/idestylesheets.prg index af25f1a0a7..72ccb22864 100644 --- a/harbour/contrib/hbide/idestylesheets.prg +++ b/harbour/contrib/hbide/idestylesheets.prg @@ -506,7 +506,7 @@ FUNCTION hbide_buildGradientString( aGrands ) s += "stop:" + hb_ntos( a_[ 1 ] ) + " " + hbide_rgbString( a_[ 2 ], a_[ 3 ], a_[ 4 ] ) + ", " NEXT - RETURN substr( s, 1, hb_BLen( s ) - 2 ) + RETURN substr( s, 1, Len( s ) - 2 ) /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/idetags.prg b/harbour/contrib/hbide/idetags.prg index 5b56b2700c..9bda6f5e12 100644 --- a/harbour/contrib/hbide/idetags.prg +++ b/harbour/contrib/hbide/idetags.prg @@ -69,7 +69,7 @@ #include "common.ch" #include "xbp.ch" -#define LEFTEQUAL( l, r ) ( hb_BLeft( l, hb_BLen( r ) ) == r ) +#define LEFTEQUAL( l, r ) ( Left( l, Len( r ) ) == r ) /*----------------------------------------------------------------------*/ @@ -125,13 +125,13 @@ FUNCTION UpdateTags( cModule, aSummary, aSumData, aFuncList, aLines, aText ) ELSEIF cType == "CLASS" cSyntax := LTrim( SubStr( cSyntax, 7 ) ) ELSE - cSyntax := lTrim( SubStr( cSyntax, hb_BLen( cType ) + 1 ) ) + cSyntax := LTrim( SubStr( cSyntax, Len( cType ) + 1 ) ) ENDIF IF ( n := RAt( "(", cSyntax ) ) > 0 - cName := Trim( hb_BLeft( cSyntax, n-1 ) ) + cName := Trim( Left( cSyntax, n-1 ) ) FOR m := Len( cName ) TO 1 STEP -1 - IF ( ! substr( cName, m, 1 ) $ cGoodFuncNameChars ) + IF !( substr( cName, m, 1 ) $ cGoodFuncNameChars ) EXIT ENDIF NEXT @@ -315,7 +315,7 @@ FUNCTION Summarize( aText, cComments, aSumData, nFileType ) ELSE a := ParsExpr( aText[ i ], .F. , @lInComment, , .F., .F.) - AEval( a,{|x| nNest := Max( 0, nNest + iif( x == "{", 1, iif( x == "}", -1, 0 ) ) ) } ) + AEval( a, {| x | nNest := Max( 0, nNest + iif( x == "{", 1, iif( x == "}", -1, 0 ) ) ) } ) ccLine := "" nLine := i+1 ENDIF diff --git a/harbour/contrib/hbmysql/utils/dbf2mysq.prg b/harbour/contrib/hbmysql/utils/dbf2mysq.prg index c25bab9509..0eab5210aa 100644 --- a/harbour/contrib/hbmysql/utils/dbf2mysq.prg +++ b/harbour/contrib/hbmysql/utils/dbf2mysq.prg @@ -76,28 +76,28 @@ PROCEDURE Main( ... ) i := 1 // Scan parameters and setup workings - WHILE i <= PCount() + DO WHILE i <= PCount() - cTok := hb_PValue( i ++ ) + cTok := hb_PValue( i++ ) DO CASE CASE cTok == "-h" - cHostName := hb_PValue( i ++ ) + cHostName := hb_PValue( i++ ) CASE cTok == "-d" - cDataBase := hb_PValue( i ++ ) + cDataBase := hb_PValue( i++ ) CASE cTok == "-t" - cTable := hb_PValue( i ++ ) + cTable := hb_PValue( i++ ) CASE cTok == "-f" - cFile := hb_PValue( i ++ ) + cFile := hb_PValue( i++ ) CASE cTok == "-u" - cUser := hb_PValue( i ++ ) + cUser := hb_PValue( i++ ) CASE cTok == "-p" - cPassWord := hb_PValue( i ++ ) + cPassWord := hb_PValue( i++ ) CASE cTok == "-c" lCreateTable := .T. @@ -109,7 +109,7 @@ PROCEDURE Main( ... ) ENDDO dbUseArea( .T. , , cFile, "dbffile", , .T. ) - aDbfStruct := dbffile -> ( dbStruct() ) + aDbfStruct := dbffile->( dbStruct() ) oServer := TMySQLServer():New( cHostName, cUser, cPassWord ) IF oServer:NetErr() @@ -145,12 +145,12 @@ PROCEDURE Main( ... ) QUIT ENDIF - WHILE !dbffile -> ( EOF() ) .AND. Inkey() != K_ESC + DO WHILE ! dbffile->( EOF() ) .AND. Inkey() != K_ESC oRecord := oTable:GetBlankRow() - for i := 1 TO dbffile -> ( FCount() ) - oRecord:FieldPut( i, dbffile -> ( FieldGet(i ) ) ) + for i := 1 TO dbffile->( FCount() ) + oRecord:FieldPut( i, dbffile->( FieldGet(i ) ) ) next oTable:Append( oRecord ) @@ -158,15 +158,15 @@ PROCEDURE Main( ... ) Alert( oTable:Error() ) ENDIF - dbffile -> ( dbSkip() ) + dbffile->( dbSkip() ) DevPos( Row(), 1 ) - IF ( dbffile -> ( RecNo() ) % 100 ) == 0 - DevOut( "imported recs: " + Str( dbffile -> (RecNo() ) ) ) + IF ( dbffile->( RecNo() ) % 100 ) == 0 + DevOut( "imported recs: " + hb_ntos( dbffile->(RecNo() ) ) ) ENDIF ENDDO - dbffile -> ( dbCloseArea() ) + dbffile->( dbCloseArea() ) oTable:Destroy() oServer:Destroy() diff --git a/harbour/contrib/hbpgsql/tests/dbf2pg.prg b/harbour/contrib/hbpgsql/tests/dbf2pg.prg index 3a89ab3ba3..0b75519552 100644 --- a/harbour/contrib/hbpgsql/tests/dbf2pg.prg +++ b/harbour/contrib/hbpgsql/tests/dbf2pg.prg @@ -7,8 +7,8 @@ * dbf2pg.prg - converts a .dbf file into a Postgres table * * Copyright 2000 Maurilio Longo - * (The Original file was ported from Mysql and changed by Rodrigo Moreno rodrigo_moreno@yahoo.com) - * * www - http://harbour-project.org + * (The original file was ported from mysql and changed by Rodrigo Moreno rodrigo_moreno@yahoo.com) + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,6 +52,7 @@ */ #include "inkey.ch" +#include "fileio.ch" PROCEDURE Main( ... ) @@ -136,7 +137,7 @@ PROCEDURE Main( ... ) ENDDO // create log file - IF ( nHandle := FCreate( RTrim( cTable ) + ".log" ) ) == -1 + IF ( nHandle := FCreate( RTrim( cTable ) + ".log" ) ) == F_ERROR ? "Cannot create log file" QUIT ENDIF diff --git a/harbour/contrib/hbtip/tests/dnldftp.prg b/harbour/contrib/hbtip/tests/dnldftp.prg index 712a5772a6..4f762b1704 100644 --- a/harbour/contrib/hbtip/tests/dnldftp.prg +++ b/harbour/contrib/hbtip/tests/dnldftp.prg @@ -12,11 +12,11 @@ PROCEDURE Main( cFile ) RETURN - /********************************************************************** - * - * Static Function TRP20FTPEnv() - * - **********************************************************************/ +/********************************************************************** + * + * Static Function TRP20FTPEnv() + * + **********************************************************************/ STATIC FUNCTION TRP20FTPEnv( cCarpeta ) @@ -67,11 +67,11 @@ STATIC FUNCTION TRP20FTPEnv( cCarpeta ) ELSE cStr := "No se ha podido conectar con el servidor FTP" + " " + oURL:cServer IF oFTP:SocketCon == NIL - cStr += Chr( 13 ) + Chr( 10 ) + "Conexión no inicializada" + cStr += hb_eol() + "Conexión no inicializada" ELSEIF hb_InetErrorCode( oFTP:SocketCon ) == 0 - cStr += Chr( 13 ) + Chr( 10 ) + "Respuesta del servidor:" + " " + oFTP:cReply + cStr += hb_eol() + "Respuesta del servidor:" + " " + oFTP:cReply ELSE - cStr += Chr( 13 ) + Chr( 10 ) + "Error en la conexión:" + " " + hb_InetErrorDesc( oFTP:SocketCon ) + cStr += hb_eol() + "Error en la conexión:" + " " + hb_InetErrorDesc( oFTP:SocketCon ) ENDIF ? cStr lRetorno := .F. diff --git a/harbour/contrib/hbtip/tests/upld_ftp.prg b/harbour/contrib/hbtip/tests/upld_ftp.prg index 4a1f5a750e..5fc09a7d0f 100644 --- a/harbour/contrib/hbtip/tests/upld_ftp.prg +++ b/harbour/contrib/hbtip/tests/upld_ftp.prg @@ -9,7 +9,7 @@ #include "directry.ch" -PROCEDURE MAIN( cMask ) +PROCEDURE Main( cMask ) ? TRP20FTPEnv( cMask ) @@ -71,11 +71,11 @@ STATIC FUNCTION TRP20FTPEnv( cCarpeta ) ELSE cStr := "No se ha podido conectar con el servidor FTP" + " " + oURL:cServer IF oFTP:SocketCon == NIL - cStr += Chr( 13 ) + Chr( 10 ) + "Conexión no inicializada" + cStr += hb_eol() + "Conexión no inicializada" ELSEIF hb_InetErrorCode( oFTP:SocketCon ) == 0 - cStr += Chr( 13 ) + Chr( 10 ) + "Respuesta del servidor:" + " " + oFTP:cReply + cStr += hb_eol() + "Respuesta del servidor:" + " " + oFTP:cReply ELSE - cStr += Chr( 13 ) + Chr( 10 ) + "Error en la conexión:" + " " + hb_InetErrorDesc( oFTP:SocketCon ) + cStr += hb_eol() + "Error en la conexión:" + " " + hb_InetErrorDesc( oFTP:SocketCon ) ENDIF ? cStr lRetorno := .F. diff --git a/harbour/extras/hbvpdf/hbvpdf.prg b/harbour/extras/hbvpdf/hbvpdf.prg index 10479ed4c1..377bc3b861 100644 --- a/harbour/extras/hbvpdf/hbvpdf.prg +++ b/harbour/extras/hbvpdf/hbvpdf.prg @@ -2426,7 +2426,7 @@ local nBytes := 0 local i nDepth := iif(HB_ISNUMERIC(nDepth),nDepth,0) if hFile == NIL - if (hFile := fCreate(cFile,FC_NORMAL)) == -1 + if (hFile := fCreate(cFile,FC_NORMAL)) == F_ERROR return nBytes endif endif @@ -2465,7 +2465,7 @@ LOCAL cData,cType,nDataLen,nBytes local nDepth := 0 local aRay := {} if hFile == NIL - if (hFile:=fOpen(cFile,FO_READ)) == -1 + if (hFile:=fOpen(cFile,FO_READ)) == F_ERROR return aRay endif cData := space(3) diff --git a/harbour/extras/hbvpdf/hbvpdft.prg b/harbour/extras/hbvpdf/hbvpdft.prg index 27713ffe09..3758684d8d 100644 --- a/harbour/extras/hbvpdf/hbvpdft.prg +++ b/harbour/extras/hbvpdf/hbvpdft.prg @@ -2508,7 +2508,7 @@ local lOpen := ( hFile != nil ) nDepth := iif( HB_ISNUMERIC( nDepth ), nDepth, 0 ) //if hFile == NIL if !lOpen - if ( hFile := fCreate( cFile,FC_NORMAL ) ) == -1 + if ( hFile := fCreate( cFile,FC_NORMAL ) ) == F_ERROR return nBytes endif endif @@ -2557,7 +2557,7 @@ local aRay := {} local lOpen := ( hFile != nil ) if hFile == NIL // First Timer - if ( hFile := fOpen( cFile,FO_READ ) ) == -1 + if ( hFile := fOpen( cFile,FO_READ ) ) == F_ERROR return aRay endif cData := space( 3 ) diff --git a/harbour/extras/httpsrv/session.prg b/harbour/extras/httpsrv/session.prg index c9f7430f83..67dd4315ba 100644 --- a/harbour/extras/httpsrv/session.prg +++ b/harbour/extras/httpsrv/session.prg @@ -598,7 +598,7 @@ 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 ) ) != F_ERROR nRetry := 0 DO WHILE nRetry++ <= ::nFileRetry @@ -642,7 +642,7 @@ 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 ( nH := hb_FCreate( cFile, FC_NORMAL, FO_READWRITE + FO_DENYWRITE ) ) != F_ERROR IF ( FWrite( nH, @cData, nFileSize ) ) != nFileSize uhttpd_Die( "ERROR: On writing session file : " + cFile + ", File error : " + hb_cStr( FError() ) ) ELSE diff --git a/harbour/tests/codebloc.prg b/harbour/tests/codebloc.prg index c2f8763ea9..d7abb83c98 100644 --- a/harbour/tests/codebloc.prg +++ b/harbour/tests/codebloc.prg @@ -98,9 +98,9 @@ PROCEDURE OtherTest( cblock ) PROCEDURE AnotherTest( cb, a ) OutStd( Eval( cb, a ) ) - OutStd( Chr( 13 ) + Chr( 10 ) ) + OutStd( hb_eol() ) OutStd( Eval( cb, a, "again and again" ) ) - OutStd( Chr( 13 ) + Chr( 10 ) ) + OutStd( hb_eol() ) RETURN diff --git a/harbour/tests/rddtest/rddtst.prg b/harbour/tests/rddtest/rddtst.prg index 068787874f..f2dd70108e 100644 --- a/harbour/tests/rddtest/rddtst.prg +++ b/harbour/tests/rddtest/rddtst.prg @@ -44,8 +44,10 @@ REQUEST DBFCDX field FSTR, FNUM +#include "fileio.ch" + #ifdef _TEST_CREATE_ - static hMake := -1 + static hMake := F_ERROR #endif static nTested := 0 static nErrors := 0 @@ -103,7 +105,7 @@ rddSetDefault(rdd) if empty(cOutFile) ? "Syntax: []" quit - elseif (hMake:=fcreate(cOutFile))==-1 + elseif (hMake:=fcreate(cOutFile))==F_ERROR ? "Cannot create file: ", cOutFile quit endif @@ -148,7 +150,7 @@ return nil static function test_close() local cOut #ifdef _TEST_CREATE_ - if hMake != -1 + if hMake != F_ERROR cOut:=EOL+; 'RETURN NIL'+EOL if !fwrite(hMake, cOut)==len(cOut) diff --git a/harbour/tests/recursiv.prg b/harbour/tests/recursiv.prg index 9c3388e980..6d79b5b76c 100644 --- a/harbour/tests/recursiv.prg +++ b/harbour/tests/recursiv.prg @@ -6,7 +6,7 @@ PROCEDURE Main() - QOut( "Testing recursive calls" + Chr( 13 ) + Chr( 10 ) ) + QOut( "Testing recursive calls" + hb_eol() ) QOut( f( 10 ) ) diff --git a/harbour/tests/test_all.prg b/harbour/tests/test_all.prg index bf5a24abcf..d90f7663f9 100644 --- a/harbour/tests/test_all.prg +++ b/harbour/tests/test_all.prg @@ -67,7 +67,7 @@ FUNCTION TestIt( cFile ) nH2 := FOpen( "nottestd.txt", FO_WRITE ) ENDIF FSeek( nH2, 0, FS_END ) - FWrite( nH2, DToC( Date() ) + " " + Time() + " " + cFile + Chr( 13 ) + Chr( 10 ) ) + FWrite( nH2, DToC( Date() ) + " " + Time() + " " + cFile + hb_eol() ) FClose( nH2 ) ENDIF diff --git a/harbour/tests/testdbf.prg b/harbour/tests/testdbf.prg index f23f317f9e..9e7d927a48 100644 --- a/harbour/tests/testdbf.prg +++ b/harbour/tests/testdbf.prg @@ -4,7 +4,8 @@ PROCEDURE Main() - LOCAL nI, aStruct := { { "CHARACTER", "C", 25, 0 }, ; + LOCAL nI, aStruct := { ; + { "CHARACTER", "C", 25, 0 }, ; { "NUMERIC", "N", 8, 0 }, ; { "DOUBLE", "N", 8, 2 }, ; { "DATE", "D", 8, 0 }, ; diff --git a/harbour/tests/teststr.prg b/harbour/tests/teststr.prg index b574b836b8..8e061bb678 100644 --- a/harbour/tests/teststr.prg +++ b/harbour/tests/teststr.prg @@ -2,24 +2,16 @@ * $Id$ */ -STATIC s_cNewLine - PROCEDURE Main( cParam ) - IF Empty( cParam ) - s_cNewLine := Chr( 13 ) + Chr( 10 ) - ELSE - s_cNewLine := Chr( 10 ) - ENDIF - - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "Running with SET FIXED OFF (the default setting): " ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) test() __ACCEPT( "Pause before running again with SET FIXED ON: " ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "Running with SET FIXED ON: " ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) Set( _SET_FIXED, "ON" ) test() @@ -37,33 +29,33 @@ PROCEDURE test() OutStd( - a ) OutStd( b ) OutStd( - b ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "2: " ) OutStd( a + b ) OutStd( a - b ) OutStd( a * b ) OutStd( a / b ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "3: " ) OutStd( a % b ) OutStd( a ** b ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) c := a * b d := b * a - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "4: " ) OutStd( Str( c ) ) OutStd( Str( d ) ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "5: " ) OutStd( Str( c + d ) ) OutStd( Str( c - d ) ) OutStd( Str( c * d ) ) OutStd( Str( c / d ) ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "6: " ) OutStd( a + b + c ) OutStd( c - b - a ) @@ -71,56 +63,56 @@ PROCEDURE test() OutStd( b * a * c * d ) b := 1.000213 OutStd( b * b * b * b * b * b * b ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) FOR nI := 1 TO 20 - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( LTrim( Str( 6 + nI ) ) + ": " ) OutStd( 10 ** nI + ( 1.02 * 1.02 ) ) NEXT - OutStd( s_cNewLine ) + OutStd( hb_eol() ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "27: " ) OutStd( Str( a ), a ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "28: " ) OutStd( Str( b ), b ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "29: " ) OutStd( Str( b, 15 ) ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "30: " ) OutStd( Str( b, 20, 5 ) ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "31: " ) OutStd( Str( b, 20, 10 ) ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "32: " ) OutStd( Str( b, 5, 10 ) ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "33: " ) OutStd( Str( b, 20, - 10 ) ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "34: " ) OutStd( Str( b, - 12, 7 ) ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) OutStd( "35: " ) OutStd( Str( b, 0 ) ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) a := 15.1004 OutStd( "36: " ) OutStd( Str( a ), a ) - OutStd( s_cNewLine ) + OutStd( hb_eol() ) RETURN