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

SELF/self -> Self (3.4 sync)

Browse Source
This commit is contained in:
Viktor Szakats
2017-09-14 01:12:12 +00:00
parent 8340825fd5
commit 0764e1b746
41 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/clsdata.prg
View File

@@ -29,39 +29,39 @@ FUNCTION TBaseObject()
STATIC FUNCTION NewBase()
LOCAL self := QSelf()
LOCAL Self := QSelf()
::Data1 := 1
::ClassData1 := "A"
RETURN self
RETURN Self
STATIC FUNCTION Test()
LOCAL self := QSelf()
LOCAL Self := QSelf()
? "Inside ::Test()"
? "calling ::Method1()"
::Method1()
RETURN self
RETURN Self
STATIC FUNCTION Method1Base()
LOCAL self := QSelf()
LOCAL Self := QSelf()
? "I am Method1 from TBaseObject"
::Method2()
RETURN self
RETURN Self
STATIC FUNCTION Method2Base()
LOCAL self := QSelf()
LOCAL Self := QSelf()
? "I am Method2 from TBaseObject"
RETURN self
RETURN Self
FUNCTION HBObject()
@@ -81,7 +81,7 @@ FUNCTION HBObject()
STATIC FUNCTION New()
LOCAL self := QSelf()
LOCAL Self := QSelf()
::TBaseObject:NewBase()
::Data1 := 1
@@ -90,21 +90,21 @@ STATIC FUNCTION New()
// ClassData2 override ClassData1
::ClassData2 := "B"
RETURN self
RETURN Self
STATIC FUNCTION Method1()
LOCAL self := QSelf()
LOCAL Self := QSelf()
? "I am Method1 from HBObject"
::TBaseObject:Method1()
RETURN self
RETURN Self
STATIC FUNCTION Method2()
LOCAL self := QSelf()
LOCAL Self := QSelf()
? "I am Method2 from HBObject"
RETURN self
RETURN Self

24
tests/clsnv.prg
View File

@@ -58,7 +58,7 @@ METHOD m1
? " execute ::z(), should be: MYCLASS3:Z()"
::z()
RETURN self
RETURN Self
METHOD x
@@ -70,7 +70,7 @@ METHOD x
? " e =>", ::e, ", should be: (e3)"
? " f =>", ::f, ", should be: (f3)"
RETURN self
RETURN Self
METHOD y
@@ -82,7 +82,7 @@ METHOD y
? " e =>", ::e, ", should be: (e3)"
? " f =>", ::f, ", should be: (f3)"
RETURN self
RETURN Self
METHOD z
@@ -94,7 +94,7 @@ METHOD z
? " e =>", ::e, ", should be: (e3)"
? " f =>", ::f, ", should be: (f3)"
RETURN self
RETURN Self
CREATE CLASS myclass2
hidden:
@@ -131,7 +131,7 @@ METHOD m2
? " execute ::z(), should be: MYCLASS3:Z()"
::z()
RETURN self
RETURN Self
METHOD x
@@ -143,7 +143,7 @@ METHOD x
? " e =>", ::e, ", should be: (e3)"
? " f =>", ::f, ", should be: (f3)"
RETURN self
RETURN Self
METHOD y
@@ -155,7 +155,7 @@ METHOD y
? " e =>", ::e, ", should be: (e3)"
? " f =>", ::f, ", should be: (f3)"
RETURN self
RETURN Self
METHOD z
@@ -167,7 +167,7 @@ METHOD z
? " e =>", ::e, ", should be: (e3)"
? " f =>", ::f, ", should be: (f3)"
RETURN self
RETURN Self
CREATE CLASS myclass3 FROM myclass1, myclass2
hidden:
@@ -204,7 +204,7 @@ METHOD m3
? " execute ::z(), should be: MYCLASS3:Z()"
::z()
RETURN self
RETURN Self
METHOD x
@@ -216,7 +216,7 @@ METHOD x
? " e =>", ::e, ", should be: (e3)"
? " f =>", ::f, ", should be: (f3)"
RETURN self
RETURN Self
METHOD y
@@ -228,7 +228,7 @@ METHOD y
? " e =>", ::e, ", should be: (e3)"
? " f =>", ::f, ", should be: (f3)"
RETURN self
RETURN Self
METHOD z
@@ -240,4 +240,4 @@ METHOD z
? " e =>", ::e, ", should be: (e3)"
? " f =>", ::f, ", should be: (f3)"
RETURN self
RETURN Self

