should parse function with no params

glyh · Sep 16, 2024 · 20d5054 · 20d5054
1 parent bb22d3b
commit 20d5054
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/parser/parser.mbt b/src/parser/parser.mbt
@@ -26,8 +26,7 @@ fn parser() -> PS {
 
   // Type
   let type_ref : Ref[PT] = { val: empty() }
-  type_ref.val = tok(@lex.UNIT_T).map(fn { _ => T::Unit }) +
-    tok(@lex.BOOL_T).map(fn { _ => T::Bool }) +
+  type_ref.val = tok(@lex.BOOL_T).map(fn { _ => T::Bool }) +
     tok(@lex.INT_T).map(fn { _ => T::Int }) +
     tok(@lex.DOUBLE_T).map(fn { _ => T::Double }) +
     (
@@ -38,9 +37,10 @@ fn parser() -> PS {
     ) +
     lift2(
       fn(args, ret) { T::Fun(args, ret) },
-      tok(@lex.LPAREN) >> sep_list1(tok(@lex.COMMA), ref(type_ref)),
+      tok(@lex.LPAREN) >> sep_list(tok(@lex.COMMA), ref(type_ref)),
       tok(@lex.RPAREN) >> tok(@lex.ARROW) >> ref(type_ref),
     ) +
+    tok(@lex.UNIT_T).map(fn { _ => T::Unit }) +
     (
       tok(@lex.LPAREN) >>
       sep_list1(tok(@lex.COMMA), ref(type_ref)).map(

diff --git a/src/parser/parser_test_inline.mbt b/src/parser/parser_test_inline.mbt
@@ -136,3 +136,17 @@ test "nested fns" {
     ,
   )
 }
+
+test "no param fn type" {
+  let src =
+    #|fn wat() -> () -> Int {
+    #|  fn a() { 1 };
+    #|  a
+    #|};
+  inspect!(
+    parse_program(src),
+    content=
+      #|LetRec({name: ("wat", Fun([], Int)), args: [], body: LetRec({name: ("a", Var({val: None})), args: [], body: Int(1)}, Var("a"))}, Unit)
+    ,
+  )
+}
diff --git a/test/test_src/nested_fns.mbt b/test/test_src/nested_fns.mbt
@@ -1,5 +1,5 @@
 fn no_ann() -> Unit {
-  fn main() { () };
+  fn main() { fn lol(){ {fn wat(){()}; 1} }; 3 };
   fn a(u: Int, v: Int, w) -> Int {
     fn init() { () };
     fn b(x: Bool, y, z: Bool) {
@@ -15,7 +15,7 @@ fn no_ann() -> Unit {
     -> ((Unit) -> Int) -> Int {
       fn d(x: Bool, y: Int, z: Int) {
         let _ = not(not(not(x)));
-        let _ = -----y <= y;
+        let _ = 3-----y <= y;
         let _ = y == y;
         let a = Array::make(10, 10);
         a[1] = 2;