Changeset 99039 in vbox

Timestamp:

Mar 18, 2023 9:03:37 PM (21 months ago)

Author:

vboxsync

Message:

scm/kmk: Indent multiline variable/function expansions in variable assignments better. bugref:10348

File:

• trunk/src/bldprogs/scmrw-kmk.cpp (modified) (5 diffs)

trunk/src/bldprogs/scmrw-kmk.cpp

@@ -1305 +1305 @@
     return false;
 }
+
+
+/**
+ * Scans the given line segment for variable expansion and updates the state
+ * accordingly.
+ *
+ * @returns New cExpandNesting value.
+ * @param   cExpandNesting              Current variable expansion nesting
+ *                                      level.
+ * @param   achExpandingNestingClose    String with the closing character for
+ *                                      each expansion level. 256 chars.
+ * @param   pchLine                     The string to scan.
+ * @param   cchLine                     Length to scan.
+ */
+static unsigned scmKmkScanStringForExpansions(unsigned cExpandNesting, char achExpandNestingClose[256],
+                                              const char *pchLine, size_t cchLine)
+{
+    while (cchLine-- > 0)
+    {
+        char ch = *pchLine++;
+        switch (ch)
+        {
+            case '$':
+            {
+                size_t cDollars = 1;
+                while (cchLine > 0 && (ch = *pchLine) == '$')
+                    cDollars++, pchLine++, cchLine--;
+                if ((cDollars & 1) && cchLine > 0 && (ch == '{' || ch == '('))
+                {
+                    if (cExpandNesting < 256)
+                        achExpandNestingClose[cExpandNesting] = ch == '(' ? ')' : '}';
+                    cExpandNesting++;
+                    pchLine++;
+                    cchLine--;
+                }
+                break;
+            }
+
+            case ')':
+            case '}':
+                if (cExpandNesting > 0 && (cExpandNesting > 256 || ch == achExpandNestingClose[cExpandNesting - 1]))
+                    cExpandNesting--;
+                break;
+        }
+    }
+    return cExpandNesting;
+}
+
 
 /**
@@ -1438 +1486 @@
 
 /** @todo this block can probably be merged into the final loop below. */
-    unsigned cPendingEols = 0;
+    unsigned cPendingEols   = 0;
     while (iSubLine + 1 < cLines && offLine + 1 == cchLine && pchLine[offLine] == '\\')
     {
@@ -1464 +1512 @@
      * Okay, we've gotten to the value / comment part.
      */
+    char     achExpandNestingClose[256];
+    unsigned cExpandNesting = 0;
     for (;;)
     {
@@ -1503 +1553 @@
                     memset(pszDst, ' ', cchIndent);
                     pszDst += cchIndent;
-                    *pszDst++ = '\t';
+
+                    size_t cTabIndent = cExpandNesting + 1;
+                    while (cTabIndent-- > 0)
+                        *pszDst++ = '\t';
+
                     cPendingEols--;
                 } while (cPendingEols > 0);
@@ -1517 +1571 @@
             /* Append the value part we found. */
             pszDst = (char *)mempcpy(pszDst, &pchLine[offLine], offValueEnd - offLine);
+            cExpandNesting = scmKmkScanStringForExpansions(cExpandNesting, achExpandNestingClose,
+                                                           &pchLine[offLine], offValueEnd - offLine);
             offLine = offValueEnd2;
         }