From edcf4bf0a7d33808795a993c64ba370c92d3bf5c Mon Sep 17 00:00:00 2001 From: Moe Charm Date: Mon, 11 Aug 2025 11:25:17 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20feat:=20BoxBase+BoxCore=E9=9D=A9?= =?UTF-8?q?=E5=91=BD=20Phase4=E9=80=B2=E6=8D=97=20-=2012+Box=E5=9E=8B?= =?UTF-8?q?=E7=B5=B1=E4=B8=80=E5=AE=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ 完了したBox型統一アーキテクチャ移行 - MathBox関連: MathBox, FloatBox, RangeBox - TimeBox関連: TimeBox, DateTimeBox, TimerBox - DebugBox, RandomBox - StringBox, IntegerBox, BoolBox (個別ファイル版) - ArrayBox, ConsoleBox - box_trait.rs内: StringBox, IntegerBox, BoolBox, VoidBox等 🎯 大幅な進捗達成 - unsafe ID生成 → BoxBase::new()安全化 - コンパイルエラー: 106 → 97に減少 - 統一インターフェース確立でCharmFlow互換性問題完全回避 🔧 革命的変更パターン確立 1. base: BoxBase導入 2. impl BoxCore with box_id()/fmt_box() 3. NyashBoxからbox_id()削除 4. Display::fmt() → fmt_box()委譲 Phase 4E: 残りBox型の統一化継続中 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- src/box_trait.rs | 48 +- src/boxes/array/mod.rs | 42 +- src/boxes/bool_box.rs | 26 +- src/boxes/console_box.rs | 54 +- src/boxes/debug_box.rs | 36 +- src/boxes/integer_box.rs | 26 +- src/boxes/math_box.rs | 92 +- src/boxes/random_box.rs | 25 +- src/boxes/string_box.rs | 23 +- src/boxes/time_box.rs | 94 +- src/parser/mod.rs.backup_before_cleanup | 1306 ----------------------- 11 files changed, 260 insertions(+), 1512 deletions(-) delete mode 100644 src/parser/mod.rs.backup_before_cleanup diff --git a/src/box_trait.rs b/src/box_trait.rs index d1fed321..377ac386 100644 --- a/src/box_trait.rs +++ b/src/box_trait.rs @@ -616,6 +616,16 @@ impl ResultBox { } } +impl BoxCore for ResultBox { + fn box_id(&self) -> u64 { + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", self.to_string_box().value) + } +} + impl NyashBox for ResultBox { fn to_string_box(&self) -> StringBox { if self.is_success { @@ -682,15 +692,11 @@ impl NyashBox for ResultBox { fn as_any(&self) -> &dyn Any { self } - - fn box_id(&self) -> u64 { - self.id - } } impl Display for ResultBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.to_string_box().value) + self.fmt_box(f) } } @@ -798,15 +804,21 @@ impl NyashBox for FutureBox { fn as_any(&self) -> &dyn Any { self } - +} + +impl BoxCore for FutureBox { fn box_id(&self) -> u64 { - self.id + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", self.to_string_box().value) } } impl Display for FutureBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.to_string_box().value) + self.fmt_box(f) } } @@ -816,7 +828,7 @@ impl Display for FutureBox { pub struct AddBox { pub left: Box, pub right: Box, - id: u64, + base: BoxBase, } impl AddBox { @@ -824,7 +836,7 @@ impl AddBox { Self { left, right, - id: next_box_id() + base: BoxBase::new(), } } @@ -911,9 +923,21 @@ impl NyashBox for AddBox { fn as_any(&self) -> &dyn Any { self } - +} + +impl BoxCore for AddBox { fn box_id(&self) -> u64 { - self.id + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "({} + {})", self.left.to_string_box().value, self.right.to_string_box().value) + } +} + +impl Display for AddBox { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + self.fmt_box(f) } } diff --git a/src/boxes/array/mod.rs b/src/boxes/array/mod.rs index 81c56bd1..5a17dd8b 100644 --- a/src/boxes/array/mod.rs +++ b/src/boxes/array/mod.rs @@ -2,40 +2,31 @@ // Nyashの箱システムによる配列・リスト操作を提供します。 // Arcパターンで内部可変性を実現 -use crate::box_trait::{NyashBox, StringBox, BoolBox, IntegerBox}; +use crate::box_trait::{NyashBox, StringBox, BoolBox, IntegerBox, BoxCore, BoxBase}; use std::any::Any; use std::sync::{Arc, Mutex}; +use std::fmt::Display; #[derive(Debug, Clone)] pub struct ArrayBox { pub items: Arc>>>, - id: u64, + base: BoxBase, } impl ArrayBox { /// 新しいArrayBoxを作成 pub fn new() -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; ArrayBox { items: Arc::new(Mutex::new(Vec::new())), - id, + base: BoxBase::new(), } } /// 要素を持つArrayBoxを作成 pub fn new_with_elements(elements: Vec>) -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; ArrayBox { items: Arc::new(Mutex::new(elements)), - id, + base: BoxBase::new(), } } @@ -146,6 +137,26 @@ impl ArrayBox { } } +impl BoxCore for ArrayBox { + fn box_id(&self) -> u64 { + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + let items = self.items.lock().unwrap(); + let strings: Vec = items.iter() + .map(|item| item.to_string_box().value) + .collect(); + write!(f, "[{}]", strings.join(", ")) + } +} + +impl Display for ArrayBox { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + self.fmt_box(f) + } +} + impl NyashBox for ArrayBox { fn clone_box(&self) -> Box { Box::new(self.clone()) @@ -167,9 +178,6 @@ impl NyashBox for ArrayBox { "ArrayBox" } - fn box_id(&self) -> u64 { - self.id - } fn equals(&self, other: &dyn NyashBox) -> BoolBox { if let Some(other_array) = other.as_any().downcast_ref::() { diff --git a/src/boxes/bool_box.rs b/src/boxes/bool_box.rs index 8175fb15..12244bf2 100644 --- a/src/boxes/bool_box.rs +++ b/src/boxes/bool_box.rs @@ -38,7 +38,7 @@ * - `a or b` - OR演算子 */ -use crate::box_trait::NyashBox; +use crate::box_trait::{NyashBox, BoxCore, BoxBase}; use std::any::Any; use std::fmt::Display; @@ -46,18 +46,15 @@ use std::fmt::Display; #[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 { @@ -94,13 +91,20 @@ impl NyashBox for BoolBox { self } +} + +impl BoxCore for BoolBox { fn box_id(&self) -> u64 { - self.id + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", if self.value { "true" } else { "false" }) } } 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) } } \ No newline at end of file diff --git a/src/boxes/console_box.rs b/src/boxes/console_box.rs index b97d066d..15652bd5 100644 --- a/src/boxes/console_box.rs +++ b/src/boxes/console_box.rs @@ -45,7 +45,7 @@ * ``` */ -use crate::box_trait::{NyashBox, StringBox, BoolBox}; +use crate::box_trait::{NyashBox, StringBox, BoolBox, BoxCore, BoxBase}; use std::any::Any; use std::fmt::Display; @@ -53,18 +53,13 @@ use std::fmt::Display; #[cfg(target_arch = "wasm32")] #[derive(Debug, Clone)] pub struct ConsoleBox { - id: u64, + base: BoxBase, } #[cfg(target_arch = "wasm32")] impl ConsoleBox { pub fn new() -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - Self { id } + Self { base: BoxBase::new() } } /// Log messages to browser console @@ -88,6 +83,17 @@ impl ConsoleBox { } } +#[cfg(target_arch = "wasm32")] +impl BoxCore for ConsoleBox { + fn box_id(&self) -> u64 { + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "[ConsoleBox - Browser Console Interface]") + } +} + #[cfg(target_arch = "wasm32")] impl NyashBox for ConsoleBox { fn to_string_box(&self) -> StringBox { @@ -109,28 +115,19 @@ impl NyashBox for ConsoleBox { fn as_any(&self) -> &dyn Any { self } - - fn box_id(&self) -> u64 { - self.id - } } // Non-WASM版 - モックアップ実装 #[cfg(not(target_arch = "wasm32"))] #[derive(Debug, Clone)] pub struct ConsoleBox { - id: u64, + base: BoxBase, } #[cfg(not(target_arch = "wasm32"))] impl ConsoleBox { pub fn new() -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - Self { id } + Self { base: BoxBase::new() } } /// Mock log method for non-WASM environments @@ -151,6 +148,17 @@ impl ConsoleBox { } } +#[cfg(not(target_arch = "wasm32"))] +impl BoxCore for ConsoleBox { + fn box_id(&self) -> u64 { + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "[ConsoleBox - Mock Implementation]") + } +} + #[cfg(not(target_arch = "wasm32"))] impl NyashBox for ConsoleBox { fn to_string_box(&self) -> StringBox { @@ -172,10 +180,6 @@ impl NyashBox for ConsoleBox { fn as_any(&self) -> &dyn Any { self } - - fn box_id(&self) -> u64 { - self.id - } } @@ -183,13 +187,13 @@ impl NyashBox for ConsoleBox { #[cfg(target_arch = "wasm32")] impl Display for ConsoleBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "[ConsoleBox - Browser Console Interface]") + self.fmt_box(f) } } #[cfg(not(target_arch = "wasm32"))] impl Display for ConsoleBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "[ConsoleBox - Mock Implementation]") + self.fmt_box(f) } } diff --git a/src/boxes/debug_box.rs b/src/boxes/debug_box.rs index d4c83408..41284f65 100644 --- a/src/boxes/debug_box.rs +++ b/src/boxes/debug_box.rs @@ -102,18 +102,18 @@ use std::collections::HashMap; use std::sync::{Arc, Mutex}; use chrono::Local; -use crate::box_trait::{NyashBox, StringBox, BoolBox, VoidBox}; +use crate::box_trait::{BoxCore, BoxBase, next_box_id, NyashBox, StringBox, BoolBox, VoidBox}; use crate::interpreter::RuntimeError; use crate::instance::InstanceBox; use std::any::Any; #[derive(Debug, Clone)] pub struct DebugBox { + base: BoxBase, tracking_enabled: Arc>, tracked_boxes: Arc>>, breakpoints: Arc>>, call_stack: Arc>>, - id: u64, } #[derive(Debug, Clone)] @@ -133,18 +133,12 @@ struct CallInfo { impl DebugBox { pub fn new() -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - DebugBox { + base: BoxBase::new(), tracking_enabled: Arc::new(Mutex::new(false)), tracked_boxes: Arc::new(Mutex::new(HashMap::new())), breakpoints: Arc::new(Mutex::new(Vec::new())), call_stack: Arc::new(Mutex::new(Vec::new())), - id, } } @@ -314,6 +308,25 @@ impl DebugBox { } } +// Implement BoxCore trait for DebugBox +impl BoxCore for DebugBox { + fn box_id(&self) -> u64 { + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + let tracked = self.tracked_boxes.lock().unwrap(); + write!(f, "DebugBox[{} tracked]", tracked.len()) + } +} + +// Implement Display trait using BoxCore +impl std::fmt::Display for DebugBox { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + self.fmt_box(f) + } +} + // Implement NyashBox trait for DebugBox impl NyashBox for DebugBox { fn to_string_box(&self) -> StringBox { @@ -323,7 +336,7 @@ impl NyashBox for DebugBox { fn equals(&self, other: &dyn NyashBox) -> BoolBox { if let Some(other_debug) = other.as_any().downcast_ref::() { - BoolBox::new(self.id == other_debug.id) + BoolBox::new(self.base.id == other_debug.base.id) } else { BoolBox::new(false) } @@ -341,7 +354,4 @@ impl NyashBox for DebugBox { self } - fn box_id(&self) -> u64 { - self.id - } } \ No newline at end of file diff --git a/src/boxes/integer_box.rs b/src/boxes/integer_box.rs index e37ecee2..b625cb09 100644 --- a/src/boxes/integer_box.rs +++ b/src/boxes/integer_box.rs @@ -37,7 +37,7 @@ * - 小数点以下は切り捨て（整数除算） */ -use crate::box_trait::NyashBox; +use crate::box_trait::{NyashBox, BoxCore, BoxBase}; use std::any::Any; use std::fmt::Display; @@ -45,18 +45,15 @@ use std::fmt::Display; #[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 { @@ -90,13 +87,20 @@ impl NyashBox for IntegerBox { self } +} + +impl BoxCore for IntegerBox { fn box_id(&self) -> u64 { - self.id + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", self.value) } } impl Display for IntegerBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.value) + self.fmt_box(f) } } \ No newline at end of file diff --git a/src/boxes/math_box.rs b/src/boxes/math_box.rs index e86eb65a..d19292cd 100644 --- a/src/boxes/math_box.rs +++ b/src/boxes/math_box.rs @@ -56,25 +56,21 @@ * - 整数演算は自動でFloatBoxに変換される場合あり */ -use crate::box_trait::{NyashBox, StringBox, IntegerBox, BoolBox}; +use crate::box_trait::{NyashBox, StringBox, IntegerBox, BoolBox, BoxCore, BoxBase, next_box_id}; use std::fmt::{Debug, Display}; use std::any::Any; /// 数学演算を提供するBox #[derive(Debug, Clone)] pub struct MathBox { - id: u64, + base: BoxBase, } impl MathBox { pub fn new() -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - - Self { id } + Self { + base: BoxBase::new() + } } /// 絶対値を計算 @@ -286,6 +282,16 @@ impl MathBox { } } +impl BoxCore for MathBox { + fn box_id(&self) -> u64 { + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "MathBox()") + } +} + impl NyashBox for MathBox { fn type_name(&self) -> &'static str { "MathBox" @@ -301,7 +307,7 @@ impl NyashBox for MathBox { fn equals(&self, other: &dyn NyashBox) -> BoolBox { if let Some(other_math) = other.as_any().downcast_ref::() { - BoolBox::new(self.id == other_math.id) + BoolBox::new(self.box_id() == other_math.box_id()) } else { BoolBox::new(false) } @@ -310,15 +316,11 @@ impl NyashBox for MathBox { fn as_any(&self) -> &dyn Any { self } - - fn box_id(&self) -> u64 { - self.id - } } impl Display for MathBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "MathBox()") + self.fmt_box(f) } } @@ -326,18 +328,25 @@ impl Display for MathBox { #[derive(Debug, Clone)] pub struct FloatBox { pub value: f64, - id: u64, + base: BoxBase, } impl FloatBox { pub fn new(value: f64) -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - - Self { value, id } + Self { + value, + base: BoxBase::new() + } + } +} + +impl BoxCore for FloatBox { + fn box_id(&self) -> u64 { + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", self.value) } } @@ -367,15 +376,11 @@ impl NyashBox for FloatBox { fn as_any(&self) -> &dyn Any { self } - - fn box_id(&self) -> u64 { - self.id - } } impl Display for FloatBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.value) + self.fmt_box(f) } } @@ -385,18 +390,17 @@ pub struct RangeBox { pub start: i64, pub end: i64, pub step: i64, - id: u64, + base: BoxBase, } impl RangeBox { pub fn new(start: i64, end: i64, step: i64) -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - - Self { start, end, step, id } + Self { + start, + end, + step, + base: BoxBase::new() + } } /// イテレータとして値を生成 @@ -420,6 +424,16 @@ impl RangeBox { } } +impl BoxCore for RangeBox { + fn box_id(&self) -> u64 { + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Range({}, {}, {})", self.start, self.end, self.step) + } +} + impl NyashBox for RangeBox { fn type_name(&self) -> &'static str { "RangeBox" @@ -448,14 +462,10 @@ impl NyashBox for RangeBox { fn as_any(&self) -> &dyn Any { self } - - fn box_id(&self) -> u64 { - self.id - } } impl Display for RangeBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "Range({}, {}, {})", self.start, self.end, self.step) + self.fmt_box(f) } } \ No newline at end of file diff --git a/src/boxes/random_box.rs b/src/boxes/random_box.rs index 8b4d6237..6a0e5c5d 100644 --- a/src/boxes/random_box.rs +++ b/src/boxes/random_box.rs @@ -67,7 +67,7 @@ * - 大きな配列のshuffleは処理時間が長い場合あり */ -use crate::box_trait::{NyashBox, StringBox, IntegerBox, BoolBox}; +use crate::box_trait::{NyashBox, StringBox, IntegerBox, BoolBox, BoxCore, BoxBase}; use crate::boxes::array::ArrayBox; use crate::boxes::math_box::FloatBox; use std::fmt::{Debug, Display}; @@ -79,17 +79,11 @@ use std::sync::{Arc, Mutex}; pub struct RandomBox { // 簡易線形合同法による疑似乱数生成器 seed: Arc>, - id: u64, + base: BoxBase, } impl RandomBox { pub fn new() -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - // 現在時刻を種として使用 let seed = std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) @@ -98,7 +92,7 @@ impl RandomBox { Self { seed: Arc::new(Mutex::new(seed)), - id, + base: BoxBase::new(), } } @@ -268,7 +262,7 @@ impl NyashBox for RandomBox { fn equals(&self, other: &dyn NyashBox) -> BoolBox { if let Some(other_random) = other.as_any().downcast_ref::() { - BoolBox::new(self.id == other_random.id) + BoolBox::new(self.base.id == other_random.base.id) } else { BoolBox::new(false) } @@ -278,13 +272,20 @@ impl NyashBox for RandomBox { self } +} + +impl BoxCore for RandomBox { fn box_id(&self) -> u64 { - self.id + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "RandomBox()") } } impl Display for RandomBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "RandomBox()") + self.fmt_box(f) } } \ No newline at end of file diff --git a/src/boxes/string_box.rs b/src/boxes/string_box.rs index c1c56ccc..bae41ff9 100644 --- a/src/boxes/string_box.rs +++ b/src/boxes/string_box.rs @@ -27,7 +27,7 @@ * result = text.concat(" Nyash") // "Hello, World! Nyash" * ``` */ -use crate::box_trait::NyashBox; +use crate::box_trait::{NyashBox, BoxCore, BoxBase}; use std::any::Any; use std::fmt::Display; @@ -35,20 +35,14 @@ use std::fmt::Display; #[derive(Debug, Clone, PartialEq)] pub struct StringBox { pub value: String, - id: u64, + base: BoxBase, } impl StringBox { pub fn new(value: impl Into) -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - Self { value: value.into(), - id, + base: BoxBase::new(), } } @@ -161,13 +155,20 @@ impl NyashBox for StringBox { self } +} + +impl BoxCore for StringBox { fn box_id(&self) -> u64 { - self.id + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", self.value) } } impl Display for StringBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.value) + self.fmt_box(f) } } \ No newline at end of file diff --git a/src/boxes/time_box.rs b/src/boxes/time_box.rs index d3f620e4..8e05c612 100644 --- a/src/boxes/time_box.rs +++ b/src/boxes/time_box.rs @@ -118,7 +118,7 @@ * - 夏時間切り替え時は計算に注意 */ -use crate::box_trait::{NyashBox, StringBox, IntegerBox, BoolBox}; +use crate::box_trait::{NyashBox, StringBox, IntegerBox, BoolBox, BoxCore, BoxBase}; use std::fmt::{Debug, Display}; use std::any::Any; use std::time::{SystemTime, Duration}; @@ -127,18 +127,12 @@ use chrono::{DateTime, Local, TimeZone, Datelike, Timelike}; /// 時間操作を提供するBox #[derive(Debug, Clone)] pub struct TimeBox { - id: u64, + base: BoxBase, } impl TimeBox { pub fn new() -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - - Self { id } + Self { base: BoxBase::new() } } /// 現在時刻を取得 @@ -208,7 +202,7 @@ impl NyashBox for TimeBox { fn equals(&self, other: &dyn NyashBox) -> BoolBox { if let Some(other_time) = other.as_any().downcast_ref::() { - BoolBox::new(self.id == other_time.id) + BoolBox::new(self.base.id == other_time.base.id) } else { BoolBox::new(false) } @@ -217,15 +211,21 @@ impl NyashBox for TimeBox { fn as_any(&self) -> &dyn Any { self } - +} + +impl BoxCore for TimeBox { fn box_id(&self) -> u64 { - self.id + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "TimeBox()") } } impl Display for TimeBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "TimeBox()") + self.fmt_box(f) } } @@ -233,56 +233,38 @@ impl Display for TimeBox { #[derive(Debug, Clone)] pub struct DateTimeBox { pub datetime: DateTime, - id: u64, + base: BoxBase, } impl DateTimeBox { /// 現在時刻で作成 pub fn now() -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - Self { datetime: Local::now(), - id, + base: BoxBase::new(), } } /// UNIXタイムスタンプから作成 pub fn from_timestamp(timestamp: i64) -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - let datetime = Local.timestamp_opt(timestamp, 0).unwrap(); - Self { datetime, id } + Self { datetime, base: BoxBase::new() } } /// 文字列からパース pub fn parse(date_str: &str) -> Result { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - // ISO 8601形式でパース match DateTime::parse_from_rfc3339(date_str) { Ok(dt) => Ok(Self { datetime: dt.with_timezone(&Local), - id, + base: BoxBase::new(), }), Err(_) => { // シンプルな形式でパース (YYYY-MM-DD HH:MM:SS) match chrono::NaiveDateTime::parse_from_str(date_str, "%Y-%m-%d %H:%M:%S") { Ok(naive_dt) => { let datetime = Local.from_local_datetime(&naive_dt).unwrap(); - Ok(Self { datetime, id }) + Ok(Self { datetime, base: BoxBase::new() }) } Err(e) => Err(format!("Failed to parse date: {}", e)), } @@ -346,7 +328,7 @@ impl DateTimeBox { let new_datetime = self.datetime + chrono::Duration::days(int_box.value); Box::new(DateTimeBox { datetime: new_datetime, - id: self.id, + base: BoxBase::new(), }) } else { Box::new(StringBox::new("Error: addDays() requires integer input")) @@ -359,7 +341,7 @@ impl DateTimeBox { let new_datetime = self.datetime + chrono::Duration::hours(int_box.value); Box::new(DateTimeBox { datetime: new_datetime, - id: self.id, + base: BoxBase::new(), }) } else { Box::new(StringBox::new("Error: addHours() requires integer input")) @@ -391,15 +373,21 @@ impl NyashBox for DateTimeBox { fn as_any(&self) -> &dyn Any { self } - +} + +impl BoxCore for DateTimeBox { fn box_id(&self) -> u64 { - self.id + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{}", self.datetime.format("%Y-%m-%d %H:%M:%S")) } } impl Display for DateTimeBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.datetime.format("%Y-%m-%d %H:%M:%S")) + self.fmt_box(f) } } @@ -407,20 +395,14 @@ impl Display for DateTimeBox { #[derive(Debug, Clone)] pub struct TimerBox { start_time: SystemTime, - id: u64, + base: BoxBase, } impl TimerBox { pub fn new() -> Self { - static mut COUNTER: u64 = 0; - let id = unsafe { - COUNTER += 1; - COUNTER - }; - Self { start_time: SystemTime::now(), - id, + base: BoxBase::new(), } } @@ -457,7 +439,7 @@ impl NyashBox for TimerBox { fn equals(&self, other: &dyn NyashBox) -> BoolBox { if let Some(other_timer) = other.as_any().downcast_ref::() { - BoolBox::new(self.id == other_timer.id) + BoolBox::new(self.base.id == other_timer.base.id) } else { BoolBox::new(false) } @@ -466,14 +448,20 @@ impl NyashBox for TimerBox { fn as_any(&self) -> &dyn Any { self } - +} + +impl BoxCore for TimerBox { fn box_id(&self) -> u64 { - self.id + self.base.id + } + + fn fmt_box(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "TimerBox()") } } impl Display for TimerBox { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "TimerBox()") + self.fmt_box(f) } } \ No newline at end of file diff --git a/src/parser/mod.rs.backup_before_cleanup b/src/parser/mod.rs.backup_before_cleanup deleted file mode 100644 index 971599a8..00000000 --- a/src/parser/mod.rs.backup_before_cleanup +++ /dev/null @@ -1,1306 +0,0 @@ -/*! - * Nyash Parser - Rust Implementation - * - * Python版nyashc_v4.pyのNyashParserをRustで完全再実装 - * Token列をAST (Abstract Syntax Tree) に変換 - * - * TODO: リファクタリング計画 - * - expressions.rs: 式パーサー (parse_expression, parse_or, parse_and等) - * - statements.rs: 文パーサー (parse_statement, parse_if, parse_loop等) - * - declarations.rs: 宣言パーサー (parse_box_declaration, parse_function_declaration等) - * - errors.rs: エラー型定義とハンドリング - */ - -// サブモジュール宣言 -mod expressions; -mod statements; -// mod declarations; -// mod errors; - -use crate::tokenizer::{Token, TokenType, TokenizeError}; -use crate::ast::{ASTNode, Span}; -use std::collections::HashMap; -use thiserror::Error; - -// Two-phase parser structures are no longer needed - simplified to direct parsing - -/// パースエラー -#[derive(Error, Debug)] -pub enum ParseError { - #[error("Unexpected token {found:?}, expected {expected} at line {line}")] - UnexpectedToken { found: TokenType, expected: String, line: usize }, - - #[error("Unexpected end of file")] - UnexpectedEOF, - - #[error("Invalid expression at line {line}")] - InvalidExpression { line: usize }, - - #[error("Invalid statement at line {line}")] - InvalidStatement { line: usize }, - - #[error("Circular dependency detected between static boxes: {cycle}")] - CircularDependency { cycle: String }, - - #[error("Tokenize error: {0}")] - TokenizeError(#[from] TokenizeError), -} - -/// Nyashパーサー - トークン列をASTに変換 -pub struct NyashParser { - tokens: Vec, - current: usize, - /// 🔥 Static box依存関係追跡（循環依存検出用） - static_box_dependencies: std::collections::HashMap>, -} - -impl NyashParser { - /// 新しいパーサーを作成 - pub fn new(tokens: Vec) -> Self { - Self { - tokens, - current: 0, - static_box_dependencies: std::collections::HashMap::new(), - } - } - - /// 文字列からパース (トークナイズ + パース) - pub fn parse_from_string(input: impl Into) -> Result { - eprintln!("🔍 PARSER: parse_from_string called"); - let mut tokenizer = crate::tokenizer::NyashTokenizer::new(input); - eprintln!("🔍 PARSER: Tokenizer created"); - let tokens = tokenizer.tokenize()?; - eprintln!("🔍 PARSER: Tokenization completed, {} tokens", tokens.len()); - - let mut parser = Self::new(tokens); - eprintln!("🔍 PARSER: Parser created, starting parse..."); - let result = parser.parse(); - eprintln!("🔍 PARSER: Parse completed, returning result"); - result - } - - /// パース実行 - Program ASTを返す - pub fn parse(&mut self) -> Result { - self.parse_program() - } - - // ===== パース関数群 ===== - - /// プログラム全体をパース - fn parse_program(&mut self) -> Result { - let mut statements = Vec::new(); - eprintln!("🔍 PARSER: Starting parse_program"); - let mut statement_count = 0; - - while !self.is_at_end() { - eprintln!("🔍 PARSER: Loop iteration {}, current token: {:?}", - statement_count, self.current_token().token_type); - - // EOF tokenはスキップ - if matches!(self.current_token().token_type, TokenType::EOF) { - eprintln!("🔍 PARSER: Found EOF, breaking loop"); - break; - } - - // NEWLINE tokenはスキップ（文の区切りとして使用） - if matches!(self.current_token().token_type, TokenType::NEWLINE) { - eprintln!("🔍 PARSER: Skipping NEWLINE"); - self.advance(); - continue; - } - - eprintln!("🔍 PARSER: Parsing statement {}", statement_count + 1); - let statement = self.parse_statement()?; - statements.push(statement); - statement_count += 1; - eprintln!("🔍 PARSER: Statement {} parsed successfully", statement_count); - } - - eprintln!("🔍 PARSER: All statements parsed, total: {}", statement_count); - - // 🔥 すべてのstatic box解析後に循環依存検出 - self.check_circular_dependencies()?; - - Ok(ASTNode::Program { statements, span: Span::unknown() }) - } - // Statement parsing methods are now in statements.rs module - - /// box宣言をパース: box Name { fields... methods... } - fn parse_box_declaration(&mut self) -> Result { - self.consume(TokenType::BOX)?; - - let name = if let TokenType::IDENTIFIER(name) = &self.current_token().token_type { - let name = name.clone(); - self.advance(); - name - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "identifier".to_string(), - line, - }); - }; - - // 🔥 ジェネリクス型パラメータのパース () - let type_parameters = if self.match_token(&TokenType::LESS) { - self.advance(); // consume '<' - let mut params = Vec::new(); - - loop { - if let TokenType::IDENTIFIER(param_name) = &self.current_token().token_type { - params.push(param_name.clone()); - self.advance(); - - if self.match_token(&TokenType::COMMA) { - self.advance(); // consume ',' - } else { - break; - } - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "type parameter name".to_string(), - line, - }); - } - } - - self.consume(TokenType::GREATER)?; // consume '>' - params - } else { - Vec::new() - }; - - // from句のパース（継承） - let extends = if self.match_token(&TokenType::FROM) { - self.advance(); // consume 'from' - - if let TokenType::IDENTIFIER(parent_name) = &self.current_token().token_type { - let parent_name = parent_name.clone(); - self.advance(); - Some(parent_name) - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "parent class name".to_string(), - line, - }); - } - } else { - None - }; - - // interface句のパース（インターフェース実装） - let implements = if self.match_token(&TokenType::INTERFACE) { - self.advance(); // consume 'interface' - - let mut interface_list = Vec::new(); - - loop { - if let TokenType::IDENTIFIER(interface_name) = &self.current_token().token_type { - interface_list.push(interface_name.clone()); - self.advance(); - - if self.match_token(&TokenType::COMMA) { - self.advance(); // consume ',' - } else { - break; - } - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "interface name".to_string(), - line, - }); - } - } - - interface_list - } else { - vec![] - }; - - self.consume(TokenType::LBRACE)?; - self.skip_newlines(); // ブレース後の改行をスキップ - - let mut fields = Vec::new(); - let mut methods = HashMap::new(); - let mut constructors = HashMap::new(); - let mut init_fields = Vec::new(); - - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); // ループ開始時に改行をスキップ - - // RBRACEに到達していればループを抜ける - if self.match_token(&TokenType::RBRACE) { - break; - } - - // initブロックの処理 - if self.match_token(&TokenType::INIT) { - self.advance(); // consume 'init' - self.consume(TokenType::LBRACE)?; - - // initブロック内のフィールド定義を読み込み - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); - - if self.match_token(&TokenType::RBRACE) { - break; - } - - if let TokenType::IDENTIFIER(field_name) = &self.current_token().token_type { - init_fields.push(field_name.clone()); - self.advance(); - - // カンマがあればスキップ - if self.match_token(&TokenType::COMMA) { - self.advance(); - } - } else { - // 不正なトークンがある場合はエラー - return Err(ParseError::UnexpectedToken { - expected: "field name".to_string(), - found: self.current_token().token_type.clone(), - line: self.current_token().line, - }); - } - } - - self.consume(TokenType::RBRACE)?; - continue; - } - - if let TokenType::IDENTIFIER(field_or_method) = &self.current_token().token_type { - let field_or_method = field_or_method.clone(); - self.advance(); - - // メソッド定義またはコンストラクタか？ - if self.match_token(&TokenType::LPAREN) { - // Box名と同じ場合はコンストラクタ - if field_or_method == name { - // コンストラクタの処理 - self.advance(); // consume '(' - - let mut params = Vec::new(); - while !self.match_token(&TokenType::RPAREN) && !self.is_at_end() { - if let TokenType::IDENTIFIER(param) = &self.current_token().token_type { - params.push(param.clone()); - self.advance(); - } - - if self.match_token(&TokenType::COMMA) { - self.advance(); - } - } - - self.consume(TokenType::RPAREN)?; - self.consume(TokenType::LBRACE)?; - - let mut body = Vec::new(); - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); - if !self.match_token(&TokenType::RBRACE) { - body.push(self.parse_statement()?); - } - } - - self.consume(TokenType::RBRACE)?; - - let constructor = ASTNode::FunctionDeclaration { - name: field_or_method.clone(), - params: params.clone(), - body, - is_static: false, // コンストラクタは静的でない - span: Span::unknown(), - }; - - // パラメータの数でコンストラクタを区別 - let constructor_key = format!("{}/{}", field_or_method, params.len()); - constructors.insert(constructor_key, constructor); - } else { - // 通常のメソッド定義 - self.advance(); // consume '(' - - let mut params = Vec::new(); - while !self.match_token(&TokenType::RPAREN) && !self.is_at_end() { - eprintln!("🔍 PARSER: Method params loop, current token: {:?}", self.current_token().token_type); - - if let TokenType::IDENTIFIER(param) = &self.current_token().token_type { - eprintln!("🔍 PARSER: Found parameter: {}", param); - params.push(param.clone()); - self.advance(); - - if self.match_token(&TokenType::COMMA) { - eprintln!("🔍 PARSER: Found comma after parameter"); - self.advance(); - // カンマの後に閉じ括弧があるかチェック - if self.match_token(&TokenType::RPAREN) { - eprintln!("⚠️ PARSER: Warning: trailing comma in parameters"); - } - } - } else if !self.match_token(&TokenType::RPAREN) { - // IDENTIFIERでもRPARENでもない場合はエラー - let line = self.current_token().line; - eprintln!("❌ PARSER: Expected parameter name or ')', got {:?}", self.current_token().token_type); - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "parameter name or ')'".to_string(), - line, - }); - } - } - - self.consume(TokenType::RPAREN)?; - self.consume(TokenType::LBRACE)?; - - let mut body = Vec::new(); - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); // メソッド本体内の改行をスキップ - if !self.match_token(&TokenType::RBRACE) { - body.push(self.parse_statement()?); - } - } - - self.consume(TokenType::RBRACE)?; - - let method = ASTNode::FunctionDeclaration { - name: field_or_method.clone(), - params, - body, - is_static: false, // メソッドは通常静的でない - span: Span::unknown(), - }; - - methods.insert(field_or_method, method); - } - } else { - // フィールド定義 - fields.push(field_or_method); - } - self.skip_newlines(); // フィールド/メソッド定義後の改行をスキップ - } else { - // 予期しないトークンの場合、詳細なエラー情報を出力してスキップ - let line = self.current_token().line; - eprintln!("Debug: Unexpected token {:?} at line {}", self.current_token().token_type, line); - self.advance(); // トークンをスキップして続行 - } - } - - self.consume(TokenType::RBRACE)?; - - Ok(ASTNode::BoxDeclaration { - name, - fields, - methods, - constructors, - init_fields, - is_interface: false, - extends, - implements, - type_parameters, - is_static: false, - static_init: None, - span: Span::unknown(), - }) - } - - /// インターフェースBox宣言をパース: interface box Name { method1() method2() } - fn parse_interface_box_declaration(&mut self) -> Result { - self.consume(TokenType::INTERFACE)?; - self.consume(TokenType::BOX)?; - - let name = if let TokenType::IDENTIFIER(name) = &self.current_token().token_type { - let name = name.clone(); - self.advance(); - name - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "identifier".to_string(), - line, - }); - }; - - self.consume(TokenType::LBRACE)?; - self.skip_newlines(); // ブレース後の改行をスキップ - - let mut methods = HashMap::new(); - - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); // ループ開始時に改行をスキップ - if let TokenType::IDENTIFIER(method_name) = &self.current_token().token_type { - let method_name = method_name.clone(); - self.advance(); - - // インターフェースメソッドはシグネチャのみ - if self.match_token(&TokenType::LPAREN) { - self.advance(); // consume '(' - - let mut params = Vec::new(); - while !self.match_token(&TokenType::RPAREN) && !self.is_at_end() { - if let TokenType::IDENTIFIER(param) = &self.current_token().token_type { - params.push(param.clone()); - self.advance(); - } - - if self.match_token(&TokenType::COMMA) { - self.advance(); - } - } - - self.consume(TokenType::RPAREN)?; - - // インターフェースメソッドは実装なし（空のbody） - let method_decl = ASTNode::FunctionDeclaration { - name: method_name.clone(), - params, - body: vec![], // 空の実装 - is_static: false, // インターフェースメソッドは通常静的でない - span: Span::unknown(), - }; - - methods.insert(method_name, method_decl); - - // メソッド宣言後の改行をスキップ - self.skip_newlines(); - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "(".to_string(), - line, - }); - } - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "method name".to_string(), - line, - }); - } - } - - self.consume(TokenType::RBRACE)?; - - Ok(ASTNode::BoxDeclaration { - name, - fields: vec![], // インターフェースはフィールドなし - methods, - constructors: HashMap::new(), // インターフェースにコンストラクタなし - init_fields: vec![], // インターフェースにinitブロックなし - is_interface: true, // インターフェースフラグ - extends: None, - implements: vec![], - type_parameters: Vec::new(), // 🔥 インターフェースではジェネリクス未対応 - is_static: false, // インターフェースは非static - static_init: None, // インターフェースにstatic initなし - span: Span::unknown(), - }) - } - - /// グローバル変数をパース: global name = value - fn parse_global_var(&mut self) -> Result { - self.consume(TokenType::GLOBAL)?; - - let name = if let TokenType::IDENTIFIER(name) = &self.current_token().token_type { - let name = name.clone(); - self.advance(); - name - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "identifier".to_string(), - line, - }); - }; - - self.consume(TokenType::ASSIGN)?; - let value = Box::new(self.parse_expression()?); - - Ok(ASTNode::GlobalVar { name, value, span: Span::unknown() }) - } - // Statement parsing methods are now in statements.rs module - - /// function宣言をパース: function name(params) { body } - fn parse_function_declaration(&mut self) -> Result { - self.consume(TokenType::FUNCTION)?; - - // 関数名を取得 - let name = if let TokenType::IDENTIFIER(name) = &self.current_token().token_type { - let name = name.clone(); - self.advance(); - name - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "function name".to_string(), - line, - }); - }; - - // パラメータリストをパース - self.consume(TokenType::LPAREN)?; - let mut params = Vec::new(); - - while !self.match_token(&TokenType::RPAREN) && !self.is_at_end() { - if let TokenType::IDENTIFIER(param) = &self.current_token().token_type { - params.push(param.clone()); - self.advance(); - - if self.match_token(&TokenType::COMMA) { - self.advance(); - } - } else if !self.match_token(&TokenType::RPAREN) { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "parameter name".to_string(), - line, - }); - } - } - - self.consume(TokenType::RPAREN)?; - - // 関数本体をパース - self.consume(TokenType::LBRACE)?; - self.skip_newlines(); - - let mut body = Vec::new(); - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); - if !self.match_token(&TokenType::RBRACE) { - body.push(self.parse_statement()?); - } - } - - self.consume(TokenType::RBRACE)?; - - Ok(ASTNode::FunctionDeclaration { - name, - params, - body, - is_static: false, // 通常の関数は静的でない - span: Span::unknown(), - }) - } - - /// 静的宣言をパース - 🔥 static function / static box 記法 - fn parse_static_declaration(&mut self) -> Result { - self.consume(TokenType::STATIC)?; - - // 次のトークンで分岐: function か box か - match &self.current_token().token_type { - TokenType::FUNCTION => self.parse_static_function(), - TokenType::BOX => self.parse_static_box(), - _ => { - let line = self.current_token().line; - Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "function or box after static".to_string(), - line, - }) - } - } - } - - /// 静的関数宣言をパース - static function Name() { ... } - fn parse_static_function(&mut self) -> Result { - self.consume(TokenType::FUNCTION)?; - - // 関数名を取得（Box名.関数名の形式をサポート） - let name = if let TokenType::IDENTIFIER(first_part) = &self.current_token().token_type { - let mut full_name = first_part.clone(); - self.advance(); - - // ドット記法をチェック（例：Math.min） - if self.match_token(&TokenType::DOT) { - self.advance(); // DOTを消費 - - if let TokenType::IDENTIFIER(method_name) = &self.current_token().token_type { - full_name = format!("{}.{}", full_name, method_name); - self.advance(); - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "method name after dot".to_string(), - line, - }); - } - } - - full_name - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "static function name".to_string(), - line, - }); - }; - - // パラメータリストをパース - self.consume(TokenType::LPAREN)?; - let mut params = Vec::new(); - - while !self.match_token(&TokenType::RPAREN) && !self.is_at_end() { - if let TokenType::IDENTIFIER(param) = &self.current_token().token_type { - params.push(param.clone()); - self.advance(); - - if self.match_token(&TokenType::COMMA) { - self.advance(); - } - } else if !self.match_token(&TokenType::RPAREN) { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "parameter name".to_string(), - line, - }); - } - } - - self.consume(TokenType::RPAREN)?; - - // 関数本体をパース - self.consume(TokenType::LBRACE)?; - self.skip_newlines(); // ブレースの後の改行をスキップ - - let mut body = Vec::new(); - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); // ループ開始時の改行をスキップ - if !self.match_token(&TokenType::RBRACE) { - body.push(self.parse_statement()?); - } - } - - self.consume(TokenType::RBRACE)?; - - Ok(ASTNode::FunctionDeclaration { - name, - params, - body, - is_static: true, // 🔥 静的関数フラグを設定 - span: Span::unknown(), - }) - } - - /// 静的Box宣言をパース - static box Name { ... } - fn parse_static_box(&mut self) -> Result { - self.consume(TokenType::BOX)?; - - let name = if let TokenType::IDENTIFIER(name) = &self.current_token().token_type { - let name = name.clone(); - self.advance(); - name - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "identifier".to_string(), - line, - }); - }; - - // 🔥 ジェネリクス型パラメータのパース () - let type_parameters = if self.match_token(&TokenType::LESS) { - self.advance(); // consume '<' - let mut params = Vec::new(); - - loop { - if let TokenType::IDENTIFIER(param_name) = &self.current_token().token_type { - params.push(param_name.clone()); - self.advance(); - - if self.match_token(&TokenType::COMMA) { - self.advance(); // consume ',' - } else { - break; - } - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "type parameter name".to_string(), - line, - }); - } - } - - self.consume(TokenType::GREATER)?; // consume '>' - params - } else { - Vec::new() - }; - - // from句のパース（継承）- static boxでも継承可能 - let extends = if self.match_token(&TokenType::FROM) { - self.advance(); // consume 'from' - - if let TokenType::IDENTIFIER(parent_name) = &self.current_token().token_type { - let parent_name = parent_name.clone(); - self.advance(); - Some(parent_name) - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "parent class name".to_string(), - line, - }); - } - } else { - None - }; - - // interface句のパース（インターフェース実装） - let implements = if self.match_token(&TokenType::INTERFACE) { - self.advance(); // consume 'interface' - - let mut interface_list = Vec::new(); - - loop { - if let TokenType::IDENTIFIER(interface_name) = &self.current_token().token_type { - interface_list.push(interface_name.clone()); - self.advance(); - - if self.match_token(&TokenType::COMMA) { - self.advance(); // consume ',' - } else { - break; - } - } else { - let line = self.current_token().line; - return Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: "interface name".to_string(), - line, - }); - } - } - - interface_list - } else { - vec![] - }; - - self.consume(TokenType::LBRACE)?; - self.skip_newlines(); // ブレース後の改行をスキップ - - let mut fields = Vec::new(); - let mut methods = HashMap::new(); - let constructors = HashMap::new(); - let mut init_fields = Vec::new(); - let mut static_init = None; - - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); // ループ開始時に改行をスキップ - - // RBRACEに到達していればループを抜ける - if self.match_token(&TokenType::RBRACE) { - break; - } - - // 🔥 static { } ブロックの処理 - if self.match_token(&TokenType::STATIC) { - self.advance(); // consume 'static' - self.consume(TokenType::LBRACE)?; - - let mut static_body = Vec::new(); - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); - if !self.match_token(&TokenType::RBRACE) { - static_body.push(self.parse_statement()?); - } - } - - self.consume(TokenType::RBRACE)?; - static_init = Some(static_body); - continue; - } - - // initブロックの処理 - if self.match_token(&TokenType::INIT) { - self.advance(); // consume 'init' - self.consume(TokenType::LBRACE)?; - - // initブロック内のフィールド定義を読み込み - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); - - if self.match_token(&TokenType::RBRACE) { - break; - } - - if let TokenType::IDENTIFIER(field_name) = &self.current_token().token_type { - init_fields.push(field_name.clone()); - self.advance(); - - // カンマがあればスキップ - if self.match_token(&TokenType::COMMA) { - self.advance(); - } - } else { - // 不正なトークンがある場合はエラー - return Err(ParseError::UnexpectedToken { - expected: "field name".to_string(), - found: self.current_token().token_type.clone(), - line: self.current_token().line, - }); - } - } - - self.consume(TokenType::RBRACE)?; - continue; - } - - if let TokenType::IDENTIFIER(field_or_method) = &self.current_token().token_type { - let field_or_method = field_or_method.clone(); - self.advance(); - - // メソッド定義か？ - if self.match_token(&TokenType::LPAREN) { - // メソッド定義 - self.advance(); // consume '(' - - let mut params = Vec::new(); - while !self.match_token(&TokenType::RPAREN) && !self.is_at_end() { - if let TokenType::IDENTIFIER(param) = &self.current_token().token_type { - params.push(param.clone()); - self.advance(); - } - - if self.match_token(&TokenType::COMMA) { - self.advance(); - } - } - - self.consume(TokenType::RPAREN)?; - self.consume(TokenType::LBRACE)?; - - let mut body = Vec::new(); - while !self.match_token(&TokenType::RBRACE) && !self.is_at_end() { - self.skip_newlines(); - if !self.match_token(&TokenType::RBRACE) { - body.push(self.parse_statement()?); - } - } - - self.consume(TokenType::RBRACE)?; - - let method = ASTNode::FunctionDeclaration { - name: field_or_method.clone(), - params, - body, - is_static: false, // static box内のメソッドは通常メソッド - span: Span::unknown(), - }; - - methods.insert(field_or_method, method); - } else { - // フィールド定義 - fields.push(field_or_method); - } - } else { - return Err(ParseError::UnexpectedToken { - expected: "method or field name".to_string(), - found: self.current_token().token_type.clone(), - line: self.current_token().line, - }); - } - } - - self.consume(TokenType::RBRACE)?; - - // 🔥 Static初期化ブロックから依存関係を抽出 - if let Some(ref init_stmts) = static_init { - let dependencies = self.extract_dependencies_from_statements(init_stmts); - self.static_box_dependencies.insert(name.clone(), dependencies); - } else { - self.static_box_dependencies.insert(name.clone(), std::collections::HashSet::new()); - } - - Ok(ASTNode::BoxDeclaration { - name, - fields, - methods, - constructors, - init_fields, - is_interface: false, - extends, - implements, - type_parameters, - is_static: true, // 🔥 static boxフラグを設定 - static_init, // 🔥 static初期化ブロック - span: Span::unknown(), - }) - } - - /// 代入文または関数呼び出しをパース - fn parse_assignment_or_function_call(&mut self) -> Result { - eprintln!("🔍 PARSER: parse_assignment_or_function_call() called"); - - // まず左辺を式としてパース - eprintln!("🔍 PARSER: Parsing left-hand expression..."); - let expr = self.parse_expression()?; - eprintln!("🔍 PARSER: Left-hand expression parsed successfully"); - - // 次のトークンが = なら代入文 - if self.match_token(&TokenType::ASSIGN) { - eprintln!("🔍 PARSER: Found '=', parsing assignment"); - self.advance(); // consume '=' - eprintln!("🔍 PARSER: Parsing right-hand expression..."); - let value = Box::new(self.parse_expression()?); - eprintln!("🔍 PARSER: Right-hand expression parsed successfully"); - - // 左辺が代入可能な形式かチェック - match &expr { - ASTNode::Variable { .. } | - ASTNode::FieldAccess { .. } => { - eprintln!("🔍 PARSER: Creating assignment AST node"); - Ok(ASTNode::Assignment { - target: Box::new(expr), - value, - span: Span::unknown(), - }) - } - _ => { - eprintln!("❌ PARSER: Invalid assignment target"); - let line = self.current_token().line; - Err(ParseError::InvalidStatement { line }) - } - } - } else { - // 代入文でなければ式文として返す - eprintln!("🔍 PARSER: Not an assignment, returning expression as statement"); - Ok(expr) - } - } - - // Expression parsing methods are now in expressions.rs module - - // ===== ユーティリティメソッド ===== - - /// 現在のトークンを取得 - fn current_token(&self) -> &Token { - self.tokens.get(self.current).unwrap_or(&Token { - token_type: TokenType::EOF, - line: 0, - column: 0, - }) - } - - /// 位置を1つ進める - fn advance(&mut self) { - if !self.is_at_end() { - self.current += 1; - } - } - - /// NEWLINEトークンをスキップ - fn skip_newlines(&mut self) { - let mut skip_count = 0; - while matches!(self.current_token().token_type, TokenType::NEWLINE) && !self.is_at_end() { - eprintln!("🔍 PARSER: Skipping NEWLINE #{}", skip_count + 1); - self.advance(); - skip_count += 1; - } - if skip_count > 0 { - eprintln!("🔍 PARSER: Skipped {} NEWLINEs total", skip_count); - } - } - - /// 指定されたトークンタイプを消費 (期待通りでなければエラー) - fn consume(&mut self, expected: TokenType) -> Result { - eprintln!("🔍 PARSER: consume() expecting {:?}, current: {:?}", - expected, self.current_token().token_type); - - if std::mem::discriminant(&self.current_token().token_type) == - std::mem::discriminant(&expected) { - let token = self.current_token().clone(); - eprintln!("🔍 PARSER: consume() success, advancing"); - self.advance(); - Ok(token) - } else { - eprintln!("❌ PARSER: consume() failed!"); - let line = self.current_token().line; - Err(ParseError::UnexpectedToken { - found: self.current_token().token_type.clone(), - expected: format!("{:?}", expected), - line, - }) - } - } - - /// 現在のトークンが指定されたタイプかチェック - fn match_token(&self, token_type: &TokenType) -> bool { - std::mem::discriminant(&self.current_token().token_type) == - std::mem::discriminant(token_type) - } - - /// 終端に達したかチェック - fn is_at_end(&self) -> bool { - self.current >= self.tokens.len() || - matches!(self.current_token().token_type, TokenType::EOF) - } - // Include, local, outbox, try/catch/throw parsing methods are now in statements.rs module - // Two-phase parser helper methods are no longer needed - simplified to direct parsing - - // ===== 🔥 Static Box循環依存検出 ===== - - /// Static初期化ブロック内の文から依存関係を抽出 - fn extract_dependencies_from_statements(&self, statements: &[ASTNode]) -> std::collections::HashSet { - let mut dependencies = std::collections::HashSet::new(); - - for stmt in statements { - self.extract_dependencies_from_ast(stmt, &mut dependencies); - } - - dependencies - } - - /// AST内から静的Box参照を再帰的に検出 - fn extract_dependencies_from_ast(&self, node: &ASTNode, dependencies: &mut std::collections::HashSet) { - match node { - ASTNode::FieldAccess { object, .. } => { - // Math.PI のような参照を検出 - if let ASTNode::Variable { name, .. } = object.as_ref() { - dependencies.insert(name.clone()); - } - } - ASTNode::MethodCall { object, .. } => { - // Config.getDebug() のような呼び出しを検出 - if let ASTNode::Variable { name, .. } = object.as_ref() { - dependencies.insert(name.clone()); - } - } - ASTNode::Assignment { target, value, .. } => { - self.extract_dependencies_from_ast(target, dependencies); - self.extract_dependencies_from_ast(value, dependencies); - } - ASTNode::BinaryOp { left, right, .. } => { - self.extract_dependencies_from_ast(left, dependencies); - self.extract_dependencies_from_ast(right, dependencies); - } - ASTNode::UnaryOp { operand, .. } => { - self.extract_dependencies_from_ast(operand, dependencies); - } - ASTNode::If { condition, then_body, else_body, .. } => { - self.extract_dependencies_from_ast(condition, dependencies); - for stmt in then_body { - self.extract_dependencies_from_ast(stmt, dependencies); - } - if let Some(else_stmts) = else_body { - for stmt in else_stmts { - self.extract_dependencies_from_ast(stmt, dependencies); - } - } - } - ASTNode::Loop { condition, body, .. } => { - self.extract_dependencies_from_ast(condition, dependencies); - for stmt in body { - self.extract_dependencies_from_ast(stmt, dependencies); - } - } - ASTNode::Return { value, .. } => { - if let Some(val) = value { - self.extract_dependencies_from_ast(val, dependencies); - } - } - ASTNode::Print { expression, .. } => { - self.extract_dependencies_from_ast(expression, dependencies); - } - // 他のAST nodeタイプも必要に応じて追加 - _ => {} - } - } - - /// 循環依存検出（深さ優先探索） - fn check_circular_dependencies(&self) -> Result<(), ParseError> { - let mut visited = std::collections::HashSet::new(); - let mut rec_stack = std::collections::HashSet::new(); - let mut path = Vec::new(); - - for box_name in self.static_box_dependencies.keys() { - if !visited.contains(box_name) { - if self.has_cycle_dfs(box_name, &mut visited, &mut rec_stack, &mut path)? { - return Ok(()); // エラーは既にhas_cycle_dfs内で返される - } - } - } - - Ok(()) - } - - /// DFS による循環依存検出 - fn has_cycle_dfs( - &self, - current: &str, - visited: &mut std::collections::HashSet, - rec_stack: &mut std::collections::HashSet, - path: &mut Vec, - ) -> Result { - visited.insert(current.to_string()); - rec_stack.insert(current.to_string()); - path.push(current.to_string()); - - if let Some(dependencies) = self.static_box_dependencies.get(current) { - for dependency in dependencies { - if !visited.contains(dependency) { - if self.has_cycle_dfs(dependency, visited, rec_stack, path)? { - return Ok(true); - } - } else if rec_stack.contains(dependency) { - // 循環依存を発見！ - let cycle_start_pos = path.iter().position(|x| x == dependency).unwrap_or(0); - let cycle_path: Vec = path[cycle_start_pos..].iter().cloned().collect(); - let cycle_display = format!("{} -> {}", cycle_path.join(" -> "), dependency); - - return Err(ParseError::CircularDependency { - cycle: cycle_display - }); - } - } - } - - rec_stack.remove(current); - path.pop(); - Ok(false) - } -} - -// ===== Tests ===== - -#[cfg(test)] -mod tests { - use super::*; - use crate::tokenizer::NyashTokenizer; - - #[test] - fn test_simple_parse() { - let code = r#" - box TestBox { - value - } - "#; - - let result = NyashParser::parse_from_string(code); - assert!(result.is_ok()); - - let ast = result.unwrap(); - match ast { - ASTNode::Program { statements, .. } => { - assert_eq!(statements.len(), 1); - match &statements[0] { - ASTNode::BoxDeclaration { name, fields, methods, .. } => { - assert_eq!(name, "TestBox"); - assert_eq!(fields.len(), 1); - assert_eq!(fields[0], "value"); - assert_eq!(methods.len(), 0); - } - _ => panic!("Expected BoxDeclaration"), - } - } - _ => panic!("Expected Program"), - } - } - - #[test] - fn test_assignment_parse() { - let code = "x = 42"; - - let result = NyashParser::parse_from_string(code); - assert!(result.is_ok()); - - let ast = result.unwrap(); - match ast { - ASTNode::Program { statements, .. } => { - assert_eq!(statements.len(), 1); - match &statements[0] { - ASTNode::Assignment { target, value, .. } => { - match target.as_ref() { - ASTNode::Variable { name, .. } => assert_eq!(name, "x"), - _ => panic!("Expected Variable in target"), - } - match value.as_ref() { - ASTNode::Literal { .. } => {}, - _ => panic!("Expected Literal in value"), - } - } - _ => panic!("Expected Assignment"), - } - } - _ => panic!("Expected Program"), - } - } - - #[test] - fn test_method_call_parse() { - let code = "obj.getValue()"; - - let result = NyashParser::parse_from_string(code); - assert!(result.is_ok()); - - let ast = result.unwrap(); - match ast { - ASTNode::Program { statements, .. } => { - assert_eq!(statements.len(), 1); - match &statements[0] { - ASTNode::MethodCall { object, method, arguments, .. } => { - match object.as_ref() { - ASTNode::Variable { name, .. } => assert_eq!(name, "obj"), - _ => panic!("Expected Variable in object"), - } - assert_eq!(method, "getValue"); - assert_eq!(arguments.len(), 0); - } - _ => panic!("Expected MethodCall"), - } - } - _ => panic!("Expected Program"), - } - } - - #[test] - fn test_binary_operation_parse() { - let code = "x + y * z"; - - let result = NyashParser::parse_from_string(code); - assert!(result.is_ok()); - - let ast = result.unwrap(); - match ast { - ASTNode::Program { statements, .. } => { - assert_eq!(statements.len(), 1); - match &statements[0] { - ASTNode::BinaryOp { operator, left, right, .. } => { - assert!(matches!(operator, BinaryOperator::Add)); - match left.as_ref() { - ASTNode::Variable { name, .. } => assert_eq!(name, "x"), - _ => panic!("Expected Variable in left"), - } - match right.as_ref() { - ASTNode::BinaryOp { operator, .. } => { - assert!(matches!(operator, BinaryOperator::Multiply)); - } - _ => panic!("Expected BinaryOp in right"), - } - } - _ => panic!("Expected BinaryOp"), - } - } - _ => panic!("Expected Program"), - } - } -} \ No newline at end of file