add all

Justfile

@@ -0,0 +1,17 @@
+test:
+	cargo test
+
+build:
+	cargo build
+
+scan-file FILENAME:
+	cargo run -- scan --file {{ FILENAME }}
+
+scan COMMANDS:
+	cargo run -- scan "{{ COMMANDS }}"
+
+compile COMMANDS:
+	cargo run -- run "{{ COMMANDS }}"
+
+compile-file FILENAME:
+	cargo run -- run --file {{ FILENAME }}

src/compiler.rs

@@ -14,7 +14,7 @@ pub struct Compiler<'a> {
 }
 
 impl<'a> Compiler<'a> {
-    pub fn from_source(source: &'a String) -> Self {
+    pub fn from_source(source: &'a str) -> Self {
         Compiler {
             scanner: Scanner::new(source),
             chunk: None,
@@ -31,21 +31,15 @@ impl<'a> Compiler<'a> {
         self.expression();
         //self.consume(TokenType::TokenEof, "Expect end of expression");
         self.emit_return();
-        return !self.had_error;
+        !self.had_error
     }
 
     fn advance(&mut self) {
-        self.previous = self.current.clone();
+        self.previous = self.current;
-        while let Some(r) = self.scanner.next() {
+        if let Some(Ok(token)) = self.scanner.next() {
-            match r {
+            self.current = Some(token);
-                Ok(token) => {
+        } else {
-                    self.current = Some(token);
+            self.error_at_current("error as current token");
-                    break;
-                }
-                _ => {
-                    self.error_at_current("error as current token");
-                }
-            }
         }
     }
 
@@ -120,18 +114,18 @@ impl<'a> Compiler<'a> {
     }
 }
 
-// use strum_macros::Display;
+use strum_macros::Display;
-// #[derive(Display, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Display, PartialEq, Eq, PartialOrd, Ord)]
-// enum Precedence {
+enum Precedence {
-//     None,
+    None,
-//     Assignment,
+    Assignment,
-//     Or,
+    Or,
-//     And,
+    And,
-//     Equality,
+    Equality,
-//     Comparison,
+    Comparison,
-//     Term,
+    Term,
-//     Factor,
+    Factor,
-//     Unary,
+    Unary,
-//     Call,
+    Call,
-//     Primary,
+    Primary,
-// }
+}

src/main.rs

@@ -101,9 +101,9 @@ fn scan_content(source: &str) {
 fn run_content(source: &str) {
     let mut _vm: VM = VM::new();
     let owned = &source.to_owned();
-    // let mut compiler: Compiler = Compiler::from_source(owned);
+    let mut compiler: Compiler = Compiler::from_source(owned);
-    // compiler.compile();
+    compiler.compile();
-    todo!("run_content is not hooked up yet");
+    //todo!("run_content is not hooked up yet");
     // let mut chunk: Chunk = compiler.compile();
     // match vm.interpret(&mut chunk) {
     //     InterpretResult::InterpretOk => exit(0),
@@ -111,3 +111,9 @@ fn run_content(source: &str) {
     //     InterpretResult::InterpretRuntimeError => exit(70),
     // }
 }
+fn compile_content(source: &str) {
+    let mut _vm: VM = VM::new();
+    let owned = &source.to_owned();
+    let mut compiler: Compiler = Compiler::from_source(owned);
+    compiler.compile();
+}