diff options
Diffstat (limited to 'src/forth')
| -rw-r--r-- | src/forth/interp.rs | 17 | ||||
| -rw-r--r-- | src/forth/parser.rs | 3 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/forth/interp.rs b/src/forth/interp.rs index cacc5e3..e41f0d9 100644 --- a/src/forth/interp.rs +++ b/src/forth/interp.rs @@ -29,6 +29,12 @@ pub enum OpCode { #[derive(Clone, Debug)] pub struct ByteCode(pub Vec<OpCode>); +impl std::ops::Deref for ByteCode { + type Target = Vec<OpCode>; + fn deref(&self) -> &Self::Target { + &self.0 + } +} impl ByteCode { pub fn len(&self) -> usize { @@ -67,15 +73,20 @@ pub struct CallStack(pub Vec<InstructionPointer>); #[derive(Clone, Debug)] pub struct WordList(pub Vec<ByteCode>); +impl std::ops::Deref for WordList { + type Target = Vec<ByteCode>; + fn deref(&self) -> &Self::Target { + &self.0 + } +} #[derive(Debug)] pub struct Interp { // todo: don't be pub, probably pub stack: DataStack, - callstack: CallStack, - // todo: don't be pub + pub callstack: CallStack, pub wordlist: WordList, - ip: InstructionPointer, + pub ip: InstructionPointer, } #[derive(Debug)] diff --git a/src/forth/parser.rs b/src/forth/parser.rs index ac6715d..1eb93df 100644 --- a/src/forth/parser.rs +++ b/src/forth/parser.rs @@ -1,7 +1,5 @@ use super::interp::{ByteCode, OpCode, WordList}; -use log::debug; - use std::collections::HashMap; use std::iter::{Enumerate, Iterator}; use std::str::Chars; @@ -81,7 +79,6 @@ impl<'a> Parser<'a> { self.enumerator.by_ref() .find(|(_i, c)| c.is_whitespace())?; let word = &self.text[start..end]; - debug!("Parser::next_word → ‘{}’ ({} → {})", word, start, end); Some((word, start, end)) } |
