fix(phase-4.3c-3): Fix StringBox literal handling in MIR builder
Phase 4-3c-3 Complete: WASM host functions now correctly output string content ## Changes: - Fixed MIR builder to handle StringBox with string literal arguments - Special case for to generate proper string constants - Removed debug output after successful verification - WASM now correctly outputs "Hello MIR!" instead of "StringBox" ## Test Results: - MIR generation: ✅ Generates correctly - WASM compilation: ✅ String data correctly placed at offset 4096 - WASM execution: ✅ Outputs "Hello MIR\!" as expected ## Technical Details: - Modified build_new_expression() to detect StringBox with literal arguments - Generates Const instruction with actual string content - Host function reads StringBox memory layout correctly This completes the WASM string output functionality for Phase 4. 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Moe Charm
@ -8,7 +8,10 @@
|
||||
|
||||
use super::*;
|
||||
use crate::boxes::{buffer::BufferBox, JSONBox, HttpClientBox, StreamBox, RegexBox, IntentBox, SocketBox, HTTPServerBox, HTTPRequestBox, HTTPResponseBox};
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
use crate::boxes::{FloatBox, MathBox, ConsoleBox, TimeBox, DateTimeBox, RandomBox, SoundBox, DebugBox, file::FileBox, MapBox};
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
use crate::boxes::{FloatBox, ConsoleBox, SoundBox, DebugBox, MapBox};
|
||||
use std::sync::Arc;
|
||||
|
||||
impl NyashInterpreter {
|
||||
@ -238,25 +241,43 @@ impl NyashInterpreter {
|
||||
}
|
||||
|
||||
// MathBox method calls
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
if let Some(math_box) = obj_value.as_any().downcast_ref::<MathBox>() {
|
||||
return self.execute_math_method(math_box, method, arguments);
|
||||
}
|
||||
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
if let Some(math_proxy) = obj_value.as_any().downcast_ref::<crate::interpreter::plugin_loader::MathBoxProxy>() {
|
||||
return self.execute_math_proxy_method(math_proxy, method, arguments);
|
||||
}
|
||||
|
||||
// NullBox method calls
|
||||
if let Some(null_box) = obj_value.as_any().downcast_ref::<crate::boxes::null_box::NullBox>() {
|
||||
return self.execute_null_method(null_box, method, arguments);
|
||||
}
|
||||
|
||||
// TimeBox method calls
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
if let Some(time_box) = obj_value.as_any().downcast_ref::<TimeBox>() {
|
||||
return self.execute_time_method(time_box, method, arguments);
|
||||
}
|
||||
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
if let Some(time_proxy) = obj_value.as_any().downcast_ref::<crate::interpreter::plugin_loader::TimeBoxProxy>() {
|
||||
return self.execute_time_proxy_method(time_proxy, method, arguments);
|
||||
}
|
||||
|
||||
// DateTimeBox method calls
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
if let Some(datetime_box) = obj_value.as_any().downcast_ref::<DateTimeBox>() {
|
||||
return self.execute_datetime_method(datetime_box, method, arguments);
|
||||
}
|
||||
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
if let Some(datetime_proxy) = obj_value.as_any().downcast_ref::<crate::interpreter::plugin_loader::DateTimeBoxProxy>() {
|
||||
return self.execute_datetime_proxy_method(datetime_proxy, method, arguments);
|
||||
}
|
||||
|
||||
// TimerBox method calls
|
||||
if let Some(timer_box) = obj_value.as_any().downcast_ref::<TimerBox>() {
|
||||
return self.execute_timer_method(timer_box, method, arguments);
|
||||
@ -268,10 +289,16 @@ impl NyashInterpreter {
|
||||
}
|
||||
|
||||
// RandomBox method calls
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
if let Some(random_box) = obj_value.as_any().downcast_ref::<RandomBox>() {
|
||||
return self.execute_random_method(random_box, method, arguments);
|
||||
}
|
||||
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
if let Some(random_proxy) = obj_value.as_any().downcast_ref::<crate::interpreter::plugin_loader::RandomBoxProxy>() {
|
||||
return self.execute_random_proxy_method(random_proxy, method, arguments);
|
||||
}
|
||||
|
||||
// SoundBox method calls
|
||||
if let Some(sound_box) = obj_value.as_any().downcast_ref::<SoundBox>() {
|
||||
return self.execute_sound_method(sound_box, method, arguments);
|
||||
|
||||
379
src/interpreter/methods/math_methods.rs
Normal file
379
src/interpreter/methods/math_methods.rs
Normal file
@ -0,0 +1,379 @@
|
||||
/*!
|
||||
* Math Methods Module
|
||||
*
|
||||
* MathBox, RandomBox, TimeBox, DateTimeBoxのメソッド実装
|
||||
* Phase 9.75f-2: 動的ライブラリ化対応
|
||||
*/
|
||||
|
||||
use crate::interpreter::{NyashInterpreter, RuntimeError};
|
||||
use crate::ast::ASTNode;
|
||||
use crate::box_trait::{NyashBox, IntegerBox, BoolBox, StringBox};
|
||||
use crate::boxes::FloatBox;
|
||||
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
use crate::interpreter::plugin_loader::{MathBoxProxy, RandomBoxProxy, TimeBoxProxy, DateTimeBoxProxy};
|
||||
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
use crate::boxes::{MathBox, RandomBox, TimeBox, DateTimeBox};
|
||||
|
||||
impl NyashInterpreter {
|
||||
/// MathBox用メソッドを実行（動的ライブラリ対応）
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn execute_math_proxy_method(&mut self,
|
||||
_math_box: &MathBoxProxy,
|
||||
method: &str,
|
||||
arguments: &[ASTNode]) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
|
||||
match method {
|
||||
"sqrt" => {
|
||||
if arguments.len() != 1 {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("sqrt() expects 1 argument, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
let arg = self.execute_expression(&arguments[0])?;
|
||||
let value = self.to_float(&arg)?;
|
||||
|
||||
let cache = crate::interpreter::plugin_loader::PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
if let Ok(sqrt_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(f64) -> f64>>(b"nyash_math_sqrt\0") {
|
||||
let result = sqrt_fn(value);
|
||||
return Ok(Box::new(FloatBox::new(result)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Failed to call sqrt".to_string(),
|
||||
})
|
||||
}
|
||||
"pow" => {
|
||||
if arguments.len() != 2 {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("pow() expects 2 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
let base_value = self.execute_expression(&arguments[0])?;
|
||||
let exp_value = self.execute_expression(&arguments[1])?;
|
||||
let base = self.to_float(&base_value)?;
|
||||
let exp = self.to_float(&exp_value)?;
|
||||
|
||||
let cache = crate::interpreter::plugin_loader::PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
if let Ok(pow_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(f64, f64) -> f64>>(b"nyash_math_pow\0") {
|
||||
let result = pow_fn(base, exp);
|
||||
return Ok(Box::new(FloatBox::new(result)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Failed to call pow".to_string(),
|
||||
})
|
||||
}
|
||||
"sin" => self.call_unary_math_fn("nyash_math_sin", arguments),
|
||||
"cos" => self.call_unary_math_fn("nyash_math_cos", arguments),
|
||||
"tan" => self.call_unary_math_fn("nyash_math_tan", arguments),
|
||||
"abs" => self.call_unary_math_fn("nyash_math_abs", arguments),
|
||||
"floor" => self.call_unary_math_fn("nyash_math_floor", arguments),
|
||||
"ceil" => self.call_unary_math_fn("nyash_math_ceil", arguments),
|
||||
"round" => self.call_unary_math_fn("nyash_math_round", arguments),
|
||||
"log" => self.call_unary_math_fn("nyash_math_log", arguments),
|
||||
"log10" => self.call_unary_math_fn("nyash_math_log10", arguments),
|
||||
"exp" => self.call_unary_math_fn("nyash_math_exp", arguments),
|
||||
"min" => self.call_binary_math_fn("nyash_math_min", arguments),
|
||||
"max" => self.call_binary_math_fn("nyash_math_max", arguments),
|
||||
"toString" => {
|
||||
if !arguments.is_empty() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("toString() expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
Ok(Box::new(_math_box.to_string_box()))
|
||||
}
|
||||
"type_name" => {
|
||||
if !arguments.is_empty() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("type_name() expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
Ok(Box::new(StringBox::new(_math_box.type_name())))
|
||||
}
|
||||
_ => Err(RuntimeError::InvalidOperation {
|
||||
message: format!("Unknown MathBox method: {}", method),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
/// RandomBox用メソッドを実行（動的ライブラリ対応）
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn execute_random_proxy_method(&mut self,
|
||||
random_box: &RandomBoxProxy,
|
||||
method: &str,
|
||||
arguments: &[ASTNode]) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
|
||||
match method {
|
||||
"next" => {
|
||||
if !arguments.is_empty() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("next() expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
random_box.next()
|
||||
}
|
||||
"range" => {
|
||||
if arguments.len() != 2 {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("range() expects 2 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
let min_value = self.execute_expression(&arguments[0])?;
|
||||
let max_value = self.execute_expression(&arguments[1])?;
|
||||
let min = self.to_float(&min_value)?;
|
||||
let max = self.to_float(&max_value)?;
|
||||
random_box.range(min, max)
|
||||
}
|
||||
"int" => {
|
||||
if arguments.len() != 2 {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("int() expects 2 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
let min_value = self.execute_expression(&arguments[0])?;
|
||||
let max_value = self.execute_expression(&arguments[1])?;
|
||||
let min = self.to_integer(&min_value)?;
|
||||
let max = self.to_integer(&max_value)?;
|
||||
random_box.int(min, max)
|
||||
}
|
||||
"toString" => {
|
||||
if !arguments.is_empty() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("toString() expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
Ok(Box::new(random_box.to_string_box()))
|
||||
}
|
||||
"type_name" => {
|
||||
if !arguments.is_empty() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("type_name() expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
Ok(Box::new(StringBox::new(random_box.type_name())))
|
||||
}
|
||||
_ => Err(RuntimeError::InvalidOperation {
|
||||
message: format!("Unknown RandomBox method: {}", method),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
/// TimeBox用メソッドを実行（動的ライブラリ対応）
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn execute_time_proxy_method(&mut self,
|
||||
_time_box: &TimeBoxProxy,
|
||||
method: &str,
|
||||
arguments: &[ASTNode]) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
|
||||
match method {
|
||||
"now" => {
|
||||
if !arguments.is_empty() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("now() expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
crate::interpreter::plugin_loader::PluginLoader::create_datetime_now()
|
||||
}
|
||||
"parse" => {
|
||||
if arguments.len() != 1 {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("parse() expects 1 argument, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
let time_str = self.execute_expression(&arguments[0])?.to_string_box().value;
|
||||
crate::interpreter::plugin_loader::PluginLoader::create_datetime_from_string(&time_str)
|
||||
}
|
||||
"toString" => {
|
||||
if !arguments.is_empty() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("toString() expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
Ok(Box::new(_time_box.to_string_box()))
|
||||
}
|
||||
"type_name" => {
|
||||
if !arguments.is_empty() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("type_name() expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
Ok(Box::new(StringBox::new(_time_box.type_name())))
|
||||
}
|
||||
_ => Err(RuntimeError::InvalidOperation {
|
||||
message: format!("Unknown TimeBox method: {}", method),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
/// DateTimeBox用メソッドを実行（動的ライブラリ対応）
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn execute_datetime_proxy_method(&mut self,
|
||||
datetime_box: &DateTimeBoxProxy,
|
||||
method: &str,
|
||||
arguments: &[ASTNode]) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
|
||||
// type_name と toString は引数チェックを個別で行う
|
||||
if !arguments.is_empty() && method != "type_name" && method != "toString" {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("{}() expects 0 arguments, got {}", method, arguments.len()),
|
||||
});
|
||||
}
|
||||
|
||||
let cache = crate::interpreter::plugin_loader::PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
match method {
|
||||
"year" => {
|
||||
if let Ok(year_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(*mut std::ffi::c_void) -> i32>>(b"nyash_datetime_year\0") {
|
||||
let year = year_fn(datetime_box.handle.ptr);
|
||||
return Ok(Box::new(IntegerBox::new(year as i64)));
|
||||
}
|
||||
}
|
||||
"month" => {
|
||||
if let Ok(month_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(*mut std::ffi::c_void) -> u32>>(b"nyash_datetime_month\0") {
|
||||
let month = month_fn(datetime_box.handle.ptr);
|
||||
return Ok(Box::new(IntegerBox::new(month as i64)));
|
||||
}
|
||||
}
|
||||
"day" => {
|
||||
if let Ok(day_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(*mut std::ffi::c_void) -> u32>>(b"nyash_datetime_day\0") {
|
||||
let day = day_fn(datetime_box.handle.ptr);
|
||||
return Ok(Box::new(IntegerBox::new(day as i64)));
|
||||
}
|
||||
}
|
||||
"hour" => {
|
||||
if let Ok(hour_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(*mut std::ffi::c_void) -> u32>>(b"nyash_datetime_hour\0") {
|
||||
let hour = hour_fn(datetime_box.handle.ptr);
|
||||
return Ok(Box::new(IntegerBox::new(hour as i64)));
|
||||
}
|
||||
}
|
||||
"minute" => {
|
||||
if let Ok(minute_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(*mut std::ffi::c_void) -> u32>>(b"nyash_datetime_minute\0") {
|
||||
let minute = minute_fn(datetime_box.handle.ptr);
|
||||
return Ok(Box::new(IntegerBox::new(minute as i64)));
|
||||
}
|
||||
}
|
||||
"second" => {
|
||||
if let Ok(second_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(*mut std::ffi::c_void) -> u32>>(b"nyash_datetime_second\0") {
|
||||
let second = second_fn(datetime_box.handle.ptr);
|
||||
return Ok(Box::new(IntegerBox::new(second as i64)));
|
||||
}
|
||||
}
|
||||
"timestamp" => {
|
||||
if let Ok(timestamp_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(*mut std::ffi::c_void) -> i64>>(b"nyash_datetime_timestamp\0") {
|
||||
let timestamp = timestamp_fn(datetime_box.handle.ptr);
|
||||
return Ok(Box::new(IntegerBox::new(timestamp)));
|
||||
}
|
||||
}
|
||||
"toString" => {
|
||||
return Ok(Box::new(datetime_box.to_string_box()));
|
||||
}
|
||||
"type_name" => {
|
||||
if !arguments.is_empty() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("type_name() expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
return Ok(Box::new(StringBox::new(datetime_box.type_name())));
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: format!("Unknown DateTimeBox method: {}", method),
|
||||
})
|
||||
}
|
||||
|
||||
// ヘルパーメソッド
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
fn call_unary_math_fn(&mut self, fn_name: &str, arguments: &[ASTNode]) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
if arguments.len() != 1 {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("{}() expects 1 argument, got {}", fn_name.strip_prefix("nyash_math_").unwrap_or(fn_name), arguments.len()),
|
||||
});
|
||||
}
|
||||
let arg_value = self.execute_expression(&arguments[0])?;
|
||||
let value = self.to_float(&arg_value)?;
|
||||
|
||||
let cache = crate::interpreter::plugin_loader::PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
let fn_name_bytes = format!("{}\0", fn_name);
|
||||
if let Ok(math_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(f64) -> f64>>(fn_name_bytes.as_bytes()) {
|
||||
let result = math_fn(value);
|
||||
return Ok(Box::new(FloatBox::new(result)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to call {}", fn_name),
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
fn call_binary_math_fn(&mut self, fn_name: &str, arguments: &[ASTNode]) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
if arguments.len() != 2 {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("{}() expects 2 arguments, got {}", fn_name.strip_prefix("nyash_math_").unwrap_or(fn_name), arguments.len()),
|
||||
});
|
||||
}
|
||||
let a_value = self.execute_expression(&arguments[0])?;
|
||||
let b_value = self.execute_expression(&arguments[1])?;
|
||||
let a = self.to_float(&a_value)?;
|
||||
let b = self.to_float(&b_value)?;
|
||||
|
||||
let cache = crate::interpreter::plugin_loader::PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
let fn_name_bytes = format!("{}\0", fn_name);
|
||||
if let Ok(math_fn) = plugin.library.get::<libloading::Symbol<unsafe extern "C" fn(f64, f64) -> f64>>(fn_name_bytes.as_bytes()) {
|
||||
let result = math_fn(a, b);
|
||||
return Ok(Box::new(FloatBox::new(result)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to call {}", fn_name),
|
||||
})
|
||||
}
|
||||
|
||||
// 型変換ヘルパー
|
||||
fn to_float(&self, value: &Box<dyn NyashBox>) -> Result<f64, RuntimeError> {
|
||||
if let Some(float_box) = value.as_any().downcast_ref::<FloatBox>() {
|
||||
Ok(float_box.value)
|
||||
} else if let Some(int_box) = value.as_any().downcast_ref::<IntegerBox>() {
|
||||
Ok(int_box.value as f64)
|
||||
} else {
|
||||
Err(RuntimeError::TypeError {
|
||||
message: "Value must be a number".to_string(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn to_integer(&self, value: &Box<dyn NyashBox>) -> Result<i64, RuntimeError> {
|
||||
if let Some(int_box) = value.as_any().downcast_ref::<IntegerBox>() {
|
||||
Ok(int_box.value)
|
||||
} else if let Some(float_box) = value.as_any().downcast_ref::<FloatBox>() {
|
||||
Ok(float_box.value as i64)
|
||||
} else {
|
||||
Err(RuntimeError::TypeError {
|
||||
message: "Value must be a number".to_string(),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -23,5 +23,6 @@ pub mod data_methods; // BufferBox, JSONBox, RegexBox
|
||||
pub mod network_methods; // HttpClientBox, StreamBox
|
||||
pub mod p2p_methods; // IntentBox, P2PBox
|
||||
pub mod http_methods; // SocketBox, HTTPServerBox, HTTPRequestBox, HTTPResponseBox
|
||||
pub mod math_methods; // MathBox, RandomBox, TimeBox, DateTimeBox
|
||||
|
||||
// Re-export methods for easy access
|
||||
|
||||
@ -7,9 +7,11 @@
|
||||
*/
|
||||
|
||||
use super::*;
|
||||
use crate::boxes::{NullBox, ConsoleBox, FloatBox, DateTimeBox, SocketBox, HTTPServerBox, HTTPRequestBox, HTTPResponseBox};
|
||||
use crate::boxes::{NullBox, ConsoleBox, FloatBox, SocketBox, HTTPServerBox, HTTPRequestBox, HTTPResponseBox};
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
use crate::boxes::FileBox;
|
||||
use crate::boxes::{FileBox, MathBox, RandomBox, TimeBox, DateTimeBox};
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
use crate::boxes::DateTimeBox;
|
||||
// use crate::boxes::intent_box_wrapper::IntentBoxWrapper;
|
||||
use crate::box_trait::SharedNyashBox;
|
||||
use std::sync::Arc;
|
||||
@ -167,9 +169,33 @@ impl NyashInterpreter {
|
||||
message: format!("MathBox constructor expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
let math_box = Box::new(MathBox::new()) as Box<dyn NyashBox>;
|
||||
// 🌍 革命的実装：Environment tracking廃止
|
||||
return Ok(math_box);
|
||||
|
||||
println!("🔧 DEBUG: DYNAMIC-FILE feature check...");
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
println!("🔌 DEBUG: DYNAMIC-FILE ENABLED - Creating MathBox through dynamic library");
|
||||
log::debug!("🔌 DEBUG: Creating MathBox through dynamic library");
|
||||
match super::plugin_loader::PluginLoader::create_math_box() {
|
||||
Ok(math_box) => {
|
||||
println!("🔌 DEBUG: MathBox created successfully, type_name: {}", math_box.type_name());
|
||||
log::debug!("🔌 DEBUG: MathBox created successfully, type_name: {}", math_box.type_name());
|
||||
return Ok(math_box);
|
||||
}
|
||||
Err(e) => {
|
||||
println!("❌ DEBUG: Failed to create MathBox through dynamic library: {}", e);
|
||||
log::error!("Failed to create MathBox through dynamic library: {}", e);
|
||||
// Fall back to static MathBox
|
||||
let math_box = Box::new(MathBox::new()) as Box<dyn NyashBox>;
|
||||
return Ok(math_box);
|
||||
}
|
||||
}
|
||||
}
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
println!("🔌 DEBUG: DYNAMIC-FILE DISABLED - Creating static MathBox");
|
||||
let math_box = Box::new(MathBox::new()) as Box<dyn NyashBox>;
|
||||
return Ok(math_box);
|
||||
}
|
||||
}
|
||||
"NullBox" => {
|
||||
// NullBoxは引数なしで作成
|
||||
@ -382,25 +408,65 @@ impl NyashInterpreter {
|
||||
message: format!("TimeBox constructor expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
let time_box = Box::new(TimeBox::new()) as Box<dyn NyashBox>;
|
||||
// 🌍 革命的実装：Environment tracking廃止
|
||||
return Ok(time_box);
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
log::debug!("🔌 DEBUG: Creating TimeBox through dynamic library");
|
||||
let time_box = super::plugin_loader::PluginLoader::create_time_box()?;
|
||||
log::debug!("🔌 DEBUG: TimeBox created successfully, type_name: {}", time_box.type_name());
|
||||
return Ok(time_box);
|
||||
}
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
let time_box = Box::new(TimeBox::new()) as Box<dyn NyashBox>;
|
||||
return Ok(time_box);
|
||||
}
|
||||
}
|
||||
"DateTimeBox" => {
|
||||
// DateTimeBoxは引数なしで現在時刻、または引数1個でタイムスタンプ
|
||||
match arguments.len() {
|
||||
0 => {
|
||||
let datetime_box = Box::new(DateTimeBox::now()) as Box<dyn NyashBox>;
|
||||
// 🌍 革命的実装：Environment tracking廃止
|
||||
return Ok(datetime_box);
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
log::debug!("🔌 DEBUG: Creating DateTimeBox (now) through dynamic library");
|
||||
let datetime_box = super::plugin_loader::PluginLoader::create_datetime_now()?;
|
||||
log::debug!("🔌 DEBUG: DateTimeBox created successfully, type_name: {}", datetime_box.type_name());
|
||||
return Ok(datetime_box);
|
||||
}
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
let datetime_box = Box::new(DateTimeBox::now()) as Box<dyn NyashBox>;
|
||||
return Ok(datetime_box);
|
||||
}
|
||||
}
|
||||
1 => {
|
||||
let timestamp_value = self.execute_expression(&arguments[0])?;
|
||||
|
||||
// Try integer timestamp first
|
||||
if let Some(int_box) = timestamp_value.as_any().downcast_ref::<IntegerBox>() {
|
||||
let datetime_box = Box::new(DateTimeBox::from_timestamp(int_box.value)) as Box<dyn NyashBox>;
|
||||
// 🌍 革命的実装：Environment tracking廃止
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
// TODO: Add timestamp creation to plugin
|
||||
let datetime_box = Box::new(DateTimeBox::from_timestamp(int_box.value)) as Box<dyn NyashBox>;
|
||||
return Ok(datetime_box);
|
||||
}
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
let datetime_box = Box::new(DateTimeBox::from_timestamp(int_box.value)) as Box<dyn NyashBox>;
|
||||
return Ok(datetime_box);
|
||||
}
|
||||
}
|
||||
|
||||
// Try string parsing
|
||||
let time_str = timestamp_value.to_string_box().value;
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
log::debug!("🔌 DEBUG: Creating DateTimeBox from string through dynamic library");
|
||||
let datetime_box = super::plugin_loader::PluginLoader::create_datetime_from_string(&time_str)?;
|
||||
log::debug!("🔌 DEBUG: DateTimeBox created successfully, type_name: {}", datetime_box.type_name());
|
||||
return Ok(datetime_box);
|
||||
} else {
|
||||
}
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
return Err(RuntimeError::TypeError {
|
||||
message: "DateTimeBox constructor requires integer timestamp".to_string(),
|
||||
});
|
||||
@ -442,9 +508,18 @@ impl NyashInterpreter {
|
||||
message: format!("RandomBox constructor expects 0 arguments, got {}", arguments.len()),
|
||||
});
|
||||
}
|
||||
let random_box = Box::new(RandomBox::new()) as Box<dyn NyashBox>;
|
||||
// 🌍 革命的実装：Environment tracking廃止
|
||||
return Ok(random_box);
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
log::debug!("🔌 DEBUG: Creating RandomBox through dynamic library");
|
||||
let random_box = super::plugin_loader::PluginLoader::create_random_box()?;
|
||||
log::debug!("🔌 DEBUG: RandomBox created successfully, type_name: {}", random_box.type_name());
|
||||
return Ok(random_box);
|
||||
}
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
let random_box = Box::new(RandomBox::new()) as Box<dyn NyashBox>;
|
||||
return Ok(random_box);
|
||||
}
|
||||
}
|
||||
"SoundBox" => {
|
||||
// SoundBoxは引数なしで作成
|
||||
|
||||
@ -11,19 +11,20 @@ use std::sync::{Arc, RwLock};
|
||||
use libloading::{Library, Symbol};
|
||||
|
||||
use crate::interpreter::RuntimeError;
|
||||
use crate::box_trait::{NyashBox, StringBox, BoolBox, VoidBox, BoxCore, BoxBase};
|
||||
use crate::box_trait::{NyashBox, StringBox, BoolBox, BoxCore, BoxBase, IntegerBox};
|
||||
use crate::boxes::FloatBox;
|
||||
|
||||
lazy_static::lazy_static! {
|
||||
/// グローバルプラグインキャッシュ
|
||||
static ref PLUGIN_CACHE: RwLock<HashMap<String, LoadedPlugin>> =
|
||||
pub(crate) static ref PLUGIN_CACHE: RwLock<HashMap<String, LoadedPlugin>> =
|
||||
RwLock::new(HashMap::new());
|
||||
}
|
||||
|
||||
/// ロード済みプラグイン情報
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
struct LoadedPlugin {
|
||||
library: Library,
|
||||
info: PluginInfo,
|
||||
pub(crate) struct LoadedPlugin {
|
||||
pub(crate) library: Library,
|
||||
pub(crate) info: PluginInfo,
|
||||
}
|
||||
|
||||
/// プラグイン情報
|
||||
@ -61,6 +62,114 @@ impl Drop for FileBoxHandle {
|
||||
unsafe impl Send for FileBoxHandle {}
|
||||
unsafe impl Sync for FileBoxHandle {}
|
||||
|
||||
/// MathBoxハンドル
|
||||
#[derive(Debug)]
|
||||
struct MathBoxHandle {
|
||||
ptr: *mut c_void,
|
||||
}
|
||||
|
||||
impl Drop for MathBoxHandle {
|
||||
fn drop(&mut self) {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
if !self.ptr.is_null() {
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
if let Ok(free_fn) = plugin.library.get::<Symbol<unsafe extern "C" fn(*mut c_void)>>(b"nyash_math_free\0") {
|
||||
free_fn(self.ptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unsafe impl Send for MathBoxHandle {}
|
||||
unsafe impl Sync for MathBoxHandle {}
|
||||
|
||||
/// RandomBoxハンドル
|
||||
#[derive(Debug)]
|
||||
struct RandomBoxHandle {
|
||||
ptr: *mut c_void,
|
||||
}
|
||||
|
||||
impl Drop for RandomBoxHandle {
|
||||
fn drop(&mut self) {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
if !self.ptr.is_null() {
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
if let Ok(free_fn) = plugin.library.get::<Symbol<unsafe extern "C" fn(*mut c_void)>>(b"nyash_random_free\0") {
|
||||
free_fn(self.ptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unsafe impl Send for RandomBoxHandle {}
|
||||
unsafe impl Sync for RandomBoxHandle {}
|
||||
|
||||
/// TimeBoxハンドル
|
||||
#[derive(Debug)]
|
||||
struct TimeBoxHandle {
|
||||
ptr: *mut c_void,
|
||||
}
|
||||
|
||||
impl Drop for TimeBoxHandle {
|
||||
fn drop(&mut self) {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
if !self.ptr.is_null() {
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
if let Ok(free_fn) = plugin.library.get::<Symbol<unsafe extern "C" fn(*mut c_void)>>(b"nyash_time_free\0") {
|
||||
free_fn(self.ptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unsafe impl Send for TimeBoxHandle {}
|
||||
unsafe impl Sync for TimeBoxHandle {}
|
||||
|
||||
/// DateTimeBoxハンドル
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct DateTimeBoxHandle {
|
||||
pub(crate) ptr: *mut c_void,
|
||||
}
|
||||
|
||||
impl Drop for DateTimeBoxHandle {
|
||||
fn drop(&mut self) {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
if !self.ptr.is_null() {
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
if let Ok(free_fn) = plugin.library.get::<Symbol<unsafe extern "C" fn(*mut c_void)>>(b"nyash_datetime_free\0") {
|
||||
free_fn(self.ptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unsafe impl Send for DateTimeBoxHandle {}
|
||||
unsafe impl Sync for DateTimeBoxHandle {}
|
||||
|
||||
/// FileBoxプロキシ - 動的ライブラリのFileBoxをラップ
|
||||
#[derive(Debug)]
|
||||
pub struct FileBoxProxy {
|
||||
@ -251,6 +360,485 @@ impl std::fmt::Display for FileBoxProxy {
|
||||
}
|
||||
}
|
||||
|
||||
// ================== MathBoxProxy ==================
|
||||
|
||||
/// MathBoxプロキシ - 動的ライブラリのMathBoxをラップ
|
||||
#[derive(Debug)]
|
||||
pub struct MathBoxProxy {
|
||||
handle: Arc<MathBoxHandle>,
|
||||
base: BoxBase,
|
||||
}
|
||||
|
||||
unsafe impl Send for MathBoxProxy {}
|
||||
unsafe impl Sync for MathBoxProxy {}
|
||||
|
||||
impl MathBoxProxy {
|
||||
pub fn new(handle: *mut c_void) -> Self {
|
||||
MathBoxProxy {
|
||||
handle: Arc::new(MathBoxHandle { ptr: handle }),
|
||||
base: BoxBase::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl BoxCore for MathBoxProxy {
|
||||
fn box_id(&self) -> u64 {
|
||||
self.base.id
|
||||
}
|
||||
|
||||
fn parent_type_id(&self) -> Option<std::any::TypeId> {
|
||||
None // プロキシ型は継承しない
|
||||
}
|
||||
|
||||
fn fmt_box(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "MathBox")
|
||||
}
|
||||
|
||||
fn as_any(&self) -> &dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
|
||||
fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl NyashBox for MathBoxProxy {
|
||||
fn type_name(&self) -> &'static str {
|
||||
"MathBox"
|
||||
}
|
||||
|
||||
fn clone_box(&self) -> Box<dyn NyashBox> {
|
||||
match PluginLoader::create_math_box() {
|
||||
Ok(new_box) => new_box,
|
||||
Err(_) => Box::new(MathBoxProxy {
|
||||
handle: Arc::clone(&self.handle),
|
||||
base: BoxBase::new(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn share_box(&self) -> Box<dyn NyashBox> {
|
||||
self.clone_box()
|
||||
}
|
||||
|
||||
fn to_string_box(&self) -> StringBox {
|
||||
StringBox::new("MathBox")
|
||||
}
|
||||
|
||||
fn equals(&self, other: &dyn NyashBox) -> BoolBox {
|
||||
if let Some(_) = other.as_any().downcast_ref::<MathBoxProxy>() {
|
||||
BoolBox::new(true)
|
||||
} else {
|
||||
BoolBox::new(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for MathBoxProxy {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
self.fmt_box(f)
|
||||
}
|
||||
}
|
||||
|
||||
// ================== RandomBoxProxy ==================
|
||||
|
||||
/// RandomBoxプロキシ - 動的ライブラリのRandomBoxをラップ
|
||||
#[derive(Debug)]
|
||||
pub struct RandomBoxProxy {
|
||||
handle: Arc<RandomBoxHandle>,
|
||||
base: BoxBase,
|
||||
}
|
||||
|
||||
unsafe impl Send for RandomBoxProxy {}
|
||||
unsafe impl Sync for RandomBoxProxy {}
|
||||
|
||||
impl RandomBoxProxy {
|
||||
pub fn new(handle: *mut c_void) -> Self {
|
||||
RandomBoxProxy {
|
||||
handle: Arc::new(RandomBoxHandle { ptr: handle }),
|
||||
base: BoxBase::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn next(&self) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
let next_fn: Symbol<unsafe extern "C" fn(*mut c_void) -> f64> =
|
||||
plugin.library.get(b"nyash_random_next\0").map_err(|e| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to get nyash_random_next: {}", e)
|
||||
}
|
||||
})?;
|
||||
|
||||
let value = next_fn(self.handle.ptr);
|
||||
Ok(Box::new(FloatBox::new(value)))
|
||||
}
|
||||
} else {
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Math plugin not loaded".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Dynamic loading not enabled".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
pub fn range(&self, min: f64, max: f64) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
let range_fn: Symbol<unsafe extern "C" fn(*mut c_void, f64, f64) -> f64> =
|
||||
plugin.library.get(b"nyash_random_range\0").map_err(|e| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to get nyash_random_range: {}", e)
|
||||
}
|
||||
})?;
|
||||
|
||||
let value = range_fn(self.handle.ptr, min, max);
|
||||
Ok(Box::new(FloatBox::new(value)))
|
||||
}
|
||||
} else {
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Math plugin not loaded".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Dynamic loading not enabled".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
pub fn int(&self, min: i64, max: i64) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
let int_fn: Symbol<unsafe extern "C" fn(*mut c_void, i64, i64) -> i64> =
|
||||
plugin.library.get(b"nyash_random_int\0").map_err(|e| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to get nyash_random_int: {}", e)
|
||||
}
|
||||
})?;
|
||||
|
||||
let value = int_fn(self.handle.ptr, min, max);
|
||||
Ok(Box::new(IntegerBox::new(value)))
|
||||
}
|
||||
} else {
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Math plugin not loaded".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Dynamic loading not enabled".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl BoxCore for RandomBoxProxy {
|
||||
fn box_id(&self) -> u64 {
|
||||
self.base.id
|
||||
}
|
||||
|
||||
fn parent_type_id(&self) -> Option<std::any::TypeId> {
|
||||
None // プロキシ型は継承しない
|
||||
}
|
||||
|
||||
fn fmt_box(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "RandomBox")
|
||||
}
|
||||
|
||||
fn as_any(&self) -> &dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
|
||||
fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl NyashBox for RandomBoxProxy {
|
||||
fn type_name(&self) -> &'static str {
|
||||
"RandomBox"
|
||||
}
|
||||
|
||||
fn clone_box(&self) -> Box<dyn NyashBox> {
|
||||
match PluginLoader::create_random_box() {
|
||||
Ok(new_box) => new_box,
|
||||
Err(_) => Box::new(RandomBoxProxy {
|
||||
handle: Arc::clone(&self.handle),
|
||||
base: BoxBase::new(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn share_box(&self) -> Box<dyn NyashBox> {
|
||||
self.clone_box()
|
||||
}
|
||||
|
||||
fn to_string_box(&self) -> StringBox {
|
||||
StringBox::new("RandomBox")
|
||||
}
|
||||
|
||||
fn equals(&self, other: &dyn NyashBox) -> BoolBox {
|
||||
if let Some(_) = other.as_any().downcast_ref::<RandomBoxProxy>() {
|
||||
BoolBox::new(true)
|
||||
} else {
|
||||
BoolBox::new(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for RandomBoxProxy {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
self.fmt_box(f)
|
||||
}
|
||||
}
|
||||
|
||||
// ================== TimeBoxProxy ==================
|
||||
|
||||
/// TimeBoxプロキシ - 動的ライブラリのTimeBoxをラップ
|
||||
#[derive(Debug)]
|
||||
pub struct TimeBoxProxy {
|
||||
handle: Arc<TimeBoxHandle>,
|
||||
base: BoxBase,
|
||||
}
|
||||
|
||||
unsafe impl Send for TimeBoxProxy {}
|
||||
unsafe impl Sync for TimeBoxProxy {}
|
||||
|
||||
impl TimeBoxProxy {
|
||||
pub fn new(handle: *mut c_void) -> Self {
|
||||
TimeBoxProxy {
|
||||
handle: Arc::new(TimeBoxHandle { ptr: handle }),
|
||||
base: BoxBase::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl BoxCore for TimeBoxProxy {
|
||||
fn box_id(&self) -> u64 {
|
||||
self.base.id
|
||||
}
|
||||
|
||||
fn parent_type_id(&self) -> Option<std::any::TypeId> {
|
||||
None // プロキシ型は継承しない
|
||||
}
|
||||
|
||||
fn fmt_box(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "TimeBox")
|
||||
}
|
||||
|
||||
fn as_any(&self) -> &dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
|
||||
fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl NyashBox for TimeBoxProxy {
|
||||
fn type_name(&self) -> &'static str {
|
||||
"TimeBox"
|
||||
}
|
||||
|
||||
fn clone_box(&self) -> Box<dyn NyashBox> {
|
||||
match PluginLoader::create_time_box() {
|
||||
Ok(new_box) => new_box,
|
||||
Err(_) => Box::new(TimeBoxProxy {
|
||||
handle: Arc::clone(&self.handle),
|
||||
base: BoxBase::new(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn share_box(&self) -> Box<dyn NyashBox> {
|
||||
self.clone_box()
|
||||
}
|
||||
|
||||
fn to_string_box(&self) -> StringBox {
|
||||
StringBox::new("TimeBox")
|
||||
}
|
||||
|
||||
fn equals(&self, other: &dyn NyashBox) -> BoolBox {
|
||||
if let Some(_) = other.as_any().downcast_ref::<TimeBoxProxy>() {
|
||||
BoolBox::new(true)
|
||||
} else {
|
||||
BoolBox::new(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for TimeBoxProxy {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
self.fmt_box(f)
|
||||
}
|
||||
}
|
||||
|
||||
// ================== DateTimeBoxProxy ==================
|
||||
|
||||
/// DateTimeBoxプロキシ - 動的ライブラリのDateTimeBoxをラップ
|
||||
#[derive(Debug)]
|
||||
pub struct DateTimeBoxProxy {
|
||||
pub(crate) handle: Arc<DateTimeBoxHandle>,
|
||||
base: BoxBase,
|
||||
}
|
||||
|
||||
unsafe impl Send for DateTimeBoxProxy {}
|
||||
unsafe impl Sync for DateTimeBoxProxy {}
|
||||
|
||||
impl DateTimeBoxProxy {
|
||||
pub fn new(handle: *mut c_void) -> Self {
|
||||
DateTimeBoxProxy {
|
||||
handle: Arc::new(DateTimeBoxHandle { ptr: handle }),
|
||||
base: BoxBase::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl BoxCore for DateTimeBoxProxy {
|
||||
fn box_id(&self) -> u64 {
|
||||
self.base.id
|
||||
}
|
||||
|
||||
fn parent_type_id(&self) -> Option<std::any::TypeId> {
|
||||
None // プロキシ型は継承しない
|
||||
}
|
||||
|
||||
fn fmt_box(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
if let Ok(to_string_fn) = plugin.library.get::<Symbol<unsafe extern "C" fn(*mut c_void) -> *mut c_char>>(b"nyash_datetime_to_string\0") {
|
||||
let str_ptr = to_string_fn(self.handle.ptr);
|
||||
if !str_ptr.is_null() {
|
||||
let c_str = CStr::from_ptr(str_ptr);
|
||||
if let Ok(rust_str) = c_str.to_str() {
|
||||
let result = write!(f, "{}", rust_str);
|
||||
|
||||
// 文字列を解放
|
||||
if let Ok(free_fn) = plugin.library.get::<Symbol<unsafe extern "C" fn(*mut c_char)>>(b"nyash_string_free\0") {
|
||||
free_fn(str_ptr);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
write!(f, "DateTimeBox")
|
||||
}
|
||||
|
||||
fn as_any(&self) -> &dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
|
||||
fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl NyashBox for DateTimeBoxProxy {
|
||||
fn type_name(&self) -> &'static str {
|
||||
"DateTimeBox"
|
||||
}
|
||||
|
||||
fn clone_box(&self) -> Box<dyn NyashBox> {
|
||||
// DateTimeBoxは不変なので、ハンドルを共有
|
||||
Box::new(DateTimeBoxProxy {
|
||||
handle: Arc::clone(&self.handle),
|
||||
base: BoxBase::new(),
|
||||
})
|
||||
}
|
||||
|
||||
fn share_box(&self) -> Box<dyn NyashBox> {
|
||||
self.clone_box()
|
||||
}
|
||||
|
||||
fn to_string_box(&self) -> StringBox {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
if let Ok(to_string_fn) = plugin.library.get::<Symbol<unsafe extern "C" fn(*mut c_void) -> *mut c_char>>(b"nyash_datetime_to_string\0") {
|
||||
let str_ptr = to_string_fn(self.handle.ptr);
|
||||
if !str_ptr.is_null() {
|
||||
let c_str = CStr::from_ptr(str_ptr);
|
||||
if let Ok(rust_str) = c_str.to_str() {
|
||||
let result = StringBox::new(rust_str);
|
||||
|
||||
// 文字列を解放
|
||||
if let Ok(free_fn) = plugin.library.get::<Symbol<unsafe extern "C" fn(*mut c_char)>>(b"nyash_string_free\0") {
|
||||
free_fn(str_ptr);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
StringBox::new("DateTimeBox")
|
||||
}
|
||||
|
||||
fn equals(&self, other: &dyn NyashBox) -> BoolBox {
|
||||
if let Some(other_datetime) = other.as_any().downcast_ref::<DateTimeBoxProxy>() {
|
||||
// タイムスタンプで比較
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
if let Ok(timestamp_fn) = plugin.library.get::<Symbol<unsafe extern "C" fn(*mut c_void) -> i64>>(b"nyash_datetime_timestamp\0") {
|
||||
let this_ts = timestamp_fn(self.handle.ptr);
|
||||
let other_ts = timestamp_fn(other_datetime.handle.ptr);
|
||||
return BoolBox::new(this_ts == other_ts);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
BoolBox::new(false)
|
||||
} else {
|
||||
BoolBox::new(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for DateTimeBoxProxy {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
self.fmt_box(f)
|
||||
}
|
||||
}
|
||||
|
||||
/// プラグインローダー公開API
|
||||
pub struct PluginLoader;
|
||||
|
||||
@ -402,4 +990,229 @@ impl PluginLoader {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// Mathプラグインをロード
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn load_math_plugin() -> Result<(), RuntimeError> {
|
||||
let mut cache = PLUGIN_CACHE.write().unwrap();
|
||||
|
||||
if cache.contains_key("math") {
|
||||
return Ok(()); // 既にロード済み
|
||||
}
|
||||
|
||||
// プラグインパスを決定（複数の場所を試す）
|
||||
let lib_name = if cfg!(target_os = "windows") {
|
||||
"nyash_math.dll"
|
||||
} else if cfg!(target_os = "macos") {
|
||||
"libnyash_math.dylib"
|
||||
} else {
|
||||
"libnyash_math.so"
|
||||
};
|
||||
|
||||
// 複数のパスを試す
|
||||
let possible_paths = vec![
|
||||
format!("./target/release/{}", lib_name),
|
||||
format!("./target/debug/{}", lib_name),
|
||||
format!("./plugins/{}", lib_name),
|
||||
format!("./{}", lib_name),
|
||||
];
|
||||
|
||||
let mut lib_path = None;
|
||||
for path in &possible_paths {
|
||||
if std::path::Path::new(path).exists() {
|
||||
lib_path = Some(path.clone());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
let lib_path = lib_path.ok_or_else(|| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to find math plugin library. Searched paths: {:?}", possible_paths)
|
||||
}
|
||||
})?;
|
||||
|
||||
// ライブラリをロード
|
||||
unsafe {
|
||||
let library = Library::new(&lib_path).map_err(|e| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to load math plugin: {}", e)
|
||||
}
|
||||
})?;
|
||||
|
||||
// プラグイン情報（簡略化）
|
||||
let info = PluginInfo {
|
||||
name: "math".to_string(),
|
||||
version: 1,
|
||||
api_version: 1,
|
||||
};
|
||||
|
||||
cache.insert("math".to_string(), LoadedPlugin {
|
||||
library,
|
||||
info,
|
||||
});
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// MathBoxを作成
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn create_math_box() -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
Self::load_math_plugin()?;
|
||||
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
let create_fn: Symbol<unsafe extern "C" fn() -> *mut c_void> =
|
||||
plugin.library.get(b"nyash_math_create\0").map_err(|e| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to get nyash_math_create: {}", e)
|
||||
}
|
||||
})?;
|
||||
|
||||
let handle = create_fn();
|
||||
if handle.is_null() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: "Failed to create MathBox".to_string()
|
||||
});
|
||||
}
|
||||
|
||||
Ok(Box::new(MathBoxProxy::new(handle)))
|
||||
}
|
||||
} else {
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Math plugin not loaded".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// RandomBoxを作成
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn create_random_box() -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
Self::load_math_plugin()?;
|
||||
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
let create_fn: Symbol<unsafe extern "C" fn() -> *mut c_void> =
|
||||
plugin.library.get(b"nyash_random_create\0").map_err(|e| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to get nyash_random_create: {}", e)
|
||||
}
|
||||
})?;
|
||||
|
||||
let handle = create_fn();
|
||||
if handle.is_null() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: "Failed to create RandomBox".to_string()
|
||||
});
|
||||
}
|
||||
|
||||
Ok(Box::new(RandomBoxProxy::new(handle)))
|
||||
}
|
||||
} else {
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Math plugin not loaded".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// TimeBoxを作成
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn create_time_box() -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
Self::load_math_plugin()?;
|
||||
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
let create_fn: Symbol<unsafe extern "C" fn() -> *mut c_void> =
|
||||
plugin.library.get(b"nyash_time_create\0").map_err(|e| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to get nyash_time_create: {}", e)
|
||||
}
|
||||
})?;
|
||||
|
||||
let handle = create_fn();
|
||||
if handle.is_null() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: "Failed to create TimeBox".to_string()
|
||||
});
|
||||
}
|
||||
|
||||
Ok(Box::new(TimeBoxProxy::new(handle)))
|
||||
}
|
||||
} else {
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Math plugin not loaded".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// 現在時刻のDateTimeBoxを作成
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn create_datetime_now() -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
Self::load_math_plugin()?;
|
||||
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
unsafe {
|
||||
let now_fn: Symbol<unsafe extern "C" fn() -> *mut c_void> =
|
||||
plugin.library.get(b"nyash_time_now\0").map_err(|e| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to get nyash_time_now: {}", e)
|
||||
}
|
||||
})?;
|
||||
|
||||
let handle = now_fn();
|
||||
if handle.is_null() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: "Failed to create DateTimeBox".to_string()
|
||||
});
|
||||
}
|
||||
|
||||
Ok(Box::new(DateTimeBoxProxy::new(handle)))
|
||||
}
|
||||
} else {
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Math plugin not loaded".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// 文字列からDateTimeBoxを作成
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
pub fn create_datetime_from_string(time_str: &str) -> Result<Box<dyn NyashBox>, RuntimeError> {
|
||||
Self::load_math_plugin()?;
|
||||
|
||||
let cache = PLUGIN_CACHE.read().unwrap();
|
||||
if let Some(plugin) = cache.get("math") {
|
||||
let c_str = CString::new(time_str).map_err(|_| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: "Invalid time string".to_string()
|
||||
}
|
||||
})?;
|
||||
|
||||
unsafe {
|
||||
let parse_fn: Symbol<unsafe extern "C" fn(*const c_char) -> *mut c_void> =
|
||||
plugin.library.get(b"nyash_time_parse\0").map_err(|e| {
|
||||
RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to get nyash_time_parse: {}", e)
|
||||
}
|
||||
})?;
|
||||
|
||||
let handle = parse_fn(c_str.as_ptr());
|
||||
if handle.is_null() {
|
||||
return Err(RuntimeError::InvalidOperation {
|
||||
message: format!("Failed to parse time string: {}", time_str)
|
||||
});
|
||||
}
|
||||
|
||||
Ok(Box::new(DateTimeBoxProxy::new(handle)))
|
||||
}
|
||||
} else {
|
||||
Err(RuntimeError::InvalidOperation {
|
||||
message: "Math plugin not loaded".to_string()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user