feat(base): 0.R4 - a queue keeps its own count, so every package verb takes only its own state; ludic migrate state --prune
ludic.base's Queue<T> carries a QueueTag (its name and pending count): queue_new(name), q_push(q, v), q_drain(q), q_clear(q) take no BaseState, and core_undrained(tags) names the given queues still holding facts. A reducer on a package's state can now call that package's verbs (wallet_earn(wallet_st, n)). ludic migrate state --prune (ludicc --migrate-prune) takes out each state parameter a function no longer uses, nor anything it calls, and the argument that fills it - including an argument for a parameter the callee has dropped, which is taken out before the call is checked, so a generic's T is told by the argument that says it. A reducer keeps its state. --dry-run now counts the edits it would make. Every package was moved with it: 608 base_st parameters and their arguments, 1889 edits. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
8cf4b3fed6
commit
71735b10a2
151 changed files with 58668 additions and 54719 deletions
|
|
@ -23,66 +23,66 @@ program InventoryTest {
|
|||
|
||||
bind PackRules { stack_limit: fn limit }
|
||||
|
||||
function fresh(base_st: mut BaseState, inventory_st: mut InventoryState) -> void {
|
||||
function fresh(inventory_st: mut InventoryState) -> void {
|
||||
inv_config(inventory_st, names("wood", "rod", "fish"))
|
||||
inv_reset(base_st, inventory_st)
|
||||
inv_reset(inventory_st)
|
||||
}
|
||||
|
||||
function changes(base_st: mut BaseState, inventory_st: mut InventoryState) -> []ItemChanged { return q_drain(base_st, inv_changes(base_st, inventory_st)) }
|
||||
function waiting(base_st: mut BaseState, inventory_st: mut InventoryState) -> int { return q_len(inv_changes(base_st, inventory_st)) }
|
||||
function changes(inventory_st: mut InventoryState) -> []ItemChanged { return q_drain(inv_changes(inventory_st)) }
|
||||
function waiting(inventory_st: mut InventoryState) -> int { return q_len(inv_changes(inventory_st)) }
|
||||
|
||||
test "add puts in what fits and says how many" (base_st: mut BaseState, inventory_st: mut InventoryState) {
|
||||
fresh(base_st, inventory_st)
|
||||
expect_eq(inv_add(base_st, inventory_st, WOOD, 7), 7)
|
||||
expect_eq(inv_add(base_st, inventory_st, WOOD, 7), 3)
|
||||
test "add puts in what fits and says how many" (inventory_st: mut InventoryState) {
|
||||
fresh(inventory_st)
|
||||
expect_eq(inv_add(inventory_st, WOOD, 7), 7)
|
||||
expect_eq(inv_add(inventory_st, WOOD, 7), 3)
|
||||
expect_eq(inv_count(inventory_st, WOOD), 10)
|
||||
expect_eq(inv_room(inventory_st, WOOD), 0)
|
||||
expect_eq(inv_add(base_st, inventory_st, ROD, 2), 1)
|
||||
expect_eq(inv_add(inventory_st, ROD, 2), 1)
|
||||
expect_eq(inv_total(inventory_st), 11)
|
||||
}
|
||||
|
||||
test "take is all or none" (base_st: mut BaseState, inventory_st: mut InventoryState) {
|
||||
fresh(base_st, inventory_st)
|
||||
inv_add(base_st, inventory_st, FISH, 3)
|
||||
expect(not inv_take(base_st, inventory_st, FISH, 4))
|
||||
test "take is all or none" (inventory_st: mut InventoryState) {
|
||||
fresh(inventory_st)
|
||||
inv_add(inventory_st, FISH, 3)
|
||||
expect(not inv_take(inventory_st, FISH, 4))
|
||||
expect_eq(inv_count(inventory_st, FISH), 3)
|
||||
expect(inv_take(base_st, inventory_st, FISH, 3))
|
||||
expect(inv_take(inventory_st, FISH, 3))
|
||||
expect(not inv_has(inventory_st, FISH, 1))
|
||||
}
|
||||
|
||||
test "set goes past the room, never below zero" (base_st: mut BaseState, inventory_st: mut InventoryState) {
|
||||
fresh(base_st, inventory_st)
|
||||
inv_set(base_st, inventory_st, ROD, 3)
|
||||
test "set goes past the room, never below zero" (inventory_st: mut InventoryState) {
|
||||
fresh(inventory_st)
|
||||
inv_set(inventory_st, ROD, 3)
|
||||
expect_eq(inv_count(inventory_st, ROD), 3)
|
||||
expect_eq(inv_room(inventory_st, ROD), 0)
|
||||
inv_set(base_st, inventory_st, ROD, -2)
|
||||
inv_set(inventory_st, ROD, -2)
|
||||
expect_eq(inv_count(inventory_st, ROD), 0)
|
||||
}
|
||||
|
||||
test "every change is a fact, and no change is not" (base_st: mut BaseState, inventory_st: mut InventoryState) {
|
||||
fresh(base_st, inventory_st)
|
||||
inv_add(base_st, inventory_st, WOOD, 2)
|
||||
inv_take(base_st, inventory_st, WOOD, 1)
|
||||
inv_set(base_st, inventory_st, WOOD, 1)
|
||||
let cs = changes(base_st, inventory_st)
|
||||
test "every change is a fact, and no change is not" (inventory_st: mut InventoryState) {
|
||||
fresh(inventory_st)
|
||||
inv_add(inventory_st, WOOD, 2)
|
||||
inv_take(inventory_st, WOOD, 1)
|
||||
inv_set(inventory_st, WOOD, 1)
|
||||
let cs = changes(inventory_st)
|
||||
expect_eq(len(cs), 2)
|
||||
expect_eq(cs[0].after, 2)
|
||||
expect_eq(cs[1].before, 2)
|
||||
expect_eq(cs[1].after, 1)
|
||||
expect_eq(waiting(base_st, inventory_st), 0)
|
||||
expect_eq(waiting(inventory_st), 0)
|
||||
}
|
||||
|
||||
test "an item out of range is nothing" (base_st: mut BaseState, inventory_st: mut InventoryState) {
|
||||
fresh(base_st, inventory_st)
|
||||
expect_eq(inv_add(base_st, inventory_st, 9, 1), 0)
|
||||
test "an item out of range is nothing" (inventory_st: mut InventoryState) {
|
||||
fresh(inventory_st)
|
||||
expect_eq(inv_add(inventory_st, 9, 1), 0)
|
||||
expect_eq(inv_count(inventory_st, -1), 0)
|
||||
expect(not inv_take(base_st, inventory_st, 9, 0))
|
||||
expect(not inv_take(inventory_st, 9, 0))
|
||||
}
|
||||
|
||||
test "the save is by name, so a reordered table still reads it" (base_st: mut BaseState, inventory_st: mut InventoryState) {
|
||||
fresh(base_st, inventory_st)
|
||||
inv_add(base_st, inventory_st, WOOD, 4)
|
||||
inv_add(base_st, inventory_st, FISH, 2)
|
||||
test "the save is by name, so a reordered table still reads it" (inventory_st: mut InventoryState) {
|
||||
fresh(inventory_st)
|
||||
inv_add(inventory_st, WOOD, 4)
|
||||
inv_add(inventory_st, FISH, 2)
|
||||
let root = save_tree()
|
||||
save_section(root, "inventory", 1, inv_save(inventory_st))
|
||||
let text = save_encode(root)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue