fbc: sf.net # 948: Duplicated class members inherit from the base class instead of incorrectly from the namespace

Example:

namespace M
    dim as zstring * 32 duplicate = "M.duplicate"
end namespace

namespace N
    dim as zstring * 32 duplicate = "N.duplicate"
    type parent extends object
        dim as zstring * 32 duplicate = "N.parent.duplicate"
    end type
    type child extends parent
        declare sub proc()
    end type
end namespace

sub n.child.proc()
    using M
    ? duplicate '' now is "N.parent.duplicate"
                '' was N.duplicate in fbc-1.08
end sub

dim as N.child c
c.proc()

Author: jayrm

changelog.txt

@@ -96,6 +96,7 @@ Version 1.09.0
 - sf.net #945: regression: Scoping rules have changed inside methods - allow globals to shadow non-explicit enums implicitly imported in to the current namespace
 - sf.net #892: Bug when default calling via a pointer to a 'Sub' defined with the only 'Any Ptr' - fbc now differentiates between function pointers that have different numbers and positions of optional parameters
 - sf.net #948: Overriding class members doesn't work inside methods of further-extended subclasses
+- sf.net #948: Duplicated class members inherit from the base class instead of incorrectly from the namespace
 
 
 Version 1.08.0

src/compiler/symb.bas

@@ -1100,100 +1100,128 @@ function symbLookupTypeNS _
 	'' Because symbols are added in the order that they are defined,
 	'' in some cases we can't just take the first symbol we find.
 
-	'' keyword?
-	hashtb = symb.hashlist.tail
-	do
-		dim as FBSYMBOL ptr sym = hashLookupEx( @hashtb->tb, id, index )
-		while( sym )
-			if( sym->class = FB_SYMBCLASS_KEYWORD ) then
-				tk = sym->key.id
-				tk_class = sym->key.tkclass
-				'' return if it's a KEYWORD or a OPERATOR token, they
-				'' can't never be redefined, even inside namespaces
-				if( tk_class <> FB_TKCLASS_QUIRKWD ) then
+	scope
+		'' keyword?
+		hashtb = symb.hashlist.tail
+		do
+			dim as FBSYMBOL ptr sym = hashLookupEx( @hashtb->tb, id, index )
+			while( sym )
+				if( sym->class = FB_SYMBCLASS_KEYWORD ) then
+					tk = sym->key.id
+					tk_class = sym->key.tkclass
+					'' return if it's a KEYWORD or a OPERATOR token, they
+					'' can't never be redefined, even inside namespaces
+					if( tk_class <> FB_TKCLASS_QUIRKWD ) then
+						return symbNewChainpool( sym )
+					end if
+				end if
+				sym = sym->hash.next
+			wend
+			hashtb = hashtb->prev
+		loop while( hashtb <> NULL )
+	end scope
+
+	scope
+		'' Search locals - if we are in a procedure, and the symbol can be found
+		'' directly, return the first one on the top of the stack
+		hashtb = symb.hashlist.tail
+		do
+			dim as FBSYMBOL ptr sym = hashLookupEx( @hashtb->tb, id, index )
+			while( sym )
+				if( symbIsLocal( sym ) ) then
 					return symbNewChainpool( sym )
 				end if
-			end if
-			sym = sym->hash.next
-		wend
-		hashtb = hashtb->prev
-	loop while( hashtb <> NULL )
+				sym = sym->hash.next
+			wend
+			hashtb = hashtb->prev
+		loop while( hashtb <> NULL )
+	end scope
 
-	'' any symbol not in the global namespace or we are already in the global namespace?
-	'' check the whole list before we check the imports
-	hashtb = symb.hashlist.tail
-	do
-		dim as FBSYMBOL ptr sym = hashLookupEx( @hashtb->tb, id, index )
+
+	scope
+		'' Search symbols in the UDT's namespace
+		dim as FBSYMBOL ptr ns = symbGetCurrentNamespc( )
+
+		'' search in UDT's (TYPE or CLASS) hash tb first
+		dim as FBSYMBOL ptr sym = hashLookupEx( @symbGetCompHashTb( ns ).tb, id, index )
+
+		'' don't access locals in a TYPE's namespace
 		while( sym )
