Switch DIY parser/lexer to nom

.github/workflows/rust.yml

@@ -0,0 +1,23 @@
+name: Rust
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Checkout submodules
+      shell: bash
+      run: |
+        # If your submodules are configured to use SSH instead of HTTPS please uncomment the following line
+        # git config --global url."https://github.com/".insteadOf "git@github.com:"
+        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+        git submodule sync --recursive
+        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+    - name: Build
+      run: cargo build --locked --verbose
+    - name: Run tests
+      run: cargo test --locked --verbose

Cargo.toml

@@ -11,4 +11,10 @@ hmap = "0.1"
 jlight-vm = {path = "jlight-vm"}
 regalloc = {path = "jlight-vm/regalloc.rs/lib"}
 hashlink = "0.4"
+nom_locate = "1.0.0"
+nom-recursive = "0.1.1"
+nom-packrat = "0.3.0"
 
+[dependencies.nom]
+version = "5.1.0"
+features = ["regexp_macros"]

src/ast.rs

@@ -1,21 +1,45 @@
 use crate::token::Position;
+use core::ops::Deref;
+use std::borrow::Borrow;
 
-#[derive(Clone, PartialEq)]
+#[derive(Clone, PartialEq, Default)]
 pub struct Expr {
     pub pos: Position,
     pub expr: ExprKind,
 }
 
+#[derive(Clone, Debug, PartialEq)]
+pub struct Ident(pub String);
+
+impl From<Ident> for String {
+    fn from(ident: Ident) -> Self {
+        ident.0
+    }
+}
+
+impl Deref for Ident {
+    type Target = String;
+    fn deref(&self) -> &String {
+        &self.0
+    }
+}
+
+impl Borrow<String> for Ident {
+    fn borrow(&self) -> &String {
+        &self.0
+    }
+}
+
 #[derive(Clone, Debug, PartialEq)]
 pub enum ExprKind {
     Assign(Box<Expr>, Box<Expr>),
     BinOp(Box<Expr>, String, Box<Expr>),
     Unop(String, Box<Expr>),
-    Access(Box<Expr>, String),
-    Ident(String),
-    Function(Option<String>, Vec<String>, Box<Expr>),
+    Access(Box<Expr>, Ident),
+    Ident(Ident),
+    Function(Option<Ident>, Vec<Ident>, Box<Expr>),
     Class(String, Box<Expr>, Option<Box<Expr>>),
-    Lambda(Vec<String>, Box<Expr>),
+    Lambda(Vec<Ident>, Box<Expr>),
     Match(Box<Expr>, Vec<(Box<Expr>, Box<Expr>)>, Option<Box<Expr>>),
     If(Box<Expr>, Box<Expr>, Option<Box<Expr>>),
     ConstInt(i64),
@@ -24,21 +48,27 @@ pub enum ExprKind {
     New(Box<Expr>),
     ConstFloat(f64),
     Object(Vec<(Box<Expr>, Box<Expr>)>),
-    Var(bool, String, Option<Box<Expr>>),
+    Var(bool, Ident, Option<Box<Expr>>),
     While(Box<Expr>, Box<Expr>),
     Block(Vec<Box<Expr>>),
     Return(Option<Box<Expr>>),
     Call(Box<Expr>, Vec<Box<Expr>>),
     Nil,
     Break,
     Continue,
-    Throw(String),
+    Throw(Box<Expr>),
     ConstBool(bool),
     Array(Vec<Box<Expr>>),
     ArrayIndex(Box<Expr>, Box<Expr>),
     This,
 }
 
+impl Default for ExprKind {
+    fn default() -> Self {
+        ExprKind::Nil
+    }
+}
+
 use std::fmt;
 
 impl Expr {