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@594 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

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

5
src_main/code/picodeinfo.h
View File

@@ -97,7 +97,6 @@ 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;
} }
@@ -124,12 +123,12 @@ inline PICout operator <<(PICout s, const PICodeInfo::ClassInfo & v) {
else s << ", "; else s << ", ";
s << a; s << a;
} }
s << ");\n"; s << ") Meta" << i.meta << ";\n";
} }
if (!v.functions.isEmpty() && !v.variables.isEmpty()) if (!v.functions.isEmpty() && !v.variables.isEmpty())
s << "\n"; s << "\n";
piForeachC (TypeInfo & i, v.variables) { piForeachC (TypeInfo & i, v.variables) {
s << PICoutManipulators::Tab << i << ";\n"; s << PICoutManipulators::Tab << i << " Meta" << i.meta << ";\n";
} }
s << "}\n"; s << "}\n";
s.restoreControl(); s.restoreControl();

4
src_main/code/picodeparser.cpp
View File

@@ -530,7 +530,7 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
tmp_temp[crepl] = "<" + ctemp + ">"; tmp_temp[crepl] = "<" + ctemp + ">";
ts = fc.find("<", te); ts = fc.find("<", te);
} }
fc.replaceAll("\n", " ").replaceAll("\t", " ").replaceAll(" ", " ").replaceAll(", ", ",").replaceAll(" $M", "$M"); fc.replaceAll("\n", " ").replaceAll("\t", " ").replaceAll(" ", " ").replaceAll(", ", ",").replaceAll(" (", "(").replaceAll(" $M", "$M");
//piCout << "parse member" << fc; //piCout << "parse member" << fc;
PIStringList tl, al; PIStringList tl, al;
Member me; Member me;
@@ -540,7 +540,7 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
int ind = fc.find("$M"); int ind = fc.find("$M");
if (ind >= 0) { if (ind >= 0) {
meta = tmp_meta.value(fc.takeMid(ind, 5)); meta = tmp_meta.value(fc.takeMid(ind, 5));
fc.replaceAll(" ", " "); fc.replaceAll(" ", " ").replaceAll(" (", "(");
} }
fc.cutRight(fc.size_s() - fc.findLast(")") - 1); fc.cutRight(fc.size_s() - fc.findLast(")") - 1);
te = fc.find("("); te = fc.find("(");