From 8526ad1c305885a244abb5bea199a1f734851311 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 2 May 2021 14:02:18 +0300 Subject: [PATCH] PICodeParser now recognize non-direct PIMETA --- CMakeLists.txt | 2 +- libs/main/code/picodeparser.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b86842e..95993975 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 2) set(pip_MINOR 23) -set(pip_REVISION 1) +set(pip_REVISION 2) 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 d6c7b7f5..c811e63c 100644 --- a/libs/main/code/picodeparser.cpp +++ b/libs/main/code/picodeparser.cpp @@ -234,8 +234,6 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) { if (fc.mid(i, 2) == "//" && !mlc) {ole = fc.find('\n', i); fc.cutMid(i, ole < 0 ? -1 : ole - i); --i; continue;} } pfc = procMacros(fc); - - replaceMeta(pfc); if (main) return true; @@ -279,6 +277,8 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) { } } } + + replaceMeta(pfc); //piCout << NewLine << "file" << cur_file << pfc; int pl = -1;