Finished refactoring text streaming abstraction

Author: IsaacShelton

src/components/build_pp_ast/src/lexer/mod.rs

@@ -5,7 +5,7 @@ mod state;
 use self::{lex_line::lex_line, state::State};
 use super::{error::PreprocessorErrorKind, line_splice::LineSplicer};
 use infinite_iterator::InfiniteIterator;
-use text::{Text, TextPeeker};
+use text::{CharacterPeeker, Text};
 
 // Lexer for C preprocessor
 pub struct Lexer<I: Text> {
@@ -37,7 +37,7 @@ where
         loop {
             match self.line_splicer.next_line() {
                 Ok(line) => {
-                    let mut line = TextPeeker::new(line);
+                    let mut line = CharacterPeeker::new(line);
 
                     if line.peek().is_present() {
                         let start_of_line = line.peek().source();

src/components/build_workspace/src/compile/module.rs

@@ -12,7 +12,7 @@ use infinite_iterator::{InfiniteIteratorPeeker, InfinitePeekable};
 use line_column::Location;
 use source_files::{Source, SourceFileKey};
 use std::path::Path;
-use text::{TextPeeker, TextStreamer};
+use text::{CharacterInfiniteIterator, CharacterPeeker};
 use token::{Token, TokenKind};
 
 pub struct CompiledModule<'a, I: InfinitePeekable<Token> + 'a> {
@@ -34,7 +34,7 @@ pub fn compile_module_file<'a>(
     let key = source_files.add(path.to_path_buf(), content);
     let content = source_files.get(key).content();
 
-    let text = TextPeeker::new(TextStreamer::new(content.chars(), key));
+    let text = CharacterPeeker::new(CharacterInfiniteIterator::new(content.chars(), key));
     let lexer = InfiniteIteratorPeeker::new(Lexer::new(text));
     let mut input = Input::new(lexer, compiler.source_files, key);
     input.ignore_newlines();

src/components/build_workspace/src/compile/normal.rs

@@ -10,7 +10,7 @@ use data_units::ByteUnits;
 use diagnostics::{ErrorDiagnostic, Show, into_show};
 use fs_tree::FsNodeId;
 use infinite_iterator::InfiniteIteratorPeeker;
-use text::{TextPeeker, TextStreamer};
+use text::{CharacterInfiniteIterator, CharacterPeeker};
 
 pub fn compile_normal_file(
     compiler: &Compiler,
@@ -26,7 +26,7 @@ pub fn compile_normal_file(
     let source_files = &compiler.source_files;
     let key = source_files.add(path.clone(), content);
     let content = source_files.get(key).content();
-    let text = TextPeeker::new(TextStreamer::new(content.chars(), key));
+    let text = CharacterPeeker::new(CharacterInfiniteIterator::new(content.chars(), key));
 
     match &normal_file.kind {
         NormalFileKind::Adept => {

src/components/cli/src/build/invoke.rs

@@ -6,7 +6,7 @@ use compiler::Compiler;
 use diagnostics::{DiagnosticFlags, Diagnostics, unerror};
 use source_files::SourceFiles;
 use std::{fs::metadata, path::Path};
-use text::{TextPeeker, TextStreamer};
+use text::{CharacterInfiniteIterator, CharacterPeeker};
 
 impl Invoke for BuildCommand {
     fn invoke(self) -> Result<(), ()> {
@@ -52,7 +52,7 @@ fn compile_header(compiler: &Compiler, filepath: &Path) -> Result<(), ()> {
 
     let header_key = source_files.add(filepath.into(), content);
 
-    let header_contents = TextPeeker::new(TextStreamer::new(
+    let header_contents = CharacterPeeker::new(CharacterInfiniteIterator::new(
         source_files.get(header_key).content().chars(),
         header_key,
     ));

src/support/text/src/text_streamer.rs src/support/text/src/character_infinite_iterator.rs

@@ -3,13 +3,13 @@ use infinite_iterator::InfiniteIterator;
 use line_column::{LineColumn, Location};
 use source_files::{Source, SourceFileKey};
 
-pub struct TextStreamer<I: Iterator<Item = char>> {
+pub struct CharacterInfiniteIterator<I: Iterator<Item = char>> {
     iterator: LineColumn<I>,
     file_key: SourceFileKey,
     last_location: Location,
 }
 
-impl<I> TextStreamer<I>
+impl<I> CharacterInfiniteIterator<I>
 where
     I: Iterator<Item = char>,
 {
@@ -22,7 +22,7 @@ where
     }
 }
 
-impl<I> InfiniteIterator for TextStreamer<I>
+impl<I> InfiniteIterator for CharacterInfiniteIterator<I>
 where
     I: Iterator<Item = char>,
 {
@@ -48,4 +48,4 @@ where
     }
 }
 
-unsafe impl<I> Send for TextStreamer<I> where I: Iterator<Item = char> + Send {}
+unsafe impl<I> Send for CharacterInfiniteIterator<I> where I: Iterator<Item = char> + Send {}

src/support/text/src/peeker.rs src/support/text/src/character_peeker.rs

@@ -3,15 +3,15 @@ use infinite_iterator::InfiniteIterator;
 use source_files::Source;
 use std::collections::VecDeque;
 
-pub struct TextPeeker<I>
+pub struct CharacterPeeker<I>
 where
     I: InfiniteIterator<Item = Character>,
 {
     stream: I,
     queue: VecDeque<(char, Source)>,
 }
 
-impl<I> TextPeeker<I>
+impl<I> CharacterPeeker<I>
 where
     I: InfiniteIterator<Item = Character>,
 {
@@ -23,7 +23,7 @@ where
     }
 }
 
-impl<I> InfiniteIterator for TextPeeker<I>
+impl<I> InfiniteIterator for CharacterPeeker<I>
 where
     I: InfiniteIterator<Item = Character>,
 {
@@ -37,7 +37,7 @@ where
     }
 }
 
-impl<I> Text for TextPeeker<I>
+impl<I> Text for CharacterPeeker<I>
 where
     I: InfiniteIterator<Item = Character>,
 {

src/support/text/src/lib.rs

@@ -1,14 +1,14 @@
 mod character;
+mod character_infinite_iterator;
+mod character_peeker;
 mod eatable;
-mod peeker;
-mod text_streamer;
 
 pub use character::{Character, is_c_non_digit};
+pub use character_infinite_iterator::CharacterInfiniteIterator;
+pub use character_peeker::CharacterPeeker;
 pub use eatable::Eatable;
 use infinite_iterator::InfiniteIterator;
-pub use peeker::TextPeeker;
 use source_files::Source;
-pub use text_streamer::TextStreamer;
 
 pub trait Text: InfiniteIterator<Item = Character> {
     fn peek_nth(&mut self, n: usize) -> Character;