tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phase29ak(p4): remove pattern1 guard from single_planner

Browse Source
This commit is contained in:
tomoaki
2025-12-29 15:10:08 +09:00
parent 655b968fb4
commit afe12ffa35
6 changed files with 88 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mir/builder/control_flow/plan/single_planner/rules.rs
View File

@ -32,22 +32,23 @@ pub(super) fn try_build_domain_plan(ctx: &LoopPatternContext) -> Result<Option<D
for rule_id in PLAN_RULE_ORDER {
let rule_id = *rule_id;
let name = rule_name(rule_id);
// Phase 286 P2.6: Pattern1 Plan guard (structural Fail-Fast)
// Phase 29ak P1: planner also suppresses Pattern1 facts; keep this guard as safety.
// Pattern1 should only match Pattern1SimpleWhile pattern_kind
// This prevents Pattern1 from incorrectly matching Pattern3 fixtures
if matches!(rule_id, PlanRuleId::Pattern1)
&& ctx.pattern_kind != LoopPatternKind::Pattern1SimpleWhile
{
continue;
}
let planner_hit = try_take_planner(&planner_opt, rule_id);
// Pattern1 gating is handled by planner/facts; fallback mirrors the same contract.
let allow_pattern1 = match ctx.pattern_kind {
LoopPatternKind::Pattern1SimpleWhile => true,
_ => false,
};
let allow_pattern8 = !ctx.in_static_box;
let (plan_opt, log_none) = if planner_hit.is_some() {
(planner_hit, false)
} else {
(fallback_extract(ctx, rule_id, allow_pattern8)?, true)
let plan_opt = fallback_extract(ctx, rule_id, allow_pattern1, allow_pattern8)?;
let log_none = if matches!(rule_id, PlanRuleId::Pattern1) {
allow_pattern1
} else {
true
};
(plan_opt, log_none)
};
let promotion_tag = if matches!(rule_id, PlanRuleId::Pattern2)
@ -102,10 +103,16 @@ fn try_take_planner(planner_opt: &Option<DomainPlan>, kind: PlanRuleId) -> Optio
fn fallback_extract(
ctx: &LoopPatternContext,
kind: PlanRuleId,
allow_pattern1: bool,
allow_pattern8: bool,
) -> Result<Option<DomainPlan>, String> {
match kind {
PlanRuleId::Pattern1 => extractors::pattern1::extract_pattern1_plan(ctx.condition, ctx.body),
PlanRuleId::Pattern1 => {
if !allow_pattern1 {
return Ok(None);
}
extractors::pattern1::extract_pattern1_plan(ctx.condition, ctx.body)
}
PlanRuleId::Pattern2 => {
extractors::pattern2_break::extract_pattern2_plan(ctx.condition, ctx.body)
}