Skip to content

[Backport] SF_CheckInputCode: Preprocess code #2428

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
t-b merged 1 commit into from
May 15, 2025
Merged

[Backport] SF_CheckInputCode: Preprocess code #2428

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions Packages/MIES/MIES_SweepFormula.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2899,16 +2899,18 @@ End
static Function SF_CheckInputCode(string code, string graph)

variable i, numGraphs, jsonIDy, jsonIDx, subFormulaCnt
string jsonPath, xFormula, yFormula, formulasRemain, subPath, yAndXFormula
string jsonPath, xFormula, yFormula, formulasRemain, subPath, yAndXFormula, codeWithoutVariables, preProcCode

NVAR jsonID = $GetSweepFormulaJSONid(SF_GetBrowserDF(graph))
JSON_Release(jsonID, ignoreErr = 1)
jsonID = JSON_New()
JSON_AddObjects(jsonID, "")

code = SF_CheckVariableAssignments(code, jsonID)
preProcCode = SF_PreprocessInput(code)

WAVE/T graphCode = SF_SplitCodeToGraphs(SF_PreprocessInput(code))
codeWithoutVariables = SF_CheckVariableAssignments(preProcCode, jsonID)

WAVE/T graphCode = SF_SplitCodeToGraphs(codeWithoutVariables)

numGraphs = DimSize(graphCode, ROWS)
for(i = 0; i < numGraphs; i += 1)
Expand Down
7 changes: 7 additions & 0 deletions Packages/tests/Basic/UTF_SweepFormula.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,13 @@ static Function TestInputCodeCheck()
JSON_Release(jsonId)
CHECK_EQUAL_STR(jsonRef, jsonTxt)

formula = "# comment\r var = 1\r\r $var"
jsonRef = "{\n\"graph_0\": {\n\"pair_0\": {\n\"formula_y\": \"$var\"\n}\n},\n\"variable:var\": 1\n}"
MIES_SF#SF_CheckInputCode(formula, win)
jsonTxt = JSON_Dump(jsonId)
JSON_Release(jsonId)
CHECK_EQUAL_STR(jsonRef, jsonTxt)

formula = "[*]"
try
MIES_SF#SF_CheckInputCode(formula, win)
Expand Down