Merge pull request #326 from jayrm/basic-macros

Wide character support for '__FB_EVAL__' and fix constant folding for ASC() with embedded NUL characters

Author: jayrm

changelog.txt

@@ -8,10 +8,12 @@ Version 1.09.0
 - crt headers: add const qualifiers in crt/stdlib.bi
 - crt headers: add const qualifiers in crt/stdio.bi, crt/sys/stat.bi, crt/wchar.bi
 - crt headers: add const qualifiers in crt/sys/win32/stat.bi, crt/win32/stdio.bi
+- github #325, #326: fbc: internal changes for string processing functions
 
 [added]
 - fbc: add '-z fbrt' command line option to link against libfbrt*.a instead of libfb*.a
 - makefile: add target for fbrt, fb runtime library written in fbc. Bulid libfbrt*.a and merge any missing object modules from libfb*.a
+- github #325, #326: fbc: add support for wstrings used with __FB_EVAL__()
 
 [fixed]
 - github #315: set parameters when calling SCREENCONTROL (was broken in fbc 1.08.0 due to new LONG/LONGINT SCREENCONTROL API's)
@@ -22,6 +24,7 @@ Version 1.09.0
 - github #323: gas64: When the target variable is const variable, code cannot be generated for variable assignment of different length. (Skyfish)
 - github #324: fbc: When converting a wide character escape sequence to an internal format, the escaped value is incorrect. (Skyfish)
 - fbc: remove warning on function suffix in '-lang qb'
+- github #325, #326: fbc: constant folding ASC() on constant strings with embedded NUL characters - previously ASC returned 0 for anything past the first embedded NUL char, for example ASC(!"A\000B",3) incorrectly returned 0 and should return 66
 
 
 Version 1.08.0

makefile

@@ -632,9 +632,6 @@ ifeq ($(TARGET_OS),js)
   RTL_LIBS += $(libdir)/fb_shell.html
 endif
 
-# allow optionally including config-post
--include config-post.mk
-
 #
 # Build rules
 #
@@ -654,6 +651,9 @@ ifndef V
   QUIET       = @
 endif
 
+# allow optionally including config-post
+-include config-post.mk
+
 ################################################################################
 
 .PHONY: all

src/compiler/ast-node-bop.bas

@@ -78,6 +78,9 @@ private function hStrLiteralCompare _
     static as DZSTRING ltext, rtext
     dim as integer res = any
 
+	'' !!!FIXME!!! - embedded NUL CHARs incorrectly end the string
+	'' !!!TODO!!! - use textlen returned from hUnescape() to get proper comparison length
+
    	DZstrAssign( ltext, hUnescape( symbGetVarLitText( astGetSymbol( l ) ) ) )
    	DZstrAssign( rtext, hUnescape( symbGetVarLitText( astGetSymbol( r ) ) ) )
 
@@ -119,6 +122,9 @@ private function hWStrLiteralCompare _
 	ls = astGetSymbol( l )
 	rs = astGetSymbol( r )
 
+	'' !!!FIXME!!! - embedded NUL CHARs incorrectly end the string
+	'' !!!TODO!!! - use textlen returned from hUnescape[W]() to get proper comparison length
+
 	'' left operand not a wstring?
 	if( symbGetType( ls ) <> FB_DATATYPE_WCHAR ) then
    		DZstrAssign( textz, hUnescape( symbGetVarLitText( ls ) ) )

src/compiler/ast-node-call.bas

@@ -204,7 +204,7 @@ function astLoadCALL( byval n as ASTNODE ptr ) as IRVREG ptr
 
 		'' cdecl: pushed arguments must be popped by caller
 		'' pascal/stdcall: callee does it instead
-		'' thiscall: could be either depending on target !!! TODO !!!
+		'' thiscall: could be either depending on target !!!TODO!!!
 		argbytes = symbCalcArgLen( l->dtype, l->subtype, arg->arg.mode )
 		if( symbGetProcMode( proc ) = FB_FUNCMODE_CDECL ) then
 			bytestopop += argbytes

src/compiler/ast-node-conv.bas

@@ -387,7 +387,7 @@ function astNewCONV _
 	end if
 
 	'' UDT? check if it is z|wstring? 
-	'' !!! TODO !!! make this block in to a function
+	'' !!!TODO!!! make this block in to a function
 	''              re-use in astNewOvlCONV()
 	''              rewrite hDoGlobOpOverload() as astTry* function
 	if( typeGet( ldtype ) = FB_DATATYPE_STRUCT ) then

src/compiler/ast-node-data.bas

@@ -21,7 +21,7 @@ sub astDataStmtInit( )
 end sub
 
 function astDataStmtBegin( ) as ASTNODE ptr
-    dim as ASTNODE ptr n = any
+	dim as ASTNODE ptr n = any
 
 	'' alloc new node
 	n = astNewNode( AST_NODECLASS_DATASTMT, FB_DATATYPE_INVALID )
