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>
88 lines
2.1 KiB
Rust
88 lines
2.1 KiB
Rust
use crate::parser::NyashParser;
|
|
|
|
fn parse(src: &str) -> crate::ast::ASTNode {
|
|
NyashParser::parse_from_string(src).expect("parse ok")
|
|
}
|
|
|
|
fn no_toplevel_funccall(ast: &crate::ast::ASTNode) -> bool {
|
|
match ast {
|
|
crate::ast::ASTNode::Program { statements, .. } => !statements
|
|
.iter()
|
|
.any(|n| matches!(n, crate::ast::ASTNode::FunctionCall { .. })),
|
|
_ => true,
|
|
}
|
|
}
|
|
|
|
fn box_has_methods(ast: &crate::ast::ASTNode, box_name: &str, methods: &[&str]) -> bool {
|
|
fn check_box(b: &crate::ast::ASTNode, box_name: &str, methods: &[&str]) -> bool {
|
|
if let crate::ast::ASTNode::BoxDeclaration {
|
|
name,
|
|
methods: m,
|
|
is_static,
|
|
..
|
|
} = b
|
|
{
|
|
if name == box_name && *is_static {
|
|
return methods.iter().all(|k| {
|
|
if let Some(node) = m.get(*k) {
|
|
matches!(node, crate::ast::ASTNode::FunctionDeclaration { name, .. } if name == *k)
|
|
} else { false }
|
|
});
|
|
}
|
|
}
|
|
false
|
|
}
|
|
match ast {
|
|
crate::ast::ASTNode::Program { statements, .. } => {
|
|
statements.iter().any(|n| check_box(n, box_name, methods))
|
|
}
|
|
_ => false,
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn static_box_methods_no_stray_call_compact() {
|
|
let src = r#"
|
|
static box S {
|
|
f(a) { return a }
|
|
g(b) { return b }
|
|
}
|
|
"#;
|
|
let ast = parse(src);
|
|
assert!(
|
|
no_toplevel_funccall(&ast),
|
|
"no top-level FunctionCall expected"
|
|
);
|
|
assert!(
|
|
box_has_methods(&ast, "S", &["f", "g"]),
|
|
"static box S should have f and g methods"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn static_box_methods_no_stray_call_newline_seams() {
|
|
// Newlines between ) and {, and tight seam between } and next method head
|
|
let src = r#"
|
|
static box S {
|
|
parse_float(s)
|
|
{
|
|
return s
|
|
}
|
|
is_empty_or_whitespace(s)
|
|
{
|
|
return 0
|
|
}
|
|
}
|
|
"#;
|
|
let ast = parse(src);
|
|
assert!(
|
|
no_toplevel_funccall(&ast),
|
|
"no top-level FunctionCall expected at seams"
|
|
);
|
|
assert!(box_has_methods(
|
|
&ast,
|
|
"S",
|
|
&["parse_float", "is_empty_or_whitespace"]
|
|
));
|
|
}
|