feat: show exact statement which must be returning at the end of a function

src/main/wacc/ast.scala

@@ -105,10 +105,16 @@ object ast {
         x3: => Parsley[List[Param]],
         x4: => Parsley[NonEmptyList[Stmt]]
     ): Parsley[FuncDecl] =
-      super.apply(x1, x2, x3, x4).guardAgainst {
+      super.apply(
-        case FuncDecl(_, _, _, body) if !body.isReturning =>
+        x1,
-          Seq("Function must return on all paths")
+        x2,
-      }
+        x3,
+        x4.guardAgainst {
+          case body if !body.isReturning =>
+            println(body)
+            Seq("All functions must end in a returning statement")
+        }
+      )
   }
 
   case class Param(paramType: Type, name: Ident)

src/main/wacc/parser.scala

@@ -75,15 +75,15 @@ object parser {
 
   // Statements
   private lazy val `<program>` = Program(
-    "begin" ~> many(atomic(`<func>`)),
+    "begin" ~> many(`<func>`),
     `<stmt>` <~ "end"
   )
   private lazy val `<func>` = FuncDecl(
-    `<type>`,
+    atomic(`<type>`),
-    `<ident>` <~ "(",
+    atomic(`<ident>`) <~ "(",
     sepBy(`<param>`, ",") <~ ")" <~ "is",
-    `<stmt>` <~ "end"
+    `<stmt>`
-  )
+  ) <~ "end"
   private lazy val `<param>` = Param(`<type>`, `<ident>`)
   private lazy val `<stmt>`: Parsley[NonEmptyList[Stmt]] =
     sepBy1(`<basic-stmt>`, ";")