2025-12-08 00:30:17 +09:00
|
|
|
//! Phase 171-fix: Condition Expression Environment
|
|
|
|
|
//!
|
|
|
|
|
//! This module provides the environment for lowering condition expressions to JoinIR.
|
|
|
|
|
//! It maps variable names to JoinIR-local ValueIds, ensuring proper separation between
|
|
|
|
|
//! HOST and JoinIR value spaces.
|
|
|
|
|
//!
|
|
|
|
|
//! ## Design Philosophy
|
|
|
|
|
//!
|
|
|
|
|
//! **Single Responsibility**: This module ONLY handles variable name → ValueId mapping
|
|
|
|
|
//! for condition expressions. It does NOT:
|
|
|
|
|
//! - Perform AST lowering (that's condition_lowerer.rs)
|
|
|
|
|
//! - Extract variables from AST (that's condition_var_extractor.rs)
|
|
|
|
|
//! - Manage HOST ↔ JoinIR bindings (that's inline_boundary.rs)
|
|
|
|
|
|
|
|
|
|
use crate::mir::ValueId;
|
2025-12-10 13:59:23 +09:00
|
|
|
use std::collections::BTreeMap; // Phase 222.5-D: HashMap → BTreeMap for determinism
|
2025-12-08 00:30:17 +09:00
|
|
|
|
|
|
|
|
/// Environment for condition expression lowering
|
|
|
|
|
///
|
|
|
|
|
/// Maps variable names to JoinIR-local ValueIds. Used when lowering
|
|
|
|
|
/// condition AST nodes to JoinIR instructions.
|
|
|
|
|
///
|
2025-12-09 18:32:03 +09:00
|
|
|
/// # Phase 200-B Extension
|
|
|
|
|
///
|
|
|
|
|
/// Added `captured` field to track function-scoped captured variables
|
|
|
|
|
/// separately from loop parameters. Captured variables have ParamRole::Condition
|
|
|
|
|
/// and do NOT participate in header PHI or ExitLine.
|
|
|
|
|
///
|
2025-12-08 00:30:17 +09:00
|
|
|
/// # Example
|
|
|
|
|
///
|
|
|
|
|
/// ```ignore
|
|
|
|
|
/// let mut env = ConditionEnv::new();
|
|
|
|
|
/// env.insert("i".to_string(), ValueId(0)); // Loop parameter
|
|
|
|
|
/// env.insert("end".to_string(), ValueId(1)); // Condition-only var
|
|
|
|
|
///
|
2025-12-09 18:32:03 +09:00
|
|
|
/// // Phase 200-B: Add captured variable
|
|
|
|
|
/// env.captured.insert("digits".to_string(), ValueId(2));
|
|
|
|
|
///
|
2025-12-08 00:30:17 +09:00
|
|
|
/// // Later during lowering:
|
|
|
|
|
/// if let Some(value_id) = env.get("i") {
|
|
|
|
|
/// // Use value_id in JoinIR instruction
|
|
|
|
|
/// }
|
|
|
|
|
/// ```
|
|
|
|
|
#[derive(Debug, Clone, Default)]
|
|
|
|
|
pub struct ConditionEnv {
|
2025-12-09 18:32:03 +09:00
|
|
|
/// Loop parameters and condition-only variables (legacy)
|
2025-12-10 13:59:23 +09:00
|
|
|
name_to_join: BTreeMap<String, ValueId>, // Phase 222.5-D: HashMap → BTreeMap for determinism
|
2025-12-09 18:32:03 +09:00
|
|
|
|
|
|
|
|
/// Phase 200-B: Captured function-scoped variables (ParamRole::Condition)
|
|
|
|
|
///
|
|
|
|
|
/// These variables are:
|
|
|
|
|
/// - Declared in function scope before the loop
|
|
|
|
|
/// - Never reassigned (effectively immutable)
|
|
|
|
|
/// - Used in loop condition or body
|
|
|
|
|
/// - NOT included in header PHI or ExitLine (condition-only)
|
2025-12-10 13:59:23 +09:00
|
|
|
pub captured: BTreeMap<String, ValueId>, // Phase 222.5-D: HashMap → BTreeMap for determinism
|
2025-12-08 00:30:17 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl ConditionEnv {
|
|
|
|
|
/// Create a new empty environment
|
|
|
|
|
pub fn new() -> Self {
|
|
|
|
|
Self {
|
2025-12-10 13:59:23 +09:00
|
|
|
name_to_join: BTreeMap::new(), // Phase 222.5-D: HashMap → BTreeMap for determinism
|
|
|
|
|
captured: BTreeMap::new(), // Phase 222.5-D: HashMap → BTreeMap for determinism
|
2025-12-08 00:30:17 +09:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Insert a variable binding
|
|
|
|
|
///
|
|
|
|
|
/// # Arguments
|
|
|
|
|
///
|
|
|
|
|
/// * `name` - Variable name (e.g., "i", "end")
|
|
|
|
|
/// * `join_id` - JoinIR-local ValueId for this variable
|
|
|
|
|
pub fn insert(&mut self, name: String, join_id: ValueId) {
|
|
|
|
|
self.name_to_join.insert(name, join_id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Look up a variable by name
|
|
|
|
|
///
|
2025-12-09 18:32:03 +09:00
|
|
|
/// Phase 200-B: Searches both name_to_join (loop params) and captured fields.
|
|
|
|
|
///
|
2025-12-08 00:30:17 +09:00
|
|
|
/// Returns `Some(ValueId)` if the variable exists in the environment,
|
|
|
|
|
/// `None` otherwise.
|
|
|
|
|
pub fn get(&self, name: &str) -> Option<ValueId> {
|
|
|
|
|
self.name_to_join.get(name).copied()
|
2025-12-09 18:32:03 +09:00
|
|
|
.or_else(|| self.captured.get(name).copied())
|
2025-12-08 00:30:17 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Check if a variable exists in the environment
|
2025-12-09 18:32:03 +09:00
|
|
|
///
|
|
|
|
|
/// Phase 200-B: Checks both name_to_join and captured fields.
|
2025-12-08 00:30:17 +09:00
|
|
|
pub fn contains(&self, name: &str) -> bool {
|
2025-12-09 18:32:03 +09:00
|
|
|
self.name_to_join.contains_key(name) || self.captured.contains_key(name)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Check if a variable is a captured (Condition role) variable
|
|
|
|
|
///
|
|
|
|
|
/// Phase 200-B: New method to distinguish captured vars from loop params.
|
|
|
|
|
pub fn is_captured(&self, name: &str) -> bool {
|
|
|
|
|
self.captured.contains_key(name)
|
2025-12-08 00:30:17 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Get the number of variables in the environment
|
2025-12-09 18:32:03 +09:00
|
|
|
///
|
|
|
|
|
/// Phase 200-B: Counts both name_to_join and captured fields.
|
2025-12-08 00:30:17 +09:00
|
|
|
pub fn len(&self) -> usize {
|
2025-12-09 18:32:03 +09:00
|
|
|
self.name_to_join.len() + self.captured.len()
|
2025-12-08 00:30:17 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Check if the environment is empty
|
2025-12-09 18:32:03 +09:00
|
|
|
///
|
|
|
|
|
/// Phase 200-B: Checks both name_to_join and captured fields.
|
2025-12-08 00:30:17 +09:00
|
|
|
pub fn is_empty(&self) -> bool {
|
2025-12-09 18:32:03 +09:00
|
|
|
self.name_to_join.is_empty() && self.captured.is_empty()
|
2025-12-08 00:30:17 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Get an iterator over all (name, ValueId) pairs
|
2025-12-09 18:32:03 +09:00
|
|
|
///
|
|
|
|
|
/// Phase 200-B: Note - this only iterates over name_to_join (loop params).
|
|
|
|
|
/// For captured variables, access the `captured` field directly.
|
2025-12-08 00:30:17 +09:00
|
|
|
pub fn iter(&self) -> impl Iterator<Item = (&String, &ValueId)> {
|
|
|
|
|
self.name_to_join.iter()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Get all variable names (sorted)
|
2025-12-09 18:32:03 +09:00
|
|
|
///
|
|
|
|
|
/// Phase 200-B: Includes both name_to_join and captured variables.
|
2025-12-08 00:30:17 +09:00
|
|
|
pub fn names(&self) -> Vec<String> {
|
2025-12-09 18:32:03 +09:00
|
|
|
let mut names: Vec<_> = self.name_to_join.keys()
|
|
|
|
|
.chain(self.captured.keys())
|
|
|
|
|
.cloned()
|
|
|
|
|
.collect();
|
2025-12-08 00:30:17 +09:00
|
|
|
names.sort();
|
2025-12-09 18:32:03 +09:00
|
|
|
names.dedup(); // Remove duplicates (shouldn't happen, but be safe)
|
2025-12-08 00:30:17 +09:00
|
|
|
names
|
|
|
|
|
}
|
2025-12-09 18:32:03 +09:00
|
|
|
|
|
|
|
|
/// Phase 201-A: Get the maximum ValueId used in this environment
|
|
|
|
|
///
|
|
|
|
|
/// Returns the highest ValueId.0 value from both name_to_join and captured,
|
|
|
|
|
/// or None if the environment is empty.
|
|
|
|
|
///
|
|
|
|
|
/// This is used by JoinIR lowering to determine the starting point for
|
|
|
|
|
/// alloc_value() to avoid ValueId collisions.
|
|
|
|
|
pub fn max_value_id(&self) -> Option<u32> {
|
|
|
|
|
let name_max = self.name_to_join.values().map(|v| v.0).max();
|
|
|
|
|
let captured_max = self.captured.values().map(|v| v.0).max();
|
|
|
|
|
|
|
|
|
|
match (name_max, captured_max) {
|
|
|
|
|
(Some(a), Some(b)) => Some(a.max(b)),
|
|
|
|
|
(Some(a), None) => Some(a),
|
|
|
|
|
(None, Some(b)) => Some(b),
|
|
|
|
|
(None, None) => None,
|
|
|
|
|
}
|
|
|
|
|
}
|
2025-12-08 00:30:17 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Binding between HOST and JoinIR ValueIds for condition variables
|
|
|
|
|
///
|
|
|
|
|
/// This structure explicitly connects a variable name to both its HOST ValueId
|
|
|
|
|
/// (from the host function's variable_map) and its JoinIR ValueId (allocated
|
|
|
|
|
/// locally within the JoinIR fragment).
|
|
|
|
|
///
|
|
|
|
|
/// # Example
|
|
|
|
|
///
|
|
|
|
|
/// For condition variable "start" in `loop(start < end)`:
|
|
|
|
|
///
|
|
|
|
|
/// ```ignore
|
|
|
|
|
/// ConditionBinding {
|
|
|
|
|
/// name: "start".to_string(),
|
|
|
|
|
/// host_value: ValueId(33), // HOST function's ValueId for "start"
|
|
|
|
|
/// join_value: ValueId(1), // JoinIR-local ValueId for "start"
|
|
|
|
|
/// }
|
|
|
|
|
/// ```
|
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
|
pub struct ConditionBinding {
|
|
|
|
|
/// Variable name (e.g., "start", "end")
|
|
|
|
|
pub name: String,
|
|
|
|
|
|
|
|
|
|
/// HOST function's ValueId for this variable
|
|
|
|
|
///
|
|
|
|
|
/// This comes from `builder.variable_map` in the host function.
|
|
|
|
|
pub host_value: ValueId,
|
|
|
|
|
|
|
|
|
|
/// JoinIR-local ValueId for this variable
|
|
|
|
|
///
|
|
|
|
|
/// This is allocated within the JoinIR fragment and must be remapped
|
|
|
|
|
/// when merging into the host function.
|
|
|
|
|
pub join_value: ValueId,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl ConditionBinding {
|
|
|
|
|
/// Create a new condition binding
|
|
|
|
|
pub fn new(name: String, host_value: ValueId, join_value: ValueId) -> Self {
|
|
|
|
|
Self {
|
|
|
|
|
name,
|
|
|
|
|
host_value,
|
|
|
|
|
join_value,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests {
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_condition_env_basic() {
|
|
|
|
|
let mut env = ConditionEnv::new();
|
|
|
|
|
assert!(env.is_empty());
|
|
|
|
|
assert_eq!(env.len(), 0);
|
|
|
|
|
|
|
|
|
|
env.insert("i".to_string(), ValueId(0));
|
|
|
|
|
assert!(!env.is_empty());
|
|
|
|
|
assert_eq!(env.len(), 1);
|
|
|
|
|
assert!(env.contains("i"));
|
|
|
|
|
assert_eq!(env.get("i"), Some(ValueId(0)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_condition_env_multiple_vars() {
|
|
|
|
|
let mut env = ConditionEnv::new();
|
|
|
|
|
env.insert("i".to_string(), ValueId(0));
|
|
|
|
|
env.insert("start".to_string(), ValueId(1));
|
|
|
|
|
env.insert("end".to_string(), ValueId(2));
|
|
|
|
|
|
|
|
|
|
assert_eq!(env.len(), 3);
|
|
|
|
|
assert_eq!(env.get("i"), Some(ValueId(0)));
|
|
|
|
|
assert_eq!(env.get("start"), Some(ValueId(1)));
|
|
|
|
|
assert_eq!(env.get("end"), Some(ValueId(2)));
|
|
|
|
|
assert_eq!(env.get("nonexistent"), None);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_condition_binding() {
|
|
|
|
|
let binding = ConditionBinding::new(
|
|
|
|
|
"start".to_string(),
|
|
|
|
|
ValueId(33), // HOST
|
|
|
|
|
ValueId(1), // JoinIR
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
assert_eq!(binding.name, "start");
|
|
|
|
|
assert_eq!(binding.host_value, ValueId(33));
|
|
|
|
|
assert_eq!(binding.join_value, ValueId(1));
|
|
|
|
|
}
|
|
|
|
|
}
|