From d97798d063511e9d5b1a44aa1a7851547dcac117 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 30 Apr 2024 15:23:26 +0300 Subject: [PATCH] version 3.18.1 fix pip_cmg - ignore static members --- CMakeLists.txt | 2 +- utils/code_model_generator/main.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad0da40c..292a9a87 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 3) set(PIP_MINOR 18) -set(PIP_REVISION 0) +set(PIP_REVISION 1) set(PIP_SUFFIX ) set(PIP_COMPANY SHS) set(PIP_DOMAIN org.SHS) diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp index d2fa5fdd..5b569b62 100755 --- a/utils/code_model_generator/main.cpp +++ b/utils/code_model_generator/main.cpp @@ -302,6 +302,7 @@ bool writeClassStreamMembersOut(PIIOTextStream & ts, const PICodeParser::Entity PISet used_id; for (const PICodeParser::Member & m: ml) { if (is_union && m.isBitfield()) continue; + if (m.attributes[PICodeParser::Static]) continue; if (m.meta.value("id") == "-") continue; ++cnt; if (m.meta.contains("id")) cnt = m.meta.value("id").toInt(); @@ -355,6 +356,7 @@ bool writeClassStreamMembersIn(PIIOTextStream & ts, const PICodeParser::Entity * PISet used_id; for (const PICodeParser::Member & m: ml) { if (is_union && m.isBitfield()) continue; + if (m.attributes[PICodeParser::Static]) continue; if (m.meta.value("id") == "-") continue; ++cnt; if (m.meta.contains("id")) cnt = m.meta.value("id").toInt(); @@ -421,6 +423,7 @@ bool needClassStream(const PICodeParser::Entity * e) { if (e->meta.contains("no-stream")) return false; for (const PICodeParser::Member & m: e->members) { if (m.is_type_ptr || m.isBitfield() || !m.dims.isEmpty() || (m.visibility != PICodeParser::Public)) continue; + if (m.attributes[PICodeParser::Static]) continue; if (m.meta.value("id") == "-") continue; return true; }