fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-10-15 04:12 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/gtwvg/tests/activex.prg
  * contrib/gtwvg/tests/demowvg.prg
  * contrib/gtwvg/tests/demowvg1.prg
  * contrib/gtwvg/tests/demoxbp.prg
  * contrib/gtwvg/tests/tbrowser.prg
  * contrib/hbhpdf/tests/harupdf.prg
  * contrib/hbmisc/fileread.prg
  * contrib/xhb/tcgi.prg
  * extras/gtwvw/tests/ebtest7.prg
  * extras/gtwvw/tests/maximize.prg
  * extras/gtwvw/tests/wvwtest9.prg
  * extras/hbxlsxml/xlsxml.prg
  * extras/httpsrv/session.prg
  * tests/alias.prg
  * tests/begin.prg
  * tests/byref.prg
  * tests/funcarr.prg
  * tests/testwarn.prg
  * tests/wvtext.prg
    * renamed STATIC vars to start with 's_'
    * renamed PUBLIC/PRIVATE vars to start with 'p_'
    * renamed STATIC "const" vars to start with 'sc_'

  * contrib/hbhpdf/tests/harupdf.prg
    ! fixed unused STATIC function warnings

  * contrib/hbmisc/tests/rtfclass.prg
    + changed low-level class creation to hbclass.ch one
This commit is contained in:
Viktor Szakats
2012-10-15 02:16:10 +00:00
parent 007f42f3b1
commit 6831364d2f
21 changed files with 221 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
harbour/ChangeLog
View File

@@ -16,6 +16,36 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-10-15 04:12 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/gtwvg/tests/activex.prg
* contrib/gtwvg/tests/demowvg.prg
* contrib/gtwvg/tests/demowvg1.prg
* contrib/gtwvg/tests/demoxbp.prg
* contrib/gtwvg/tests/tbrowser.prg
* contrib/hbhpdf/tests/harupdf.prg
* contrib/hbmisc/fileread.prg
* contrib/xhb/tcgi.prg
* extras/gtwvw/tests/ebtest7.prg
* extras/gtwvw/tests/maximize.prg
* extras/gtwvw/tests/wvwtest9.prg
* extras/hbxlsxml/xlsxml.prg
* extras/httpsrv/session.prg
* tests/alias.prg
* tests/begin.prg
* tests/byref.prg
* tests/funcarr.prg
* tests/testwarn.prg
* tests/wvtext.prg
* renamed STATIC vars to start with 's_'
* renamed PUBLIC/PRIVATE vars to start with 'p_'
* renamed STATIC "const" vars to start with 'sc_'
* contrib/hbhpdf/tests/harupdf.prg
! fixed unused STATIC function warnings
* contrib/hbmisc/tests/rtfclass.prg
+ changed low-level class creation to hbclass.ch one
2012-10-15 03:39 UTC+0200 Viktor Szakats (harbour syenar.net)
- contrib/hbmysql/utils
- contrib/hbmysql/utils/dbf2mysq.prg

20
harbour/contrib/gtwvg/tests/activex.prg
View File

