Changeset 98393 in vbox

Timestamp:

Feb 1, 2023 2:35:20 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155637

Message:

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

File:

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

trunk/src/bldprogs/scmrw-kmk.cpp

@@ -1453 +1453 @@
             else
             {
+                unsigned iEol = 0;
                 cPendingEols = RT_MIN(2, cPendingEols); /* reduce to two, i.e. only one empty separator line */
                 do
                 {
-                    *pszDst++ = ' ';
+                    if (iEol++ == 0)  /* skip this for the 2nd empty line. */
+                        *pszDst++ = ' ';
                     *pszDst++ = '\\';
                     *pszDst = '\0';
@@ -1731 +1733 @@
 
         /* Skip whitespace (if any). */
-        size_t cchSpaces = 0;
         while (offLine < cchLine && RT_C_IS_SPACE(pchLine[offLine]))
-        {
-            cchSpaces++;
             offLine++;
-        }
 
         /* Deal with new line and emit indentation. */
@@ -1903 +1901 @@
                     enmType = kKmkAssignType_Prepending;
                 else
+                {
                     Assert(ch != ':');
-                return scmKmkHandleAssignment2(pParser, offWord, offLine - 1, enmType, offLine - 1, 0);
+                    return scmKmkHandleAssignment2(pParser, offWord, offLine - 1, enmType, offLine - 1, 0);
+                }
+                return scmKmkHandleAssignment2(pParser, offWord, offLine - 2, enmType, offLine - 2, 0);
             }
         }
@@ -2123 +2124 @@
 
                     case kKmkToken_Comment:
+                        AssertFailed(); /* not possible */
                         break;
 
@@ -2154 +2156 @@
                     continue;
                 }
-                /** @todo process comments. */
+
+                /*
+                 * Indent comment lines, unless the comment is too far into the line and such.
+                 */
+                size_t const offEffLine = ScmCalcSpacesForSrcSpan(pchLine, 0, offLine, pSettings);
+                if (offEffLine <= Parser.iActualDepth + 7)
+                {
+                    ScmStreamWrite(pOut, g_szSpaces, Parser.iActualDepth);
+                    ScmStreamWrite(pOut, &pchLine[offLine], cchLine - offLine);
+                    ScmStreamPutEol(pOut, Parser.enmEol);
+                    continue;
+                }
             }
         }