Add mangling modifier 'as long|ulong alias "long"' for Win64

- minor code & whitespace clean-up, plus comments for this change

Author: jayrm

src/compiler/parser-decl-symbtype.bas

@@ -397,26 +397,36 @@ private function cMangleModifier _
 	( _
 	) as integer
 
-	static as zstring * FB_MAXNAMELEN+1 aliasid
 	function = FALSE
 
+	'' currently, cMangleModifier() returns true/false, because
+	'' we are checking for one case only.  And the FB_DATATYPE
+	'' stored in the upper bits of the dtype in FB_DT_MANGLEMASK
+	'' was selected for convenience.  In future, it might be
+	'' better to have a new FB_MANGLE_DATATYPE enum for tracking
+	'' the desired mapping stored in the upper bits of the
+	'' dtype, especially if there are some mappings that can't
+	'' be found in existing FB_DATATYPE.  To support additional
+	'' checks and mappings, should probably pass a dtype
+	'' parameter in to this procedure to be updated or returned.
+
 	'' ALIAS?
 	if( lexGetToken( ) = FB_TK_ALIAS ) then
 		lexSkipToken( )
 
-		'' "long"
+		'' "long"?
 		if( lexGetClass( ) = FB_TKCLASS_STRLITERAL ) then
-			aliasid = *lexGetText( )
-			lexSkipToken( )
-
-			select case lcase( aliasid )
+			select case lcase( *lexGetText( ) )
 			case "long"
+				'' only Win64 is affected by ths modifer
 				function = fbIs64bit( ) and ((env.target.options and FB_TARGETOPT_UNIX) = 0)
 			case ""
 				errReport( FB_ERRMSG_EMPTYALIASSTRING )
 			case else
 				errReport( FB_ERRMSG_SYNTAXERROR )	
 			end select
+
+			lexSkipToken( )
 		else
 			errReport( FB_ERRMSG_SYNTAXERROR )
 		end if
@@ -706,7 +716,7 @@ function cSymbolType _
 				dtype = FB_DATATYPE_UINT
 
 			case FB_DATATYPE_LONG
-				if( typeIsMangleDt( dtype ) ) then
+				if( typeHasMangleDt( dtype ) ) then
 					dtype = typeSetMangleDt( FB_DATATYPE_ULONG, FB_DATATYPE_UINT )
 				else
 					dtype = FB_DATATYPE_ULONG

src/compiler/symb-mangling.bas

@@ -366,7 +366,7 @@ function hMangleBuiltInType _
 		'' Windows 64bit
 
 		'' check for remapping of dtype mangling
-		if( typeIsMangleDt( dtype ) ) then
+		if( typeHasMangleDt( dtype ) ) then
 			dtype = typeGetMangleDt( dtype )
 			'' Windows 64bit
 			select case( dtype )
@@ -390,6 +390,9 @@ function hMangleBuiltInType _
 		end select
 	end if
 
+	'' dtype should be a FB_DATATYPE by now
+	assert( dtype = typeGetDtOnly( dtype ) )
+
 	static as zstring ptr typecodes(0 to FB_DATATYPES-1) => _
 	{ _
 		@"v", _ '' void

src/compiler/symb.bi

@@ -57,15 +57,15 @@ const FB_DT_TYPEMASK 		= &b00000000000000000000000000011111 '' max 32 built-in d
 const FB_DT_PTRMASK  		= &b00000000000000000000000111100000 '' level of pointer indirection
 const FB_DT_CONSTMASK		= &b00000000000000111111111000000000 '' PTRLEVELS + 1 bit-masks
 const FB_DATATYPE_REFERENCE	= &b00000000000010000000000000000000 '' used for mangling BYREF parameters
-const FB_DT_MANGLEMASK      = &b00000001111100000000000000000000 '' used to modify mangling for builtin types
+const FB_DT_MANGLEMASK		= &b00000001111100000000000000000000 '' used to modify mangling for builtin types
 const FB_DATATYPE_INVALID	= &b10000000000000000000000000000000
 
 const FB_DT_PTRLEVELS		= 8					'' max levels of pointer indirection
 
 const FB_DT_PTRPOS			= 5
 const FB_DT_CONSTPOS		= FB_DT_PTRPOS + 4
 
-const FB_DT_MANGLEPOS       = 20
+const FB_DT_MANGLEPOS		= 20
 
 enum FB_OVLPROC_MATCH_SCORE
 	FB_OVLPROC_NO_MATCH = 0
@@ -2495,7 +2495,7 @@ declare sub symbProcRecalcRealType( byval proc as FBSYMBOL ptr )
 #define	typeSetIsRef( dt ) (dt or FB_DATATYPE_REFERENCE)
 #define	typeUnsetIsRef( dt ) (dt and not FB_DATATYPE_REFERENCE)
 
-#define	typeIsMangleDt( dt ) (((dt and FB_DT_MANGLEMASK) <> 0))
+#define	typeHasMangleDt( dt ) (((dt and FB_DT_MANGLEMASK) <> 0))
 #define typeGetMangleDt( dt ) ((dt and FB_DT_MANGLEMASK) shr FB_DT_MANGLEPOS)
 #define typeSetMangleDt( dt, mangle_dt ) ((dt and not FB_DT_MANGLEMASK) or ((mangle_dt shl FB_DT_MANGLEPOS) and FB_DT_MANGLEMASK ))
 

tests/cpp/fbc-mangle.bas

@@ -5,7 +5,7 @@
 
 '' by default, fbc's Long/ULong data type maps to c's int type, and since 
 '' Integer/Uinteger are meant to be (consistently) 64bits in fbc-64bit,
-''  there is no other type that (by default) that can map to c's long int, 
+'' there is no other type that (by default) that can map to c's long int, 
 '' which is 32bit even on Win64.
 
 '' So, in Win64, to allow calling an external library that needs a 'long int' 
@@ -149,7 +149,7 @@ end scope
 scope
 
 	''  c = signed|unsigned int
-	'' fb = [unsigned] long|integer
+	'' fb = [unsigned] long
 
 	ASSERT( cpp_byval_uint(0) = 0 )
 	ASSERT( cpp_byval_sint(0) = 0 )
@@ -170,7 +170,8 @@ end scope
 scope
 
 	'' c = signed|unsigned long int
-	'' fb = [unsigned] long alias "long"
+	'' fb = [unsigned] long alias "long"    on Win64
+	'' fb = [unsigned] integer              on everything else
 
 	ASSERT( cpp_byval_ulongint(0) = 0 )
 	ASSERT( cpp_byval_slongint(0) = 0 )