Skip to content

Fix misinterpretation of function arguments with parameters (#45) #96

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

Open
dyrpsf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix misinterpretation of function arguments with parameters (#45) #96

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8883bdf
Fix misinterpretation of function arguments with parameters (#45)
dyrpsf Jan 4, 2026
ccc9f0a
Refactor function argument handling to avoid duplication
dyrpsf Jan 5, 2026
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
57 changes: 49 additions & 8 deletions src/main/java/org/simulator/sbml/astnode/ASTNodeInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,34 @@ public boolean compileBoolean(CallableSBase nsb, double time) {
*/
public double functionDouble(ASTNodeValue rightChild, List<String> variables,
ASTNodeValue[] children, int nArguments, double[] values, double time, double delay) {
for (int i = 0; i < nArguments; i++) {
values[i] = children[i].compileDouble(time, delay);

// Save current function-argument environment (for nested function calls)
Map<String, Double> oldFuncArgs = funcArgs;
Map<String, Double> newFuncArgs = new HashMap<>(oldFuncArgs);

// Number of arguments we can actually map (safety for mismatches)
int n = Math.min(nArguments, Math.min(children.length, variables.size()));

// 1) Evaluate all argument expressions in the *caller* context
for (int i = 0; i < n; i++) {
double argVal = children[i].compileDouble(time, delay);
values[i] = argVal;

String varName = variables.get(i);
if (varName != null) {
// 2) Bind each function variable (bvar) to its argument value
newFuncArgs.put(varName, argVal);
}
}

// 3) Use the extended environment while evaluating the function body
funcArgs = newFuncArgs;
try {
return rightChild.compileDouble(time, delay);
} finally {
// 4) Restore the previous environment (important for nested calls)
funcArgs = oldFuncArgs;
}
double value = rightChild.compileDouble(time, delay);
return value;
}

/**
Expand Down Expand Up @@ -562,11 +585,29 @@ public boolean functionBoolean(String name, List<ASTNodeValue> children) {
*/
public boolean functionBoolean(ASTNodeValue rightChild, List<String> variables,
ASTNodeValue[] children, double[] values, double time) {
for (int i = 0; i < children.length; i++) {
values[i] = children[i].compileDouble(time, 0d);

Map<String, Double> oldFuncArgs = funcArgs;
Map<String, Double> newFuncArgs = new HashMap<>(oldFuncArgs);

int n = Math.min(children.length, variables.size());

// Evaluate arguments in caller context and bind to function variables
for (int i = 0; i < n; i++) {
double argVal = children[i].compileDouble(time, 0d);
values[i] = argVal;

String varName = variables.get(i);
if (varName != null) {
newFuncArgs.put(varName, argVal);
}
}

funcArgs = newFuncArgs;
try {
return rightChild.compileBoolean(time);
} finally {
funcArgs = oldFuncArgs;
}
boolean value = rightChild.compileBoolean(time);
return value;
}

/**
Expand Down