@@ -383,7 +383,7 @@ STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam )
LOCAL nKey, sData
STATIC nTurn := 0
STATIC s_nTurn := 0
// After :CREATE() Messages
//
@@ -435,15 +435,15 @@ STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam )
ELSEIF nKey == K_F11
IF nActiveX == 4
nTurn++
IF nTurn > 6
nTurn := 1
s_nTurn++
IF s_nTurn > 6
s_nTurn := 1
ENDIF
sData := NIL
sData := ''
DO CASE
CASE nTurn == 1
CASE s_nTurn == 1
hb_gtInfo( HB_GTI_WINTITLE, 'RMChart [ Next:F11 ] ' + 'Stacked Bars' )
//SetMode( 30,100 )
@@ -464,7 +464,7 @@ STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam )
sData += "140033|140045|140055|14006-1|1400925|140131|14014-1|140171|14019-4684277|1402111"
sData += "|140221|140236|140535000*9000*12000*6000*10000*5000"
CASE nTurn == 2
CASE s_nTurn == 2
hb_gtInfo( HB_GTI_WINTITLE, 'RMChart [ Next:F11 ] ' + 'Floating Bars' )
//SetMode( 20,90 )
@@ -479,7 +479,7 @@ STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam )
sData += "531*3*4*6*6*4*7*4*9*3*10*3|120011|120026|120044|120101|120132|12019-47872|120211"
sData += "1|120221|1202312|120531*.5*1.5*10.5*12*1*12*1*12.5*.5*2*11"
CASE nTurn == 3
CASE s_nTurn == 3
hb_gtInfo( HB_GTI_WINTITLE, 'RMChart [ Next:F11 ] ' + 'Four Regions' )
//SetMode( 40,120 )
@@ -512,7 +512,7 @@ STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam )
sData += "171|42019-16744448|4202115|420221|4202310|420261|420538.1*6.2*4.3*2.2*1.2*3.1*5."
sData += "2*11.4*7.3*4.2"
CASE nTurn == 4
CASE s_nTurn == 4
hb_gtInfo( HB_GTI_WINTITLE, 'RMChart [ Next:F11 ] ' + '10 Biggest Companies' )
//SetMode( 25,90 )
@@ -530,7 +530,7 @@ STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam )
sData += "0052|120061|120071|1200970|120111|120121|120131|1201421|120171|12019-16744448|12"
sData += "02115|120221|1202310|120261|120538.9*4.1*4.4*2.1*.3*.3*5.9*11.3*6.7*6"
CASE nTurn == 5
CASE s_nTurn == 5
hb_gtInfo( HB_GTI_WINTITLE, 'RMChart [ Next:F11 ] ' + 'Grouped Bars' )
//SetMode( 25,80 )
@@ -543,7 +543,7 @@ STATIC FUNCTION ExeActiveX( nActiveX, oCom, xParam )
sData += "0*50*70*60|130011|130022|130044|130131|1302111|130221|130235|1305340*10*30*20*80"
sData += "|140011|140022|140044|140131|1402111|140221|140235|1405370*50*80*40*30"
CASE nTurn == 6
CASE s_nTurn == 6
hb_gtInfo( HB_GTI_WINTITLE, 'RMChart [ Next:F11 ] ' + 'Flow Chart' )
//SetMode( 30,50 )

4
harbour/contrib/gtwvg/tests/demowvg.prg
View File

@@ -297,12 +297,12 @@ PROCEDURE WvtNextGets_X()
LOCAL scr := SaveScreen( 0, 0, MaxRow(), MaxCol() )
LOCAL wvtScr := Wvt_SaveScreen( 0, 0, MaxRow(), MaxCol() )
STATIC nPalletMultiplier := 0
STATIC s_nPalletMultiplier := 0
// Change the values of pallatte arbitrarily though yu can fine tune
// these values with realistic values.
//
aNewPalette[ 8 ] := aNewPalette[ 8 ] + ( 100000 * ++nPalletMultiplier )
aNewPalette[ 8 ] := aNewPalette[ 8 ] + ( 100000 * ++s_nPalletMultiplier )
Wvt_SetPalette( aNewPalette )

6
harbour/contrib/gtwvg/tests/demowvg1.prg
View File

@@ -133,11 +133,11 @@ REQUEST HB_GT_WGU
FUNCTION SetGT( nIndex, pGT )
LOCAL oldGT
STATIC pGT_ := { NIL, NIL, NIL }
STATIC s_pGT_ := { NIL, NIL, NIL }
oldGT := pGT_[ nIndex ]
oldGT := s_pGT_[ nIndex ]
IF PCount() == 2
pGT_[ nIndex ] := pGT
s_pGT_[ nIndex ] := pGT
ENDIF
RETURN oldGT

4
harbour/contrib/gtwvg/tests/demoxbp.prg
View File

@@ -410,7 +410,7 @@ STATIC FUNCTION ExeFontDialog( oCrt )
LOCAL oFontDlg, oWvgFont
STATIC nMode := 0
STATIC s_nMode := 0
oFontDlg := WvgFontDialog():new( oCrt )
@@ -430,7 +430,7 @@ STATIC FUNCTION ExeFontDialog( oCrt )
oFontDlg:create()
// Every 2nd FontDialog will be MODAL
oWvgFont := oFontDlg:display( ++nMode % 2 )
oWvgFont := oFontDlg:display( ++s_nMode % 2 )
HB_SYMBOL_UNUSED( oWvgFont )

10
harbour/contrib/gtwvg/tests/tbrowser.prg
View File

