fbc: basic-macros: fix regression and macro / define name handling

- see commit e1a25ee
- previous to the basic-macros feature additions, #define's with parens
  must be invoked with parens and if used without parens, then can be
  allowed to be a different symbol in some contexts.
- without this fix, existing fbc headers will be broken where built-in
  defines like 'rgb' and 'bit' are used for fields or parameters.

#define D() 4321

'' following are OK since symbol is used with parens and so does not
'' invoke the macro

type T
  D as string
  rgb as ulong
  bit as ubyte
end type

declare sub s( byval D as single )

Author: jayrm

src/compiler/pp-define.bas

@@ -386,7 +386,7 @@ private function hLoadDefine _
 					hasParens = true
 				else
 					'' not an error, macro can be passed as param to other macros
-					if( pp.invoking > 0 ) then
+					if( (pp.invoking > 0) or ((symbGetDefineFlags( s ) and FB_DEFINE_FLAGS_NEEDPARENS) <> 0 ) ) then
 						exit function
 					end if
 				end if
@@ -781,7 +781,7 @@ private function hLoadDefineW _
 					hasParens = true
 				else
 					'' not an error, macro can be passed as param to other macros
-					if( pp.invoking > 0 ) then
+					if( (pp.invoking > 0) or ((symbGetDefineFlags( s ) and FB_DEFINE_FLAGS_NEEDPARENS) <> 0 ) ) then
 						exit function
 					end if
 				end if
@@ -1090,7 +1090,8 @@ private sub hReadDefineText _
 		byval sym as FBSYMBOL ptr, _
 		byval defname as zstring ptr, _
 		byval isargless as integer, _
-		byval ismultiline as integer _
+		byval ismultiline as integer, _
+		byval flags as integer _
 	)
 
 	dim as zstring ptr text = any
@@ -1109,7 +1110,7 @@ private sub hReadDefineText _
 				errReportEx( FB_ERRMSG_DUPDEFINITION, defname )
     		end if
     	else
-    		symbAddDefine( defname, text, len( *text ), isargless )
+			symbAddDefine( defname, text, len( *text ), isargless, , flags )
     	end if
 
     '' unicode..
@@ -1126,7 +1127,7 @@ private sub hReadDefineText _
 				errReportEx( FB_ERRMSG_DUPDEFINITION, defname )
     		end if
     	else
-    		symbAddDefineW( defname, textw, len( *textw ), isargless )
+			symbAddDefineW( defname, textw, len( *textw ), isargless, , flags )
     	end if
 
     end if
@@ -1298,7 +1299,7 @@ sub ppDefine( byval ismultiline as integer )
 
 	'' not a macro?
 	if( params = 0 ) then
-		hReadDefineText( sym, @defname, isargless, ismultiline )
+		hReadDefineText( sym, @defname, isargless, ismultiline, define_flags )
 		exit sub
 	end if
 

src/compiler/rtl-macro.bas

@@ -584,6 +584,9 @@ private sub hAddMacro( byval macdef as FB_RTL_MACRODEF ptr )
 	'' for each parameter..
 	dim as FB_DEFPARAM ptr paramhead, lastparam
 	for i as integer = 0 to macdef->params-1
+		'' if there are parameters, then must have parens
+		'' TODO: if other optional flags are needed, then in macrodata()
+		flags or= FB_DEFINE_FLAGS_NEEDPARENS
 		lastparam = symbAddDefineParam( lastparam, macdef->paramTb(i) )
 		if( paramhead = NULL ) then
 			paramhead = lastparam

src/compiler/symb-define.bas

@@ -789,6 +789,8 @@ sub symbDefineInit _
 			lastparam = symbAddDefineParam( lastparam, macroTb(i).params(j) )
 		next	
 
+		'' TODO: if any macros are added that don't need params, then 
+		'' flags should be stored in macroTb
 		var sym = symbAddDefineMacro( macroTb(i).name, NULL, macroTb(i).nparams, firstparam, macroTb(i).flags or FB_DEFINE_FLAGS_NEEDPARENS )
 		sym->def.mprocz = macroTb(i).procz
 		sym->def.mprocw = macroTb(i).procw

tests/pp/define-shadow.bas

@@ -0,0 +1,44 @@
+' TEST_MODE : COMPILE_ONLY_OK
+
+'' macro with parens is seen as macro only when using parens
+
+#define D1() 1
+
+type T1
+	'' no expansion of D1() or built-ins
+	D1 as double
+	rgb as double
+	bit as double
+end type
+
+'' no expansion of D1()
+declare sub S1 _
+	( _
+		byval D1 as single, _
+		byval rgb as double, _
+		byval bit as double _
+	)
+
+'' expand D
+var X1 = D1()
+
+
+#define D2(arg1,arg2) 1
+
+type T2
+	'' no expansion of D2() or built-ins
+	D2 as double
+	rgb as double
+	bit as double
+end type
+
+'' no expansion of D2()
+declare sub S2 _
+	( _
+		byval D2 as single, _
+		byval rgb as double, _
+		byval bit as double _
+	)
+
+'' expand D
+var X2 = D2(,)