nixd/Syntax: allow expr_app -> expr_simple passthrough

nix-community · Sep 17, 2023 · 5f5127d · 5f5127d
1 parent 6a7dbaa
commit 5f5127d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/nixd/lib/Syntax/Parser/Parser.y b/nixd/lib/Syntax/Parser/Parser.y
@@ -63,7 +63,7 @@
 %type <Binds> binds
 %type <AttrPath> attrpath
 %type <Attrs> attrs
-%type <Call> expr_app
+%type <Node> expr_app
 %type <Node> path_start
 %type <SPath> spath
 %type <Uri> uri
@@ -192,14 +192,18 @@ expr_op
 
 expr_app
   : expr_app expr_select {
-    $$->Args.emplace_back($1);
+    if (auto F = dynamic_cast<Call *>($1)) {
+      // If $1 is already a function call, then we insert the arg list
+      F->Args.emplace_back($2);
+    } else {
+      // Otherwise, create a new function
+      auto N = decorateNode(new Call, yylloc, *Data);
+      N->Fn = $1;
+      N->Args = {$2};
+    }
     $$->Range = mkRange(yylloc, *Data);
   }
-  | expr_select {
-    auto N = decorateNode(new Call, yylloc, *Data);
-    N->Fn = $1;
-    $$ = N;
-  }
+  | expr_select
 
 
 expr_select

diff --git a/nixd/test/Syntax/Basic.cpp b/nixd/test/Syntax/Basic.cpp
@@ -20,7 +20,7 @@ TEST(NixdSyntax, Case1) {
                     .Origin = nix::Pos::Origin(nix::Pos::none_tag())});
   Data->Result = nullptr;
 
-  char Test[] = "let { x = 1; y = 2; } in x\n\0\0";
+  char Test[] = "let x = 1; y = 2; in x\n\0\0";
   parse(Test, strlen(Test) + 2, Data.get());
 }