@@ -77,7 +77,7 @@ FUNCTION ExecBrowser( oCrt )
LOCAL hPopup := Wvt_SetPopupMenu()
LOCAL oVBar, oHBar, oCom, oTre, oChk, oSLE, oLBx, aNvg, oIdx
STATIC nStyle := 0
STATIC s_nStyle := 0
THREAD STATIC t_nFactor := 200
THREAD STATIC t_lActiveX := .F.
@@ -131,11 +131,11 @@ FUNCTION ExecBrowser( oCrt )
NEXT
oBrowse:configure()
IF nStyle > 5
nStyle := 0
IF s_nStyle > 5
s_nStyle := 0
ENDIF
Wvt_SetPen( nStyle, 0, rgb( 210,1210,210 ) )
nStyle++
Wvt_SetPen( s_nStyle, 0, rgb( 210,1210,210 ) )
s_nStyle++
hb_gtInfo( HB_GTI_WINTITLE, "WVT Gui TBrowse()" )
AAdd( aBlocks, {|| Wvt_DrawBoxRaised( oBrowse:nTop - 2, oBrowse:nLeft - 2, oBrowse:nBottom + 1, oBrowse:nRight + 2 ) } )

19
harbour/contrib/hbhpdf/tests/harupdf.prg
View File

@@ -165,7 +165,7 @@ FUNCTION DesignHaruPDF( cFileToSave )
Page_Images( pdf )
// Commentout the following line if you need ASCII chart by Codepages
//Page_CodePages( pdf )
Page_CodePages( pdf )
HPDF_SaveToFile( pdf, cFileToSave )
@@ -674,23 +674,6 @@ STATIC FUNCTION Page_Text( pdf )
//
STATIC FUNCTION PrintText( page )
LOCAL buf
LOCAL pos := HPDF_Page_GetCurrentTextPos( page )
STATIC no := 0
no ++
buf := hb_ntos( no ) + " " + hb_ntos( pos[ 1 ] ) + " " + hb_ntos( pos[ 2 ] )
HPDF_Page_ShowText( page, buf )
RETURN NIL
//
STATIC FUNCTION Page_TextScaling( pdf )
LOCAL font, page, tw, angle1, angle2, buf, len, fsize, i, r, b, g, yPos, rad1, rad2

4
harbour/contrib/hbmisc/fileread.prg
View File

@@ -233,7 +233,7 @@ METHOD ErrorNo() CLASS TFileRead
METHOD ErrorMsg( cText ) CLASS TFileRead
STATIC s_cAction := { "on", "creating object for", "opening", "reading from", "closing" }
STATIC sc_cAction := { "on", "creating object for", "opening", "reading from", "closing" }
LOCAL cMessage, nTemp
@@ -248,7 +248,7 @@ METHOD ErrorMsg( cText ) CLASS TFileRead
ELSE
nTemp := ::nLastOp + 1
ENDIF
cMessage := iif( Empty( cText ), "", cText ) + "Error " + hb_ntos( ::nError ) + " " + s_cAction[ nTemp ] + " " + ::cFile
cMessage := iif( Empty( cText ), "", cText ) + "Error " + hb_ntos( ::nError ) + " " + sc_cAction[ nTemp ] + " " + ::cFile
ENDIF
RETURN cMessage

32
harbour/contrib/hbmisc/tests/rtfclass.prg
View File

