refactor(tazjin/rlox): Introduce declarations in parser r/2025

Change-Id: I873fdd53319ec36da18926d9477e809a69dbace7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2288
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI

1 files changed, 18 insertions, 10 deletions

diff --git a/users/tazjin/rlox/src/interpreter.rs b/users/tazjin/rlox/src/interpreter.rs
index c68101cf68..5e43e075b0 100644
--- a/users/tazjin/rlox/src/interpreter.rs
+++ b/users/tazjin/rlox/src/interpreter.rs
@@ -1,5 +1,5 @@
 use crate::errors::{report, Error, ErrorKind};
-use crate::parser::{self, Expr, Literal, Program, Statement};
+use crate::parser::{self, Declaration, Expr, Literal, Program, Statement};
 use crate::scanner::{self, TokenKind};
 
 // Run some Lox code and print it to stdout
@@ -104,16 +104,24 @@ fn eval<'a>(expr: &Expr<'a>) -> Result<Literal, Error> {
     }
 }
 
+fn run_stmt<'a>(stmt: &Statement<'a>) -> Result<(), Error> {
+    match stmt {
+        Statement::Expr(expr) => {
+            eval(expr)?;
+        }
+        Statement::Print(expr) => {
+            let result = eval(expr)?;
+            println!("{:?}", result)
+        }
+    }
+
+    Ok(())
+}
+
 fn run_program<'a>(program: &Program<'a>) -> Result<(), Error> {
-    for stmt in program {
-        match stmt {
-            Statement::Expr(expr) => {
-                eval(expr)?;
-            }
-            Statement::Print(expr) => {
-                let result = eval(expr)?;
-                println!("{:?}", result)
-            }
+    for decl in program {
+        match decl {
+            Declaration::Stmt(stmt) => run_stmt(stmt)?,
         }
     }