nixd/Syntax: action for OpHasAttr (expr "?" attrpath)

nix-community · Sep 16, 2023 · e19d90d · e19d90d
1 parent cda6116
commit e19d90d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/nixd/include/nixd/Syntax/Nodes.h b/nixd/include/nixd/Syntax/Nodes.h
@@ -83,6 +83,11 @@ struct StringAttr : Node {};
 
 struct AttrPath : Node {};
 
+struct OpHasAttr : Node {
+  Node *Operand;
+  AttrPath *Path;
+};
+
 struct OpNot : Node {
   Node *Body;
 };

diff --git a/nixd/lib/Syntax/Parser/Parser.y b/nixd/lib/Syntax/Parser/Parser.y
@@ -23,6 +23,7 @@
     nixd::syntax::If *If;
     nixd::syntax::Formals *Formals;
     nixd::syntax::Binds *Binds;
+    nixd::syntax::AttrPath *AttrPath;
 
     // Tokens
     nixd::syntax::StringToken STR;
@@ -38,6 +39,7 @@
 %type <Identifier> identifier
 %type <Formals> formals
 %type <Binds> binds
+%type <AttrPath> attrpath
 %token <Identifier> ID
 %token <N> INT
 %token <NF> FLOAT
@@ -150,7 +152,10 @@ expr_op
   | expr_op '/' expr_op { $$ = mkBinOp<OpDiv>($1, $3, yylloc, *Data); }
   | expr_op CONCAT expr_op { $$ = mkBinOp<OpConcatLists>($1, $3, yylloc, *Data); }
   | expr_op '?' attrpath {
-
+    $$ = decorateNode(new OpHasAttr{
+      .Operand = $1,
+      .Path = $3
+    }, yylloc, *Data);
   }
   | expr_app
   ;