@@ -14,9 +14,11 @@
#require "hbmisc"
#include "hbclass.ch"
PROCEDURE Main()
LOCAL ortf := trtf():new( "test.rtf" )
LOCAL ortf := TRtf():new( "test.rtf" )
LOCAL htest := FCreate( "rtf_test.txt" )
LOCAL ctest := ""
@@ -38,24 +40,17 @@ PROCEDURE Main()
RETURN
FUNCTION trtf()
CREATE CLASS TRtf
STATIC oclass
VAR nHandle
IF oclass == NIL
oclass := HBClass():new( "trtf" )
oclass:adddata( "nhandle" )
oclass:addmethod( "new", @new() )
oclass:addmethod( "write", @write() )
oclass:addmethod( "close", @close() )
oclass:create()
ENDIF
METHOD new( cfilename )
METHOD write( csource )
METHOD close()
RETURN oclass:instance()
END CLASS
STATIC FUNCTION new( cfilename )
LOCAL self := qself()
METHOD new( cfilename ) CLASS TRtf
::nhandle := FCreate( cfilename )
FWrite( ::nhandle, ;
@@ -64,9 +59,8 @@ STATIC FUNCTION new( cfilename )
RETURN self
STATIC FUNCTION write( csource )
METHOD write( csource ) CLASS TRtf
LOCAL self := qself()
LOCAL cchar, cline, xatt, i
LOCAL nchar, y
@@ -136,9 +130,7 @@ STATIC FUNCTION write( csource )
RETURN self
STATIC FUNCTION CLOSE()
LOCAL self := qself()
METHOD close() CLASS TRtf
FWrite( ::nhandle, "\f1\fs16\par" + hb_eol() + "}" )
FClose( ::nhandle )

57
harbour/contrib/xhb/tcgi.prg
View File

@@ -49,32 +49,32 @@
CLASS TCgi FROM THtml
DATA nH
DATA Server_Software
DATA Server_Name
DATA Gateway_Interface
DATA Server_Protocol
DATA Server_Port
DATA Request_Method
DATA Http_Accept
DATA Http_User_agent
DATA Http_Referer
DATA Path_Info
DATA Path_Translated
DATA Script_Name
DATA Query_String
DATA Remote_Host
DATA Remote_Addr
DATA ipAddress
DATA Remote_User
DATA Auth_Type
DATA Auth_User
DATA Auth_Pass
DATA Content_Type
DATA Content_Length
DATA Annotation_Server
VAR nH
VAR Server_Software
VAR Server_Name
VAR Gateway_Interface
VAR Server_Protocol
VAR Server_Port
VAR Request_Method
VAR Http_Accept
VAR Http_User_agent
VAR Http_Referer
VAR Path_Info
VAR Path_Translated
VAR Script_Name
VAR Query_String
VAR Remote_Host
VAR Remote_Addr
VAR ipAddress
VAR Remote_User
VAR Auth_Type
VAR Auth_User
VAR Auth_Pass
VAR Content_Type
VAR Content_Length
VAR Annotation_Server
DATA aQueryFields INIT {}
VAR aQueryFields INIT {}
METHOD New( cInBuffer )
@@ -157,11 +157,12 @@ METHOD ToObject() CLASS TCgi
LOCAL nScope := 1
LOCAL aDb
LOCAL oNew
STATIC sn := 0
STATIC s_n := 0
// --> create new oObject class from this one...
sn++
aDb := HBClass():New( "NewCgi" + StrZero( sn, 3 ), { "TCgi" } )
s_n++
aDb := HBClass():New( "NewCgi" + StrZero( s_n, 3 ), { "TCgi" } )
FOR i := 1 TO Len( ::aQueryFields )

36
harbour/extras/gtwvw/tests/ebtest7.prg
View File

@@ -99,7 +99,7 @@ PROCEDURE Main()
// "NEW" button in the main window multiple times.
PROCEDURE GetSession()
STATIC snsession := 0
STATIC s_nsession := 0
LOCAL aEBGets := {}
LOCAL cName := Space( 30 )
LOCAL cNickName := Space( 10 )
@@ -110,19 +110,19 @@ PROCEDURE GetSession()
LOCAL nwinnum
LOCAL nrow1, ncol1, nrow2, ncol2
LOCAL cdebugreport
IF snsession > 15
IF s_nsession > 15
MyMessageBox( 0, "Sorry, maximum number of sessions reached" )
RETURN
ENDIF
snsession++
nwinnum := snsession
s_nsession++
nwinnum := s_nsession
nrow1 := 4 + ( snsession - 1 ) * 1
ncol1 := 10 + ( snsession - 1 ) * 2
nrow1 := 4 + ( s_nsession - 1 ) * 1
ncol1 := 10 + ( s_nsession - 1 ) * 2
nrow2 := nrow1 + 15
ncol2 := ncol1 + 60
wvw_nOpenWindow( "Session " + hb_ntos( snsession ) + " (press F8 for help)", ;
wvw_nOpenWindow( "Session " + hb_ntos( s_nsession ) + " (press F8 for help)", ;
nrow1, ncol1, nrow2, ncol2, NIL, 0 )
cRemark += hb_eol() + "(from Session " + hb_ntos( nwinnum ) + ")"
@@ -139,13 +139,13 @@ PROCEDURE GetSession()
cdebugreport += "cName:" + cName + hb_eol()
cdebugreport += "cNickName:" + cNickName + hb_eol()
cdebugreport += "dBirthDate:" + DToC( dBirthDate ) + hb_eol()
cdebugreport += "nBudget:" + tran( nBudget, "999,999.99" ) + hb_eol()
cdebugreport += "nBudget:" + transform( nBudget, "999,999.99" ) + hb_eol()
cdebugreport += "cRemark:" + cRemark
MyMessageBox( nwinnum, cdebugreport )
wvw_lclosewindow()
snsession--
s_nsession--
RETURN
@@ -539,18 +539,18 @@ STATIC FUNCTION nFocused( aEBGets )
// callback function called by GTWVW during some events on editbox
STATIC FUNCTION MaskEditBox( nWinNum, nId, nEvent, aEBGets )
STATIC bBusy := .F.
STATIC s_bBusy := .F.
LOCAL ctext
LOCAL nIndex := nGetIndex( aEBGets, nId )
LOCAL mcvaltype, mcpict, mlmultiline
LOCAL nwasfocus
IF bBusy
IF s_bBusy
RETURN NIL
ENDIF
IF nIndex == 0
RETURN NIL
ENDIF
bBusy := .T.
s_bBusy := .T.
mcvaltype := aEBGets[ nIndex ][ __GET_CVALTYPE ]
mcpict := aEBGets[ nIndex ][ __GET_CPICT ]
mlmultiline := aEBGets[ nIndex ][ __GET_LMULTILINE ]
@@ -582,7 +582,7 @@ STATIC FUNCTION MaskEditBox( nWinNum, nId, nEvent, aEBGets )
ProcessCharMask( nwinnum, nId, mcvaltype, mcpict )
ENDIF
ENDCASE
bBusy := .F.
s_bBusy := .F.
RETURN NIL
@@ -975,15 +975,15 @@ FUNCTION WVW_INPUTFOCUS( nWinNum, hWnd, message, wParam, lParam )
FUNCTION inp_handler( nwinnum, bhandler )
STATIC sbhandlers := {}
STATIC s_bhandlers := {}
LOCAL i
LOCAL retval := iif( Len( sbhandlers ) >= nwinnum + 1, sbhandlers[nwinnum+1], NIL )
LOCAL retval := iif( Len( s_bhandlers ) >= nwinnum + 1, s_bhandlers[nwinnum+1], NIL )
IF HB_ISBLOCK( bhandler )
IF Len( sbhandlers ) < nwinnum + 1
ASize( sbhandlers, nwinnum + 1 )
IF Len( s_bhandlers ) < nwinnum + 1
ASize( s_bhandlers, nwinnum + 1 )
ENDIF
sbhandlers[nwinnum+1] := bhandler
s_bhandlers[ nwinnum + 1 ] := bhandler
ENDIF
RETURN retval

2
harbour/extras/gtwvw/tests/maximize.prg
View File

@@ -60,7 +60,7 @@ PROCEDURE updatescr()
NEXT
FOR i := 0 TO MaxCol()
@ MaxRow(), i SAY "B"
//@ maxrow()-1,i say right(tran(i,"999"),1)
//@ maxrow()-1,i say right(transform(i,"999"),1)
NEXT
FOR i := 0 TO MaxRow()
@ i, MaxCol() SAY "R"

10
harbour/extras/gtwvw/tests/wvwtest9.prg
View File

@@ -906,15 +906,15 @@ FUNCTION WVW_Paint( nWinNum )
#if 0
FUNCTION WVW_SetFocus( hWnd, nWinNum )
STATIC nGotFocus := 0
STATIC s_nGotFocus := 0
IF nWinNum == 0
RETURN NIL
ENDIF
nGotFocus++
@ 0, 0 SAY nGotFocus
IF nGotFocus % 3 == 0
Alert( "Got focus " + tran( nGotFocus,"9999" ) + "th times" )
s_nGotFocus++
@ 0, 0 SAY s_nGotFocus
IF s_nGotFocus % 3 == 0
Alert( "Got focus " + transform( s_nGotFocus,"9999" ) + "th times" )
ENDIF
RETURN NIL

20
harbour/extras/hbxlsxml/xlsxml.prg
View File

@@ -150,20 +150,20 @@ METHOD ExcelWriterXML:addStyle( id )
LOCAL style
STATIC styleNum := 1
STATIC s_styleNum := 1
IF Empty( id )
id := NIL
ENDIF
IF id == NIL
id := "CustomStyle" + hb_ntos( styleNum )
styleNum++
id := "CustomStyle" + hb_ntos( s_styleNum )
s_styleNum++
ENDIF
WHILE ! ::checkStyleID( id )
id := "CustomStyle" + hb_ntos( styleNum )
styleNum++
id := "CustomStyle" + hb_ntos( s_styleNum )
s_styleNum++
ENDDO
style := ExcelWriterXML_Style():new( id )
@@ -175,16 +175,16 @@ METHOD ExcelWriterXML:addSheet( id )
LOCAL sheet
STATIC sheetNum := 1
STATIC s_sheetNum := 1
IF id == NIL
id := "Sheet" + hb_ntos( sheetNum )
sheetNum++
id := "Sheet" + hb_ntos( s_sheetNum )
s_sheetNum++
ENDIF
WHILE ! ::checkSheetID( id )
id := "Sheet" + hb_ntos( sheetNum )
sheetNum++
id := "Sheet" + hb_ntos( s_sheetNum )
s_sheetNum++
ENDDO
sheet := ExcelWriterXML_Sheet():New( id )

2
harbour/extras/httpsrv/session.prg
View File

@@ -703,7 +703,7 @@ METHOD SessionDestroy( cID ) CLASS uhttpd_Session
METHOD SessionGC( nMaxLifeTime ) CLASS uhttpd_Session
//TraceLog( "SessionGC() - nMaxLifeTime", nMaxLifeTime )
//STATIC nStartTime
//STATIC s_nStartTime
LOCAL nSecs
LOCAL aDir, aFile

114
harbour/tests/alias.prg
View File

@@ -6,127 +6,130 @@
// It is used to check if pcode is generated correctly for aliased expressions
// (you must check it visually :)
MEMVAR p_privateVar
MEMVAR unknVar
PROCEDURE Main()
LOCAL localVar
STATIC staticVar
STATIC s_staticVar
FIELD fieldVar
FIELD aliasedField IN aaa
MEMVAR memvarVar
PRIVATE privateVar
PRIVATE p_privateVar
? privateVar
? p_privateVar
? memvarVar
? localVar
? staticVar
? s_staticVar
? fieldVar
? aliasedField
? unknVar
? 1->privateVar
? 1->p_privateVar
? 1->memvarVar
? 1->localVar
? 1->staticVar
? 1->s_staticVar
? 1->fieldVar
? 1->aliasedField
? 1->unknVar
? alias->privateVar
? alias->p_privateVar
? alias->memvarVar
? alias->localVar
? alias->staticVar
? alias->s_staticVar
? alias->fieldVar
? alias->aliasedField
? alias->unknVar
? ( localVar )->privateVar
? ( localVar )->p_privateVar
? ( localVar )->memvarVar
? ( localVar )->localVar
? ( localVar )->staticVar
? ( localVar )->s_staticVar
? ( localVar )->fieldVar
? ( localVar )->aliasedField
? ( localVar )->unknVar
? ( localVar )->( privateVar, memvarVar, localVar, staticVar, fieldVar, aliasedField, unknVar )
? alias->( privateVar, memvarVar, localVar, staticVar, fieldVar, aliasedField, unknVar )
? 2->( privateVar, memvarVar, localVar, staticVar, fieldVar, aliasedField, unknVar )
? ( localVar, 2 )->( privateVar, memvarVar, localVar, staticVar, fieldVar, aliasedField, unknVar )
? ( localVar )->( p_privateVar, memvarVar, localVar, s_staticVar, fieldVar, aliasedField, unknVar )
? alias->( p_privateVar, memvarVar, localVar, s_staticVar, fieldVar, aliasedField, unknVar )
? 2->( p_privateVar, memvarVar, localVar, s_staticVar, fieldVar, aliasedField, unknVar )
? ( localVar, 2 )->( p_privateVar, memvarVar, localVar, s_staticVar, fieldVar, aliasedField, unknVar )
? privateVar ++
? memvarVar ++
? localVar ++
? staticVar ++
? fieldVar ++
? aliasedField ++
? unknVar ++
? p_privateVar++
? memvarVar++
? localVar++
? s_staticVar++
? fieldVar++
? aliasedField++
? unknVar++
? 1->privateVar ++
? 1->memvarVar ++
? 1->localVar ++
? 1->staticVar ++
? 1->fieldVar ++
? 1->aliasedField ++
? 1->unknVar ++
? 1->p_privateVar++
? 1->memvarVar++
? 1->localVar++
? 1->s_staticVar++
? 1->fieldVar++
? 1->aliasedField++
? 1->unknVar++
? alias->privateVar ++
? alias->memvarVar ++
? alias->localVar ++
? alias->staticVar ++
? alias->fieldVar ++
? alias->aliasedField ++
? alias->unknVar ++
? alias->p_privateVar++
? alias->memvarVar++
? alias->localVar++
? alias->s_staticVar++
? alias->fieldVar++
? alias->aliasedField++
? alias->unknVar++
? ( localVar )->privateVar ++
? ( localVar )->memvarVar ++
? ( localVar )->localVar ++
? ( localVar )->staticVar ++
? ( localVar )->fieldVar ++
? ( localVar )->aliasedField ++
? ( localVar )->unknVar ++
? ( localVar )->p_privateVar++
? ( localVar )->memvarVar++
? ( localVar )->localVar++
? ( localVar )->s_staticVar++
? ( localVar )->fieldVar++
? ( localVar )->aliasedField++
? ( localVar )->unknVar++
? privateVar += privateVar
? p_privateVar += p_privateVar
? memvarVar += memvarVar
? localVar += localVar
? staticVar += staticVar
? s_staticVar += s_staticVar
? fieldVar += fieldVar
? aliasedField += aliasedField
? unknVar += unknVar
? 1->privateVar += 1->privateVar
? 1->p_privateVar += 1->p_privateVar
? 1->memvarVar += 1->memvarVar
? 1->localVar += 1->localVar
? 1->staticVar += 1->staticVar
? 1->s_staticVar += 1->s_staticVar
? 1->fieldVar += 1->fieldVar
? 1->aliasedField += 1->aliasedField
? 1->unknVar += 1->unknVar
? alias->privateVar += alias->privateVar
? alias->p_privateVar += alias->p_privateVar
? alias->memvarVar += alias->memvarVar
? alias->localVar += alias->localVar
? alias->staticVar += alias->staticVar
? alias->s_staticVar += alias->s_staticVar
? alias->fieldVar += alias->fieldVar
? alias->aliasedField += alias->aliasedField
? alias->unknVar += alias->unknVar
? ( localVar )->privateVar += ( localVar )->privateVar
? ( localVar )->p_privateVar += ( localVar )->p_privateVar
? ( localVar )->memvarVar += ( localVar )->memvarVar
? ( localVar )->localVar += ( localVar )->localVar
? ( localVar )->staticVar += ( localVar )->staticVar
? ( localVar )->s_staticVar += ( localVar )->s_staticVar
? ( localVar )->fieldVar += ( localVar )->fieldVar
? ( localVar )->aliasedField += ( localVar )->aliasedField
? ( localVar )->unknVar += ( localVar )->unknVar
? ( localVar )->privateVar += 2->privateVar
? ( localVar )->p_privateVar += 2->p_privateVar
? ( localVar )->memvarVar += 2->memvarVar
? ( localVar )->localVar += 2->localVar
? ( localVar )->staticVar += 2->staticVar
? ( localVar )->s_staticVar += 2->s_staticVar
? ( localVar )->fieldVar += 2->fieldVar
? ( localVar )->aliasedField += 2->aliasedField
? ( localVar )->unknVar += 2->unknVar
? alias->( aliasedField, MEMVAR->privateVar, 1->( Test( 2->fieldVar ) ) )
? alias->( aliasedField, MEMVAR->p_privateVar, 1->( Test( 2->fieldVar ) ) )
MEMVAR->privateVar := 0
MEMVAR->p_privateVar := 0
M->localVar := 1
MEMVA->fieldVar := 2
@@ -134,3 +137,6 @@ PROCEDURE Main()
FIEL->aliasedFieldVar := 1
RETURN
STATIC FUNCTION Test()
RETURN NIL

16
harbour/tests/begin.prg
View File

@@ -6,12 +6,12 @@
// and BREAK statement
MEMVAR oMemvar
MEMVAR mPrivate
MEMVAR p_mPrivate
PROCEDURE Main()
LOCAL oLocal
PRIVATE mPrivate := "private value in MAIN"
PRIVATE p_mPrivate := "private value in MAIN"
BEGIN SEQUENCE
? " Inside SEQUENCE 1"
@@ -73,7 +73,7 @@ PROCEDURE Main()
END SEQUENCE
? "After SEQUENCE 7"
? M->mPrivate
? M->p_mPrivate
Break( "exit from MAIN" )
? "This text will be not printed"
@@ -81,9 +81,9 @@ PROCEDURE Main()
PROCEDURE Break1()
PRIVATE mPrivate := "VALUE from Break1"
PRIVATE p_mPrivate := "VALUE from Break1"
BREAK M->mPrivate
BREAK M->p_mPrivate
PROCEDURE Break2()
@@ -100,7 +100,7 @@ PROCEDURE Break2()
PROCEDURE Break3()
STATIC oStatic
STATIC s_oStatic
BEGIN SEQUENCE
? " Inside SEQUENCE 9"
@@ -108,8 +108,8 @@ PROCEDURE Break3()
BEGIN SEQUENCE
? " Inside SEQUENCE 10"
Break( "value from nested SEQUENCE 10" )
RECOVER USING oStatic
? " Recovering in 10 using...", oStatic
RECOVER USING s_oStatic
? " Recovering in 10 using...", s_oStatic
END SEQUENCE
? "After SEQUENCE 10"

14
harbour/tests/byref.prg
View File

@@ -6,7 +6,7 @@
PROCEDURE Main()
STATIC s := 10
STATIC s_x := 10
LOCAL x := 0
@@ -17,9 +17,9 @@ PROCEDURE Main()
? "Managing STATIC variables by reference"
? "In main before ref1 s=", s
ref1( @s )
? " In main after ref1 s=", s
? "In main before ref1 s=", s_x
ref1( @s_x )
? " In main after ref1 s=", s_x
RETURN
@@ -43,12 +43,12 @@ FUNCTION ref2( x )
FUNCTION ref3( x )
STATIC a
STATIC s_a
x++
? " In ref3 before ref4 =", x
a := { x, x }
Ref4( @a )
s_a := { x, x }
Ref4( @s_a )
? " In ref3 after ref4 =", x
RETURN NIL

4
harbour/tests/funcarr.prg
View File

@@ -58,6 +58,6 @@ PROCEDURE Main()
FUNCTION aFunc()
STATIC aArray := { [Test] }
STATIC s_aArray := { [Test] }
RETURN aArray
RETURN s_aArray

8
harbour/tests/testwarn.prg
View File

@@ -53,7 +53,7 @@ FIELD b AS STRING
MEMVAR Var1 AS STRING
STATIC lGlobal AS LOGICAL
STATIC s_lGlobal AS LOGICAL
PROCEDURE Main( optional )
@@ -98,7 +98,7 @@ PROCEDURE Main( optional )
Var1 := .F.
ENDIF
IF lGlobal
IF s_lGlobal
Var1 := .T.
ENDIF
@@ -122,8 +122,8 @@ PROCEDURE SOMEPROC()
Var1 := 1
IF lGlobal == 0
? "lGlobal is NOT Numeric"
IF s_lGlobal == 0
? "s_lGlobal is NOT Numeric"
ENDIF
RETURN

18
harbour/tests/wvtext.prg
View File

@@ -381,26 +381,26 @@ FUNCTION SetPaletteIndex()
PROCEDURE thFunc()
STATIC nBrowser := 0
STATIC nZx := 0
STATIC nZy := 0
STATIC s_nBrowser := 0
STATIC s_nZx := 0
STATIC s_nZy := 0
LOCAL cTitle, oBrowse, lEnd, nKey, i, aStruct
LOCAL aColor := { "W+/N", "W+/B", "W+/G", "W+/BG", "W+/N*", "W+/RB", "N/W*", "N/GR*" }
nBrowser++
nZx += 20
nZy += 20
s_nBrowser++
s_nZx += 20
s_nZy += 20
/* allocate own GT driver */
hb_gtReload( "WVT" )
hb_gtInfo( HB_GTI_PALETTE, 8, RGB( 120, 200, 240 ) )
IF ( nBrowser % 2 ) != 0
IF ( s_nBrowser % 2 ) != 0
hb_gtInfo( HB_GTI_RESIZEMODE, HB_GTI_RESIZEMODE_ROWS )
ENDIF
hb_gtInfo( HB_GTI_FONTNAME , "Lucida Console" )
hb_gtInfo( HB_GTI_WINTITLE, "test.dbf [" + iif( ( nBrowser % 2 ) != 0, "RESIZABLE_BY_ROWS", "RESIZABLE_BY_FONT" ) + "]" )
hb_gtInfo( HB_GTI_WINTITLE, "test.dbf [" + iif( ( s_nBrowser % 2 ) != 0, "RESIZABLE_BY_ROWS", "RESIZABLE_BY_FONT" ) + "]" )
hb_gtInfo( HB_GTI_ALTENTER, .T. ) //allow alt-enter for full screen
SetCursor( SC_NONE )
@@ -420,7 +420,7 @@ PROCEDURE thFunc()
" Rows and " + hb_ntos( MaxCol() ) + " Columns"
hb_DispOutAt( 0, 0, PadC( cTitle, MaxCol() + 1 ), "N/GR*" )
hb_gtInfo( HB_GTI_SETPOS_XY, nZx, nZy ) //this does not work until something is displayed
hb_gtInfo( HB_GTI_SETPOS_XY, s_nZx, s_nZy ) //this does not work until something is displayed
USE test NEW SHARED
aStruct := dbStruct()