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:
@ -7,9 +7,9 @@
|
||||
* Manages the complex state transitions during function lowering
|
||||
*/
|
||||
|
||||
use super::special_handlers::contains_value_return;
|
||||
use crate::ast::ASTNode;
|
||||
use crate::mir::{Effect, EffectMask, FunctionSignature, MirType};
|
||||
use super::special_handlers::contains_value_return;
|
||||
|
||||
/// Prepare function signature for a box method
|
||||
/// Includes 'me' parameter as first parameter
|
||||
@ -32,7 +32,7 @@ pub fn prepare_method_signature(
|
||||
// Determine return type based on body analysis
|
||||
let returns_value = contains_value_return(body);
|
||||
let ret_ty = if returns_value {
|
||||
MirType::Unknown // Will be inferred later
|
||||
MirType::Unknown // Will be inferred later
|
||||
} else {
|
||||
MirType::Void
|
||||
};
|
||||
@ -62,7 +62,7 @@ pub fn prepare_static_method_signature(
|
||||
// Determine return type based on body analysis
|
||||
let returns_value = contains_value_return(body);
|
||||
let ret_ty = if returns_value {
|
||||
MirType::Unknown // Will be inferred later
|
||||
MirType::Unknown // Will be inferred later
|
||||
} else {
|
||||
MirType::Void
|
||||
};
|
||||
@ -77,11 +77,7 @@ pub fn prepare_static_method_signature(
|
||||
|
||||
/// Generate canonical method name for MIR function
|
||||
/// E.g., "StringBox.upper/0" for StringBox's upper method with 0 args
|
||||
pub fn generate_method_function_name(
|
||||
box_name: &str,
|
||||
method_name: &str,
|
||||
arity: usize,
|
||||
) -> String {
|
||||
pub fn generate_method_function_name(box_name: &str, method_name: &str, arity: usize) -> String {
|
||||
format!("{}.{}/{}", box_name, method_name, arity)
|
||||
}
|
||||
|
||||
@ -120,10 +116,9 @@ pub fn create_method_parameter_mapping(
|
||||
}
|
||||
|
||||
/// Create parameter mapping for static method lowering
|
||||
pub fn create_static_parameter_mapping(
|
||||
params: &[String],
|
||||
) -> Vec<(String, MirType)> {
|
||||
params.iter()
|
||||
pub fn create_static_parameter_mapping(params: &[String]) -> Vec<(String, MirType)> {
|
||||
params
|
||||
.iter()
|
||||
.map(|p| (p.clone(), MirType::Unknown))
|
||||
.collect()
|
||||
}
|
||||
@ -139,14 +134,24 @@ pub fn wrap_in_program(statements: Vec<ASTNode>) -> ASTNode {
|
||||
/// Check if method name suggests it returns a value
|
||||
pub fn method_likely_returns_value(method_name: &str) -> bool {
|
||||
// Heuristic: methods that likely return values
|
||||
method_name.starts_with("get") ||
|
||||
method_name.starts_with("is") ||
|
||||
method_name.starts_with("has") ||
|
||||
method_name.starts_with("to") ||
|
||||
matches!(method_name,
|
||||
"length" | "size" | "count" |
|
||||
"upper" | "lower" | "trim" |
|
||||
"add" | "sub" | "mul" | "div" |
|
||||
"min" | "max" | "abs"
|
||||
)
|
||||
method_name.starts_with("get")
|
||||
|| method_name.starts_with("is")
|
||||
|| method_name.starts_with("has")
|
||||
|| method_name.starts_with("to")
|
||||
|| matches!(
|
||||
method_name,
|
||||
"length"
|
||||
| "size"
|
||||
| "count"
|
||||
| "upper"
|
||||
| "lower"
|
||||
| "trim"
|
||||
| "add"
|
||||
| "sub"
|
||||
| "mul"
|
||||
| "div"
|
||||
| "min"
|
||||
| "max"
|
||||
| "abs"
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user