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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Brian Fiete 2023-01-13 07:02:06 -05:00
commit 5b80116c8d
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BeefLibs/SDL2/src/SDL2.bf
View file

@ -625,7 +625,7 @@ namespace SDL2
ResizeLeft ResizeLeft
} }
struct WindowPos : int32 public struct WindowPos : int32
{ {
public const WindowPos Undefined = 0x1FFF0000; public const WindowPos Undefined = 0x1FFF0000;
public const WindowPos Centered = 0x2FFF0000; public const WindowPos Centered = 0x2FFF0000;

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

@ -2125,7 +2125,7 @@ namespace System
return UTF8.Decode(ptr + idx, mLength - idx).c == c; return UTF8.Decode(ptr + idx, mLength - idx).c == c;
} }
public void ReplaceLargerHelper(String find, String replace) private void ReplaceLargerHelper(String find, String replace)
{ {
List<int> replaceEntries = scope List<int>(8192); List<int> replaceEntries = scope List<int>(8192);

4
IDEHelper/Compiler/BfParser.cpp
View file

@ -2146,7 +2146,7 @@ void BfParser::NextToken(int endIdx, bool outerIsInterpolate, bool disablePrepro
newBlock->SetSrcEnd(mSrcIdx); newBlock->SetSrcEnd(mSrcIdx);
mSrcIdx--; mSrcIdx--;
} }
else if ((mSyntaxToken == BfSyntaxToken_EOF) || (mSyntaxToken == BfSyntaxToken_StringQuote)) else if (mSyntaxToken == BfSyntaxToken_StringQuote)
{ {
mSrcIdx--; mSrcIdx--;
mPassInstance->FailAfterAt("Expected '}'", mSourceData, newBlock->GetSrcEnd() - 1); 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) BF_EXPORT int BF_CALLTYPE BfParser_GetIndexAtLine(BfParser* bfParser, int line)
{ {
return bfParser->GetIndexAtLine(line); return bfParser->GetIndexAtLine(line);
} }