✨ 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>
178 lines
6.3 KiB
Rust
178 lines
6.3 KiB
Rust
use super::ValueId;
|
|
use crate::ast::ASTNode;
|
|
|
|
impl super::MirBuilder {
|
|
// Lambda lowering to NewClosure
|
|
pub(super) fn build_lambda_expression(
|
|
&mut self,
|
|
params: Vec<String>,
|
|
body: Vec<ASTNode>,
|
|
) -> Result<ValueId, String> {
|
|
use std::collections::HashSet;
|
|
let mut used: HashSet<String> = HashSet::new();
|
|
let mut locals: HashSet<String> = HashSet::new();
|
|
for p in ¶ms {
|
|
locals.insert(p.clone());
|
|
}
|
|
fn collect_vars(
|
|
ast: &ASTNode,
|
|
used: &mut std::collections::HashSet<String>,
|
|
locals: &mut std::collections::HashSet<String>,
|
|
) {
|
|
match ast {
|
|
ASTNode::Variable { name, .. } => {
|
|
if !locals.contains(name) {
|
|
used.insert(name.clone());
|
|
}
|
|
}
|
|
ASTNode::Assignment { target, value, .. } => {
|
|
collect_vars(target, used, locals);
|
|
collect_vars(value, used, locals);
|
|
}
|
|
ASTNode::BinaryOp { left, right, .. } => {
|
|
collect_vars(left, used, locals);
|
|
collect_vars(right, used, locals);
|
|
}
|
|
ASTNode::UnaryOp { operand, .. } => {
|
|
collect_vars(operand, used, locals);
|
|
}
|
|
ASTNode::MethodCall {
|
|
object, arguments, ..
|
|
} => {
|
|
collect_vars(object, used, locals);
|
|
for a in arguments {
|
|
collect_vars(a, used, locals);
|
|
}
|
|
}
|
|
ASTNode::FunctionCall { arguments, .. } => {
|
|
for a in arguments {
|
|
collect_vars(a, used, locals);
|
|
}
|
|
}
|
|
ASTNode::Call {
|
|
callee, arguments, ..
|
|
} => {
|
|
collect_vars(callee, used, locals);
|
|
for a in arguments {
|
|
collect_vars(a, used, locals);
|
|
}
|
|
}
|
|
ASTNode::FieldAccess { object, .. } => {
|
|
collect_vars(object, used, locals);
|
|
}
|
|
ASTNode::New { arguments, .. } => {
|
|
for a in arguments {
|
|
collect_vars(a, used, locals);
|
|
}
|
|
}
|
|
ASTNode::If {
|
|
condition,
|
|
then_body,
|
|
else_body,
|
|
..
|
|
} => {
|
|
collect_vars(condition, used, locals);
|
|
for st in then_body {
|
|
collect_vars(st, used, locals);
|
|
}
|
|
if let Some(eb) = else_body {
|
|
for st in eb {
|
|
collect_vars(st, used, locals);
|
|
}
|
|
}
|
|
}
|
|
ASTNode::Loop {
|
|
condition, body, ..
|
|
} => {
|
|
collect_vars(condition, used, locals);
|
|
for st in body {
|
|
collect_vars(st, used, locals);
|
|
}
|
|
}
|
|
ASTNode::TryCatch {
|
|
try_body,
|
|
catch_clauses,
|
|
finally_body,
|
|
..
|
|
} => {
|
|
for st in try_body {
|
|
collect_vars(st, used, locals);
|
|
}
|
|
for c in catch_clauses {
|
|
for st in &c.body {
|
|
collect_vars(st, used, locals);
|
|
}
|
|
}
|
|
if let Some(fb) = finally_body {
|
|
for st in fb {
|
|
collect_vars(st, used, locals);
|
|
}
|
|
}
|
|
}
|
|
ASTNode::Throw { expression, .. } => {
|
|
collect_vars(expression, used, locals);
|
|
}
|
|
ASTNode::Print { expression, .. } => {
|
|
collect_vars(expression, used, locals);
|
|
}
|
|
ASTNode::Return { value, .. } => {
|
|
if let Some(v) = value {
|
|
collect_vars(v, used, locals);
|
|
}
|
|
}
|
|
ASTNode::AwaitExpression { expression, .. } => {
|
|
collect_vars(expression, used, locals);
|
|
}
|
|
ASTNode::MatchExpr {
|
|
scrutinee,
|
|
arms,
|
|
else_expr,
|
|
..
|
|
} => {
|
|
collect_vars(scrutinee, used, locals);
|
|
for (_, e) in arms {
|
|
collect_vars(e, used, locals);
|
|
}
|
|
collect_vars(else_expr, used, locals);
|
|
}
|
|
ASTNode::Program { statements, .. } => {
|
|
for st in statements {
|
|
collect_vars(st, used, locals);
|
|
}
|
|
}
|
|
ASTNode::FunctionDeclaration { params, body, .. } => {
|
|
let mut inner = locals.clone();
|
|
for p in params {
|
|
inner.insert(p.clone());
|
|
}
|
|
for st in body {
|
|
collect_vars(st, used, &mut inner);
|
|
}
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
for st in body.iter() {
|
|
collect_vars(st, &mut used, &mut locals);
|
|
}
|
|
let mut captures: Vec<(String, ValueId)> = Vec::new();
|
|
for name in used.into_iter() {
|
|
if let Some(&vid) = self.variable_map.get(&name) {
|
|
captures.push((name, vid));
|
|
}
|
|
}
|
|
let me = self.variable_map.get("me").copied();
|
|
let dst = self.value_gen.next();
|
|
self.emit_instruction(super::MirInstruction::NewClosure {
|
|
dst,
|
|
params: params.clone(),
|
|
body: body.clone(),
|
|
captures,
|
|
me,
|
|
})?;
|
|
self.value_types
|
|
.insert(dst, crate::mir::MirType::Box("FunctionBox".to_string()));
|
|
Ok(dst)
|
|
}
|
|
}
|