passes simple test

examples/if.rs

+fn main() {
+    let a = {
+        let b = 1;
+        b
+    };
+}

src/ast/main.rs

+use std::fs::File;
+use std::io::prelude::*;
+
 use lalrpop_util::lalrpop_mod;
 
 lalrpop_mod!(pub parser, "/ast/parser.rs");
@@ -7,13 +10,32 @@ use parser::*;
 pub mod ast;
 use ast::*;
 
-fn main() {
+fn main() {}
+
+pub fn read(file_name: &str) -> std::io::Result<String> {
+    let mut file = File::open(file_name)?;
+    let mut contents = String::new();
+    file.read_to_string(&mut contents)?;
+    Ok(contents)
+}
+
+// pub fn parse(file_name: &str) -> Program {
+//     let p = read(file_name).expect("File not found");
+//     ProgramParser::new().parse(&p).unwrap()
+// }
+
+#[test]
+fn t1() {
     let s = "
     {
-            let ;
+        let a = {
+            let b = 1 + 1;
             ;
+            if a { }
+
+            b
+        }
     }
     ";
-
-    println!("{:?}", BlockExpressionParser::new().parse(s));
+    StmtsParser::new().parse(s).unwrap();
 }

src/ast/parser.lalrpop

@@ -4,40 +4,68 @@ use crate::ast::*;
 
 grammar;
 
-pub ExpressionWithoutBlock: () = {
-    LiteralExpression => ()
+match {
+    // The default whitespace skipping is disabled an `ignore pattern` is specified
+    r"\s*" => { }, 
+    // Skip `// comments`
+    r"//[^\n\r]*" => { }, 
+    // Skip `/* comments */`
+    r"/\*([^\*]*\*+[^\*/])*([^\*]*\*+|[^\*])*\*/" => { },  
+    _
 }
 
-pub LiteralExpression = {
-    Num
-    Id
+//pub Expr: () 
+pub Expr: () = {
+    ExprStmt => (),
+    ExprNoBlock => (),    
 }
 
-ExpressionWithBlock: () = {
-    BlockExpression => ()
+pub ExprNoBlock: () = {
+    Expr AddSub Factor => (),
+    Factor => (),
 }
 
-pub BlockExpression: ()= {
-    "{" Statements? "}" => ()
+pub AddSub: () = {
+    "+" => (),
+    "-" => (),
 }
 
-pub Statements: () = {
-    Statement+ => (),
-    Statement+ ExpressionWithoutBlock => (),
-    ExpressionWithBlock => ()
+pub Factor: () = {
+    Factor MulDiv Term => (),
+    Term => (),
 }
 
-pub Statement: () = {
-    ";" => (),
-    "let" ";" => (),
-    ExpressionStatement => ()
+pub MulDiv: () = {
+    "/" => (),
+    "*" => (),
+}
+
+pub Term: () = {
+    Id => (),
+    Num => (),
+}
+
+
+
+
+pub ExprStmt: () = {
+    "if" Expr Stmts "else" Stmts => (),
+    Stmts => (),
+}
+
+pub Stmts: () = {
+    "{" Stmt* "}" => (),
 }
 
-pub ExpressionStatement: () = {
-    ExpressionWithoutBlock ";" => (),
-    ExpressionWithBlock ";"? => ()
+pub Stmt: () = {
+    ";" => (),
+    "let" Id "=" Expr => (),
+    "if" Expr Stmts ("else" Stmts)? => (),
+    ExprNoBlock => (),
+    Stmts => (),
 }
 
+
 pub Num: i32 = {
     r"[0-9]+" => i32::from_str(<>).unwrap(),
 };