From 7100333f9a77a4b8c20d5669db220222e07b8f72 Mon Sep 17 00:00:00 2001 From: disarray2077 <86157825+disarray2077@users.noreply.github.com> Date: Mon, 19 Dec 2022 13:11:13 -0300 Subject: [PATCH 1/3] Make `ReplaceLargerHelper` private --- BeefLibs/corlib/src/String.bf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BeefLibs/corlib/src/String.bf b/BeefLibs/corlib/src/String.bf index 64fabff2..7b18a59c 100644 --- a/BeefLibs/corlib/src/String.bf +++ b/BeefLibs/corlib/src/String.bf @@ -2125,7 +2125,7 @@ namespace System return UTF8.Decode(ptr + idx, mLength - idx).c == c; } - public void ReplaceLargerHelper(String find, String replace) + private void ReplaceLargerHelper(String find, String replace) { List replaceEntries = scope List(8192); From 572e891c9a0358fe46b6ed0934ec6d00077d1194 Mon Sep 17 00:00:00 2001 From: disarray2077 <86157825+disarray2077@users.noreply.github.com> Date: Mon, 19 Dec 2022 13:16:11 -0300 Subject: [PATCH 2/3] Make `WindowPos` public --- BeefLibs/SDL2/src/SDL2.bf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BeefLibs/SDL2/src/SDL2.bf b/BeefLibs/SDL2/src/SDL2.bf index 33e4f036..87ad3da9 100644 --- a/BeefLibs/SDL2/src/SDL2.bf +++ b/BeefLibs/SDL2/src/SDL2.bf @@ -625,7 +625,7 @@ namespace SDL2 ResizeLeft } - struct WindowPos : int32 + public struct WindowPos : int32 { public const WindowPos Undefined = 0x1FFF0000; public const WindowPos Centered = 0x2FFF0000; From 488683a40c1065bcef51a23ca973b3ebc9c7da67 Mon Sep 17 00:00:00 2001 From: disarray2077 <86157825+disarray2077@users.noreply.github.com> Date: Mon, 19 Dec 2022 22:19:45 -0300 Subject: [PATCH 3/3] Fix infinite loop in `BfParser::NextToken` --- IDEHelper/Compiler/BfParser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IDEHelper/Compiler/BfParser.cpp b/IDEHelper/Compiler/BfParser.cpp index b709b4fb..dd4135a1 100644 --- a/IDEHelper/Compiler/BfParser.cpp +++ b/IDEHelper/Compiler/BfParser.cpp @@ -2146,7 +2146,7 @@ void BfParser::NextToken(int endIdx, bool outerIsInterpolate, bool disablePrepro newBlock->SetSrcEnd(mSrcIdx); mSrcIdx--; } - else if ((mSyntaxToken == BfSyntaxToken_EOF) || (mSyntaxToken == BfSyntaxToken_StringQuote)) + else if (mSyntaxToken == BfSyntaxToken_StringQuote) { mSrcIdx--; mPassInstance->FailAfterAt("Expected '}'", mSourceData, newBlock->GetSrcEnd() - 1); @@ -4205,4 +4205,4 @@ BF_EXPORT void BF_CALLTYPE BfParser_GetLineCharAtIdx(BfParser* bfParser, int idx BF_EXPORT int BF_CALLTYPE BfParser_GetIndexAtLine(BfParser* bfParser, int line) { return bfParser->GetIndexAtLine(line); -} \ No newline at end of file +}