Changeset 98383 in vbox for trunk

Timestamp:

Feb 1, 2023 1:00:13 PM (2 years ago)

Author:

vboxsync

Message:

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

File:

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

trunk/src/bldprogs/scmrw-kmk.cpp

@@ -600 +600 @@
     size_t  const      cchLine   = pParser->cchLine;
     uint32_t const     cchIndent = pParser->iActualDepth
-                                 - (fElse && pParser->iDepth > 0 && !pParser->aDepth[pParser->iDepth].fIgnoreNesting);
+                                 - (fElse && pParser->iActualDepth > 0 && !pParser->aDepth[pParser->iDepth - 1].fIgnoreNesting);
 
     /*
@@ -747 +747 @@
     size_t          cchLine   = pParser->cchLine;
     uint32_t const  cchIndent = pParser->iActualDepth
-                              - (fElse && pParser->iDepth > 0 && !pParser->aDepth[pParser->iDepth].fIgnoreNesting);
+                              - (fElse && pParser->iActualDepth > 0 && !pParser->aDepth[pParser->iDepth - 1].fIgnoreNesting);
 
     /*
@@ -1095 +1095 @@
         pParser->iActualDepth -= 1;
     }
-    uint32_t const cchIndent = pParser->iActualDepth;
     ScmVerbose(pParser->pState, 5, "%u: debug: unnesting %u/%u (endif)\n",
                ScmStreamTellLine(pParser->pIn), iDepth, pParser->iActualDepth);
+    uint32_t const cchIndent = pParser->iActualDepth;
 
     /*
@@ -1180 +1180 @@
 static bool scmKmkHandleDefine(KMKPARSER *pParser, size_t offToken)
 {
+    scmKmkHandleSimple(pParser, offToken);
+
     /* Hack Alert! Start out parsing the define in recipe mode.
 
@@ -1185 +1187 @@
        used. However, we ASSUME they are either makefile code snippets or
        recipe templates.  */
+    scmKmkPushNesting(pParser, kKmkToken_define);
     scmKmkSetInRecipe(pParser, true);
-
-    return scmKmkHandleSimple(pParser, offToken);
+    return false;
 }
 
@@ -1195 +1197 @@
     /* Leaving a define resets the recipt mode. */
     scmKmkSetInRecipe(pParser, false);
+
+    /*
+     * Pop a nesting.
+     */
+    if (pParser->iDepth < 1)
+        return scmKmkGiveUp(pParser, "Lone 'endef'");
+    uint32_t iDepth = pParser->iDepth - 1;
+    if (pParser->aDepth[iDepth].enmToken != kKmkToken_define)
+        return scmKmkGiveUp(pParser, "Unpexected 'endef', expected 'endif' for line %u", pParser->aDepth[iDepth].iLine);
+    pParser->iDepth = iDepth;
+    if (!pParser->aDepth[iDepth].fIgnoreNesting)
+    {
+        AssertStmt(pParser->iActualDepth > 0, pParser->iActualDepth++);
+        pParser->iActualDepth -= 1;
+    }
+    ScmVerbose(pParser->pState, 5, "%u: debug: unnesting %u/%u (endef)\n",
+               ScmStreamTellLine(pParser->pIn), iDepth, pParser->iActualDepth);
 
     return scmKmkHandleSimple(pParser, offToken);