2008-05-23 21:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* source/rtl/browse.prg
   * source/rtl/getsys53.prg
   * source/rtl/profiler.prg
   * source/rtl/tbrowse.prg
   * source/debug/dbghelp.prg
   * source/debug/dbgwa.prg
   * utils/hbextern/hbextern.prg
   * utils/hbtest/hbtest.prg
   * utils/hbtest/rt_array.prg
   * utils/hbtest/rt_class.prg
   * utils/hbtest/rt_date.prg
   * utils/hbtest/rt_file.prg
   * utils/hbtest/rt_hvm.prg
   * utils/hbtest/rt_hvma.prg
   * utils/hbtest/rt_math.prg
   * utils/hbtest/rt_misc.prg
   * utils/hbtest/rt_str.prg
   * utils/hbtest/rt_stra.prg
   * utils/hbtest/rt_trans.prg
     % FUNCTION -> PROCEDURE
This commit is contained in:
Viktor Szakats
2008-05-23 19:57:49 +00:00
parent 242c235e68
commit ab03dc731d
20 changed files with 108 additions and 88 deletions

View File

@@ -8,6 +8,28 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-05-23 21:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/browse.prg
* source/rtl/getsys53.prg
* source/rtl/profiler.prg
* source/rtl/tbrowse.prg
* source/debug/dbghelp.prg
* source/debug/dbgwa.prg
* utils/hbextern/hbextern.prg
* utils/hbtest/hbtest.prg
* utils/hbtest/rt_array.prg
* utils/hbtest/rt_class.prg
* utils/hbtest/rt_date.prg
* utils/hbtest/rt_file.prg
* utils/hbtest/rt_hvm.prg
* utils/hbtest/rt_hvma.prg
* utils/hbtest/rt_math.prg
* utils/hbtest/rt_misc.prg
* utils/hbtest/rt_str.prg
* utils/hbtest/rt_stra.prg
* utils/hbtest/rt_trans.prg
% FUNCTION -> PROCEDURE
2008-05-23 21:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/compiler/hbfunchk.c
! Typo in message.

View File

@@ -62,7 +62,7 @@
#include "common.ch"
#include "inkey.ch"
FUNCTION __dbgHelp( nTopic )
PROCEDURE __dbgHelp( nTopic )
LOCAL oDlg
LOCAL cColor := iif( __Dbg():lMonoDisplay, "N/W, W/N, W+/W, W+/N", "N/W, N/BG, R/W, R/BG" )
@@ -92,7 +92,7 @@ FUNCTION __dbgHelp( nTopic )
oDlg:ShowModal()
RETURN NIL
RETURN
STATIC PROCEDURE PaintWindow( oDlg, oBrw, aTopics )

View File

@@ -54,7 +54,7 @@
#include "setcurs.ch"
#include "inkey.ch"
function __dbgShowWorkAreas()
procedure __dbgShowWorkAreas()
local oDlg
local oCol
@@ -85,7 +85,7 @@ function __dbgShowWorkAreas()
if Len( aAlias ) == 0
Alert( "No workareas in use")
return nil
return
endif
IF !Used()
@@ -160,9 +160,9 @@ function __dbgShowWorkAreas()
dbSelectArea( nOldArea )
return nil
return
static function DlgWorkAreaPaint( oDlg, aBrw )
static procedure DlgWorkAreaPaint( oDlg, aBrw )
/* Display captions */
@@ -211,9 +211,9 @@ static function DlgWorkAreaPaint( oDlg, aBrw )
UpdateInfo( oDlg, Alias() )
return nil
return
static function DlgWorkAreaKey( nKey, oDlg, aBrw, aAlias, aStruc, aInfo )
static procedure DlgWorkAreaKey( nKey, oDlg, aBrw, aAlias, aStruc, aInfo )
static s_nFocus := 1
@@ -229,7 +229,7 @@ static function DlgWorkAreaKey( nKey, oDlg, aBrw, aAlias, aStruc, aInfo )
s_nFocus := 1
endif
aBrw[ s_nFocus ]:Hilite()
return nil
return
endif
do case
@@ -263,7 +263,7 @@ static function DlgWorkAreaKey( nKey, oDlg, aBrw, aAlias, aStruc, aInfo )
WorkAreasKeyPressed( nKey, aBrw[ 3 ], Len( aStruc ) )
endcase
return nil
return
static procedure WorkAreasKeyPressed( nKey, oBrw, nTotal )
@@ -347,12 +347,12 @@ static function DbfInfo( aInfo )
return aInfo
static function UpdateInfo( oDlg, cAlias )
static procedure UpdateInfo( oDlg, cAlias )
local nOldArea
if Empty( cAlias )
return NIL
return
endif
nOldArea := Select()
@@ -373,4 +373,4 @@ static function UpdateInfo( oDlg, cAlias )
dbSelectArea( nOldArea )
return nil
return

