udt-wstring: LCASE, UCASE, will accept UDT as z|wstring

Author: jayrm

changelog.txt

@@ -10,6 +10,7 @@ Version 1.07.0
 - github #141: makefile option 'ENABLE_STRIPALL=1' introduced to pass '-d ENABLE_STRIPALL' via FBCFLAGS by default for dos/win32 targets (William Breathitt Gray)
 - 'TYPE udt EXTENDS Z|WSTRING' allowed to specify that UDT is a kind of Z|WSTRING
 - LTRIM/RTRIM/TRIM will accept UDT as Z|WSTRING
+- LCASE/UCASE will accept UDT as Z|WSTRING
 
 [fixed]
 - sf.net #881: C backend: support for varadic function parameters in gcc using __builtin_va_list type and related macros

src/compiler/rtl-string.bas

@@ -3791,6 +3791,8 @@ function rtlStrCase _
 		end if
 	end if
 
+	astTryConvertUdtToWstring( expr )
+
 	if( is_lcase ) then
 		if( astGetDataType( expr ) = FB_DATATYPE_WCHAR ) then
 			f = PROCLOOKUP( WSTRLCASE2 )

tests/udt-wstring/case.bas

@@ -0,0 +1,43 @@
+#include "fbcunit.bi"
+#include once "uwstring-fixed.bi"
+#include once "chk-wstring.bi"
+
+#define ustring UWSTRING_FIXED
+
+SUITE( fbc_tests.udt_wstring_.case_ )
+
+	'' U/LCASE( wstring )
+	#macro check_rtlfunc( rtlfunc, text )
+		scope
+			dim t as wstring * 50 = text
+			dim u as ustring = t
+
+			CU_ASSERT( t = text )
+			CU_ASSERT( u = t )
+
+			dim rt as wstring * 50 = rtlfunc( t )
+			dim ru as wstring * 50 = rtlfunc( u )
+			CU_ASSERT_WSTRING_EQUAL( rt, ru )
+
+		end scope
+	#endmacro
+
+	#macro check( text )
+		check_rtlfunc( ucase, text )
+		check_rtlfunc( lcase, text )
+	#endmacro
+
+	TEST( default )
+		check( "" )
+		check( " " )
+		check( "  " )
+		check( "abcde" )
+		check( "asdfghjkl" )
+		check( !"\u30a1\u30a3\u30a5\u30a7\u30a9" )       '' katakana
+		check( !"\u0444\u044b\u0432\u0430\u043f\u0440" ) '' russian
+		check( !"asd wstring fghjkl\u4644" )
+		check( "QWERTZUIOP" )
+		check( "1234567890" )
+	END_TEST
+
+END_SUITE

tests/udt-zstring/case.bas

@@ -0,0 +1,39 @@
+#include "fbcunit.bi"
+#include once "uzstring-fixed.bi"
+#include once "chk-zstring.bi"
+
+#define ustring UZSTRING_FIXED
+
+SUITE( fbc_tests.udt_zstring_.case_ )
+
+	'' U/LCASE( zstring )
+	#macro check_rtlfunc( rtlfunc, text )
+		scope
+			dim t as zstring * 50 = text
+			dim u as ustring = t
+
+			CU_ASSERT( t = text )
+			CU_ASSERT( u = t )
+
+			dim rt as zstring * 50 = rtlfunc( t )
+			dim ru as zstring * 50 = rtlfunc( u )
+			CU_ASSERT_ZSTRING_EQUAL( rt, ru )
+		end scope
+	#endmacro
+
+	#macro check( text )
+		check_rtlfunc( ucase, text )
+		check_rtlfunc( lcase, text )
+	#endmacro
+
+	TEST( default )
+		check( "" )
+		check( " " )
+		check( "  " )
+		check( "abcde" )
+		check( "asdfghjkl" )
+		check( "QWERTZUIOP" )
+		check( "1234567890" )
+	END_TEST
+
+END_SUITE