* include/harbour.hbx
* fixes/changes to some function names
* config/hb_c.cfg
+ updated to do better vertical aligment in
structs, var declarations and assignments
; TODO: move this to /bin folder and add to 'install'-ed
file list, rename to 'harbour.ucf'
* src/debug/*.prg
* src/rdd/*.prg
* src/rdd/hbsix/*.prg
* src/rdd/usrrdd/rdds/*.prg
* src/rtl/*.prg
* src/vm/*.prg
* utils/hbi18n/hbi18n.prg
* utils/hbmk2/hbmk2.prg
* utils/hbmk2/examples/*.hb
* contrib/hbblat/blatcls.prg
* contrib/gtwvg/*.prg
* contrib/gtwvg/tests/*.prg
* contrib/hbblink/*.prg
* contrib/hbcairo/tests/*.prg
* contrib/hbcomm/*.prg
* contrib/hbcomm/tests/*.prg
* contrib/hbcups/tests/*.prg
* contrib/hbcurl/tests/*.prg
* contrib/hbexpat/*.prg
* contrib/hbexpat/tests/*.prg
* contrib/hbfbird/*.prg
* contrib/hbfbird/tests/*.prg
* contrib/hbfoxpro/*.prg
* contrib/hbfship/*.prg
* contrib/hbgd/*.prg
* contrib/hbgd/tests/*.prg
* contrib/hbgs/tests/*.prg
* contrib/hbhpdf/*.prg
* contrib/hbhpdf/tests/*.prg
* contrib/hbhttpd/*.prg
* contrib/hbhttpd/tests/*.prg
* contrib/hblzf/tests/*.prg
* contrib/hbmagic/tests/*.prg
* contrib/hbmisc/*.prg
* contrib/hbmisc/tests/*.prg
* contrib/hbct/*.prg
* contrib/hbct/tests/*.prg
* contrib/hbmlzo/tests/*.prg
* contrib/hbmxml/*.prg
* contrib/hbmxml/tests/*.prg
* contrib/hbmysql/*.prg
* contrib/hbmysql/tests/*.prg
* contrib/hboslib/*.prg
* contrib/hbsms/*.prg
* contrib/hbtinymt/tests/*.prg
* contrib/hbtpathy/*.prg
* contrib/hbtpathy/tests/*.prg
* contrib/hbunix/tests/*.prg
* contrib/hbxdiff/tests/*.prg
* contrib/hbzebra/tests/*.prg
* contrib/hbziparc/*.prg
* contrib/hbziparc/tests/*.prg
* contrib/rddads/*.prg
* contrib/rddads/tests/*.prg
* contrib/hbodbc/*.prg
* contrib/hbodbc/tests/*.prg
* contrib/hbpgsql/*.prg
* contrib/hbpgsql/tests/*.prg
* contrib/hbsqlit3/*.prg
* contrib/hbsqlit3/tests/*.prg
* contrib/hbwin/*.prg
* contrib/hbwin/tests/*.prg
* contrib/hbxpp/*.prg
* contrib/hbxpp/tests/*.prg
* contrib/hbxhb/*.prg
* contrib/hbxhb/tests/*.prg
* contrib/hbnetio/*.prg
* contrib/hbnetio/utils/hbnetio/*.hb
* contrib/hbnetio/utils/hbnetio/*.prg
* contrib/hbtip/*.prg
* contrib/hbtip/tests/*.prg
* tests/usrrdd/*.prg
* tests/funcarr.prg
* extras/gfspell/spell.prg
* extras/gtwvw/tests/*.prg
* extras/guestbk/*.prg
* extras/hbdoc/*.prg
* extras/rddado/*.prg
* extras/rddado/tests/*.prg
* extras/hbxlsxml/*.prg
* extras/httpsrv/*.prg
* extras/httpsrv/modules/*.prg
* extras/hbsuper/*.prg
* extras/hbvpdf/*.prg
* extras/hbvpdf/tests/*.prg
* tests/*.prg (except some which are well formatted but in different/fast-typing style)
* tests/*.hb
* bin/*.hb
* contrib/*.hb
* config/*.hb
* some manual formatting to better be able to verify
changes made by hbformat and be friendlier with hbformat.
* most files reformatted with hbformat using Maurizio's
patch, with mostly minor manual corrections and verification.
All hbformat changes for revised one-by-one.
! __DIR(): fixed to be unicode compatible
! __hbdoc_ToSource(): make sure to not generate line ending
spaces in output.
+ hbmk2/hbrun: HBMK_WITH_GTXWC built-time option to include
GTXWC. Useful for hbrun.
* hbct tests: change to not use [] as string delimiter
+ added full prototypes to Array class declaration
; NOTE: Only these were not or not fully formatted:
contrib/hbnetio/tests/*.prg
tests/hbpptest/*.prg
tests/mt/*.prg
tests/multifnc/*.prg
tests/rddtest/*.prg
utils/hbmk2/hbmk2.prg (for the most part)
src/rtl/tbrowse.prg (for the most part)
utils/hbtest/*.prg
*.ch, *.c, *.h
* src/rtl/cdpapihb.c
* src/rtl/hbadler.c
* src/rtl/hbsocket.c
* src/rtl/sha1.c
* src/vm/classes.c
* src/vm/dynsym.c
* src/vm/garbage.c
* src/debug/dbgentry.c
* do not end macros with ';' to avoid uncrustify warning
and wrong formatting as a consequence
* src/compiler/cmdcheck.c
* minor changes for uncrustify-friendliness
* contrib/hbformat/utils/hbfmtcls.prg
* contrib/hbformat/utils/hbformat.prg
% optimizations in hbformat.prg
! fixed mask/filename handling to be
multiplatform in hbformat.prg
+ added 'HBXList=' hbformat.ini parameter allowing
to add any .hbx file for proper function name
casing.
! fixed progress bar to display correctly
* tests/speedstr.prg
! fixed to run as intended in unicode code
* hbformatted
- contrib/hbwin/tests/dlg.xml
* contrib/hbwin/tests/dlg.rc
- extras/gtwvw/tests/wvwtest9.xml
+ extras/gtwvw/tests/wvwtest9.mft
* extras/gtwvw/tests/wvwtest9.rc
* renamed manifest to have .mft extension
% deleted unnecessary manifest
* "Win32 API" -> "Windows API"
! deleted CPU arch from manifest
* package/harb_win.mft
* formatting
* src/common/hbver.c
+ added version detection for win 8 and win server 2012
* minor formatting/code cleanup
* tests/gfx.prg
* updated to run in script mode.
; TOFIX: it doesn't draw anything with GTWVT
* tests/gfx.prg
* tests/gtwin.prg
* tests/gtxfnt.prg
* tests/wvt_fs.prg
* tests/wvtext.prg
+ support for GTXWC when run as script
* doc/en/*.txt
* contrib/hbct/doc/en/*.txt
* contrib/hbgd/doc/en/*.txt
* contrib/hbgt/doc/en/*.txt
* contrib/hbmisc/doc/en/*.txt
* contrib/hbnf/doc/en/*.txt
* contrib/hbziparc/doc/en/*.txt
* contrib/rddads/doc/en/*.txt
! fixed few broken tags reported by Carlos
% deleted line ending spaces
* some minor formatting
* contrib/hbnf/*.c
* contrib/hbnf/*.h
* extras/gfspell/spellc.c
* uncrustified with updated hb_c.cfg
* contrib/hbnf/*.prg
* contrib/hbnf/tests/*.prg
* hbformatted with Mauriozo's patch.
* a few manual corrections (avoiding #translates, using hb_ColorIndex())
in general and to make hbformat happy.
+ contrib/hbnf/tests/menuto.prg
+ added sample code for MENU TO (adatped from docs)
- src/rdd/dbfntx/dbfntx0.prg
- deleted unused file with no enabled code in it
* contrib/hbtip/tests/dbtohtml.prg
* contrib/hbtip/tests/loadhtml.prg
* contrib/hbtip/tests/tipmmail.prg
* minor cleanups
* contrib/hbtip/thtml.prg
! fixed typo due to s&r
% use hb_memowrit()
* src/rtl/tbrowse.prg
* conditional code sorted to be hbformat friendly
* some formatting
* INSTALL
* package/harbour.rb
* package/mpkg_src_nightly.sh
* package/mpkg_win_nightly.bat
* package/updt_web_nightly.sh
* website/changelog.html
* website/faq/harbour17.html
* website/faq/harbour27.html
* website/index.html
* website/menu/harbour-menu.js
* updated repository URL to new sf.net one
* tests/function.cfm
* contrib/hbhttpd/tests/tpl/_main.tpl
* contrib/hbtip/tests/tipmmail.prg
* website/faq/*.html
* website/samples/*.html
* use utf-8 in html and email
* contrib/hbrun/hbrun.hbp
+ support for HBMK_WITH_GTXWC
* tests/rto_get.prg
* tests/onidle.prg
* tests/mousetst.prg
* tests/wcecon.prg
* tests/vmasort.prg
- contrib/hbnf/tests/metaph.prg
* minor cleanups
* contrib/hbmysql/tests/test.prg
* contrib/hbmysql/tests/dbf2mysq.prg
% minor optimization, deleted outdated comment/line
* src/compiler/harbour.yyc
* src/compiler/harbour.y
* minor formatting
382 lines
6.6 KiB
Plaintext
382 lines
6.6 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
// Basic test for memvars handling
|
|
|
|
MEMVAR MEMVAR
|
|
MEMVAR memvar1
|
|
MEMVAR memvar2
|
|
MEMVAR memvar3
|
|
MEMVAR memvar4
|
|
MEMVAR mempublic
|
|
MEMVAR memprivate
|
|
MEMVAR memparam
|
|
MEMVAR memfunc
|
|
MEMVAR public1
|
|
MEMVAR public2
|
|
MEMVAR public3
|
|
MEMVAR publCB
|
|
MEMVAR private1
|
|
MEMVAR private2
|
|
MEMVAR private3
|
|
MEMVAR privVar
|
|
MEMVAR para1
|
|
MEMVAR para2
|
|
MEMVAR para3
|
|
MEMVAR parameter1again
|
|
MEMVAR param1
|
|
MEMVAR param2
|
|
MEMVAR initmem
|
|
|
|
PROCEDURE Main()
|
|
|
|
LOCAL main := 0
|
|
|
|
HB_SYMBOL_UNUSED( main )
|
|
|
|
Test1()
|
|
__Accept( "press Enter..." )
|
|
Test2()
|
|
__Accept( "press Enter..." )
|
|
Test3()
|
|
__Accept( "press Enter..." )
|
|
Test4()
|
|
__Accept( "press Enter..." )
|
|
Test5()
|
|
__Accept( "press Enter..." )
|
|
Test6()
|
|
__Accept( "press Enter..." )
|
|
Test7( "value1", 2, .T. )
|
|
__Accept( "press Enter..." )
|
|
Test8()
|
|
__Accept( "press Enter..." )
|
|
Test9()
|
|
|
|
RETURN
|
|
|
|
//
|
|
|
|
PROCEDURE Test1()
|
|
|
|
// PUBLIC overrided by PRIVATE overrided by uninitialized PUBLIC
|
|
PUBL memvar1
|
|
|
|
? "==Test 1==PUBLIC -> PRIVATE -> PUBLIC"
|
|
? memvar1
|
|
memvar1 := "main"
|
|
? "in MAIN : ", memvar1
|
|
Scope( memvar1 )
|
|
? "back in MAIN : ", memvar1
|
|
?
|
|
|
|
RETURN
|
|
|
|
FUNCTION Scope( value )
|
|
|
|
PRIVA memvar1 := "scope"
|
|
|
|
Scope2()
|
|
? "in SCOPE : ", memvar1
|
|
|
|
RETURN value
|
|
|
|
PROCEDURE Scope2()
|
|
|
|
PUBLIC memvar1
|
|
|
|
? "in SCOPE2 : ", memvar1
|
|
|
|
RETURN
|
|
|
|
//
|
|
|
|
PROCEDURE Test2()
|
|
|
|
// PUBLIC overrided by PUBLIC overrided by uninitialized PUBLIC
|
|
PUBLIC memvar2
|
|
|
|
? "==Test 2==PUBLIC -> PUBLIC -> PUBLIC"
|
|
? memvar2
|
|
memvar2 := "main"
|
|
? "in MAIN : ", memvar2
|
|
Scope3( memvar2 )
|
|
? "back in MAIN : ", memvar2
|
|
?
|
|
|
|
RETURN
|
|
|
|
FUNCTION Scope3( value )
|
|
|
|
PUBLIC memvar2 := "scope"
|
|
|
|
Scope4()
|
|
? "in SCOPE : ", memvar2
|
|
|
|
RETURN value
|
|
|
|
PROCEDURE Scope4()
|
|
|
|
PUBLIC memvar2
|
|
|
|
? "in SCOPE2 : ", memvar2
|
|
|
|
RETURN
|
|
|
|
//
|
|
|
|
PROCEDURE Test3()
|
|
|
|
// PUBLIC overrided by PRIVATE overrided by initialized PUBLIC
|
|
PUBLIC memvar3
|
|
|
|
? "==Test 3==PUBLIC -> PRIVATE -> PUBLIC:="
|
|
? memvar3
|
|
memvar3 := "main"
|
|
? "in MAIN : ", memvar3
|
|
Scope5( memvar3 )
|
|
? "back in MAIN : ", memvar3
|
|
?
|
|
|
|
RETURN
|
|
|
|
FUNCTION Scope5( value )
|
|
|
|
PRIVATE memvar3 := "scope"
|
|
|
|
Scope6()
|
|
? "in SCOPE : ", memvar3
|
|
|
|
RETURN value
|
|
|
|
PROCEDURE Scope6()
|
|
|
|
PUBLIC memvar3 := "scope2"
|
|
|
|
? "in SCOPE2 : ", memvar3
|
|
|
|
RETURN
|
|
|
|
//
|
|
|
|
PROCEDURE Test4()
|
|
|
|
// PUBLIC overrided by PUBLIC overrided by initialized PUBLIC
|
|
PUBLIC memvar4
|
|
|
|
? "==Test 4==PUBLIC -> PUBLIC -> PUBLIC:="
|
|
? memvar4
|
|
memvar4 := "main"
|
|
? "in MAIN : ", memvar4
|
|
Scope7( memvar4 )
|
|
? "back in MAIN : ", memvar4
|
|
?
|
|
|
|
RETURN
|
|
|
|
FUNCTION Scope7( value )
|
|
|
|
PUBLIC memvar4 := "scope"
|
|
|
|
Scope8()
|
|
? "in SCOPE : ", memvar4
|
|
|
|
RETURN value
|
|
|
|
PROCEDURE Scope8()
|
|
|
|
PUBLIC memvar4 := "scope2"
|
|
|
|
? "in SCOPE2 : ", memvar4
|
|
|
|
RETURN
|
|
|
|
//
|
|
|
|
PROCEDURE TEST5()
|
|
|
|
PUBLIC mempublic, public3 := 3
|
|
|
|
// PUBLIC public2[ 10 ] //unsupported yet
|
|
PRIVATE memprivate
|
|
PARAMETERS memparam
|
|
|
|
? "==Test for memvars passed by reference and __PUBLIC/__PRIVATE "
|
|
? " uninitialized PUBLIC : ", mempublic
|
|
// ? "uninitialized PUBLIC array (first item) : ", public2[ 1 ]
|
|
? "initialized PUBLIC : ", public3
|
|
? " uninitialized PRIVATE : ", memprivate
|
|
? "uninitialized PARAMETER : ", memparam
|
|
// ? memnone
|
|
|
|
mempublic := "PUBLIC"
|
|
? " PUBLIC with new value : ", mempublic
|
|
memprivate := "PRIVATE"
|
|
? " PRIVATE with new value : ", memprivate
|
|
memparam := "PARAMETER"
|
|
? "PARAMETER with new value : ", memparam
|
|
// memnone := 4
|
|
// ? memnone
|
|
|
|
? " PUBLIC after passing by reference : ", UseVar( @mempublic )
|
|
? " PRIVATE after passing by reference : ", UseVar( @memprivate )
|
|
? "PARAMETER after passing by reference : ", UseVar( @memparam )
|
|
// ? Use( @memnone )
|
|
|
|
#ifdef __HARBOUR__
|
|
? "PUBLIC created by __PUBLIC function : ", public1
|
|
#endif
|
|
?
|
|
|
|
RETURN
|
|
|
|
FUNCTION UseVar( value )
|
|
|
|
UseRef( @value )
|
|
|
|
#ifdef __HARBOUR__
|
|
__mvPublic( "public1" ) // , "public21" )
|
|
// __mvPRIVATE( "private1", "private2", "private3" )
|
|
__mvPrivate( { "private1", "private2", "private3" } )
|
|
? "undeclared PUBLIC created by __PUBLIC function : ", public1
|
|
? "undeclared PRIVATE created by __PRIVATE function : ", private1
|
|
? "undeclared PRIVATE created by __PRIVATE function : ", private2
|
|
? "undeclared PRIVATE created by __PRIVATE function : ", private3
|
|
|
|
public1 := "public created by __PUBLIC"
|
|
#endif
|
|
?
|
|
|
|
RETURN value
|
|
|
|
PROCEDURE UseRef( reference )
|
|
|
|
reference += " variable"
|
|
|
|
RETURN
|
|
|
|
//
|
|
|
|
PROCEDURE Test6()
|
|
|
|
PUBLIC publCB
|
|
PRIVATE privVar := " (PRIVATE in MAIN) "
|
|
|
|
? "== Test for detached PRIVATE variables"
|
|
DetachMemvar( "detached memvar" )
|
|
? Eval( publCB, "in Main: " )
|
|
|
|
RETURN
|
|
|
|
PROCEDURE DetachMemvar( cValue )
|
|
|
|
PRIVATE privVar := " (PRIVATE in DetachMemvar) "
|
|
|
|
publCB := {| x | x + privVar + cValue }
|
|
? Eval( publCB, "in DetachMemvar: " )
|
|
|
|
RETURN
|
|
|
|
//
|
|
|
|
PROCEDURE Test7( )
|
|
|
|
PARAMETERS para1, para2, para3
|
|
PARAM parameter1again
|
|
|
|
? "Parameter 1 : ", para1
|
|
? "Parameter 2 : ", para2
|
|
? "Parameter 3 : ", para3
|
|
? "Parameter 4 : ", parameter1again
|
|
|
|
RETURN
|
|
|
|
//
|
|
|
|
PROCEDURE Test8()
|
|
|
|
PRIVATE private1 := "PRIVATE1"
|
|
|
|
? "In Test8 before UsePriv"
|
|
? "Private1 : ", private1
|
|
UsePriv( private1 )
|
|
? "In Test8 after UsePriv"
|
|
? "Private1 : ", private1
|
|
|
|
__Accept( "press Enter..." )
|
|
|
|
? "In Test8 before UsePriv with reference"
|
|
? "Private1 : ", private1
|
|
UsePriv( @private1 )
|
|
? "In Test8 after UsePriv with reference"
|
|
? "Private1 : ", private1
|
|
|
|
RETURN
|
|
|
|
PROCEDURE UsePriv()
|
|
|
|
PARAMETERS param1
|
|
|
|
? "In UsePriv before UseParam"
|
|
? "Private1 : ", private1
|
|
? "Param1 : ", param1
|
|
UseParam()
|
|
? "In UsePriv after UseParam"
|
|
? "Private1 : ", private1
|
|
? "Param1 : ", param1
|
|
|
|
RETURN
|
|
|
|
PROCEDURE UseParam()
|
|
|
|
PARAMETERS param2
|
|
|
|
? "In UseParam before assignment"
|
|
? "Private1 : ", private1
|
|
? "Param1 : ", param1
|
|
? "Param2 : ", param2
|
|
param2 := "PARAM2"
|
|
param1 := "new value"
|
|
? "In UseParam after assignment"
|
|
? "Private1 : ", private1
|
|
? "Param1 : ", param1
|
|
? "Param2 : ", param2
|
|
|
|
RETURN
|
|
|
|
//
|
|
|
|
PROCEDURE Test9()
|
|
|
|
PUBLIC MEMVAR
|
|
PUBLIC memfunc
|
|
|
|
memvar := 19
|
|
|
|
? "Variable with the name of module (memvar) : ", memvar
|
|
|
|
memfunc := 33
|
|
? "Variable with the name of function : ", memfunc
|
|
? "Return value from a function : ", memfunc( 9 )
|
|
|
|
// mem()
|
|
|
|
RETURN
|
|
|
|
STATIC FUNCTION memfunc( memfunc )
|
|
|
|
RETURN memfunc * memfunc
|
|
|
|
INIT PROCEDURE initmem()
|
|
|
|
PARAMETERS MEMVAR
|
|
PARAMETERS initmem
|
|
|
|
? "Tests for PARAMETERS, PRIVATE nad PUBLIC variables"
|
|
?
|
|
? "in INIT function - Passed parameter : ", memvar
|
|
? "in INIT function - Passed parameter with different name : ", initmem
|
|
?
|
|
|
|
RETURN
|