From ef8dd58d9bb41d5c4dba1765bb4342f4082fba5a Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer.bar-yam@bevuta.com>
Date: Mon, 27 Oct 2025 18:31:55 +0100
Subject: [PATCH] parser.y: use std::move() to avoid unnecessary copies

With #14314, in some places in the parser we started using C++ objects
directly rather than pointers. In those places lines like `$$ = $1` now
imply a copy when we don't need one. This commit changes those to `$$ =
std::move($1)` to avoid those copies.
---
 src/libexpr/parser.y | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 93c944dcf..2257e1b45 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -345,8 +345,8 @@ string_parts
 
 string_parts_interpolated
   : string_parts_interpolated STR
-  { $$ = $1; $$.emplace_back(state->at(@2), new ExprString(state->alloc, $2)); }
-  | string_parts_interpolated DOLLAR_CURLY expr '}' { $$ = $1; $$.emplace_back(state->at(@2), $3); }
+  { $$ = std::move($1); $$.emplace_back(state->at(@2), new ExprString(state->alloc, $2)); }
+  | string_parts_interpolated DOLLAR_CURLY expr '}' { $$ = std::move($1); $$.emplace_back(state->at(@2), $3); }
   | DOLLAR_CURLY expr '}' { $$.emplace_back(state->at(@1), $2); }
   | STR DOLLAR_CURLY expr '}' {
       $$.emplace_back(state->at(@1), new ExprString(state->alloc, $1));
@@ -391,8 +391,8 @@ path_start
   ;
 
 ind_string_parts
-  : ind_string_parts IND_STR { $$ = $1; $$.emplace_back(state->at(@2), $2); }
-  | ind_string_parts DOLLAR_CURLY expr '}' { $$ = $1; $$.emplace_back(state->at(@2), $3); }
+  : ind_string_parts IND_STR { $$ = std::move($1); $$.emplace_back(state->at(@2), $2); }
+  | ind_string_parts DOLLAR_CURLY expr '}' { $$ = std::move($1); $$.emplace_back(state->at(@2), $3); }
   | { }
   ;
 
@@ -440,9 +440,9 @@ binds1
   ;
 
 attrs
-  : attrs attr { $$ = $1; $$.emplace_back(AttrName(state->symbols.create($2)), state->at(@2)); }
+  : attrs attr { $$ = std::move($1); $$.emplace_back(AttrName(state->symbols.create($2)), state->at(@2)); }
   | attrs string_attr
-    { $$ = $1;
+    { $$ = std::move($1);
       std::visit(overloaded {
           [&](std::string_view str) { $$.emplace_back(AttrName(state->symbols.create(str)), state->at(@2)); },
           [&](Expr * expr) {
@@ -457,20 +457,20 @@ attrs
   ;
 
 attrpath
-  : attrpath '.' attr { $$ = $1; $$.push_back(AttrName(state->symbols.create($3))); }
+  : attrpath '.' attr { $$ = std::move($1); $$.push_back(AttrName(state->symbols.create($3))); }
   | attrpath '.' string_attr
-    { $$ = $1;
+    { $$ = std::move($1);
       std::visit(overloaded {
           [&](std::string_view str) { $$.push_back(AttrName(state->symbols.create(str))); },
           [&](Expr * expr) { $$.push_back(AttrName(expr)); }
-      }, $3);
+      }, std::move($3));
     }
   | attr { $$.push_back(AttrName(state->symbols.create($1))); }
   | string_attr
     { std::visit(overloaded {
           [&](std::string_view str) { $$.push_back(AttrName(state->symbols.create(str))); },
           [&](Expr * expr) { $$.push_back(AttrName(expr)); }
-      }, $1);
+      }, std::move($1));
     }
   ;
 
@@ -480,7 +480,7 @@ attr
   ;
 
 string_attr
-  : '"' string_parts '"' { $$ = $2; }
+  : '"' string_parts '"' { $$ = std::move($2); }
   | DOLLAR_CURLY expr '}' { $$ = $2; }
   ;