Skip to content

Revert "📝 CodeRabbit Chat: Update Parser.cs in Computer.V2.Lib directory" #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktshikotshi merged 1 commit into from
May 30, 2025
Merged

Revert "📝 CodeRabbit Chat: Update Parser.cs in Computer.V2.Lib directory" #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 22 additions & 36 deletions src/Computer.V2.Lib/Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,56 +44,42 @@ public static string Substitute(string expr, List<List<string>> funcs, List<List
return (expr);
}

private static (string Variable, string Value) MatchFunction(string expr, List<List<string>> funcs, List<List<string>> vars)
{
// Matches a single-argument function call, substitutes either variable or numeric args,
// computes the resulting expression, and returns at first successful match.
var rgx = new Regex(@"([a-zA-Z]+)\((([a-zA-Z]+)|((\-)?\d+([\.]\d+)?))\)");
var matches = rgx.Matches(expr);
var rgx = new Regex(@"([a-zA-Z]+\((([a-zA-Z]+)|((\-)?\d+([\.]\d+)?))\))");
var match = rgx.Matches(expr);
var fVar = "";

foreach (Match match in matches)
for (var i = 0; i < match.Count; i++)
{
if (!match.Success) continue;
var tmp = match.Value;
var parts = Regex.Split(tmp, @"\(|\)");
var name = parts[0];
var arg = parts[1];

if (!match[i].Success) continue;
var tmp = match[i].Value;
var func = Regex.Split(tmp, @"\(|\)");
foreach (var f in funcs)
{
if (f[0] != name) continue;
fVar = arg;
var body = f[2];
string rplc;

// Variable argument
if (Regex.IsMatch(arg, @"^[a-zA-Z]+$"))
if (f[0] != func[0]) continue;
fVar = func[1];
var rplc = f[2];
if (Regex.IsMatch(func[1], @"^[a-zA-Z]+$"))
{
var varEntry = vars.FirstOrDefault(v => v[0] == arg);
if (varEntry != null)
foreach (var v in vars)
{
rplc = body.Replace(f[1], $"1*{varEntry[1]}");
}
else
{
// Fallback: treat undefined variable as numeric literal
rplc = body.Replace(f[1], $"1*{arg}");
if (v[0] != func[1]) continue;
rplc = rplc.Replace(f[1], $"1*{v[1]}");
rplc = $"1*{Maths.Calculate(rplc)}";
expr = expr.Replace(tmp, rplc);
break;
}
expr = expr.Replace(tmp, f[2]);
}
else
{
// Numeric argument
rplc = body.Replace(f[1], $"1*{arg}");
rplc = rplc.Replace(f[1], $"1*{func[1]}");
rplc = $"1*{Maths.Calculate(rplc)}";
expr = expr.Replace(tmp, rplc);
}

// Evaluate and substitute
rplc = $"1*{Maths.Calculate(rplc)}";
expr = expr.Replace(tmp, rplc);
return (fVar, expr);
}
}

return (fVar, expr);
return (fVar, expr);
}

//find the value of the variable
Expand Down
Loading