@@ -37,7 +37,7 @@ function astDataStmtStore _
 		byval expr as ASTNODE ptr _
 	) as ASTNODE ptr
 
-    dim as ASTNODE ptr n = any
+	dim as ASTNODE ptr n = any
 
 	'' alloc new node
 	n = astNewNode( AST_NODECLASS_DATASTMT, FB_DATATYPE_INVALID )
@@ -69,21 +69,21 @@ function astDataStmtStore _
 
 		'' string?
 		if( litsym <> NULL ) then
-       		'' not a wstring?
-       		if( astGetDataType( expr ) <> FB_DATATYPE_WCHAR ) then
-       			n->data.id = FB_DATASTMT_ID_ZSTR
+			'' not a wstring?
+			if( astGetDataType( expr ) <> FB_DATATYPE_WCHAR ) then
+				n->data.id = FB_DATASTMT_ID_ZSTR
 			'' wstring..
-     		else
-        		n->data.id = FB_DATASTMT_ID_WSTR
-    		end if
+			else
+				n->data.id = FB_DATASTMT_ID_WSTR
+			end if
 
 		'' scalar..
 		else
 			'' address of?
 			if( astIsOFFSET( expr ) ) then
-          		n->data.id = FB_DATASTMT_ID_OFFSET
+				n->data.id = FB_DATASTMT_ID_OFFSET
 			else
-            	n->data.id = FB_DATASTMT_ID_CONST
+				n->data.id = FB_DATASTMT_ID_CONST
 			end if
 		end if
 	end if
@@ -96,13 +96,13 @@ end function
 
 sub astDataStmtEnd( byval tree as ASTNODE ptr )
 
-    dim as FBSYMBOL ptr array = any, elm = any
-    dim as integer i = any, id = any
-    dim as ASTNODE ptr n = any, expr = any, initree = any
-    dim as string littext
+	dim as FBSYMBOL ptr array = any, elm = any
+	dim as integer i = any, id = any
+	dim as ASTNODE ptr n = any, expr = any, initree = any
+	dim as string littext
 
-    '' add the last node: the link
-    astDataStmtStore( tree, NULL )
+	'' add the last node: the link
+	astDataStmtStore( tree, NULL )
 
 	'' create/lookup the datadesc array symbol for the last symbol
 
@@ -147,42 +147,42 @@ sub astDataStmtEnd( byval tree as ASTNODE ptr )
 							 astNewCONSTi( id, FB_DATATYPE_SHORT ), _
 							 elm )
 
-    	elm = symbGetNext( elm )
+		elm = symbGetNext( elm )
 
-        '' .node = expr
+		'' .node = expr
 		astTypeIniAddAssign( initree, expr, elm )
 
 		astTypeIniScopeEnd( initree, array )
 
-    	'' next
+		'' next
 		dim as ASTNODE ptr nxt = n->r
 		astDelNode( n )
 		n = nxt
 	next
 
-    ''
+	''
 	astTypeIniScopeEnd( initree, array )
 
-    astTypeIniEnd( initree, TRUE )
+	astTypeIniEnd( initree, TRUE )
 
-    symbSetTypeIniTree( array, initree )
+	symbSetTypeIniTree( array, initree )
 
 	'' Link the previous DATA stmt to this new one
 	if( ast.data.lastsym <> NULL ) then
-    	'' lastarray(ubound(lastarray)).next = @array(0)
-    	initree = symbGetTypeIniTree( astGetLastDataStmtSymbol( ) )
-
-    	n = initree->l
-    	var tn = n
-    	do while( n->r <> NULL )
-    		if( n->class = AST_NODECLASS_TYPEINI_ASSIGN ) then
-    			tn = n
-    		end if
-    		n = n->r
-    	loop
+		'' lastarray(ubound(lastarray)).next = @array(0)
+		initree = symbGetTypeIniTree( astGetLastDataStmtSymbol( ) )
+
+		n = initree->l
+		var tn = n
+		do while( n->r <> NULL )
+			if( n->class = AST_NODECLASS_TYPEINI_ASSIGN ) then
+				tn = n
+			end if
+			n = n->r
+		loop
 
-    	'' del the NULL expr
-    	astDelNode( tn->l )
+		'' del the NULL expr
+		astDelNode( tn->l )
 
 		'' replace the node
 		tn->l = astNewADDROF( astNewVAR( array ) )
@@ -234,8 +234,8 @@ function astDataStmtAdd _
 		'' Called for RESTORE <label>
 		'' static datadesc array id specifically for that label
 		'' (if <label> is a forward reference, then this datadesc array
-		''  may be looked up by astDataStmtEnd() later,
-		''  when the corresponding DATA is found)
+		'' may be looked up by astDataStmtEnd() later,
+		'' when the corresponding DATA is found)
 		id = FB_DATASTMT_PREFIX + *symbGetName( label )
 		dTB(0).upper = 0
 	end if

