migrate to ctutils

Cargo.toml

@@ -13,6 +13,6 @@ keywords = ["rust", "nexus", "scripting", "language"]
 homepage = "https://muffingroup.github.io/MuffinSite/"
 
 [dependencies]
-clutils = "0.1.0"
+clutils = "0.0.1"
 colored = "2.0.4"
 maplit = "1.0.2"

src/lexer/lexer.rs

@@ -1,6 +1,8 @@
+use clutils::file_handler::FileHandler;
+
 use crate::{
     lexer::tokens::{Token, TokenType},
-    util::{FileHandler, FirstAsChar},
+    util::FirstAsChar,
 };
 
 /// Same as tokens.push() but reduces boilerplate
@@ -16,7 +18,6 @@ macro_rules! push_token {
 /// Lexer struct containing
 /// necessary info to
 /// construct the parser
-#[derive(Clone)]
 pub struct Lexer {
     pub input: FileHandler,
     pub current_pos: usize,
@@ -31,7 +32,7 @@ pub struct Lexer {
 impl Lexer {
     /// Constructs lexer from FileHandler
     pub fn new(input: FileHandler) -> Self {
-        let input_chars: Vec<char> = input.file_content.chars().collect();
+        let input_chars: Vec<char> = input.content.chars().collect();
         if input_chars.len() > 0 {
             return Lexer {
                 input: input,
@@ -50,7 +51,7 @@ impl Lexer {
             Some(alt) => {
                 alt.chars().collect()
             },
-            None => self.input.file_content.chars().collect(),
+            None => self.input.content.chars().collect(),
         };
         let mut tokens: Vec<Token> = Vec::new();
 

src/lib.rs

@@ -0,0 +1,38 @@
+use clutils::{file_handler::{Extension, FileHandler}, literal::Literal};
+use evaluator::evaluator::Evaluator;
+use lexer::lexer::Lexer;
+use parser::parser::Parser;
+
+mod builtin;
+mod evaluator;
+mod lexer;
+mod parser;
+mod util;
+
+pub enum NexusExtensions {
+    NX,
+}
+
+impl Literal for NexusExtensions {
+    fn literal(self: &Self) -> &str {
+        "nx"
+    }
+}
+
+impl Extension for NexusExtensions {
+
+}
+
+pub fn run_interpreter(src: FileHandler) {
+    let mut lexer = Lexer::new(src);
+
+    let mut parser = match Parser::new(&mut lexer, true) {
+        Ok(parser) => parser,
+        Err(_) => todo!(),
+    };
+
+    let ast = parser.parse_program();
+
+    let mut evaluator = Evaluator::new();
+    evaluator.eval_program(ast);
+}

src/main.rs

@@ -1,16 +1,7 @@
-mod builtin;
-mod evaluator;
-mod lexer;
-mod parser;
-mod util;
-
 use std::env;
 
-use lexer::lexer::Lexer;
-use parser::parser::Parser;
-use util::FileHandler;
-
-use crate::evaluator::evaluator::Evaluator;
+use clutils::file_handler::FileHandler;
+use nexus::NexusExtensions;
 
 // nexus run <File>
 
@@ -31,23 +22,10 @@ fn main() {
 
     match first_arg.as_str() {
         "run" => {
-            let src = FileHandler::read_file(&second_arg);
-            run_interpreter(src)
+            // TODO: allowing passing references to file handler
+            let src = FileHandler::new_with_extension(second_arg.clone(), Box::new(NexusExtensions::NX)).expect("Failed to handle file");
+            nexus::run_interpreter(src)
         },
         _ => todo!(),
     };
 }
-
-fn run_interpreter(src: FileHandler) {
-    let mut lexer = Lexer::new(src);
-
-    let mut parser = match Parser::new(&mut lexer, true) {
-        Ok(parser) => parser,
-        Err(_) => todo!(),
-    };
-
-    let ast = parser.parse_program();
-
-    let mut evaluator = Evaluator::new();
-    evaluator.eval_program(ast);
-}

src/parser/parser.rs

@@ -1,14 +1,17 @@
 use std::process;
 
+use clutils::file_handler::FileHandler;
+
 use crate::{
     builtin::errors::{Error, *},
     lexer::{
         lexer::Lexer,
         tokens::{Token, TokenType},
     },
     parser::ast::*,
-    util::{self, FileHandler},
+    util,
 };
+
 /// Parser struct containing
 /// necessary info to
 /// construct Evaluator
@@ -815,7 +818,7 @@ impl<'a> Parser<'a> {
         let msg = format!(
             "{} error at: {}:{}:{}",
             message,
-            self.file_handler.file_path,
+            self.file_handler.full_path,
             self.line_count,
             self.peek_token.cur_pos + 1,
         );

src/util.rs

@@ -6,14 +6,6 @@ use colored::Colorize;
 
 use crate::evaluator::object::Error;
 
-/// Handles files and stores file path
-/// for error messages
-#[derive(Clone)]
-pub struct FileHandler {
-    pub file_path: String,
-    pub file_content: String,
-}
-
 pub trait FirstAsChar {
     /// Returns first character of a string as a char.
     /// Most useful when converting string with only
@@ -35,27 +27,6 @@ impl<T> ToSome<T> for T {
     }
 }
 
-impl FileHandler {
-    /// Constructs FileHandler from file path
-    pub fn read_file(path: &str) -> FileHandler {
-        let mut file = File::open(path).expect(format!("Failed to find file: {}", path).as_str());
-        let mut buffer = String::new();
-        let file_ending = match path.split('.').last() {
-            Some(ending) => ending,
-            None => "unknown",
-        };
-
-        if file_ending != "nx" {
-            panic!("Wrong file format. Current: {}, expected: nx", file_ending);
-        }
-
-        file.read_to_string(&mut buffer)
-            .expect("Failed to read file");
-
-        FileHandler { file_path: path.to_string(), file_content: buffer }
-    }
-}
-
 /// Accept input from the console
 pub fn input() -> String {
     io::stdout().flush().expect("Failed to flush output");

test/test.nx

@@ -1,13 +1 @@
-<<<<<<< HEAD
-foo :: func(x) {
-    print(x)
-}
-
-foo(0)
-=======
-var x = [0, 0]
-
-loop i in 0..10 {
-    print(i)
-}
->>>>>>> parent of 9811e27 (rewrite enviroments)
+print("Good morning!")