From 39d01b75ac679410821ce5e16c09ec6b7799f791 Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Wed, 27 May 2026 20:47:35 -0500 Subject: refactor: thread card-state struct through the item-data round-trip Second step of #147. get-item-data now returns an org-drill-card-state and store-item-data takes one, so the six recall fields move as named slots instead of a positional list. The three call sites (smart-reschedule, hypothetical-next-review-date, copy-scheduling-to-marker) read scheduler inputs through accessors and build a struct for the store, which removes the hand re-ordering between the get-shape and the store-shape. Behavior is unchanged. The legacy LEARN_DATA read path and the virgin-item sentinel are preserved field-for-field, and store takes just the struct because its last-interval slot already holds the interval to persist. The schedulers still take positional args; they adopt the struct in the following commits. I updated the round-trip, integration, and setup-helper tests to build and read the struct via a small list-view helper, so the existing expected-value assertions stay readable. --- tests/test-org-drill-prompt-and-misc.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/test-org-drill-prompt-and-misc.el') diff --git a/tests/test-org-drill-prompt-and-misc.el b/tests/test-org-drill-prompt-and-misc.el index d684c9a..968ad57 100644 --- a/tests/test-org-drill-prompt-and-misc.el +++ b/tests/test-org-drill-prompt-and-misc.el @@ -95,7 +95,7 @@ (ert-deftest test-org-drill-relearn-item-resets-interval-to-zero () "Relearning sets DRILL_LAST_INTERVAL back to 0 — the card behaves as new." (with-fresh-drill-entry - (org-drill-store-item-data 30 5 0 5 4.0 2.5) + (org-drill-store-item-data (make-org-drill-card-state :last-interval 30 :repetitions 5 :failures 0 :total-repeats 5 :meanq 4.0 :ease 2.5)) (with-fixed-now (org-drill-relearn-item)) ;; After relearn: last-interval should be 0 @@ -105,7 +105,7 @@ (ert-deftest test-org-drill-relearn-item-removes-scheduled-stamp () "Relearning unschedules the entry (days-ahead = 0 path)." (with-fresh-drill-entry - (org-drill-store-item-data 30 5 0 5 4.0 2.5) + (org-drill-store-item-data (make-org-drill-card-state :last-interval 30 :repetitions 5 :failures 0 :total-repeats 5 :meanq 4.0 :ease 2.5)) (org-schedule nil "2026-06-01") (with-fixed-now (org-drill-relearn-item)) -- cgit v1.2.3