diff --git a/crates/console/prometeu-drivers/src/audio/engine.rs b/crates/console/prometeu-drivers/src/audio/engine.rs index 82ef4d3..cdf1af5 100644 --- a/crates/console/prometeu-drivers/src/audio/engine.rs +++ b/crates/console/prometeu-drivers/src/audio/engine.rs @@ -550,7 +550,7 @@ impl AudioMixer { }, } } - fn release(&mut self, index: usize) { + fn begin_note_release(&mut self, index: usize) { let state = &mut self.states[index]; if state.release_age.is_none() { let level = envelope(state, &self.exponential); @@ -634,7 +634,7 @@ impl AudioMixer { && state.note_id == event.a && state.iteration == self.groups[group].iteration { - self.release(index); + self.begin_note_release(index); } } } else { @@ -671,7 +671,7 @@ impl AudioMixer { let loop_event = if bank.loop_time.is_some() { bank.loop_event } else { 0 }; let loop_length = bank.end_time - loop_start; for index in group * 12..group * 12 + 12 { - self.release(index); + self.begin_note_release(index); } let g = &mut self.groups[group]; if !g.looping { diff --git a/crates/dev/prometeu-quality-checks/tests/no_legacy.rs b/crates/dev/prometeu-quality-checks/tests/no_legacy.rs index a7bff02..b74616f 100644 --- a/crates/dev/prometeu-quality-checks/tests/no_legacy.rs +++ b/crates/dev/prometeu-quality-checks/tests/no_legacy.rs @@ -66,8 +66,8 @@ fn test_no_legacy_artifacts() { let stripped = strip_comments_and_strings(&content); let toks = tokenize_identifiers(&stripped); - for (tok, line, col) in toks { - if is_forbidden_ident(&tok) { + for (tok, line, col, offset) in toks { + if is_forbidden_ident(&tok, &stripped[..offset]) { violations.insert(format!( "{}:{}:{} identifier '{}': legacy token", rel(&workspace_root, path), @@ -167,11 +167,21 @@ fn path_segment_violation(path: &Path) -> Option { None } -fn is_forbidden_ident(tok: &str) -> bool { +fn is_forbidden_ident(tok: &str, prefix: &str) -> bool { + // The standard atomic ordering is unrelated to the removed RC API. + if tok == "Release" { + if let Some(owner) = prefix.trim_end().strip_suffix("::") { + if let Some(before_owner) = owner.trim_end().strip_suffix("Ordering") { + if !before_owner.chars().last().is_some_and(is_ident_part) { + return false; + } + } + } + } FORBIDDEN_IDENT_TOKENS.contains(&tok) } -fn tokenize_identifiers(text: &str) -> Vec<(String, usize, usize)> { +fn tokenize_identifiers(text: &str) -> Vec<(String, usize, usize, usize)> { let mut out = Vec::new(); let mut line: usize = 1; let mut col: usize = 1; @@ -203,7 +213,7 @@ fn tokenize_identifiers(text: &str) -> Vec<(String, usize, usize)> { } } let tok = &text[start..i]; - out.push((tok.to_string(), start_line, start_col)); + out.push((tok.to_string(), start_line, start_col, start)); } else { i += 1; col += 1; @@ -391,3 +401,41 @@ mod pathdiff { } } } + +#[test] +fn atomic_release_ordering_is_not_a_legacy_rc_identifier() { + for source in [ + "flag.store(false, Ordering::Release);", + "flag.store(false, std::sync::atomic::Ordering::Release);", + "flag.store(false, Ordering /* comment */ ::\n Release);", + ] { + let stripped = strip_comments_and_strings(source); + assert!( + tokenize_identifiers(&stripped) + .iter() + .all(|(tok, _, _, offset)| { !is_forbidden_ident(tok, &stripped[..*offset]) }), + "{source}" + ); + } +} + +#[test] +fn atomic_ordering_exception_does_not_admit_legacy_identifiers() { + for source in [ + "fn release() {}", + "enum Legacy { Release }", + "CustomOrdering::Release", + "Ordering; struct Release;", + "Ordering::release()", + "Ordering::HIP", + "Ordering::enter_scope()", + ] { + let stripped = strip_comments_and_strings(source); + assert!( + tokenize_identifiers(&stripped) + .iter() + .any(|(tok, _, _, offset)| { is_forbidden_ident(tok, &stripped[..*offset]) }), + "{source}" + ); + } +} diff --git a/crates/tools/pbxgen-stress/src/demo.rs b/crates/tools/pbxgen-stress/src/demo.rs index 7e24f05..7a779ef 100644 --- a/crates/tools/pbxgen-stress/src/demo.rs +++ b/crates/tools/pbxgen-stress/src/demo.rs @@ -373,3 +373,44 @@ pub fn program(preset: Preset, seed: i64) -> Vec { .serialize(&mut budget) .expect("demo PBX") } + +#[cfg(test)] +mod tests { + use super::*; + use prometeu_hal::syscalls::caps; + use prometeu_vm::ValidatedProgramImage; + + #[test] + fn every_preset_emits_a_program_accepted_by_the_vm_loader() { + for preset in [Preset::Light, Preset::Normal, Preset::Heavy] { + for seed in [DEFAULT_SEED, i64::MIN, i64::MAX] { + let bytes = program(preset, seed); + ValidatedProgramImage::load( + &bytes, + &mut LoadBudget::new(Default::default()), + caps::ALL, + ) + .expect("generated demo must satisfy the runtime bytecode contract"); + } + } + } + + #[test] + fn generation_is_reproducible_and_preserves_preset_and_seed_selection() { + let bytes = program(Preset::Normal, DEFAULT_SEED); + assert_eq!(bytes, program(Preset::Normal, DEFAULT_SEED)); + assert_ne!(bytes, program(Preset::Normal, DEFAULT_SEED + 1)); + assert_ne!(bytes, program(Preset::Light, DEFAULT_SEED)); + assert_ne!(bytes, program(Preset::Heavy, DEFAULT_SEED)); + } + + #[test] + fn preset_names_round_trip_and_unknown_names_are_rejected() { + for preset in [Preset::Light, Preset::Normal, Preset::Heavy] { + assert_eq!(Preset::parse(preset.name()), Some(preset)); + } + for invalid in ["", "unknown", "Normal", " heavy "] { + assert_eq!(Preset::parse(invalid), None); + } + } +}