refactor(mir): Phase 138-P1-B - parity_checker.rs を routing.rs から分離
## 概要 - Dev機能(parity verification)を本線ロジックから分離 - routing.rs: 459行 → 220行 (52%削減) - 全2テスト PASS、退行なし ## 分離内容 - verify_router_parity() 関数 (69行) - テストコード (test_parity_check_* 2個) - テストヘルパー (build_skip_whitespace_loop) ## ファイル構成 - parity_checker.rs (248行) - 独立したDev検証モジュール - routing.rs (220行) - クリーンな本線ロジックに ## テスト結果 - 2 tests passed (parity_checker::tests::*) - routing.rs から重複コード完全削除
This commit is contained in:
nyash-codex
@ -3,10 +3,12 @@
|
|||||||
//! This module contains JoinIR-related control flow logic:
|
//! This module contains JoinIR-related control flow logic:
|
||||||
//! - Pattern lowerers (patterns/)
|
//! - Pattern lowerers (patterns/)
|
||||||
//! - Routing logic (routing.rs) ✅
|
//! - Routing logic (routing.rs) ✅
|
||||||
|
//! - Parity verification (parity_checker.rs) ✅ Phase 138
|
||||||
//! - MIR block merging (merge/) ✅ Phase 4
|
//! - MIR block merging (merge/) ✅ Phase 4
|
||||||
//! - Unified tracing (trace.rs) ✅ Phase 195
|
//! - Unified tracing (trace.rs) ✅ Phase 195
|
||||||
|
|
||||||
pub(in crate::mir::builder) mod merge;
|
pub(in crate::mir::builder) mod merge;
|
||||||
|
pub(in crate::mir::builder) mod parity_checker;
|
||||||
pub(in crate::mir::builder) mod patterns;
|
pub(in crate::mir::builder) mod patterns;
|
||||||
pub(in crate::mir::builder) mod routing;
|
pub(in crate::mir::builder) mod routing;
|
||||||
pub(in crate::mir::builder) mod routing_legacy_binding;
|
pub(in crate::mir::builder) mod routing_legacy_binding;
|
||||||
|
|||||||
248
src/mir/builder/control_flow/joinir/parity_checker.rs
Normal file
248
src/mir/builder/control_flow/joinir/parity_checker.rs
Normal file
@ -0,0 +1,248 @@
|
|||||||
|
//! Router Parity Verification (Dev-only)
|
||||||
|
//!
|
||||||
|
//! Ensures the canonicalizer's pattern choice matches the router's pattern_kind.
|
||||||
|
//! This module provides validation to ensure consistency between the two systems.
|
||||||
|
|
||||||
|
use crate::ast::{ASTNode, Span};
|
||||||
|
use crate::mir::builder::MirBuilder;
|
||||||
|
|
||||||
|
impl MirBuilder {
|
||||||
|
/// Phase 137-4: Verify router parity between canonicalizer and router
|
||||||
|
///
|
||||||
|
/// Dev-only: Ensures the canonicalizer's pattern choice matches the router's
|
||||||
|
/// pattern_kind. On mismatch:
|
||||||
|
/// - Debug mode (HAKO_JOINIR_DEBUG=1): Log warning
|
||||||
|
/// - Strict mode (HAKO_JOINIR_STRICT=1 or NYASH_JOINIR_STRICT=1): Return error
|
||||||
|
pub(super) fn verify_router_parity(
|
||||||
|
&self,
|
||||||
|
condition: &ASTNode,
|
||||||
|
body: &[ASTNode],
|
||||||
|
func_name: &str,
|
||||||
|
ctx: &super::patterns::LoopPatternContext,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
use crate::mir::loop_canonicalizer::canonicalize_loop_expr;
|
||||||
|
|
||||||
|
// Reconstruct loop AST for canonicalizer
|
||||||
|
let loop_ast = ASTNode::Loop {
|
||||||
|
condition: Box::new(condition.clone()),
|
||||||
|
body: body.to_vec(),
|
||||||
|
span: Span::unknown(),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Run canonicalizer
|
||||||
|
let (_, decision) = canonicalize_loop_expr(&loop_ast)
|
||||||
|
.map_err(|e| format!("[loop_canonicalizer/PARITY] Canonicalizer error: {}", e))?;
|
||||||
|
|
||||||
|
// Compare patterns only if canonicalizer succeeded
|
||||||
|
if let Some(canonical_pattern) = decision.chosen {
|
||||||
|
let actual_pattern = ctx.pattern_kind;
|
||||||
|
|
||||||
|
if canonical_pattern != actual_pattern {
|
||||||
|
// Pattern mismatch detected
|
||||||
|
let msg = format!(
|
||||||
|
"[loop_canonicalizer/PARITY] MISMATCH in function '{}': \
|
||||||
|
canonical={:?}, actual={:?}",
|
||||||
|
func_name, canonical_pattern, actual_pattern
|
||||||
|
);
|
||||||
|
|
||||||
|
// Check strict mode (NOTE: Will be replaced with SSOT in Phase 138-P2-B)
|
||||||
|
let is_strict = std::env::var("HAKO_JOINIR_STRICT").is_ok()
|
||||||
|
|| std::env::var("NYASH_JOINIR_STRICT").is_ok();
|
||||||
|
|
||||||
|
if is_strict {
|
||||||
|
// Strict mode: fail fast
|
||||||
|
return Err(msg);
|
||||||
|
} else {
|
||||||
|
// Debug mode: log only
|
||||||
|
eprintln!("{}", msg);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Patterns match - success!
|
||||||
|
eprintln!(
|
||||||
|
"[loop_canonicalizer/PARITY] OK in function '{}': \
|
||||||
|
canonical and actual agree on {:?}",
|
||||||
|
func_name, canonical_pattern
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Canonicalizer failed (Fail-Fast)
|
||||||
|
// Log but don't error - router might still handle it
|
||||||
|
eprintln!(
|
||||||
|
"[loop_canonicalizer/PARITY] Canonicalizer failed for '{}': {}",
|
||||||
|
func_name,
|
||||||
|
decision.notes.join("; ")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::ast::{ASTNode, BinaryOperator, LiteralValue, Span};
|
||||||
|
|
||||||
|
/// Test helper: Create a skip_whitespace pattern loop AST
|
||||||
|
fn build_skip_whitespace_loop() -> ASTNode {
|
||||||
|
ASTNode::Loop {
|
||||||
|
condition: Box::new(ASTNode::BinaryOp {
|
||||||
|
operator: BinaryOperator::Less,
|
||||||
|
left: Box::new(ASTNode::Variable {
|
||||||
|
name: "p".to_string(),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
right: Box::new(ASTNode::Variable {
|
||||||
|
name: "len".to_string(),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
body: vec![ASTNode::If {
|
||||||
|
condition: Box::new(ASTNode::BinaryOp {
|
||||||
|
operator: BinaryOperator::Equal,
|
||||||
|
left: Box::new(ASTNode::Variable {
|
||||||
|
name: "is_ws".to_string(),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
right: Box::new(ASTNode::Literal {
|
||||||
|
value: LiteralValue::Integer(1),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
then_body: vec![ASTNode::Assignment {
|
||||||
|
target: Box::new(ASTNode::Variable {
|
||||||
|
name: "p".to_string(),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
value: Box::new(ASTNode::BinaryOp {
|
||||||
|
operator: BinaryOperator::Add,
|
||||||
|
left: Box::new(ASTNode::Variable {
|
||||||
|
name: "p".to_string(),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
right: Box::new(ASTNode::Literal {
|
||||||
|
value: LiteralValue::Integer(1),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}],
|
||||||
|
else_body: Some(vec![ASTNode::Break {
|
||||||
|
span: Span::unknown(),
|
||||||
|
}]),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}],
|
||||||
|
span: Span::unknown(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parity_check_skip_whitespace_match() {
|
||||||
|
use crate::mir::loop_canonicalizer::canonicalize_loop_expr;
|
||||||
|
use crate::mir::builder::control_flow::joinir::patterns::ast_feature_extractor as ast_features;
|
||||||
|
|
||||||
|
let loop_ast = build_skip_whitespace_loop();
|
||||||
|
|
||||||
|
// Extract condition and body
|
||||||
|
let (condition, body) = match &loop_ast {
|
||||||
|
ASTNode::Loop { condition, body, .. } => (condition.as_ref(), body.as_slice()),
|
||||||
|
_ => panic!("Expected loop node"),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Run canonicalizer
|
||||||
|
let (_, canonical_decision) = canonicalize_loop_expr(&loop_ast).unwrap();
|
||||||
|
let canonical_pattern = canonical_decision.chosen.expect("Canonicalizer should succeed");
|
||||||
|
|
||||||
|
// Run router's pattern detection
|
||||||
|
let has_continue = ast_features::detect_continue_in_body(body);
|
||||||
|
let has_break = ast_features::detect_break_in_body(body);
|
||||||
|
let features = ast_features::extract_features(condition, body, has_continue, has_break);
|
||||||
|
let actual_pattern = crate::mir::loop_pattern_detection::classify(&features);
|
||||||
|
|
||||||
|
// Phase 137-5: Verify MATCH (ExitContract policy fix)
|
||||||
|
// Both canonicalizer and router should agree on Pattern2Break
|
||||||
|
// because has_break=true (ExitContract determines pattern choice)
|
||||||
|
assert_eq!(
|
||||||
|
canonical_pattern,
|
||||||
|
crate::mir::loop_pattern_detection::LoopPatternKind::Pattern2Break,
|
||||||
|
"Canonicalizer should choose Pattern2Break for has_break=true"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
actual_pattern,
|
||||||
|
crate::mir::loop_pattern_detection::LoopPatternKind::Pattern2Break,
|
||||||
|
"Router should classify as Pattern2Break for has_break=true"
|
||||||
|
);
|
||||||
|
assert_eq!(canonical_pattern, actual_pattern, "Phase 137-5: Canonicalizer and router should agree (SSOT policy)");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parity_check_match_simple_while() {
|
||||||
|
use crate::mir::loop_canonicalizer::canonicalize_loop_expr;
|
||||||
|
use crate::mir::builder::control_flow::joinir::patterns::ast_feature_extractor as ast_features;
|
||||||
|
|
||||||
|
// Simple while loop: no break, no continue, no if
|
||||||
|
let loop_ast = ASTNode::Loop {
|
||||||
|
condition: Box::new(ASTNode::BinaryOp {
|
||||||
|
operator: BinaryOperator::Less,
|
||||||
|
left: Box::new(ASTNode::Variable {
|
||||||
|
name: "i".to_string(),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
right: Box::new(ASTNode::Literal {
|
||||||
|
value: LiteralValue::Integer(10),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
body: vec![ASTNode::Assignment {
|
||||||
|
target: Box::new(ASTNode::Variable {
|
||||||
|
name: "i".to_string(),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
value: Box::new(ASTNode::BinaryOp {
|
||||||
|
operator: BinaryOperator::Add,
|
||||||
|
left: Box::new(ASTNode::Variable {
|
||||||
|
name: "i".to_string(),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
right: Box::new(ASTNode::Literal {
|
||||||
|
value: LiteralValue::Integer(1),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}),
|
||||||
|
span: Span::unknown(),
|
||||||
|
}],
|
||||||
|
span: Span::unknown(),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Extract condition and body
|
||||||
|
let (condition, body) = match &loop_ast {
|
||||||
|
ASTNode::Loop { condition, body, .. } => (condition.as_ref(), body.as_slice()),
|
||||||
|
_ => panic!("Expected loop node"),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Canonicalizer will fail for simple patterns (not yet implemented)
|
||||||
|
let canonical_result = canonicalize_loop_expr(&loop_ast);
|
||||||
|
|
||||||
|
// Router's pattern detection
|
||||||
|
let has_continue = ast_features::detect_continue_in_body(body);
|
||||||
|
let has_break = ast_features::detect_break_in_body(body);
|
||||||
|
let features = ast_features::extract_features(condition, body, has_continue, has_break);
|
||||||
|
let actual_pattern = crate::mir::loop_pattern_detection::classify(&features);
|
||||||
|
|
||||||
|
// Router should classify as Pattern1SimpleWhile
|
||||||
|
assert_eq!(
|
||||||
|
actual_pattern,
|
||||||
|
crate::mir::loop_pattern_detection::LoopPatternKind::Pattern1SimpleWhile
|
||||||
|
);
|
||||||
|
|
||||||
|
// Canonicalizer should fail (not implemented yet for Pattern1)
|
||||||
|
assert!(canonical_result.is_ok());
|
||||||
|
let (_, decision) = canonical_result.unwrap();
|
||||||
|
assert!(decision.is_fail_fast(), "Canonicalizer should fail for simple patterns (Phase 3 only supports skip_whitespace)");
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -6,76 +6,6 @@ use crate::mir::builder::MirBuilder;
|
|||||||
use crate::mir::ValueId;
|
use crate::mir::ValueId;
|
||||||
|
|
||||||
impl MirBuilder {
|
impl MirBuilder {
|
||||||
/// Phase 137-4: Verify router parity between canonicalizer and router
|
|
||||||
///
|
|
||||||
/// Dev-only: Ensures the canonicalizer's pattern choice matches the router's
|
|
||||||
/// pattern_kind. On mismatch:
|
|
||||||
/// - Debug mode (HAKO_JOINIR_DEBUG=1): Log warning
|
|
||||||
/// - Strict mode (HAKO_JOINIR_STRICT=1): Return error
|
|
||||||
fn verify_router_parity(
|
|
||||||
&self,
|
|
||||||
condition: &ASTNode,
|
|
||||||
body: &[ASTNode],
|
|
||||||
func_name: &str,
|
|
||||||
ctx: &super::patterns::LoopPatternContext,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
use crate::ast::Span;
|
|
||||||
use crate::mir::loop_canonicalizer::canonicalize_loop_expr;
|
|
||||||
|
|
||||||
// Reconstruct loop AST for canonicalizer
|
|
||||||
let loop_ast = ASTNode::Loop {
|
|
||||||
condition: Box::new(condition.clone()),
|
|
||||||
body: body.to_vec(),
|
|
||||||
span: Span::unknown(),
|
|
||||||
};
|
|
||||||
|
|
||||||
// Run canonicalizer
|
|
||||||
let (_, decision) = canonicalize_loop_expr(&loop_ast)
|
|
||||||
.map_err(|e| format!("[loop_canonicalizer/PARITY] Canonicalizer error: {}", e))?;
|
|
||||||
|
|
||||||
// Compare patterns only if canonicalizer succeeded
|
|
||||||
if let Some(canonical_pattern) = decision.chosen {
|
|
||||||
let actual_pattern = ctx.pattern_kind;
|
|
||||||
|
|
||||||
if canonical_pattern != actual_pattern {
|
|
||||||
// Pattern mismatch detected
|
|
||||||
let msg = format!(
|
|
||||||
"[loop_canonicalizer/PARITY] MISMATCH in function '{}': \
|
|
||||||
canonical={:?}, actual={:?}",
|
|
||||||
func_name, canonical_pattern, actual_pattern
|
|
||||||
);
|
|
||||||
|
|
||||||
// Check strict mode
|
|
||||||
let is_strict = std::env::var("HAKO_JOINIR_STRICT").is_ok()
|
|
||||||
|| std::env::var("NYASH_JOINIR_STRICT").is_ok();
|
|
||||||
|
|
||||||
if is_strict {
|
|
||||||
// Strict mode: fail fast
|
|
||||||
return Err(msg);
|
|
||||||
} else {
|
|
||||||
// Debug mode: log only
|
|
||||||
eprintln!("{}", msg);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Patterns match - success!
|
|
||||||
eprintln!(
|
|
||||||
"[loop_canonicalizer/PARITY] OK in function '{}': \
|
|
||||||
canonical and actual agree on {:?}",
|
|
||||||
func_name, canonical_pattern
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Canonicalizer failed (Fail-Fast)
|
|
||||||
// Log but don't error - router might still handle it
|
|
||||||
eprintln!(
|
|
||||||
"[loop_canonicalizer/PARITY] Canonicalizer failed for '{}': {}",
|
|
||||||
func_name,
|
|
||||||
decision.notes.join("; ")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Phase 49: Try JoinIR Frontend for mainline integration
|
/// Phase 49: Try JoinIR Frontend for mainline integration
|
||||||
///
|
///
|
||||||
@ -288,172 +218,3 @@ impl MirBuilder {
|
|||||||
self.cf_loop_joinir_legacy_binding(condition, body, func_name, debug)
|
self.cf_loop_joinir_legacy_binding(condition, body, func_name, debug)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use crate::ast::{ASTNode, BinaryOperator, LiteralValue, Span};
|
|
||||||
|
|
||||||
/// Test helper: Create a skip_whitespace pattern loop AST
|
|
||||||
fn build_skip_whitespace_loop() -> ASTNode {
|
|
||||||
ASTNode::Loop {
|
|
||||||
condition: Box::new(ASTNode::BinaryOp {
|
|
||||||
operator: BinaryOperator::Less,
|
|
||||||
left: Box::new(ASTNode::Variable {
|
|
||||||
name: "p".to_string(),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
right: Box::new(ASTNode::Variable {
|
|
||||||
name: "len".to_string(),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
body: vec![ASTNode::If {
|
|
||||||
condition: Box::new(ASTNode::BinaryOp {
|
|
||||||
operator: BinaryOperator::Equal,
|
|
||||||
left: Box::new(ASTNode::Variable {
|
|
||||||
name: "is_ws".to_string(),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
right: Box::new(ASTNode::Literal {
|
|
||||||
value: LiteralValue::Integer(1),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
then_body: vec![ASTNode::Assignment {
|
|
||||||
target: Box::new(ASTNode::Variable {
|
|
||||||
name: "p".to_string(),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
value: Box::new(ASTNode::BinaryOp {
|
|
||||||
operator: BinaryOperator::Add,
|
|
||||||
left: Box::new(ASTNode::Variable {
|
|
||||||
name: "p".to_string(),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
right: Box::new(ASTNode::Literal {
|
|
||||||
value: LiteralValue::Integer(1),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}],
|
|
||||||
else_body: Some(vec![ASTNode::Break {
|
|
||||||
span: Span::unknown(),
|
|
||||||
}]),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}],
|
|
||||||
span: Span::unknown(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_parity_check_skip_whitespace_match() {
|
|
||||||
use crate::mir::loop_canonicalizer::canonicalize_loop_expr;
|
|
||||||
use crate::mir::builder::control_flow::joinir::patterns::ast_feature_extractor as ast_features;
|
|
||||||
|
|
||||||
let loop_ast = build_skip_whitespace_loop();
|
|
||||||
|
|
||||||
// Extract condition and body
|
|
||||||
let (condition, body) = match &loop_ast {
|
|
||||||
ASTNode::Loop { condition, body, .. } => (condition.as_ref(), body.as_slice()),
|
|
||||||
_ => panic!("Expected loop node"),
|
|
||||||
};
|
|
||||||
|
|
||||||
// Run canonicalizer
|
|
||||||
let (_, canonical_decision) = canonicalize_loop_expr(&loop_ast).unwrap();
|
|
||||||
let canonical_pattern = canonical_decision.chosen.expect("Canonicalizer should succeed");
|
|
||||||
|
|
||||||
// Run router's pattern detection
|
|
||||||
let has_continue = ast_features::detect_continue_in_body(body);
|
|
||||||
let has_break = ast_features::detect_break_in_body(body);
|
|
||||||
let features = ast_features::extract_features(condition, body, has_continue, has_break);
|
|
||||||
let actual_pattern = crate::mir::loop_pattern_detection::classify(&features);
|
|
||||||
|
|
||||||
// Phase 137-5: Verify MATCH (ExitContract policy fix)
|
|
||||||
// Both canonicalizer and router should agree on Pattern2Break
|
|
||||||
// because has_break=true (ExitContract determines pattern choice)
|
|
||||||
assert_eq!(
|
|
||||||
canonical_pattern,
|
|
||||||
crate::mir::loop_pattern_detection::LoopPatternKind::Pattern2Break,
|
|
||||||
"Canonicalizer should choose Pattern2Break for has_break=true"
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
actual_pattern,
|
|
||||||
crate::mir::loop_pattern_detection::LoopPatternKind::Pattern2Break,
|
|
||||||
"Router should classify as Pattern2Break for has_break=true"
|
|
||||||
);
|
|
||||||
assert_eq!(canonical_pattern, actual_pattern, "Phase 137-5: Canonicalizer and router should agree (SSOT policy)");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_parity_check_match_simple_while() {
|
|
||||||
use crate::mir::loop_canonicalizer::canonicalize_loop_expr;
|
|
||||||
use crate::mir::builder::control_flow::joinir::patterns::ast_feature_extractor as ast_features;
|
|
||||||
|
|
||||||
// Simple while loop: no break, no continue, no if
|
|
||||||
let loop_ast = ASTNode::Loop {
|
|
||||||
condition: Box::new(ASTNode::BinaryOp {
|
|
||||||
operator: BinaryOperator::Less,
|
|
||||||
left: Box::new(ASTNode::Variable {
|
|
||||||
name: "i".to_string(),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
right: Box::new(ASTNode::Literal {
|
|
||||||
value: LiteralValue::Integer(10),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
body: vec![ASTNode::Assignment {
|
|
||||||
target: Box::new(ASTNode::Variable {
|
|
||||||
name: "i".to_string(),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
value: Box::new(ASTNode::BinaryOp {
|
|
||||||
operator: BinaryOperator::Add,
|
|
||||||
left: Box::new(ASTNode::Variable {
|
|
||||||
name: "i".to_string(),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
right: Box::new(ASTNode::Literal {
|
|
||||||
value: LiteralValue::Integer(1),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}),
|
|
||||||
span: Span::unknown(),
|
|
||||||
}],
|
|
||||||
span: Span::unknown(),
|
|
||||||
};
|
|
||||||
|
|
||||||
// Extract condition and body
|
|
||||||
let (condition, body) = match &loop_ast {
|
|
||||||
ASTNode::Loop { condition, body, .. } => (condition.as_ref(), body.as_slice()),
|
|
||||||
_ => panic!("Expected loop node"),
|
|
||||||
};
|
|
||||||
|
|
||||||
// Canonicalizer will fail for simple patterns (not yet implemented)
|
|
||||||
let canonical_result = canonicalize_loop_expr(&loop_ast);
|
|
||||||
|
|
||||||
// Router's pattern detection
|
|
||||||
let has_continue = ast_features::detect_continue_in_body(body);
|
|
||||||
let has_break = ast_features::detect_break_in_body(body);
|
|
||||||
let features = ast_features::extract_features(condition, body, has_continue, has_break);
|
|
||||||
let actual_pattern = crate::mir::loop_pattern_detection::classify(&features);
|
|
||||||
|
|
||||||
// Router should classify as Pattern1SimpleWhile
|
|
||||||
assert_eq!(
|
|
||||||
actual_pattern,
|
|
||||||
crate::mir::loop_pattern_detection::LoopPatternKind::Pattern1SimpleWhile
|
|
||||||
);
|
|
||||||
|
|
||||||
// Canonicalizer should fail (not implemented yet for Pattern1)
|
|
||||||
assert!(canonical_result.is_ok());
|
|
||||||
let (_, decision) = canonical_result.unwrap();
|
|
||||||
assert!(decision.is_fail_fast(), "Canonicalizer should fail for simple patterns (Phase 3 only supports skip_whitespace)");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user