fbc: remove implementation of the deleting destructor (g++ compatibility)

- the deleting destructor was being automatically generated (implementation) even when the class (UDT) was being declared only
- add tests for (simplified) virtual destructor and method in tests/cpp/derived.bmk
- add method test for class test in tests/cpp/class.bmk

Author: jayrm

src/compiler/ast-node-proc.bas

@@ -673,14 +673,14 @@ function astProcEnd( byval callrtexit as integer ) as integer
 	res = (symbCheckLabels(symbGetProcSymbTbHead(parser.currproc)) = 0)
 
 	if( res ) then
-		'' Complete Destructor?
+		'' Complete Destructor? (D1) 
 		if( symbIsDestructor1( sym ) and enable_implicit_code ) then
 			'' Call destructors, behind the exit label, so they'll
 			'' always be called, even with early returns.
 			hCallDtors( sym )
 		end if
 
-		'' Deleting Destructor?
+		'' Deleting Destructor? (D0)
 		if( symbIsDestructor0( sym ) and enable_implicit_code ) then
 			hCallDeleteDtor( sym )
 		end if

src/compiler/parser-proc.bas

@@ -1482,9 +1482,7 @@ function cProcHeader _
 				''   except for the destructor type
 				dim dtor0 as FBSYMBOL ptr = symbPreAddProc( NULL )
 				symbAddProcInstanceParam( parent, dtor0 )
-				pattrib and= not FB_PROCATTRIB_DESTRUCTOR1
-				pattrib or= FB_PROCATTRIB_DESTRUCTOR0
-				dtor0 = symbAddCtor( dtor0, NULL, attrib, pattrib, mode )
+				dtor0 = symbAddCtor( dtor0, NULL, attrib, ((pattrib and not FB_PROCATTRIB_DESTRUCTOR1) or FB_PROCATTRIB_DESTRUCTOR0), mode )
 			end if
 		end if
 
@@ -1848,7 +1846,7 @@ sub cProcStmtBegin( byval attrib as FB_SYMBATTRIB, byval pattrib as FB_PROCATTRI
 	stk->proc.endlabel = astGetProcExitlabel( ast.proc.curr )
 end sub
 
-'' ProcStmtEnd  =  END (SUB | FUNCTION) .
+'' ProcStmtEnd  =  END (SUB | FUNCTION | OPERATOR | CONSTRUCTOR | DESTRUCTOR | PROPERTY) .
 sub cProcStmtEnd( )
 	dim as FB_CMPSTMTSTK ptr stk = any
 	dim as FBSYMBOL ptr proc_res = any
@@ -1894,7 +1892,7 @@ sub cProcStmtEnd( )
 		end if
 	end if
 
-    '' always finish
+	'' always finish
 	astProcEnd( FALSE )
 
 	'' Close namespace again if cProcHeader() opened it

src/compiler/symb-comp.bas

@@ -628,21 +628,17 @@ sub symbUdtDeclareDefaultMembers _
 			'' Complete dtor
 			default.dtor1 = hDeclareProc( udt, INVALID, FB_DATATYPE_INVALID, FB_SYMBATTRIB_NONE, FB_PROCATTRIB_DESTRUCTOR1 )
 
+			'' c++? we may need other dtors too...
 			if( symbGetMangling( udt ) = FB_MANGLING_CPP ) then
 				'' Deleting dtor
 				default.dtor0 = hDeclareProc( udt, INVALID, FB_DATATYPE_INVALID, FB_SYMBATTRIB_NONE, FB_PROCATTRIB_DESTRUCTOR0 )
 			end if
 
 			'' Don't allow the implicit dtor to override a FINAL dtor from the base
 			symbProcCheckOverridden( default.dtor1, TRUE )
-		end if
-	end if
 
-	if( symbGetMangling( udt ) = FB_MANGLING_CPP ) then
-		if( default.dtor0 = NULL ) then
-			'' deleting dtor will be implicitly declared if the complete dtor was explicitly declared
-			default.dtor0 = symbGetCompDtor0( udt )
 		end if
+
 	end if
 
 end sub
@@ -810,7 +806,7 @@ sub symbSetCompDtor1( byval sym as FBSYMBOL ptr, byval proc as FBSYMBOL ptr )
 		assert( symbIsDestructor1( proc ) )
 		symbUdtAllocExt( sym )
 		if( sym->udt.ext->dtor1 = NULL ) then
-			'' Add dtor
+			'' Add deleting dtor (D1)
 			sym->udt.ext->dtor1 = proc
 		end if
 	end if
@@ -821,7 +817,7 @@ sub symbSetCompDtor0( byval sym as FBSYMBOL ptr, byval proc as FBSYMBOL ptr )
 		assert( symbIsDestructor0( proc ) )
 		symbUdtAllocExt( sym )
 		if( sym->udt.ext->dtor0 = NULL ) then
-			'' Add dtor
+			'' Add complete dtor (D0)
 			sym->udt.ext->dtor0 = proc
 		end if
 	end if
@@ -1076,11 +1072,11 @@ private sub hInsertImported _
 		if( ns <> NULL ) then
 			symbGetCompExt( ns )->cnt += 1
 			if( symbGetCompExt( ns )->cnt = 1 ) then
-	  			'' add to import hash tb list
-	  			symbHashListInsertNamespace( ns, _
-	  										 symbGetCompSymbTb( ns ).head )
-	  		end if
-	  	end if
+				'' add to import hash tb list
+				symbHashListInsertNamespace( ns, _
+											 symbGetCompSymbTb( ns ).head )
+			end if
+		end if
 
 		imp_ = symbGetImportNext( imp_ )
 	loop

src/compiler/symb-proc.bas

@@ -932,6 +932,10 @@ add_proc:
 				'' There can always only be one complete dtor, so there is no
 				'' need to do a lookup and/or overload checks.
 				overridden = symbGetCompDtor1( parent->udt.base->subtype )
+			elseif( symbIsDestructor0( proc ) ) then
+				'' There can always only be deleting dtor, so there is no
+				'' need to do a lookup and/or overload checks.
+				overridden = symbGetCompDtor0( parent->udt.base->subtype )
 			elseif( symbIsOperator( proc ) ) then
 				'' Get the corresponding operator from the base
 				'' (actually a chain of overloads for that particular operator)

src/compiler/symb.bi

@@ -2504,10 +2504,10 @@ declare sub symbProcRecalcRealType( byval proc as FBSYMBOL ptr )
 
 #define symbIsConstructor(s) ((s->pattrib and FB_PROCATTRIB_CONSTRUCTOR) <> 0)
 
-#define symbIsDestructor0(s) ((s->pattrib and FB_PROCATTRIB_DESTRUCTOR0) <> 0)
-
 #define symbIsDestructor1(s) ((s->pattrib and FB_PROCATTRIB_DESTRUCTOR1) <> 0)
 
+#define symbIsDestructor0(s) ((s->pattrib and FB_PROCATTRIB_DESTRUCTOR0) <> 0)
+
 #define symbIsOperator(s) ((s->pattrib and FB_PROCATTRIB_OPERATOR) <> 0)
 
 #define symbIsProperty(s) ((s->pattrib and FB_PROCATTRIB_PROPERTY) <> 0)

tests/cpp/class-cpp.cpp

@@ -69,7 +69,8 @@ class UDT
 	UDT();
 	UDT( UDT const& rhs );
 	UDT( int const& rhs );
-	~UDT();	
+	~UDT();
+	void method( int const& rhs );	
 
 	// assignment
 	UDT& operator=( UDT const& rhs );
@@ -140,6 +141,20 @@ UDT::~UDT()
 	}
 }
 
