refactor: move some stuff around

voximity · Mar 10, 2023 · a8f911b · a8f911b
1 parent 934b4bc
commit a8f911b
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 53 deletions.
diff --git a/src/assembler/lexer.rs b/src/assembler/lexer.rs
@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, ops::Range};
 
-use super::IndexedChars;
+use crate::util::IndexedChars;
 
 #[derive(Default, Debug, Clone)]
 pub struct Lexeme {
@@ -138,7 +138,7 @@ impl<'a> Lexer<'a> {
                     if self.peek_is(|c| c == ':') {
                         // a label marker
                         self.chars.next();
-                        slice.end = self.chars.offset;
+                        slice.end = self.chars.offset();
 
                         lexemes.push(Lexeme {
                             slice,

diff --git a/src/assembler/mod.rs b/src/assembler/mod.rs
@@ -1,51 +1,2 @@
-use std::str::CharIndices;
-
 pub mod inst;
 pub mod lexer;
-
-pub struct IndexedChars<'a> {
-    slice: &'a str,
-    iter: CharIndices<'a>,
-    peeked: Option<Option<(usize, char)>>,
-    offset: usize,
-}
-
-impl<'a> Iterator for IndexedChars<'a> {
-    type Item = (usize, char);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self.peeked.take().unwrap_or_else(|| self.iter.next()) {
-            Some((offset, c)) => {
-                self.offset = self.peek_boundary();
-                Some((offset, c))
-            }
-            None => {
-                self.offset = self.slice.len();
-                None
-            }
-        }
-    }
-}
-
-impl<'a> IndexedChars<'a> {
-    pub fn new(slice: &'a str) -> Self {
-        Self {
-            slice,
-            iter: slice.char_indices(),
-            peeked: None,
-            offset: 0,
-        }
-    }
-
-    pub fn offset(&self) -> usize {
-        self.offset
-    }
-
-    pub fn peek(&mut self) -> Option<&(usize, char)> {
-        self.peeked.get_or_insert_with(|| self.iter.next()).as_ref()
-    }
-
-    fn peek_boundary(&mut self) -> usize {
-        self.peek().map(|(idx, _)| *idx).unwrap_or(self.slice.len())
-    }
-}
diff --git a/src/main.rs b/src/main.rs
@@ -8,8 +8,8 @@ mod assembler;
 mod editor;
 mod highlighting;
 mod output;
-mod par_buf;
 mod simulator;
+mod util;
 
 fn main() {
     eframe::run_native(

diff --git a/src/output.rs b/src/output.rs
@@ -1,4 +1,4 @@
-use crate::par_buf::ParBuf;
+use crate::util::ParBuf;
 
 #[derive(Debug, Default)]
 pub enum OutputTab {

diff --git a/src/util/indexed_chars.rs b/src/util/indexed_chars.rs
@@ -0,0 +1,48 @@
+use std::str::CharIndices;
+
+pub struct IndexedChars<'a> {
+    slice: &'a str,
+    iter: CharIndices<'a>,
+    peeked: Option<Option<(usize, char)>>,
+    offset: usize,
+}
+
+impl<'a> Iterator for IndexedChars<'a> {
+    type Item = (usize, char);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self.peeked.take().unwrap_or_else(|| self.iter.next()) {
+            Some((offset, c)) => {
+                self.offset = self.peek_boundary();
+                Some((offset, c))
+            }
+            None => {
+                self.offset = self.slice.len();
+                None
+            }
+        }
+    }
+}
+
+impl<'a> IndexedChars<'a> {
+    pub fn new(slice: &'a str) -> Self {
+        Self {
+            slice,
+            iter: slice.char_indices(),
+            peeked: None,
+            offset: 0,
+        }
+    }
+
+    pub fn offset(&self) -> usize {
+        self.offset
+    }
+
+    pub fn peek(&mut self) -> Option<&(usize, char)> {
+        self.peeked.get_or_insert_with(|| self.iter.next()).as_ref()
+    }
+
+    pub fn peek_boundary(&mut self) -> usize {
+        self.peek().map(|(idx, _)| *idx).unwrap_or(self.slice.len())
+    }
+}
diff --git a/src/util/mod.rs b/src/util/mod.rs
@@ -0,0 +1,5 @@
+mod indexed_chars;
+mod par_buf;
+
+pub use indexed_chars::*;
+pub use par_buf::*;
diff --git a/src/par_buf.rs → src/util/par_buf.rs b/src/par_buf.rs → src/util/par_buf.rs