luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-10-07 10:33:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Internals: Use C++14 quoted literal std::string

Browse Source
This commit is contained in:
Wilson Snyder
2024-01-28 21:00:20 -05:00
parent eecdf4b0f3
commit 22687a6901
38 changed files with 92 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3File.cpp
+10 -11
View File
@@ -877,26 +877,26 @@ string V3OutFormatter::quoteNameControls(const string& namein,
// Encode chars into XML string
for (const char c : namein) {
if (c == '"') {
out += std::string{"""};
out += """s;
} else if (c == '\'') {
out += std::string{"'"};
out += "'"s;
} else if (c == '<') {
out += std::string{"&lt;"};
out += "&lt;"s;
} else if (c == '>') {
out += std::string{"&gt;"};
out += "&gt;"s;
} else if (c == '&') {
out += std::string{"&amp;"};
out += "&amp;"s;
} else if (std::isprint(c)) {
out += c;
} else {
out += std::string{"&#"} + cvtToStr((unsigned int)(c & 0xff)) + ";";
out += "&#"s + cvtToStr((unsigned int)(c & 0xff)) + ";";
}
}
} else {
// Encode control chars into C style escapes
for (const char c : namein) {
if (c == '\\' || c == '"') {
out += std::string{"\\"} + c;
out += "\\"s + c;
} else if (c == '\n') {
out += "\\n";
} else if (c == '\r') {
@@ -907,8 +907,8 @@ string V3OutFormatter::quoteNameControls(const string& namein,
out += c;
} else {
// This will also cover \a etc
const string octal = std::string{"\\"} + cvtToStr((c >> 6) & 3)
+ cvtToStr((c >> 3) & 7) + cvtToStr(c & 7);
const string octal
= "\\"s + cvtToStr((c >> 6) & 3) + cvtToStr((c >> 3) & 7) + cvtToStr(c & 7);
out += octal;
}
}
@@ -955,8 +955,7 @@ void V3OutFile::putsForceIncs() {
void V3OutCFile::putsGuard() {
UASSERT(!m_guard, "Already called putsGuard in emit file");
m_guard = true;
string var
= VString::upcase(std::string{"VERILATED_"} + V3Os::filenameNonDir(filename()) + "_");
string var = VString::upcase("VERILATED_"s + V3Os::filenameNonDir(filename()) + "_");
for (char& c : var) {
if (!std::isalnum(c)) c = '_';
}