+// sub UDT.method( byref rhs as const long )
+void UDT::method( int const& rhs )
+{
+	if( initial ) {
+		ptr1 = this;
+		ptr2 = &rhs;
+		setMsg( "void UDT::method( int const& rhs )" );
+		val1 = value;
+		val2 = rhs;
+		val3 = rhs;
+	}
+	value = rhs;
+}
+
 // operator UDT.let( byref rhs as const UDT )
 UDT& UDT::operator=( UDT const& rhs )
 {

tests/cpp/class-fbc.bas

@@ -56,9 +56,11 @@ extern "c++"
 		declare constructor thiscall ( byref rhs as const UDT )
 		declare constructor thiscall ( byref rhs as const long )
 		declare destructor thiscall ()
+		declare sub method thiscall ( byref rhs as const long )
 		declare operator let thiscall ( byref rhs as const UDT )
-		/' declare operator thiscall +( byref rhs as const long ) as UDT '/
-		/' declare operator thiscall -( byref rhs as const long ) as UDT '/
+		'' !!! TODO !!! member operators
+		'' !!! TODO !!! declare operator + thiscall ( byref rhs as const long ) as UDT
+		'' !!! TODO !!! declare operator - thiscall ( byref rhs as const long ) as UDT
 
 	end type
 
@@ -123,6 +125,17 @@ scope
 	assert( b.value = 2 )
 end scope
 
+DLOG( sub UDT.method( byref rhs as const long ) )
+scope
+	dim a1 as long = 1, a2 as long = 2
+	resetChecks()
+	dim b as UDT = a1
+	checkResults( @b, @a1, -1, 1, 1, "UDT::UDT( int const& rhs )" )
+	b.method( a2 )
+	checkResults( @b, @a2,  1, 2, 2, "void UDT::method( int const& rhs )" )
+	assert( b.value = a2 )
+end scope
+
 DLOG( operator UDT.let( byref rhs as const UDT ) )
 scope
 	dim a as UDT = 2
@@ -137,8 +150,8 @@ end scope
 '' disable results for ctor/dtor/copy-ctor/let
 setInitial( 0 )
 
-/' 
-'' !!! TODO !!!
+/'
+!!! TODO !!!
 DLOG( operator UDT.+( byref rhs as const long ) )
 scope
 	dim as UDT a = 3
@@ -149,7 +162,6 @@ scope
 	checkResults( @a, @b, 3, 11, 14, "UDT::operator+( int rhs )" )
 end scope
 
-'' !!! TODO !!!
 DLOG( operator UDT.-( byref rhs as const long ) as UDT )
 scope
 	dim as UDT a = 17