Comptime Improvements

BeefBoot/BootApp.cpp

@@ -812,7 +812,7 @@ bool BootApp::Compile()
 		mCELibProject = BfSystem_CreateProject(mSystem, "BeefLib", GetFileDir(mTargetPath).c_str());
 
 		BfProjectFlags flags = BfProjectFlags_None;
-		BfProject_SetOptions(mCELibProject, BfTargetType_BeefLib, "", mDefines.c_str(), mOptLevel, 0, 0, 0, flags);		
+		BfProject_SetOptions(mCELibProject, BfTargetType_BeefLib, "", mDefines.c_str(), mOptLevel, 0, 0, 0, flags);
 	}
 
 	if (!mDefines.IsEmpty())

BeefLibs/corlib/src/Console.bf

@@ -2,6 +2,7 @@ using System.Text;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Diagnostics;
 
 namespace System
 {
@@ -478,5 +479,47 @@ namespace System
 			Write("\x1B[H\x1B[J");
 #endif
 		}
+
+		[CLink]
+		private static extern int32 system(char8* cmd);
+
+		public static Result<void, int> RunCommand(StringView command)
+		{
+			if (!Compiler.IsComptime)
+			{
+				int exitcode = system(command.ToScopeCStr!());
+				return exitcode == 0 ? .Ok : .Err(exitcode);
+			}
+
+			ProcessStartInfo startInfo = scope .();
+			startInfo.SetFileNameAndArguments(command);
+			startInfo.UseShellExecute = false;
+			startInfo.RedirectStandardOutput = true;
+			startInfo.RedirectStandardError = true;
+			startInfo.CreateNoWindow = true;
+
+			SpawnedProcess proc = scope .();
+			if (proc.Start(startInfo) case .Err)
+			    return .Err(0);
+
+			FileStream output = scope .();
+			FileStream error = scope .();
+			StreamReader outputReader = scope .(output);
+			StreamReader errorReader = scope .(output);
+			proc.AttachStandardOutput(output);
+			proc.AttachStandardError(error);
+
+			String buffer = scope .(1024);
+			while (!proc.HasExited)
+			{
+				outputReader.ReadToEnd(buffer).IgnoreError();
+				errorReader.ReadToEnd(buffer).IgnoreError();
+				if (!buffer.IsEmpty)
+					OutString(buffer);
+			}
+
+			int exitcode = proc.ExitCode;
+			return exitcode == 0 ? .Ok : .Err(exitcode);
+		}
 	}
 }

IDE/BeefProj.toml

@@ -1,11 +1,16 @@
 FileVersion = 1
-Dependencies = {Beefy2D = "*", corlib = "*", curl = "*"}
 
 [Project]
 Name = "IDE"
 TargetType = "BeefGUIApplication"
 StartupObject = "IDE.Program"
 
+[Dependencies]
+Beefy2D = "*"
+corlib = "*"
+curl = "*"
+IDEHelper = "*"
+
 [Platform.Windows]
 IconFile = "$(ProjectDir)/Resources/Beef.ico"
 ManifestFile = "$(ProjectDir)/Resources/IDE.manifest"

IDEHelper/BeefProj.toml

@@ -1,10 +1,14 @@
 FileVersion = 1
-Dependencies = {corlib = "*", Debugger64 = "*", BeefySysLib = "*"}
 
 [Project]
 Name = "IDEHelper"
 TargetType = "CustomBuild"
 
+[Dependencies]
+corlib = "*"
+Debugger64 = "*"
+BeefySysLib = "*"
+
 [Configs.Debug.Win32]
 TargetDirectory = "$(WorkspaceDir)/../IDE/dist"
 TargetName = "IDEHelper32_d.dll"

IDEHelper/Compiler/BfCompiler.cpp

@@ -447,6 +447,10 @@ BfCompiler::BfCompiler(BfSystem* bfSystem, bool isResolveOnly)
 	mIOnTypeDoneTypeDef = NULL;
 	mIOnFieldInitTypeDef = NULL;
 	mIOnMethodInitTypeDef = NULL;
+	mCompilerOptionsPlatformTypeTypeDef = NULL;
+	mCompilerOptionsMachineTypeTypeDef = NULL;
+	mCompilerOptionsToolsetTypeTypeDef = NULL;
+	mCompilerOptionsOptLevelTypeDef = NULL;
 	mLinkNameAttributeTypeDef = NULL;
 	mCallingConventionAttributeTypeDef = NULL;
 	mMethodRefTypeDef = NULL;
@@ -7333,6 +7337,11 @@ bool BfCompiler::DoCompile(const StringImpl& outputDirectory)
 	mIOnFieldInitTypeDef = _GetRequiredType("System.IOnFieldInit");
 	mIOnMethodInitTypeDef = _GetRequiredType("System.IOnMethodInit");
 
+	mCompilerOptionsPlatformTypeTypeDef = _GetRequiredType("System.Compiler.Options.PlatformType");
+	mCompilerOptionsMachineTypeTypeDef = _GetRequiredType("System.Compiler.Options.MachineType");
+	mCompilerOptionsToolsetTypeTypeDef = _GetRequiredType("System.Compiler.Options.ToolsetType");
+	mCompilerOptionsOptLevelTypeDef = _GetRequiredType("System.Compiler.Options.OptLevel");
+
 	mLinkNameAttributeTypeDef = _GetRequiredType("System.LinkNameAttribute");
 	mCallingConventionAttributeTypeDef = _GetRequiredType("System.CallingConventionAttribute");
 	mMethodRefTypeDef = _GetRequiredType("System.MethodReference", 1);

IDEHelper/Compiler/BfCompiler.h