-			'' return if it's not the global ns (as in C++, any nested
-			'' symbol has precedence over any imported one, even if the
-			'' latter was imported in the current ns)
-			if( hashtb->owner <> @symbGetGlobalNamespc( ) ) then
-				return symbNewChainpool( sym )
+			if( symbIsLocal( sym ) ) then
+				sym = sym->hash.next
 			else
-				'' also if we are at the global ns, no need to check the imports
-				if( symbGetCurrentNamespc( ) = @symbGetGlobalNamespc( ) ) then
-					return symbNewChainpool( sym )
-				else
-					if( first_ancestor = NULL ) then
-						first_ancestor = sym
-					end if
-				end if
+				exit while
 			end if
-			sym = sym->hash.next
 		wend
-		hashtb = hashtb->prev
-	loop while( hashtb <> NULL )
-
-	dim as FBSYMBOL ptr ns = symbGetCurrentNamespc( )
 
-	'' search in UDT's (TYPE or CLASS) hash tb first
-	dim as FBSYMBOL ptr sym = hashLookupEx( @symbGetCompHashTb( ns ).tb, id, index )
-
-	'' don't access local variables in an explicit namespace
-	while( sym )
-		if( symbIsLocal( sym ) and symbIsVar( sym ) ) then
-			sym = sym->hash.next
-		else
-			exit while
+		'' Found the symbol in the type's namespace?
+		if( sym ) then
+			dim as FBSYMCHAIN ptr chain_ = symbNewChainpool( sym )
+			return chain_
 		end if
-	wend
+	end scope
+
+	scope
+		'' Search symbols in the the type's imports, but only if inherieted from
+		'' a parent type - don't check imports from a normal namespace
+
+		'' we already know that the current namespace is a TYPE
+		dim as FBSYMBOL ptr ns = symbGetCurrentNamespc( )
+
+		if( (symbGetCompExt( ns ) <> NULL) and (symbGetCompImportHead( ns ) <> NULL) ) then
+			dim as FBSYMCHAIN ptr chain_ = hLookupImportList( ns, id, index )
+			dim as FBSYMBOL ptr sym = NULL
+
+			'' search UDT variables
+			while ( chain_ )
+				sym = chain_->sym
+				while( sym )
+					dim as FBSYMBOL ptr parent = symbGetParent( sym )
+					if( symbGetType( parent ) = FB_DATATYPE_STRUCT ) then
+						if( symbGetUDTBaseLevel( ns, parent ) > 0 ) then
+							return symbNewChainpool( chain_->sym )
+						end if
+					end if
+					sym = sym->hash.next
+				wend
 
-	'' Found the symbol in the type's namespace?
-	if( sym ) then
-		dim as FBSYMCHAIN ptr chain_ = symbNewChainpool( sym )
-		return chain_
-	end if
+				chain_ = symbChainGetNext( chain_ )
+			wend
 
-	'' Search the type's imports
-	if( (symbGetCompExt( ns ) <> NULL) and (symbGetCompImportHead( ns ) <> NULL) ) then
-		dim as FBSYMCHAIN ptr chain_ = hLookupImportList( ns, id, index )
-		if( chain_ ) then
-			'' return the first one
-			return symbNewChainpool( chain_->sym )
 		end if
-	end if
-
-	'' search all the imports?
-	dim as FBSYMCHAIN ptr imp_chain = hashLookupEx( @symb.imphashtb, id, index )
-	if( imp_chain <> NULL ) then
+	end scope
 
-		if( first_ancestor ) then
-			dim as FBSYMCHAIN ptr chain_ = symbNewChainpool( first_ancestor )
-			chain_->next = imp_chain
-			return chain_
+	scope
+		'' any symbol not in the global namespace or we are already in the global namespace?
+		'' check the whole list before we check the imports
+		hashtb = symb.hashlist.tail
+		do
+			dim as FBSYMBOL ptr sym = hashLookupEx( @hashtb->tb, id, index )
+			if( sym ) then
+				return symbNewChainpool( sym )
+			end if
+			hashtb = hashtb->prev
+		loop while( hashtb <> NULL )
+	end scope
+
+	scope
+		'' search the current namespace
+		dim as FBSYMBOL ptr ns = symbGetCurrentNamespc( )
+
+		if( (symbGetCompExt( ns ) <> NULL) and (symbGetCompImportHead( ns ) <> NULL) ) then
+			dim as FBSYMCHAIN ptr chain_ = hLookupImportList( ns, id, index )
+			if( chain_ ) then
+				'' return the first one
+				return symbNewChainpool( chain_->sym )
+			end if
 		end if
