diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-05-23 13:37:53 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-05-23 13:37:53 -0700 |
| commit | 68359bcd6f1ded0dffa12f0d1e2288e433fd83e7 (patch) | |
| tree | 6cbf1976a4a7ca510e7330c8f6d09603d9dc9446 /frontends | |
| parent | ae89e6ab26d2d87a604e20ebc14dcda8c9901585 (diff) | |
| parent | 5ac7e38d0aab1c73150accd9befbccc5398b8e42 (diff) | |
| download | yosys-68359bcd6f1ded0dffa12f0d1e2288e433fd83e7.tar.gz yosys-68359bcd6f1ded0dffa12f0d1e2288e433fd83e7.tar.bz2 yosys-68359bcd6f1ded0dffa12f0d1e2288e433fd83e7.zip | |
Merge remote-tracking branch 'origin/eddie/opt_rmdff' into xc7mux
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/aiger/aigerparse.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc index 8b3fa6536..94bfdfa3e 100644 --- a/frontends/aiger/aigerparse.cc +++ b/frontends/aiger/aigerparse.cc @@ -57,11 +57,15 @@ void AigerReader::parse_aiger() // Optional values B = C = J = F = 0; - for (auto &i : std::array<std::reference_wrapper<unsigned>,4>{B, C, J, F}) { - if (f.peek() != ' ') break; - if (!(f >> i)) - log_error("Invalid AIGER header\n"); - } + if (f.peek() != ' ') goto end_of_header; + if (!(f >> B)) log_error("Invalid AIGER header\n"); + if (f.peek() != ' ') goto end_of_header; + if (!(f >> C)) log_error("Invalid AIGER header\n"); + if (f.peek() != ' ') goto end_of_header; + if (!(f >> J)) log_error("Invalid AIGER header\n"); + if (f.peek() != ' ') goto end_of_header; + if (!(f >> F)) log_error("Invalid AIGER header\n"); +end_of_header: std::string line; std::getline(f, line); // Ignore up to start of next line, as standard |