10
tests/debug.prg
View File

@@ -158,7 +158,7 @@ STATIC FUNCTION Show()
// Set a whole list symbols to value
// Normal way of set objects from external
// sources, like memo files.
// <oObject> Set self according to the DATA
// <oObject> Set Self according to the DATA
// contained in <oObject>
// Can be used to transfer info from
// one class to another
@@ -204,23 +204,23 @@ STATIC FUNCTION Show()
STATIC FUNCTION Transfer( ... )
LOCAL self := QSelf()
LOCAL Self := QSelf()
LOCAL aParam := __dbgVMParLList()
LOCAL nLen := PCount()
LOCAL xRet
LOCAL xData
IF nLen == 0
xRet := __objGetValueList( self, ::aExcept() )
xRet := __objGetValueList( Self, ::aExcept() )
ELSE
FOR EACH xData IN aParam
IF HB_ISARRAY( xData )
IF HB_ISARRAY( xData[ 1 ] ) // 2D array passed
xRet := __objSetValueList( self, xData )
xRet := __objSetValueList( Self, xData )
ELSE // 1D array passed
xRet := __objSetValueList( self, { xData } )
xRet := __objSetValueList( Self, { xData } )
ENDIF
ELSEIF HB_ISOBJECT( xData ) // Object passed

20
tests/destruct.prg
View File

@@ -97,29 +97,29 @@ END CLASS
METHOD INIT( type ) CLASS myClass
? "Hi, I'm INIT method of class:", self:classname()
? "Hi, I'm INIT method of class:", Self:classname()
::type := type
RETURN self
RETURN Self
PROCEDURE DTOR CLASS myClass
? " Hi, I'm desturctor of class: ", self:classname()
? " Hi, I'm desturctor of class: ", Self:classname()
IF ::type == 1
? " I'm storing reference to self in instance variable."
? " I'm storing reference to Self in instance variable."
? " Bad practice but safe in Harbour because it will be destroyed."
::var1 := self
::var1 := Self
ELSEIF ::Type == 2
? " I'm storing reference to self in class variable."
? " I'm storing reference to Self in class variable."
? " It's programmer bug which should cause RT error."
::var2 := self
::var2 := Self
ELSEIF ::Type == 3
? " I'm storing reference to self in public variable."
? " I'm storing reference to Self in public variable."
? " It's programmer bug which should cause RT error."
P := self
P := Self
ELSE
? " I do not store any references to self."
? " I do not store any references to Self."
? " It's a safe destructor."
ENDIF

4
tests/dynobj.prg
View File

@@ -20,7 +20,7 @@ PROCEDURE Main()
? "Let's add inline 'CalcArea' at run-time to an already instanced class"
__objAddInline( oForm, "CalcArea", ;
{| self | ( ::nRight - ::nLeft ) * ( ::nBottom - ::nTop ) } )
{| Self | ( ::nRight - ::nLeft ) * ( ::nBottom - ::nTop ) } )
? "What methods are in the class :"
? hb_ValToExp( __objGetMethodList( oForm ) )
@@ -64,7 +64,7 @@ PROCEDURE Main()
? "And CalcArea() will now give a result in square inches"
__objModInline( oForm, "CalcArea", ;
{| self | ( ::nRight - ::nLeft ) * ( ::nBottom - ::nTop ) / ( 2.54 * 2.54 ) } )
{| Self | ( ::nRight - ::nLeft ) * ( ::nBottom - ::nTop ) / ( 2.54 * 2.54 ) } )
? "What is the Form area ?"
? oForm:CalcArea()

26
tests/inherit.prg
View File

