Merge pull request #332 from jayrm/strings

Allow overloads for [z|w]string [ptr] types and conversions for UDT's casting [z|w]string [ptr] types

Author: jayrm

changelog.txt

@@ -13,6 +13,7 @@ Version 1.09.0
 - fbc: gen gcc: allow compiling with GCC 4.5 and older, by avoiding -Wno-unused-but-set-variable (TeeEmCee)
 - fbc: internal function fbcQueryGcc() to ask gcc for the correct as & ld to use (TeeEmCee)
 - rtlib: freebsd: minimum thread stacksize 8192 KiB
+- sf.net #666: allow overload 'as string' with 'as zstring ptr' parameters
 
 [added]
 - fbc: add '-z fbrt' command line option to link against libfbrt*.a instead of libfb*.a
@@ -23,6 +24,7 @@ Version 1.09.0
 - fbc: add '-entry name' command line option to set program entry point (TeeEmCee)
 - added objinfo support for ELF files on freebsd
 - PROCPTR( identifier, type ) syntax to allow getting procedure pointer for based on sub/function type
+- sf.net #666: overload matching for UDT's with CAST() operators as [w|z]string type and implicit conversions
 
 [fixed]
 - github #315: set parameters when calling SCREENCONTROL (was broken in fbc 1.08.0 due to new LONG/LONGINT SCREENCONTROL API's)
@@ -38,6 +40,7 @@ Version 1.09.0
 - darwin: a variety of improvements to allow compiling and linking (TeeEmCee)
 - gfxlib2: fix d2d scaling issues for high dpi (adeyblue)
 - fbc: improve error message on statement between SELECT and first CASE inside a subroutine and don't allow CONST/ENUM between any SELECT & first CASE.
+- sf.net #843: Implicit casting of argument to string works for Instr() and Mid() but not for Left() and Right() 
 
 
 Version 1.08.0

src/compiler/dstr.bas

@@ -49,7 +49,7 @@ declare sub hRealloc _
 #endmacro
 
 '':::::
-#define CALC_LEN( p ) iif( p <> NULL, len( *src ), 0 )
+#define CALC_LEN( p ) iif( p <> NULL, len( *p ), 0 )
 
 ''::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 '' dynamic zstrings
@@ -61,9 +61,9 @@ sub DZstrZero _
 		byref dst as DZSTRING _
 	)
 
-    dst.data = NULL
-    dst.len = 0
-    dst.size = 0
+	dst.data = NULL
+	dst.len = 0
+	dst.size = 0
 
 end sub
 
@@ -209,9 +209,9 @@ sub DWstrZero _
 		byref dst as DWSTRING _
 	)
 
-    dst.data = NULL
-    dst.len = 0
-    dst.size = 0
+	dst.data = NULL
+	dst.len = 0
+	dst.size = 0
 
 end sub
 

src/compiler/symb-data.bas

@@ -134,7 +134,7 @@ sub symbDataInit( )
 		'' populate symb_dtypeMatchTB() with ranking numbers
 		for i = 0 to NUMTYPES - 1
 			dtype2 = rank(i)
-			symb_dtypeMatchTB( dtype1, dtype2 ) = i
+			symb_dtypeMatchTB( dtype1, dtype2 ) = OvlMatchScore( i, 0 )
 		next
 
 	next
@@ -525,14 +525,21 @@ end function
 '' result:
 ''
 '' FB_OVLPROC_FULLMATCH              => compatible, exact match
+'' FB_OVLPROC_FULLMATCH - stringrank => compatible, distance between string types (no w<->z conversion)
 '' FB_OVLPROC_FULLMATCH - baselevel  => compatible, derived types
 '' FB_OVLPROC_TYPEMATCH + consts     => same type, different consts
 '' FB_OVLPROC_HALFMATCH              => compatible, same data type class
 '' FB_OVLPROC_HALFMATCH - rank       => compatible, distance between numeric types
-'' FB_OVLPROC_HALFMATCH - struct     => compatible, UDT ctor/cast
+'' FB_OVLPROC_HALFMATCH - stringrank => compatible, distance between string types (w<->z conversion)
+'' FB_OVLPROC_CONVMATCH - struct     => compatible, UDT ctor
+'' FB_OVLPROC_CASTMATCH              => compatible, implicit cast required (udt and string casts)
+'' FB_OVLPROC_CONVMATCH              => compatible, implicit conversion required (udt and string conversions)
+'' FB_OVLPROC_CONVMATCH - struct     => compatible, lowest UDT conv/cast
 '' FB_OVLPROC_LOWEST_MATCH           => compatible, lowest scoring parameter
 '' FB_OVLPROC_NO_MATCH               => incompatible
 
+'' FB_OVLPROC_MAJORSCALE             => granularity of the matching score
+
 ''
 function typeCalcMatch _
 	( _
@@ -558,7 +565,7 @@ function typeCalcMatch _
 	end if
 
 	if( (typeGetDtAndPtrOnly( ldtype ) = typeGetDtAndPtrOnly( rdtype )) and (lsubtype = rsubtype) ) then
-		return FB_OVLPROC_TYPEMATCH + const_matches
+		return FB_OVLPROC_TYPEMATCH + OvlMatchScore( const_matches, 0 )
 	end if
 
 	'' We know that they're different (in terms of dtype or subtype or both),