Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 04:22:20 +02:00
Code Activity

Renamed QuoteString to Quote, UnQuoteString to Unquote

Browse source
This commit is contained in:
Brian Fiete 2022-03-19 12:30:35 -07:00
parent e00cfcf0b6
commit b1d3ea8013
3 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BeefLibs/corlib/src/Compiler.bf
View file

@ -130,7 +130,7 @@ namespace System
Flags flags = .None; Flags flags = .None;
val.Generate(fileName, outText, ref flags); val.Generate(fileName, outText, ref flags);
val.mCmdInfo.Append("fileName\t"); val.mCmdInfo.Append("fileName\t");
fileName.QuoteString(val.mCmdInfo); fileName.Quote(val.mCmdInfo);
val.mCmdInfo.Append("\n"); val.mCmdInfo.Append("\n");
val.mCmdInfo.Append("data\n"); val.mCmdInfo.Append("data\n");

42
BeefLibs/corlib/src/String.bf
View file

@ -447,7 +447,7 @@ namespace System
strBuffer.Append(this); 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('"'); outString.Append('"');
for (int i < length) for (int i < length)
@ -480,12 +480,18 @@ namespace System
outString.Append('"'); 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) if (length < 2)
return .Err; return .Err;
@ -502,15 +508,21 @@ namespace System
return .Err; 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) 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) if (length < 2)
return .Err; return .Err;
@ -553,9 +565,9 @@ namespace System
return .Ok; 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"; static String sHexUpperChars = "0123456789ABCDEF";
@ -563,7 +575,7 @@ namespace System
{ {
if (format == "Q") if (format == "Q")
{ {
QuoteString(Ptr, mLength, outString); Quote(Ptr, mLength, outString);
return; return;
} }
outString.Append(this); outString.Append(this);
@ -571,7 +583,7 @@ namespace System
void IPrintable.Print(String outString) void IPrintable.Print(String outString)
{ {
String.QuoteString(Ptr, mLength, outString); String.Quote(Ptr, mLength, outString);
} }
[AlwaysInclude] [AlwaysInclude]
@ -3229,7 +3241,7 @@ namespace System
{ {
if (format == "Q") if (format == "Q")
{ {
String.QuoteString(mPtr, mLength, outString); String.Quote(mPtr, mLength, outString);
return; return;
} }
outString.Append(mPtr, mLength); outString.Append(mPtr, mLength);
@ -3237,7 +3249,7 @@ namespace System
void IPrintable.Print(String outString) void IPrintable.Print(String outString)
{ {
String.QuoteString(mPtr, mLength, outString); String.Quote(mPtr, mLength, outString);
} }
[Commutable] [Commutable]
@ -3628,12 +3640,12 @@ namespace System
public void QuoteString(String outString) public void QuoteString(String outString)
{ {
String.QuoteString(Ptr, Length, outString); String.Quote(Ptr, Length, outString);
} }
public Result<void> UnQuoteString(String outString) public Result<void> UnQuoteString(String outString)
{ {
return String.UnQuoteString(Ptr, Length, outString); return String.Unquote(Ptr, Length, outString);
} }
[NoDiscard] [NoDiscard]

2
BeefLibs/corlib/src/Type.bf
View file

@ -1285,7 +1285,7 @@ namespace System.Reflection
strBuffer.Append('\''); strBuffer.Append('\'');
var str = (*(char32*)&mValue).ToString(.. scope .()); var str = (*(char32*)&mValue).ToString(.. scope .());
let len = str.Length; let len = str.Length;
String.QuoteString(&str[0], len, str); String.Quote(&str[0], len, str);
strBuffer.Append(str[(len + 1)...^2]); strBuffer.Append(str[(len + 1)...^2]);
strBuffer.Append('\''); strBuffer.Append('\'');
case typeof(uint64), typeof(uint): case typeof(uint64), typeof(uint):