nixd/Syntax: actions for lists

nix-community · Sep 17, 2023 · ef82b5d · ef82b5d
1 parent 3584f0c
commit ef82b5d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/nixd/include/nixd/Syntax/Nodes.inc b/nixd/include/nixd/Syntax/Nodes.inc
@@ -23,6 +23,10 @@ NODE(With, {
   Node *Body;
 })
 NODE(Binds, { std::vector<Node *> Attributes; })
+
+NODE(ListBody, { std::vector<Node *> Elems; })
+NODE(List, { ListBody *Body; })
+
 NODE(Let, {
   Node *Binds;
   Node *Body;
@@ -45,7 +49,6 @@ NODE(Path, { std::string S; })
 NODE(SPath, { std::string S; })
 NODE(URI, { std::string S; })
 
-NODE(List, { std::vector<Node *> Elems; })
 NODE(Call, {
   Node *Fn;
   std::vector<Node *> Args;

diff --git a/nixd/lib/Syntax/Parser/Parser.y b/nixd/lib/Syntax/Parser/Parser.y
@@ -35,6 +35,7 @@
     nixd::syntax::Attrs *Attrs;
     nixd::syntax::Attribute *Attribute;
     nixd::syntax::InheritedAttribute *IA;
+    nixd::syntax::ListBody *LB;
 
     // Tokens
     nixd::syntax::StringToken STR;
@@ -65,6 +66,7 @@
 %type <Uri> uri
 %type <IA> inherited_attribute
 %type <Attribute> attribute
+%type <LB> list_body
 %token <ID> ID
 %token <N> INT
 %token <NF> FLOAT
@@ -273,7 +275,18 @@ expr_simple
       .Recursive = false
     }, yylloc, *Data);
   }
-  | '[' expr_list ']'
+  | '[' list_body ']' {
+    $$ = decorateNode(new List {
+      .Body = $2
+    }, yylloc, *Data);
+  }
+
+list_body
+  : list_body expr_select {
+    $$->Elems.emplace_back($2);
+    $$->Range = mkRange(yylloc, *Data);
+  }
+  | { $$ = decorateNode(new ListBody, yylloc, *Data); }
 
 string_parts
   : string { $$ = $1; }
@@ -461,12 +474,6 @@ string_attr
   : '"' string_parts '"' { $$ = $2; }
   | string_parts_interp_expr { $$ = $1; }
 
-
-expr_list
-  : expr_list expr_select
-  |
-
-
 formals
   : formal ',' formals {
     $$->Formals.emplace_back($1);