Bladeren bron

Mintest changes

Brian Fiete 4 jaren geleden
bovenliggende
commit
03c28503c6

+ 23 - 14
IDE/mintest/BeefProj.toml

@@ -11,8 +11,9 @@ Description = "Mintest"
 
 [Configs.Debug.Win64]
 CLibType = "Static"
+BeefLibType = "DynamicDebug"
 StackSize = 4194304
-DebugCommandArguments = "hey=\"yo man\" zag= zoogles boof   stoopers   \"\"\"abc efg\"\"\""
+DebugCommandArguments = "abc"
 DebugWorkingDirectory = ".\\"
 
 [Configs.Debug.Win32]
@@ -31,6 +32,9 @@ BuildKind = "StaticLib"
 BuildKind = "StaticLib"
 RelocType = "PIC"
 
+[Configs.Debug.wasm32]
+PostBuildCmds = ["copy $(BuildDir)\\*.js $(ProjectDir)", "copy $(BuildDir)\\*.wasm $(ProjectDir)", "copy $(BuildDir)\\*.html $(ProjectDir)"]
+
 [Configs.Release.Win64]
 OtherLinkFlags = "$(LinkFlags) C:\\Beef\\BeefTools\\TestDLL\\x64\\Debug\\TestDLL.lib"
 DebugCommandArguments = "hey=\"yo man\" zag= zoogles boof   stoopers   \"abc efg\""
@@ -87,19 +91,24 @@ BuildKind = "StaticLib"
 BuildKind = "StaticLib"
 RelocType = "PIC"
 
-[[ProjectFolder.Items]]
-Type = "Folder"
-Name = "snorg"
+[Configs.NewDebug.Win64]
+CLibType = "Static"
+BeefLibType = "Static"
+DebugCommandArguments = "abc"
+DebugWorkingDirectory = ".\\"
+
+[Configs.NewDebug.Win32]
+CLibType = "DynamicDebug"
+BeefLibType = "Static"
 
-[[ProjectFolder.Items]]
-Type = "Source"
-Path = "../../../temp/test.txt"
+[Configs.NewDebug.WinFart]
+OtherLinkFlags = ""
+CLibType = "Static"
+BeefLibType = "Static"
 
-[[ProjectFolder.Items]]
-Type = "Folder"
-Path = "../../../temp/borf"
-AutoInclude = true
+[Configs.NewDebug.iOS]
+BeefLibType = "Static"
 
-[[ProjectFolder.Items]]
-Type = "Source"
-Path = "../../../temp/test.bf"
+[Configs.NewDebug.aarch64-none-linux-android21]
+BeefLibType = "Static"
+RelocType = "PIC"

+ 16 - 0
IDE/mintest/BeefSpace.toml

@@ -7,6 +7,7 @@ StartupProject = "mintest"
 PreprocessorMacros = ["z5"]
 
 [Configs.Debug.Win32]
+BfOptimizationLevel = "OgPlus"
 InitLocalVariables = true
 IntermediateType = "ObjectAndIRCode"
 ConfigSelections = {mintest2 = {Enabled = false}}
@@ -21,6 +22,10 @@ COptimizationLevel = "Og"
 [[Configs.Debug.Win64.DistinctOptions]]
 Filter = "System.String"
 
+[[Configs.Debug.Win64.DistinctOptions]]
+Filter = "uint8"
+AllocStackTraceDepth = 1
+
 [Configs.Debug.WinFart]
 EmitDebugInfo = "No"
 EmitDynamicCastCheck = false
@@ -31,6 +36,17 @@ AllocStackTraceDepth = 0
 [Configs.Debug.iOS]
 IntermediateType = "Bitcode"
 
+[Configs.Debug.wasm32]
+AllocType = "CRT"
+EmitDynamicCastCheck = false
+EnableObjectDebugFlags = false
+EmitObjectAccessCheck = false
+IntermediateType = "ObjectAndIRCode"
+ConfigSelections = {mintest2 = {Enabled = false}}
+
+[Configs.Debug.armv7-none-linux-android21]
+IntermediateType = "ObjectAndIRCode"
+
 [Configs.Release.Win32]
 Toolset = "GNU"
 BfOptimizationLevel = "OgPlus"

+ 1 - 2
IDE/mintest/mintest2/BeefProj.toml

@@ -3,8 +3,7 @@ Dependencies = {minlib = "*"}
 
 [Project]
 Name = "mintest2"
-TargetType = "BeefLib"
-StartupObject = "Mintest2"
+StartupObject = "Mintest2.Program"
 DefaultNamespace = ""
 
 [Configs.Debug.Win32]

+ 11 - 0
IDE/mintest/mintest2/src/main4.bf

@@ -1,2 +1,13 @@
 using System;
 using System.Diagnostics;
+
+namespace Mintest2
+{
+	class Program
+	{
+		public static void Main()
+		{
+			
+		}
+	}
+}

+ 1 - 3
IDE/mintest/src/main.bf

@@ -239,8 +239,6 @@ namespace Hey.Dude.Bro
 
 		public static int Main(String[] args)
 		{
-			//Test2(1, 2, 3, 4);
-			
 			Blurg.Hey();
 			return 1;
 		}
@@ -336,4 +334,4 @@ static
 	{
 
 	}
-}*/
+}*/

+ 31 - 1
IDE/mintest/src/main2.bf

@@ -1,2 +1,32 @@
-using System;
 
+
+class Zaggle<T>
+{
+	public int Capacity
+	{
+		get
+		{
+			return 0;
+		}
+
+		set
+		{
+
+		}
+	}
+
+	public void MethodA()
+	{
+
+	}
+
+	public void MethodB()
+	{
+
+	}
+
+	public void MethodC()
+	{
+
+	}
+}

+ 8 - 41
IDE/mintest/src/main3.bf

@@ -1,59 +1,26 @@
 #pragma warning disable 168
+//#pragma warning disable 168
 
 using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Collections;
 
-namespace SDL
+struct Blurg
 {
-	struct SDL_Cursor
+	public static int MethodB<T>(T foo) where T : struct
 	{
-		int mA;
+	    return 2;
 	}
-}
 
-struct ImGui
-{
-	public enum MouseCursor
+	public static int MethodB<K, V>((K key, V value) foo) where K : var where V : var
 	{
-		A,
-		B,
-		C,
-		D,
-		COUNT
+	    return 3;
 	}
-}
-
-struct Blurg
-{
-	//private static SDL.SDL_Cursor*[(.)ImGui.MouseCursor.COUNT] g_MouseCursors = .(null,);
-
-	private static SDL.SDL_Cursor*[(.)ImGui.MouseCursor.COUNT] g_MouseCursors = .(null,);
 
 	public static void Hey()
 	{
-		let cur = new SDL.SDL_Cursor();
-
-		g_MouseCursors[0] = cur;
-		g_MouseCursors[1] = cur;
-		g_MouseCursors[2] = cur;
+		Debug.Assert(MethodB(11) == 2);
+		Debug.Assert(MethodB(("A", "B")) == 3);
 	}
-
 }
-
-
-class TestClass
-{
-	public void GetIt(ref TestClass tc)
-	{
-
-	}
-
-	public this()
-	{
-		/*let a = &this;
-
-		GetIt(ref this);*/
-	}
-}