@@ -60,10 +60,10 @@ FUNCTION TEmpty()
IF oEmpty == NIL
oEmpty := HBClass():New( "TEmpty" ) // Create a new class def
oEmpty:AddInline( "New", {| self | self } )
oEmpty:AddInline( "New", {| Self | Self } )
oEmpty:AddInline( "Run", {|| QOut( "Run !" ) } ) // Test command
oEmpty:AddInline( "Set", {| self, xParam | ::Out := xParam } )
oEmpty:AddInline( "Set", {| Self, xParam | ::Out := xParam } )
oEmpty:AddData( "Out", "Hi there" ) // Test command
oEmpty:AddVirtual( "Dispose" ) // Clean up code
@@ -82,7 +82,7 @@ FUNCTION TOnTop()
IF oOnTop == NIL
oOnTop := HBClass():New( "TOnTop", "TTextFile" )
oOnTop:AddInline( "Say", {| self, cArg | QOut( __objSendMsg( self, cArg ) ) } )
oOnTop:AddInline( "Say", {| Self, cArg | QOut( __objSendMsg( Self, cArg ) ) } )
oOnTop:Create()
ENDIF
@@ -134,7 +134,7 @@ FUNCTION TTextFile()
FUNCTION New( cFileName, cMode, nBlock )
LOCAL self := QSelf() // Get self
LOCAL Self := QSelf() // Get Self
hb_default( @cMode, "R" )
hb_default( @nBlock, 4096 )
@@ -160,11 +160,11 @@ FUNCTION New( cFileName, cMode, nBlock )
ENDIF
::nBlockSize := nBlock
RETURN self
RETURN Self
FUNCTION RUN( xTxt, lCRLF )
LOCAL self := QSelf()
LOCAL Self := QSelf()
LOCAL xRet
IF ::cMode == "R"
@@ -181,7 +181,7 @@ FUNCTION RUN( xTxt, lCRLF )
FUNCTION Dispose()
LOCAL self := QSelf()
LOCAL Self := QSelf()
::cBlock := NIL
IF ::hFile != F_ERROR
@@ -191,7 +191,7 @@ FUNCTION Dispose()
ENDIF
ENDIF
RETURN self
RETURN Self
//
// Read a single line
@@ -199,7 +199,7 @@ FUNCTION Dispose()
FUNCTION READ()
LOCAL self := QSelf()
LOCAL Self := QSelf()
LOCAL cRet := ""
LOCAL cBlock
LOCAL nCrPos
@@ -256,7 +256,7 @@ FUNCTION READ()
FUNCTION WriteLn( xTxt, lCRLF )
LOCAL self := QSelf()
LOCAL Self := QSelf()
LOCAL cBlock
IF ::hFile == F_ERROR
@@ -276,11 +276,11 @@ FUNCTION WriteLn( xTxt, lCRLF )
::nLine := ::nLine + 1
ENDIF
RETURN self
RETURN Self
FUNCTION Write( xTxt )
LOCAL self := QSelf()
LOCAL Self := QSelf()
RETURN ::WriteLn( xTxt, .F. )
@@ -290,7 +290,7 @@ FUNCTION Write( xTxt )
STATIC FUNCTION GOTO( nLine )
LOCAL self := QSelf()
LOCAL Self := QSelf()
LOCAL nWhere := 1
IF Empty( ::hFile )

2
tests/objarr.prg
View File

@@ -77,7 +77,7 @@ STATIC FUNCTION New()
::x := { 1, 1 }
RETURN self
RETURN Self
STATIC FUNCTION Get()

2
tests/objasign.prg
View File

@@ -68,4 +68,4 @@ STATIC FUNCTION New()
::x := 1
RETURN self
RETURN Self

2
tests/overload.prg
View File

@@ -40,7 +40,7 @@ CREATE CLASS TString
VAR cValue
METHOD New( cText ) INLINE ::cValue := cText, self
METHOD New( cText ) INLINE ::cValue := cText, Self
OPERATOR "=" ARG cArg INLINE ::cValue = cArg
OPERATOR "==" ARG cArg INLINE ::cValue == cArg

4
tests/speedtst.prg
View File

@@ -914,12 +914,12 @@ return
METHOD Notifier:init
::aQueue := {}
::oSignal := Signal():new()
RETURN self
RETURN Self
METHOD Notifier:notify( xValue )
AAdd( ::aQueue, xValue )
::oSignal:signal()
RETURN self
RETURN Self
METHOD Notifier:subscribe()
LOCAL xResult

6
tests/stripem.prg
View File

@@ -102,7 +102,7 @@ METHOD New( cFileName, cMode, nBlock ) CLASS TTextFile
ENDIF
::nBlockSize := nBlock
RETURN self
RETURN Self
//
// Dispose -> Close the file handle
@@ -118,7 +118,7 @@ METHOD Dispose() CLASS TTextFile
ENDIF
ENDIF
RETURN self
RETURN Self
//
// Read a single line
@@ -201,7 +201,7 @@ METHOD WriteLn( xTxt, lCRLF ) CLASS TTextFile
::nLine := ::nLine + 1
ENDIF
RETURN self
RETURN Self
//
// Go to a specified line number