tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

builder/exprs: use AssignStmt and ReturnStmt wrappers for clearer destructuring (no behavior change)

Browse Source
This commit is contained in:
Selfhosting Dev
2025-09-17 07:57:29 +09:00
parent 3f930a0057
commit f3be8ea5f6
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mir/builder/exprs.rs
View File

@ -1,6 +1,6 @@
// Expression lowering split from builder.rs to keep files lean // Expression lowering split from builder.rs to keep files lean
use super::{ConstValue, MirInstruction, ValueId}; use super::{ConstValue, MirInstruction, ValueId};
use crate::ast::ASTNode; use crate::ast::{ASTNode, AssignStmt, ReturnStmt};
impl super::MirBuilder { impl super::MirBuilder {
// Main expression dispatcher // Main expression dispatcher
@ -75,11 +75,13 @@ impl super::MirBuilder {
.. ..
} => self.build_from_expression(parent.clone(), method.clone(), arguments.clone()), } => self.build_from_expression(parent.clone(), method.clone(), arguments.clone()),
ASTNode::Assignment { target, value, .. } => { node @ ASTNode::Assignment { .. } => {
if let ASTNode::FieldAccess { object, field, .. } = target.as_ref() { // Use AssignStmt wrapper for clearer destructuring (no behavior change)
self.build_field_assignment(*object.clone(), field.clone(), *value.clone()) let stmt = AssignStmt::try_from(node).expect("ASTNode::Assignment must convert");
} else if let ASTNode::Variable { name, .. } = target.as_ref() { if let ASTNode::FieldAccess { object, field, .. } = stmt.target.as_ref() {
self.build_assignment(name.clone(), *value.clone()) self.build_field_assignment(*object.clone(), field.clone(), *stmt.value.clone())
} else if let ASTNode::Variable { name, .. } = stmt.target.as_ref() {
self.build_assignment(name.clone(), *stmt.value.clone())
} else { } else {
Err("Complex assignment targets not yet supported".to_string()) Err("Complex assignment targets not yet supported".to_string())
} }
@ -108,7 +110,11 @@ impl super::MirBuilder {
self.build_lambda_expression(params.clone(), body.clone()) self.build_lambda_expression(params.clone(), body.clone())
} }
ASTNode::Return { value, .. } => self.build_return_statement(value.clone()), node @ ASTNode::Return { .. } => {
// Use ReturnStmt wrapper for consistent access (no behavior change)
let stmt = ReturnStmt::try_from(node).expect("ASTNode::Return must convert");
self.build_return_statement(stmt.value.clone())
}
// Control flow: break/continue are handled inside LoopBuilder context // Control flow: break/continue are handled inside LoopBuilder context
ASTNode::Local { ASTNode::Local {