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

pip_cmg now ignore streaming for members with PIMETA(id=-)

Browse Source
This commit is contained in:
Пелипенко Иван
2021-06-26 19:21:34 +03:00
parent a8d55abac1
commit e33aee3ddb
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 2) set(pip_MAJOR 2)
set(pip_MINOR 26) set(pip_MINOR 26)
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

@@ -203,6 +203,7 @@ void writeClassStreamMembersOut(PIFile & f, const PICodeParser::Entity * e, int
piForeachC (PICodeParser::Member & m, ml) { piForeachC (PICodeParser::Member & m, ml) {
if (is_union && m.isBitfield()) if (is_union && m.isBitfield())
continue; continue;
if (m.meta.value("id") == "-") continue;
++cnt; ++cnt;
if (m.meta.contains("id")) if (m.meta.contains("id"))
cnt = m.meta.value("id").toInt(); cnt = m.meta.value("id").toInt();
@@ -241,6 +242,7 @@ void writeClassStreamMembersIn(PIFile & f, const PICodeParser::Entity * e, int &
piForeachC (PICodeParser::Member & m, ml) { piForeachC (PICodeParser::Member & m, ml) {
if (is_union && m.isBitfield()) if (is_union && m.isBitfield())
continue; continue;
if (m.meta.value("id") == "-") continue;
++cnt; ++cnt;
if (m.meta.contains("id")) if (m.meta.contains("id"))
cnt = m.meta.value("id").toInt(); cnt = m.meta.value("id").toInt();
@@ -278,6 +280,7 @@ bool needClassStream(const PICodeParser::Entity * e) {
piForeachC (PICodeParser::Member & m, e->members) { piForeachC (PICodeParser::Member & m, e->members) {
if (m.is_type_ptr || m.isBitfield() || !m.dims.isEmpty() || (m.visibility != PICodeParser::Public)) if (m.is_type_ptr || m.isBitfield() || !m.dims.isEmpty() || (m.visibility != PICodeParser::Public))
continue; continue;
if (m.meta.value("id") == "-") continue;
return true; return true;
} }
return false; return false;