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

Fixed cascade error, switched minidump test to use symbols.beeflang.org

Browse source
This commit is contained in:
Brian Fiete 2019-08-29 17:40:17 -07:00
parent 7966abb501
commit 3625d76cc7
9 changed files with 78 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDE/BeefProj.toml
View file

@ -27,7 +27,7 @@ TargetDirectory = "$(WorkspaceDir)/dist"
TargetName = "BeefIDE_d"
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib"
CLibType = "Dynamic"
DebugCommandArguments = "-proddir=C:\\Beef\\IDE\\Tests\\Test1 -test=scripts\\HotSwap_VirtualRemap.txt -platform=Win64 -testNoExit"
DebugCommandArguments = "-test=scripts\\Minidump.txt -testNoExit"
DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest"
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]

2
IDE/Tests/EmptyTest/scripts/Minidump.txt
View file

@ -1,4 +1,4 @@
SetSymSrvOptions("C:/SymCache", "http://linux.beefy2d.com/symbols\nhttps://msdl.microsoft.com/download/symbols", "TempCache")
SetSymSrvOptions("C:/SymCache", "http://symbols.beeflang.org/\nhttps://msdl.microsoft.com/download/symbols", "TempCache")
#SetSymSrvOptions("C:/SymCache", "https://msdl.microsoft.com/download/symbols\nhttps://chromium-browser-symsrv.commondatastorage.googleapis.com", "TempCache")
#SetSymSrvOptions("C:/SymCache", "https://msdl.microsoft.com/download/symbols\nhttps://chromium-browser-symsrv.commondatastorage.googleapis.com", "None")

4
IDE/mintest/src/main3.bf
View file

@ -130,6 +130,10 @@ class Blurg
public static void Hey()
{
TestStruct ts = .();
//int val = ts..mA;
ts.mA = 123;
VoidCall();
int val0 = GetInt();

10
IDE/src/IDEApp.bf
View file

@ -4737,11 +4737,13 @@ namespace IDE
mViewWhiteSpace.mMenu = AddMenuItem(advancedEditMenu, "View White Space", "View White Space", null, null, true, mViewWhiteSpace.Bool ? 1 : 0);
AddMenuItem(advancedEditMenu, "Reformat Document", "Reformat Document");
if (mSettings.mEnableDevMode)
{
subMenu.AddMenuItem(null);
var internalEditMenu = subMenu.AddMenuItem("Internal");
internalEditMenu.AddMenuItem("Hilight Cursor References", null, new (menu) => { ToggleCheck(menu, ref gApp.mSettings.mEditorSettings.mHiliteCursorReferences); }, null, null, true, gApp.mSettings.mEditorSettings.mHiliteCursorReferences ? 1 : 0);
internalEditMenu.AddMenuItem("Delayed Autocomplete", null, new (menu) => { ToggleCheck(menu, ref gApp.mDbgDelayedAutocomplete); }, null, null, true, gApp.mDbgDelayedAutocomplete ? 1 : 0);
}
//////////
@ -4774,10 +4776,13 @@ namespace IDE
//subMenu.AddMenuItem("Compile Current File", null, new (menu) => { CompileCurrentFile(); });
AddMenuItem(subMenu, "Cancel Build", "Cancel Build", new (menu) => { menu.SetDisabled(!IsCompiling); });
if (mSettings.mEnableDevMode)
{
var internalBuildMenu = subMenu.AddMenuItem("Internal");
internalBuildMenu.AddMenuItem("Autobuild (Debug)", null, new (menu) => { mDebugAutoBuild = !mDebugAutoBuild; });
internalBuildMenu.AddMenuItem("Autorun (Debug)", null, new (menu) => { mDebugAutoRun = !mDebugAutoRun; });
internalBuildMenu.AddMenuItem("Disable Compiling", null, new (menu) => { ToggleCheck(menu, ref mDisableBuilding); }, null, null, true, mDisableBuilding ? 1 : 0);
}
//////////
@ -4803,6 +4808,8 @@ namespace IDE
AddMenuItem(newBreakpointMenu, "&Memory Breakpoint...", "Breakpoint Memory");
AddMenuItem(newBreakpointMenu, "&Symbol Breakpoint...", "Breakpoint Symbol");
if (mSettings.mEnableDevMode)
{
var internalDebugMenu = subMenu.AddMenuItem("Internal");
internalDebugMenu.AddMenuItem("Error Test", null, new (menu) => { DoErrorTest(); } );
internalDebugMenu.AddMenuItem("Reconnect BeefPerf", null, new (menu) => { BeefPerf.RetryConnect(); } );
@ -4835,6 +4842,7 @@ namespace IDE
mLongUpdateProfileId = 0;
}
}, null, null, true, (mLongUpdateProfileId != 0) ? 1 : 0);
}
//////////

