aboutsummaryrefslogtreecommitdiffstats
path: root/frontends
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-05-21 18:20:58 -0700
committerGitHub <noreply@github.com>2019-05-21 18:20:58 -0700
commitcb24d23b6d450edb3349c9788c06a0a1ee9f0ade (patch)
tree9d8e71ac765fe18a1ac2c07a8daff50bc0cb24d2 /frontends
parentc907899422884d959632ed42c6589a0720b681e4 (diff)
parent705775342774cff735ba13d2c3216680ae98b7a0 (diff)
downloadyosys-cb24d23b6d450edb3349c9788c06a0a1ee9f0ade.tar.gz
yosys-cb24d23b6d450edb3349c9788c06a0a1ee9f0ade.tar.bz2
yosys-cb24d23b6d450edb3349c9788c06a0a1ee9f0ade.zip
Merge pull request #1024 from YosysHQ/eddie/fix_Wmissing_braces
Diffstat (limited to 'frontends')
-rw-r--r--frontends/aiger/aigerparse.cc14
1 files changed, 9 insertions, 5 deletions
diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc
index 2e4774dfd..38348cd65 100644
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@ -55,11 +55,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