symb: Allow symbGetDefaultParamMode() dtype param to have CONST bits

freebasic · Mar 17, 2014 · f0eeaf3 · f0eeaf3
1 parent 8f553ea
commit f0eeaf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/compiler/parser-decl-proc-params.bas b/src/compiler/parser-decl-proc-params.bas
@@ -408,7 +408,7 @@ private function hParamDecl _
 		'' we have to delay the true default until now, since
 		'' byval/byref depends on the symbol type
 		if( use_default ) then
-			mode = symbGetDefaultParamMode( typeGetDtAndPtrOnly( dtype ), subtype )
+			mode = symbGetDefaultParamMode( dtype, subtype )
 		end if
 	end if
 

diff --git a/src/compiler/symb-proc.bas b/src/compiler/symb-proc.bas
@@ -2777,7 +2777,7 @@ private sub hParamsToStr( byref s as string, byval proc as FBSYMBOL ptr )
 			'' always include Byval/Byref in that case, otherwise it'd depend on
 			'' source code context.
 			if( fbLangIsSet( FB_LANG_FB ) and _
-			    (symbGetDefaultParamMode( symbGetType( param ), param->subtype ) <> parammode) ) then
+			    (symbGetDefaultParamMode( param->typ, param->subtype ) <> parammode) ) then
 				if( parammode = FB_PARAMMODE_BYVAL ) then
 					s += "byval "
 				else
@@ -2878,9 +2878,7 @@ function symbGetDefaultParamMode _
 		byval subtype as FBSYMBOL ptr _
 	) as integer
 
-	'' assumes dtype has const info stripped
-
-	select case as const dtype
+	select case as const( typeGetDtAndPtrOnly( dtype ) )
     case FB_DATATYPE_FWDREF, _
          FB_DATATYPE_FIXSTR, FB_DATATYPE_STRING, _
 	     FB_DATATYPE_CHAR, FB_DATATYPE_WCHAR, _