Add structs to parser

Author: Nikil-Shyamsunder

src/diagnostic.rs

@@ -229,7 +229,7 @@ mod tests {
 
         // create fileid and read file
         let input =
-            std::fs::read_to_string("tests/calyx_go_doneStruct.prot").expect("failed to load");
+            std::fs::read_to_string("tests/calyx_go_done_struct.prot").expect("failed to load");
         let calyx_fileid = handler.add_file("calyx_go_done.prot".to_string(), input);
 
         // 2) create transaction

src/parser.rs

@@ -72,8 +72,18 @@ mod tests {
         parse_file("tests/mul.prot");
     }
 
+    #[test]
+    fn test_easycond_prot() {
+        parse_file("tests/cond.prot");
+    }
+
     #[test]
     fn test_cond_prot() {
         parse_file("tests/cond.prot");
     }
+
+    #[test]
+    fn test_calyx_go_done_struct_prot() {
+        parse_file("tests/calyx_go_done_struct.prot");
+    }
 }

src/protocols.pest

@@ -44,7 +44,8 @@ cmd = { path_id ~ "(" ~ ")" ~ ";"}
 stmt = _{ (assign | cmd | while | cond) }
 dir = _{"in" | "out" }
 arg = { dir ~ id ~ ":" ~ tpe }
-arglist = { (arg ~ "," ~ arglist) | arg }
+arglist = { (arg ~ "," ~ arglist) | arg ~ ","? }
+type_param = { "<" ~ id ~ ":" ~ id ~ ">" }
 
 // Loops
 while = { "while" ~ expr ~ "{" ~ stmt* ~ "}" }
@@ -55,5 +56,8 @@ else_if = { "else" ~ "if" ~ expr ~ "{" ~ stmt* ~ "}"}
 else = { "else" ~ "{" ~ stmt* ~ "}" }
 cond = { if ~ else_if* ~ else? }
 
-fun = { "fn" ~ id ~ "(" ~ arglist ~ ")" ~ "{" ~ stmt* ~ "}" }
-file = { SOI ~ fun* ~ EOI }
+// Structs
+struct = { "struct" ~ id ~ "{" ~ arglist? ~ "}" }
+
+fun = { "fn" ~ id ~ type_param? ~ "(" ~ arglist ~ ")" ~ "{" ~ stmt* ~ "}" }
+file = { SOI ~ (fun | struct)* ~ EOI }

src/typecheck.rs

@@ -171,7 +171,7 @@ mod tests {
 
         // create fileid and read file
         let input =
-            std::fs::read_to_string("tests/calyx_go_doneStruct.prot").expect("failed to load");
+            std::fs::read_to_string("tests/calyx_go_done_struct.prot").expect("failed to load");
         let calyx_fileid = handler.add_file("calyx_go_done.prot".to_string(), input);
 
         // 2) create transaction