src/compiler/dstr.bas

@@ -96,7 +96,7 @@ end sub
 sub DZstrAssign _
 	( _
 		byref dst as DZSTRING, _
-		byval src as zstring ptr _
+		byval src as const zstring ptr _
 	)
 
 	dim as integer src_len = CALC_LEN( src )
@@ -113,7 +113,7 @@ end sub
 sub DZstrAssignW _
 	( _
 		byref dst as DZSTRING, _
-		byval src as wstring ptr _
+		byval src as const wstring ptr _
 	)
 
 	dim as integer src_len = CALC_LEN( src )
@@ -148,7 +148,7 @@ end sub
 sub DZstrConcatAssign _
 	( _
 		byref dst as DZSTRING, _
-		byval src as zstring ptr _
+		byval src as const zstring ptr _
 	)
 
 	dim as integer src_len = CALC_LEN( src )
@@ -166,7 +166,7 @@ end sub
 sub DZstrConcatAssignW _
 	( _
 		byref dst as DZSTRING, _
-		byval src as wstring ptr _
+		byval src as const wstring ptr _
 	)
 
 	dim as integer src_len = CALC_LEN( src )
@@ -244,7 +244,7 @@ end sub
 sub DWstrAssign _
 	( _
 		byref dst as DWSTRING, _
-		byval src as wstring ptr _
+		byval src as const wstring ptr _
 	)
 
 	dim as integer src_len = CALC_LEN( src )
@@ -261,7 +261,7 @@ end sub
 sub DWstrAssignA _
 	( _
 		byref dst as DWSTRING, _
-		byval src as zstring ptr _
+		byval src as const zstring ptr _
 	)
 
 	dim as integer src_len = CALC_LEN( src )
@@ -296,7 +296,7 @@ end sub
 sub DWstrConcatAssign _
 	( _
 		byref dst as DWSTRING, _
-		byval src as wstring ptr _
+		byval src as const wstring ptr _
 	)
 
 	dim as integer src_len = CALC_LEN( src )
@@ -314,7 +314,7 @@ end sub
 sub DWstrConcatAssignA _
 	( _
 		byref dst as DWSTRING, _
-		byval src as zstring ptr _
+		byval src as const zstring ptr _
 	)
 
 	dim as integer src_len = CALC_LEN( src )

src/compiler/dstr.bi

@@ -31,13 +31,13 @@ declare sub DZstrReset _
 declare sub DZstrAssign _
 	( _
 		byref dst as DZSTRING, _
-		byval src as zstring ptr _
+		byval src as const zstring ptr _
 	)
 
 declare sub DZstrAssignW _
 	( _
 		byref dst as DZSTRING, _
-		byval src as wstring ptr _
+		byval src as const wstring ptr _
 	)
 
 declare sub DZstrAssignC _
@@ -49,13 +49,13 @@ declare sub DZstrAssignC _
 declare sub DZstrConcatAssign _
 	( _
 		byref dst as DZSTRING, _
-		byval src as zstring ptr _
+		byval src as const zstring ptr _
 	)
 
 declare sub DZstrConcatAssignW _
 	( _
 		byref dst as DZSTRING, _
-		byval src as wstring ptr _
+		byval src as const wstring ptr _
 	)
 
 declare sub DZstrConcatAssignC _
@@ -83,13 +83,13 @@ declare sub DWstrReset _
 declare sub DWstrAssign _
 	( _
 		byref dst as DWSTRING, _
-		byval src as wstring ptr _
+		byval src as const wstring ptr _
 	)
 
 declare sub DWstrAssignA _
 	( _
 		byref dst as DWSTRING, _
-		byval src as zstring ptr _
+		byval src as const zstring ptr _
 	)
 
 declare sub DWstrAssignC _
@@ -101,13 +101,13 @@ declare sub DWstrAssignC _
 declare sub DWstrConcatAssign _
 	( _
 		byref dst as DWSTRING, _
-		byval src as wstring ptr _
+		byval src as const wstring ptr _
 	)
 
 declare sub DWstrConcatAssignA _
 	( _
 		byref dst as DWSTRING, _
-		byval src as zstring ptr _
+		byval src as const zstring ptr _
 	)
 
 declare sub DWstrConcatAssignC _

src/compiler/fbc.bas

@@ -3689,7 +3689,7 @@ private sub hPrintOptions( byval verbose as integer )
 	print "  -strip           Omit all symbol information from the output file"
 	print "  -t <value>       Set .exe stack size in kbytes, default: 1024 (win32/dos)"
 	if( verbose ) then
-	'' !!! TODO !!! provide more examples of available targets
+	'' !!!TODO!!! provide more examples of available targets
 	print "  -target <name>   Set cross-compilation target"
 	else
 	print "  -target <name>   Set cross-compilation target"