View File

@@ -288,7 +288,7 @@ FUNCTION Browse( nTop, nLeft, nBottom, nRight )
RETURN .T.
STATIC FUNCTION StatLine( oBrw, lAppend )
STATIC PROCEDURE StatLine( oBrw, lAppend )
LOCAL nTop := oBrw:nTop - 1
LOCAL nRight := oBrw:nRight
@@ -307,7 +307,7 @@ STATIC FUNCTION StatLine( oBrw, lAppend )
IIF( oBrw:HitTop(), "<bof>", " " ) )
ENDIF
RETURN NIL
RETURN
STATIC FUNCTION DoGet( oBrw, lAppend )
@@ -394,7 +394,7 @@ STATIC FUNCTION ExitKey( lAppend )
RETURN nKey
STATIC FUNCTION FreshOrder( oBrw )
STATIC PROCEDURE FreshOrder( oBrw )
LOCAL nRec := RecNo()
@@ -408,7 +408,7 @@ STATIC FUNCTION FreshOrder( oBrw )
ENDDO
ENDIF
RETURN NIL
RETURN
STATIC FUNCTION Skipped( nRecs, lAppend )

View File

@@ -139,16 +139,16 @@ FUNCTION HitTest( oGetList, nMRow, nMCol, aMsg )
RETURN iif( oGetList != NIL, oGetlist:hitTest( nMRow, nMCol, aMsg ), 0 )
FUNCTION ShowGetMsg( oGet, aMsg )
PROCEDURE ShowGetMsg( oGet, aMsg )
LOCAL oGetList := __GetListActive()
IF oGetList != NIL
oGetList:ShowGetMsg( oGet, aMsg )
ENDIF
RETURN NIL
RETURN
FUNCTION EraseGetMsg( oGet, aMsg )
PROCEDURE EraseGetMsg( oGet, aMsg )
LOCAL oGetList := __GetListActive()
HB_SYMBOL_UNUSED( oGet )
@@ -157,7 +157,7 @@ FUNCTION EraseGetMsg( oGet, aMsg )
oGetList:EraseGetMsg( aMsg )
ENDIF
RETURN NIL
RETURN
FUNCTION ReadStats( nElement, xNewValue )
LOCAL oGetList := __GetListActive()

View File

@@ -106,7 +106,7 @@
#include "inkey.ch"
Function Main()
Procedure Main()
Local oProfile := HBProfile():new()
Local n
@@ -147,26 +147,26 @@ Local n
@ 3, 0 Say " Total Ticks: " + str( oProfile:totalTicks() )
@ 4, 0 Say "Total Seconds: " + str( oProfile:totalSeconds() )
Return NIL
Return
Static Function DrawScreen( cTitle )
Static Procedure DrawScreen( cTitle )
Scroll()
@ 0, 0 SAY PadR( cTitle, MaxCol() + 1 ) COLOR "N/W"
Return NIL
Return
Function DoNothingForTwoSeconds()
Procedure DoNothingForTwoSeconds()
Inkey( 2 )
Return NIL
Return
Function CallMe500Times()
Return NIL
Procedure CallMe500Times()
Return
Static Function Browser( oBrowse )
Static Procedure Browser( oBrowse )
Local lBrowsing := .T.
Local nKey
@@ -205,7 +205,7 @@ Local nKey
EndDo
Return NIL
Return
#endif

View File

