From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 10 Aug 2019 07:52:14 +0000 (+0200)
Subject: Merge pull request #1258 from YosysHQ/eddie/cleanup
X-Git-Tag: working-ls180~1151
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f54bf1631ff37a83733c162e6ebd188c1d5ea18f;p=yosys.git

Merge pull request #1258 from YosysHQ/eddie/cleanup

Cleanup a few barnacles across codebase
---

f54bf1631ff37a83733c162e6ebd188c1d5ea18f
diff --cc frontends/aiger/aigerparse.cc
index f8ac2724f,4ecd01993..bd0596cc0
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@@ -372,8 -371,23 +372,8 @@@ void AigerReader::parse_xaiger(const di
  
  	RTLIL::Wire* n0 = module->wire("\\__0__");
  	if (n0)
- 		module->connect(n0, RTLIL::S0);
+ 		module->connect(n0, State::S0);
  
 -	dict<int,IdString> box_lookup;
 -	for (auto m : design->modules()) {
 -		auto it = m->attributes.find("\\abc_box_id");
 -		if (it == m->attributes.end())
 -			continue;
 -		if (m->name.begins_with("$paramod"))
 -			continue;
 -		auto id = it->second.as_int();
 -		auto r = box_lookup.insert(std::make_pair(id, m->name));
 -		if (!r.second)
 -			log_error("Module '%s' has the same abc_box_id = %d value as '%s'.\n",
 -					log_id(m), id, log_id(r.first->second));
 -		log_assert(r.second);
 -	}
 -
  	// Parse footer (symbol table, comments, etc.)
  	std::string s;
  	bool comment_seen = false;