udt-wstring: ASC function will accept UDT as Z|WSTRING

Author: jayrm

changelog.txt

@@ -18,6 +18,7 @@ Version 1.07.0
 - SADD/STRPTR will accept UDT as Z|WSTRING to return Z|WSTRING ptr
 - LSET/RSET statements will accept UDT as Z|WSTRING
 - MID statement will accept UDT as Z|WSTRING
+- ASC function 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

@@ -3331,6 +3331,8 @@ function rtlStrAsc _
 
 	function = NULL
 
+	astTryOvlStringCONV( expr )
+
     ''
     if( astGetDataType( expr ) <> FB_DATATYPE_WCHAR ) then
     	proc = astNewCALL( PROCLOOKUP( STRASC ) )

tests/udt-wstring/asc.bas

@@ -0,0 +1,49 @@
+#include "fbcunit.bi"
+#include once "uwstring-fixed.bi"
+#include once "chk-wstring.bi"
+
+#define ustring UWSTRING_FIXED
+
+SUITE( fbc_tests.udt_wstring_.asc_ )
+
+	TEST( ascii )
+		dim s as wstring * 256
+		for i as uinteger = 1 to 255
+			s[i-1] = i
+		next
+		dim u as ustring = s
+
+		CU_ASSERT_EQUAL( asc( s ), asc( u ) )
+
+		for i as integer = -2 to 257
+			select case i
+			case 1 to 255
+				CU_ASSERT_EQUAL( i, asc( u, i ) )
+			case else
+				CU_ASSERT_EQUAL( 0, asc( u, i ) )
+			end select
+		next
+
+	END_TEST
+
+	TEST( ucs2 )
+		dim s as wstring * 256
+		for i as uinteger = 1 to 255
+			s[i-1] = i shl 8
+		next
+		dim u as ustring = s
+
+		CU_ASSERT_EQUAL( asc( s ), asc( u ) )
+
+		for i as integer = -2 to 257
+			select case i
+			case 1 to 255
+				CU_ASSERT_EQUAL( asc( s, i ), asc( u, i ) )
+			case else
+				CU_ASSERT_EQUAL( 0, asc( u, i ) )
+			end select
+		next
+
+	END_TEST
+
+END_SUITE

tests/udt-zstring/asc.bas

@@ -0,0 +1,49 @@
+#include "fbcunit.bi"
+#include once "uzstring-fixed.bi"
+#include once "chk-zstring.bi"
+
+#define ustring UZSTRING_FIXED
+
+SUITE( fbc_tests.udt_zstring_.asc_ )
+
+	TEST( ascii )
+		dim s as zstring * 256
+		for i as uinteger = 1 to 255
+			s[i-1] = i
+		next
+		dim u as ustring = s
+
+		CU_ASSERT_EQUAL( asc( s ), asc( u ) )
+
+		for i as integer = -2 to 257
+			select case i
+			case 1 to 255
+				CU_ASSERT_EQUAL( i, asc( u, i ) )
+			case else
+				CU_ASSERT_EQUAL( 0, asc( u, i ) )
+			end select
+		next
+
+	END_TEST
+
+	TEST( ucs2 )
+		dim s as zstring * 256
+		for i as uinteger = 1 to 255
+			s[i-1] = i shl 8
+		next
+		dim u as ustring = s
+
+		CU_ASSERT_EQUAL( asc( s ), asc( u ) )
+
+		for i as integer = -2 to 257
+			select case i
+			case 1 to 255
+				CU_ASSERT_EQUAL( asc( s, i ), asc( u, i ) )
+			case else
+				CU_ASSERT_EQUAL( 0, asc( u, i ) )
+			end select
+		next
+
+	END_TEST
+
+END_SUITE

tests/wstring/asc.bas

@@ -19,4 +19,40 @@ SUITE( fbc_tests.wstring_.asc_ )
 
 	END_TEST
 
+	TEST( ascii )
+		dim w as wstring * 256
+		for i as integer = 1 to 255
+			w[i-1] = i
+		next
+		
+		CU_ASSERT_EQUAL( 1, asc( w ) )
+
+		for i as integer = -2 to 257
+			select case i
+			case 1 to 255
+				CU_ASSERT_EQUAL( i, asc( w, i ) )
+			case else
+				CU_ASSERT_EQUAL( 0, asc( w, i ) )
+			end select
+		next
+	END_TEST
+
+	TEST( ucs2 )
+		dim w as wstring * 256
+		for i as integer = 1 to 255
+			w[i-1] = i shl 8
+		next
+
+		CU_ASSERT_EQUAL( 256, asc( w ) )
+
+		for i as integer = -2 to 257
+			select case i
+			case 1 to 255
+				CU_ASSERT_EQUAL( w[i-1], asc( w, i ) )
+			case else
+				CU_ASSERT_EQUAL( 0, asc( w, i ) )
+			end select
+		next
+	END_TEST
+
 END_SUITE