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

Fix parser. Comments and IO_PORT

Browse Source 
Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
This commit is contained in:
YRabbit 2021-07-03 08:23:25 +10:00
parent 9443267717
commit 5c5982c50a
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gowin/arch.cc
View File

@ -492,19 +492,17 @@ void Arch::read_cst(std::istream &in)
std::getline(in, line); std::getline(in, line);
io_loc = true; io_loc = true;
if (!std::regex_match(line, match, iobre)) { if (!std::regex_match(line, match, iobre)) {
// empty line or comment if (std::regex_match(line, match, portre)) {
if (line.empty() == 0) { io_loc = false;
continue; } else {
} else { if ( (!line.empty()) && (line.rfind("//", 0) == std::string::npos)) {
if (!std::regex_match(line, match, portre)) {
io_loc = false;
} else if (line.rfind("//", 0) == 0) {
log_warning("Invalid constraint: %s\n", line.c_str()); log_warning("Invalid constraint: %s\n", line.c_str());
continue;
} }
} continue;
} }
// std::cout << match[1] << " " << match[2] << std::endl; }
//std::cout << match[1] << " " << match[2] << std::endl;
IdString net = id(match[1]); IdString net = id(match[1]);
auto it = cells.find(net); auto it = cells.find(net);