From b1d3ea8013ddf5f2e77f92c00623a224a53b24da Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Sat, 19 Mar 2022 12:30:35 -0700
Subject: [PATCH] Renamed QuoteString to Quote, UnQuoteString to Unquote

---
 BeefLibs/corlib/src/Compiler.bf |  2 +-
 BeefLibs/corlib/src/String.bf   | 42 +++++++++++++++++++++------------
 BeefLibs/corlib/src/Type.bf     |  2 +-
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/BeefLibs/corlib/src/Compiler.bf b/BeefLibs/corlib/src/Compiler.bf
index 37bb158a..738b1cdc 100644
--- a/BeefLibs/corlib/src/Compiler.bf
+++ b/BeefLibs/corlib/src/Compiler.bf
@@ -130,7 +130,7 @@ namespace System
 				Flags flags = .None;
 				val.Generate(fileName, outText, ref flags);
 				val.mCmdInfo.Append("fileName\t");
-				fileName.QuoteString(val.mCmdInfo);
+				fileName.Quote(val.mCmdInfo);
 				val.mCmdInfo.Append("\n");
 				val.mCmdInfo.Append("data\n");
 
diff --git a/BeefLibs/corlib/src/String.bf b/BeefLibs/corlib/src/String.bf
index 0bb55f93..306880db 100644
--- a/BeefLibs/corlib/src/String.bf
+++ b/BeefLibs/corlib/src/String.bf
@@ -447,7 +447,7 @@ namespace System
 			strBuffer.Append(this);
 		}
 
-		public static void QuoteString(char8* ptr, int length, String outString)
+		public static void Quote(char8* ptr, int length, String outString)
 		{
 			outString.Append('"');
 			for (int i < length)
@@ -480,12 +480,18 @@ namespace System
 			outString.Append('"');
 		}
 
-		public void QuoteString(String outString)
+		public void Quote(String outString)
 		{
-			QuoteString(Ptr, Length, outString);
+			Quote(Ptr, Length, outString);
 		}
 
-		public static Result<void> UnQuoteString(char8* ptr, int length, String outString)
+		[Obsolete("Replaced with Quote", false)]
+		public void QuoteString(String outString)
+		{
+			Quote(Ptr, Length, outString);
+		}
+
+		public static Result<void> Unquote(char8* ptr, int length, String outString)
 		{
 			if (length < 2)
 				return .Err;
@@ -502,15 +508,21 @@ namespace System
 				return .Err;
 			}
 
-			return UnEscapeString(ptr, length, outString);
+			return Unescape(ptr, length, outString);
 		}
 
+		public Result<void> Unquote(String outString)
+		{
+			return Unquote(Ptr, Length, outString);
+		}
+
+		[Obsolete("Replaced with Unquote", false)]
 		public Result<void> UnQuoteString(String outString)
 		{
-			return UnQuoteString(Ptr, Length, outString);
+			return Unquote(outString);
 		}
 
-		public static Result<void> UnEscapeString(char8* ptr, int length, String outString)
+		public static Result<void> Unescape(char8* ptr, int length, String outString)
 		{
 			if (length < 2)
 				return .Err;
@@ -553,9 +565,9 @@ namespace System
 			return .Ok;
 		}
 
-	public Result<void> UnEscapeString(String outString)
+	public Result<void> Unescape(String outString)
 	{
-		return UnEscapeString(Ptr, Length, outString);
+		return Unescape(Ptr, Length, outString);
 	}
 
 		static String sHexUpperChars = "0123456789ABCDEF";
@@ -563,7 +575,7 @@ namespace System
 		{
 			if (format == "Q")
 			{
-				QuoteString(Ptr, mLength, outString);
+				Quote(Ptr, mLength, outString);
 				return;
 			}
 			outString.Append(this);
@@ -571,7 +583,7 @@ namespace System
 
 		void IPrintable.Print(String outString)
 		{
-			String.QuoteString(Ptr, mLength, outString);
+			String.Quote(Ptr, mLength, outString);
 		}
 
 		[AlwaysInclude]
@@ -3229,7 +3241,7 @@ namespace System
 		{
 			if (format == "Q")
 			{
-				String.QuoteString(mPtr, mLength, outString);
+				String.Quote(mPtr, mLength, outString);
 				return;
 			}
 			outString.Append(mPtr, mLength);
@@ -3237,7 +3249,7 @@ namespace System
 
 		void IPrintable.Print(String outString)
 		{
-			String.QuoteString(mPtr, mLength, outString);
+			String.Quote(mPtr, mLength, outString);
 		}
 
 		[Commutable]
@@ -3628,12 +3640,12 @@ namespace System
 
 		public void QuoteString(String outString)
 		{
-			String.QuoteString(Ptr, Length, outString);
+			String.Quote(Ptr, Length, outString);
 		}
 
 		public Result<void> UnQuoteString(String outString)
 		{
-			return String.UnQuoteString(Ptr, Length, outString);
+			return String.Unquote(Ptr, Length, outString);
 		}
 
 		[NoDiscard]
diff --git a/BeefLibs/corlib/src/Type.bf b/BeefLibs/corlib/src/Type.bf
index d814af49..836c48d7 100644
--- a/BeefLibs/corlib/src/Type.bf
+++ b/BeefLibs/corlib/src/Type.bf
@@ -1285,7 +1285,7 @@ namespace System.Reflection
 				strBuffer.Append('\'');
 				var str = (*(char32*)&mValue).ToString(.. scope .());
 				let len = str.Length;
-				String.QuoteString(&str[0], len, str);
+				String.Quote(&str[0], len, str);
 				strBuffer.Append(str[(len + 1)...^2]);
 				strBuffer.Append('\'');
 			case typeof(uint64), typeof(uint):