Skip to content

Commit fc74d01

Browse files
JBrosDevelopmentJBrosDevelopment
committed
removed Containers
1 parent a70672c commit fc74d01

4 files changed

Lines changed: 35 additions & 116 deletions

File tree

‎EZCode/EZHelp.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ public string Format(object _text, object _char)
113113
}
114114
if (Interpreter.Vars.Any(x => x.Name == instance_name))
115115
{
116-
format = format.Remove(range.Start, range.Count).Insert(range.Start, Interpreter.GetValue(name, DataType.GetType("str", Interpreter.Classes, Interpreter.Containers)).ToString());
116+
format = format.Remove(range.Start, range.Count).Insert(range.Start, Interpreter.GetValue(name, DataType.GetType("str", Interpreter.Classes)).ToString());
117117
}
118118
else
119119
{
120120
Interpreter.parser.WatchIsFound([name], 0, out ExplicitWatch watch, out _);
121121

122-
object val = Interpreter.GetValue(watch != null ? watch.Runs : name, DataType.GetType("str", Interpreter.Classes, Interpreter.Containers));
122+
object val = Interpreter.GetValue(watch != null ? watch.Runs : name, DataType.GetType("str", Interpreter.Classes));
123123
format = format.Remove(range.Start, range.Count).Insert(range.Start, Interpreter.GetValue(val, new DataType(DataType.Types._string, null)).ToString());
124124
}
125125
}
@@ -157,7 +157,7 @@ public object ObjectParse(object obj, object type, bool to_string, string arrayS
157157
{
158158
string n = obj.ToString();
159159
o = obj;
160-
DataType data = DataType.GetType(type.ToString(), Interpreter.Classes, Interpreter.Containers);
160+
DataType data = DataType.GetType(type.ToString(), Interpreter.Classes);
161161
if (Interpreter.Vars.Any(x => x.Name == n)) Interpreter.Vars.FirstOrDefault(x => x.Name == n).DataType = data;
162162
obj = Interpreter.GetValue(n, data, arraySeperator);
163163
} while (obj != o);

‎EZCode/Interpreter.cs‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
using Newtonsoft.Json.Linq;
2-
using System.Reflection;
1+
using System.Reflection;
32
using static EZCodeLanguage.Parser;
4-
using static System.Net.Mime.MediaTypeNames;
53

64
namespace EZCodeLanguage
75
{
@@ -69,8 +67,8 @@ public Interpreter(string file, Parser parser)
6967
Var var = Classes[i].Properties[j];
7068
if (var.DataType.ObjectClass == null)
7169
{
72-
var.DataType = DataType.GetType(var.Line.Value.Split(" ")[0], Classes, Containers);
73-
if (var.DataType.ObjectClass == null && var.DataType.ObjectContainer == null)
70+
var.DataType = DataType.GetType(var.Line.Value.Split(" ")[0], Classes);
71+
if (var.DataType.ObjectClass == null)
7472
{
7573
var.DataType.ObjectClass = Classes[i];
7674
}
@@ -90,7 +88,7 @@ public Interpreter(string file, Parser parser)
9088
GetValueMethod get = Classes[i].GetTypes[j];
9189
if (get.DataType == null || get.DataType.ObjectClass == null)
9290
{
93-
get.DataType = DataType.GetType(get.Returns, Classes, Containers);
91+
get.DataType = DataType.GetType(get.Returns, Classes);
9492
}
9593
}
9694
}
@@ -106,7 +104,6 @@ public Interpreter(string file, Parser parser)
106104
public Var[] Vars { get; set; } = [];
107105
public Method[] Methods { get; set; } = [];
108106
public Class[] Classes { get => parser.Classes.ToArray(); }
109-
public Container[] Containers { get => parser.Containers.ToArray(); }
110107
public Line CurrentLine { get; private set; }
111108
private bool StartMethodEntry = false;
112109
public int Interperate() => Interperate(parser.LinesWithTokens);
@@ -277,7 +274,7 @@ public int Interperate(LineWithTokens[] LineTokens)
277274
else
278275
{
279276
v.Value = GetValue(new Token(TokenType.Identifier, line.Tokens.Skip(4).ToArray(), string.Join(" ", line.Tokens.Select(x => x.StringValue))));
280-
v.DataType = DataType.TypeFromValue(v.Value.ToString(), Classes, Containers);
277+
v.DataType = DataType.TypeFromValue(v.Value.ToString(), Classes);
281278
}
282279
}
283280
MethodRun(run.Runs, run.Parameters);
@@ -668,7 +665,7 @@ public int Interperate(LineWithTokens[] LineTokens)
668665
try
669666
{
670667
if (LastTryNotFailed == null) break;
671-
Var exception = new Var("error", LastTryNotFailed.Message, CurrentLine, stackNumber: StackNumber, type: DataType.GetType("str", Classes, Containers));
668+
Var exception = new Var("error", LastTryNotFailed.Message, CurrentLine, stackNumber: StackNumber, type: DataType.GetType("str", Classes));
672669
Vars = [.. Vars, exception];
673670
Statement? statement = FirstToken.Value as Statement;
674671
LastTryNotFailed = null;
@@ -760,7 +757,7 @@ public int Interperate(LineWithTokens[] LineTokens)
760757
LineWithTokens line = new LineWithTokens(argument.Tokens, argument.Line);
761758
object? result = null;
762759
string exc = "";
763-
try { result = SingleLine(line) ?? throw new Exception(); } catch (Exception e) { exc = EZHelp.Error; EZHelp.Error = null; result = GetValue(argument.Tokens, DataType.GetType("bool", Classes, Containers)); }
760+
try { result = SingleLine(line) ?? throw new Exception(); } catch (Exception e) { exc = EZHelp.Error; EZHelp.Error = null; result = GetValue(argument.Tokens, DataType.GetType("bool", Classes)); }
764761
if (result is Class c)
765762
result = Argument.EvaluateTerm(c.Properties.FirstOrDefault(x => x.Name.ToLower() == "value").Value.ToString());
766763
if (result == null)
@@ -830,7 +827,7 @@ private IdentType IsType(string token, out object? type)
830827
while (v != null);
831828
Vars = [.. Vars, .. parameters];
832829
object? result = null;
833-
var _returning = Returning != null ? new DataType(Returning.Type, Returning.ObjectClass, Returning.ObjectContainer) : null;
830+
var _returning = Returning != null ? new DataType(Returning.Type, Returning.ObjectClass) : null;
834831
var _returned = returned;
835832
Returning = method.Returns;
836833
returned = null;
@@ -1130,7 +1127,7 @@ void DoClass(Class c, int skip = 1)
11301127
string[] parts = run.Parameters[i].Value.ToString().Split(" ");
11311128
for (int j = 0; j < parts.Length; j++)
11321129
{
1133-
parts[j] = GetValue(parts[j], DataType.GetType("str", Classes, Containers), arraySeperator).ToString();
1130+
parts[j] = GetValue(parts[j], DataType.GetType("str", Classes), arraySeperator).ToString();
11341131
}
11351132
run.Parameters[i].Value = string.Join(" ", parts);
11361133
}

