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

PICodeParser namespace fix

Browse Source
This commit is contained in:
Пелипенко Иван
2024-11-07 15:43:13 +03:00
parent 57f8c1313e
commit 2247473959
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/main/code/picodeparser.cpp
View File

@@ -498,6 +498,7 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
MetaMap smeta = maybeMeta(pfc); MetaMap smeta = maybeMeta(pfc);
meta << smeta; meta << smeta;
} }
// piCout << "pfc E" << cur_namespace << "," << tmp;
parseEnum(0, cur_namespace + tmp, pfc.takeRange('{', '}'), meta); parseEnum(0, cur_namespace + tmp, pfc.takeRange('{', '}'), meta);
pfc.takeSymbol(); pfc.takeSymbol();
continue; continue;
@@ -613,8 +614,8 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_namespace)
int ps = -1; int ps = -1;
bool def = false; bool def = false;
PIString prev_namespace = cur_namespace, stmp; PIString prev_namespace = cur_namespace, stmp;
if (ce) cur_namespace += ce->name + s_ns; if (ce) cur_namespace = ce->name + s_ns;
// piCout << "parse class" << ce->name << "namespace" << cur_namespace; // piCout << "parse class" << (ce ? ce->name : "NULL") << "namespace" << cur_namespace;
// piCout << "\nparse class" << ce->name << "namespace" << cur_namespace; // piCout << "\nparse class" << ce->name << "namespace" << cur_namespace;
while (!fc.isEmpty()) { while (!fc.isEmpty()) {
PIString cw = fc.takeCWord(), tmp; PIString cw = fc.takeCWord(), tmp;
@@ -666,6 +667,7 @@ void PICodeParser::parseClass(Entity * parent, PIString & fc, bool is_namespace)
MetaMap smeta = maybeMeta(fc); MetaMap smeta = maybeMeta(fc);
meta << smeta; meta << smeta;
} }
// piCout << "pc E" << cur_namespace << "," << tmp;
parseEnum(ce, cur_namespace + tmp, fc.takeRange('{', '}'), meta); parseEnum(ce, cur_namespace + tmp, fc.takeRange('{', '}'), meta);
fc.takeSymbol(); fc.takeSymbol();
continue; continue;