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

PIString hard optimization

Browse Source
This commit is contained in:
Пелипенко Иван
2020-07-31 14:12:47 +03:00
parent 1d5c979607
commit e728b30e5e
7 changed files with 318 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

294
lib/main/code/picodeparser.cpp
View File

@@ -24,7 +24,7 @@
PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const { PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
PIStringList arg_vals; PIStringList arg_vals;
while (!args_.isEmpty()) { while (!args_.isEmpty()) {
int ci = args_.find(","), bi = args_.find("("); int ci = args_.find(','), bi = args_.find('(');
if (ci < 0) { if (ci < 0) {
arg_vals << args_; arg_vals << args_;
break; break;
@@ -33,7 +33,7 @@ PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
if (bi >= 0 && bi < ci) { if (bi >= 0 && bi < ci) {
ca = args_.left(args_.takeLeft(bi).toInt()); ca = args_.left(args_.takeLeft(bi).toInt());
ci -= ca.size_s(); bi -= ca.size_s(); ci -= ca.size_s(); bi -= ca.size_s();
ca += "(" + args_.takeRange("(", ")") + ")"; ca += '(' + args_.takeRange('(', ')') + ')';
} else { } else {
ca = args_.takeLeft(ci); ca = args_.takeLeft(ci);
} }
@@ -41,7 +41,7 @@ PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
args_.trim(); args_.takeLeft(1); args_.trim(); args_.trim(); args_.takeLeft(1); args_.trim();
} }
if (args.size() != arg_vals.size()) { if (args.size() != arg_vals.size()) {
piCout << ("Error: in expansion of macro \"" + name + "(" + args.join(", ") + ")\": expect") piCout << ("Error: in expansion of macro \"" + name + '(' + args.join(", ") + ")\": expect")
<< args.size() << "arguments but takes" << arg_vals.size() << "!"; << args.size() << "arguments but takes" << arg_vals.size() << "!";
if (ok != 0) *ok = false; if (ok != 0) *ok = false;
return PIString(); return PIString();
@@ -57,7 +57,7 @@ PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
if (ind + an.size_s() < ret.size_s()) nc = ret.mid(ind + an.size_s(),1)[0]; if (ind + an.size_s() < ret.size_s()) nc = ret.mid(ind + an.size_s(),1)[0];
if (ppc != '#' && pc == '#' && !_isCChar(nc)) { // to chars if (ppc != '#' && pc == '#' && !_isCChar(nc)) { // to chars
ind--; ind--;
ret.replace(ind, an.size_s() + 1, "\"" + av + "\""); ret.replace(ind, an.size_s() + 1, '\"' + av + '\"');
ind -= an.size_s() - av.size_s() - 1; ind -= an.size_s() - av.size_s() - 1;
continue; continue;
} }
@@ -66,7 +66,7 @@ PIString PICodeParser::Macro::expand(PIString args_, bool * ok) const {
ind -= an.size_s() - av.size_s(); ind -= an.size_s() - av.size_s();
} }
} }
ret.replaceAll("##", ""); ret.replaceAll(PIStringAscii("##"), "");
if (ok != 0) *ok = true; if (ok != 0) *ok = true;
return ret; return ret;
} }
@@ -99,20 +99,20 @@ void PICodeParser::parseFile(const PIString & file, bool follow_includes) {
} }
piCout << "\n\nDefines:"; piCout << "\n\nDefines:";
piForeachC (Define & m, defines) piForeachC (Define & m, defines)
piCout << "define" << m.first << m.second; piCout << PIStringAscii("define") << m.first << m.second;
piCout << "\n\nMacros:"; piCout << "\n\nMacros:";
piForeachC (Macro & m, macros) piForeachC (Macro & m, macros)
piCout << "Macro:" << m.name << m.args << m.value; piCout << "Macro:" << m.name << m.args << m.value;
piCout << "\n\nClasses:"; piCout << "\n\nClasses:";
piCout << "\n\nEnums:"; piCout << "\n\nEnums:";
piForeachC (Enum & c, enums) { piForeachC (Enum & c, enums) {
piCout << "enum" << c.name << c.meta; piCout << PIStringAscii("enum") << c.name << c.meta;
piForeachC (EnumeratorInfo & e, c.members) piForeachC (EnumeratorInfo & e, c.members)
piCout << " " << e.name << "=" << e.value << e.meta; piCout << " " << e.name << "=" << e.value << e.meta;
} }
piCout << "\n\nTypedefs:"; piCout << "\n\nTypedefs:";
piForeachC (Typedef & c, typedefs) piForeachC (Typedef & c, typedefs)
piCout << "typedef" << c;*/ piCout << PIStringAscii("typedef") << c;*/
} }
@@ -122,19 +122,19 @@ void PICodeParser::parseFiles(const PIStringList & files, bool follow_includes)
parseFileInternal(f, follow_includes); parseFileInternal(f, follow_includes);
/*piCout << "\n\nDefines:"; /*piCout << "\n\nDefines:";
piForeachC (Define & m, defines) piForeachC (Define & m, defines)
piCout << "define" << m.first << m.second; piCout << PIStringAscii("define") << m.first << m.second;
piCout << "\n\nMacros:"; piCout << "\n\nMacros:";
piForeachC (Macro & m, macros) piForeachC (Macro & m, macros)
piCout << "Macro:" << m.name << m.args << m.value; piCout << "Macro:" << m.name << m.args << m.value;
piCout << "\n\nClasses:"; piCout << "\n\nClasses:";
piForeachC (Entity * c, entities) piForeachC (Entity * c, entities)
piCout << "class" << c->name << c->parents; piCout << PIStringAscii("class") << c->name << c->parents;
piCout << "\n\nEnums:"; piCout << "\n\nEnums:";
piForeachC (Enum & c, enums) piForeachC (Enum & c, enums)
piCout << "enum" << c.name << c.members; piCout << PIStringAscii("enum") << c.name << c.members;
piCout << "\n\nTypedefs:"; piCout << "\n\nTypedefs:";
piForeachC (Typedef & c, typedefs) piForeachC (Typedef & c, typedefs)
piCout << "typedef" << c;*/ piCout << PIStringAscii("typedef") << c;*/
} }
@@ -153,7 +153,7 @@ bool PICodeParser::parseFileInternal(const PIString & file, bool follow_includes
PIFile f(file, PIIODevice::ReadOnly); PIFile f(file, PIIODevice::ReadOnly);
int ii = 0; int ii = 0;
while (!f.isOpened() && ii < (includes.size_s() - 1)) { while (!f.isOpened() && ii < (includes.size_s() - 1)) {
f.setPath(includes[++ii] + "/" + file); f.setPath(includes[++ii] + '/' + file);
//piCout << "try" << f.path(); //piCout << "try" << f.path();
f.open(PIIODevice::ReadOnly); f.open(PIIODevice::ReadOnly);
} }
@@ -186,7 +186,7 @@ void PICodeParser::clear() {
evaluator.clearCustomVariables(); evaluator.clearCustomVariables();
cur_def_vis = Global; cur_def_vis = Global;
anon_num = 0; anon_num = 0;
defines << Define("PICODE", "") << custom_defines; defines << Define(PIStringAscii("PICODE"), "") << custom_defines;
} }
@@ -197,9 +197,9 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
PIString pfc, line, ccmn, tmp; PIString pfc, line, ccmn, tmp;
PIMap<PIString, PIString> cchars; PIMap<PIString, PIString> cchars;
/// Remove comments, join multiline "*" and replace "*" to $n (cchars) /// Remove comments, join multiline '*' and replace '*' to $n (cchars)
fc.replaceAll("\r\n", "\n"); fc.replaceAll("\r\n", '\n');
fc.replaceAll("\r", "\n"); fc.replaceAll('\r', '\n');
for (int i = 0; i < fc.size_s() - 1; ++i) { for (int i = 0; i < fc.size_s() - 1; ++i) {
if (fc[i].unicode16Code() >= 255) continue; if (fc[i].unicode16Code() >= 255) continue;
if (i > 0) pc = c; if (i > 0) pc = c;
@@ -256,7 +256,7 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
if (ind + m.name.size_s() < pfc.size_s()) nc = pfc.mid(ind + m.name.size_s(),1)[0]; if (ind + m.name.size_s() < pfc.size_s()) nc = pfc.mid(ind + m.name.size_s(),1)[0];
if (_isCChar(pc) || _isCChar(nc) || nc.isDigit()) continue; if (_isCChar(pc) || _isCChar(nc) || nc.isDigit()) continue;
PIString ret, range; bool ok(false); PIString ret, range; bool ok(false);
range = pfc.mid(ind + m.name.size_s()).takeRange("(", ")"); range = pfc.mid(ind + m.name.size_s()).takeRange('(', ')');
ret = m.expand(range, &ok); ret = m.expand(range, &ok);
if (!ok) return false; if (!ok) return false;
int rlen = pfc.find(range, ind + m.name.size_s()) + range.size_s() + 1 - ind; int rlen = pfc.find(range, ind + m.name.size_s()) + range.size_s() + 1 - ind;
@@ -275,20 +275,20 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
if (pl == nl) break; if (pl == nl) break;
pl = nl; pl = nl;
if (pfc.left(9) == "namespace") { if (pfc.left(9) == "namespace") {
pfc.cutLeft(pfc.find("{") + 1); pfc.cutLeft(pfc.find('{') + 1);
continue; continue;
} }
if (pfc.left(8) == "template") { if (pfc.left(8) == "template") {
pfc.cutLeft(8); pfc.cutLeft(8);
pfc.takeRange("<", ">"); pfc.takeRange('<', '>');
bool def = !isDeclaration(pfc, 0, &end); bool def = !isDeclaration(pfc, 0, &end);
pfc.cutLeft(end); pfc.cutLeft(end);
if (def) pfc.takeRange("{", "}"); if (def) pfc.takeRange('{', '}');
else pfc.takeSymbol(); else pfc.takeSymbol();
continue; continue;
} }
if (pfc.left(5) == "class" || pfc.left(6) == "struct" || pfc.left(5) == "union") { if (pfc.left(5) == PIStringAscii("class") || pfc.left(6) == "struct" || pfc.left(5) == "union") {
int dind = pfc.find("{", 0), find = pfc.find(";", 0); int dind = pfc.find('{', 0), find = pfc.find(';', 0);
if (dind < 0 && find < 0) {pfc.cutLeft(6); continue;} if (dind < 0 && find < 0) {pfc.cutLeft(6); continue;}
if (dind < 0 || find < dind) {pfc.cutLeft(6); continue;} if (dind < 0 || find < dind) {pfc.cutLeft(6); continue;}
ccmn = pfc.left(dind) + "{\n" + pfc.mid(dind).takeRange('{', '}') + "\n}\n"; ccmn = pfc.left(dind) + "{\n" + pfc.mid(dind).takeRange('{', '}') + "\n}\n";
@@ -296,24 +296,24 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
parseClass(0, ccmn); parseClass(0, ccmn);
continue; continue;
} }
if (pfc.left(4) == "enum") { if (pfc.left(4) == PIStringAscii("enum")) {
pfc.cutLeft(4); pfc.cutLeft(4);
tmp = pfc.takeCWord(); tmp = pfc.takeCWord();
pfc.trim(); pfc.trim();
MetaMap meta = maybeMeta(pfc); MetaMap meta = maybeMeta(pfc);
parseEnum(0, cur_namespace + tmp, pfc.takeRange("{", "}"), meta); parseEnum(0, cur_namespace + tmp, pfc.takeRange('{', '}'), meta);
pfc.takeSymbol(); pfc.takeSymbol();
continue; continue;
} }
if (pfc.left(7) == "typedef") { if (pfc.left(7) == PIStringAscii("typedef")) {
pfc.cutLeft(7); pfc.cutLeft(7);
typedefs << parseTypedef(pfc.takeLeft(pfc.find(";"))); typedefs << parseTypedef(pfc.takeLeft(pfc.find(';')));
if (typedefs.back().first.isEmpty()) typedefs.pop_back(); if (typedefs.back().first.isEmpty()) typedefs.pop_back();
else root_.typedefs << typedefs.back(); else root_.typedefs << typedefs.back();
pfc.takeSymbol(); pfc.takeSymbol();
continue; continue;
} }
int sci = pfc.find(";", 0), obi = pfc.find("{", 0); int sci = pfc.find(';', 0), obi = pfc.find('{', 0);
if (sci < 0 && obi < 0) { if (sci < 0 && obi < 0) {
pfc.takeLeft(1); pfc.takeLeft(1);
continue; continue;
@@ -323,7 +323,7 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
str = pfc.takeLeft(sci + 1); str = pfc.takeLeft(sci + 1);
} else { } else {
str = pfc.takeLeft(obi); str = pfc.takeLeft(obi);
pfc.cutLeft(pfc.takeRange("{", "}").toInt()); pfc.cutLeft(pfc.takeRange('{', '}').toInt());
} }
parseMember(&root_, str); parseMember(&root_, str);
} }
@@ -333,22 +333,22 @@ bool PICodeParser::parseFileContent(PIString & fc, bool main) {
PICodeParser::Entity * PICodeParser::parseClassDeclaration(const PIString & fc) { PICodeParser::Entity * PICodeParser::parseClassDeclaration(const PIString & fc) {
PIString cd = fc.trimmed().removeAll('\n').replaceAll("\t", " ").replaceAll(" ", " "), pn; PIString cd = fc.trimmed().removeAll('\n').replaceAll('\t', ' ').replaceAll(PIStringAscii(" "), ' '), pn;
MetaMap meta; MetaMap meta;
int ind = cd.find("$M"); int ind = cd.find(PIStringAscii("$M"));
if (ind >= 0) { if (ind >= 0) {
meta = tmp_meta.value(cd.takeMid(ind, 5)); meta = tmp_meta.value(cd.takeMid(ind, 5));
cd.replaceAll(" ", " "); cd.replaceAll(PIStringAscii(" "), ' ');
} }
//piCout << "found class <****\n" << cd << "\n****>"; //piCout << "found class <****\n" << cd << "\n****>";
ind = cd.find(":"); ind = cd.find(':');
PIVector<Entity * > parents; PIVector<Entity * > parents;
if (ind > 0) { if (ind > 0) {
PIStringList pl = cd.takeMid(ind + 1).trim().split(","); PIStringList pl = cd.takeMid(ind + 1).trim().split(',');
cd.cutRight(1); cd.cutRight(1);
Entity * pe = 0; Entity * pe = 0;
piForeachC (PIString & p, pl) { piForeachC (PIString & p, pl) {
if (p.contains(" ")) pn = p.mid(p.find(" ") + 1); if (p.contains(' ')) pn = p.mid(p.find(' ') + 1);
else pn = p; else pn = p;
pe = findEntityByName(pn); pe = findEntityByName(pn);
if (pe == 0) ;//{piCout << "Error: can`t find" << pn;} if (pe == 0) ;//{piCout << "Error: can`t find" << pn;}
@@ -356,11 +356,11 @@ PICodeParser::Entity * PICodeParser::parseClassDeclaration(const PIString & fc)
} }
} }
PIString typename_ = cd.left(6).trim(); PIString typename_ = cd.left(6).trim();
bool is_class = typename_ == "class"; bool is_class = typename_ == PIStringAscii("class");
cur_def_vis = (is_class ? Private : Public); cur_def_vis = (is_class ? Private : Public);
PIString cn = cd.mid(6).trim(); PIString cn = cd.mid(6).trim();
bool has_name = !cn.isEmpty(); bool has_name = !cn.isEmpty();
if (cn.isEmpty()) cn = "<unnamed_" + PIString::fromNumber(anon_num++) + ">"; if (cn.isEmpty()) cn = "<unnamed_" + PIString::fromNumber(anon_num++) + '>';
//piCout << "found " << typename_ << cn; //piCout << "found " << typename_ << cn;
if (cn.isEmpty()) return 0; if (cn.isEmpty()) return 0;
Entity * e = new Entity(); Entity * e = new Entity();
@@ -377,7 +377,7 @@ PICodeParser::Entity * PICodeParser::parseClassDeclaration(const PIString & fc)
PIString PICodeParser::parseClass(Entity * parent, PIString & fc) { PIString PICodeParser::parseClass(Entity * parent, PIString & fc) {
Visibility prev_vis = cur_def_vis; Visibility prev_vis = cur_def_vis;
int dind = fc.find("{"), find = fc.find(";"), end = 0; int dind = fc.find('{'), find = fc.find(';'), end = 0;
if (dind < 0 && find < 0) return PIString(); if (dind < 0 && find < 0) return PIString();
if (dind < 0 || find < dind) return fc.left(find); if (dind < 0 || find < dind) return fc.left(find);
//piCout << "parse class <****\n" << fc.left(20) << "\n****>"; //piCout << "parse class <****\n" << fc.left(20) << "\n****>";
@@ -396,37 +396,37 @@ PIString PICodeParser::parseClass(Entity * parent, PIString & fc) {
while (!fc.isEmpty()) { while (!fc.isEmpty()) {
PIString cw = fc.takeCWord(), tmp; PIString cw = fc.takeCWord(), tmp;
//piCout << "\ntaked word" << cw; //piCout << "\ntaked word" << cw;
if (cw == "public") {cur_def_vis = Public; fc.cutLeft(1); continue;} if (cw == PIStringAscii("public" )) {cur_def_vis = Public; fc.cutLeft(1); continue;}
if (cw == "protected") {cur_def_vis = Protected; fc.cutLeft(1); continue;} if (cw == PIStringAscii("protected")) {cur_def_vis = Protected; fc.cutLeft(1); continue;}
if (cw == "private") {cur_def_vis = Private; fc.cutLeft(1); continue;} if (cw == PIStringAscii("private" )) {cur_def_vis = Private; fc.cutLeft(1); continue;}
if (cw == "class" || cw == "struct" || cw == "union") { if (cw == PIStringAscii("class") || cw == PIStringAscii("struct") || cw == PIStringAscii("union")) {
if (isDeclaration(fc, 0, &end)) { if (isDeclaration(fc, 0, &end)) {
fc.cutLeft(end); fc.cutLeft(end);
fc.takeSymbol(); fc.takeSymbol();
continue; continue;
} }
tmp = fc.takeLeft(fc.find("{")); tmp = fc.takeLeft(fc.find('{'));
stmp = fc.takeRange("{", "}"); stmp = fc.takeRange('{', '}');
fc.takeSymbol(); fc.takeSymbol();
stmp = cw + " " + tmp + "{" + stmp + "}"; stmp = cw + ' ' + tmp + '{' + stmp + '}';
parseClass(ce, stmp); parseClass(ce, stmp);
continue; continue;
} }
if (cw == "enum") { if (cw == PIStringAscii("enum")) {
tmp = fc.takeCWord(); tmp = fc.takeCWord();
fc.trim(); fc.trim();
MetaMap meta = maybeMeta(fc); MetaMap meta = maybeMeta(fc);
parseEnum(ce, cur_namespace + tmp, fc.takeRange("{", "}"), meta); parseEnum(ce, cur_namespace + tmp, fc.takeRange('{', '}'), meta);
fc.takeSymbol(); fc.takeSymbol();
continue; continue;
} }
if (cw == "friend") {fc.cutLeft(fc.find(";") + 1); continue;} if (cw == PIStringAscii("friend")) {fc.cutLeft(fc.find(';') + 1); continue;}
if (cw == "typedef") {ce->typedefs << parseTypedef(fc.takeLeft(fc.find(";"))); typedefs << ce->typedefs.back(); typedefs.back().first.insert(0, cur_namespace); if (ce->typedefs.back().first.isEmpty()) ce->typedefs.pop_back(); fc.takeSymbol(); continue;} if (cw == PIStringAscii("typedef")) {ce->typedefs << parseTypedef(fc.takeLeft(fc.find(';'))); typedefs << ce->typedefs.back(); typedefs.back().first.insert(0, cur_namespace); if (ce->typedefs.back().first.isEmpty()) ce->typedefs.pop_back(); fc.takeSymbol(); continue;}
if (cw == "template") { if (cw == "template") {
fc.takeRange("<", ">"); fc.takeRange('<', '>');
def = !isDeclaration(fc, 0, &end); def = !isDeclaration(fc, 0, &end);
fc.cutLeft(end); fc.cutLeft(end);
if (def) fc.takeRange("{", "}"); if (def) fc.takeRange('{', '}');
else fc.takeSymbol(); else fc.takeSymbol();
continue; continue;
} }
@@ -434,7 +434,7 @@ PIString PICodeParser::parseClass(Entity * parent, PIString & fc) {
tmp = (cw + fc.takeLeft(end)).trim(); tmp = (cw + fc.takeLeft(end)).trim();
if (!tmp.isEmpty()) if (!tmp.isEmpty())
parseMember(ce, tmp); parseMember(ce, tmp);
if (def) fc.takeRange("{", "}"); if (def) fc.takeRange('{', '}');
else fc.takeSymbol(); else fc.takeSymbol();
if (ps == fc.size_s()) {fc.cutLeft(1);} if (ps == fc.size_s()) {fc.cutLeft(1);}
ps = fc.size_s(); ps = fc.size_s();
@@ -448,13 +448,13 @@ PIString PICodeParser::parseClass(Entity * parent, PIString & fc) {
PICodeParser::MetaMap PICodeParser::parseMeta(PIString & fc) { PICodeParser::MetaMap PICodeParser::parseMeta(PIString & fc) {
PICodeParser::MetaMap ret; PICodeParser::MetaMap ret;
if (fc.isEmpty()) return ret; if (fc.isEmpty()) return ret;
PIStringList ml = fc.split(","); PIStringList ml = fc.split(',');
piForeachC (PIString & m, ml) { piForeachC (PIString & m, ml) {
int i = m.find("="); int i = m.find("=");
if (i < 0) continue; if (i < 0) continue;
PIString mv = m.mid(i + 1).trim(); PIString mv = m.mid(i + 1).trim();
if (mv.startsWith("\"")) mv.cutLeft(1); if (mv.startsWith('\"')) mv.cutLeft(1);
if (mv.endsWith("\"")) mv.cutRight(1); if (mv.endsWith('\"')) mv.cutRight(1);
ret[m.left(i).trim()] = mv; ret[m.left(i).trim()] = mv;
} }
//piCout << ms << ret; //piCout << ms << ret;
@@ -463,18 +463,18 @@ PICodeParser::MetaMap PICodeParser::parseMeta(PIString & fc) {
bool PICodeParser::parseEnum(Entity * parent, const PIString & name, PIString fc, const MetaMap & meta) { bool PICodeParser::parseEnum(Entity * parent, const PIString & name, PIString fc, const MetaMap & meta) {
//piCout << "enum" << name << fc; //piCout << PIStringAscii("enum") << name << fc;
Enum e(name); Enum e(name);
e.meta = meta; e.meta = meta;
PIStringList vl(fc.split(",")); PIStringList vl(fc.split(','));
PIString vn; PIString vn;
int cv = -1, ind = 0; int cv = -1, ind = 0;
piForeach (PIString & v, vl) { piForeach (PIString & v, vl) {
MetaMap meta; MetaMap meta;
int mi = v.find("$M"); int mi = v.find(PIStringAscii("$M"));
if (mi >= 0) { if (mi >= 0) {
meta = tmp_meta.value(v.takeMid(mi, 5)); meta = tmp_meta.value(v.takeMid(mi, 5));
v.replaceAll(" ", " "); v.replaceAll(" ", ' ');
} }
vn = v; ind = v.find("="); vn = v; ind = v.find("=");
if (ind > 0) {cv = v.right(v.size_s() - ind - 1).toInt(); vn = v.left(ind);} if (ind > 0) {cv = v.right(v.size_s() - ind - 1).toInt(); vn = v.left(ind);}
@@ -492,15 +492,15 @@ bool PICodeParser::parseEnum(Entity * parent, const PIString & name, PIString fc
PICodeParser::Typedef PICodeParser::parseTypedef(PIString fc) { PICodeParser::Typedef PICodeParser::parseTypedef(PIString fc) {
//piCout << "parse typedef" << fc; //piCout << "parse typedef" << fc;
Typedef td; Typedef td;
fc.replaceAll("\t", " "); fc.replaceAll('\t', ' ');
if (fc.contains("(")) { if (fc.contains('(')) {
int start = fc.find("("), end = fc.find(")"); int start = fc.find('('), end = fc.find(')');
td.first = fc.takeMid(start + 1, end - start - 1).trim(); td.first = fc.takeMid(start + 1, end - start - 1).trim();
if (td.first.left(1) == "*") {td.first.cutLeft(1).trim(); fc.insert(start + 1, "*");} if (td.first.left(1) == PIChar('*')) {td.first.cutLeft(1).trim(); fc.insert(start + 1, '*');}
td.second = fc.trim(); td.second = fc.trim();
} else { } else {
td.first = fc.takeMid(fc.findLast(" ")).trim(); td.first = fc.takeMid(fc.findLast(' ')).trim();
td.second = fc.trim(); td.second = fc.trim();
} }
//piCout << "found typedef" << td; //piCout << "found typedef" << td;
@@ -513,30 +513,30 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
if (fc.find("operator") >= 0) return true; if (fc.find("operator") >= 0) return true;
tmp_temp.clear(); tmp_temp.clear();
//piCout << "parse member" << fc; //piCout << "parse member" << fc;
int ts = fc.find("<"), te = 0; int ts = fc.find('<'), te = 0;
PIString ctemp, crepl; PIString ctemp, crepl;
while (ts >= 0) { while (ts >= 0) {
ctemp = fc.mid(ts).takeRange("<", ">"); ctemp = fc.mid(ts).takeRange('<', '>');
if (ctemp.isEmpty()) {te = ts + 1; ts = fc.find("<", te); continue;} if (ctemp.isEmpty()) {te = ts + 1; ts = fc.find('<', te); continue;}
crepl = "$T" + PIString::fromNumber(tmp_temp.size_s()).expandLeftTo(3, "0"); crepl = PIStringAscii("$T") + PIString::fromNumber(tmp_temp.size_s()).expandLeftTo(3, '0');
fc.replace(ts, ctemp.size_s() + 2, crepl); fc.replace(ts, ctemp.size_s() + 2, crepl);
tmp_temp[crepl] = "<" + ctemp + ">"; tmp_temp[crepl] = '<' + ctemp + '>';
ts = fc.find("<", te); ts = fc.find('<', te);
} }
fc.replaceAll("\n", " ").replaceAll("\t", " ").replaceAll(" ", " ").replaceAll(", ", ",").replaceAll(" (", "(").replaceAll(" $M", "$M"); fc.replaceAll('\n', ' ').replaceAll('\t', ' ').replaceAll(" ", ' ').replaceAll(", ", ',').replaceAll(PIStringAscii(" ("), '(').replaceAll(PIStringAscii(" $M"), PIStringAscii("$M"));
//piCout << "parse member" << fc; //piCout << "parse member" << fc;
PIStringList tl, al; PIStringList tl, al;
Member me; Member me;
//piCout << fc; //piCout << fc;
if (fc.contains("(")) { if (fc.contains('(')) {
MetaMap meta; MetaMap meta;
int ind = fc.find("$M"); int ind = fc.find(PIStringAscii("$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(" ", " ").replaceAll(" (", "("); fc.replaceAll(PIStringAscii(" "), ' ').replaceAll(PIStringAscii(" ("), '(');
} }
fc.cutRight(fc.size_s() - fc.findLast(")") - 1); fc.cutRight(fc.size_s() - fc.findLast(')') - 1);
te = fc.find("("); te = fc.find('(');
//piCout << fc; //piCout << fc;
for (ts = te - 1; ts >= 0; --ts) for (ts = te - 1; ts >= 0; --ts)
if (!_isCChar(fc[ts]) && !(fc[ts].isDigit())) break; if (!_isCChar(fc[ts]) && !(fc[ts].isDigit())) break;
@@ -544,20 +544,20 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
me.meta = meta; me.meta = meta;
me.name = fc.takeMid(ts + 1, te - ts - 1); me.name = fc.takeMid(ts + 1, te - ts - 1);
if (me.name == parent->name) return true; if (me.name == parent->name) return true;
me.arguments_full = fc.takeMid(ts + 2).cutRight(1).split(","); me.arguments_full = fc.takeMid(ts + 2).cutRight(1).split(',');
me.type = fc.cutRight(1).trim(); me.type = fc.cutRight(1).trim();
me.visibility = cur_def_vis; me.visibility = cur_def_vis;
if (me.type.find("inline ") >= 0) { if (me.type.find(PIStringAscii("inline ")) >= 0) {
me.attributes |= Inline; me.attributes |= Inline;
me.type.removeAll("inline "); me.type.removeAll(PIStringAscii("inline "));
} }
if (me.type.find("static ") >= 0) { if (me.type.find(PIStringAscii("static ")) >= 0) {
me.attributes |= Static; me.attributes |= Static;
me.type.removeAll("static "); me.type.removeAll(PIStringAscii("static "));
} }
if (me.type.find("virtual ") >= 0) { if (me.type.find(PIStringAscii("virtual ")) >= 0) {
me.attributes |= Virtual; me.attributes |= Virtual;
me.type.removeAll("virtual "); me.type.removeAll(PIStringAscii("virtual "));
} }
normalizeEntityNamespace(me.type); normalizeEntityNamespace(me.type);
int i = 0; int i = 0;
@@ -566,15 +566,15 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
if ((i = a.find("=")) > 0) if ((i = a.find("=")) > 0)
a.cutRight(a.size_s() - i).trim(); a.cutRight(a.size_s() - i).trim();
for (int j = 0; j < me.arguments_full.size_s(); ++j) for (int j = 0; j < me.arguments_full.size_s(); ++j)
if (me.arguments_full[j] == "void") { if (me.arguments_full[j] == PIStringAscii("void")) {
me.arguments_full.remove(j); me.arguments_full.remove(j);
--j; --j;
} }
me.arguments_type = me.arguments_full; me.arguments_type = me.arguments_full;
piForeach (PIString & a, me.arguments_type) { piForeach (PIString & a, me.arguments_type) {
crepl.clear(); crepl.clear();
if (a.contains("[")) if (a.contains('['))
crepl = a.takeMid(a.find("["), a.findLast("]") - a.find("[") + 1); crepl = a.takeMid(a.find('['), a.findLast(']') - a.find('[') + 1);
for (ts = a.size_s() - 1; ts >= 0; --ts) for (ts = a.size_s() - 1; ts >= 0; --ts)
if (!_isCChar(a[ts]) && !(a[ts].isDigit())) break; if (!_isCChar(a[ts]) && !(a[ts].isDigit())) break;
a.cutRight(a.size_s() - ts - 1); a.cutRight(a.size_s() - ts - 1);
@@ -586,18 +586,18 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
//piCout << "func" << me.type << me.name << me.arguments_full << me.arguments_type; //piCout << "func" << me.type << me.name << me.arguments_full << me.arguments_type;
parent->functions << me; parent->functions << me;
} else { } else {
if (fc.endsWith(";")) fc.cutRight(1); if (fc.endsWith(';')) fc.cutRight(1);
if (fc.startsWith("using") || !(fc.contains(' ') || fc.contains('\t') || fc.contains('\n'))) return true; if (fc.startsWith(PIStringAscii("using")) || !(fc.contains(' ') || fc.contains('\t') || fc.contains('\n'))) return true;
int bits = extractMemberBits(fc); int bits = extractMemberBits(fc);
tl = fc.split(","); tl = fc.split(',');
//piCout << "member" << fc << tl; //piCout << "member" << fc << tl;
//piCout << "member after eb" << fc << ", bits =" << bits; //piCout << "member after eb" << fc << ", bits =" << bits;
if (tl.isEmpty()) return true; if (tl.isEmpty()) return true;
bool vn = true; bool vn = true;
ctemp = tl.front().trim(); ctemp = tl.front().trim();
PIString meta_t; PIString meta_t;
if (ctemp.contains("$M")) if (ctemp.contains(PIStringAscii("$M")))
meta_t = ctemp.takeMid(ctemp.find("$M")); meta_t = ctemp.takeMid(ctemp.find(PIStringAscii("$M")));
for (ts = ctemp.size_s() - 1; ts > 0; --ts) { for (ts = ctemp.size_s() - 1; ts > 0; --ts) {
if (vn) {if (!_isCChar(ctemp[ts]) && !ctemp[ts].isDigit() && ctemp[ts] != '[' && ctemp[ts] != ']') vn = false;} if (vn) {if (!_isCChar(ctemp[ts]) && !ctemp[ts].isDigit() && ctemp[ts] != '[' && ctemp[ts] != ']') vn = false;}
else {if (_isCChar(ctemp[ts]) || ctemp[ts].isDigit()) break;} else {if (_isCChar(ctemp[ts]) || ctemp[ts].isDigit()) break;}
@@ -606,26 +606,26 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
me.visibility = cur_def_vis; me.visibility = cur_def_vis;
ctemp += meta_t; ctemp += meta_t;
restoreTmpTemp(&me); restoreTmpTemp(&me);
PIString type = " " + me.type; PIString type = PIStringAscii(" ") + me.type;
if (type.find(" const ") >= 0) { if (type.find(PIStringAscii(" const ")) >= 0) {
me.attributes |= Const; me.attributes |= Const;
type.replaceAll(" const ", " "); type.replaceAll(PIStringAscii(" const "), ' ');
} }
if (type.find(" static ") >= 0) { if (type.find(PIStringAscii(" static ")) >= 0) {
me.attributes |= Static; me.attributes |= Static;
type.replaceAll(" static ", " "); type.replaceAll(PIStringAscii(" static "), ' ');
} }
if (type.find(" mutable ") >= 0) { if (type.find(PIStringAscii(" mutable ")) >= 0) {
me.attributes |= Mutable; me.attributes |= Mutable;
type.replaceAll(" mutable ", " "); type.replaceAll(PIStringAscii(" mutable "), ' ');
} }
if (type.find(" volatile ") >= 0) { if (type.find(PIStringAscii(" volatile ")) >= 0) {
me.attributes |= Volatile; me.attributes |= Volatile;
type.replaceAll(" volatile ", " "); type.replaceAll(PIStringAscii(" volatile "), ' ');
} }
if (type.find(" extern ") >= 0) { if (type.find(PIStringAscii(" extern ")) >= 0) {
me.attributes |= Extern; me.attributes |= Extern;
type.replaceAll(" extern ", " "); type.replaceAll(PIStringAscii(" extern "), ' ');
} }
type.trim(); type.trim();
normalizeEntityNamespace(type); normalizeEntityNamespace(type);
@@ -637,15 +637,15 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
me.type = type; me.type = type;
restoreTmpMeta(&me); restoreTmpMeta(&me);
if (me.name.isEmpty()) continue; if (me.name.isEmpty()) continue;
if (me.name.contains("[")) if (me.name.contains('['))
crepl = me.name.takeMid(me.name.find("["), me.name.findLast("]") - me.name.find("[") + 1); crepl = me.name.takeMid(me.name.find('['), me.name.findLast(']') - me.name.find('[') + 1);
while (!me.name.isEmpty()) { while (!me.name.isEmpty()) {
if (me.name.front() == "*" || me.name.front() == "&") { if (me.name.front() == PIChar('*') || me.name.front() == PIChar('&')) {
me.type += me.name.takeLeft(1); me.type += me.name.takeLeft(1);
me.name.trim(); me.name.trim();
} else break; } else break;
} }
me.is_type_ptr = (me.type.right(1) == "]" || me.type.right(1) == "*"); me.is_type_ptr = (me.type.right(1) == PIChar(']') || me.type.right(1) == PIChar('*'));
me.type += crepl; me.type += crepl;
me.bits = bits; me.bits = bits;
while (!crepl.isEmpty()) { while (!crepl.isEmpty()) {
@@ -664,7 +664,7 @@ bool PICodeParser::parseMember(Entity * parent, PIString & fc) {
int PICodeParser::extractMemberBits(PIString & fc) { int PICodeParser::extractMemberBits(PIString & fc) {
int i = fc.findLast(":"); int i = fc.findLast(':');
if (i <= 0) return -1; if (i <= 0) return -1;
if (fc[i - 1].toAscii() == ':') return -1; if (fc[i - 1].toAscii() == ':') return -1;
PIString bs = fc.takeMid(i).mid(1).trim(); PIString bs = fc.takeMid(i).mid(1).trim();
@@ -681,11 +681,11 @@ void PICodeParser::normalizeEntityNamespace(PIString & n) {
n.cutRight(suff.size_s()); n.cutRight(suff.size_s());
break; break;
} }
n.push_front(" "); n.push_front(' ');
if (n.find(" static ") >= 0) {n.replaceAll(" static ", ""); pref += "static ";} if (n.find(PIStringAscii(" static ")) >= 0) {n.replaceAll(PIStringAscii(" static "), ""); pref += PIStringAscii("static ");}
if (n.find(" const ") >= 0) {n.replaceAll(" const ", ""); pref += "const ";} if (n.find(PIStringAscii(" const ")) >= 0) {n.replaceAll(PIStringAscii(" const "), ""); pref += PIStringAscii("const ");}
if (n.find(" mutable ") >= 0) {n.replaceAll(" mutable ", ""); pref += "mutable ";} if (n.find(PIStringAscii(" mutable ")) >= 0) {n.replaceAll(PIStringAscii(" mutable "), ""); pref += PIStringAscii("mutable ");}
if (n.find(" volatile ") >= 0) {n.replaceAll(" volatile ", ""); pref += "volatile ";} if (n.find(PIStringAscii(" volatile ")) >= 0) {n.replaceAll(PIStringAscii(" volatile "), ""); pref += PIStringAscii("volatile ");}
n.trim(); n.trim();
int f = 0; int f = 0;
piForeachC (Entity * e, entities) { piForeachC (Entity * e, entities) {
@@ -694,7 +694,7 @@ void PICodeParser::normalizeEntityNamespace(PIString & n) {
return; return;
} }
if ((f = e->name.find(n)) >= 0) if ((f = e->name.find(n)) >= 0)
if (e->name.mid(f - 1, 1) == ":") if (e->name.mid(f - 1, 1) == PIChar(':'))
if (e->name.find(cur_namespace) >= 0) { if (e->name.find(cur_namespace) >= 0) {
n = pref + e->name + suff; n = pref + e->name + suff;
return; return;
@@ -702,7 +702,7 @@ void PICodeParser::normalizeEntityNamespace(PIString & n) {
} }
piForeachC (Enum & e, enums) piForeachC (Enum & e, enums)
if ((f = e.name.find(n)) >= 0) if ((f = e.name.find(n)) >= 0)
if (e.name.mid(f - 1, 1) == ":") if (e.name.mid(f - 1, 1) == PIChar(':'))
if (e.name.find(cur_namespace) >= 0) { if (e.name.find(cur_namespace) >= 0) {
//piCout << "change" << n << "to" << e.name + suff; //piCout << "change" << n << "to" << e.name + suff;
n = pref + e.name + suff; n = pref + e.name + suff;
@@ -710,7 +710,7 @@ void PICodeParser::normalizeEntityNamespace(PIString & n) {
} }
piForeachC (Typedef & e, typedefs) piForeachC (Typedef & e, typedefs)
if ((f = e.first.find(n)) >= 0) if ((f = e.first.find(n)) >= 0)
if (e.first.mid(f - 1, 1) == ":") if (e.first.mid(f - 1, 1) == PIChar(':'))
if (e.first.find(cur_namespace) >= 0) { if (e.first.find(cur_namespace) >= 0) {
//piCout << "change" << n << "to" << e.name + suff; //piCout << "change" << n << "to" << e.name + suff;
n = pref + e.first + suff; n = pref + e.first + suff;
@@ -723,20 +723,20 @@ void PICodeParser::normalizeEntityNamespace(PIString & n) {
void PICodeParser::restoreTmpTemp(Member * e) { void PICodeParser::restoreTmpTemp(Member * e) {
int i = 0; int i = 0;
piForeach (PIString & a, e->arguments_full) { piForeach (PIString & a, e->arguments_full) {
while ((i = a.find("$T")) >= 0) while ((i = a.find(PIStringAscii("$T"))) >= 0)
a.replace(i, 5, tmp_temp[a.mid(i, 5)]); a.replace(i, 5, tmp_temp[a.mid(i, 5)]);
} }
piForeach (PIString & a, e->arguments_type) { piForeach (PIString & a, e->arguments_type) {
while ((i = a.find("$T")) >= 0) while ((i = a.find(PIStringAscii("$T"))) >= 0)
a.replace(i, 5, tmp_temp[a.mid(i, 5)]); a.replace(i, 5, tmp_temp[a.mid(i, 5)]);
} }
while ((i = e->type.find("$T")) >= 0) while ((i = e->type.find(PIStringAscii("$T"))) >= 0)
e->type.replace(i, 5, tmp_temp[e->type.mid(i, 5)]); e->type.replace(i, 5, tmp_temp[e->type.mid(i, 5)]);
} }
void PICodeParser::restoreTmpMeta(PICodeParser::Member * e) { void PICodeParser::restoreTmpMeta(PICodeParser::Member * e) {
int i = e->name.find("$M"); int i = e->name.find(PIStringAscii("$M"));
if (i < 0) return; if (i < 0) return;
e->meta = tmp_meta[e->name.takeMid(i, 5)]; e->meta = tmp_meta[e->name.takeMid(i, 5)];
} }
@@ -744,7 +744,7 @@ void PICodeParser::restoreTmpMeta(PICodeParser::Member * e) {
PICodeParser::MetaMap PICodeParser::maybeMeta(PIString & fc) { PICodeParser::MetaMap PICodeParser::maybeMeta(PIString & fc) {
PICodeParser::MetaMap ret; PICodeParser::MetaMap ret;
if (fc.left(2) == "$M") { if (fc.left(2) == PIStringAscii("$M")) {
ret = tmp_meta.value(fc.takeLeft(5)); ret = tmp_meta.value(fc.takeLeft(5));
fc.trim(); fc.trim();
} }
@@ -754,10 +754,10 @@ PICodeParser::MetaMap PICodeParser::maybeMeta(PIString & fc) {
bool PICodeParser::macroCondition(const PIString & mif, PIString mifcond) { bool PICodeParser::macroCondition(const PIString & mif, PIString mifcond) {
//piCout << "macroCondition" << mif << mifcond; //piCout << "macroCondition" << mif << mifcond;
if (mif == "ifdef") return isDefineExists(mifcond); if (mif == PIStringAscii("ifdef")) return isDefineExists(mifcond);
if (mif == "ifndef") return !isDefineExists(mifcond); if (mif == PIStringAscii("ifndef")) return !isDefineExists(mifcond);
if (mif == "if" || mif == "elif") { if (mif == PIStringAscii("if") || mif == PIStringAscii("elif")) {
mifcond.removeAll(" ").removeAll("\t"); mifcond.removeAll(' ').removeAll('\t');
return procMacrosCond(mifcond) > 0.; return procMacrosCond(mifcond) > 0.;
} }
return false; return false;
@@ -770,7 +770,7 @@ double PICodeParser::procMacrosCond(PIString fc) {
int oper = 0, ps = -1; int oper = 0, ps = -1;
char cc, nc; char cc, nc;
PIString ce; PIString ce;
fc.removeAll("defined"); fc.removeAll(PIStringAscii("defined"));
//piCout << "procMacrosCond" << fc; //piCout << "procMacrosCond" << fc;
while (!fc.isEmpty()) { while (!fc.isEmpty()) {
cc = fc[0].toAscii(); cc = fc[0].toAscii();
@@ -825,17 +825,17 @@ double PICodeParser::defineValue(const PIString & dn) {
void PICodeParser::replaceMeta(PIString & dn) { void PICodeParser::replaceMeta(PIString & dn) {
tmp_meta.clear(); tmp_meta.clear();
if (dn.isEmpty()) return; if (dn.isEmpty()) return;
int s = dn.find("PIMETA"); int s = dn.find(PIStringAscii("PIMETA"));
while (s >= 0) { while (s >= 0) {
int ms = 0, ml = 0; int ms = 0, ml = 0;
ms = dn.findRange('(', ')', '\\', s + 6, &ml); ms = dn.findRange('(', ')', '\\', s + 6, &ml);
if (ms < 0) return; if (ms < 0) return;
PIString meta = dn.mid(ms, ml).trim(); PIString meta = dn.mid(ms, ml).trim();
PIString rm = "$M" + PIString::fromNumber(tmp_meta.size_s()).expandLeftTo(3, "0"); PIString rm = PIStringAscii("$M") + PIString::fromNumber(tmp_meta.size_s()).expandLeftTo(3, '0');
dn.replace(s, ms + ml + 1 - s, rm); dn.replace(s, ms + ml + 1 - s, rm);
//piCout << "FOUND META \"" << meta << "\""; //piCout << "FOUND META \"" << meta << '\"';
tmp_meta[rm] = parseMeta(meta); tmp_meta[rm] = parseMeta(meta);
s = dn.find("PIMETA"); s = dn.find(PIStringAscii("PIMETA"));
} }
} }
@@ -849,7 +849,7 @@ PICodeParser::Entity * PICodeParser::findEntityByName(const PIString & en) {
bool PICodeParser::isDeclaration(const PIString & fc, int start, int * end) { bool PICodeParser::isDeclaration(const PIString & fc, int start, int * end) {
int dind = fc.find("{", start), find = fc.find(";", start); int dind = fc.find('{', start), find = fc.find(';', start);
//piCout << "isDeclaration" << dind << find << fc.left(10); //piCout << "isDeclaration" << dind << find << fc.left(10);
if (dind < 0 && find < 0) {if (end) *end = -1; return true;} if (dind < 0 && find < 0) {if (end) *end = -1; return true;}
if (dind < 0 || find < dind) {if (end) *end = find; return true;} if (dind < 0 || find < dind) {if (end) *end = find; return true;}
@@ -866,11 +866,11 @@ bool PICodeParser::isMainFile(const PIString & fc) {
if (csi < 0) csi = fc.find("\nmain", si); if (csi < 0) csi = fc.find("\nmain", si);
if (csi < 0) return false; if (csi < 0) return false;
si = csi; si = csi;
int fi = fc.find("(", si + 5); int fi = fc.find('(', si + 5);
if (fi < 0) return false; if (fi < 0) return false;
if (fi - si < 10) { if (fi - si < 10) {
PIString ms(fc.mid(si, fi - si + 1)); PIString ms(fc.mid(si, fi - si + 1));
ms.removeAll(" ").removeAll("\t").removeAll("\n"); ms.removeAll(' ').removeAll('\t').removeAll('\n');
if (ms == "main(") return true; if (ms == "main(") return true;
} }
si += 5; si += 5;
@@ -885,17 +885,17 @@ PIString PICodeParser::procMacros(PIString fc) {
bool grab = false, skip = false, cond_ok = false; bool grab = false, skip = false, cond_ok = false;
PIString pfc, nfc, line, mif, mifcond; PIString pfc, nfc, line, mif, mifcond;
//piCout << "procMacros\n<******" << fc << "\n******>"; //piCout << "procMacros\n<******" << fc << "\n******>";
fc += "\n"; fc += '\n';
while (!fc.isEmpty()) { while (!fc.isEmpty()) {
line = fc.takeLine().trimmed(); line = fc.takeLine().trimmed();
if (line.left(1) == "#") { if (line.left(1) == PIChar('#')) {
mifcond = line.mid(1); mifcond = line.mid(1);
mif = mifcond.takeCWord(); mif = mifcond.takeCWord();
//piCout << mif; //piCout << mif;
//piCout << "mif mifcond" << mif << mifcond << ifcnt; //piCout << "mif mifcond" << mif << mifcond << ifcnt;
if (skip || grab) { if (skip || grab) {
if (mif.left(2) == "if") ifcnt++; if (mif.left(2) == PIStringAscii("if")) ifcnt++;
if (mif.left(5) == "endif") { if (mif.left(5) == PIStringAscii("endif")) {
if (ifcnt > 0) ifcnt--; if (ifcnt > 0) ifcnt--;
else { else {
//piCout << "main endif" << skip << grab; //piCout << "main endif" << skip << grab;
@@ -904,7 +904,7 @@ PIString PICodeParser::procMacros(PIString fc) {
continue; continue;
} }
} }
if (mif.left(4) == "elif" && ifcnt == 0) { if (mif.left(4) == PIStringAscii("elif") && ifcnt == 0) {
//piCout << "main elif" << skip << grab << cond_ok; //piCout << "main elif" << skip << grab << cond_ok;
if (cond_ok) { if (cond_ok) {
if (grab) { if (grab) {
@@ -929,10 +929,10 @@ PIString PICodeParser::procMacros(PIString fc) {
else {skip = true; grab = false;} else {skip = true; grab = false;}
continue; continue;
} }
if (grab) nfc << line << "\n"; if (grab) nfc << line << '\n';
continue; continue;
} }
if (mif.left(2) == "if") { if (mif.left(2) == PIStringAscii("if")) {
//piCout << "main if"; //piCout << "main if";
skip = grab = cond_ok = false; skip = grab = cond_ok = false;
if (macroCondition(mif, mifcond.trimmed())) grab = cond_ok = true; if (macroCondition(mif, mifcond.trimmed())) grab = cond_ok = true;
@@ -944,8 +944,8 @@ PIString PICodeParser::procMacros(PIString fc) {
//return false; /// WARNING: now skip errors //return false; /// WARNING: now skip errors
} }
} else { } else {
if (grab) nfc << line << "\n"; if (grab) nfc << line << '\n';
else if (!skip) pfc << line << "\n"; else if (!skip) pfc << line << '\n';
} }
} }
return pfc; return pfc;
@@ -957,20 +957,20 @@ bool PICodeParser::parseDirective(PIString d) {
PIString dname = d.takeCWord(); PIString dname = d.takeCWord();
//piCout << "parseDirective" << d; //piCout << "parseDirective" << d;
if (dname == "include") { if (dname == "include") {
d.replaceAll("<", "\"").replaceAll(">", "\""); d.replaceAll('<', '\"').replaceAll('>', '\"');
PIString cf = cur_file, ifc = d.takeRange("\"", "\""); PIString cf = cur_file, ifc = d.takeRange('\"', '\"');
if (with_includes) { if (with_includes) {
bool ret = parseFileInternal(ifc, with_includes); bool ret = parseFileInternal(ifc, with_includes);
cur_file = cf; cur_file = cf;
return ret; return ret;
} }
} }
if (dname == "define") { if (dname == PIStringAscii("define")) {
PIString mname = d.takeCWord(); PIString mname = d.takeCWord();
//piCout << mname; //piCout << mname;
if (mname == "PIMETA") return true; if (mname == PIStringAscii("PIMETA")) return true;
if (d.left(1) == "(") { // macro if (d.left(1) == PIChar('(')) { // macro
PIStringList args = d.takeRange("(", ")").split(",").trim(); PIStringList args = d.takeRange('(', ')').split(',').trim();
macros << Macro(mname, d.trim(), args); macros << Macro(mname, d.trim(), args);
} else { // define } else { // define
d.trim(); d.trim();

151
lib/main/core/pistring.cpp
View File

@@ -173,7 +173,7 @@ PIString PIString::dtos(const double num, char format, int precision) {
PIString PIString::fromNumberBaseS(const llong value, int base, bool * ok) { PIString PIString::fromNumberBaseS(const llong value, int base, bool * ok) {
if (value == 0LL) return PIString("0"); if (value == 0LL) return PIString('0');
if (base < 2 || base > 40) {if (ok != 0) *ok = false; return PIString();} if (base < 2 || base > 40) {if (ok != 0) *ok = false; return PIString();}
if (ok != 0) *ok = true; if (ok != 0) *ok = true;
if (base == 10) return lltos(value); if (base == 10) return lltos(value);
@@ -192,7 +192,7 @@ PIString PIString::fromNumberBaseS(const llong value, int base, bool * ok) {
} }
PIString PIString::fromNumberBaseU(const ullong value, int base, bool * ok) { PIString PIString::fromNumberBaseU(const ullong value, int base, bool * ok) {
if (value == 0ULL) return PIString("0"); if (value == 0ULL) return PIString('0');
if (base < 2 || base > 40) {if (ok != 0) *ok = false; return PIString();} if (base < 2 || base > 40) {if (ok != 0) *ok = false; return PIString();}
if (ok != 0) *ok = true; if (ok != 0) *ok = true;
if (base == 10) return ulltos(value); if (base == 10) return ulltos(value);
@@ -211,9 +211,10 @@ PIString PIString::fromNumberBaseU(const ullong value, int base, bool * ok) {
llong PIString::toNumberBase(const PIString & value, int base, bool * ok) { llong PIString::toNumberBase(const PIString & value, int base, bool * ok) {
static const PIString s_0x = PIStringAscii("0x");
PIString v = value.trimmed(); PIString v = value.trimmed();
if (base < 0) { if (base < 0) {
int ind = v.find("0x"); int ind = v.find(s_0x);
if (ind == 0 || ind == 1) {v.remove(ind, 2); base = 16;} if (ind == 0 || ind == 1) {v.remove(ind, 2); base = 16;}
else base = 10; else base = 10;
} else } else
@@ -254,6 +255,7 @@ void PIString::appendFromChars(const char * c, int s, const char * codepage) {
int sz = ucnv_toUChars(cc, ucs, s, c, s, &e); int sz = ucnv_toUChars(cc, ucs, s, c, s, &e);
//printf("appendFromChars %d -> %d\n", s, sz); //printf("appendFromChars %d -> %d\n", s, sz);
//printf("PIString %d -> %d\n", c[0], ucs[0]); //printf("PIString %d -> %d\n", c[0], ucs[0]);
reserve(size_s() + sz);
for (int i = 0; i < sz; ++i) for (int i = 0; i < sz; ++i)
push_back(PIChar(ucs[i])); push_back(PIChar(ucs[i]));
delete[] ucs; delete[] ucs;
@@ -264,11 +266,9 @@ void PIString::appendFromChars(const char * c, int s, const char * codepage) {
# ifdef WINDOWS # ifdef WINDOWS
sz = MultiByteToWideChar((uint)(uintptr_t)codepage, MB_ERR_INVALID_CHARS, c, s, 0, 0); sz = MultiByteToWideChar((uint)(uintptr_t)codepage, MB_ERR_INVALID_CHARS, c, s, 0, 0);
if (sz <= 0) return; if (sz <= 0) return;
wchar_t * buffer = new wchar_t[sz]; int old_sz = size_s();
MultiByteToWideChar((uint)(uintptr_t)codepage, MB_ERR_INVALID_CHARS, c, s, buffer, sz); enlarge(sz);
for (int i = 0; i < sz; ++i) MultiByteToWideChar((uint)(uintptr_t)codepage, MB_ERR_INVALID_CHARS, c, s, (LPWSTR)PIDeque<PIChar>::data(old_sz), sz);
push_back(PIChar((ushort)buffer[i]));
delete[] buffer;
return; return;
//printf("request %d\n", sz); //printf("request %d\n", sz);
# else # else
@@ -330,9 +330,14 @@ PIString PIString::fromAscii(const char * s) {
PIString ret; PIString ret;
int l = 0; int l = 0;
while (s[l] != '\0') { while (s[l] != '\0') {
ret.push_back(PIChar(short(s[l]))); ret.push_back(PIChar(s[l]));
++l; ++l;
} }
/*while (s[l] != '\0') ++l;
PIString ret;
ret.resize(l);
for (int i = 0; i < l; ++i)
ret[i] = s[i];*/
return ret; return ret;
} }
@@ -369,6 +374,7 @@ void PIString::buildData(const char * cp) const {
UConverter * cc = ucnv_open(cp, &e); UConverter * cc = ucnv_open(cp, &e);
if (cc) { if (cc) {
char uc[8]; char uc[8];
data_.reserve(size_s());
for (int i = 0; i < size_s(); ++i) { for (int i = 0; i < size_s(); ++i) {
if (at(i).isAscii()) if (at(i).isAscii())
data_.push_back(uchar(at(i).unicode16Code())); data_.push_back(uchar(at(i).unicode16Code()));
@@ -605,16 +611,18 @@ PIString PIString::trimmed() const {
PIString & PIString::replace(int from, int count, const PIString & with) { PIString & PIString::replace(int from, int count, const PIString & with) {
if (count < length() - from) remove(from, count); count = piMini(count, length() - from);
else remove(from, length() - from); if (count == with.size_s())
uint c = with.length(); memcpy(&(at(from)), &(with.at(0)), count * sizeof(PIChar));
for (uint i = 0; i < c; ++i) insert(from + i, with[i]); else {
remove(from, count);
PIDeque<PIChar>::insert(from, with);
}
return *this; return *this;
} }
PIString & PIString::replace(const PIString & what, const PIString & with, bool * ok) { PIString & PIString::replace(const PIString & what, const PIString & with, bool * ok) {
//piCout << "replace" << what << with;
if (what.isEmpty()) { if (what.isEmpty()) {
if (ok != 0) *ok = false; if (ok != 0) *ok = false;
return *this; return *this;
@@ -628,8 +636,53 @@ PIString & PIString::replace(const PIString & what, const PIString & with, bool
PIString & PIString::replaceAll(const PIString & what, const PIString & with) { PIString & PIString::replaceAll(const PIString & what, const PIString & with) {
if (what.isEmpty() || what == with) return *this; if (what.isEmpty() || what == with) return *this;
bool ok = true; if (with.isEmpty()) removeAll(what);
while (ok) replace(what, with, &ok); else {
int l = what.length(), dl = with.length() - what.length();
for (int i = 0; i < length() - l + 1; ++i) {
bool match = true;
for (int j = 0; j < l; ++j) {
if (at(j + i) != what[j]) {
match = false;
break;
}
}
if (!match) continue;
if (dl > 0) PIDeque<PIChar>::insert(i, PIDeque<PIChar>((size_t)dl));
if (dl < 0) PIDeque<PIChar>::remove(i, -dl);
memcpy(PIDeque<PIChar>::data(i), &(with.at(0)), with.length() * sizeof(PIChar));
//i -= l;
}
}
return *this;
}
PIString & PIString::replaceAll(const char what, const char with) {
int l = length();
for (int i = 0; i < l; ++i) {
if (at(i) == what)
at(i) = with;
}
return *this;
}
PIString & PIString::removeAll(const PIString & str) {
if (str.isEmpty()) return *this;
int l = str.length();
for (int i = 0; i < length() - l + 1; ++i) {
bool match = true;
for (int j = 0; j < l; ++j) {
if (at(j + i) != str[j]) {
match = false;
break;
}
}
if (!match) continue;
PIDeque<PIChar>::remove(i, l);
i -= l;
}
return *this; return *this;
} }
@@ -641,16 +694,17 @@ PIString & PIString::insert(int index, const PIString & str) {
PIString & PIString::elide(int size, float pos) { PIString & PIString::elide(int size, float pos) {
static const PIString s_dotdot = PIStringAscii("..");
if (length() <= size) return *this; if (length() <= size) return *this;
if (length() <= 2) { if (length() <= 2) {
fill("."); fill('.');
return *this; return *this;
} }
pos = piClampf(pos, 0.f, 1.f); pos = piClampf(pos, 0.f, 1.f);
int ns = size - 2; int ns = size - 2;
int ls = piRoundf(ns * pos); int ls = piRoundf(ns * pos);
remove(ls, length() - ns); remove(ls, length() - ns);
insert(ls, ".."); insert(ls, s_dotdot);
return *this; return *this;
} }
@@ -670,9 +724,9 @@ PIStringList PIString::split(const PIString & delim) const {
} }
int PIString::find(const char str, const int start) const { int PIString::find(const char c, const int start) const {
for (int i = start; i < length(); ++i) for (int i = start; i < length(); ++i)
if (at(i) == str) if (at(i) == c)
return i; return i;
return -1; return -1;
} }
@@ -687,9 +741,9 @@ int PIString::find(const PIString & str, const int start) const {
} }
int PIString::findLast(const char str, const int start) const { int PIString::findLast(const char c, const int start) const {
for (int i = length() - 1; i >= start; --i) for (int i = length() - 1; i >= start; --i)
if (at(i) == str) if (at(i) == c)
return i; return i;
return -1; return -1;
} }
@@ -730,7 +784,7 @@ int PIString::findCWord(const PIString & word, const int start) const {
} }
int PIString::findRange(const PIChar & start, const PIChar & end, const PIChar & shield, const int start_index, int * len) const { int PIString::findRange(const PIChar start, const PIChar end, const PIChar shield, const int start_index, int * len) const {
if (len) *len = 0; if (len) *len = 0;
bool trim_ = (start != ' ' && start != '\t' && start != '\n' && start != '\r'), eq = (start == end); bool trim_ = (start != ' ' && start != '\t' && start != '\n' && start != '\r'), eq = (start == end);
int sz = size_s(), ls = -1, le = -1, cnt = 0; int sz = size_s(), ls = -1, le = -1, cnt = 0;
@@ -783,7 +837,7 @@ int PIString::findAnyLast(const PIString & str, const int start) const {
} }
int PIString::entries(const PIChar & c) const { int PIString::entries(const PIChar c) const {
int sz = size_s(), ret = 0; int sz = size_s(), ret = 0;
for (int i = 0; i < sz; ++i) for (int i = 0; i < sz; ++i)
if (at(i) == c) ++ret; if (at(i) == c) ++ret;
@@ -804,9 +858,14 @@ bool PIString::endsWith(const PIString & str) const {
bool PIString::toBool() const { bool PIString::toBool() const {
static const PIString s_true = PIStringAscii("true");
static const PIString s_yes = PIStringAscii("yes" );
static const PIString s_on = PIStringAscii("on" );
static const PIString s_ok = PIStringAscii("ok" );
PIString s(*this); PIString s(*this);
s = s.trimmed().toLowerCase(); s = s.trimmed().toLowerCase();
if ( atof(s.toNativeDecimalPoints().data()) > 0. || s == "true" || s == "yes" || s == "on" || s == "ok") return true; if (s == s_true || s == s_yes || s == s_on || s == s_ok) return true;
if (atof(s.toNativeDecimalPoints().data()) > 0.) return true;
return false; return false;
} }
@@ -953,7 +1012,7 @@ PIString PIString::takeNumber() {
} }
PIString PIString::takeRange(const PIChar & start, const PIChar & end, const PIChar & shield) { PIString PIString::takeRange(const PIChar start, const PIChar end, const PIChar shield) {
PIString ret; PIString ret;
bool trim_ = (start != ' ' && start != '\t' && start != '\n' && start != '\r'), eq = (start == end); bool trim_ = (start != ' ' && start != '\t' && start != '\n' && start != '\r'), eq = (start == end);
int sz = size_s(), ls = -1, le = -1, cnt = 0; int sz = size_s(), ls = -1, le = -1, cnt = 0;
@@ -991,7 +1050,7 @@ PIString PIString::takeRange(const PIChar & start, const PIChar & end, const PIC
} }
PIString PIString::inBrackets(const PIChar &start, const PIChar &end) const { PIString PIString::inBrackets(const PIChar start, const PIChar end) const {
int slen = length(); int slen = length();
int st = -1, bcnt = 0; int st = -1, bcnt = 0;
PIChar cc; PIChar cc;
@@ -1030,9 +1089,9 @@ PIString PIString::toNativeDecimalPoints() const {
#ifdef HAS_LOCALE #ifdef HAS_LOCALE
PIString s(*this); PIString s(*this);
if (currentLocale == 0) return s; if (currentLocale == 0) return s;
return s.replaceAll(".", currentLocale->decimal_point).replaceAll(",", currentLocale->decimal_point); return s.replaceAll('.', currentLocale->decimal_point).replaceAll(',', currentLocale->decimal_point);
#else #else
return PIString(*this).replaceAll(",", "."); return PIString(*this).replaceAll(',', '.');
#endif #endif
} }
@@ -1062,27 +1121,27 @@ ldouble PIString::toLDouble() const {
PIString & PIString::setReadableSize(llong bytes) { PIString & PIString::setReadableSize(llong bytes) {
clear(); clear();
if (bytes < 1024) {*this += (PIString::fromNumber(bytes) + " B"); return *this;} if (bytes < 1024) {*this += (PIString::fromNumber(bytes) + PIStringAscii(" B")); return *this;}
double fres = bytes / 1024.; double fres = bytes / 1024.;
llong res = bytes / 1024; llong res = bytes / 1024;
fres -= res; fres -= res;
if (res < 1024) {*this += (PIString::fromNumber(res) + "." + PIString::fromNumber(llong(fres * 10)).left(1) + " kB"); return *this;} if (res < 1024) {*this += (PIString::fromNumber(res) + PIStringAscii(".") + PIString::fromNumber(llong(fres * 10)).left(1) + PIStringAscii(" kB")); return *this;}
fres = res / 1024.; fres = res / 1024.;
res /= 1024; res /= 1024;
fres -= res; fres -= res;
if (res < 1024) {*this += (PIString::fromNumber(res) + "." + PIString::fromNumber(llong(fres * 10)).left(1) + " MB"); return *this;} if (res < 1024) {*this += (PIString::fromNumber(res) + PIStringAscii(".") + PIString::fromNumber(llong(fres * 10)).left(1) + PIStringAscii(" MB")); return *this;}
fres = res / 1024.; fres = res / 1024.;
res /= 1024; res /= 1024;
fres -= res; fres -= res;
if (res < 1024) {*this += (PIString::fromNumber(res) + "." + PIString::fromNumber(llong(fres * 10)).left(1) + " GB"); return *this;} if (res < 1024) {*this += (PIString::fromNumber(res) + PIStringAscii(".") + PIString::fromNumber(llong(fres * 10)).left(1) + PIStringAscii(" GB")); return *this;}
fres = res / 1024.; fres = res / 1024.;
res /= 1024; res /= 1024;
fres -= res; fres -= res;
if (res < 1024) {*this += (PIString::fromNumber(res) + "." + PIString::fromNumber(llong(fres * 10)).left(1) + " TB"); return *this;} if (res < 1024) {*this += (PIString::fromNumber(res) + PIStringAscii(".") + PIString::fromNumber(llong(fres * 10)).left(1) + PIStringAscii(" TB")); return *this;}
fres = res / 1024.; fres = res / 1024.;
res /= 1024; res /= 1024;
fres -= res; fres -= res;
*this += (PIString::fromNumber(res) + "." + PIString::fromNumber(llong(fres * 10)).left(1) + " PB"); *this += (PIString::fromNumber(res) + PIStringAscii(".") + PIString::fromNumber(llong(fres * 10)).left(1) + PIStringAscii(" PB"));
return *this; return *this;
} }
@@ -1110,14 +1169,14 @@ void parseVersion(PIString s, PIVector<int> & codes, PIStringList & strs) {
} }
int mccnt = 2 - s.entries('.'); int mccnt = 2 - s.entries('.');
if (mccnt > 0) { if (mccnt > 0) {
int ind = s.findLast(".") + 1; int ind = s.findLast('.') + 1;
while (!_versionDelims_.contains(s[ind])) { while (!_versionDelims_.contains(s[ind])) {
++ind; ++ind;
if (ind > s.size_s() - 1) if (ind > s.size_s() - 1)
break; break;
} }
for (int i = 0; i < mccnt; ++i) for (int i = 0; i < mccnt; ++i)
s.insert(ind, ".0"); s.insert(ind, PIStringAscii(".0"));
} }
PIStringList comps; PIStringList comps;
while (!s.isEmpty()) { while (!s.isEmpty()) {
@@ -1132,7 +1191,7 @@ void parseVersion(PIString s, PIVector<int> & codes, PIStringList & strs) {
} }
for (int i = 0; i < comps.size_s(); ++i) { for (int i = 0; i < comps.size_s(); ++i) {
if (comps[i].isEmpty()) if (comps[i].isEmpty())
comps[i] = "0"; comps[i] = '0';
bool ok = false; bool ok = false;
int val = comps[i].toInt(-1, &ok); int val = comps[i].toInt(-1, &ok);
if (ok) { if (ok) {
@@ -1148,20 +1207,20 @@ void parseVersion(PIString s, PIVector<int> & codes, PIStringList & strs) {
int versionLabelValue(PIString s) { int versionLabelValue(PIString s) {
int ret = -10000; int ret = -10000;
if (s.isEmpty()) return 0; if (s.isEmpty()) return 0;
if (s.startsWith("pre")) { if (s.startsWith(PIStringAscii("pre"))) {
s.cutLeft(3); s.cutLeft(3);
ret -= 1; ret -= 1;
} }
if (s.startsWith("rc")) { if (s.startsWith(PIStringAscii("rc"))) {
s.cutLeft(2); s.cutLeft(2);
ret += s.toInt(); ret += s.toInt();
} }
if (s.startsWith("r")) { if (s.startsWith(PIStringAscii("r"))) {
s.cutLeft(1); s.cutLeft(1);
ret += 10000 + s.toInt(); ret += 10000 + s.toInt();
} }
if (s == "alpha") ret -= 4; if (s == PIStringAscii("alpha")) ret -= 4;
if (s == "beta" ) ret -= 2; if (s == PIStringAscii("beta" )) ret -= 2;
return ret; return ret;
} }
@@ -1200,13 +1259,13 @@ PIString versionNormalize(const PIString & v) {
PIString ret; PIString ret;
for (int i = 0; i < codes.size_s(); ++i) { for (int i = 0; i < codes.size_s(); ++i) {
if (i > 0) { if (i > 0) {
if (i < 3) ret += "."; if (i < 3) ret += '.';
else ret += "-"; else ret += '-';
} }
ret += PIString::fromNumber(codes[i]); ret += PIString::fromNumber(codes[i]);
} }
for (int i = 0; i < strs.size_s(); ++i) { for (int i = 0; i < strs.size_s(); ++i) {
ret += "_"; ret += '_';
ret += strs[i]; ret += strs[i];
} }
return ret; return ret;

88
lib/main/core/pistring.h
View File

@@ -43,7 +43,8 @@ public:
static const float ElideCenter; static const float ElideCenter;
static const float ElideRight ; static const float ElideRight ;
PIString & operator +=(const PIChar & c) {push_back(c); return *this;} PIString & operator +=(const PIChar c) {push_back(c); return *this;}
PIString & operator +=(const char c) {push_back(PIChar(c)); return *this;}
PIString & operator +=(const char * str); PIString & operator +=(const char * str);
PIString & operator +=(const wchar_t * str); PIString & operator +=(const wchar_t * str);
PIString & operator +=(const PIByteArray & ba) {appendFromChars((const char * )ba.data(), ba.size_s(), __utf8name__); return *this;} PIString & operator +=(const PIByteArray & ba) {appendFromChars((const char * )ba.data(), ba.size_s(), __utf8name__); return *this;}
@@ -55,7 +56,7 @@ public:
//! Contructs string with single symbol "c" //! Contructs string with single symbol "c"
PIString(const PIChar & c): PIDeque<PIChar>() {*this += c;} PIString(const PIChar c): PIDeque<PIChar>() {*this += c;}
PIString(const char c): PIDeque<PIChar>() {*this += PIChar(c);} PIString(const char c): PIDeque<PIChar>() {*this += PIChar(c);}
/*! \brief Contructs string from c-string "str" /*! \brief Contructs string from c-string "str"
@@ -84,7 +85,7 @@ public:
/*! \brief Contructs string as sequence of symbols "c" of buffer with length "len" /*! \brief Contructs string as sequence of symbols "c" of buffer with length "len"
* \details Example: \snippet pistring.cpp PIString(int, PIChar) */ * \details Example: \snippet pistring.cpp PIString(int, PIChar) */
PIString(const int len, const PIChar & c): PIDeque<PIChar>() {for (int i = 0; i < len; ++i) push_back(c);} PIString(const int len, const PIChar c): PIDeque<PIChar>() {for (int i = 0; i < len; ++i) push_back(c);}
~PIString() {} ~PIString() {}
@@ -110,7 +111,7 @@ public:
bool operator ==(const PIString & str) const; bool operator ==(const PIString & str) const;
//! Compare operator //! Compare operator
bool operator ==(const PIChar c) const {return *this == PIString(c);} bool operator ==(const PIChar c) const {if (size_s() != 1) return false; return at(0) == c;}
//! Compare operator //! Compare operator
bool operator ==(const char * str) const {return *this == PIString(str);} bool operator ==(const char * str) const {return *this == PIString(str);}
@@ -119,7 +120,7 @@ public:
bool operator !=(const PIString & str) const; bool operator !=(const PIString & str) const;
//! Compare operator //! Compare operator
bool operator !=(const PIChar c) const {return *this != PIString(c);} bool operator !=(const PIChar c) const {if (size_s() != 1) return true; return at(0) != c;}
//! Compare operator //! Compare operator
bool operator !=(const char * str) const {return *this != PIString(str);} bool operator !=(const char * str) const {return *this != PIString(str);}
@@ -128,7 +129,7 @@ public:
bool operator <(const PIString & str) const; bool operator <(const PIString & str) const;
//! Compare operator //! Compare operator
bool operator <(const PIChar c) const {return *this < PIString(c);} bool operator <(const PIChar c) const {if (size_s() != 1) return size_s() < 1; return at(0) < c;}
//! Compare operator //! Compare operator
bool operator <(const char * str) const {return *this < PIString(str);} bool operator <(const char * str) const {return *this < PIString(str);}
@@ -137,7 +138,7 @@ public:
bool operator >(const PIString & str) const; bool operator >(const PIString & str) const;
//! Compare operator //! Compare operator
bool operator >(const PIChar c) const {return *this > PIString(c);} bool operator >(const PIChar c) const {if (size_s() != 1) return size_s() > 1; return at(0) > c;}
//! Compare operator //! Compare operator
bool operator >(const char * str) const {return *this > PIString(str);} bool operator >(const char * str) const {return *this > PIString(str);}
@@ -146,7 +147,7 @@ public:
bool operator <=(const PIString & str) const {return !(*this > str);} bool operator <=(const PIString & str) const {return !(*this > str);}
//! Compare operator //! Compare operator
bool operator <=(const PIChar c) const {return *this <= PIString(c);} bool operator <=(const PIChar c) const {return !(*this > c);}
//! Compare operator //! Compare operator
bool operator <=(const char * str) const {return *this <= PIString(str);} bool operator <=(const char * str) const {return *this <= PIString(str);}
@@ -155,7 +156,7 @@ public:
bool operator >=(const PIString & str) const {return !(*this < str);} bool operator >=(const PIString & str) const {return !(*this < str);}
//! Compare operator //! Compare operator
bool operator >=(const PIChar c) const {return *this >= PIString(c);} bool operator >=(const PIChar c) const {return !(*this < c);}
//! Compare operator //! Compare operator
bool operator >=(const char * str) const {return *this >= PIString(str);} bool operator >=(const char * str) const {return *this >= PIString(str);}
@@ -166,7 +167,11 @@ public:
/*! \brief Append symbol "c" at the end of string /*! \brief Append symbol "c" at the end of string
* \details Example: \snippet pistring.cpp PIString::<<(PIChar) */ * \details Example: \snippet pistring.cpp PIString::<<(PIChar) */
PIString & operator <<(const PIChar & c) {*this += c; return *this;} PIString & operator <<(const PIChar c) {*this += c; return *this;}
/*! \brief Append symbol "c" at the end of string
* \details Example: \snippet pistring.cpp PIString::<<(PIChar) */
PIString & operator <<(const char c) {*this += PIChar(c); return *this;}
/*! \brief Append c-string "str" at the end of string /*! \brief Append c-string "str" at the end of string
* \details Example: \snippet pistring.cpp PIString::<<(char * ) */ * \details Example: \snippet pistring.cpp PIString::<<(char * ) */
@@ -181,11 +186,6 @@ public:
PIString & operator <<(const int & num) {*this += PIString::fromNumber(num); return *this;} PIString & operator <<(const int & num) {*this += PIString::fromNumber(num); return *this;}
PIString & operator <<(const uint & num) {*this += PIString::fromNumber(num); return *this;} PIString & operator <<(const uint & num) {*this += PIString::fromNumber(num); return *this;}
/*! \brief Append string representation of "num" at the end of string
* \details Example: \snippet pistring.cpp PIString::<<(int) */
PIString & operator <<(const short & num) {*this += PIString::fromNumber(num); return *this;}
PIString & operator <<(const ushort & num) {*this += PIString::fromNumber(num); return *this;}
/*! \brief Append string representation of "num" at the end of string /*! \brief Append string representation of "num" at the end of string
* \details Example: \snippet pistring.cpp PIString::<<(int) */ * \details Example: \snippet pistring.cpp PIString::<<(int) */
PIString & operator <<(const long & num) {*this += PIString::fromNumber(num); return *this;} PIString & operator <<(const long & num) {*this += PIString::fromNumber(num); return *this;}
@@ -282,8 +282,20 @@ public:
* \details Example: \snippet pistring.cpp PIString::replaceAll * \details Example: \snippet pistring.cpp PIString::replaceAll
* \sa \a replace(), \a replaced() */ * \sa \a replace(), \a replaced() */
PIString & replaceAll(const PIString & what, const PIString & with); PIString & replaceAll(const PIString & what, const PIString & with);
PIString replaceAll(const PIString & what, const PIString & with) const {PIString str(*this); str.replaceAll(what, with); return str;}
/*! \brief Replace all founded symbols "what" with symbol "with" and return this string
* \details Example: \snippet pistring.cpp PIString::replaceAll
* \sa \a replace(), \a replaced() */
PIString & replaceAll(const char what, const char with);
PIString replacedAll(const PIString & what, const PIString & with) const {PIString str(*this); str.replaceAll(what, with); return str;}
PIString replacedAll(const char what, const char with) const {PIString str(*this); str.replaceAll(what, with); return str;}
PIString & removeAll(const PIString & str);
PIString & removeAll(char c) {PIDeque<PIChar>::removeAll(PIChar(c)); return *this;}
/*! \brief Repeat content of string "times" times and return this string /*! \brief Repeat content of string "times" times and return this string
* \details Example: \snippet pistring.cpp PIString::repeat */ * \details Example: \snippet pistring.cpp PIString::repeat */
PIString & repeat(int times) {PIString ss(*this); times--; piForTimes (times) *this += ss; return *this;} PIString & repeat(int times) {PIString ss(*this); times--; piForTimes (times) *this += ss; return *this;}
@@ -294,11 +306,11 @@ public:
/*! \brief Insert symbol "c" after index "index" and return this string /*! \brief Insert symbol "c" after index "index" and return this string
* \details Example: \snippet pistring.cpp PIString::insert_0 */ * \details Example: \snippet pistring.cpp PIString::insert_0 */
PIString & insert(const int index, const PIChar & c) {PIDeque<PIChar>::insert(index, c); return *this;} PIString & insert(const int index, const PIChar c) {PIDeque<PIChar>::insert(index, c); return *this;}
/*! \brief Insert symbol "c" after index "index" and return this string /*! \brief Insert symbol "c" after index "index" and return this string
* \details Example: \snippet pistring.cpp PIString::insert_1 */ * \details Example: \snippet pistring.cpp PIString::insert_1 */
PIString & insert(const int index, const char & c) {return insert(index, PIChar(c));} PIString & insert(const int index, const char c) {return insert(index, PIChar(c));}
/*! \brief Insert string "str" after index "index" and return this string /*! \brief Insert string "str" after index "index" and return this string
* \details Example: \snippet pistring.cpp PIString::insert_2 */ * \details Example: \snippet pistring.cpp PIString::insert_2 */
@@ -312,13 +324,13 @@ public:
* "c" at the end of string, and return this string * "c" at the end of string, and return this string
* \details Example: \snippet pistring.cpp PIString::expandRightTo * \details Example: \snippet pistring.cpp PIString::expandRightTo
* \sa \a expandLeftTo() */ * \sa \a expandLeftTo() */
PIString & expandRightTo(const int len, const PIChar & c) {if (len > length()) resize(len, c); return *this;} PIString & expandRightTo(const int len, const PIChar c) {if (len > length()) resize(len, c); return *this;}
/*! \brief Enlarge string to length "len" by addition sequence of symbols /*! \brief Enlarge string to length "len" by addition sequence of symbols
* "c" at the beginning of string, and return this string * "c" at the beginning of string, and return this string
* \details Example: \snippet pistring.cpp PIString::expandLeftTo * \details Example: \snippet pistring.cpp PIString::expandLeftTo
* \sa \a expandRightTo() */ * \sa \a expandRightTo() */
PIString & expandLeftTo(const int len, const PIChar & c) {if (len > length()) insert(0, PIString(len - length(), c)); return *this;} PIString & expandLeftTo(const int len, const PIChar c) {if (len > length()) insert(0, PIString(len - length(), c)); return *this;}
/*! \brief Add "c" symbols at the beginning and end of the string, and return this string /*! \brief Add "c" symbols at the beginning and end of the string, and return this string
* \sa \a quoted() */ * \sa \a quoted() */
@@ -331,7 +343,7 @@ public:
/*! \brief Reverse string and return this string /*! \brief Reverse string and return this string
* \details Example: \snippet pistring.cpp PIString::reverse * \details Example: \snippet pistring.cpp PIString::reverse
* \sa \a reversed() */ * \sa \a reversed() */
PIString & reverse() {PIString str(*this); clear(); piForeachR (const PIChar & c, str) push_back(c); return *this;} PIString & reverse() {PIString str(*this); clear(); piForeachCR (PIChar c, str) push_back(c); return *this;}
/*! \brief Reverse copy of this string and return it /*! \brief Reverse copy of this string and return it
* \details Example: \snippet pistring.cpp PIString::reversed * \details Example: \snippet pistring.cpp PIString::reversed
@@ -394,13 +406,13 @@ public:
* \details "Shield" symbol prevent analysis of the next symbol. * \details "Shield" symbol prevent analysis of the next symbol.
* Example: \snippet pistring.cpp PIString::takeRange * Example: \snippet pistring.cpp PIString::takeRange
* \sa \a takeSymbol(), \a takeWord(), \a takeLine(), \a takeNumber() */ * \sa \a takeSymbol(), \a takeWord(), \a takeLine(), \a takeNumber() */
PIString takeRange(const PIChar & start, const PIChar & end, const PIChar & shield = '\\'); PIString takeRange(const PIChar start, const PIChar end, const PIChar shield = '\\');
/*! \brief Return a string in brackets "start" and "end" symbols from the begin of this /*! \brief Return a string in brackets "start" and "end" symbols from the begin of this
* string and return it. * string and return it.
* \details Example: string = "a(b(c)d)e"; inBrackets('(', ')') = "b(c)d"; */ * \details Example: string = "a(b(c)d)e"; inBrackets('(', ')') = "b(c)d"; */
PIString inBrackets(const PIChar & start, const PIChar & end) const; PIString inBrackets(const PIChar start, const PIChar end) const;
/*! \brief Return real bytes count of this string /*! \brief Return real bytes count of this string
* \details It`s equivalent length of char sequence * \details It`s equivalent length of char sequence
@@ -467,11 +479,8 @@ public:
PIString toNativeDecimalPoints() const; PIString toNativeDecimalPoints() const;
//! \brief Returns if string contains "str" //! \brief Returns if string contains "c"
bool contains(const char str) const {return contains(PIString(str));} bool contains(const char c) const {return PIDeque<PIChar>::contains(PIChar(c));}
//! \brief Returns if string contains "str"
bool contains(const PIChar str) const {return contains(PIString(str));}
//! \brief Returns if string contains "str" //! \brief Returns if string contains "str"
bool contains(const char * str) const {return contains(PIString(str));} bool contains(const char * str) const {return contains(PIString(str));}
@@ -480,9 +489,9 @@ public:
bool contains(const PIString & str) const {return find(str) >= 0;} bool contains(const PIString & str) const {return find(str) >= 0;}
//! \brief Search substring "str" from symbol at index "start" and return first occur position //! \brief Search symbol "c" from symbol at index "start" and return first occur position
//! \details Example: \snippet pistring.cpp PIString::find //! \details Example: \snippet pistring.cpp PIString::find
int find(const char str, const int start = 0) const; int find(const char c, const int start = 0) const;
//! \brief Search substring "str" from symbol at index "start" and return first occur position //! \brief Search substring "str" from symbol at index "start" and return first occur position
//! \details Example: \snippet pistring.cpp PIString::find //! \details Example: \snippet pistring.cpp PIString::find
@@ -492,9 +501,9 @@ public:
//! \details Example: \snippet pistring.cpp PIString::find //! \details Example: \snippet pistring.cpp PIString::find
int find(const char * str, const int start = 0) const {return find(PIString(str), start);} int find(const char * str, const int start = 0) const {return find(PIString(str), start);}
//! \brief Search substring "str" from symbol at index "start" and return last occur position //! \brief Search symbol "c" from symbol at index "start" and return last occur position
//! \details Example: \snippet pistring.cpp PIString::findLast //! \details Example: \snippet pistring.cpp PIString::findLast
int findLast(const char str, const int start = 0) const; int findLast(const char c, const int start = 0) const;
//! \brief Search substring "str" from symbol at index "start" and return last occur position //! \brief Search substring "str" from symbol at index "start" and return last occur position
//! \details Example: \snippet pistring.cpp PIString::findLast //! \details Example: \snippet pistring.cpp PIString::findLast
@@ -514,7 +523,7 @@ public:
//! \brief Search range between "start" and "end" symbols at index "start_index" and return first occur position. //! \brief Search range between "start" and "end" symbols at index "start_index" and return first occur position.
//! \details Example: \snippet pistring.cpp PIString::findRange //! \details Example: \snippet pistring.cpp PIString::findRange
int findRange(const PIChar & start, const PIChar & end, const PIChar & shield = '\\', const int start_index = 0, int * len = 0) const; int findRange(const PIChar start, const PIChar end, const PIChar shield = '\\', const int start_index = 0, int * len = 0) const;
//! \brief Search any symbol of "str" from symbol at index "start" and return first occur position //! \brief Search any symbol of "str" from symbol at index "start" and return first occur position
//! \details Example: \snippet pistring.cpp PIString::findAny //! \details Example: \snippet pistring.cpp PIString::findAny
@@ -533,7 +542,7 @@ public:
int findAnyLast(const char * str, const int start = 0) const {return findAnyLast(PIString(str), start);} int findAnyLast(const char * str, const int start = 0) const {return findAnyLast(PIString(str), start);}
//! \brief Returns number of occurrences of symbol "c" //! \brief Returns number of occurrences of symbol "c"
int entries(const PIChar & c) const; int entries(const PIChar c) const;
//! \brief Returns number of occurrences of symbol "c" //! \brief Returns number of occurrences of symbol "c"
int entries(char c) const {return entries(PIChar(c));} int entries(char c) const {return entries(PIChar(c));}
@@ -718,9 +727,6 @@ public:
//! \details Example: \snippet pistring.cpp PIString::readableSize //! \details Example: \snippet pistring.cpp PIString::readableSize
static PIString readableSize(llong bytes); static PIString readableSize(llong bytes);
PIString & removeAll(char v) {replaceAll(v, ""); return *this;}
PIString & removeAll(const PIString & v) {replaceAll(v, ""); return *this;}
private: private:
static const char toBaseN[]; static const char toBaseN[];
static const int fromBaseN[]; static const int fromBaseN[];
@@ -763,6 +769,12 @@ inline PIString operator +(const PIString & f, const char * str) {PIString s(f);
//! \relatesalso PIString \brief Return concatenated string //! \relatesalso PIString \brief Return concatenated string
inline PIString operator +(const char * str, const PIString & f) {return PIString(str) + f;} inline PIString operator +(const char * str, const PIString & f) {return PIString(str) + f;}
//! \relatesalso PIString \brief Return concatenated string
inline PIString operator +(const char c, const PIString & f) {return PIChar(c) + f;}
//! \relatesalso PIString \brief Return concatenated string
inline PIString operator +(const PIString & f, const char c) {return f + PIChar(c);}
inline char chrUpr(char c); inline char chrUpr(char c);
inline char chrLwr(char c); inline char chrLwr(char c);

2
lib/main/io_devices/pifile.cpp
View File

@@ -593,7 +593,7 @@ void PIFile::setDefaultCharset(const char * c) {
PIFile::FileInfo PIFile::fileInfo(const PIString & path) { PIFile::FileInfo PIFile::fileInfo(const PIString & path) {
FileInfo ret; FileInfo ret;
if (path.isEmpty()) return ret; if (path.isEmpty()) return ret;
ret.path = path.replaceAll("\\", PIDir::separator); ret.path = path.replacedAll("\\", PIDir::separator);
PIString n = ret.name(); PIString n = ret.name();
//piCout << "open" << path; //piCout << "open" << path;
#ifdef WINDOWS #ifdef WINDOWS

2
lib/main/io_devices/piiodevice.cpp
View File

@@ -382,7 +382,7 @@ void PIIODevice::splitFullPath(PIString fpwm, PIString * full_path, DeviceMode *
int dm = 0; int dm = 0;
DeviceOptions op = 0; DeviceOptions op = 0;
if (fpwm.find("(") > 0 && fpwm.find(")") > 0) { if (fpwm.find("(") > 0 && fpwm.find(")") > 0) {
PIString dms(fpwm.right(fpwm.length() - fpwm.findLast("(")).takeRange("(", ")").trim().toLowerCase().removeAll(" ")); PIString dms(fpwm.right(fpwm.length() - fpwm.findLast("(")).takeRange("(", ")").trim().toLowerCase().removeAll(' '));
PIStringList opts(dms.split(",")); PIStringList opts(dms.split(","));
piForeachC (PIString & o, opts) { piForeachC (PIString & o, opts) {
//piCout << dms; //piCout << dms;

25
main.cpp
View File

@@ -34,36 +34,25 @@ int main() {
class db { class db {
public: public:
db() { db() {
for (int i=0; i<1000; ++i) for (int i=0; i<10000; ++i)
x << sin(double(i)/180.0); x << sin(double(i)/180.0);
printf("jkfkhg\n"); //printf("jkfkhg\n");
} }
// db(const db & d) {x = d.x;}
// db(db && o) {x.swap(o.x);}
private: private:
PIVector<double> x; PIVector<double> x;
}; };
#include "picodeparser.h" #include "picodeparser.h"
int main() { int main() {
/*PIString s(" 324 654 sf 5fdwg sdfsdf sdfefg");
piCout << s;
piCout << s.replaceAll(' ', '1');*/
piDebug = false; piDebug = false;
printf("==============\n");
double min = -1, max = -1, mean = 0; double min = -1, max = -1, mean = 0;
for (int i = 0; i < 50; ++i) { for (int i = 0; i < 50; ++i) {
PICodeParser cp;
PITimeMeasurer tm; PITimeMeasurer tm;
/*PICodeParser cp; cp.parseFile("SH_plugin_base.h");
cp.parseFile("SH_plugin_base.h");*/
PIVector<db> sl;
sl.reserve(10000);
db d;
for (int i = 0; i < 10000; ++i) {
// db b(d);
// db c(b);
// c = b;
// sl << c;
sl << db(d);
// sl << std::move(d);
}
double ms = tm.elapsed_m(); double ms = tm.elapsed_m();
if (min < 0) min = ms; if (min < 0) min = ms;
if (max < 0) max = ms; if (max < 0) max = ms;

14
utils/code_model_generator/main.cpp
View File

@@ -331,13 +331,13 @@ void makeGetterValue(PIFile & f, const PICodeParser::Entity * e) {
void writeModel(PICodeParser & parser, PICLI & cli, const PIString out, bool meta, bool enums, bool streams, bool texts, bool getters) { void writeModel(PICodeParser & parser, PICLI & cli, const PIString out, bool meta, bool enums, bool streams, bool texts, bool getters) {
PIVector<const PICodeParser::Entity * > ventities; PIVector<const PICodeParser::Entity * > ventities;
PIString defname = out PIString defname = out
.replaceAll(".", "_") .replacedAll('.', '_')
.replaceAll("/", "_") .replaceAll('/', '_')
.replaceAll(":", "_") .replaceAll(':', '_')
.replaceAll("-", "_") .replaceAll('-', '_')
.replaceAll("@", "_") .replaceAll('@', '_')
.replaceAll("\\", "_") .replaceAll('\\', '_')
.removeAll(" ") .removeAll(' ')
.toUpperCase() .toUpperCase()
+ "_H"; + "_H";
bool inc_h, inc_cpp; bool inc_h, inc_cpp;