‎EZCode/Package.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static Parser GetPackageAsParser(string package_name)
2929

3030
// CACHE SYSTEM NOT WORKING PROPERLY
3131

32-
if (parser.Classes.Count == 0 && parser.Methods.Count == 0 && parser.Containers.Count == 0 && parser.LinesWithTokens.Length == 0)
32+
if (parser.Classes.Count == 0 && parser.Methods.Count == 0 && parser.LinesWithTokens.Length == 0)
3333
parser.Parse(string.Join("\n\n// End of File\n\n", project.Files.Select(x => File.ReadAllText(Path.Combine(pack_dir, x)))));
3434

3535
return parser;
@@ -54,7 +54,7 @@ public static string SaveCache(string file, Parser parser)
5454
Project project = JsonConvert.DeserializeObject<Project>(File.ReadAllText(fileInfo.FullName));
5555
Parser parse = OpenCache(project.Files.Select(x => Path.Combine(fileInfo.DirectoryName, x)).ToArray());
5656

57-
if (parse.Classes.Count == 0 && parse.Methods.Count == 0 && parse.Containers.Count == 0 && parse.LinesWithTokens.Length == 0)
57+
if (parse.Classes.Count == 0 && parse.Methods.Count == 0 && parse.LinesWithTokens.Length == 0)
5858
parse.Parse(string.Join("\n\n// End of File\n\n", project.Files.Select(x => File.ReadAllText(Path.Combine(fileInfo.DirectoryName, x)))));
5959

6060
parser = parse;
@@ -84,7 +84,7 @@ public static Parser OpenCache(string[] files)
8484
Project project = JsonConvert.DeserializeObject<Project>(File.ReadAllText(fileInfo.FullName));
8585
cache = OpenCache(project.Files.Select(x=> Path.Combine(fileInfo.DirectoryName, x)).ToArray());
8686

87-
if (cache.Classes.Count == 0 && cache.Methods.Count == 0 && cache.Containers.Count == 0 && cache.LinesWithTokens.Length == 0)
87+
if (cache.Classes.Count == 0 && cache.Methods.Count == 0 && cache.LinesWithTokens.Length == 0)
8888
cache.Parse(string.Join("\n\n// End of File\n\n", project.Files.Select(x => File.ReadAllText(Path.Combine(fileInfo.DirectoryName, x)))));
8989

9090
CombineParsers(parser, cache);
@@ -105,7 +105,6 @@ public static Parser CombineParsers(Parser parser, Parser p2)
105105
parser.LinesWithTokens = [.. parser.LinesWithTokens, .. p2.LinesWithTokens];
106106
parser.Classes = [.. parser.Classes, .. p2.Classes];
107107
parser.Methods = [.. parser.Methods, .. p2.Methods];
108-
parser.Containers = [.. parser.Containers, .. p2.Containers];
109108

110109
return parser;
111110
}

0 commit comments

Comments
 (0)