Allow multiple preinclude files (#1763)

include/asm/fstack.hpp

@@ -56,7 +56,7 @@ std::shared_ptr<std::string> fstk_GetUniqueIDStr();
 MacroArgs *fstk_GetCurrentMacroArgs();
 
 void fstk_AddIncludePath(std::string const &path);
-void fstk_SetPreIncludeFile(std::string const &path);
+void fstk_AddPreIncludeFile(std::string const &path);
 std::optional<std::string> fstk_FindFile(std::string const &path);
 bool fstk_FileError(std::string const &path, char const *functionName);
 

man/rgbasm.1

@@ -176,6 +176,7 @@ This acts as if a
 .Ql Ic INCLUDE Qq Ar include_file
 was read before the input
 .Ar asmfile .
+Multiple files can be pre-included in the order they were provided.
 .It Fl p Ar pad_value , Fl \-pad-value Ar pad_value
 Use this as the value for
 .Ic DS

src/asm/fstack.cpp

@@ -3,6 +3,7 @@
 #include "asm/fstack.hpp"
 #include <sys/stat.h>
 
+#include <deque>
 #include <errno.h>
 #include <inttypes.h>
 #include <memory>
@@ -46,7 +47,7 @@ size_t maxRecursionDepth;
 // The first include path for `fstk_FindFile` to try is none at all
 static std::vector<std::string> includePaths = {""};
 
-static std::string preIncludeName;
+static std::deque<std::string> preIncludeNames;
 
 std::string const &FileStackNode::dump(uint32_t curLineNo) const {
 	if (std::holds_alternative<std::vector<uint32_t>>(data)) {
@@ -115,12 +116,9 @@ void fstk_AddIncludePath(std::string const &path) {
 	}
 }
 
-void fstk_SetPreIncludeFile(std::string const &path) {
-	if (!preIncludeName.empty()) {
-		warnx("Overriding pre-included filename %s", preIncludeName.c_str());
-	}
-	preIncludeName = path;
-	verbosePrint("Pre-included filename %s\n", preIncludeName.c_str()); // LCOV_EXCL_LINE
+void fstk_AddPreIncludeFile(std::string const &path) {
+	preIncludeNames.emplace_front(path);
+	verbosePrint("Pre-included filename %s\n", path.c_str()); // LCOV_EXCL_LINE
 }
 
 static bool isValidFilePath(std::string const &path) {
@@ -413,13 +411,11 @@ void fstk_Init(std::string const &mainPath, size_t maxDepth) {
 
 	maxRecursionDepth = maxDepth;
 
-	if (!preIncludeName.empty()) {
-		if (std::optional<std::string> fullPath = fstk_FindFile(preIncludeName); fullPath) {
+	for (std::string const &name : preIncludeNames) {
+		if (std::optional<std::string> fullPath = fstk_FindFile(name); fullPath) {
 			newFileContext(*fullPath, false);
 		} else {
-			error(
-			    "Error reading pre-included file '%s': %s", preIncludeName.c_str(), strerror(errno)
-			);
+			error("Error reading pre-included file '%s': %s", name.c_str(), strerror(errno));
 		}
 	}
 }

src/asm/main.cpp

@@ -270,7 +270,7 @@ int main(int argc, char *argv[]) {
 			break;
 
 		case 'P':
-			fstk_SetPreIncludeFile(musl_optarg);
+			fstk_AddPreIncludeFile(musl_optarg);
 			break;
 
 			unsigned long padByte;

test/asm/preinclude-2.inc

@@ -0,0 +1,4 @@
+warn "another pre-included file"
+
+def v1 += 10
+def v2 -= 10

test/asm/preinclude.err

@@ -1,4 +1,6 @@
-warning: preinclude.asm(0) -> preinclude.inc(1): [-Wuser]
+warning: preinclude.asm(0) -> preinclude-2.inc(0) -> preinclude-1.inc(1): [-Wuser]
     pre-included file
+warning: preinclude.asm(0) -> preinclude-2.inc(1): [-Wuser]
+    another pre-included file
 warning: preinclude.asm(1): [-Wuser]
     main file

test/asm/preinclude.flags

@@ -1 +1 @@
--Weverything -P preinclude.inc
+-Weverything -P preinclude-1.inc -P preinclude-2.inc

test/asm/preinclude.out

@@ -4,4 +4,4 @@ rept 3
 for 0/3
 for 1/3
 for 2/3
-12 + 34 = 46
+22 + 24 = 46