da1d815d4d
* source/compiler/harbour.c
* source/compiler/harbour.y
+ Added support for DECLARE FunName(...) AS CLASS ClassName
+ Added support for DECLARE FunName( ... @SomeFun() ... ) - Function Pointer declared parameter.
* source/compiler/simplex.c
* Corrected some compiler warnings.
* source/compiler/harbour.slx
* Reenabled support for ID_ON_HOLD.
* include/hberror.h
+ Added: #define HB_COMP_WARN_RETURN_SUSPECT 28
* source/compiler/hbgenerr.c
+ Added: "4Suspecious return type: \'%s\' expected: \'%s\'"
* source/compiler/hbpcode.c
+ Completed support for Strong Typed variables as declared classes, as well as Adaptive Typed usage with declared classes.
* Few other corrections and enhancements.
* include/hbclass.ch
+ Added TClass declaration:
DECLARE TClass ;
New( cName AS STRING, OPTIONAL SuperParams ) AS CLASS TClass ;
Create() AS OBJECT;
Instance() AS OBJECT ;
AddClsMthds( cName AS STRING, @Method(), nScope AS NUMERIC, n2 AS NUMERIC, n3 AS NUMERIC );
AddMultiClsData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING );
AddMultiData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING );
AddMethod( cName AS STRING, @Method(), nScope AS NUMERIC );
AddInLine( cName AS STRING, bBlock AS CODEBLOCK, nScope AS NUMERIC );
AddVirtual( cName AS STRING )
+ Added declaration to s_oClass AS CLASS TClass
* tests/testdecl.prg
* Minor refinement.
65 lines
1.2 KiB
Plaintext
65 lines
1.2 KiB
Plaintext
// Test for DECLARE statement
|
|
// $Id$
|
|
//
|
|
#include "hbclass.ch"
|
|
|
|
#TRANSLATE AS NEW <ClassName> => AS CLASS <ClassName> := <ClassName>():New()
|
|
|
|
DECLARE nMyFun() AS NUMERIC
|
|
|
|
DECLARE MyClass ;
|
|
NEW AS CLASS MyClass ;
|
|
While AS String ;
|
|
cVar AS String
|
|
|
|
DECLARE MyFun( Var1 AS STRING, OPTIONAL Var1 ) AS LOGICAL
|
|
|
|
DECLARE SomeFunc( OPTIONAL SomeVar AS STRING )
|
|
|
|
DECLARE SomeFunc( OPTIONAL SomeVar AS STRING, OPTIONAL OtherVar )
|
|
|
|
Function Main()
|
|
|
|
MEMVAR Var1, Var2, aVar
|
|
MEMVAR Var3, aVar5, aVar8, Var7
|
|
LOCAL MyObj AS NEW MyClass
|
|
|
|
DECLARE Var1
|
|
DECLARE Var2 := 2
|
|
DECLARE aVar[2]
|
|
DECLARE Var3 := 'Var9', Var4, aVar5[1]
|
|
DECLARE Var6, Var7:=7, aVar8[8]
|
|
DECLARE Var9 AS STRING
|
|
DECLARE &var3
|
|
DECLARE &Var3.
|
|
DECLARE &Var3. ; DECLARE &Var3.&Var3
|
|
DECLARE &Var3.var3
|
|
DECLARE Var3&Var3
|
|
DECLARE Var3&Var3.
|
|
DECLARE Var3&Var3&Var3
|
|
|
|
M->Var1 := nMyFun()
|
|
? M->Var1
|
|
|
|
? M->Var2
|
|
|
|
M->aVar[1] := 'Array Element'
|
|
? M->aVar[1]
|
|
|
|
MyObj:cVar := 'Hello'
|
|
? MyObj:cVar
|
|
|
|
RETURN NIL
|
|
|
|
CLASS MyClass
|
|
METHOD New() Constructor
|
|
VAR WHile
|
|
VAR cVar
|
|
END CLASS
|
|
|
|
METHOD New() CLASS MyClass
|
|
RETURN Self
|
|
|
|
Function nMyFun()
|
|
RETURN 1
|