chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
This commit is contained in:
@ -1,27 +1,27 @@
|
||||
/*!
|
||||
* MethodBox - Function Pointer Implementation for Nyash
|
||||
*
|
||||
*
|
||||
* イベントハンドラーやコールバックを実現するためのMethodBox実装
|
||||
* ChatGPT先生のアドバイスを全面採用
|
||||
*/
|
||||
|
||||
use crate::box_trait::{NyashBox, StringBox, BoolBox, BoxCore, BoxBase};
|
||||
use crate::ast::ASTNode;
|
||||
use crate::box_trait::{BoolBox, BoxBase, BoxCore, NyashBox, StringBox};
|
||||
use crate::instance_v2::InstanceBox;
|
||||
use std::fmt::{Debug, Display};
|
||||
use std::any::Any;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use once_cell::sync::OnceCell;
|
||||
use std::any::Any;
|
||||
use std::fmt::{Debug, Display};
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
/// BoxType enum - ChatGPT先生の提案に従い、Box型を分類
|
||||
#[derive(Debug)]
|
||||
pub enum BoxType {
|
||||
/// 通常のインスタンス
|
||||
Instance(Box<dyn NyashBox>),
|
||||
|
||||
|
||||
/// 関数定義(インスタンスなし)
|
||||
Function(FunctionDefinition),
|
||||
|
||||
|
||||
/// メソッド参照(インスタンス+メソッド)
|
||||
Method(MethodBox),
|
||||
}
|
||||
@ -40,13 +40,13 @@ pub struct FunctionDefinition {
|
||||
pub struct MethodBox {
|
||||
/// メソッドを持つインスタンス
|
||||
pub instance: Arc<Mutex<Box<dyn NyashBox>>>,
|
||||
|
||||
|
||||
/// メソッド名
|
||||
pub method_name: String,
|
||||
|
||||
|
||||
/// メソッド定義(キャッシュ用)
|
||||
pub method_def: Option<FunctionDefinition>,
|
||||
|
||||
|
||||
/// Box基底
|
||||
base: BoxBase,
|
||||
}
|
||||
@ -57,7 +57,14 @@ impl MethodBox {
|
||||
// メソッド定義をキャッシュ(可能であれば)
|
||||
let method_def = if let Some(inst) = instance.as_any().downcast_ref::<InstanceBox>() {
|
||||
inst.get_method(&method_name).and_then(|ast| {
|
||||
if let ASTNode::FunctionDeclaration { name, params, body, is_static, .. } = ast {
|
||||
if let ASTNode::FunctionDeclaration {
|
||||
name,
|
||||
params,
|
||||
body,
|
||||
is_static,
|
||||
..
|
||||
} = ast
|
||||
{
|
||||
Some(FunctionDefinition {
|
||||
name: name.clone(),
|
||||
params: params.clone(),
|
||||
@ -71,7 +78,7 @@ impl MethodBox {
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
|
||||
Self {
|
||||
instance: Arc::new(Mutex::new(instance)),
|
||||
method_name,
|
||||
@ -79,15 +86,18 @@ impl MethodBox {
|
||||
base: BoxBase::new(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// メソッドを呼び出す
|
||||
pub fn invoke(&self, _args: Vec<Box<dyn NyashBox>>) -> Result<Box<dyn NyashBox>, String> {
|
||||
if let Some(invoker) = METHOD_INVOKER.get() {
|
||||
return invoker.invoke(self, _args);
|
||||
}
|
||||
Err(format!("MethodBox.invoke not configured (no invoker) for method '{}'", self.method_name))
|
||||
Err(format!(
|
||||
"MethodBox.invoke not configured (no invoker) for method '{}'",
|
||||
self.method_name
|
||||
))
|
||||
}
|
||||
|
||||
|
||||
/// インスタンスを取得(内部使用)
|
||||
pub fn get_instance(&self) -> Arc<Mutex<Box<dyn NyashBox>>> {
|
||||
Arc::clone(&self.instance)
|
||||
@ -96,7 +106,11 @@ impl MethodBox {
|
||||
|
||||
/// Global invoker hook to connect MethodBox to the interpreter
|
||||
pub trait MethodInvoker: Send + Sync {
|
||||
fn invoke(&self, method: &MethodBox, args: Vec<Box<dyn NyashBox>>) -> Result<Box<dyn NyashBox>, String>;
|
||||
fn invoke(
|
||||
&self,
|
||||
method: &MethodBox,
|
||||
args: Vec<Box<dyn NyashBox>>,
|
||||
) -> Result<Box<dyn NyashBox>, String>;
|
||||
}
|
||||
|
||||
static METHOD_INVOKER: OnceCell<Arc<dyn MethodInvoker + Send + Sync>> = OnceCell::new();
|
||||
@ -109,29 +123,29 @@ impl NyashBox for MethodBox {
|
||||
fn to_string_box(&self) -> StringBox {
|
||||
StringBox::new(format!("<MethodBox: {}>", self.method_name))
|
||||
}
|
||||
|
||||
|
||||
fn equals(&self, other: &dyn NyashBox) -> BoolBox {
|
||||
if let Some(other_method) = other.as_any().downcast_ref::<MethodBox>() {
|
||||
// 同じインスタンス、同じメソッド名なら等しい
|
||||
let self_inst = self.instance.lock().unwrap();
|
||||
let other_inst = other_method.instance.lock().unwrap();
|
||||
BoolBox::new(
|
||||
self_inst.box_id() == other_inst.box_id() &&
|
||||
self.method_name == other_method.method_name
|
||||
self_inst.box_id() == other_inst.box_id()
|
||||
&& self.method_name == other_method.method_name,
|
||||
)
|
||||
} else {
|
||||
BoolBox::new(false)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fn type_name(&self) -> &'static str {
|
||||
"MethodBox"
|
||||
}
|
||||
|
||||
|
||||
fn clone_box(&self) -> Box<dyn NyashBox> {
|
||||
Box::new(self.clone())
|
||||
}
|
||||
|
||||
|
||||
/// 仮実装: clone_boxと同じ(後で修正)
|
||||
fn share_box(&self) -> Box<dyn NyashBox> {
|
||||
self.clone_box()
|
||||
@ -150,11 +164,11 @@ impl BoxCore for MethodBox {
|
||||
fn fmt_box(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "<MethodBox: {}>", self.method_name)
|
||||
}
|
||||
|
||||
|
||||
fn as_any(&self) -> &dyn Any {
|
||||
self
|
||||
}
|
||||
|
||||
|
||||
fn as_any_mut(&mut self) -> &mut dyn Any {
|
||||
self
|
||||
}
|
||||
@ -171,7 +185,7 @@ impl Display for MethodBox {
|
||||
pub struct EphemeralInstance {
|
||||
/// ローカル変数
|
||||
pub locals: HashMap<String, Box<dyn NyashBox>>,
|
||||
|
||||
|
||||
/// 親インスタンス(メソッド呼び出しの場合)
|
||||
pub parent_instance: Option<Arc<Mutex<Box<dyn NyashBox>>>>,
|
||||
}
|
||||
@ -186,7 +200,7 @@ impl EphemeralInstance {
|
||||
parent_instance: None,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// インスタンスから一時スコープを作成
|
||||
pub fn from_instance(instance: Arc<Mutex<Box<dyn NyashBox>>>) -> Self {
|
||||
Self {
|
||||
@ -194,24 +208,24 @@ impl EphemeralInstance {
|
||||
parent_instance: Some(instance),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// ローカル変数を設定
|
||||
pub fn set_local(&mut self, name: String, value: Box<dyn NyashBox>) {
|
||||
self.locals.insert(name, value);
|
||||
}
|
||||
|
||||
|
||||
/// ローカル変数を取得
|
||||
pub fn get_local(&self, name: &str) -> Option<Box<dyn NyashBox>> {
|
||||
self.locals.get(name).map(|v| v.clone_box())
|
||||
}
|
||||
|
||||
|
||||
/// 変数を解決(local → instance fields → global)
|
||||
pub fn resolve_variable(&self, name: &str) -> Option<Box<dyn NyashBox>> {
|
||||
// 1. ローカル変数
|
||||
if let Some(value) = self.get_local(name) {
|
||||
return Some(value);
|
||||
}
|
||||
|
||||
|
||||
// 2. インスタンスフィールド(parent_instanceがある場合)
|
||||
if let Some(parent) = &self.parent_instance {
|
||||
let inst = parent.lock().unwrap();
|
||||
@ -221,7 +235,7 @@ impl EphemeralInstance {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 3. グローバル(TODO: インタープリタとの統合が必要)
|
||||
None
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user