Mercurial > projects > ddmd

diff dmd/StringExp.d @ 129:010eb8f0e18d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
further work on dmd test suite
author korDen
date Sun, 05 Sep 2010 15:32:22 +0400
parents e28b18c23469
children 14feb7ae01a6
line wrap: on
line diff
--- a/dmd/StringExp.d	Sat Sep 04 01:33:05 2010 +0100
+++ b/dmd/StringExp.d	Sun Sep 05 15:32:22 2010 +0400
@@ -108,7 +108,7 @@
 				case 'd':
 					for (u = 0; u < len;)
 					{
-						p = utf_decodeChar(cast(string)string_[0..len], &u, &c);
+						p = utf_decodeChar((cast(char*)string_)[0..len], &u, &c);
 						if (p !is null)
 						{	
 							error("%s", p);
@@ -132,7 +132,7 @@
 				case 'w':
 					for (u = 0; u < len;)
 					{
-						p = utf_decodeChar(cast(string)string_[0..len], &u, &c);
+						p = utf_decodeChar((cast(char*)string_)[0..len], &u, &c);
 						if (p !is null)
 						{	
 							error("%s", p);
@@ -191,7 +191,7 @@
 		case 1:
 			for (size_t u = 0; u < len;)
 			{
-				p = utf_decodeChar(cast(string)string_[0..len], &u, &c);
+				p = utf_decodeChar((cast(char*)string_)[0..len], &u, &c);
 				if (p)
 				{   
 					error("%s", p);
@@ -205,7 +205,7 @@
 		case 2:
 			for (size_t u = 0; u < len;)
 			{
-				p = utf_decodeWchar(cast(wstring)string_[0..len], &u, &c);
+				p = utf_decodeWchar((cast(wchar*)string_)[0..len], &u, &c);
 				if (p)
 				{   error("%s", p);
 					break;
@@ -446,7 +446,7 @@
 					for (size_t u = 0; u < len;)
 					{	
 						dchar c;
-						string p = utf_decodeChar(cast(string)se.string_[0..len], &u, &c);
+						string p = utf_decodeChar((cast(char*)se.string_)[0..len], &u, &c);
 						if (p !is null)
 							error("%s", p);
 						else
@@ -460,7 +460,7 @@
 					for (size_t u = 0; u < len;)
 					{	
 						dchar c;
-						string p = utf_decodeChar(cast(string)se.string_[0..len], &u, &c);
+						string p = utf_decodeChar((cast(char*)se.string_)[0..len], &u, &c);
 						if (p !is null)
 							error("%s", p);
 						buffer.write4(c);
@@ -473,7 +473,7 @@
 					for (size_t u = 0; u < len;)
 					{	
 						dchar c;
-						string p = utf_decodeWchar(cast(wstring)se.string_[0..len], &u, &c);
+						string p = utf_decodeWchar((cast(wchar*)se.string_)[0..len], &u, &c);
 						if (p)
 							error("%s", p);
 						else
@@ -487,7 +487,7 @@
 					for (size_t u = 0; u < len;)
 					{	
 						dchar c;
-						string p = utf_decodeWchar(cast(wstring)se.string_[0..len], &u, &c);
+						string p = utf_decodeWchar((cast(wchar*)se.string_)[0..len], &u, &c);
 						if (p)
 							error("%s", p);
 						buffer.write4(c);
@@ -733,7 +733,7 @@
 		    m = 'w';
 		    for (u = 0; u < len; )
 		    {
-			p = utf_decodeWchar(cast(wstring)string_[0..len], &u, &c);
+			p = utf_decodeWchar((cast(wchar*)string_)[0..len], &u, &c);
 			if (p)
 			    error("%s", p);
 			else