Changeset 106747 in vbox

Timestamp:

Oct 28, 2024 1:55:40 PM (5 months ago)

Author:

vboxsync

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

165631

Message:

scm: Hacked up minimal support for multiline if1of/ifn1of. jiraref:VBP-1253

File:

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

trunk/src/bldprogs/scmrw-kmk.cpp

@@ -666 +666 @@
 static bool scmKmkHandleIfParentheses(KMKPARSER *pParser, size_t offToken, KMKTOKEN enmToken, size_t cchToken, bool fElse)
 {
-    const char * const pchLine   = pParser->pchLine;
-    size_t  const      cchLine   = pParser->cchLine;
+    const char        *pchLine   = pParser->pchLine;
+    size_t             cchLine   = pParser->cchLine;
     uint32_t const     cchIndent = pParser->iActualDepth
                                  - (fElse && pParser->iActualDepth > 0 && !pParser->aDepth[pParser->iDepth - 1].fIgnoreNesting);
+    const char * const pchToken = &pchLine[offToken];
 
     /*
@@ -688 +689 @@
      * We do not allow line continuation for these.
      */
+    uint32_t cLines         = 1;
+    size_t   cchMaxLeadWord = 0;
+    size_t   cchTotalLine   = cchLine;
     if (scmKmkIsLineWithContinuation(pchLine, cchLine))
-        return scmKmkGiveUp(pParser, "Line continuation not allowed with '%.*s' directive.", cchToken, &pchLine[offToken]);
+    {
+        if (enmToken != kKmkToken_if1of  && enmToken != kKmkToken_ifn1of)
+            return scmKmkGiveUp(pParser, "Line continuation not allowed with '%.*s' directive.", cchToken, pchToken);
+        cchTotalLine = scmKmkLineContinuationPeek(pParser, &cLines, &cchMaxLeadWord);
+    }
 
     /*
@@ -695 +703 @@
      * too long (it seriously should be).
      */
-    if (cchLine + cchIndent + 32 > sizeof(pParser->szBuf))
-        return scmKmkGiveUp(pParser, "Line too long for a '%.*s' directive: %u chars", cchToken, &pchLine[offToken], cchLine);
+    if (cchTotalLine + cchIndent + 32 > sizeof(pParser->szBuf))
+        return scmKmkGiveUp(pParser, "Line too long for a '%.*s' directive: %u chars", cchToken, pchToken, cchTotalLine);
     char *pszDst = pParser->szBuf;
 
@@ -708 +716 @@
         pszDst = (char *)mempcpy(pszDst, RT_STR_TUPLE("else "));
 
-    memcpy(pszDst, &pchLine[offToken], cchToken);
+    memcpy(pszDst, pchToken, cchToken);
     pszDst += cchToken;
 
@@ -723 +731 @@
             offSrc++;
         if (pchLine[offSrc] != '(')
-            return scmKmkGiveUp(pParser, "Expected '(' to follow '%.*s'", cchToken, &pchLine[offToken]);
+            return scmKmkGiveUp(pParser, "Expected '(' to follow '%.*s'", cchToken, pchToken);
         offSrc++;
     }
     *pszDst++ = ' ';
     *pszDst++ = '(';
-
-    /*
-     * Skip spaces after the opening parenthesis.
+    size_t const offContIndent = pszDst - pParser->szBuf;
+
+    /*
+     * Skip spaces after the opening parenthesis. 
+     *  
+     * Note! We don't support/grok any line continuation stuff here.
      */
     while (offSrc < cchLine && RT_C_IS_BLANK(pchLine[offSrc]))
@@ -737 +748 @@
     /*
      * Work up to the ',' separator.  It shall likewise not be preceeded by any spaces.
-     * Need to take $(func 1,2,3) calls into account here, so we trac () and {} while
-     * skipping ahead.
+     * Need to take $(func 1,2,3) calls into account here, so we trac () and {} while 
+     * skipping ahead. 
+     *  
+     * Note! We don't support/grok any line continuation stuff here.
      */
     if (pchLine[offSrc] != ',')
@@ -745 +758 @@
         offSrc = scmKmkSkipExpString(pchLine, cchLine, offSrc, ',');
         if (pchLine[offSrc] != ',')
