Expand - Fix stringify a little

thepowersgang · Jan 21, 2024 · 97b4ad4 · 97b4ad4
1 parent 812ccb5
commit 97b4ad4
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/expand/stringify.cpp b/src/expand/stringify.cpp
@@ -24,7 +24,20 @@ class CExpander:
             if(!rv.empty())
                 rv += " ";
             DEBUG(" += " << tok);
-            rv += tok.to_str();
+            if( tok.type() == TOK_IDENT ) {
+                rv += tok.ident().name.c_str();
+            }
+            else {
+                auto v = tok.to_str();
+                const char* s = v.c_str();
+                // Very hacky strip of hygine information (e.g. from paths)
+                if( s[0] == '{' ) {
+                    while( *s != '}' )
+                        s ++;
+                    s ++;
+                }
+                rv += s;
+            }
         }
 
         // TODO: Strip out any `{...}` sequences that aren't from nested