aleleba/gridcraft
1
0
Fork 0
mirror of https://github.com/storytold/gridcraft.git synced 2026-11-03 00:41:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Engine: the run's check of each step finds the inputs on their sheet after a sheet moved

Browse Source 
- The check for writes over data compared the inputs' sheet with the sheet's index when the run
  started, while the inputs follow their cells: after a step inserted a sheet in front, a step
  writing into its own input on the moved sheet was stopped as writing over data. It now uses the
  sheet's index now. Test: the input case in
  `inputs_and_the_output_follow_their_cells_when_a_step_moves_them`.
- Docs: the page says `macro.run` checks the macro, its inputs and parameters and the policy
  before it runs, and that a formula whose references a move rewrites counts as changed too.
This commit is contained in:
prxnvt
2026-10-25 03:19:59 -04:00
parent 2cf5b808b3
commit 198fe482a1
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/macros/run.rs
+2 -1
View File
@@ -508,7 +508,8 @@ impl Guard {
if Arc::ptr_eq(ps, sa) {
continue;
}
let in_input = |c: CellRef| inputs.iter().any(|(_, p, _)| p.sheet == si && p.range.contains(c));
// The inputs have followed their cells, so they are on the sheet's index now.
let in_input = |c: CellRef| inputs.iter().any(|(_, p, _)| p.sheet == ai && p.range.contains(c));
let mut hit: Vec<CellRef> = ps
.cells
.diff(&sa.cells)
crates/engine/src/tests/macros.rs
+12 -1
View File
@@ -191,10 +191,21 @@ fn inputs_and_the_output_follow_their_cells_when_a_step_moves_them() {
{"command": "home.insertSheet", "params": {"name": "Summary", "before": 0}},
{"command": "cell.set", "params": {"cell": "Input", "input": "x"}}
]);
put(&mut s, json!({"name": "Front", "inputs": [{"name": "Input", "kind": "cell"}], "output": {"onConflict": "overwrite"}, "steps": steps}));
put(
&mut s,
json!({"name": "Front", "inputs": [{"name": "Input", "kind": "cell"}], "output": {"onConflict": "overwrite"}, "steps": steps.clone()}),
);
s.execute("macro.run", json!({"name": "Front", "inputs": "Sheet1!B2"})).unwrap();
assert_eq!((on(&s, "Sheet1", "B2"), on(&s, "Summary", "B2")), ("x".into(), "".into()));
// Data in the input: the step writes into its own input, which isn't data written over, on
// the input's sheet wherever it moved.
let mut s = super::s();
set(&mut s, "B2", "held");
put(&mut s, json!({"name": "Front", "inputs": [{"name": "Input", "kind": "cell"}], "output": {"onConflict": "fail"}, "steps": steps}));
s.execute("macro.run", json!({"name": "Front", "inputs": "Sheet1!B2"})).unwrap();
assert_eq!(on(&s, "Sheet1", "B2"), "x");
// Rows inserted above: the input and the output move down with their cells.
let mut s = super::s();
set(&mut s, "B5", "in");