@@ -341,7 +341,7 @@ STATIC FUNCTION _SKIP_RESULT( xResult )
RETURN IIF( ValType( xResult ) == "N", Int( xResult ), 0 )
STATIC FUNCTION _DISP_FHSEP( nRow, nType, cColor, aColData )
STATIC PROCEDURE _DISP_FHSEP( nRow, nType, cColor, aColData )
LOCAL lFirst, lFirstVisible
LOCAL aCol
LOCAL cSep
@@ -404,10 +404,10 @@ STATIC FUNCTION _DISP_FHSEP( nRow, nType, cColor, aColData )
ENDIF
NEXT
RETURN NIL
RETURN
STATIC FUNCTION _DISP_FHNAME( nRow, nHeight, nLeft, nRight, nType, nColor, aColors, aColData )
STATIC PROCEDURE _DISP_FHNAME( nRow, nHeight, nLeft, nRight, nType, nColor, aColors, aColData )
LOCAL lFirst
LOCAL aCol
@@ -439,7 +439,7 @@ STATIC FUNCTION _DISP_FHNAME( nRow, nHeight, nLeft, nRight, nType, nColor, aColo
ENDIF
NEXT
RETURN NIL
RETURN
METHOD dispFrames() CLASS TBROWSE
@@ -1498,11 +1498,9 @@ METHOD doConfigure() CLASS TBROWSE
RETURN Self
STATIC FUNCTION _GENLIMITRTE()
STATIC PROCEDURE _GENLIMITRTE()
LOCAL oError
oError := ErrorNew()
LOCAL oError := ErrorNew()
oError:severity := ES_ERROR
oError:genCode := EG_LIMIT
@@ -1517,7 +1515,7 @@ STATIC FUNCTION _GENLIMITRTE()
Eval( ErrorBlock(), oError )
__errInHandler()
RETURN NIL
RETURN
/* helper function to take headings and footing data */
@@ -1664,7 +1662,7 @@ STATIC FUNCTION _SETCOLUMNS( nFrom, nTo, nStep, aColData, nFirst, nWidth, lFirst
RETURN IIF( nLast == 0, nFrom - nStep, nLast )
STATIC FUNCTION _SETVISIBLE( aColData, nWidth, nFrozen, nLeft, nRight )
STATIC PROCEDURE _SETVISIBLE( aColData, nWidth, nFrozen, nLeft, nRight )
LOCAL nColCount, nPos, nFirst
LOCAL lLeft, lRight, lFirst
@@ -1728,7 +1726,7 @@ STATIC FUNCTION _SETVISIBLE( aColData, nWidth, nFrozen, nLeft, nRight )
ENDIF
ENDIF
RETURN NIL
RETURN
/* set visible columns */

View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
* HBEXTERN.CH generator
* hbextern.ch generator
*
* Copyright 1999 Ryszard Glab <rglab@imid.med.pl>
* www - http://www.harbour-project.org

View File

@@ -99,7 +99,7 @@ STATIC s_nEndTime
REQUEST HB_LANG_EN
#endif
FUNCTION Main( cPar1, cPar2 )
PROCEDURE Main( cPar1, cPar2 )
OutStd( "Harbour Regression Test Suite" + HB_OSNewLine() +;
"Copyright 1999-2008, http://www.harbour-project.org" + HB_OSNewLine() )
@@ -123,7 +123,7 @@ FUNCTION Main( cPar1, cPar2 )
" /all Display all tests, not only the failures." + HB_OSNewLine() +;
" /skip:<list> Skip the listed test numbers." + HB_OSNewLine() )
RETURN NIL
RETURN
ENDIF
/* Initialize test */
@@ -159,7 +159,7 @@ FUNCTION Main( cPar1, cPar2 )
TEST_END()
RETURN NIL
RETURN
/* NOTE: These should always be called last, since they can mess up the test
environment.
@@ -167,7 +167,7 @@ FUNCTION Main( cPar1, cPar2 )
Right now the failing __MRestore() will clear all memory variables,
which is absolutely normal otherwise. */
STATIC FUNCTION Main_LAST()
STATIC PROCEDURE Main_LAST()
TEST_LINE( MEMVARBLOCK( "mcString" ) , "{||...}" )
#ifndef __XPP__
@@ -183,9 +183,9 @@ STATIC FUNCTION Main_LAST()
TEST_LINE( __MSave( BADFNAME(), "*", .T. ) , "E BASE 2006 Create error " + BADFNAME() + " F:DR" )
#endif
RETURN NIL
RETURN
STATIC FUNCTION TEST_BEGIN( cParam )
STATIC PROCEDURE TEST_BEGIN( cParam )
s_nStartTime := Seconds()
@@ -317,9 +317,9 @@ STATIC FUNCTION TEST_BEGIN( cParam )
w_TEST->TYPE_L := .T.
w_TEST->TYPE_L_E := .F.
RETURN NIL
RETURN
FUNCTION TEST_CALL( cBlock, bBlock, xResultExpected )
PROCEDURE TEST_CALL( cBlock, bBlock, xResultExpected )
LOCAL xResult
LOCAL oError
LOCAL bOldError
@@ -398,12 +398,12 @@ FUNCTION TEST_CALL( cBlock, bBlock, xResultExpected )
s_nPass++
ENDIF
RETURN NIL
RETURN
FUNCTION TEST_OPT_Z()
RETURN s_lShortCut
STATIC FUNCTION TEST_END()
STATIC PROCEDURE TEST_END()
dbSelectArea( "w_TEST" )
dbCloseArea()
@@ -435,7 +435,7 @@ STATIC FUNCTION TEST_END()
ErrorLevel( iif( s_nFail != 0, 1, 0 ) )
RETURN NIL
RETURN
FUNCTION XToStr( xValue )
LOCAL cType := ValType( xValue )
@@ -611,7 +611,7 @@ STATIC FUNCTION BADFNAME()
RETURN "*BADNAM*.MEM"
#endif
STATIC FUNCTION OutMsg( hFile, cMsg )
STATIC PROCEDURE OutMsg( hFile, cMsg )
IF hFile == 1
OutStd( cMsg )
@@ -621,7 +621,7 @@ STATIC FUNCTION OutMsg( hFile, cMsg )
FWrite( hFile, cMsg )
ENDIF
RETURN NIL
RETURN
/* Don't change the position of this #include. */
#include "rt_init.ch"

View File

@@ -55,7 +55,7 @@
/* Don't change the position of this #include. */
#include "rt_vars.ch"
FUNCTION Main_ARRAY()
PROCEDURE Main_ARRAY()
/* ARRAY function error conditions. */
@@ -359,7 +359,7 @@ FUNCTION Main_ARRAY()
TEST_LINE( AScan( saAllTypes, scStringZ ) , 3 )
SET EXACT OFF
RETURN NIL
RETURN
STATIC FUNCTION TANew( cChar, nLen )
LOCAL aArray

View File

@@ -60,7 +60,7 @@
MEMVAR objHolder, cDtorResult
FUNCTION Main_CLASS()
PROCEDURE Main_CLASS()
LOCAL oValue, aRef
PRIVATE objHolder, cDtorResult
@@ -1063,7 +1063,7 @@ FUNCTION Main_CLASS()
#endif
RETURN NIL
RETURN
#ifdef __HARBOUR__

View File

@@ -55,7 +55,7 @@
/* Don't change the position of this #include. */
#include "rt_vars.ch"
FUNCTION Main_DATE()
PROCEDURE Main_DATE()
LOCAL cDate := "1999/11/25"
/* YEAR() */
@@ -191,7 +191,7 @@ FUNCTION Main_DATE()
TEST_LINE( DToS(sdDate) , "19840325" )
TEST_LINE( DToS(sdDateE) , " " )
RETURN NIL
RETURN
/* Don't change the position of this #include. */
#include "rt_init.ch"

View File

@@ -60,7 +60,7 @@
/* NOTE: The order of the tests is relevant here, so don't
rearrange them. */
FUNCTION Main_FILE()
PROCEDURE Main_FILE()
LOCAL cFileName := "$$FILEIO.TMP"
LOCAL nFlags
@@ -214,7 +214,7 @@ FUNCTION Main_FILE()
FErase("$$FILEIO.TMP")
RETURN NIL
RETURN
STATIC FUNCTION TESTFIER( xRetVal )
RETURN PadR( "E: " + LTrim( Str( FError() ) ), 9 ) + " R: " + XToStr( xRetVal )

View File

@@ -55,7 +55,7 @@
/* Don't change the position of this #include. */
#include "rt_vars.ch"
FUNCTION Main_HVM()
PROCEDURE Main_HVM()
/* NOTE: CA-Cl*pper PP fails on these
TEST_LINE( "1" .AND. "2" , "E BASE 1066 Argument error conditional " )
@@ -577,7 +577,7 @@ FUNCTION Main_HVM()
TEST_LINE( {} >= {} , "E BASE 1076 Argument error >= A:2:A:{.[0].};A:{.[0].} F:S" )
TEST_LINE( {|| NIL } >= {|| NIL } , "E BASE 1076 Argument error >= A:2:B:{||...};B:{||...} F:S" )
RETURN NIL
RETURN
/* Don't change the position of this #include. */
#include "rt_init.ch"

View File

@@ -55,7 +55,7 @@
/* Don't change the position of this #include. */
#include "rt_vars.ch"
FUNCTION Main_HVMA()
PROCEDURE Main_HVMA()
LOCAL nA, nB, nC
// NOTE: These are compiler tests.
@@ -593,7 +593,7 @@ FUNCTION Main_HVMA()
TEST_LINE(( nA := -500000000000000000000000 , RTSTR( -nA )) , " 20 ********************" )
TEST_LINE(( nA := -5000000000000000000000000 , RTSTR( -nA )) , " 20 ********************" )
RETURN NIL
RETURN
FUNCTION RTSTR( nValue )
RETURN Str( Len( Str( nValue ) ), 3 ) + " " + Str( nValue )

View File

@@ -55,7 +55,7 @@
/* Don't change the position of this #include. */
#include "rt_vars.ch"
FUNCTION Main_MATH()
PROCEDURE Main_MATH()
LOCAL l, s, o
MEMVAR s0, s1, v2
@@ -527,7 +527,7 @@ FUNCTION Main_MATH()
#endif
RETURN NIL
RETURN
/* Don't change the position of this #include. */
#include "rt_init.ch"

View File

@@ -64,7 +64,7 @@
#endif
#endif
FUNCTION Main_MISC()
PROCEDURE Main_MISC()
LOCAL oError
#ifdef __HARBOUR__
LOCAL cEOL
@@ -1040,11 +1040,11 @@ FUNCTION Main_MISC()
Set( _SET_EOL, cEOL )
#endif
RETURN NIL
RETURN
#ifdef __HARBOUR__
FUNCTION Main_OPOVERL()
PROCEDURE Main_OPOVERL()
LOCAL oString := HB_TString()
oString:cValue := "Hello"
@@ -1077,7 +1077,7 @@ FUNCTION Main_OPOVERL()
TEST_LINE( oString-- , "HB_TSTRING Object" )
TEST_LINE( oString:cValue , "Hello" )
RETURN NIL
RETURN
STATIC FUNCTION HB_TString()

View File

@@ -55,7 +55,7 @@
/* Don't change the position of this #include. */
#include "rt_vars.ch"
FUNCTION Main_STR()
PROCEDURE Main_STR()
/* VAL() */
@@ -741,7 +741,7 @@ FUNCTION Main_STR()
TEST_LINE( Stuff("ABCE"+Chr(0)+"F", 2, 3, "xyz") , "Axyz"+Chr(0)+"F" )
TEST_LINE( Stuff("ABC"+Chr(0)+"EF", 2, 3, "x"+Chr(0)+"z") , "Ax"+Chr(0)+"zEF" )
RETURN NIL
RETURN
/* Don't change the position of this #include. */
#include "rt_init.ch"

View File

@@ -55,7 +55,7 @@
/* Don't change the position of this #include. */
#include "rt_vars.ch"
FUNCTION Main_STRA()
PROCEDURE Main_STRA()
/* STR() */
@@ -249,9 +249,9 @@ FUNCTION Main_STRA()
TEST_LINE( StrZero(-100000, 8, -1) , "-0100000" )
#endif
RETURN NIL
RETURN
FUNCTION Comp_Str()
PROCEDURE Comp_Str()
LOCAL old_exact := SET( _SET_EXACT, .F. )
TEST_LINE( "ABC" == "", .F. )
@@ -361,9 +361,9 @@ FUNCTION Comp_Str()
TEST_LINE( "DEF" >= "ABCD", .T. )
SET( _SET_EXACT, old_exact )
RETURN NIL
RETURN
FUNCTION Exact_Str()
PROCEDURE Exact_Str()
LOCAL old_exact := SET( _SET_EXACT, .T. )
TEST_LINE( "ABC" == "", .F. )
@@ -474,9 +474,9 @@ FUNCTION Exact_Str()
SET( _SET_EXACT, old_exact )
RETURN NIL
RETURN
FUNCTION New_STRINGS()
PROCEDURE New_STRINGS()
#ifdef __HARBOUR__
@@ -521,15 +521,15 @@ FUNCTION New_STRINGS()
#endif
RETURN NIL
RETURN
FUNCTION Long_STRINGS()
PROCEDURE Long_STRINGS()
TEST_LINE( Right( Space( 64 * 1024 - 5 ) + "12345 7890", 10 ), "12345 7890" )
TEST_LINE( Len( Space( 81910 ) + "1234567890" ), 81920 )
TEST_LINE( ( "1234567890" + Space( 810910 ) ) - ( "1234567890" + Space( 810910 ) ), "12345678901234567890" + Space( 810910 * 2 ) )
RETURN NIL
RETURN
/* Don't change the position of this #include. */
#include "rt_init.ch"

View File

@@ -55,7 +55,7 @@
/* Don't change the position of this #include. */
#include "rt_vars.ch"
FUNCTION Main_TRANS()
PROCEDURE Main_TRANS()
LOCAL cOldDate := Set( _SET_DATEFORMAT )
local cOldFixed := Set( _SET_FIXED )
local cOldDecim := Set( _SET_DECIMALS )
@@ -784,7 +784,7 @@ FUNCTION Main_TRANS()
SET( _SET_DECIMALS, cOldDecim )
SET( _SET_DATEFORMAT, cOldDate )
RETURN NIL
RETURN
/* Don't change the position of this #include. */
#include "rt_init.ch"