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
|
|
@ -1,7 +1,7 @@
|
|||
# check.ludic - once a frame on the machine that owns the story: every open step of the current
|
||||
# chapter that is met now sticks (STEPS_MET), and a chapter with all of them done moves the arc on
|
||||
# (STEPS_CHAPTER). A step asks about STATE, so one met before its chapter opened ticks at once.
|
||||
export function steps_check(base_st: mut BaseState, steps_st: mut StepsState) -> void {
|
||||
export function steps_check(steps_st: mut StepsState) -> void {
|
||||
if steps_finished(steps_st) { return }
|
||||
let ch = steps_st.steps__cur
|
||||
let n = steps_in(steps_st, ch)
|
||||
|
|
@ -9,14 +9,14 @@ export function steps_check(base_st: mut BaseState, steps_st: mut StepsState) ->
|
|||
for i in 0 .. n {
|
||||
if not steps_done(steps_st, i) and steps_met(steps_st, i) {
|
||||
steps_st.steps__done = steps_st.steps__done | (1 << i)
|
||||
steps__fact(base_st, steps_st, STEPS_MET, ch, i)
|
||||
steps__fact(steps_st, STEPS_MET, ch, i)
|
||||
}
|
||||
if not steps_done(steps_st, i) { all = false }
|
||||
}
|
||||
if not all { return }
|
||||
steps_st.steps__cur = ch + 1
|
||||
steps_st.steps__done = 0
|
||||
steps__fact(base_st, steps_st, STEPS_CHAPTER, ch, n)
|
||||
steps__fact(steps_st, STEPS_CHAPTER, ch, n)
|
||||
}
|
||||
|
||||
# is step i of chapter ch met by this machine's own state? (a chapter not being played, a panel)
|
||||
|
|
@ -36,8 +36,8 @@ export function steps_wants(steps_st: StepsState, kind: int, param: int) -> bool
|
|||
}
|
||||
|
||||
# back to no arc and no party (tests)
|
||||
export function steps_reset(base_st: mut BaseState, steps_st: mut StepsState) -> void {
|
||||
export function steps_reset(steps_st: mut StepsState) -> void {
|
||||
steps_arc_clear(steps_st)
|
||||
steps__party_clear(steps_st)
|
||||
q_clear(base_st, steps_facts(base_st, steps_st))
|
||||
q_clear(steps_facts(steps_st))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,17 +59,17 @@ export state StepsState {
|
|||
steps__facts: Queue<StepsFact> = null
|
||||
}
|
||||
|
||||
export function steps_facts(base_st: mut BaseState, steps_st: mut StepsState) -> Queue<StepsFact> {
|
||||
if steps_st.steps__facts == null { steps_st.steps__facts = queue_new(base_st, "steps.facts") }
|
||||
export function steps_facts(steps_st: mut StepsState) -> Queue<StepsFact> {
|
||||
if steps_st.steps__facts == null { steps_st.steps__facts = queue_new("steps.facts") }
|
||||
return steps_st.steps__facts
|
||||
}
|
||||
|
||||
function steps__fact(base_st: mut BaseState, steps_st: mut StepsState, what: int, ch: int, i: int) -> void {
|
||||
function steps__fact(steps_st: mut StepsState, what: int, ch: int, i: int) -> void {
|
||||
let f = new StepsFact
|
||||
f.what = what
|
||||
f.chapter = ch
|
||||
f.step = i
|
||||
q_push(base_st, steps_facts(base_st, steps_st), f)
|
||||
q_push(steps_facts(steps_st), f)
|
||||
}
|
||||
|
||||
export function steps_popcount(m: int) -> int {
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ program StepsTest {
|
|||
return k
|
||||
}
|
||||
|
||||
function fresh(base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) -> void {
|
||||
steps_reset(base_st, steps_st)
|
||||
function fresh(steps_st: mut StepsState, steps_test_st: mut StepsTestState) -> void {
|
||||
steps_reset(steps_st)
|
||||
steps_config(steps_st, 4)
|
||||
steps_test_st.party = false
|
||||
steps_test_st.seats = 1
|
||||
|
|
@ -63,8 +63,8 @@ program StepsTest {
|
|||
steps_add(steps_st, K_COMPASS, 0, 1)
|
||||
}
|
||||
|
||||
function facts_of(base_st: mut BaseState, steps_st: mut StepsState, what: int) -> int {
|
||||
let fs = q_drain(base_st, steps_facts(base_st, steps_st))
|
||||
function facts_of(steps_st: mut StepsState, what: int) -> int {
|
||||
let fs = q_drain(steps_facts(steps_st))
|
||||
var n = 0
|
||||
for i in 0 .. len(fs) { if fs[i].what == what { n += 1 } }
|
||||
return n
|
||||
|
|
@ -77,8 +77,8 @@ program StepsTest {
|
|||
return s
|
||||
}
|
||||
|
||||
test "a step is answered by its kind's shape" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "a step is answered by its kind's shape" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
steps_test_st.vals[K_WOOD] = 4
|
||||
expect(not steps_eval(steps_st, K_WOOD, 0, 5))
|
||||
steps_test_st.vals[K_WOOD] = 5
|
||||
|
|
@ -93,59 +93,59 @@ program StepsTest {
|
|||
expect_eq(steps_got(steps_st, K_FIRE, 0), -1)
|
||||
}
|
||||
|
||||
test "an arc's steps stick as they are met, and a full chapter opens the next" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "an arc's steps stick as they are met, and a full chapter opens the next" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
two_chapters(steps_st)
|
||||
expect_eq(steps_count(steps_st), 2)
|
||||
expect_eq(steps_in(steps_st, 1), 2)
|
||||
steps_test_st.vals[K_FIRE] = 1
|
||||
steps_check(base_st, steps_st)
|
||||
steps_check(steps_st)
|
||||
expect(steps_done(steps_st, 1))
|
||||
expect(not steps_done(steps_st, 0))
|
||||
expect_eq(facts_of(base_st, steps_st, STEPS_MET), 1)
|
||||
expect_eq(facts_of(steps_st, STEPS_MET), 1)
|
||||
steps_test_st.vals[K_FIRE] = 0
|
||||
steps_check(base_st, steps_st)
|
||||
steps_check(steps_st)
|
||||
expect(steps_done(steps_st, 1))
|
||||
steps_test_st.vals[K_WOOD] = 9
|
||||
steps_check(base_st, steps_st)
|
||||
steps_check(steps_st)
|
||||
expect_eq(steps_current(steps_st), 1)
|
||||
expect_eq(steps_done_mask(steps_st), 0)
|
||||
let fs = q_drain(base_st, steps_facts(base_st, steps_st))
|
||||
let fs = q_drain(steps_facts(steps_st))
|
||||
expect_eq(len(fs), 2)
|
||||
expect_eq(fs[1].what, STEPS_CHAPTER)
|
||||
expect_eq(fs[1].chapter, 0)
|
||||
}
|
||||
|
||||
test "a step met before its chapter opens ticks the moment it is looked at" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "a step met before its chapter opens ticks the moment it is looked at" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
two_chapters(steps_st)
|
||||
steps_test_st.vals[K_SIGNS] = 3
|
||||
steps_test_st.vals[K_COMPASS] = 1
|
||||
steps_test_st.vals[K_WOOD] = 5
|
||||
steps_test_st.vals[K_FIRE] = 1
|
||||
steps_check(base_st, steps_st)
|
||||
steps_check(steps_st)
|
||||
expect_eq(steps_current(steps_st), 1)
|
||||
steps_check(base_st, steps_st)
|
||||
steps_check(steps_st)
|
||||
expect(steps_finished(steps_st))
|
||||
}
|
||||
|
||||
test "a chapter holds at most six steps" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "a chapter holds at most six steps" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
expect(not steps_add(steps_st, K_WOOD, 0, 1))
|
||||
steps_chapter_add(steps_st)
|
||||
for i in 0 .. STEPS_PER_CHAPTER { expect(steps_add(steps_st, K_WOOD, 0, i)) }
|
||||
expect(not steps_add(steps_st, K_WOOD, 0, 9))
|
||||
}
|
||||
|
||||
test "the steps asked for right now" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "the steps asked for right now" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
two_chapters(steps_st)
|
||||
expect(steps_wants(steps_st, K_FIRE, -1))
|
||||
expect(not steps_wants(steps_st, K_SIGNS, -1))
|
||||
}
|
||||
|
||||
test "a tally adds up across the party, and a mask unions" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "a tally adds up across the party, and a mask unions" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
two_chapters(steps_st)
|
||||
steps_test_st.party = true
|
||||
steps_test_st.seats = 2
|
||||
|
|
@ -160,8 +160,8 @@ program StepsTest {
|
|||
expect(steps_met(steps_st, 0))
|
||||
}
|
||||
|
||||
test "anyone having done it is the party having done it" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "anyone having done it is the party having done it" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
two_chapters(steps_st)
|
||||
steps_test_st.party = true
|
||||
steps_test_st.seats = 3
|
||||
|
|
@ -169,8 +169,8 @@ program StepsTest {
|
|||
expect(steps_met(steps_st, 1))
|
||||
}
|
||||
|
||||
test "a thing in the pack is met when every player has one, and says who has not" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "a thing in the pack is met when every player has one, and says who has not" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
two_chapters(steps_st)
|
||||
steps_set_current(steps_st, 1)
|
||||
steps_test_st.party = true
|
||||
|
|
@ -186,8 +186,8 @@ program StepsTest {
|
|||
expect(steps_met(steps_st, 1))
|
||||
}
|
||||
|
||||
test "a player who leaves takes their share with them" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "a player who leaves takes their share with them" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
two_chapters(steps_st)
|
||||
steps_test_st.party = true
|
||||
steps_test_st.seats = 2
|
||||
|
|
@ -197,8 +197,8 @@ program StepsTest {
|
|||
expect(not steps_met(steps_st, 0))
|
||||
}
|
||||
|
||||
test "a share about another chapter is ignored, and the best of a tally is the best" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "a share about another chapter is ignored, and the best of a tally is the best" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
steps_chapter_add(steps_st)
|
||||
steps_add(steps_st, K_REP, 0, 25)
|
||||
steps_test_st.party = true
|
||||
|
|
@ -211,8 +211,8 @@ program StepsTest {
|
|||
expect_eq(steps_party_got(steps_st, 0), 30)
|
||||
}
|
||||
|
||||
test "the world's steps are asked of this machine alone" (base_st: mut BaseState, steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(base_st, steps_st, steps_test_st)
|
||||
test "the world's steps are asked of this machine alone" (steps_st: mut StepsState, steps_test_st: mut StepsTestState) {
|
||||
fresh(steps_st, steps_test_st)
|
||||
steps_chapter_add(steps_st)
|
||||
steps_add(steps_st, K_HOUR, 0, 1)
|
||||
steps_test_st.party = true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue