[jscompiler] Simply pushing and popping the current file being proces…

…sed. NFC
emscripten-core · Feb 22, 2025 · c8835d0 · c8835d0
1 parent fc15522
commit c8835d0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/src/modules.mjs b/src/modules.mjs
@@ -15,7 +15,8 @@ import {
   error,
   readFile,
   warn,
-  setCurrentFile,
+  pushCurrentFile,
+  popCurrentFile,
   printErr,
   addToCompileTimeContext,
   runInMacroContext,
@@ -275,7 +276,7 @@ export const LibraryManager = {
         origLibrary = this.library;
         this.library = userLibraryProxy;
       }
-      const oldFile = setCurrentFile(filename);
+      pushCurrentFile(filename);
       try {
         processed = processMacros(preprocess(filename), filename);
         runInMacroContext(processed, {filename: filename.replace(/\.\w+$/, '.preprocessed$&')});
@@ -295,7 +296,7 @@ export const LibraryManager = {
         }
         throw e;
       } finally {
-        setCurrentFile(oldFile);
+        popCurrentFile();
         if (origLibrary) {
           this.library = origLibrary;
         }

diff --git a/src/parseTools.mjs b/src/parseTools.mjs
@@ -18,7 +18,8 @@ import {
   printErr,
   readFile,
   runInMacroContext,
-  setCurrentFile,
+  pushCurrentFile,
+  popCurrentFile,
   warn,
   srcDir,
 } from './utility.mjs';
@@ -36,10 +37,15 @@ export function processMacros(text, filename) {
   // The `?` here in makes the regex non-greedy so it matches with the closest
   // set of closing braces.
   // `[\s\S]` works like `.` but include newline.
-  return text.replace(/{{{([\s\S]+?)}}}/g, (_, str) => {
-    const ret = runInMacroContext(str, {filename: filename});
-    return ret !== null ? ret.toString() : '';
-  });
+  pushCurrentFile(filename);
+  try {
+    return text.replace(/{{{([\s\S]+?)}}}/g, (_, str) => {
+      const ret = runInMacroContext(str, {filename: filename});
+      return ret !== null ? ret.toString() : '';
+    });
+  } finally {
+    popCurrentFile();
+  }
 }
 
 function findIncludeFile(filename, currentDir) {
@@ -86,7 +92,6 @@ export function preprocess(filename) {
   const showStack = [];
   const showCurrentLine = () => showStack.every((x) => x == SHOW);
 
-  const oldFilename = setCurrentFile(filename);
   const fileExt = filename.split('.').pop().toLowerCase();
   const isHtml = fileExt === 'html' || fileExt === 'htm' ? true : false;
   let inStyle = false;
@@ -99,6 +104,7 @@ export function preprocess(filename) {
   let ret = '';
   let emptyLine = false;
 
+  pushCurrentFile(filename);
   try {
     for (let [i, line] of lines.entries()) {
       if (isHtml) {
@@ -209,7 +215,7 @@ no matching #endif found (${showStack.length$}' unmatched preprocessing directiv
     );
     return ret;
   } finally {
-    setCurrentFile(oldFilename);
+    popCurrentFile();
   }
 }
 

diff --git a/src/utility.mjs b/src/utility.mjs
@@ -46,17 +46,19 @@ export function warningOccured() {
   return warnings;
 }
 
-let currentFile = null;
+let currentFile = [];
 
-export function setCurrentFile(f) {
-  let rtn = currentFile;
-  currentFile = f;
-  return rtn;
+export function pushCurrentFile(f) {
+  currentFile.push(f);
+}
+
+export function popCurrentFile(f) {
+  currentFile.pop(f);
 }
 
 function errorPrefix() {
-  if (currentFile) {
-    return currentFile + ': ';
+  if (currentFile.length > 0) {
+    return currentFile[currentFile.length - 1] + ': ';
   } else {
     return '';
   }