From 9f1d23ad8ef5ee40ad21fb029e7ddb4bf59929f0 Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Wed, 23 Oct 2024 19:11:46 +0300
Subject: [PATCH] version 4.3.1 PICodeParser now works with multi-line macros

---
 CMakeLists.txt                  |  2 +-
 libs/main/code/picodeparser.cpp | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6167b409..8872a989 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(PIP)
 set(PIP_MAJOR    4)
 set(PIP_MINOR    3)
-set(PIP_REVISION 0)
+set(PIP_REVISION 1)
 set(PIP_SUFFIX   )
 set(PIP_COMPANY  SHS)
 set(PIP_DOMAIN   org.SHS)
diff --git a/libs/main/code/picodeparser.cpp b/libs/main/code/picodeparser.cpp
index 67e2ccb4..a1c8f58a 100644
--- a/libs/main/code/picodeparser.cpp
+++ b/libs/main/code/picodeparser.cpp
@@ -343,6 +343,7 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 	static const PIString s_typedef   = PIStringAscii("typedef");
 	static const PIString s_namespace = PIStringAscii("namespace");
 	static const PIString s_template  = PIStringAscii("template");
+	static const PIString s_L         = PIStringAscii("$L");
 
 	bool mlc = false, cc = false;
 	int mls = 0, ole = -1, /*ccs = 0,*/ end = 0;
@@ -365,8 +366,9 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 		}
 		if (i > 0)
 			if (c == '\\' && fc[i - 1].toAscii() != '\\') {
-				fc.cutMid(i, 2);
-				--i;
+				fc.cutMid(i, 1);
+				fc.replace(i, 1, s_L);
+				++i;
 				continue;
 			}
 		if (cc) continue;
@@ -390,6 +392,7 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
 		}
 	}
 	pfc = procMacros(fc);
+	pfc.removeAll(s_L);
 
 	if (main) return true;
 
@@ -1248,6 +1251,7 @@ PIString PICodeParser::procMacros(PIString fc) {
 	static const PIString s_elif   = PIStringAscii("elif");
 	static const PIString s_else   = PIStringAscii("else");
 	static const PIString s_endif  = PIStringAscii("endif");
+	static const PIString s_L      = PIStringAscii("$L");
 	if (fc.isEmpty()) return PIString();
 	int ifcnt = 0;
 	bool grab = false, skip = false, cond_ok = false;
@@ -1337,7 +1341,9 @@ bool PICodeParser::parseDirective(PIString d) {
 	static const PIString s_define  = PIStringAscii("define");
 	static const PIString s_undef   = PIStringAscii("undef");
 	static const PIString s_PIMETA  = PIStringAscii("PIMETA");
+	static const PIString s_L       = PIStringAscii("$L");
 	if (d.isEmpty()) return true;
+	d.replaceAll(s_L, '\n');
 	PIString dname = d.takeCWord();
 	// piCout << "parseDirective" << d;
 	if (dname == s_include) {