chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
Phase 25.1 完了成果: - ✅ LoopForm v2 テスト・ドキュメント・コメント完備 - 4ケース(A/B/C/D)完全テストカバレッジ - 最小再現ケース作成(SSAバグ調査用) - SSOT文書作成(loopform_ssot.md) - 全ソースに [LoopForm] コメントタグ追加 - ✅ Stage-1 CLI デバッグ環境構築 - stage1_cli.hako 実装 - stage1_bridge.rs ブリッジ実装 - デバッグツール作成(stage1_debug.sh/stage1_minimal.sh) - アーキテクチャ改善提案文書 - ✅ 環境変数削減計画策定 - 25変数の完全調査・分類 - 6段階削減ロードマップ(25→5、80%削減) - 即時削除可能変数特定(NYASH_CONFIG/NYASH_DEBUG) Phase 26-D からの累積変更: - PHI実装改善(ExitPhiBuilder/HeaderPhiBuilder等) - MIRビルダーリファクタリング - 型伝播・最適化パス改善 - その他約300ファイルの累積変更 🎯 技術的成果: - SSAバグ根本原因特定(条件分岐内loop変数変更) - Region+next_iパターン適用完了(UsingCollectorBox等) - LoopFormパターン文書化・テスト化完了 - セルフホスティング基盤強化 Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: ChatGPT <noreply@openai.com> Co-Authored-By: Task Assistant <task@anthropic.com>
This commit is contained in:
@ -16,16 +16,14 @@
|
||||
|
||||
use crate::box_trait::{BoolBox, IntegerBox, NyashBox, StringBox};
|
||||
use crate::boxes::FloatBox;
|
||||
use crate::operator_traits::{
|
||||
DynamicAdd, DynamicDiv, DynamicMul, DynamicSub, OperatorError,
|
||||
};
|
||||
use crate::operator_traits::{DynamicAdd, DynamicDiv, DynamicMul, DynamicSub, OperatorError};
|
||||
|
||||
// Phase 1-2: Import macros, helpers, and static implementations from separate modules
|
||||
mod macros;
|
||||
mod helpers;
|
||||
mod macros;
|
||||
mod static_ops;
|
||||
|
||||
pub use helpers::{concat_result, can_repeat};
|
||||
pub use helpers::{can_repeat, concat_result};
|
||||
pub use macros::impl_static_numeric_ops;
|
||||
|
||||
// Phase 2: Static implementations are now in static_ops.rs
|
||||
@ -392,16 +390,27 @@ impl OperatorResolver {
|
||||
#[inline]
|
||||
fn try_dyn_left_add(left: &dyn NyashBox, right: &dyn NyashBox) -> Option<Box<dyn NyashBox>> {
|
||||
if let Some(int_box) = left.as_any().downcast_ref::<crate::box_trait::IntegerBox>() {
|
||||
if let Some(result) = int_box.try_add(right) { return Some(result); }
|
||||
if let Some(result) = int_box.try_add(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
if let Some(str_box) = left.as_any().downcast_ref::<crate::box_trait::StringBox>() {
|
||||
if let Some(result) = str_box.try_add(right) { return Some(result); }
|
||||
if let Some(result) = str_box.try_add(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
if let Some(float_box) = left.as_any().downcast_ref::<crate::boxes::math_box::FloatBox>() {
|
||||
if let Some(result) = float_box.try_add(right) { return Some(result); }
|
||||
if let Some(float_box) = left
|
||||
.as_any()
|
||||
.downcast_ref::<crate::boxes::math_box::FloatBox>()
|
||||
{
|
||||
if let Some(result) = float_box.try_add(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
if let Some(bool_box) = left.as_any().downcast_ref::<crate::box_trait::BoolBox>() {
|
||||
if let Some(result) = bool_box.try_add(right) { return Some(result); }
|
||||
if let Some(result) = bool_box.try_add(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
@ -409,13 +418,22 @@ impl OperatorResolver {
|
||||
#[inline]
|
||||
fn try_dyn_left_sub(left: &dyn NyashBox, right: &dyn NyashBox) -> Option<Box<dyn NyashBox>> {
|
||||
if let Some(int_box) = left.as_any().downcast_ref::<crate::box_trait::IntegerBox>() {
|
||||
if let Some(result) = int_box.try_sub(right) { return Some(result); }
|
||||
if let Some(result) = int_box.try_sub(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
if let Some(float_box) = left.as_any().downcast_ref::<crate::boxes::math_box::FloatBox>() {
|
||||
if let Some(result) = float_box.try_sub(right) { return Some(result); }
|
||||
if let Some(float_box) = left
|
||||
.as_any()
|
||||
.downcast_ref::<crate::boxes::math_box::FloatBox>()
|
||||
{
|
||||
if let Some(result) = float_box.try_sub(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
if let Some(bool_box) = left.as_any().downcast_ref::<crate::box_trait::BoolBox>() {
|
||||
if let Some(result) = bool_box.try_sub(right) { return Some(result); }
|
||||
if let Some(result) = bool_box.try_sub(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
@ -423,16 +441,27 @@ impl OperatorResolver {
|
||||
#[inline]
|
||||
fn try_dyn_left_mul(left: &dyn NyashBox, right: &dyn NyashBox) -> Option<Box<dyn NyashBox>> {
|
||||
if let Some(int_box) = left.as_any().downcast_ref::<crate::box_trait::IntegerBox>() {
|
||||
if let Some(result) = int_box.try_mul(right) { return Some(result); }
|
||||
if let Some(result) = int_box.try_mul(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
if let Some(str_box) = left.as_any().downcast_ref::<crate::box_trait::StringBox>() {
|
||||
if let Some(result) = str_box.try_mul(right) { return Some(result); }
|
||||
if let Some(result) = str_box.try_mul(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
if let Some(float_box) = left.as_any().downcast_ref::<crate::boxes::math_box::FloatBox>() {
|
||||
if let Some(result) = float_box.try_mul(right) { return Some(result); }
|
||||
if let Some(float_box) = left
|
||||
.as_any()
|
||||
.downcast_ref::<crate::boxes::math_box::FloatBox>()
|
||||
{
|
||||
if let Some(result) = float_box.try_mul(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
if let Some(bool_box) = left.as_any().downcast_ref::<crate::box_trait::BoolBox>() {
|
||||
if let Some(result) = bool_box.try_mul(right) { return Some(result); }
|
||||
if let Some(result) = bool_box.try_mul(right) {
|
||||
return Some(result);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
@ -442,7 +471,10 @@ impl OperatorResolver {
|
||||
if let Some(int_box) = left.as_any().downcast_ref::<crate::box_trait::IntegerBox>() {
|
||||
return int_box.try_div(right);
|
||||
}
|
||||
if let Some(float_box) = left.as_any().downcast_ref::<crate::boxes::math_box::FloatBox>() {
|
||||
if let Some(float_box) = left
|
||||
.as_any()
|
||||
.downcast_ref::<crate::boxes::math_box::FloatBox>()
|
||||
{
|
||||
return float_box.try_div(right);
|
||||
}
|
||||
if let Some(bool_box) = left.as_any().downcast_ref::<crate::box_trait::BoolBox>() {
|
||||
@ -458,7 +490,9 @@ impl OperatorResolver {
|
||||
// Try to cast to concrete types first and use their DynamicAdd implementation
|
||||
// This approach uses the concrete types rather than trait objects
|
||||
|
||||
if let Some(result) = Self::try_dyn_left_add(left, right) { return Ok(result); }
|
||||
if let Some(result) = Self::try_dyn_left_add(left, right) {
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
Err(OperatorError::UnsupportedOperation {
|
||||
operator: "+".to_string(),
|
||||
@ -472,7 +506,9 @@ impl OperatorResolver {
|
||||
left: &dyn NyashBox,
|
||||
right: &dyn NyashBox,
|
||||
) -> Result<Box<dyn NyashBox>, OperatorError> {
|
||||
if let Some(result) = Self::try_dyn_left_sub(left, right) { return Ok(result); }
|
||||
if let Some(result) = Self::try_dyn_left_sub(left, right) {
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
Err(OperatorError::UnsupportedOperation {
|
||||
operator: "-".to_string(),
|
||||
@ -486,7 +522,9 @@ impl OperatorResolver {
|
||||
left: &dyn NyashBox,
|
||||
right: &dyn NyashBox,
|
||||
) -> Result<Box<dyn NyashBox>, OperatorError> {
|
||||
if let Some(result) = Self::try_dyn_left_mul(left, right) { return Ok(result); }
|
||||
if let Some(result) = Self::try_dyn_left_mul(left, right) {
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
Err(OperatorError::UnsupportedOperation {
|
||||
operator: "*".to_string(),
|
||||
@ -500,7 +538,9 @@ impl OperatorResolver {
|
||||
left: &dyn NyashBox,
|
||||
right: &dyn NyashBox,
|
||||
) -> Result<Box<dyn NyashBox>, OperatorError> {
|
||||
if let Some(result) = Self::try_dyn_left_div(left, right) { return Ok(result); }
|
||||
if let Some(result) = Self::try_dyn_left_div(left, right) {
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
Err(OperatorError::UnsupportedOperation {
|
||||
operator: "/".to_string(),
|
||||
|
||||
Reference in New Issue
Block a user