added do-preprocess to the debugger

Author: X39

docs/Debugger/README.MD

@@ -6,6 +6,7 @@
 * [set-breakpoint](set-breakpoint.md)
 * [parse-sqf](parse-sqf.md)
 * [load-sqf](load-sqf.md)
+* [do-preprocess](do-preprocess.md)
 
 # Server-Modes
 * [callstack](get-callstack.md)
@@ -14,3 +15,4 @@
 * [status](get-status.md)
 * [variables](get-variables.md)
 * [position](position.md)
+* [preprocess](do-preprocess.md)

docs/Debugger/do-preprocess.md

@@ -0,0 +1,16 @@
+## Request Schema
+    {
+        "mode": "do-preprocess",
+        "data": { "path": "string", "content": "string" }
+    }
+* **mode** - `do-preprocess` - always set, tells the receiving end that this is a do-preprocess action in the `data` field
+* **data** - `STRING` - always set, contains either the `path` to an existing file or a `content` field. If both are provided, path takes priority.
+## Response Schema
+    {
+        "mode": "preprocess",
+        "data": "string"
+    }
+* **mode** - `preprocess` - always set, tells the receiving end that this is a preprocess-string in the `data` field
+* **data** - `STRING` - always set, contains the preprocessed data from the server.
+
+Tells the server to preprocess a file or contents.

src/debugger.cpp

@@ -8,6 +8,7 @@
 #include "value.h"
 #include "instruction.h"
 #include "fileio.h"
+#include "parsepreprocessor.h"
 #include <sstream>
 
 namespace {
@@ -257,6 +258,62 @@ void sqf::debugger::check(virtualmachine * vm)
 				auto data = json["data"];
 				_server->push_message(variablemsg(vm, vm->stack(), data));
 			}
+			else if (mode == "preprocess")
+			{
+				auto data = json["data"];
+				auto res = data.find("path");
+				if (res != data.end())
+				{
+					std::string path = *res;
+					path = vm->get_filesystem().sanitize(path);
+					auto phys = vm->get_filesystem().try_get_physical_path(path);
+					if (phys.has_value())
+					{
+						auto filecontents = load_file(phys.value());
+						bool errflag = false;
+						auto ppres = sqf::parse::preprocessor::parse(vm, filecontents, errflag, path);
+						if (errflag)
+						{
+							auto err = vm->err().str();
+							vm->err_clear();
+							_server->push_message(errormsg(err));
+						}
+						else
+						{
+							nlohmann::json json = {
+								{ "mode", "message" },
+							{ "data", ppres }
+							};
+							_server->push_message(json.dump());
+						}
+					}
+					else
+					{
+						_server->push_message(errormsg("Path not found."));
+					}
+				}
+				else
+				{
+					std::string content = data["content"];
+					auto filecontents = load_file(content);
+					bool errflag = false;
+					auto ppres = sqf::parse::preprocessor::parse(vm, filecontents, errflag, "__debugger.sqf");
+					if (errflag)
+					{
+						auto err = vm->err().str();
+						vm->err_clear();
+						_server->push_message(errormsg(err));
+					}
+					else
+					{
+						nlohmann::json json = {
+							{ "mode", "message" },
+						{ "data", ppres }
+						};
+						_server->push_message(json.dump());
+					}
+				}
+			}
 			else if (mode == "parse-sqf")
 			{
 				auto data = json["data"];

src/parsepreprocessor.cpp

@@ -696,7 +696,7 @@ namespace {
 			sstream << "#line 0" << std::endl;
 			sstream << parse_file(h, otherfinfo) << std::endl;
 			sstream << "#file " << fileinfo.path << std::endl;
-			sstream << "#line " << fileinfo.line << std::endl;
+			sstream << "#line " << fileinfo.line - 1 << std::endl;
 			return sstream.str();
 		}
 		else if (inst == "DEFINE")

src/virtualmachine.h

@@ -75,10 +75,13 @@ namespace sqf
 		std::stringstream& wrn() { /* on purpose */static_cast<virtualmachine*>(this)->mwrnflag = true; return mwrn_buff; }
 		void out(std::basic_ostream<char, std::char_traits<char>>* strm) { mout = strm; }
 		void out_buffprint() { (*mout) << mout_buff.str(); mout_buff.str(std::string()); }
+		void out_clear() { mout_buff.str(""); moutflag = false; }
 		void err(std::basic_ostream<char, std::char_traits<char>>* strm) { merr = strm; }
 		void err_buffprint() { (*merr) << merr_buff.str(); merr_buff.str(std::string()); }
+		void err_clear() { merr_buff.str(""); merrflag = false; }
 		void wrn(std::basic_ostream<char, std::char_traits<char>>* strm) { mwrn = strm; }
 		void wrn_buffprint() { (*mwrn) << mwrn_buff.str(); mwrn_buff.str(std::string()); }
+		void wrn_clear() { mwrn_buff.str(""); mwrnflag = false; }
 		virtualmachine() : virtualmachine(0) {};
 		virtualmachine(unsigned long long maxinst);
 		void execute();