diff options
author | Lushay Labs <107283894+lushaylabs@users.noreply.github.com> | 2022-10-09 23:47:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-09 23:47:09 +0300 |
commit | a7acda95f09a117a912bb3d1c327e854cd45acc8 (patch) | |
tree | e2eb10b2f9365f0bfd0e130b00bc970ae22202e5 /gowin | |
parent | 0d1ea9e6ed471ca09c5908e0b39ab46139603372 (diff) | |
download | nextpnr-a7acda95f09a117a912bb3d1c327e854cd45acc8.tar.gz nextpnr-a7acda95f09a117a912bb3d1c327e854cd45acc8.tar.bz2 nextpnr-a7acda95f09a117a912bb3d1c327e854cd45acc8.zip |
support windows line endings
Diffstat (limited to 'gowin')
-rw-r--r-- | gowin/arch.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gowin/arch.cc b/gowin/arch.cc index e33a904a..00050f44 100644 --- a/gowin/arch.cc +++ b/gowin/arch.cc @@ -876,12 +876,12 @@ void Arch::read_cst(std::istream &in) // If two locations are specified separated by commas (for differential I/O buffers), // only the first location is actually recognized and used. // And pin A will be Positive and pin B will be Negative in any case. - std::regex iobre = std::regex("IO_LOC +\"([^\"]+)\" +([^ ,;]+)(, *[^ ;]+)? *;.*"); - std::regex portre = std::regex("IO_PORT +\"([^\"]+)\" +([^;]+;).*"); + std::regex iobre = std::regex("IO_LOC +\"([^\"]+)\" +([^ ,;]+)(, *[^ ;]+)? *;.*[\\s\\S]*"); + std::regex portre = std::regex("IO_PORT +\"([^\"]+)\" +([^;]+;).*[\\s\\S]*"); std::regex port_attrre = std::regex("([^ =;]+=[^ =;]+) *([^;]*;)"); std::regex iobelre = std::regex("IO([TRBL])([0-9]+)\\[?([A-Z])\\]?"); - std::regex inslocre = std::regex("INS_LOC +\"([^\"]+)\" +R([0-9]+)C([0-9]+)\\[([0-9])\\]\\[([AB])\\] *;.*"); - std::regex clockre = std::regex("CLOCK_LOC +\"([^\"]+)\" +BUF([GS])(\\[([0-7])\\])?[^;]*;.*"); + std::regex inslocre = std::regex("INS_LOC +\"([^\"]+)\" +R([0-9]+)C([0-9]+)\\[([0-9])\\]\\[([AB])\\] *;.*[\\s\\S]*"); + std::regex clockre = std::regex("CLOCK_LOC +\"([^\"]+)\" +BUF([GS])(\\[([0-7])\\])?[^;]*;.*[\\s\\S]*"); std::smatch match, match_attr, match_pinloc; std::string line, pinline; enum |