nixd/Syntax: actions for attrs

nix-community · Sep 17, 2023 · dcbb181 · dcbb181
1 parent bfb6159
commit dcbb181
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/nixd/include/nixd/Syntax/Nodes.inc b/nixd/include/nixd/Syntax/Nodes.inc
@@ -70,6 +70,13 @@ NODE(OpNegate, { Node *Body; })
 
 NODE(Braced, { Node *Body; })
 
+NODE(AttrSet, {
+  Binds *Binds;
+  bool Recursive;
+})
+
+NODE(LegacyLet, { Binds *Binds; })
+
 // Binary Operators
 #define BIN_OP(NAME, _)                                                        \
   NODE(NAME, {                                                                 \

diff --git a/nixd/lib/Syntax/Parser/Parser.y b/nixd/lib/Syntax/Parser/Parser.y
@@ -247,9 +247,23 @@ expr_simple
       .Body = $2
     }, yylloc, *Data);
   }
-  | LET '{' binds '}'
-  | REC '{' binds '}'
-  | '{' binds '}'
+  | LET '{' binds '}' {
+    $$ = decorateNode(new LegacyLet {
+      .Binds = $3
+    }, yylloc, *Data);
+  }
+  | REC '{' binds '}' {
+    $$ = decorateNode(new AttrSet {
+      .Binds = $3,
+      .Recursive = true
+    }, yylloc, *Data);
+  }
+  | '{' binds '}' {
+    $$ = decorateNode(new AttrSet {
+      .Binds = $2,
+      .Recursive = false
+    }, yylloc, *Data);
+  }
   | '[' expr_list ']'
 
 string_parts