Stone_Red/YesNt-Interpreter
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/YesNt-Interpreter.git synced 2026-09-04 00:56:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix another calculation bug

Browse Source
This commit is contained in:
Stone_Red
2022-01-11 22:50:45 +01:00
parent 2522868379
commit 719db0f74b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YesNt.Interpreter/Statements/ProcessingStatements.cs
+2 -2
View File
@@ -15,7 +15,7 @@ namespace YesNt.Interpreter.Statements
[Statement("!calc", SearchMode.EndOfLine, SpaceAround.Start, ConsoleColor.DarkYellow, Priority = Priority.High, ExecuteInSearchMode = true)] [Statement("!calc", SearchMode.EndOfLine, SpaceAround.Start, ConsoleColor.DarkYellow, Priority = Priority.High, ExecuteInSearchMode = true)]
public void Calculate(string args) public void Calculate(string args)
{ {
MatchCollection matches = Regex.Matches(args, @"((\)?)+(\(?)+[0-9]+(((\s?)+(\)?)(\s?)+\+(\s?)+(\(?)+(\s?)+|(\s?)+(\)?)(\s?)+\-(\s?)+(\(?)+(\s?)+|(\s?)+(\)?)(\s?)+\*(\s?)+(\(?)+(\s?)+|(\s?)+(\)?)(\s?)+\/(\s?)+(\(?)+(\s?)+)|[,.])(?=[0-9])+)+[0-9]+(\)?)+"); MatchCollection matches = Regex.Matches(args.FromSaveString(), @"((\)?)+(\(?)+[0-9]+(((\s?)+(\)?)(\s?)+\+(\s?)+(\(?)+(\s?)+|(\s?)+(\)?)(\s?)+\-(\s?)+(\(?)+(\s?)+|(\s?)+(\)?)(\s?)+\*(\s?)+(\(?)+(\s?)+|(\s?)+(\)?)(\s?)+\/(\s?)+(\(?)+(\s?)+)|[,.])(?=[0-9])+)+[0-9]+(\)?)+");
for (int i = 0; i < matches.Count; i++) for (int i = 0; i < matches.Count; i++)
{ {
@@ -25,7 +25,7 @@ namespace YesNt.Interpreter.Statements
RuntimeInfo.Exit("Invalid operation", true); RuntimeInfo.Exit("Invalid operation", true);
return; return;
} }
args = args.Replace(matches[0].Value, res); args = args.FromSaveString().Replace(matches[0].Value, res);
} }
RuntimeInfo.CurrentLine = args; RuntimeInfo.CurrentLine = args;
YesNt.Interpreter/Utilities/Evaluator.cs
+2 -2
View File
@@ -74,8 +74,6 @@ namespace YesNt.Interpreter.Utilities
return part1 < part2; return part1 < part2;
} }
return null; return null;
} }
@@ -86,6 +84,8 @@ namespace YesNt.Interpreter.Utilities
return null; return null;
} }
input = input.FromSaveString();
MatchCollection matches = Regex.Matches(input, @"\(([^()]+)\)"); MatchCollection matches = Regex.Matches(input, @"\(([^()]+)\)");
while (matches.Count > 0) while (matches.Count > 0)
{ {