9
IDE/src/Settings.bf
View file

@ -638,6 +638,7 @@ namespace IDE
public KeySettings mKeySettings = new .() ~ delete _;
public RecentFiles mRecentFiles = new RecentFiles() ~ delete _;
public String mWakaTimeKey = new .() ~ delete _;
public bool mEnableDevMode;
public this()
{
@ -691,7 +692,11 @@ namespace IDE
}
}
using (sd.CreateObject("Options"))
{
sd.Add("WakaTimeKey", mWakaTimeKey);
sd.Add("EnableDevMode", mEnableDevMode);
}
String dataStr = scope String();
sd.ToTOML(dataStr);
@ -736,7 +741,11 @@ namespace IDE
}
}
using (sd.Open("Options"))
{
sd.Get("WakaTimeKey", mWakaTimeKey);
sd.Get("EnableDevMode", ref mEnableDevMode);
}
}
public void Apply()

9
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -14824,12 +14824,19 @@ BfTypedValue BfExprEvaluator::SetupNullConditional(BfTypedValue thisValue, BfTok
return thisValue;
}
void BfExprEvaluator::CheckDotToken(BfTokenNode* tokenNode)
{
if ((tokenNode != NULL) && (tokenNode->mToken == BfToken_DotDot))
mModule->Fail("Unexpected cascade operation. Chaining can only be used for method invocations", tokenNode);
}
void BfExprEvaluator::DoMemberReference(BfMemberReferenceExpression* memberRefExpr, BfTypedValue* outCascadeValue)
{
CheckDotToken(memberRefExpr->mDotToken);
BfAttributeState attributeState;
attributeState.mTarget = (BfAttributeTargets)(BfAttributeTargets_MemberAccess);
String findName;
BfAstNode* nameRefNode = memberRefExpr->mMemberName;
if (auto attrIdentifierExpr = BfNodeDynCast<BfAttributedIdentifierNode>(memberRefExpr->mMemberName))

1
IDEHelper/Compiler/BfExprEvaluator.h
View file

@ -383,6 +383,7 @@ public:
void DoTypeIntAttr(BfTypeReference* typeRef, BfToken token);
//void InitializedSizedArray(BfTupleExpression* createExpr, BfSizedArrayType* arrayType);
void InitializedSizedArray(BfSizedArrayType* sizedArrayType, BfTokenNode* openToken, const BfSizedArray<BfExpression*>& values, const BfSizedArray<BfTokenNode*>& commas, BfTokenNode* closeToken, BfTypedValue* receivingValue = NULL);
void CheckDotToken(BfTokenNode* tokenNode);
void DoMemberReference(BfMemberReferenceExpression* memberRefExpr, BfTypedValue* outCascadeValue);
//////////////////////////////////////////////////////////////////////////

2
IDEHelper/Compiler/BfSystem.h
View file

@ -1387,7 +1387,7 @@ public:
//#define BF_WANTS_LOG_CLANG
//#define BF_WANTS_LOG_DBGEXPR
//#define BF_WANTS_LOG_CV
#define BF_WANTS_LOG_DBG
//#define BF_WANTS_LOG_DBG
#endif
#ifdef BF_WANTS_LOG

2
IDEHelper/DebugManager.cpp
View file

@ -840,6 +840,8 @@ BF_EXPORT void BF_CALLTYPE Debugger_SetSymSrvOptions(const char* symCacheDir, co
{
String symStr = String(startStr, cPtr - startStr);
symStr.Trim();
if (symStr.EndsWith('/'))
symStr.Remove((int)symStr.length() - 1, 1);
if (!symStr.IsEmpty())
symServers.Add(symStr);
startStr = cPtr;