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

chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt

Browse Source
This commit is contained in:
Selfhosting Dev
2025-09-17 07:43:07 +09:00
parent fcf8ce1f3c
commit adbb0201a9
385 changed files with 35622 additions and 15004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
src/tests/identical_exec_instance.rs
View File

@ -1,56 +1,142 @@
#[cfg(all(test, not(feature = "jit-direct-only")))]
mod tests {
use std::sync::{Arc, RwLock};
use std::collections::HashMap;
use std::sync::{Arc, RwLock};
use crate::backend::VM;
use crate::mir::{MirModule, MirFunction, FunctionSignature, BasicBlockId, MirInstruction, ConstValue, EffectMask, MirType};
use crate::box_trait::NyashBox;
use crate::interpreter::RuntimeError;
use crate::mir::{
BasicBlockId, ConstValue, EffectMask, FunctionSignature, MirFunction, MirInstruction,
MirModule, MirType,
};
// Minimal Person factory: creates InstanceBox with fields [name, age]
struct PersonFactory;
impl crate::box_factory::BoxFactory for PersonFactory {
fn create_box(&self, name: &str, _args: &[Box<dyn NyashBox>]) -> Result<Box<dyn NyashBox>, RuntimeError> {
if name != "Person" { return Err(RuntimeError::InvalidOperation { message: format!("Unknown Box type: {}", name) }); }
fn create_box(
&self,
name: &str,
_args: &[Box<dyn NyashBox>],
) -> Result<Box<dyn NyashBox>, RuntimeError> {
if name != "Person" {
return Err(RuntimeError::InvalidOperation {
message: format!("Unknown Box type: {}", name),
});
}
let fields = vec!["name".to_string(), "age".to_string()];
let methods: HashMap<String, crate::ast::ASTNode> = HashMap::new();
let inst = crate::instance_v2::InstanceBox::from_declaration("Person".to_string(), fields, methods);
let inst = crate::instance_v2::InstanceBox::from_declaration(
"Person".to_string(),
fields,
methods,
);
Ok(Box::new(inst))
}
fn box_types(&self) -> Vec<&str> { vec!["Person"] }
fn is_builtin_factory(&self) -> bool { true }
fn box_types(&self) -> Vec<&str> {
vec!["Person"]
}
fn is_builtin_factory(&self) -> bool {
true
}
}
fn build_person_module() -> MirModule {
let mut module = MirModule::new("identical_person".to_string());
let sig = FunctionSignature { name: "main".into(), params: vec![], return_type: MirType::String, effects: EffectMask::PURE };
let sig = FunctionSignature {
name: "main".into(),
params: vec![],
return_type: MirType::String,
effects: EffectMask::PURE,
};
let mut f = MirFunction::new(sig, BasicBlockId::new(0));
let bb = f.entry_block;
let person = f.next_value_id();
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::NewBox { dst: person, box_type: "Person".into(), args: vec![] });
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::NewBox {
dst: person,
box_type: "Person".into(),
args: vec![],
});
// person.setField("name", "Alice")
let k_name = f.next_value_id();
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::Const { dst: k_name, value: ConstValue::String("name".into()) });
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::Const {
dst: k_name,
value: ConstValue::String("name".into()),
});
let v_alice = f.next_value_id();
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::Const { dst: v_alice, value: ConstValue::String("Alice".into()) });
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::BoxCall { dst: None, box_val: person, method: "setField".into(), args: vec![k_name, v_alice], method_id: None, effects: EffectMask::PURE });
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::Const {
dst: v_alice,
value: ConstValue::String("Alice".into()),
});
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::BoxCall {
dst: None,
box_val: person,
method: "setField".into(),
args: vec![k_name, v_alice],
method_id: None,
effects: EffectMask::PURE,
});
// person.setField("age", 25)
let k_age = f.next_value_id();
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::Const { dst: k_age, value: ConstValue::String("age".into()) });
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::Const {
dst: k_age,
value: ConstValue::String("age".into()),
});
let v_25 = f.next_value_id();
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::Const { dst: v_25, value: ConstValue::Integer(25) });
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::BoxCall { dst: None, box_val: person, method: "setField".into(), args: vec![k_age, v_25], method_id: None, effects: EffectMask::PURE });
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::Const {
dst: v_25,
value: ConstValue::Integer(25),
});
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::BoxCall {
dst: None,
box_val: person,
method: "setField".into(),
args: vec![k_age, v_25],
method_id: None,
effects: EffectMask::PURE,
});
// name = person.getField("name"); return name
let k_name2 = f.next_value_id();
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::Const { dst: k_name2, value: ConstValue::String("name".into()) });
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::Const {
dst: k_name2,
value: ConstValue::String("name".into()),
});
let out_name = f.next_value_id();
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::BoxCall { dst: Some(out_name), box_val: person, method: "getField".into(), args: vec![k_name2], method_id: None, effects: EffectMask::PURE });
f.get_block_mut(bb).unwrap().add_instruction(MirInstruction::Return { value: Some(out_name) });
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::BoxCall {
dst: Some(out_name),
box_val: person,
method: "getField".into(),
args: vec![k_name2],
method_id: None,
effects: EffectMask::PURE,
});
f.get_block_mut(bb)
.unwrap()
.add_instruction(MirInstruction::Return {
value: Some(out_name),
});
module.add_function(f);
module
@ -79,7 +165,8 @@ mod tests {
// JIT（host-bridge on）
std::env::set_var("NYASH_JIT_HOST_BRIDGE", "1");
let jit_out = crate::backend::cranelift_compile_and_execute(&module, "identical_person").expect("JIT exec");
let jit_out = crate::backend::cranelift_compile_and_execute(&module, "identical_person")
.expect("JIT exec");
let jit_s = jit_out.to_string_box().value;
assert_eq!(vm_s, jit_s);