fbc: github # 426: add __FB_ARG_LISTEXPAND__( macroname, macroargcount, args... )

- tests added
- only emit NEWLINE if the expansion is multiple source lines
- fix pointers to string characters to use sizeof(wstring) since it will vary
  depending on host platform
- add __FB_ARG_LISTEXPAND__( macroname, macroargcount, args... )
- expands to one or more 'macroname( .... )' depending on the value of
  macroargcount and number of arguments in the args... list

	/'
	#macro m( arg... )
	    #print "   "##arg
	#endmacro

	#print "1. MacroArgCount=0:"
	__FB_ARG_LISTEXPAND__( m, 0, Hello1, Hello2, Hello3, Hello4)
	#print "2. MacroArgCount>0:"
	__FB_ARG_LISTEXPAND__( m, 1, Hello1, Hello2, Hello3, Hello4)
	#print "3. MacroArgCount<0:"
	__FB_ARG_LISTEXPAND__( m, -1, Hello1, Hello2, Hello3, Hello4)
	'/

	/' Compiler output:
	   1. MacroArgCount=0:
	      Hello1, Hello2, Hello3, Hello4
	   2. MacroArgCount>0:
	      Hello1
	      Hello2
	      Hello3
	      Hello4
	   3. MacroArgCount<0:
	      Hello1, Hello2, Hello3, Hello4
	      Hello2, Hello3, Hello4
	      Hello3, Hello4
	      Hello4
	'/

Author: jayrm

changelog.txt

@@ -62,6 +62,7 @@ Version 1.20.0
 - fbc: intrinsic define __FB_OPTION_PROFILE__ to indicate if profiling is currently enabled for code generation
 - rtlib: ./fbc-int/profile.bi - extra features for working with the built-in profiler; ProfileSetFileName(), ProfileGetOptions(), ProfileSetOptions(). ProfileIgnore()
 - '-earraydims' command line option to enable array dimensions checking.  Enabled by default with '-exx' command line option.
+- github #426: add __FB_ARG_LISTEXPAND__( macroname, macroargcount, args... ): expands to one or more 'macroname( .... )' depending on the value of macroargcount and number of arguments in the args... list (skyfish)   
 
 [fixed]
 - github #410: give consistent floating point comparisons results involving NaNs.

src/compiler/hlp-str.bas

@@ -7,6 +7,14 @@
 #include once "fbint.bi"
 #include once "dstr.bi"
 
+#if sizeof(wstring) = 4
+	type WSTRING_CHAR as ulong
+#elseif sizeof(wstring) = 2
+	type WSTRING_CHAR as ushort
+#else
+	type WSTRING_CHAR as ubyte
+#endif
+
 '':::::
 #macro ASSIGN_SETUP(dst, src, _type)
 	dim as integer dst_len, src_len
@@ -1333,7 +1341,7 @@ function hWStr2long( byref txt as wstring, byref value as long ) as integer
 		return FALSE
 	end if
 
-	dim s as ushort ptr = strptr(txt)
+	dim s as WSTRING_CHAR ptr = strptr(txt)
 
 	if( s = NULL orelse *s = CHAR_NULL ) then
 		return FALSE
@@ -1628,10 +1636,9 @@ end function
 '':::::
 function hWStr2Args( byval txt as const wstring ptr, res() as DWSTRING ) as integer
 
-	'' add the wstring version
-
 	dim as integer t = 0
-	dim as const ushort ptr s = cast(const ushort ptr, txt)
+	dim as const WSTRING_CHAR ptr s = cast(const WSTRING_CHAR ptr, txt)
+
 	dim as integer prntcnt = 0
 	dim as uinteger c = CHAR_NULL
 	dim as integer max_t = 10

src/compiler/symb-define.bas

@@ -747,17 +747,23 @@ private function hDefArgListExpandZ_cb( byval argtb as LEXPP_ARGTB ptr, byval er
 					numVarArgs = hStr2Args( argStr, varArgs() ) - 1
 					if ArgCount < 0 then ' Is Negate ?
 						for index = 0 to numVarArgs step -ArgCount
+							if( index > 0 ) then
+								res &= NEWLINE
+							end if
 							res &= *MacroNameStr & "("
 							for index2 = index to numVarArgs
 								res &= varArgs(index2)
 								if index2 <> numVarArgs then
 									res &=  ","
 								end if
 							next
-							res &= ")" & NEWLINE
+							res &= ")"
 						next
 					else
 						for index = 0 to numVarArgs step ArgCount
+							if( index > 0 ) then
+								res &= NEWLINE
+							end if
 							res &= *MacroNameStr & "("
 							MaxVarArgs = iif(ArgCount>numVarArgs-index,numVarArgs,index+ArgCount-1)
 							for index2 = index to MaxVarArgs
@@ -766,7 +772,7 @@ private function hDefArgListExpandZ_cb( byval argtb as LEXPP_ARGTB ptr, byval er
 									res &=  ","
 								end if
 							next
-							res &= ")" & NEWLINE
+							res &= ")"
 						next
 					end if
 				end if
@@ -812,6 +818,9 @@ private function hDefArgListExpandW_cb( byval argtb as LEXPP_ARGTB ptr, byval er
 					numVarArgs = hWStr2Args( argStr, varArgs() ) - 1
 					if ArgCount < 0 then ' Is Negate ?
 						for index = 0 to numVarArgs step -ArgCount
+							if( index > 0 ) then
+								DWstrConcatAssign(res, NEWLINE )
+							end if
 							DWstrConcatAssign(res, *MacroNameStr.data )
 							DWstrConcatAssign(res, "(" )
 							for index2 = index to numVarArgs
@@ -820,10 +829,13 @@ private function hDefArgListExpandW_cb( byval argtb as LEXPP_ARGTB ptr, byval er
 									DWstrConcatAssign(res,  "," )
 								end if
 							next
-							DWstrConcatAssign(res, ")" & NEWLINE )
+							DWstrConcatAssign(res, ")" )
 						next
 					else
 						for index = 0 to numVarArgs step ArgCount
+							if( index > 0 ) then
+								DWstrConcatAssign(res, NEWLINE )
+							end if
 							DWstrConcatAssign(res, *MacroNameStr.data )
 							DWstrConcatAssign(res, "(" )
 							MaxVarArgs = iif(ArgCount>numVarArgs-index,numVarArgs,index+ArgCount-1)
@@ -833,7 +845,7 @@ private function hDefArgListExpandW_cb( byval argtb as LEXPP_ARGTB ptr, byval er
 									DWstrConcatAssign(res,  "," )
 								end if
 							next
-							DWstrConcatAssign(res, ")" & NEWLINE )
+							DWstrConcatAssign(res, ")" )
 						next
 					end if
 				end if