nixd/Syntax: attribute & inherited_attribute

nix-community · Sep 17, 2023 · 7f5aa9a · 7f5aa9a
1 parent 8dc640b
commit 7f5aa9a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/nixd/include/nixd/Syntax/Nodes.inc b/nixd/include/nixd/Syntax/Nodes.inc
@@ -52,6 +52,17 @@ NODE(Call, {
 })
 NODE(AttrPath, { std::vector<Node *> Names; })
 NODE(Attrs, { std::vector<Node *> Names; })
+
+NODE(Attribute, {
+  AttrPath *Path;
+  Node *Body;
+})
+
+NODE(InheritedAttribute, {
+  Attrs *Attrs;
+  Node *E;
+})
+
 NODE(Select, {
   Node *Body;
 

diff --git a/nixd/lib/Syntax/Parser/Parser.y b/nixd/lib/Syntax/Parser/Parser.y
@@ -33,6 +33,8 @@
     nixd::syntax::SPath *SPath;
     nixd::syntax::URI *Uri;
     nixd::syntax::Attrs *Attrs;
+    nixd::syntax::Attribute *Attribute;
+    nixd::syntax::InheritedAttribute *IA;
 
     // Tokens
     nixd::syntax::StringToken STR;
@@ -61,6 +63,8 @@
 %type <Node> path_start
 %type <SPath> spath
 %type <Uri> uri
+%type <IA> inherited_attribute
+%type <Attribute> attribute
 %token <ID> ID
 %token <N> INT
 %token <NF> FLOAT
@@ -374,13 +378,34 @@ identifier
   }
 
 
-
 binds
-  : binds attrpath '=' expr ';'
-  | binds INHERIT attrs ';'
-  | binds INHERIT '(' expr ')' attrs ';'
+  : binds attribute
+  | binds inherited_attribute
   |
 
+// Nixd extension
+inherited_attribute
+  : INHERIT attrs ';' {
+    $$ = decorateNode(new InheritedAttribute {
+      .Attrs = $2,
+      .E = nullptr
+    }, yylloc, *Data);
+  }
+  | INHERIT '(' expr ')' attrs ';' {
+    $$ = decorateNode(new InheritedAttribute {
+      .Attrs = $5,
+      .E = $3
+    }, yylloc, *Data);
+  }
+
+// Nixd extension
+attribute
+  : attrpath '=' expr ';' {
+    $$ = decorateNode(new Attribute {
+      .Path = $1,
+      .Body = $3
+    }, yylloc, *Data);
+  }
 
 attrs
   : attrs attr {