diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 510e0faac8..1a56fd6de2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,34 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-15 18:32 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/make.hb + * extras/httpsrv/uhttpd.prg + * tests/ac_test2.prg + * tests/alias.prg + * tests/begin.prg + * tests/db_brows.prg + * tests/memfile.prg + * tests/omacro.prg + * tests/sbartest.prg + * tests/switch.prg + * tests/testget.prg + * tests/testpp.prg + * tests/tstblock.prg + * tests/varparam.prg + * use m_ prefix for PRIVATEs, p_ for PUBLICs and s[c]_ + for STATICs + % optimized out some PRIVATEs + % use hb_Disp*() instead of @ SAY in db_browse.prg + (this fixes cursor flickering) + + * ChangeLog + ! typos + + * utils/hbtest/rt_class.prg + * utils/hbtest/rt_math.prg + * formatting + 2012-10-15 15:21 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbformat/hbfmtcls.prg * new TOFIX: @@ -312,7 +340,7 @@ * extras/hbdoc/hbdoc.prg * extras/hbdoc/tmplates.prg ! use HB_ASCAN( x, y,,, .T. ) to avoid relying on _SET_EXACT - % use ASCAN() instead of HB_ASCAN() if Harbour extension are not used (hbdoc) + % use ASCAN() instead of HB_ASCAN() if Harbour extension is not used (hbdoc) * contrib/gtwvg/tests/modal.prg ! use HB_ASCAN( x, y,,, .T. ) to avoid relying on _SET_EXACT @@ -378,7 +406,7 @@ * contrib/hbmisc/spd.c * contrib/hbmisc/dates2.c - % static string set to const and renamed + % static vectors set to const and renamed * contrib/hbnf/fttext.c * minors diff --git a/harbour/contrib/make.hb b/harbour/contrib/make.hb index a2cc401f44..d24f4094ec 100755 --- a/harbour/contrib/make.hb +++ b/harbour/contrib/make.hb @@ -39,7 +39,7 @@ #define _ACT_INC_REBUILD 4 #define _ACT_INC_REBUILD_INST 5 -STATIC hActions := {; +STATIC sc_hActions := {; _ACT_INC_CLEAN => "clean" ,; _ACT_INC => "build" ,; _ACT_INC_INST => "build and install" ,; @@ -180,7 +180,7 @@ PROCEDURE Standalone( aParams, hProjectList ) IF Empty( hProjectReqList ) lCustom := .T. ELSE - OutStd( hb_StrFormat( "! Package %1$s... %2$d project(s)", hActions[ nAction ], Len( hProjectReqList ) ) + hb_eol() ) + OutStd( hb_StrFormat( "! Package %1$s... %2$d project(s)", sc_hActions[ nAction ], Len( hProjectReqList ) ) + hb_eol() ) ENDIF ENDIF @@ -341,11 +341,11 @@ PROCEDURE GNUMake( aParams, hProjectList ) /* Start building */ - OutStd( hb_StrFormat( "! Started package %1$s...", hActions[ nAction ] ) + hb_eol() ) + OutStd( hb_StrFormat( "! Started package %1$s...", sc_hActions[ nAction ] ) + hb_eol() ) build_projects( nAction, hProjectList, hProjectReqList, "", .F. ) - OutStd( hb_StrFormat( "! Finished package %1$s...", hActions[ nAction ] ) + hb_eol() ) + OutStd( hb_StrFormat( "! Finished package %1$s...", sc_hActions[ nAction ] ) + hb_eol() ) RETURN diff --git a/harbour/extras/httpsrv/uhttpd.prg b/harbour/extras/httpsrv/uhttpd.prg index aa953544ef..78244b4900 100644 --- a/harbour/extras/httpsrv/uhttpd.prg +++ b/harbour/extras/httpsrv/uhttpd.prg @@ -813,7 +813,15 @@ STATIC FUNCTION ProcessConnection() LOCAL nMsecs, nParseTime, nPos, nThreadID LOCAL lQuitRequest := .F. - PRIVATE _SERVER, _GET, _POST, _COOKIE, _SESSION, _REQUEST, _HTTP_REQUEST, _HTTP_RESPONSE, m_cPost + PRIVATE _SERVER + PRIVATE _GET + PRIVATE _POST + PRIVATE _COOKIE + PRIVATE _SESSION + PRIVATE _REQUEST + PRIVATE _HTTP_REQUEST + PRIVATE _HTTP_RESPONSE + PRIVATE m_cPost nThreadId := hb_threadID() diff --git a/harbour/tests/ac_test2.prg b/harbour/tests/ac_test2.prg index 9d92bee575..7c5f6d3731 100644 --- a/harbour/tests/ac_test2.prg +++ b/harbour/tests/ac_test2.prg @@ -21,7 +21,7 @@ #include "inkey.ch" #include "achoice.ch" -MEMVAR lHiLiTest +MEMVAR p_lHiLiTest PROCEDURE Main() @@ -41,7 +41,7 @@ PROCEDURE Main() // set to True for items (de)highlighting // algoritm in clipper - PUBLIC lHiLiTest := .F. + PUBLIC p_lHiLiTest := .F. SetColor( "W+/N, BG+/B, , , W/N" ) @@ -88,7 +88,7 @@ FUNCTION cUF( nMode, nCurElement, nRowPos ) HB_SYMBOL_UNUSED( nCurElement ) HB_SYMBOL_UNUSED( nRowPos ) - IF lHiLiTest + IF p_lHiLiTest DispBox( 0, 0, MaxRow(), MaxCol(), Replicate( "#", 9 ), "GR+/G" ) ENDIF diff --git a/harbour/tests/alias.prg b/harbour/tests/alias.prg index c40cedff9c..ff16b59a62 100644 --- a/harbour/tests/alias.prg +++ b/harbour/tests/alias.prg @@ -6,7 +6,7 @@ // It is used to check if pcode is generated correctly for aliased expressions // (you must check it visually :) -MEMVAR p_privateVar +MEMVAR m_privateVar MEMVAR unknVar PROCEDURE Main() @@ -16,9 +16,9 @@ PROCEDURE Main() FIELD fieldVar FIELD aliasedField IN aaa MEMVAR memvarVar - PRIVATE p_privateVar + PRIVATE m_privateVar - ? p_privateVar + ? m_privateVar ? memvarVar ? localVar ? s_staticVar @@ -26,7 +26,7 @@ PROCEDURE Main() ? aliasedField ? unknVar - ? 1->p_privateVar + ? 1->m_privateVar ? 1->memvarVar ? 1->localVar ? 1->s_staticVar @@ -34,7 +34,7 @@ PROCEDURE Main() ? 1->aliasedField ? 1->unknVar - ? alias->p_privateVar + ? alias->m_privateVar ? alias->memvarVar ? alias->localVar ? alias->s_staticVar @@ -42,7 +42,7 @@ PROCEDURE Main() ? alias->aliasedField ? alias->unknVar - ? ( localVar )->p_privateVar + ? ( localVar )->m_privateVar ? ( localVar )->memvarVar ? ( localVar )->localVar ? ( localVar )->s_staticVar @@ -50,12 +50,12 @@ PROCEDURE Main() ? ( localVar )->aliasedField ? ( localVar )->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 ) + ? ( localVar )->( m_privateVar, memvarVar, localVar, s_staticVar, fieldVar, aliasedField, unknVar ) + ? alias->( m_privateVar, memvarVar, localVar, s_staticVar, fieldVar, aliasedField, unknVar ) + ? 2->( m_privateVar, memvarVar, localVar, s_staticVar, fieldVar, aliasedField, unknVar ) + ? ( localVar, 2 )->( m_privateVar, memvarVar, localVar, s_staticVar, fieldVar, aliasedField, unknVar ) - ? p_privateVar++ + ? m_privateVar++ ? memvarVar++ ? localVar++ ? s_staticVar++ @@ -63,7 +63,7 @@ PROCEDURE Main() ? aliasedField++ ? unknVar++ - ? 1->p_privateVar++ + ? 1->m_privateVar++ ? 1->memvarVar++ ? 1->localVar++ ? 1->s_staticVar++ @@ -71,7 +71,7 @@ PROCEDURE Main() ? 1->aliasedField++ ? 1->unknVar++ - ? alias->p_privateVar++ + ? alias->m_privateVar++ ? alias->memvarVar++ ? alias->localVar++ ? alias->s_staticVar++ @@ -79,7 +79,7 @@ PROCEDURE Main() ? alias->aliasedField++ ? alias->unknVar++ - ? ( localVar )->p_privateVar++ + ? ( localVar )->m_privateVar++ ? ( localVar )->memvarVar++ ? ( localVar )->localVar++ ? ( localVar )->s_staticVar++ @@ -87,7 +87,7 @@ PROCEDURE Main() ? ( localVar )->aliasedField++ ? ( localVar )->unknVar++ - ? p_privateVar += p_privateVar + ? m_privateVar += m_privateVar ? memvarVar += memvarVar ? localVar += localVar ? s_staticVar += s_staticVar @@ -95,7 +95,7 @@ PROCEDURE Main() ? aliasedField += aliasedField ? unknVar += unknVar - ? 1->p_privateVar += 1->p_privateVar + ? 1->m_privateVar += 1->m_privateVar ? 1->memvarVar += 1->memvarVar ? 1->localVar += 1->localVar ? 1->s_staticVar += 1->s_staticVar @@ -103,7 +103,7 @@ PROCEDURE Main() ? 1->aliasedField += 1->aliasedField ? 1->unknVar += 1->unknVar - ? alias->p_privateVar += alias->p_privateVar + ? alias->m_privateVar += alias->m_privateVar ? alias->memvarVar += alias->memvarVar ? alias->localVar += alias->localVar ? alias->s_staticVar += alias->s_staticVar @@ -111,7 +111,7 @@ PROCEDURE Main() ? alias->aliasedField += alias->aliasedField ? alias->unknVar += alias->unknVar - ? ( localVar )->p_privateVar += ( localVar )->p_privateVar + ? ( localVar )->m_privateVar += ( localVar )->m_privateVar ? ( localVar )->memvarVar += ( localVar )->memvarVar ? ( localVar )->localVar += ( localVar )->localVar ? ( localVar )->s_staticVar += ( localVar )->s_staticVar @@ -119,7 +119,7 @@ PROCEDURE Main() ? ( localVar )->aliasedField += ( localVar )->aliasedField ? ( localVar )->unknVar += ( localVar )->unknVar - ? ( localVar )->p_privateVar += 2->p_privateVar + ? ( localVar )->m_privateVar += 2->m_privateVar ? ( localVar )->memvarVar += 2->memvarVar ? ( localVar )->localVar += 2->localVar ? ( localVar )->s_staticVar += 2->s_staticVar @@ -127,9 +127,9 @@ PROCEDURE Main() ? ( localVar )->aliasedField += 2->aliasedField ? ( localVar )->unknVar += 2->unknVar - ? alias->( aliasedField, MEMVAR->p_privateVar, 1->( Test( 2->fieldVar ) ) ) + ? alias->( aliasedField, MEMVAR->m_privateVar, 1->( Test( 2->fieldVar ) ) ) - MEMVAR->p_privateVar := 0 + MEMVAR->m_privateVar := 0 M->localVar := 1 MEMVA->fieldVar := 2 diff --git a/harbour/tests/begin.prg b/harbour/tests/begin.prg index 8290dcb414..e549d3c988 100644 --- a/harbour/tests/begin.prg +++ b/harbour/tests/begin.prg @@ -5,13 +5,13 @@ // This files demonstrates the use of BEGIN/RECOVER/END SEQUENCE // and BREAK statement -MEMVAR oMemvar -MEMVAR p_mPrivate +MEMVAR m_oMemvar +MEMVAR m_cPrivate PROCEDURE Main() LOCAL oLocal - PRIVATE p_mPrivate := "private value in MAIN" + PRIVATE m_cPrivate := "private value in MAIN" BEGIN SEQUENCE ? " Inside SEQUENCE 1" @@ -59,8 +59,8 @@ PROCEDURE Main() BEGIN SEQUENCE ? " Inside SEQUENCE 6" Break1( ) - RECOVER USING oMemvar - ? " Recovering in 6 using... ", oMemvar + RECOVER USING m_oMemvar + ? " Recovering in 6 using... ", m_oMemvar END SEQUENCE ? "After SEQUENCE 6" @@ -68,12 +68,12 @@ PROCEDURE Main() BEGIN SEQUENCE ? " Inside SEQUENCE 7" Break2( ) - RECOVER USING oMemvar - ? " Recovering in 7 using... ", oMemvar + RECOVER USING m_oMemvar + ? " Recovering in 7 using... ", m_oMemvar END SEQUENCE ? "After SEQUENCE 7" - ? M->p_mPrivate + ? M->m_cPrivate Break( "exit from MAIN" ) ? "This text will be not printed" @@ -81,17 +81,17 @@ PROCEDURE Main() PROCEDURE Break1() - PRIVATE p_mPrivate := "VALUE from Break1" + PRIVATE m_cPrivate := "VALUE from Break1" - BREAK M->p_mPrivate + BREAK M->m_cPrivate PROCEDURE Break2() BEGIN SEQUENCE ? " Inside SEQUENCE 8" Break3( ) - RECOVER USING oMemvar - ? " Recovering in 8 using...", Eval( oMemvar, " eval in 8" ) + RECOVER USING m_oMemvar + ? " Recovering in 8 using...", Eval( m_oMemvar, " eval in 8" ) Break( "BREAK from recovery code" ) END SEQUENCE ? "After SEQUENCE 8" @@ -115,9 +115,9 @@ PROCEDURE Break3() Break4( " and parameter" ) - RECOVER USING oMemvar - ? " Recovering in 9 using...", Eval( oMemvar, " eval in 9" ) - Break( oMemvar ) + RECOVER USING m_oMemvar + ? " Recovering in 9 using...", Eval( m_oMemvar, " eval in 9" ) + Break( m_oMemvar ) END SEQUENCE ? "After SEQUENCE 9" diff --git a/harbour/tests/db_brows.prg b/harbour/tests/db_brows.prg index 7730fa34b9..b909470b92 100644 --- a/harbour/tests/db_brows.prg +++ b/harbour/tests/db_brows.prg @@ -76,9 +76,6 @@ #define LI_COLCOUNT mslist[ 42 ] #define LI_LEN 42 -MEMVAR str_barbox -MEMVAR str_bar - //+-------------------------------------------------------------------- //+ //+ PROCEDURE Main() @@ -127,18 +124,12 @@ FUNCTION DBFLIST( mslist, x1, y1, x2, y2, title, maskey ) LOCAL fbar1, fbar2, vartmp, varbuf, razmer LOCAL GetList := {} - MEMVAR str_barbox - MEMVAR str_bar + LOCAL str_barbox := hb_UTF8ToStrBox( "░" ) + LOCAL str_bar := /* LOW-ASCII "▼▲" */ Chr( 31 ) + Chr( 30 ) + hb_UTF8ToStr( "■" ) IF mslist == NIL mslist := InitList() ENDIF - IF !( Type( "str_barbox" ) == "C" ) - PRIVATE str_barbox := hb_UTF8ToStrBox( "░" ) - ENDIF - IF !( Type( "str_bar" ) == "C" ) - PRIVATE str_bar := /* LOW-ASCII "▼▲" */ Chr( 31 ) + Chr( 30 ) + hb_UTF8ToStr( "■" ) - ENDIF LI_Y1 := y1 LI_X1 := x1 LI_Y2 := y2 @@ -189,7 +180,7 @@ FUNCTION DBFLIST( mslist, x1, y1, x2, y2, title, maskey ) SetColor( LI_CLR ) hb_DispBox( LI_Y1, LI_X1, LI_Y2, LI_X2, hb_UTF8ToStrBox( "┌─┐│┘─└│ " ) ) IF title != NIL - @ LI_Y1, ( LI_X2 - LI_X1 - 1 - Len( title ) ) / 2 + LI_X1 SAY " " + title + " " + hb_DispOutAt( LI_Y1, ( LI_X2 - LI_X1 - 1 - Len( title ) ) / 2 + LI_X1, " " + title + " " ) ENDIF IF title != NIL .AND. LI_NAMES != NIL LI_Y1++ @@ -245,9 +236,9 @@ FUNCTION DBFLIST( mslist, x1, y1, x2, y2, title, maskey ) ENDCASE IF ! Empty( fbar1 ) hb_DispBox( LI_Y1 + 2, LI_X2, LI_Y2 - 2, LI_X2, str_barbox ) - @ LI_Y1 + 1, LI_X2 SAY SubStr( str_bar, 2, 1 ) - @ LI_Y2 - 1, LI_X2 SAY SubStr( str_bar, 1, 1 ) - @ LI_Y1 + 2 + Int( iif( LI_PRFLT, LI_TEKZP, &fbar1 ) * ( LI_Y2 - LI_Y1 - 4 ) / iif( LI_PRFLT, LI_KOLZ, &fbar2 ) ), LI_X2 SAY Right( str_bar, 1 ) + hb_DispOutAt( LI_Y1 + 1, LI_X2, SubStr( str_bar, 2, 1 ) ) + hb_DispOutAt( LI_Y2 - 1, LI_X2, SubStr( str_bar, 1, 1 ) ) + hb_DispOutAt( LI_Y1 + 2 + Int( iif( LI_PRFLT, LI_TEKZP, &fbar1 ) * ( LI_Y2 - LI_Y1 - 4 ) / iif( LI_PRFLT, LI_KOLZ, &fbar2 ) ), LI_X2, Right( str_bar, 1 ) ) ENDIF // IF LI_LVIEW @@ -511,7 +502,7 @@ FUNCTION VIVNAMES( mslist ) // DO MSFNEXT WITH mslist, fif DO WHILE i <= LI_NCOLUMNS .AND. fif <= Len( LI_NAMES ) IF LI_NAMES[ fif ] != NIL - @ LI_Y1, x SAY LI_NAMES[ fif ] + hb_DispOutAt( LI_Y1, x, LI_NAMES[ fif ] ) ENDIF x := x + Max( Len( FLDSTR( mslist, fif ) ), Len( LI_NAMES[ fif ] ) ) + 1 fif := iif( fif == LI_FREEZE, LI_NLEFT, fif + 1 ) @@ -577,10 +568,10 @@ STATIC PROCEDURE VIVSTR( mslist, nstroka, vybfld ) IF LI_KOLZ > 0 fif := iif( LI_FREEZE > 0, 1, LI_NLEFT ) IF LI_NLEFT != LI_LEFTVISIBLE .AND. vybfld == 0 - @ nstroka, LI_X1 + 1 SAY "<" + hb_DispOutAt( nstroka, LI_X1 + 1, "<" ) ENDIF IF Deleted() - @ nstroka, LI_X1 + 1 SAY "*" + hb_DispOutAt( nstroka, LI_X1 + 1, "*" ) ENDIF FOR i := 1 TO LI_NCOLUMNS IF i == LI_COLPOS @@ -590,7 +581,7 @@ STATIC PROCEDURE VIVSTR( mslist, nstroka, vybfld ) // DO MSFNEXT WITH mslist, fif sviv := FLDSTR( mslist, fif ) sviv := iif( Len( sviv ) < LI_X2 - 1 - x, sviv, SubStr( sviv, 1, LI_X2 - 1 - x ) ) - @ nstroka, x SAY sviv + hb_DispOutAt( nstroka, x, sviv ) ELSE sviv := FLDSTR( mslist, fif ) sviv := iif( Len( sviv ) < LI_X2 - 1 - x, sviv, SubStr( sviv, 1, LI_X2 - 1 - x ) ) @@ -602,9 +593,9 @@ STATIC PROCEDURE VIVSTR( mslist, nstroka, vybfld ) IF fif <= LI_COLCOUNT .AND. vybfld == 0 IF LI_X2 - 1 - x > 0 sviv := FLDSTR( mslist, fif ) - @ nstroka, x SAY SubStr( sviv, 1, LI_X2 - 1 - x ) + hb_DispOutAt( nstroka, x, SubStr( sviv, 1, LI_X2 - 1 - x ) ) ENDIF - @ nstroka, LI_X2 - 1 SAY ">" + hb_DispOutAt( nstroka, LI_X2 - 1, ">" ) ENDIF ENDIF diff --git a/harbour/tests/memfile.prg b/harbour/tests/memfile.prg index a37a9880c4..cbf7b6ab11 100644 --- a/harbour/tests/memfile.prg +++ b/harbour/tests/memfile.prg @@ -5,70 +5,75 @@ // ; Donated to the public domain by // Viktor Szakats (harbour syenar.net) -MEMVAR mcLongerNameThen10Chars +MEMVAR m_cLongerNameThen10Chars #ifdef __HARBOUR__ -MEMVAR mcLongerNa +MEMVAR m_cLongerN #endif -MEMVAR mcString -MEMVAR mnDouble -MEMVAR mnDoubleH -MEMVAR mnInt -MEMVAR mnLong -MEMVAR mdDate -MEMVAR mlLogicalT -MEMVAR mlLogicalF -MEMVAR mxStayHere +MEMVAR m_cString +MEMVAR m_nDouble +MEMVAR m_nDoubleH +MEMVAR m_nInt +MEMVAR m_nLong +MEMVAR m_dDate +MEMVAR m_lLogicT +MEMVAR m_lLogicF +MEMVAR m_xStayHer PROCEDURE Main() - PRIVATE mcLongerNameThen10Chars := "Long String Name!" - PRIVATE mcString := "This is a" + Chr( 0 ) + "string to save." - PRIVATE mnDouble := 100.0000 - PRIVATE mnDoubleH := 5000000000 - PRIVATE mnInt := 35 - PRIVATE mnLong := 3000000 - PRIVATE mdDate := Date() - PRIVATE mlLogicalT := .F. - PRIVATE mlLogicalF := .T. + + PRIVATE m_cLongerNameThen10Chars := "Long String Name!" + PRIVATE m_cString := "This is a" + Chr( 0 ) + "string to save." + PRIVATE m_nDouble := 100.0000 + PRIVATE m_nDoubleH := 5000000000 + PRIVATE m_nInt := 35 + PRIVATE m_nLong := 3000000 + PRIVATE m_dDate := Date() + PRIVATE m_lLogicT := .F. + PRIVATE m_lLogicF := .T. SAVE TO memfile ALL - SAVE TO memsome ALL LIKE "mnDouble*" + SAVE TO memsome ALL LIKE "m_nDouble*" CLEAR MEMORY SAVE TO memempt ALL - PRIVATE mxStayHere := "CONST" + PRIVATE m_xStayHer := "CONST" RESTORE FROM memfile ADDITIVE - ? mxStayHere - ? mcLongerNa /* Can't restore the part of the name beyond the tenth char */ - ? mcString - ? mnDouble - ? mnDoubleH - ? mnInt - ? mnLong - ? mdDate - ? mlLogicalF - ? mlLogicalT + ? m_xStayHer + ? m_cLongerN /* Can't restore the part of the name beyond the tenth char */ + ? m_cString + ? m_nDouble + ? m_nDoubleH + ? m_nInt + ? m_nLong + ? m_dDate + ? m_lLogicF + ? m_lLogicT RESTORE FROM memfile -// ? mxStayHere - ? mcLongerNa /* Can't restore the part of the name beyond the tenth char */ - ? mcString - ? mnDouble - ? mnDoubleH - ? mnInt - ? mnLong - ? mdDate - ? mlLogicalF - ? mlLogicalT +// ? m_xStayHer + ? m_cLongerN /* Can't restore the part of the name beyond the tenth char */ + ? m_cString + ? m_nDouble + ? m_nDoubleH + ? m_nInt + ? m_nLong + ? m_dDate + ? m_lLogicF + ? m_lLogicT - ? __MRestore( "memfile", .F., "mndouble*", .T. ) - ? mnDouble - ? mnDoubleH - ? __mvScope("mnInt") + ? __MRestore( "memfile", .F., "m_nDouble*", .T. ) + ? m_nDouble + ? m_nDoubleH + ? __mvScope( "m_nInt" ) + + FErase( "memempt.mem" ) + FErase( "memfile.mem" ) + FErase( "memsome.mem" ) RETURN diff --git a/harbour/tests/omacro.prg b/harbour/tests/omacro.prg index bac38f2fb2..e5d8a31fdf 100644 --- a/harbour/tests/omacro.prg +++ b/harbour/tests/omacro.prg @@ -10,13 +10,15 @@ PROCEDURE Main() LOCAL obj := ErrorNew() - MEMVAR send1, send2 - PRIVATE send1 := "_description" - PRIVATE send2 := "_tries" + MEMVAR m_send1 + MEMVAR m_send2 + + PRIVATE m_send1 := "_description" + PRIVATE m_send2 := "_tries" obj:tries := 1 - obj:&send1 := "test" + obj:&m_send1 := "test" obj:tries += 1 obj:tries++ @@ -34,19 +36,19 @@ PROCEDURE Main() To access the object variable using macro the '_' should be omitted */ - :&send2 += 1 - :&send2++ - ++:&send2 - ++:&( send2 ) + :&m_send2 += 1 + :&m_send2++ + ++:&m_send2 + ++:&( m_send2 ) - :&( send2 ) := :&( SubStr( send2, 2 ) ) + 1 + :&( m_send2 ) := :&( SubStr( m_send2, 2 ) ) + 1 - :&send1 += " description" - :&( send1 ) += " of " + :&m_send1 += " description" + :&( m_send1 ) += " of " ENDWITH - obj:&( "_" + SubStr( send1, 2 ) ) += "Error object" - ? send1, "=", obj:&( SubStr( send1, 2 ) ) - ? send2, "=", obj:tries + obj:&( "_" + SubStr( m_send1, 2 ) ) += "Error object" + ? m_send1, "=", obj:&( SubStr( m_send1, 2 ) ) + ? m_send2, "=", obj:tries RETURN diff --git a/harbour/tests/sbartest.prg b/harbour/tests/sbartest.prg index 036cbd108a..d00bca27bc 100644 --- a/harbour/tests/sbartest.prg +++ b/harbour/tests/sbartest.prg @@ -34,8 +34,9 @@ PROCEDURE Main() FUNCTION InitScrlBar() LOCAL tmpFileList, i - MEMVAR aFileList, filesScroll - PRIVATE aFileList := {}, filesScroll + + LOCAL aFileList := {} + LOCAL filesScroll CLS SetBlink( .F. ) @@ -63,7 +64,7 @@ FUNCTION InitScrlBar() filesScroll:display() - i := AChoice( 06, 29, 14, 59, aFileList, , "updateFilesScroll" ) + i := AChoice( 06, 29, 14, 59, aFileList, , {| modo | updateFilesScroll( modo, aFileList, filesScroll ) } ) @ 23, 0 SAY iif( i < 1, "", aFileList[ i ] ) COLOR "N/W*" SET COLOR TO @@ -73,13 +74,11 @@ FUNCTION InitScrlBar() // function used to update scrollbar -STATIC FUNCTION updateFilesScroll( modo ) +STATIC FUNCTION updateFilesScroll( modo, aFileList, filesScroll ) LOCAL newPos, valRet := AC_CONT // Default to continue LOCAL ultTecla := LastKey() - MEMVAR filesScroll - newPos := filesScroll:current DO CASE diff --git a/harbour/tests/switch.prg b/harbour/tests/switch.prg index 262d7445a1..1df6ead03b 100644 --- a/harbour/tests/switch.prg +++ b/harbour/tests/switch.prg @@ -10,8 +10,8 @@ PROCEDURE Main() LOCAL a := 1 - MEMVAR b - PRIVATE b := "b" + MEMVAR m_b + PRIVATE m_b := "m_b" #ifndef __XHARBOUR__ @@ -69,7 +69,7 @@ PROCEDURE Main() ? a + a EXIT - CASE "a&b" + CASE "a&m_b" CASE 1 + 1 CASE { 11111111, 22222222222 }[ 1 ] CASE 1 + 1 + 1 diff --git a/harbour/tests/testget.prg b/harbour/tests/testget.prg index 5b6687b284..c448c715a2 100644 --- a/harbour/tests/testget.prg +++ b/harbour/tests/testget.prg @@ -5,32 +5,33 @@ PROCEDURE Main() LOCAL GetList := {}, cVar := "Hello" - MEMVAR aVar, nIndex, cMacro, cEarly, cEarly2, cLate - PRIVATE aVar := { "World", "Again" }, nIndex := 1, cMacro := "cEarly", cEarly := { "Early" }, cLate := "Late!", cEarly2 := { "Early2" } + + MEMVAR m_aVar, m_nIndex, m_cMacro, m_cEarly, m_cEarly2, m_cLate + PRIVATE m_aVar := { "World", "Again" }, m_nIndex := 1, m_cMacro := "m_cEarly", m_cEarly := { "Early" }, m_cLate := "Late!", m_cEarly2 := { "Early2" } CLS ? "2nd GET should say 'Early'." @ 10, 10 SAY "cVar :" GET cVar PICTURE "@K!" - @ 12, 10 SAY "cMacro[1] :" GET &cMacro[ 1 ] - @ 14, 10 SAY "cMacro.2[1] :" GET &cMacro.2[ 1 ] - @ 16, 10 SAY "cEarly[1] :" GET cEarly[ 1 ] -// @ 14,10 SAY "cMacro :" GET &( cMacro )[ 1 ] - nIndex := 2 - @ 18, 10 SAY "aVar :" GET aVar[ nIndex ] + @ 12, 10 SAY "m_cMacro[1] :" GET &m_cMacro[ 1 ] + @ 14, 10 SAY "m_cMacro.2[1] :" GET &m_cMacro.2[ 1 ] + @ 16, 10 SAY "m_cEarly[1] :" GET m_cEarly[ 1 ] +// @ 14, 10 SAY "m_cMacro :" GET &( m_cMacro )[ 1 ] + m_nIndex := 2 + @ 18, 10 SAY "m_aVar :" GET m_aVar[ m_nIndex ] @ 20, 10 SAY "Picture of GET-1:" GET GetList[ 1 ]:Picture - nIndex := 3 - cMacro := "cLate" + m_nIndex := 3 + m_cMacro := "m_cLate" READ CLS /* Clipper Error "Get contains complex macro" ? "This GET should say 'Late!'." - cMacro := "cEarly" - @ 10, 10 SAY "cMacro :" GET &( cMacro ) - cMacro := "cLate" + m_cMacro := "m_cEarly" + @ 10, 10 SAY "m_cMacro :" GET &( m_cMacro ) + m_cMacro := "m_cLate" READ */ diff --git a/harbour/tests/testpp.prg b/harbour/tests/testpp.prg index 595a8ea01b..1e7154cef9 100644 --- a/harbour/tests/testpp.prg +++ b/harbour/tests/testpp.prg @@ -4,7 +4,7 @@ // Tests for stringify match markers // Preproces and compile only -PROC MAIN() +PROCEDURE Main() LOCAL b := "" MEMVAR a MEMVAR c diff --git a/harbour/tests/tstblock.prg b/harbour/tests/tstblock.prg index 0f82e3697f..9a9d547ccb 100644 --- a/harbour/tests/tstblock.prg +++ b/harbour/tests/tstblock.prg @@ -6,18 +6,16 @@ PROCEDURE Main() LOCAL i, bBlock[ 3 ] - MEMVAR Var1, Var2, Var3, Macro - PRIVATE Var1, Var2, Var3, Macro + MEMVAR m_Var1, m_Var2, m_Var3, m_Macro + PRIVATE m_Var1, m_Var2, m_Var3, m_Macro - M->Var1 := "Var1" - M->Var2 := "Var2" - M->Var3 := "Var3" - - CLS + m_Var1 := "m_Var1" + m_Var2 := "m_Var2" + m_Var3 := "m_Var3" FOR i := 1 TO 3 - M->Macro := "Var" + Str( i, 1 ) - bBlock[ i ] := {|| &Macro } + m_Macro := "m_Var" + Str( i, 1 ) + bBlock[ i ] := {|| &m_Macro } NEXT ? "Early (Simple):" @@ -27,8 +25,8 @@ PROCEDURE Main() NEXT FOR i := 1 TO 3 - M->Macro := "Var" + Str( i, 1 ) - bBlock[ i ] := {|| &Macro + "!" } + m_Macro := "m_Var" + Str( i, 1 ) + bBlock[ i ] := {|| &m_Macro + "!" } NEXT ? @@ -39,8 +37,8 @@ PROCEDURE Main() NEXT FOR i := 1 TO 3 - M->Macro := "Var" + Str( i, 1 ) - bBlock[ i ] := {|| &( Macro ) } + m_Macro := "m_Var" + Str( i, 1 ) + bBlock[ i ] := {|| &( m_Macro ) } NEXT ? diff --git a/harbour/tests/varparam.prg b/harbour/tests/varparam.prg index 28344a1bd6..a43783b3dc 100644 --- a/harbour/tests/varparam.prg +++ b/harbour/tests/varparam.prg @@ -4,50 +4,50 @@ /* TEST FOR USING VARIABLE NUMBER OF PARAMETERS */ -MEMVAR iLoop +MEMVAR m_iLoop PROCEDURE Main() LOCAL l1 := 11, l2 := 22, l3 := 33, l4 := 44, l5 := 55, l6 := 66 - PRIVATE iLoop + PRIVATE m_iLoop - ? "passed 0: "; TEST_0_0( ) + ? "passed 0: "; TEST_0_0() ? "passed 1: "; TEST_0_0( 1 ) ? "passed 2: "; TEST_0_0( 1, 2 ) ? "passed 3: "; TEST_0_0( 1, 2, 3 ) ? "---------------------------------------" - ? "passed 0: "; TEST_0_0v( ) + ? "passed 0: "; TEST_0_0v() ? "passed 1: "; TEST_0_0v( 1 ) ? "passed 2: "; TEST_0_0v( 1, 2 ) ? "passed 3: "; TEST_0_0v( 1, 2, 3 ) ? "---------------------------------------" - ? "passed 0: "; TEST_1_0( ) + ? "passed 0: "; TEST_1_0() ? "passed 1: "; TEST_1_0( 1 ) ? "passed 2: "; TEST_1_0( 1, 2 ) ? "passed 3: "; TEST_1_0( 1, 2, 3 ) ? "---------------------------------------" - ? "passed 0: "; TEST_1_0v( ) + ? "passed 0: "; TEST_1_0v() ? "passed 1: "; TEST_1_0v( 1 ) ? "passed 2: "; TEST_1_0v( 1, 2 ) ? "passed 3: "; TEST_1_0v( 1, 2, 3 ) ? "---------------------------------------" - ? "passed 0: "; TEST_1_1( ) + ? "passed 0: "; TEST_1_1() ? "passed 1: "; TEST_1_1( 1 ) ? "passed 2: "; TEST_1_1( 1, 2 ) ? "passed 3: "; TEST_1_1( 1, 2, 3 ) ? "---------------------------------------" - ? "passed 0: "; TEST_1_1v( ) + ? "passed 0: "; TEST_1_1v() ? "passed 1: "; TEST_1_1v( 1 ) ? "passed 2: "; TEST_1_1v( 1, 2 ) ? "passed 3: "; TEST_1_1v( 1, 2, 3 ) ? "---------------------------------------" - ? "passed 0: "; TEST_1_3( ) + ? "passed 0: "; TEST_1_3() ? "passed 1: "; TEST_1_3( 1 ) ? "passed 2: "; TEST_1_3( 1, 2 ) ? "passed 3: "; TEST_1_3( 1, 2, 3 ) @@ -56,7 +56,7 @@ PROCEDURE Main() ? "passed 6: "; TEST_1_3( 1, 2, 3, 4, 5, 6 ) ? "---------------------------------------" - ? "passed 0: "; TEST_1_3v( ) + ? "passed 0: "; TEST_1_3v() ? "passed 1: "; TEST_1_3v( 1 ) ? "passed 2: "; TEST_1_3v( 1, 2 ) ? "passed 3: "; TEST_1_3v( 1, 2, 3 ) @@ -65,7 +65,7 @@ PROCEDURE Main() ? "passed 6: "; TEST_1_3v( 1, 2, 3, 4, 5, 6 ) ? "---------------------------------------" - ? "passed 0: "; TEST_3_0( ) + ? "passed 0: "; TEST_3_0() ? "passed 1: "; TEST_3_0( 1 ) ? "passed 2: "; TEST_3_0( 1, 2 ) ? "passed 3: "; TEST_3_0( 1, 2, 3 ) @@ -74,7 +74,7 @@ PROCEDURE Main() ? "passed 6: "; TEST_3_0( 1, 2, 3, 4, 5, 6 ) ? "---------------------------------------" - ? "passed 0: "; TEST_3_0v( ) + ? "passed 0: "; TEST_3_0v() ? "passed 1: "; TEST_3_0v( 1 ) ? "passed 2: "; TEST_3_0v( 1, 2 ) ? "passed 3: "; TEST_3_0v( 1, 2, 3 ) @@ -83,7 +83,7 @@ PROCEDURE Main() ? "passed 6: "; TEST_3_0v( 1, 2, 3, 4, 5, 6 ) ? "---------------------------------------" - ? "passed 0: "; TEST_3_3( ) + ? "passed 0: "; TEST_3_3() ? "passed 1: "; TEST_3_3( 1 ) ? "passed 2: "; TEST_3_3( 1, 2 ) ? "passed 3: "; TEST_3_3( 1, 2, 3 ) @@ -92,7 +92,7 @@ PROCEDURE Main() ? "passed 6: "; TEST_3_3( 1, 2, 3, 4, 5, 6 ) ? "---------------------------------------" - ? "passed 0: "; TEST_3_3v( ) + ? "passed 0: "; TEST_3_3v() ? "passed 1: "; TEST_3_3v( 1 ) ? "passed 2: "; TEST_3_3v( 1, 2 ) ? "passed 3: "; TEST_3_3v( 1, 2, 3 ) @@ -129,19 +129,19 @@ PROCEDURE Main() PROCEDURE TEST_0_0v( ... ) ?? ProcName( 0 ), " received: ", PCount() - FOR m->iLoop := 1 TO PCount() - ? m->iLoop, "=", hb_PValue( m->iLoop ) + FOR m_iLoop := 1 TO PCount() + ? m_iLoop, "=", hb_PValue( m_iLoop ) NEXT Inkey( 0 ) RETURN -PROCEDURE TEST_0_0( ) +PROCEDURE TEST_0_0() ?? ProcName( 0 ), " received: ", PCount() - FOR m->iLoop := 1 TO PCount() - ? m->iLoop, "=", hb_PValue( m->iLoop ) + FOR m_iLoop := 1 TO PCount() + ? m_iLoop, "=", hb_PValue( m_iLoop ) NEXT Inkey( 0 ) @@ -162,7 +162,7 @@ PROCEDURE TEST_1_0v( ... ) RETURN -PROCEDURE TEST_1_0( ) +PROCEDURE TEST_1_0() LOCAL i := "i" @@ -259,8 +259,8 @@ PROCEDURE TEST_3_3v( a, b, c, ... ) ? "a=", a ? "b=", b ? "c=", c - FOR m->iLoop := 1 TO PCount() - ? m->iLoop, "=", hb_PValue( m->iLoop ) + FOR m_iLoop := 1 TO PCount() + ? m_iLoop, "=", hb_PValue( m_iLoop ) NEXT test_ref( @a, @b, @c, @x, @y, @z ) @@ -280,8 +280,8 @@ PROCEDURE TEST_3_3( a, b, c ) ? "a=", a ? "b=", b ? "c=", c - FOR m->iLoop := 1 TO PCount() - ? m->iLoop, "=", hb_PValue( m->iLoop ) + FOR m_iLoop := 1 TO PCount() + ? m_iLoop, "=", hb_PValue( m_iLoop ) NEXT test_ref( @a, @b, @c, @x, @y, @z ) @@ -290,7 +290,7 @@ PROCEDURE TEST_3_3( a, b, c ) RETURN -PROCEDURE TEST_3_0( ) +PROCEDURE TEST_3_0() LOCAL x := "x", y := "y", z := "z" @@ -298,8 +298,8 @@ PROCEDURE TEST_3_0( ) ? "x=", x ? "y=", y ? "z=", z - FOR m->iLoop := 1 TO PCount() - ? m->iLoop, "=", hb_PValue( m->iLoop ) + FOR m_iLoop := 1 TO PCount() + ? m_iLoop, "=", hb_PValue( m_iLoop ) NEXT Inkey( 0 ) @@ -314,8 +314,8 @@ PROCEDURE TEST_3_0v( ... ) ? "x=", x ? "y=", y ? "z=", z - FOR m->iLoop := 1 TO PCount() - ? m->iLoop, "=", hb_PValue( m->iLoop ) + FOR m_iLoop := 1 TO PCount() + ? m_iLoop, "=", hb_PValue( m_iLoop ) NEXT Inkey( 0 ) diff --git a/harbour/utils/hbtest/rt_class.prg b/harbour/utils/hbtest/rt_class.prg index 1db0cef756..c321b91633 100644 --- a/harbour/utils/hbtest/rt_class.prg +++ b/harbour/utils/hbtest/rt_class.prg @@ -1182,28 +1182,28 @@ EXPORTED: CLASS VAR x1 INIT "(x1)" SHARED CLASS VAR y1 INIT "(y1)" SHARED CLASS VAR z1 INIT "(z1)" SHARED -endclass +ENDCLASS CREATE CLASS SVARSCLASS2 FROM SVARSCLASS1 EXPORTED: CLASS VAR x2 INIT "(x2)" SHARED CLASS VAR y2 INIT "(y2)" SHARED CLASS VAR z2 INIT "(z2)" SHARED -endclass +ENDCLASS CREATE CLASS SVARSCLASS3 FROM SVARSCLASS1, SVARSCLASS2 EXPORTED: CLASS VAR x3 INIT "(x3)" SHARED CLASS VAR y3 INIT "(y3)" SHARED CLASS VAR z3 INIT "(z3)" SHARED -endclass +ENDCLASS CREATE CLASS SVARSCLASS4 FROM SVARSCLASS3, SVARSCLASS2 EXPORTED: CLASS VAR x4 INIT "(x4)" SHARED CLASS VAR y4 INIT "(y4)" SHARED CLASS VAR z4 INIT "(z4)" SHARED -endclass +ENDCLASS #endif diff --git a/harbour/utils/hbtest/rt_math.prg b/harbour/utils/hbtest/rt_math.prg index 33a55ba359..0e53e50fd0 100644 --- a/harbour/utils/hbtest/rt_math.prg +++ b/harbour/utils/hbtest/rt_math.prg @@ -59,7 +59,7 @@ PROCEDURE Main_MATH() LOCAL l, s, o MEMVAR s0, s1, v2 - PRIVATE s0:="V2", s1:="V", v2 + PRIVATE s0 := "V2", s1 := "V", v2 /* LOG() */