SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

version 3.18.1

Browse Source 
fix pip_cmg - ignore static members
This commit is contained in:
Пелипенко Иван
2024-04-30 15:23:26 +03:00
parent 247759b364
commit d97798d063
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -3,7 +3,7 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake
project(PIP) project(PIP)
set(PIP_MAJOR 3) set(PIP_MAJOR 3)
set(PIP_MINOR 18) set(PIP_MINOR 18)
set(PIP_REVISION 0) set(PIP_REVISION 1)
set(PIP_SUFFIX ) set(PIP_SUFFIX )
set(PIP_COMPANY SHS) set(PIP_COMPANY SHS)
set(PIP_DOMAIN org.SHS) set(PIP_DOMAIN org.SHS)

3
utils/code_model_generator/main.cpp
View File

@@ -302,6 +302,7 @@ bool writeClassStreamMembersOut(PIIOTextStream & ts, const PICodeParser::Entity
PISet<int> used_id; PISet<int> used_id;
for (const PICodeParser::Member & m: ml) { for (const PICodeParser::Member & m: ml) {
if (is_union && m.isBitfield()) continue; if (is_union && m.isBitfield()) continue;
if (m.attributes[PICodeParser::Static]) continue;
if (m.meta.value("id") == "-") continue; if (m.meta.value("id") == "-") continue;
++cnt; ++cnt;
if (m.meta.contains("id")) cnt = m.meta.value("id").toInt(); if (m.meta.contains("id")) cnt = m.meta.value("id").toInt();
@@ -355,6 +356,7 @@ bool writeClassStreamMembersIn(PIIOTextStream & ts, const PICodeParser::Entity *
PISet<int> used_id; PISet<int> used_id;
for (const PICodeParser::Member & m: ml) { for (const PICodeParser::Member & m: ml) {
if (is_union && m.isBitfield()) continue; if (is_union && m.isBitfield()) continue;
if (m.attributes[PICodeParser::Static]) continue;
if (m.meta.value("id") == "-") continue; if (m.meta.value("id") == "-") continue;
++cnt; ++cnt;
if (m.meta.contains("id")) cnt = m.meta.value("id").toInt(); 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; if (e->meta.contains("no-stream")) return false;
for (const PICodeParser::Member & m: e->members) { for (const PICodeParser::Member & m: e->members) {
if (m.is_type_ptr || m.isBitfield() || !m.dims.isEmpty() || (m.visibility != PICodeParser::Public)) continue; 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; if (m.meta.value("id") == "-") continue;
return true; return true;
} }