Changeset 98428 in vbox for trunk

Timestamp:

Feb 2, 2023 12:03:20 PM (2 years ago)

Author:

vboxsync

Message:

scm: More on the kmk makefile cleanup. bugref:10348

File:

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

trunk/src/bldprogs/scmrw-kmk.cpp

@@ -76 +76 @@
     /** Dependency file.
      *  Separators: space, '|' */
-    kKmkWordCtx_DepFile
+    kKmkWordCtx_DepFile,
+    /** Last context which may do double expansion. */
+    kKmkWordCtx_LastDoubleExpansion = kKmkWordCtx_DepFile
 } KMKWORDCTX;
 
@@ -158 +160 @@
 } KMKPARSER;
 
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+static char const g_szTabs[] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
 
 
@@ -472 +479 @@
         {
             /*
-             * Skip variable expansion.
+             * Skip variable expansion. ASSUMING double expansion being enabled
+             * for rules, we respond to both $() and $$() here, $$$$()
              */
-            if (off + 2 >= cchLine)
-                return cchLine - offStart;
-            char const chOpen = pchLine[++off];
-            if (chOpen == '(' || chOpen == '{')
+            size_t cDollars = 0;
+            do
             {
-                char const chClose = chOpen == '(' ? ')' : '}';
-                unsigned   uDepth  = 1;
                 off++;
-                for (;;)
+                if (off >= cchLine)
+                    return cchLine - offStart;
+                cDollars++;
+                ch = pchLine[off];
+            } while (ch == '$');
+            if ((cDollars & 1) || (cDollars == 2 && enmCtx <= kKmkWordCtx_LastDoubleExpansion))
+            {
+                char const chOpen = ch;
+                if (ch == '(' || ch == '{')
                 {
-                    if (off < cchLine)
-                        ch = pchLine[off++];
-                    else /* Reached the end while inside the expansion. */
+                    char const chClose = chOpen == '(' ? ')' : '}';
+                    unsigned   uDepth  = 1;
+                    off++;
+                    for (;;)
                     {
-                        pState->chOpen = chOpen;
-                        pState->uDepth = (uint16_t)uDepth;
-                        return cchLine - offStart;
+                        if (off < cchLine)
+                            ch = pchLine[off++];
+                        else /* Reached the end while inside the expansion. */
+                        {
+                            pState->chOpen = chOpen;
+                            pState->uDepth = (uint16_t)uDepth;
+                            return cchLine - offStart;
+                        }
+                        if (ch == chOpen)
+                            uDepth++;
+                        else if (ch == chClose && --uDepth == 0)
+                            break;
                     }
-                    if (ch == chOpen)
-                        uDepth++;
-                    else if (ch == chClose && --uDepth == 0)
-                        break;
                 }
-                continue;
+                else if (cDollars & 1)
+                    off++; /* $X */
             }
-            /* else: $X */
+            continue;
         }
         else if (ch == ':')
@@ -1581 +1600 @@
      * Process word by word past the colon, taking new lines into account.
      */
-    KMKWORDSTATE WordState   = { 0, 0 };
-    KMKWORDCTX   enmCtx      = kKmkWordCtx_TargetFileOrAssignment;
-    bool         fPendingEol = false;
+    KMKWORDSTATE WordState    = { 0, 0 };
+    KMKWORDCTX   enmCtx       = kKmkWordCtx_TargetFileOrAssignment;
+    unsigned     cPendingEols = 0;
     for (;;)
     {
@@ -1650 +1669 @@
                         ScmStreamPutCh(pOut, ':');
 
-                    fPendingEol = true;
+                    cPendingEols = 1;
                 }
                 else
@@ -1657 +1676 @@
                     ScmStreamPutEol(pOut, pParser->enmEol);
                     ScmStreamWrite(pOut, g_szSpaces, cchIndent);
+                    if (WordState.uDepth > 0)
+                        ScmStreamWrite(pOut, g_szTabs, RT_MIN(WordState.uDepth, sizeof(g_szTabs) - 1));
                 }
                 break;
@@ -1679 +1700 @@
     while (offLine + 1 == cchLine && pchLine[offLine] == '\\')
     {
-        fPendingEol = true;
+        cPendingEols = 1;
 
         Assert(iSubLine + 1 < cLines);
@@ -1716 +1737 @@
     {
         /* Indent the next word. */
-        if (!fPendingEol)
+        if (cPendingEols == 0)
             ScmStreamPutCh(pOut, ' ');
         else
@@ -1724 +1745 @@
             ScmStreamWrite(pOut, g_szSpaces, cchIndent);
             ScmStreamWrite(pOut, RT_STR_TUPLE("\t\t"));
-            fPendingEol = false;
-        }
+            if (cPendingEols > 1)
+            {
+                ScmStreamWrite(pOut, RT_STR_TUPLE("\\"));
+                ScmStreamPutEol(pOut, pParser->enmEol);
+                ScmStreamWrite(pOut, g_szSpaces, cchIndent);
+                ScmStreamWrite(pOut, RT_STR_TUPLE("\t\t"));
+            }
+            cPendingEols = 0;
+        }
+        if (WordState.uDepth > 0)
+            ScmStreamWrite(pOut, g_szTabs, RT_MIN(WordState.uDepth, sizeof(g_szTabs) - 1));
 
         /* Get the next word and output it. */
@@ -1742 +1772 @@
         {
             /* Get the next input line. */
-            unsigned cEmptyLines = 0;
             for (;;)
             {
@@ -1759 +1788 @@
 
                 /* Just drop empty lines, we'll re-add one of them afterward if we find more dependencies. */
+                cPendingEols++;
                 if (offLine + 1 == cchLine && pchLine[offLine] == '\\')
-                {
-                    cEmptyLines++;
                     continue;
-                }
-
-                fPendingEol = true;
                 break;
             }
@@ -2160 +2185 @@
 
                 /*
-                 * Indent comment lines, unless the comment is too far into the line and such.
+                 * Indent comment lines, unless the comment is too far too the right.
                  */
                 size_t const offEffLine = ScmCalcSpacesForSrcSpan(pchLine, 0, offLine, pSettings);