@@ -405,6 +405,11 @@ class BfCompiler
 	BfTypeDef* mIOnFieldInitTypeDef;
 	BfTypeDef* mIOnMethodInitTypeDef;
 
+	BfTypeDef* mCompilerOptionsPlatformTypeTypeDef;
+	BfTypeDef* mCompilerOptionsMachineTypeTypeDef;
+	BfTypeDef* mCompilerOptionsToolsetTypeTypeDef;
+	BfTypeDef* mCompilerOptionsOptLevelTypeDef;
+
 	BfTypeDef* mMethodRefTypeDef;
 	BfTypeDef* mNullableTypeDef;
 

IDEHelper/Compiler/BfModule.cpp

@@ -15703,7 +15703,7 @@ void BfModule::HadSlotCountDependency()
 BfTypedValue BfModule::GetCompilerFieldValue(const StringImpl& str)
 {
 	BfProject* project = mProject;
-	if ((project == NULL) && (mCurMethodState != NULL) && (mCurMethodState->mMethodInstance != NULL))	
+	if ((project == NULL) && (mCurMethodState != NULL) && (mCurMethodState->mMethodInstance != NULL))
 		project = mCurMethodState->mMethodInstance->mMethodDef->mDeclaringType->mProject;
 
 	if (str == "#IsComptime")
@@ -15750,23 +15750,23 @@ BfTypedValue BfModule::GetCompilerFieldValue(const StringImpl& str)
 	}
 	if (str == "#Platform")
 	{
-		return BfTypedValue(mBfIRBuilder->CreateConst(BfTypeCode_Int32, mCompiler->mOptions.mPlatformType), GetPrimitiveType(BfTypeCode_Int32));
+		return BfTypedValue(mBfIRBuilder->CreateConst(BfTypeCode_Int32, mCompiler->mOptions.mPlatformType), ResolveTypeDef(mCompiler->mCompilerOptionsPlatformTypeTypeDef));
 	}
 	if (str == "#Architecture")
 	{
-		return BfTypedValue(mBfIRBuilder->CreateConst(BfTypeCode_Int32, mCompiler->mOptions.mMachineType), GetPrimitiveType(BfTypeCode_Int32));
+		return BfTypedValue(mBfIRBuilder->CreateConst(BfTypeCode_Int32, mCompiler->mOptions.mMachineType), ResolveTypeDef(mCompiler->mCompilerOptionsMachineTypeTypeDef));
 	}
 	if (str == "#Toolset")
 	{
-		return BfTypedValue(mBfIRBuilder->CreateConst(BfTypeCode_Int32, mCompiler->mOptions.mToolsetType), GetPrimitiveType(BfTypeCode_Int32));
+		return BfTypedValue(mBfIRBuilder->CreateConst(BfTypeCode_Int32, mCompiler->mOptions.mToolsetType), ResolveTypeDef(mCompiler->mCompilerOptionsToolsetTypeTypeDef));
 	}
 	if (str == "#TargetTriple")
 	{
 		return BfTypedValue(GetStringObjectValue(mCompiler->mOptions.mTargetTriple), ResolveTypeDef(mCompiler->mStringTypeDef));
 	}
 	if (str == "#OptimizationLevel")
 	{
-		return BfTypedValue(mBfIRBuilder->CreateConst(BfTypeCode_Int32, project->mCodeGenOptions.mOptLevel), GetPrimitiveType(BfTypeCode_Int32));
+		return BfTypedValue(mBfIRBuilder->CreateConst(BfTypeCode_Int32, project->mCodeGenOptions.mOptLevel), ResolveTypeDef(mCompiler->mCompilerOptionsOptLevelTypeDef));
 	}
 
 	if ((mCurMethodState != NULL) && (mCurMethodState->mMixinState != NULL))

IDEHelper/Compiler/CeMachine.cpp

@@ -2085,6 +2085,7 @@ void CeBuilder::Build()
 	auto beModule = irCodeGen->mBeModule;	
 
 	mCeFunction->mFailed = true;
+	mIntPtrType = irCodeGen->mBeContext->GetPrimitiveType((mPtrSize == 4) ? BeTypeCode_Int32 : BeTypeCode_Int64);
 
 	auto methodInstance = mCeFunction->mMethodInstance;	
 
@@ -2130,8 +2131,6 @@ void CeBuilder::Build()
 			return;
 		}
 
-		mIntPtrType = irCodeGen->mBeContext->GetPrimitiveType((mPtrSize == 4) ? BeTypeCode_Int32 : BeTypeCode_Int64);
-
 		for (int funcIdx = startFunctionCount; funcIdx < (int)beModule->mFunctions.size(); funcIdx++)
 		{
 			auto beFunction = beModule->mFunctions[funcIdx];
@@ -10528,7 +10527,7 @@ void CeMachine::CheckFunctionKind(CeFunction* ceFunction)
 					ceFunction->mFunctionKind = CeFunctionKind_BfpFindFileData_Release;
 
 				else if (methodDef->mName == "BfpSystem_GetTimeStamp")
-						ceFunction->mFunctionKind = CeFunctionKind_BfpSystem_GetTimeStamp;
+					ceFunction->mFunctionKind = CeFunctionKind_BfpSystem_GetTimeStamp;
 				else if (methodDef->mName == "BfpSystem_GetEnvironmentVariable")
 					ceFunction->mFunctionKind = CeFunctionKind_BfpSystem_GetEnvironmentVariable;
 				else if (methodDef->mName == "BfpSystem_SetEnvironmentVariable")

IDEHelper/Compiler/CeMachine.h

@@ -1361,4 +1361,4 @@ namespace std
 			return BeefHash<Beefy::BfMethodRef>()(key.mMethodRef) ^ BeefHash<Beefy::String>()(key.mNameMod);
 		}
 	};
-}
+}