refactor: 大規模リファクタリングPhase完了 - SRP原則による品質向上

🎯 実行内容:
• box_operators.rs: 639行 → 26%構造改善 (Phase 1-2完了)
  - マクロ抽出: macros.rs (演算子実装統一)
  - ヘルパー分離: helpers.rs (共通ユーティリティ)
  - 静的実装分離: static_ops.rs (静的演算子)
• arithmetic boxes: 完全モジュール分割
  - 6種類の演算Box (add/subtract/multiply/divide/modulo/compare)
• plugin_loader_v2: 7モジュール完全分割
  - config/library/metadata/singletons/specs/util分離
• nyash-net-plugin: 緊急修正完了 (27エラー→0)
  - import解決問題・マクロスコープ問題・関数構造問題修正
• nyash-filebox-plugin: モジュール統合・冗長削除

📊 成果:
• SRP原則適用による保守性向上
• 大規模ファイル分割による可読性改善
• プラグインビルドエラー完全解決
• モジュール境界明確化・再利用性向上

🔧 検証済み: 全スモークテスト正常動作確認

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

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Selfhosting Dev
2025-09-25 05:03:59 +09:00
parent a800acdb63
commit 8fbbe2b3a0
34 changed files with 2004 additions and 2022 deletions

View File

@ -0,0 +1,63 @@
//! Helper functions and type conversion utilities for Box operators
//!
//! This module contains utility functions used across the operator system,
//! primarily for type conversion and validation.
use crate::box_trait::{NyashBox, StringBox};
/// Concatenate two boxes by converting both to strings
///
/// This function provides the fallback behavior for addition operations
/// when type-specific arithmetic is not available - it converts both
/// operands to strings and concatenates them.
///
/// # Arguments
///
/// * `left` - The left operand
/// * `right` - The right operand
///
/// # Returns
///
/// A StringBox containing the concatenated string representation
/// of both operands.
///
/// # Example
///
/// ```rust
/// let left = IntegerBox::new(42);
/// let right = BoolBox::new(true);
/// let result = concat_result(&left, &right);
/// // result will be StringBox("42true")
/// ```
#[inline]
pub fn concat_result(left: &dyn NyashBox, right: &dyn NyashBox) -> Box<dyn NyashBox> {
let l = left.to_string_box();
let r = right.to_string_box();
Box::new(StringBox::new(format!("{}{}", l.value, r.value)))
}
/// Check if a repetition count is within safe limits
///
/// This function validates that string repetition operations stay within
/// reasonable bounds to prevent memory exhaustion attacks.
///
/// # Arguments
///
/// * `times` - The number of repetitions requested
///
/// # Returns
///
/// `true` if the repetition count is safe (0-10,000), `false` otherwise.
///
/// # Example
///
/// ```rust
/// assert!(can_repeat(5)); // OK
/// assert!(can_repeat(10000)); // OK (at limit)
/// assert!(!can_repeat(10001)); // Too many
/// assert!(!can_repeat(-1)); // Negative
/// ```
#[inline]
pub fn can_repeat(times: i64) -> bool {
(0..=10_000).contains(&times)
}

View File

@ -0,0 +1,63 @@
//! Macro definitions for Box operator implementations
//!
//! This module contains the macro system for generating static trait implementations
//! for numeric Box types (IntegerBox, FloatBox, etc.)
// Note: The traits and OperatorError are used within the macro expansion,
// so they appear unused to the compiler but are actually required.
/// Generate static numeric operator implementations for a given Box type
///
/// This macro creates implementations of NyashAdd, NyashSub, NyashMul, and NyashDiv
/// for the specified type, with built-in error handling (e.g., division by zero).
///
/// # Arguments
///
/// * `$ty` - The Box type to implement operators for (e.g., IntegerBox, FloatBox)
/// * `$zero` - The zero value for the type (e.g., 0 for integers, 0.0 for floats)
///
/// # Example
///
/// ```rust
/// impl_static_numeric_ops!(IntegerBox, 0);
/// impl_static_numeric_ops!(FloatBox, 0.0);
/// ```
#[macro_export]
macro_rules! impl_static_numeric_ops {
($ty:ty, $zero:expr) => {
impl crate::operator_traits::NyashAdd<$ty> for $ty {
type Output = $ty;
fn add(self, rhs: $ty) -> Self::Output {
< $ty >::new(self.value + rhs.value)
}
}
impl crate::operator_traits::NyashSub<$ty> for $ty {
type Output = $ty;
fn sub(self, rhs: $ty) -> Self::Output {
< $ty >::new(self.value - rhs.value)
}
}
impl crate::operator_traits::NyashMul<$ty> for $ty {
type Output = $ty;
fn mul(self, rhs: $ty) -> Self::Output {
< $ty >::new(self.value * rhs.value)
}
}
impl crate::operator_traits::NyashDiv<$ty> for $ty {
type Output = Result<$ty, crate::operator_traits::OperatorError>;
fn div(self, rhs: $ty) -> Self::Output {
if rhs.value == $zero {
Err(crate::operator_traits::OperatorError::DivisionByZero)
} else {
Ok(< $ty >::new(self.value / rhs.value))
}
}
}
};
}
// Re-export the macro for external use
pub use impl_static_numeric_ops;

View File

@ -0,0 +1,60 @@
//! Static trait implementations for Box operators
//!
//! This module contains all static trait implementations (NyashAdd, NyashSub, etc.)
//! for basic Box types. It uses both macro-generated implementations for numeric
//! types and manual implementations for special cases.
use crate::box_trait::{BoolBox, IntegerBox, StringBox};
use crate::boxes::FloatBox;
use crate::operator_traits::{NyashAdd, NyashMul};
use crate::impl_static_numeric_ops;
// ===== Macro-generated static implementations =====
/// Static numeric operations for IntegerBox
///
/// Generates implementations for: Add, Sub, Mul, Div with zero-division error handling
impl_static_numeric_ops!(IntegerBox, 0);
/// Static numeric operations for FloatBox
///
/// Generates implementations for: Add, Sub, Mul, Div with zero-division error handling
impl_static_numeric_ops!(FloatBox, 0.0);
// ===== Manual static implementations for special cases =====
/// StringBox + StringBox -> StringBox (concatenation)
impl NyashAdd<StringBox> for StringBox {
type Output = StringBox;
fn add(self, rhs: StringBox) -> Self::Output {
StringBox::new(format!("{}{}", self.value, rhs.value))
}
}
/// StringBox * IntegerBox -> StringBox (repetition)
impl NyashMul<IntegerBox> for StringBox {
type Output = StringBox;
fn mul(self, rhs: IntegerBox) -> Self::Output {
if rhs.value >= 0 && rhs.value <= 10000 {
// Safety limit to prevent memory exhaustion
StringBox::new(self.value.repeat(rhs.value as usize))
} else {
StringBox::new(String::new()) // Empty string for invalid repetition
}
}
}
/// BoolBox + BoolBox -> IntegerBox (logical OR as addition)
impl NyashAdd<BoolBox> for BoolBox {
type Output = IntegerBox;
fn add(self, rhs: BoolBox) -> Self::Output {
let result = (self.value as i64) + (rhs.value as i64);
IntegerBox::new(result)
}
}
// Note: Additional static implementations can be added here as needed
// for cross-type operations or special Box types