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

git-svn-id: svn://db.shs.com.ru/pip@593 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2018-02-10 10:42:50 +00:00
parent 9017861eb0
commit 7c5cf7bac4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src_main/code/picodeinfo.h
View File

@@ -97,10 +97,11 @@ inline PICout operator <<(PICout s, const PICodeInfo::TypeInfo & v) {
s << v.type; s << v.type;
if (!v.name.isEmpty()) if (!v.name.isEmpty())
s << " " << v.name; s << " " << v.name;
s << " Meta" << v.meta;
return s; return s;
} }
inline PICout operator <<(PICout s, const PICodeInfo::EnumeratorInfo & v) {s << v.name << " = " << v.value; return s;} inline PICout operator <<(PICout s, const PICodeInfo::EnumeratorInfo & v) {s << v.name << " = " << v.value << " Meta" << v.meta; return s;}
inline PICout operator <<(PICout s, const PICodeInfo::ClassInfo & v) { inline PICout operator <<(PICout s, const PICodeInfo::ClassInfo & v) {
s.setControl(0, true); s.setControl(0, true);
@@ -114,7 +115,7 @@ inline PICout operator <<(PICout s, const PICodeInfo::ClassInfo & v) {
s << i; s << i;
} }
} }
s << " {\n"; s << " Meta" << v.meta << " {\n";
piForeachC (FunctionInfo & i, v.functions) { piForeachC (FunctionInfo & i, v.functions) {
s << PICoutManipulators::Tab << i.return_type << " " << i.name << "("; s << PICoutManipulators::Tab << i.return_type << " " << i.name << "(";
bool fa = true; bool fa = true;
@@ -137,7 +138,7 @@ inline PICout operator <<(PICout s, const PICodeInfo::ClassInfo & v) {
inline PICout operator <<(PICout s, const PICodeInfo::EnumInfo & v) { inline PICout operator <<(PICout s, const PICodeInfo::EnumInfo & v) {
s.setControl(0, true); s.setControl(0, true);
s << "enum " << v.name << " {\n"; s << "enum " << v.name << " Meta" << v.meta << " {\n";
piForeachC (EnumeratorInfo & i, v.members) { piForeachC (EnumeratorInfo & i, v.members) {
bool f = true; bool f = true;
if (f) f = false; if (f) f = false;

4
utils/code_model_generator/main.cpp
View File

@@ -148,8 +148,8 @@ void makeEnumInfo(PIFile & f, const PICodeParser::Enum * e) {
} }
piForeachC (PICodeParser::EnumeratorInfo & m, e->members) { piForeachC (PICodeParser::EnumeratorInfo & m, e->members) {
f << "\tei->members << PICodeInfo::EnumeratorInfo(\"" << m.name << "\", " << m.value << ");\n"; f << "\tei->members << PICodeInfo::EnumeratorInfo(\"" << m.name << "\", " << m.value << ");\n";
if (!e->meta.isEmpty()) { if (!m.meta.isEmpty()) {
for (PICodeParser::MetaMap::const_iterator i = e->meta.begin(); i != e->meta.end(); ++i) for (PICodeParser::MetaMap::const_iterator i = m.meta.begin(); i != m.meta.end(); ++i)
f << "\tei->members.back().meta[\"" << i.key() << "\"] = \"" << i.value() << "\";\n"; f << "\tei->members.back().meta[\"" << i.key() << "\"] = \"" << i.value() << "\";\n";
} }
} }