✨ Phase 3.1-3.2実装完了 - build_indirect_call_expressionでCallTarget::Value使用 - print関数をcall_global print()として統一 - build_function_callでemit_unified_call使用 - ExternCall(env.console.log)→Callee::Global(print)完全移行 🏗️ MIR統一基盤構築 - src/mir/definitions/call_unified.rs: 統一定義(297行) - emit_unified_call()と便利メソッド3種実装 - NYASH_MIR_UNIFIED_CALL=1で段階移行制御 - VM実行器でCallee対応実装済み 📊 進捗状況(26%削減見込み) - Phase 1-2: ✅ 基盤構築完了 - Phase 3.1-3.2: ✅ 基本関数統一完了 - Phase 3.3: 🔄 BoxCall統一中 - Phase 4: 📅 Python LLVM(最優先・63%削減) - Phase 5: 📅 PyVM/VM統一 📚 ドキュメント更新 - CLAUDE.md: テストスクリプト参考集追加 - CURRENT_TASK.md: Phase 3進捗更新 - python-llvm-priority-rationale.md: 優先順位戦略文書化 - mir-call-unification-master-plan.md: スケジュール最新化 🎯 6種類→1種類: Call/BoxCall/PluginInvoke/ExternCall/NewBox/NewClosure → MirCall統一へ 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
105 lines
3.8 KiB
Rust
105 lines
3.8 KiB
Rust
/*!
|
|
* Call Resolution Utilities - Type-safe function call helpers
|
|
*
|
|
* ChatGPT5 Pro Design: Stateless helpers for compile-time function resolution
|
|
* These utilities can be used across different parts of the compiler pipeline
|
|
*/
|
|
|
|
/// Check if function name is a built-in global function
|
|
/// These functions are resolved at compile-time to Callee::Global
|
|
pub fn is_builtin_function(name: &str) -> bool {
|
|
matches!(
|
|
name,
|
|
// Core runtime functions
|
|
"print" | "error" | "panic" | "exit" | "now" |
|
|
// Type operation functions
|
|
"isType" | "asType" |
|
|
// Math functions (may be expanded)
|
|
"abs" | "min" | "max"
|
|
)
|
|
}
|
|
|
|
/// Check if function name is an external/host function
|
|
/// These functions are resolved to Callee::Extern and handled by runtime
|
|
pub fn is_extern_function(name: &str) -> bool {
|
|
name.starts_with("nyash.") // Host functions use nyash.* namespace
|
|
}
|
|
|
|
/// Get suggested resolution for unresolved function names
|
|
/// Provides helpful error messages for common mistakes
|
|
pub fn suggest_resolution(name: &str) -> String {
|
|
match name {
|
|
"print" | "error" | "panic" | "exit" => {
|
|
format!("Consider using ::{}() for global function or check if you're in a box with a {} method", name, name)
|
|
}
|
|
name if name.starts_with("str") || name.starts_with("string") => {
|
|
"Consider using StringBox methods or string.* functions".to_string()
|
|
}
|
|
name if name.starts_with("array") || name.starts_with("arr") => {
|
|
"Consider using ArrayBox methods or array.* functions".to_string()
|
|
}
|
|
_ => {
|
|
format!("Function '{}' not found. Check spelling or add explicit scope qualifier", name)
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Check if a method name is commonly shadowed by global functions
|
|
/// Used for generating warnings about potential self-recursion
|
|
pub fn is_commonly_shadowed_method(method: &str) -> bool {
|
|
matches!(
|
|
method,
|
|
"print" | "error" | "log" | "panic" | // Console methods
|
|
"length" | "size" | "count" | // Container methods
|
|
"toString" | "valueOf" | // Conversion methods
|
|
"equals" | "compare" // Comparison methods
|
|
)
|
|
}
|
|
|
|
/// Generate warning message for potential self-recursion
|
|
pub fn generate_self_recursion_warning(box_name: &str, method: &str) -> String {
|
|
format!(
|
|
"Warning: Potential self-recursion detected in {}.{}(). \
|
|
Consider using ::{}() for global function or {}.{}() for explicit self-call.",
|
|
box_name, method, method, box_name, method
|
|
)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_builtin_function_detection() {
|
|
assert!(is_builtin_function("print"));
|
|
assert!(is_builtin_function("error"));
|
|
assert!(is_builtin_function("panic"));
|
|
assert!(is_builtin_function("isType"));
|
|
assert!(!is_builtin_function("custom_function"));
|
|
assert!(!is_builtin_function("nyash.console.log"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_extern_function_detection() {
|
|
assert!(is_extern_function("nyash.console.log"));
|
|
assert!(is_extern_function("nyash.fs.read"));
|
|
assert!(!is_extern_function("print"));
|
|
assert!(!is_extern_function("custom_function"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_shadowed_method_detection() {
|
|
assert!(is_commonly_shadowed_method("print"));
|
|
assert!(is_commonly_shadowed_method("length"));
|
|
assert!(is_commonly_shadowed_method("toString"));
|
|
assert!(!is_commonly_shadowed_method("custom_method"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_warning_generation() {
|
|
let warning = generate_self_recursion_warning("ConsoleStd", "print");
|
|
assert!(warning.contains("ConsoleStd.print()"));
|
|
assert!(warning.contains("::print()"));
|
|
assert!(warning.contains("self-recursion"));
|
|
}
|
|
} |