Changes in String: no implicit conversion to char* (only to const char*)

Author: aslze

include/asl/String.h

@@ -1,4 +1,4 @@
-// Copyright(c) 1999-2022 aslze
+// Copyright(c) 1999-2023 aslze
 // Licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 #ifndef ASL_STRING_H
@@ -95,7 +95,7 @@ characters transparently.
 
 ~~~
 String dirName = "Mis imágenes"  // this is UTF-8
-CreateDirectoryW( dirName );     // this gets converted to UTF-16 LPWSTRING
+CreateDirectoryW( dirName );     // this gets converted to UTF-16 LPCWSTR
 ~~~
 
 There are automatic conversions to/from many basic types, but please use with care!
@@ -336,7 +336,8 @@ class ASL_API String
 	/**
 	Returns true if this string is not empty (warning: this might change in the future to mean isTrue(), use `ok()`)
 	*/
-	operator bool() const {return _len > 0;}
+	ASL_EXPLICIT operator bool() const { return _len > 0; }
+
 	/**
 	Returns true if this string is empty (warning: this might change in the future to mean !isTrue(), use `!ok()`)
 	*/
@@ -354,14 +355,21 @@ class ASL_API String
 	Returns a pointer to the beginning of the character data (suitable for functions
 	requiring C-style strings)
 	*/
-	operator char*() {return str();}
+	char* data() { return str(); }
+	const char* data() const { return str(); }
+	
 	/**
-	Returns a const pointer to a Unicode UCS2 representation of this string by expanding from the internal
-	byte representation (suitable for functions requiring C-style wide strings (LPWSTR))
+	Returns a const pointer to a Unicode UTF16 representation of this string by expanding from the internal
+	byte representation (suitable for functions requiring C-style wide strings (LPCWSTR))
 	*/
 	operator const wchar_t*() const;
 
-	operator wchar_t*() const {return (wchar_t*)(const wchar_t*)*this;}
+	/**
+	Returns a pointer to a Unicode UTF16 representation of this string by expanding from the internal
+	byte representation (suitable for functions requiring C-style wide strings (LPWSTR))
+	*/
+	wchar_t* dataw() { return (wchar_t*)(const wchar_t*)*this; }
+	const wchar_t* dataw() const { return (const wchar_t*)*this; }
 
 	/**
 	Returns a const pointer to the beginning of the character data (suitable for functions
@@ -711,8 +719,8 @@ class SafeString
 	SafeString(String& s, int n) : _s(s), _wide(false) { _s.resize(3 * n); }
 	~SafeString() { if (_wide) _s.fixW(); else _s.fix(); }
 	operator const char*() const {return _s;}
-	operator char*() const {return _s;}
-	operator const wchar_t*() { _wide = true; return (wchar_t*)_s; }
+	operator char*() const {return _s.data();}
+	operator const wchar_t*() { _wide = true; return _s.dataw(); }
 	operator const wchar_t*() const { _wide = true; return(const wchar_t*)(String*)&_s; }
 	operator wchar_t*() { _wide = true; return(wchar_t*)(const wchar_t*)_s; }
 };

src/IniFile.cpp

@@ -65,9 +65,7 @@ IniFile::IniFile(const String& name, bool shouldwrite)
 				}
 			String key = line.substring(0,i).trimmed();
 			String value = line.substring(i+1).trimmed();
-			for(char* p=key; *p; p++)
-				if(*p == '/')
-					*p = '\\';
+			key.replaceme('/', '\\');
 			_sections[_currentTitle][key] = value;
 		}
 	}

src/Process.cpp

@@ -122,7 +122,7 @@ namespace asl {
 		DWORD len = 15;
 		do {
 			value.resize(len, false);
-			len = GetEnvironmentVariableA(var, value, value.length() + 1);
+			len = GetEnvironmentVariableA(var, value.data(), value.length() + 1);
 			if (!len)
 				value = "";
 		} while ((int)len > value.length() + 1);
@@ -230,7 +230,7 @@ namespace asl {
 
 		PROCESS_INFORMATION procInfo;
 		_ok = CreateProcessW(NULL,
-			commandline,            // application name
+			commandline.dataw(),    // application name
 			NULL,                   // process security attributes
 			NULL,                   // primary thread security attributes
 			TRUE,                   // handles are inherited

src/Var.cpp

@@ -265,15 +265,15 @@ String Var::toString() const
 	r[0]='\0';
 	switch(_type) {
 	case INT:
-		r.fix(snprintf(r, r.cap(), "%i", i));
+		r.fix(snprintf(r.data(), r.cap(), "%i", i));
 		break;
 	case FLOAT:
 		r.resize(16);
-		r.fix(snprintf(r, r.cap(), "%.7g", d));
+		r.fix(snprintf(r.data(), r.cap(), "%.7g", d));
 		break;
 	case NUMBER:
 		r.resize(29);
-		r.fix(snprintf(r, r.cap(), "%.15g", d));
+		r.fix(snprintf(r.data(), r.cap(), "%.15g", d));
 		break;
 	case BOOL:
 		r=b?"true":"false";

src/Xdl.cpp

@@ -270,7 +270,7 @@ void XdlParser::parse(const char* s)
 			else if (c == ',' || myisspace(c) || c == ']' || c == '}')
 			{
 #ifndef ASL_FAST_JSON
-				for (char* p = _buffer; *p; p++)
+				for (char* p = _buffer.data(); *p; p++)
 					if (*p == '.')
 					{
 						*p = _ldp;
@@ -300,7 +300,7 @@ void XdlParser::parse(const char* s)
 			else if(c == ',' || myisspace(c) || c == ']' || c == '}')
 			{
 #ifndef ASL_FAST_JSON
-				for(char* p = _buffer; *p; p++)
+				for(char* p = _buffer.data(); *p; p++)
 					if (*p == '.')
 					{
 						*p = _ldp;

tests/unittests.cpp

@@ -289,7 +289,6 @@ ASL_TEST(String)
 	ASL_ASSERT(f1 == xxx);
 
 	String u1(L"1");
-
 	ASL_ASSERT(u1 == "1");
 
 	String sf = String::f("a%i", 2);
@@ -369,14 +368,24 @@ ASL_TEST(String)
 	Dic<> dic = String("x=1,y=2").split(',', '=');
 	ASL_ASSERT(dic["x"] == "1" && dic["y"] == "2");
 
-	String empty = "";
+	String empty;
 	ASL_ASSERT(!empty.ok());
 	ASL_ASSERT(String("c").ok());
 	String full = "abc";
 	int valid1 = empty.ok()? 1 : 0;
 	int valid2 = full.ok()? 1 : 0;
 	ASL_ASSERT(valid1 == 0 && valid2 == 1);
 
+	// bool conversion means not empty (might change in the future)
+	ASL_ASSERT(!empty);
+	int valid1b = empty ? 1 : 0;
+	int valid2b = full ? 1 : 0;
+	ASL_ASSERT(valid1b == 0 && valid2b == 1);
+
+	String five = "5";
+	int    intfive = five;
+	ASL_CHECK(intfive, ==, 5);
+
 	ASL_ASSERT(!empty.isTrue());
 	ASL_ASSERT(!String("false").isTrue());