libnixf: dispatch lambda formals correctly (#468)

nix-community · Apr 26, 2024 · e4651bb · e4651bb
1 parent 6eb1a24
commit e4651bb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/libnixf/src/Parse/ParseExpr.cpp b/libnixf/src/Parse/ParseExpr.cpp
@@ -100,6 +100,15 @@ std::shared_ptr<Expr> Parser::parseExpr() {
       }
       break;
     }
+    case tok_r_curly:
+      switch (peek(2).kind()) {
+      case tok_at:    // { } @
+      case tok_colon: // { } :
+        return parseExprLambda();
+      default:
+        break;
+      }
+      break;
     case tok_ellipsis: // { ...
       return parseExprLambda();
     default:

diff --git a/libnixf/test/Bytecode/Write.cpp b/libnixf/test/Bytecode/Write.cpp
@@ -167,7 +167,7 @@ TEST_F(WriteTest, Complex) {
   std::string Str = OS.str();
   std::string_view Data(Str);
 
-  ASSERT_EQ(Str.size(), 2238);
+  ASSERT_EQ(Str.size(), 3334);
 
   auto Kind = bc::eat<nixbc::ExprKind>(Data);
 

diff --git a/libnixf/test/Parse/ParseExpr.cpp b/libnixf/test/Parse/ParseExpr.cpp
@@ -247,6 +247,32 @@ TEST(Parser, ExprDispatch_r_curly_ellipsis) {
   ASSERT_EQ(Diags.size(), 0);
 }
 
+TEST(Parser, ExprDispatch_r_curly_l_curly_colon) {
+  // { ...
+  auto Src = R"({ } : 1)"sv;
+
+  std::vector<Diagnostic> Diags;
+  Parser P(Src, Diags);
+  auto AST = P.parseExpr();
+
+  ASSERT_TRUE(AST);
+  ASSERT_EQ(AST->kind(), Node::NK_ExprLambda);
+  ASSERT_EQ(Diags.size(), 0);
+}
+
+TEST(Parser, ExprDispatch_r_curly_l_curly_at) {
+  // { ...
+  auto Src = R"({ } @ a: 1)"sv;
+
+  std::vector<Diagnostic> Diags;
+  Parser P(Src, Diags);
+  auto AST = P.parseExpr();
+
+  ASSERT_TRUE(AST);
+  ASSERT_EQ(AST->kind(), Node::NK_ExprLambda);
+  ASSERT_EQ(Diags.size(), 0);
+}
+
 TEST(Parser, ExprIf) {
   // if ... then ... else ...
   auto Src = R"(if 1 then cc else "d")"sv;