+	end scope
 
-		return imp_chain
-	end if
-
-	'' no imports? return only first ancestor (if we already found it)
-	if( first_ancestor ) then
-		return symbNewChainpool( first_ancestor )
-	end if
+	'' search all the imports
+	dim as FBSYMCHAIN ptr imp_chain = hashLookupEx( @symb.imphashtb, id, index )
 
 	'' never found
-	return NULL
+	return imp_chain
 
 end function
 
@@ -1345,6 +1373,9 @@ function symbLookupAt _
 	'' search in UDT's (NAMESPACE, TYPE, CLASS or ENUM) hash tb first
 	dim as FBSYMBOL ptr sym = hashLookupEx( @symbGetCompHashTb( ns ).tb, id, index )
 
+	'' !!!TODO!!! some imports won't make sense in an explicit namespace
+	'' for example this.proc() where proc() is imported from a plain old namespace
+
 	'' don't access local variables in an explicit namespace
 	while( sym )
 		if( symbIsLocal( sym ) and symbIsVar( sym ) ) then

src/compiler/symb.bi

@@ -512,7 +512,7 @@ type FB_STRUCTEXT
 end type
 
 type FBS_STRUCT
-	'' extends FBNAMESCP
+	'' extends FBNAMESPC
 	ns              as FBNAMESPC
 
 	base            as FBSYMBOL_ ptr            '' base class

tests/structs/inherit-type-1.bas

@@ -131,7 +131,7 @@ private sub module_proc()
 
 	scope
 		dim x as N.A3.C
-		checkCall( x.method(), "N.PROC" )
+		checkCall( x.method(), "N.P.PROC" )
 	end scope
 
 end sub

tests/structs/inherit-type-3.bas

@@ -144,7 +144,7 @@ namespace N
 		end type
 
 		sub C.method()
-			proc()  '' << ambiguous N.P.PROC, B.PROC, E.PROC
+			proc()
 		end sub
 
 		sub method2()

tests/structs/inherit-type-4.bas

@@ -0,0 +1,40 @@
+#include once "fbcunit.bi"
+
+'' define namespace names to allow short names
+'' in this source but avoid namespace collisions
+'' in other sources
+
+#define M iherit_type_4_M
+#define N iherit_type_4_N
+
+dim shared as zstring * 32 duplicate = "..duplicate"
+
+namespace M
+	dim as zstring * 32 duplicate = "M.duplicate"
+end namespace
+
+namespace N
+	dim as zstring * 32 duplicate = "N.duplicate"
+	type parent extends object
+		dim as zstring * 32 duplicate = "N.parent.duplicate"
+	end type
+	type child extends parent
+		declare sub proc()
+	end type
+end namespace
+
+sub n.child.proc()
+	using M
+	CU_ASSERT_EQUAL( duplicate, "N.parent.duplicate" )
+end sub
+
+private sub module_proc
+	dim as N.child c
+	c.proc()
+end sub
+
+SUITE( fbc_tests.structs.inherit_type_4 )
+	TEST( default )
+		module_proc()
+	END_TEST
+END_SUITE

tests/structs/inherit-type-5.bas

@@ -0,0 +1,45 @@
+#include once "fbcunit.bi"
+
+'' define namespace names to allow short names
+'' in this source but avoid namespace collisions
+'' in other sources
+
+#define M iherit_type_5_M
+#define N iherit_type_5_N
+
+dim shared as zstring * 32 duplicate = "..duplicate"
+
+namespace M
+	dim as zstring * 32 duplicate = "M.duplicate"
+end namespace
+
+namespace N
+	type parent extends object
+		declare sub proc()
+	end type
+	type child extends parent
+		declare sub proc()
+	end type
+end namespace
+
+sub N.parent.proc()
+	using M
+	CU_ASSERT_EQUAL( duplicate, "..duplicate" )
+end sub
+
+sub N.child.proc()
+	using M
+	CU_ASSERT_EQUAL( duplicate, "..duplicate" )
+end sub
+
+private sub module_proc
+	dim as n.child c
+	c.proc()
+	cast(n.parent,c).proc()
+end sub
+
+SUITE( fbc_tests.structs.inherit_type_5 )
+	TEST( default )
+		module_proc()
+	END_TEST
+END_SUITE