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

Beefy::String changes, lambda hotswap fixes

Browse source 
Changed some string internals related to StringViewsma
Added an "incompatible capture" error for lambdas when the captures change
This commit is contained in:
Brian Fiete 2019-09-03 11:17:13 -07:00
parent 767a3fafd9
commit 2f01cc14dd
25 changed files with 544 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

5
IDE/src/IDEApp.bf
View file

@ -3051,7 +3051,7 @@ namespace IDE
if (mRunningTestScript)
{
if ((mScriptManager.mExpectingError != null) && (text.Contains(mScriptManager.mExpectingError)))
if (mScriptManager.IsErrorExpected(text))
{
DeleteAndNullify!(mScriptManager.mExpectingError);
OutputLine("Received expected error: {0}", text);
@ -10479,7 +10479,7 @@ namespace IDE
}
else if (cmd == "error")
{
if ((mRunningTestScript) && (!IsCrashDump))
if ((mRunningTestScript) && (!IsCrashDump) && (!mScriptManager.IsErrorExpected(param)))
mScriptManager.Fail(param);
bool isFirstMsg = true;
@ -10553,7 +10553,6 @@ namespace IDE
if (isFirstMsg)
{
OutputLineSmart(scope String("ERROR: ", errorMsg));
Fail(errorMsg);
isFirstMsg = false;
}
else

5
IDE/src/ScriptManager.bf
View file

@ -177,6 +177,11 @@ namespace IDE
//gApp.mRunningTestScript = false;
}
public bool IsErrorExpected(StringView err)
{
return (mExpectingError != null) && (err.Contains(mExpectingError));
}
public void Fail(StringView fmt, params Object[] args)
{
Fail(scope String()..AppendF(fmt, params args));