Merge remote-tracking branch 'upstream/main'

Author: porcelijn

src/ast.rs

@@ -4,7 +4,10 @@ use crate::token::Tokenizer;
 
 use std::iter::Peekable;
 
-pub type Bindings = [String]; // vars
+pub struct Bindings {
+    pub vars: Vec<String>,
+}
+
 pub type Wat = String;
 pub type Wasm = Vec<u8>;
 
@@ -163,7 +166,7 @@ impl ToWasm for Factor {
             },
             Self::Param(p) => {
                 let mut out = vec![0x20]; // local.get
-                if let Some(index) = bindings.iter().position(|b| b == p) {
+                if let Some(index) = bindings.vars.iter().position(|b| b == p) {
                     write_leb128(index as i128, &mut out);
                 } else {
                     panic!("Unknown binding for local '{p}'");

src/main.rs

@@ -47,7 +47,8 @@ fn eval_wat(expr: &Expr) -> Result<i32> {
 }
 
 fn eval_wasm(expr: &Expr) -> Result<i32>{
-    let bindings: &Bindings = &[ "x".to_string(), "yy".to_string() ];
+    let vars = vec![ "x".to_string(), "yy".to_string() ];
+    let bindings: &Bindings = &Bindings { vars };
     let wasm = generate_wasm(expr, bindings);
     let engine = Engine::default();
     let module = Module::new(&engine, wasm)?;

src/token.rs

@@ -3,10 +3,10 @@ use std::str::Chars;
 
 #[derive(Debug,PartialEq)]
 pub enum Token {
+    Close(char),
     Number(i32),
-    Operator(char),
     Open(char),
-    Close(char),
+    Operator(char),
     Variable(String),
 }