From 40fe76d90307d4a48433094df342655f46edbbdf Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Mon, 11 May 2020 10:16:24 -0700 Subject: [PATCH] Added missing ()'s for allocations --- BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf | 4 ++-- BeefLibs/corlib/src/IO/FolderBrowserDialog.bf | 2 +- BeefLibs/corlib/src/Reflection/MethodInfo.bf | 2 +- BeefTools/BeefPerf/src/BPApp.bf | 2 +- BeefTools/BeefPerf/src/StatusBar.bf | 12 ++++++------ BeefTools/BeefPerf/src/WorkspacePanel.bf | 2 +- IDE/src/IDEApp.bf | 10 +++++----- IDE/src/ScriptManager.bf | 2 +- IDE/src/ui/ProjectProperties.bf | 4 ++-- IDE/src/ui/WorkspaceProperties.bf | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf index 91bcda28..1ed3d723 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf @@ -310,7 +310,7 @@ namespace Beefy.theme.dark delete mWindowTopImage; } - Image themeImg = Image.LoadFromFile(scope String..Append(tempStr, BFApp.sApp.mInstallDir, "images/DarkTheme.png"), .AllowRead); + Image themeImg = Image.LoadFromFile(scope String()..Append(tempStr, BFApp.sApp.mInstallDir, "images/DarkTheme.png"), .AllowRead); defer delete themeImg; uint32[5] bits = ?; themeImg.GetBits(0, 0, bits.Count, 1, bits.Count, &bits); @@ -335,7 +335,7 @@ namespace Beefy.theme.dark mIconError = LoadSizedImage("IconError"); mIconWarning = LoadSizedImage("IconWarning"); - mThemeImage = Image.LoadFromFile(scope String..Append(tempStr, BFApp.sApp.mInstallDir, "images/", uiFileName)); + mThemeImage = Image.LoadFromFile(scope String()..Append(tempStr, BFApp.sApp.mInstallDir, "images/", uiFileName)); for (int32 i = 0; i < (int32)ImageIdx.COUNT; i++) { diff --git a/BeefLibs/corlib/src/IO/FolderBrowserDialog.bf b/BeefLibs/corlib/src/IO/FolderBrowserDialog.bf index 994aee78..91844228 100644 --- a/BeefLibs/corlib/src/IO/FolderBrowserDialog.bf +++ b/BeefLibs/corlib/src/IO/FolderBrowserDialog.bf @@ -128,7 +128,7 @@ namespace System.IO char16* cStr = null; if (shellItem.VT.GetDisplayName(shellItem, .FILESYSPATH, out cStr) == .OK) { - let str = scope String..Append(cStr); + let str = scope String()..Append(cStr); mSelectedPath.Append(str); Windows.COM_IUnknown.CoTaskMemFree(cStr); result = .OK; diff --git a/BeefLibs/corlib/src/Reflection/MethodInfo.bf b/BeefLibs/corlib/src/Reflection/MethodInfo.bf index d3211743..aa8ed75e 100644 --- a/BeefLibs/corlib/src/Reflection/MethodInfo.bf +++ b/BeefLibs/corlib/src/Reflection/MethodInfo.bf @@ -252,7 +252,7 @@ namespace System.Reflection { if (unboxToPtr) { - int* stackDataPtr = scope:mixin int; + int* stackDataPtr = scope:mixin int(); *stackDataPtr = (int)dataPtr; ffiArgList.Add(stackDataPtr); } diff --git a/BeefTools/BeefPerf/src/BPApp.bf b/BeefTools/BeefPerf/src/BPApp.bf index 13705082..06894e94 100644 --- a/BeefTools/BeefPerf/src/BPApp.bf +++ b/BeefTools/BeefPerf/src/BPApp.bf @@ -45,7 +45,7 @@ namespace BeefPerf public Socket mListenSocket ~ delete _; public Thread mSocketThread ~ delete _; public List mClients = new List() ~ delete _; - public List mSessions = new List ~ DeleteContainerAndItems!(_); + public List mSessions = new List() ~ DeleteContainerAndItems!(_); public Monitor mClientMonitor = new Monitor() ~ delete _; public WaitEvent mShutdownEvent = new WaitEvent() ~ delete _; public BpSession mCurSession; diff --git a/BeefTools/BeefPerf/src/StatusBar.bf b/BeefTools/BeefPerf/src/StatusBar.bf index bbbae023..b1063b01 100644 --- a/BeefTools/BeefPerf/src/StatusBar.bf +++ b/BeefTools/BeefPerf/src/StatusBar.bf @@ -19,33 +19,33 @@ namespace BeefPerf g.FillRect(0, 0, mWidth, mHeight); g.SetFont(DarkTheme.sDarkTheme.mSmallFont); - g.DrawString(scope String..AppendF("FPS: {0}", gApp.mLastFPS), 4, 0); + g.DrawString(scope String()..AppendF("FPS: {0}", gApp.mLastFPS), 4, 0); // - g.DrawString(scope String..AppendF("{0}", gApp.mUpdateCnt), 0, 0, .Right, mWidth - 8); + g.DrawString(scope String()..AppendF("{0}", gApp.mUpdateCnt), 0, 0, .Right, mWidth - 8); float curY = 64; if (!gApp.mListenSocket.IsConnected) { using (g.PushColor(0xFFFF4040)) - g.DrawString(scope String..AppendF("Failed to listen on port {0}", gApp.mListenPort), 0, 0, .Right, mWidth - 8); + g.DrawString(scope String()..AppendF("Failed to listen on port {0}", gApp.mListenPort), 0, 0, .Right, mWidth - 8); } else { - g.DrawString(scope String..AppendF("Clients: {0}", gApp.mClients.Count), curY, 0); + g.DrawString(scope String()..AppendF("Clients: {0}", gApp.mClients.Count), curY, 0); curY += 64; float kPerSec = gApp.mStatBytesPerSec / 1024.0f; if ((kPerSec > 0) && (kPerSec < 0.1f)) kPerSec = 0.1f; - g.DrawString(scope String..AppendF("BPS: {0:0.0}k", kPerSec), curY, 0); + g.DrawString(scope String()..AppendF("BPS: {0:0.0}k", kPerSec), curY, 0); curY += 80; } if (gApp.mBoard.mPerfView != null) { var client = gApp.mBoard.mPerfView.mSession; - g.DrawString(scope String..AppendF("Zones: {0}", (int32)client.mNumZones), curY, 0); + g.DrawString(scope String()..AppendF("Zones: {0}", (int32)client.mNumZones), curY, 0); curY += 118; var str = scope String(); diff --git a/BeefTools/BeefPerf/src/WorkspacePanel.bf b/BeefTools/BeefPerf/src/WorkspacePanel.bf index 73e5776d..cb6bb861 100644 --- a/BeefTools/BeefPerf/src/WorkspacePanel.bf +++ b/BeefTools/BeefPerf/src/WorkspacePanel.bf @@ -110,7 +110,7 @@ namespace BeefPerf BpClient.TimeToStr(timeUS, timeStr, false); g.DrawString(timeStr, 4, 40, .Left, width - 8, .Ellipsis); - g.DrawString(scope String..AppendF("BPS: {0}k", session.mDispBPS), 4, 40, .Right, width - 8); + g.DrawString(scope String()..AppendF("BPS: {0}k", session.mDispBPS), 4, 40, .Right, width - 8); } curY += boxHeight + 4; diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf index 36736eca..ee176daa 100644 --- a/IDE/src/IDEApp.bf +++ b/IDE/src/IDEApp.bf @@ -852,7 +852,7 @@ namespace IDE //folderDialog. if (folderDialog.ShowDialog(GetActiveWindow()).GetValueOrDefault() == .OK) { - var selectedPath = scope String..AppendF(folderDialog.SelectedPath); + var selectedPath = scope String()..AppendF(folderDialog.SelectedPath); selectedPath.Append(Path.DirectorySeparatorChar); selectedPath.Append("BeefSpace.toml"); String.NewOrSet!(mDeferredOpenFileName, selectedPath); @@ -2062,7 +2062,7 @@ namespace IDE if (relPath.EndsWith(endStr)) relPath.RemoveToEnd(relPath.Length - endStr.Length);*/ - var projectSpec = new Workspace.ProjectSpec; + var projectSpec = new Workspace.ProjectSpec(); projectSpec.mProjectName = new .(project.mProjectName); if (verSpec != null) { @@ -2430,7 +2430,7 @@ namespace IDE } } - var projSpec = new Workspace.ProjectSpec; + var projSpec = new Workspace.ProjectSpec(); projSpec.mProjectName = new String(project.mProjectName); projSpec.mVerSpec = new VerSpecRecord(); projSpec.mVerSpec.SetPath("."); @@ -2488,7 +2488,7 @@ namespace IDE { for (var projectName in data.Enumerate("Projects")) { - var projSpec = new Workspace.ProjectSpec; + var projSpec = new Workspace.ProjectSpec(); projSpec.mProjectName = new String(projectName); projSpec.mVerSpec = new VerSpecRecord(); mWorkspace.mProjectSpecs.Add(projSpec); @@ -9823,7 +9823,7 @@ namespace IDE { if (err != .NotFound) { - Fail(scope String..AppendF("Failed to rename {0} to {1}", dbgBuildDir, tempDirName)); + Fail(scope String()..AppendF("Failed to rename {0} to {1}", dbgBuildDir, tempDirName)); return false; } } diff --git a/IDE/src/ScriptManager.bf b/IDE/src/ScriptManager.bf index 51a64786..4f672b57 100644 --- a/IDE/src/ScriptManager.bf +++ b/IDE/src/ScriptManager.bf @@ -1401,7 +1401,7 @@ namespace IDE public void OpenWorkspace(String dirPath) { gApp.[Friend]mDeferredOpen = .Workspace; - var selectedPath = scope String..AppendF(dirPath); + var selectedPath = scope String()..AppendF(dirPath); selectedPath.Append(Path.DirectorySeparatorChar); selectedPath.Append("BeefSpace.toml"); IDEUtils.FixFilePath(selectedPath); diff --git a/IDE/src/ui/ProjectProperties.bf b/IDE/src/ui/ProjectProperties.bf index 64436583..90118612 100644 --- a/IDE/src/ui/ProjectProperties.bf +++ b/IDE/src/ui/ProjectProperties.bf @@ -411,7 +411,7 @@ namespace IDE.ui switch ((CategoryType)mPropPage.mCategoryType) { case .Project: - var generalOptions = scope Project.GeneralOptions; + var generalOptions = scope Project.GeneralOptions(); mProject.SetupDefault(generalOptions); targetDict[mCurPropertiesTargets[0]] = generalOptions; UpdateFromTarget(targetDict); @@ -420,7 +420,7 @@ namespace IDE.ui DistinctBuildOptions defaultTypeOptions = scope:: .(); for (var typeOption in mProject.mBeefGlobalOptions.mDistinctBuildOptions) targetDict[typeOption] = defaultTypeOptions; - var generalOptions = scope Project.BeefGlobalOptions; + var generalOptions = scope Project.BeefGlobalOptions(); mProject.SetupDefault(generalOptions); targetDict[mCurPropertiesTargets[0]] = generalOptions; UpdateFromTarget(targetDict); diff --git a/IDE/src/ui/WorkspaceProperties.bf b/IDE/src/ui/WorkspaceProperties.bf index 1f31af25..bd638c52 100644 --- a/IDE/src/ui/WorkspaceProperties.bf +++ b/IDE/src/ui/WorkspaceProperties.bf @@ -672,7 +672,7 @@ namespace IDE.ui DistinctBuildOptions defaultTypeOptions = scope:: .(); for (var typeOption in gApp.mWorkspace.mBeefGlobalOptions.mDistinctBuildOptions) targetDict[typeOption] = defaultTypeOptions; - var generalOptions = scope Workspace.BeefGlobalOptions; + var generalOptions = scope Workspace.BeefGlobalOptions(); targetDict[mCurPropertiesTargets[0]] = generalOptions; UpdateFromTarget(targetDict); case .Beef_Targeted: