Added More Packages and stuff

JBrosDevelopment · JBrosDevelopment · commit 7863ca3dd1b3 · 2024-05-11T18:09:56.000-05:00
diff --git a/EZCode/App.config b/EZCode/App.config
@@ -2,7 +2,7 @@
 <configuration>
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<probing privatePath="Debug/Libraries;Release/Libraries" />
+			<probing privatePath="Debug/net.8.0/Libraries/" />
 		</assemblyBinding>
 	</runtime>
 </configuration>
diff --git a/EZCode/EZHelp.cs b/EZCode/EZHelp.cs
@@ -185,6 +185,11 @@ public static object GetParameter(object obj, string type)
 
             return e.ObjectParse(obj, type);
         }
+        public static Exception SetError(Exception exception)
+        {
+            Error = exception.Message;
+            throw exception;
+        }
         public bool Evaluate(string expression)
         {
             try
@@ -617,7 +622,6 @@ public float MathFunc(object obj, object op)
                     }
                 }
                 string operation = string.Join("", op.ToString().ToLower().ToCharArray().Select((x, y) => { if (y == 0) return char.Parse(x.ToString().ToUpper()); else return x; }));
-
                 object[] parameters = [val1];
                 if (!obj2_is_null) parameters = [..parameters, val2];
 
@@ -636,5 +640,30 @@ public float Average(object obj)
             float all = numbers.Sum();
             return all / numbers.Length;
         }
+        public float Pi() => MathF.PI;
+        public float E() => MathF.E;
+        public float Clamp(object _val, object _min, object _max)
+        {
+            float val = FloatParse(_val);
+            float min = FloatParse(_min);
+            float max = FloatParse(_max);
+
+            if (val < min) return min;
+            else if (val > max) return max;
+            else return val;
+        }
+        public float Power(object _val, object _pow)
+        {
+            float val = FloatParse(_val);
+            float pow = FloatParse(_pow);
+            return MathF.Pow(val, pow);
+        }
+        public string Trim(object text) => StringParse(text).Trim();
+        public string ToLower(object text) => StringParse(text).ToLower();
+        public string ToUpper(object text) => StringParse(text).ToUpper();
+        public string Replace(object text, object older, object newwer) => StringParse(text).Replace(StringParse(older), StringParse(newwer));
+        public string Substring(object text, object index, object length) => StringParse(text).Substring(IntParse(index), IntParse(length));
+        public bool StartsWith(object text, object val) => StringParse(text).StartsWith(StringParse(val));
+        public bool EndsWith(object text, object val) => StringParse(text).EndsWith(StringParse(val));
     }
 }
diff --git a/EZCode/Interpreter.cs b/EZCode/Interpreter.cs
@@ -30,10 +30,10 @@ internal set
         private string? Input = null;
         public enum EZInputType { Console, InputMethod }
         public EZInputType InputType { get; set; } = EZInputType.Console;
-        public void SetInput(string input, EZInputType inputType = EZInputType.InputMethod) 
+        public void SetInput(string input, EZInputType inputType = EZInputType.InputMethod)
         {
             InputType = inputType;
-            Input = input; 
+            Input = input;
         }
         public string ConsoleInput()
         {
@@ -104,6 +104,8 @@ public Interpreter(Parser parser, Debug.Breakpoint[]? breakpoints = null)
         private DataType? Returning = null;
         private int StackNumber = 0;
         public Stack<string> StackTrace { get; private set; }
+        internal record Library(string name, string[] files);
+        internal List<Library> DllLibraries { get; set; } = [];
         public Exception[] Errors { get; private set; } = [];
         public Var[] Vars { get; set; } = [];
         public Method[] Methods { get; set; } = [];
@@ -114,7 +116,6 @@ public Interpreter(Parser parser, Debug.Breakpoint[]? breakpoints = null)
         public void Interperate() => Interperate(parser.LinesWithTokens);
         public void Interperate(LineWithTokens[] LineTokens)
         {
-            int endcode = 0;
             var temp_stack = new Stack<string>(StackTrace);
 
             Package.RemoveAllPackagesFromExecutionDirectory(AppDomain.CurrentDomain.BaseDirectory);
@@ -192,13 +193,19 @@ public void Interperate(LineWithTokens[] LineTokens)
 
                             if (projects.Any(x => !string.IsNullOrEmpty(x.LibraryDirectory)))
                             {
-                                string destination = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Libraries");
+                                string destination = AppDomain.CurrentDomain.BaseDirectory;
                                 foreach (var project in projects)
                                 {
                                     if (FirstToken.StringValue == "include")
-                                        Package.AddPackageToExecutionDirectory(project, destination);
-                                    else 
-                                        Package.RemovePackageFromExecutionDirectory(project, destination);
+                                    {
+                                        Package.AddPackageToExecutionDirectory(project, destination, out var files);
+                                        DllLibraries.Add(new Library(project.Name, files));
+                                    }
+                                    else
+                                    {
+                                        var library = DllLibraries.FirstOrDefault(x => x.name == project.Name);
+                                        Package.RemovePackageFromExecutionDirectory(library.files);
+                                    }
                                 }
                             }
 
@@ -1294,7 +1301,7 @@ public object Reflect(CSharpMethod method)
         }
         public static object? InvokeMethod(string methodPath, object[] parameters, EZHelp e)
         {
-            // Split the method path into type and method name
+            // Split the method files into type and method name
             string[] pathParts = methodPath.Split('.');
             if (pathParts.Length < 2)
             {
@@ -1303,10 +1310,10 @@ public object Reflect(CSharpMethod method)
 
             if (pathParts.Length >= 2 && pathParts[1].Equals("dll"))
             {
-                // If the method path contains an assembly name, load the assembly
+                // If the method files contains an assembly name, load the assembly
                 string assemblyPath = pathParts[0] + "." + pathParts[1];
-                string subdirectory = pathParts[0]; // Name of the subdirectory is first part of namespace
-                string fullAssemblyPath = Path.Combine(subdirectory, assemblyPath); // Combine subdirectory path with assembly name
+                string subdirectory = Package.LibraryDirName; // Name of the subdirectory is first part of namespace
+                string fullAssemblyPath = Path.Combine(subdirectory, assemblyPath); // Combine subdirectory files with assembly name
                 Assembly assembly = Assembly.LoadFrom(fullAssemblyPath);
 
                 // Get the type name
@@ -1361,7 +1368,7 @@ public object Reflect(CSharpMethod method)
                     throw new ArgumentException($"Type \"{typeName}\" not found");
                 }
 
-                // Get the method name from the path
+                // Get the method name from the files
                 string methodName = pathParts.Last();
 
                 // Find the method in the type
diff --git a/EZCode/Package.cs b/EZCode/Package.cs
@@ -5,11 +5,13 @@ namespace EZCodeLanguage
     public static class Package
     {
         public static string PackagesDirectory = "D:\\EZCodeLanguage\\Packages\\";
-        public static void AddPackageToExecutionDirectory(Project project, string executionDirectory)
+        public static string LibraryDirName = "Libraries";
+        public static void AddPackageToExecutionDirectory(Project project, string executionDirectory, out string[] files)
         {
+            files = [];
             string projectPath = GetPackageDirectory(project.Name);
             string libraryDirectory = Path.Combine(projectPath, project.LibraryDirectory ?? throw new Exception("Project.LibraryDirectory is null"));
-            string executionSubDirectoryName = project.LibraryDirectory.Split(['/', '\\']).First();
+            string executionSubDirectoryName = LibraryDirName;
             string executionSubDirectory = Path.Combine(executionDirectory, executionSubDirectoryName);
 
             Directory.CreateDirectory(executionSubDirectory);
@@ -20,29 +22,38 @@ public static void AddPackageToExecutionDirectory(Project project, string execut
                 string libraryFileName = Path.GetFileName(libraryFile);
                 string executionSubDirectoryFile = Path.Combine(executionSubDirectory, libraryFileName);
                 File.Copy(libraryFile, executionSubDirectoryFile);
+                files = [.. files, executionSubDirectoryFile];
             }
         }
-        public static void RemovePackageFromExecutionDirectory(Project project, string executionDirectory)
+        public static void RemovePackageFromExecutionDirectory(string[] projectFileNames)
         {
-            string libraryDirectory = project.LibraryDirectory ?? throw new Exception("Project.LibraryDirectory is null");
-            string executionSubDirectory = Path.Combine(executionDirectory, libraryDirectory);
-
-            Directory.Delete(executionSubDirectory, true);
+            foreach(string file in projectFileNames)
+            {
+                File.Delete(file);
+            }
         }
         public static void RemoveAllPackagesFromExecutionDirectory(string executionDirectory)
         {
-            string[] directories = Directory.GetDirectories(executionDirectory);
-            foreach (string directory in directories)
+            try
             {
-                try
-                {
-                    Directory.Delete(directory, true);
-                }
-                catch
+                string executionSubDirectory = Path.Combine(executionDirectory, LibraryDirName);
+                string[] files = Directory.GetFiles(executionSubDirectory);
+                foreach (string file in files)
                 {
+                    try
+                    {
+                        File.Delete(file);
+                    }
+                    catch
+                    {
 
+                    }
                 }
             }
+            catch
+            {
+
+            }
         }
         public static string GetPackageDirectory(string package_name)
         {
diff --git a/EZCode/Parser.cs b/EZCode/Parser.cs
@@ -436,7 +436,7 @@ public Parser(string code, string file)
         public LineWithTokens[] Parse() => LinesWithTokens = TokenArray(Code, FilePath).Where(x => x.Line.Value.ToString() != "").ToArray();
         private LineWithTokens[] TokenArray(string code, string file, bool insideClass = false)
         {
-            // Set the file path property
+            // Set the file files property
             FilePath = file;
             // Set the Code property to the parameter if it isn't null
             Code ??= code;
@@ -1093,7 +1093,7 @@ just trying to get string version of parts */
                         string part = parts[i].ToString();
                         // get where '(' starts
                         int ch = Array.IndexOf(part.ToCharArray(), '(');
-                        // gets the path from the part
+                        // gets the files from the part
                         string path = part[..ch];
                         // gets the type from inside the ""
                         string type = part.Substring(ch + 1, part.Length - ch - 2).Replace("\"", "");
@@ -1102,7 +1102,7 @@ just trying to get string version of parts */
                     }
                     else if (parts[i].ToString() == "runexec")
                     {
-                        // path of the CSharp Method
+                        // files of the CSharp Method
                         string path = parts[i + 1].ToString();
                         // parameters of the method
                         string[]? vars = null;
diff --git a/TestEnv/Code.ezcode b/TestEnv/Code.ezcode
@@ -1,8 +1,3 @@
-include winforms
+include main
 
-window main new : title:Hello World
-
-defaultsettings
-runapp : main
-
-main open
+print 'str startswith : Hello World, He'
diff --git a/TestEnv/Program.cs b/TestEnv/Program.cs
@@ -1,7 +1,7 @@
 ﻿using EZCodeLanguage;
 using System.Diagnostics;
 
-// set up path variables 
+// set up files variables 
 string path = "Code.ezcode";
 string full_path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, path);
 string code = File.ReadAllText(path);

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,13 @@ namespace EZCodeLanguage`
`5`	`5`	`public static class Package`
`6`	`6`	`{`
`7`	`7`	`public static string PackagesDirectory = "D:\\EZCodeLanguage\\Packages\\";`
`8`		`- public static void AddPackageToExecutionDirectory(Project project, string executionDirectory)`
	`8`	`+ public static string LibraryDirName = "Libraries";`
	`9`	`+ public static void AddPackageToExecutionDirectory(Project project, string executionDirectory, out string[] files)`
`9`	`10`	`{`
	`11`	`+ files = [];`
`10`	`12`	`string projectPath = GetPackageDirectory(project.Name);`
`11`	`13`	`string libraryDirectory = Path.Combine(projectPath, project.LibraryDirectory ?? throw new Exception("Project.LibraryDirectory is null"));`
`12`		`- string executionSubDirectoryName = project.LibraryDirectory.Split(['/', '\\']).First();`
	`14`	`+ string executionSubDirectoryName = LibraryDirName;`
`13`	`15`	`string executionSubDirectory = Path.Combine(executionDirectory, executionSubDirectoryName);`
`14`	`16`
`15`	`17`	`Directory.CreateDirectory(executionSubDirectory);`
`@@ -20,29 +22,38 @@ public static void AddPackageToExecutionDirectory(Project project, string execut`
`20`	`22`	`string libraryFileName = Path.GetFileName(libraryFile);`
`21`	`23`	`string executionSubDirectoryFile = Path.Combine(executionSubDirectory, libraryFileName);`
`22`	`24`	`File.Copy(libraryFile, executionSubDirectoryFile);`
	`25`	`+ files = [.. files, executionSubDirectoryFile];`
`23`	`26`	`}`
`24`	`27`	`}`
`25`		`- public static void RemovePackageFromExecutionDirectory(Project project, string executionDirectory)`
	`28`	`+ public static void RemovePackageFromExecutionDirectory(string[] projectFileNames)`
`26`	`29`	`{`
`27`		`- string libraryDirectory = project.LibraryDirectory ?? throw new Exception("Project.LibraryDirectory is null");`
`28`		`- string executionSubDirectory = Path.Combine(executionDirectory, libraryDirectory);`
`29`		`-`
`30`		`- Directory.Delete(executionSubDirectory, true);`
	`30`	`+ foreach(string file in projectFileNames)`
	`31`	`+ {`
	`32`	`+ File.Delete(file);`
	`33`	`+ }`
`31`	`34`	`}`
`32`	`35`	`public static void RemoveAllPackagesFromExecutionDirectory(string executionDirectory)`
`33`	`36`	`{`
`34`		`- string[] directories = Directory.GetDirectories(executionDirectory);`
`35`		`- foreach (string directory in directories)`
	`37`	`+ try`
`36`	`38`	`{`
`37`		`- try`
`38`		`- {`
`39`		`- Directory.Delete(directory, true);`
`40`		`- }`
`41`		`- catch`
	`39`	`+ string executionSubDirectory = Path.Combine(executionDirectory, LibraryDirName);`
	`40`	`+ string[] files = Directory.GetFiles(executionSubDirectory);`
	`41`	`+ foreach (string file in files)`
`42`	`42`	`{`
	`43`	`+ try`
	`44`	`+ {`
	`45`	`+ File.Delete(file);`
	`46`	`+ }`
	`47`	`+ catch`
	`48`	`+ {`
`43`	`49`
	`50`	`+ }`
`44`	`51`	`}`
`45`	`52`	`}`
	`53`	`+ catch`
	`54`	`+ {`
	`55`	`+`
	`56`	`+ }`
`46`	`57`	`}`
`47`	`58`	`public static string GetPackageDirectory(string package_name)`
`48`	`59`	`{`