caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1075 from YosysHQ/gatecat/ecp5-lpf-errors

Browse Source 
ecp5: Improve error handling for missing end-"
This commit is contained in:
myrtle 2023-01-02 09:25:14 +01:00 committed by GitHub
commit 5cea801a2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ecp5/lpf.cc
View File

@ -44,21 +44,22 @@ bool Arch::apply_lpf(std::string filename, std::istream &in)
auto isempty = [](const std::string &str) { auto isempty = [](const std::string &str) {
return std::all_of(str.begin(), str.end(), [](char c) { return isblank(c) || c == '\r' || c == '\n'; }); return std::all_of(str.begin(), str.end(), [](char c) { return isblank(c) || c == '\r' || c == '\n'; });
}; };
auto strip_quotes = [](const std::string &str) {
if (str.at(0) == '"') {
NPNR_ASSERT(str.back() == '"');
return str.substr(1, str.size() - 2);
} else {
return str;
}
};
try { try {
if (!in) if (!in)
log_error("failed to open LPF file\n"); log_error("failed to open LPF file\n");
std::string line; std::string line;
std::string linebuf; std::string linebuf;
int lineno = 0; int lineno = 0;
auto strip_quotes = [&](const std::string &str) {
if (str.at(0) == '"') {
if (str.back() != '"') {
log_error("expected '\"' at end of string '%s' (on line %d)\n", str.c_str(), lineno);
}
return str.substr(1, str.size() - 2);
} else {
return str;
}
};
while (std::getline(in, line)) { while (std::getline(in, line)) {
++lineno; ++lineno;
size_t cstart = line.find('#'); size_t cstart = line.find('#');