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

🚀 feat: BoxBase+BoxCore革命 Phase2完了 - 統一アーキテクチャ基盤実装

Browse Source 
✅ BoxBase構造体とBoxCoreトレイト実装完了
- BoxBase: 全Box型共通の基盤構造体（統一ID管理）
- BoxCore: box_id()とfmt_box()の統一インターフェース
- NyashBox: BoxCoreを継承、type_name()デフォルト実装追加

✅ 主要Box型の統一アーキテクチャ移行完了
- StringBox, IntegerBox, BoolBox, VoidBox, NullBox
- FileBox, ErrorBox, ResultBox
- unsafe ID生成 → BoxBase::new()安全化
- Display実装 → fmt_box()統一化

🎯 CharmFlow教訓活用：互換性破綻回避の統一基盤完成
🔧 Phase3: 残りBox型の統一化作業継続中

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Moe Charm
2025-08-11 11:05:53 +09:00
parent bbd9499b0e
commit 73a12dfb56
2 changed files with 148 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

244
src/box_trait.rs
View File

@ -9,12 +9,45 @@
use std::fmt::{Debug, Display};
use std::any::Any;
use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicU64, Ordering};
use std::fs;
use std::path::Path;
/// 🔥 BoxBase + BoxCore革命 - 統一ID生成システム
/// CharmFlow教訓を活かした互換性保証の基盤
pub fn next_box_id() -> u64 {
static COUNTER: AtomicU64 = AtomicU64::new(1);
COUNTER.fetch_add(1, Ordering::Relaxed)
}
/// 🏗️ BoxBase - 全てのBox型の共通基盤構造体
/// Phase 2: 統一的な基盤データを提供
pub struct BoxBase {
pub id: u64,
}
impl BoxBase {
/// 新しいBoxBase作成 - 安全なID生成
pub fn new() -> Self {
Self {
id: next_box_id(),
}
}
}
/// 🎯 BoxCore - Box型共通メソッドの統一インターフェース
/// Phase 2: 重複コードを削減する中核トレイト
pub trait BoxCore: Send + Sync {
/// ボックスの一意ID取得
fn box_id(&self) -> u64;
/// Display実装のための統一フォーマット
fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result;
}
/// The fundamental trait that all Nyash values must implement.
/// This embodies the "Everything is Box" philosophy with Rust's type safety.
pub trait NyashBox: Debug + Send + Sync {
pub trait NyashBox: BoxCore + Debug {
/// Convert this box to a string representation (equivalent to Python's toString())
fn to_string_box(&self) -> StringBox;
@ -22,7 +55,9 @@ pub trait NyashBox: Debug + Send + Sync {
fn equals(&self, other: &dyn NyashBox) -> BoolBox;
/// Get the type name of this box for debugging
fn type_name(&self) -> &'static str;
fn type_name(&self) -> &'static str {
std::any::type_name::<Self>()
}
/// Clone this box (equivalent to Python's copy())
fn clone_box(&self) -> Box<dyn NyashBox>;
@ -30,9 +65,6 @@ pub trait NyashBox: Debug + Send + Sync {
/// Convert to Any for downcasting (enables dynamic typing in static Rust)
fn as_any(&self) -> &dyn Any;
/// Get a unique identifier for this box instance
fn box_id(&self) -> u64;
// 🌟 TypeBox革命: Get type information as a Box
// Everything is Box極限実現 - 型情報もBoxとして取得！
// TODO: 次のステップで完全実装
@ -45,20 +77,14 @@ pub trait NyashBox: Debug + Send + Sync {
#[derive(Debug, Clone, PartialEq)]
pub struct StringBox {
pub value: String,
id: u64,
base: BoxBase,
}
impl StringBox {
pub fn new(value: impl Into<String>) -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self {
value: value.into(),
id,
base: BoxBase::new(),
}
}
@ -149,6 +175,16 @@ impl StringBox {
}
}
impl BoxCore for StringBox {
fn box_id(&self) -> u64 {
self.base.id
}
fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{}", self.value)
}
}
impl NyashBox for StringBox {
fn to_string_box(&self) -> StringBox {
self.clone()
@ -173,15 +209,11 @@ impl NyashBox for StringBox {
fn as_any(&self) -> &dyn Any {
self
}
fn box_id(&self) -> u64 {
self.id
}
}
impl Display for StringBox {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.value)
self.fmt_box(f)
}
}
@ -189,18 +221,15 @@ impl Display for StringBox {
#[derive(Debug, Clone, PartialEq)]
pub struct IntegerBox {
pub value: i64,
id: u64,
base: BoxBase,
}
impl IntegerBox {
pub fn new(value: i64) -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self { value, id }
Self {
value,
base: BoxBase::new()
}
}
pub fn zero() -> Self {
@ -208,6 +237,16 @@ impl IntegerBox {
}
}
impl BoxCore for IntegerBox {
fn box_id(&self) -> u64 {
self.base.id
}
fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{}", self.value)
}
}
impl NyashBox for IntegerBox {
fn to_string_box(&self) -> StringBox {
StringBox::new(self.value.to_string())
@ -232,15 +271,11 @@ impl NyashBox for IntegerBox {
fn as_any(&self) -> &dyn Any {
self
}
fn box_id(&self) -> u64 {
self.id
}
}
impl Display for IntegerBox {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.value)
self.fmt_box(f)
}
}
@ -248,18 +283,15 @@ impl Display for IntegerBox {
#[derive(Debug, Clone, PartialEq)]
pub struct BoolBox {
pub value: bool,
id: u64,
base: BoxBase,
}
impl BoolBox {
pub fn new(value: bool) -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self { value, id }
Self {
value,
base: BoxBase::new()
}
}
pub fn true_box() -> Self {
@ -271,6 +303,16 @@ impl BoolBox {
}
}
impl BoxCore for BoolBox {
fn box_id(&self) -> u64 {
self.base.id
}
fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{}", if self.value { "true" } else { "false" })
}
}
impl NyashBox for BoolBox {
fn to_string_box(&self) -> StringBox {
StringBox::new(if self.value { "true" } else { "false" })
@ -295,33 +337,25 @@ impl NyashBox for BoolBox {
fn as_any(&self) -> &dyn Any {
self
}
fn box_id(&self) -> u64 {
self.id
}
}
impl Display for BoolBox {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", if self.value { "true" } else { "false" })
self.fmt_box(f)
}
}
/// Void/null values in Nyash - represents empty or null results
#[derive(Debug, Clone, PartialEq)]
pub struct VoidBox {
id: u64,
base: BoxBase,
}
impl VoidBox {
pub fn new() -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self { id }
Self {
base: BoxBase::new()
}
}
}
@ -331,6 +365,16 @@ impl Default for VoidBox {
}
}
impl BoxCore for VoidBox {
fn box_id(&self) -> u64 {
self.base.id
}
fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "void")
}
}
impl NyashBox for VoidBox {
fn to_string_box(&self) -> StringBox {
StringBox::new("void")
@ -351,15 +395,11 @@ impl NyashBox for VoidBox {
fn as_any(&self) -> &dyn Any {
self
}
fn box_id(&self) -> u64 {
self.id
}
}
impl Display for VoidBox {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "void")
self.fmt_box(f)
}
}
@ -370,20 +410,14 @@ pub use crate::boxes::array::ArrayBox;
#[derive(Debug, Clone)]
pub struct FileBox {
pub path: String,
id: u64,
base: BoxBase,
}
impl FileBox {
pub fn new(path: impl Into<String>) -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self {
path: path.into(),
id,
base: BoxBase::new(),
}
}
@ -428,6 +462,16 @@ impl FileBox {
}
}
impl BoxCore for FileBox {
fn box_id(&self) -> u64 {
self.base.id
}
fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "<FileBox: {}>", self.path)
}
}
impl NyashBox for FileBox {
fn to_string_box(&self) -> StringBox {
StringBox::new(format!("<FileBox: {}>", self.path))
@ -452,15 +496,11 @@ impl NyashBox for FileBox {
fn as_any(&self) -> &dyn Any {
self
}
fn box_id(&self) -> u64 {
self.id
}
}
impl Display for FileBox {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "<FileBox: {}>", self.path)
self.fmt_box(f)
}
}
@ -469,25 +509,29 @@ impl Display for FileBox {
pub struct ErrorBox {
pub error_type: String,
pub message: String,
id: u64,
base: BoxBase,
}
impl ErrorBox {
pub fn new(error_type: impl Into<String>, message: impl Into<String>) -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self {
error_type: error_type.into(),
message: message.into(),
id,
base: BoxBase::new(),
}
}
}
impl BoxCore for ErrorBox {
fn box_id(&self) -> u64 {
self.base.id
}
fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{}: {}", self.error_type, self.message)
}
}
impl NyashBox for ErrorBox {
fn to_string_box(&self) -> StringBox {
StringBox::new(format!("{}: {}", self.error_type, self.message))
@ -512,15 +556,11 @@ impl NyashBox for ErrorBox {
fn as_any(&self) -> &dyn Any {
self
}
fn box_id(&self) -> u64 {
self.id
}
}
impl Display for ErrorBox {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}: {}", self.error_type, self.message)
self.fmt_box(f)
}
}
@ -530,37 +570,25 @@ pub struct ResultBox {
pub is_success: bool,
pub value: Option<Box<dyn NyashBox>>,
pub error: Option<ErrorBox>,
id: u64,
base: BoxBase,
}
impl ResultBox {
pub fn new_success(value: Box<dyn NyashBox>) -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self {
is_success: true,
value: Some(value),
error: None,
id,
base: BoxBase::new(),
}
}
pub fn new_error(error: ErrorBox) -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self {
is_success: false,
value: None,
error: Some(error),
id,
base: BoxBase::new(),
}
}
@ -686,16 +714,10 @@ impl Clone for FutureBox {
impl FutureBox {
pub fn new() -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self {
result: Arc::new(Mutex::new(None)),
is_ready: Arc::new(Mutex::new(false)),
id,
id: next_box_id(),
}
}
@ -799,13 +821,11 @@ pub struct AddBox {
impl AddBox {
pub fn new(left: Box<dyn NyashBox>, right: Box<dyn NyashBox>) -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self { left, right, id }
Self {
left,
right,
id: next_box_id()
}
}
/// Execute the addition operation and return the result

30
src/boxes/null_box.rs
View File

@ -84,25 +84,21 @@
* - メソッド呼び出し時のnullチェックでNullPointerException防止
*/
use crate::box_trait::{NyashBox, StringBox, BoolBox};
use crate::box_trait::{NyashBox, StringBox, BoolBox, BoxCore, BoxBase, next_box_id};
use std::fmt::{Debug, Display};
use std::any::Any;
/// null値を表現するBox
#[derive(Debug, Clone)]
pub struct NullBox {
id: u64,
base: BoxBase,
}
impl NullBox {
pub fn new() -> Self {
static mut COUNTER: u64 = 0;
let id = unsafe {
COUNTER += 1;
COUNTER
};
Self { id }
Self {
base: BoxBase::new()
}
}
/// null値かどうかを判定
@ -138,6 +134,16 @@ impl NullBox {
}
}
impl BoxCore for NullBox {
fn box_id(&self) -> u64 {
self.base.id
}
fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "null")
}
}
impl NyashBox for NullBox {
fn type_name(&self) -> &'static str {
"NullBox"
@ -159,15 +165,11 @@ impl NyashBox for NullBox {
fn as_any(&self) -> &dyn Any {
self
}
fn box_id(&self) -> u64 {
self.id
}
}
impl Display for NullBox {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "null")
self.fmt_box(f)
}
}