-            return scmKmkGiveUp(pParser, "Expected ',' somewhere after '%.*s('", cchToken, &pchLine[offToken]);
+            return scmKmkGiveUp(pParser, "Expected ',' somewhere after '%.*s('", cchToken, pchToken);
 
         size_t cchCopy = offSrc - offSrcStart;
@@ -755 +768 @@
     /* 'if1of(, stuff)' does not make sense in committed code: */
     else if (enmToken == kKmkToken_if1of || enmToken == kKmkToken_ifn1of)
-        return scmKmkGiveUp(pParser, "Left set cannot be empty for '%.*s'", cchToken, &pchLine[offToken]);
+        return scmKmkGiveUp(pParser, "Left set cannot be empty for '%.*s'", cchToken, pchToken);
     offSrc++;
     *pszDst++ = ',';
@@ -764 +777 @@
      */
     if (enmToken == kKmkToken_if1of || enmToken == kKmkToken_ifn1of)
-    {
         *pszDst++ = ' ';
-        if (pchLine[offSrc] == ' ')
-            offSrc++;
-    }
     while (offSrc < cchLine && RT_C_IS_BLANK(pchLine[offSrc]))
         offSrc++;
@@ -774 +783 @@
     if (pchLine[offSrc] != ')')
     {
-        size_t const offSrcStart = offSrc;
-        offSrc = scmKmkSkipExpString(pchLine, cchLine, offSrc, ')');
-        if (pchLine[offSrc] != ')')
-            return scmKmkGiveUp(pParser, "No closing parenthesis for '%.*s'?", cchToken, &pchLine[offToken]);
-
-        size_t cchCopy = offSrc - offSrcStart;
-        while (cchCopy > 0 && RT_C_IS_BLANK(pchLine[offSrcStart + cchCopy - 1]))
-            cchCopy--;
-
-        pszDst = (char *)mempcpy(pszDst, &pchLine[offSrcStart], cchCopy);
+        do
+        {
+            if (pchLine[offSrc] == '\\' && offSrc + 1 == cchLine)
+            {
+                *pszDst++ = ' ';
+                *pszDst++ = '\\';
+                *pszDst   = '\0';
+                ScmStreamPutLine(pParser->pOut, pParser->szBuf, pszDst - pParser->szBuf, pParser->enmEol);
+                pszDst = pParser->szBuf;
+
+                memset(pszDst, ' ', offContIndent);
+                pszDst += offContIndent;
+
+                pParser->pchLine = pchLine = ScmStreamGetLine(pParser->pIn, &pParser->cchLine, &pParser->enmEol);
+                cchLine = pParser->cchLine;
+                offSrc = 0;
+                while (offSrc < cchLine && RT_C_IS_BLANK(pchLine[offSrc]))
+                    offSrc++;
+                cLines -= 1;
+            }
+
+            size_t const offSrcStart = offSrc;
+            offSrc = scmKmkSkipExpString(pchLine, cLines <= 1 ? cchLine : cchLine - 1, offSrc, ')');
+            if (pchLine[offSrc] != ')' && cLines <= 1)
+                return scmKmkGiveUp(pParser, "No closing parenthesis for '%.*s'?", cchToken, pchToken);
+
+            size_t cchCopy = offSrc - offSrcStart;
+            while (cchCopy > 0 && RT_C_IS_BLANK(pchLine[offSrcStart + cchCopy - 1]))
+                cchCopy--;
+
+            pszDst = (char *)mempcpy(pszDst, &pchLine[offSrcStart], cchCopy);
+        } while (offSrc + 1 == cchLine && pchLine[offSrc] == '\\');
     }
     /* 'if1of(stuff, )' does not make sense in committed code: */
     else if (   (enmToken == kKmkToken_if1of || enmToken == kKmkToken_ifn1of)
              && !scmKmkHasCommentMarker(pchLine, cchLine, offSrc, RT_STR_TUPLE("scm:ignore-empty-if1of-set")))
-        return scmKmkGiveUp(pParser, "Right set cannot be empty for '%.*s'", cchToken, &pchLine[offToken]);
+        return scmKmkGiveUp(pParser, "Right set cannot be empty for '%.*s'", cchToken, pchToken);
     offSrc++;
     *pszDst++ = ')';
@@ -842 +873 @@
 
     /*
-     * We do not allow line continuation for these.
+     * We do not allow line continuation for ifdef and ifndef, only if.
      */
     uint32_t cLines         = 1;