nixd/Syntax: actions for string_parts

nix-community · Sep 16, 2023 · 04b28ac · 04b28ac
1 parent 9ceaa93
commit 04b28ac
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 12 deletions.
diff --git a/nixd/include/nixd/Syntax/Nodes.h b/nixd/include/nixd/Syntax/Nodes.h
@@ -71,9 +71,17 @@ struct Int : Node {};
 
 struct Float : Node {};
 
-struct StringParts : Node {};
+struct InterpExpr : Node {
+  Node *Body;
+};
 
-struct StringPartsInterpolated : Node {};
+struct String : Node {
+  std::string S;
+};
+
+struct ConcatStrings : Node {
+  std::vector<Node *> SubStrings;
+};
 
 struct List : Node {
   std::vector<Node *> Elems;

diff --git a/nixd/lib/Syntax/Parser/Parser.y b/nixd/lib/Syntax/Parser/Parser.y
@@ -25,6 +25,9 @@
     nixd::syntax::Binds *Binds;
     nixd::syntax::AttrPath *AttrPath;
     nixd::syntax::Call *Call;
+    nixd::syntax::ConcatStrings *ConcatStrings;
+    nixd::syntax::String *String;
+    nixd::syntax::InterpExpr *InterpExpr;
 
     // Tokens
     nixd::syntax::StringToken STR;
@@ -37,6 +40,10 @@
 
 
 %type <Node> start expr expr_function expr_if expr_op expr_select expr_simple
+%type <Node> string_parts
+%type <String> string;
+%type <ConcatStrings> string_parts_interpolated
+%type <InterpExpr> string_parts_interp_expr
 %type <Identifier> identifier
 %type <Formals> formals
 %type <Binds> binds
@@ -213,18 +220,34 @@ expr_simple
   | '{' binds '}'
   | '[' expr_list ']'
 
-
 string_parts
-  : STR
-  | string_parts_interpolated
-  |
+  : string {
+    $$ = $1;
+  }
+  | string_parts_interpolated {
+    $$ = $1;
+  }
 
 
 string_parts_interpolated
-  : string_parts_interpolated STR
-  | string_parts_interpolated DOLLAR_CURLY expr '}'
-  | DOLLAR_CURLY expr '}'
-  | STR DOLLAR_CURLY expr '}'
+  : string_parts_interpolated string {
+    $$->SubStrings.emplace_back($2);
+    $$->Range = mkRange(yylloc, *Data);
+  }
+  | string_parts_interpolated string_parts_interp_expr {
+    $$->SubStrings.emplace_back($2);
+    $$->Range = mkRange(yylloc, *Data);
+  }
+  | string_parts_interp_expr {
+    $$ = decorateNode(new ConcatStrings{
+      .SubStrings = {$1}
+    }, yylloc, *Data);
+  }
+  | string string_parts_interp_expr {
+    $$ = decorateNode(new ConcatStrings{
+      .SubStrings = {$1, $2}
+    }, yylloc, *Data);
+  }
 
 
 path_start
@@ -234,9 +257,25 @@ path_start
 
 ind_string_parts
   : ind_string_parts IND_STR
-  | ind_string_parts DOLLAR_CURLY expr '}'
+  | ind_string_parts string_parts_interp_expr
   |
 
+// Nixd extension, nix uses the token directly
+string
+  : STR {
+    $$ = decorateNode(new String{
+      .S = std::string($1)
+    }, yylloc, *Data);
+  }
+
+// Nixd extension
+// nix: DOLLAR_CURLY expr '}'
+string_parts_interp_expr
+  : DOLLAR_CURLY expr '}' {
+    $$ = decorateNode(new InterpExpr{
+      .Body = $2
+    }, yylloc, *Data);
+  }
 
 identifier
   : ID {
@@ -275,7 +314,7 @@ attr
 
 string_attr
   : '"' string_parts '"'
-  | DOLLAR_CURLY expr '}'
+  | string_parts_interp_expr
 
 
 expr_list