Use find_symbol_identifiers in expr2c

romainbrenguier · romainbrenguier · commit 3abe34e62825 · 2019-06-19T11:34:23.000+01:00
Instead of find_symbol_or_nexts. Language front-end should not have to
deal with "next symbols".
diff --git a/src/ansi-c/expr2c.cpp b/src/ansi-c/expr2c.cpp
@@ -112,8 +112,7 @@ static std::string clean_identifier(const irep_idt &id)
 
 void expr2ct::get_shorthands(const exprt &expr)
 {
-  find_symbols_sett symbols;
-  find_symbols_or_nexts(expr, symbols);
+  const std::unordered_set<irep_idt> symbols = find_symbol_identifiers(expr);
 
   // avoid renaming parameters, if possible
   for(const auto &symbol_id : symbols)

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,7 @@ static std::string clean_identifier(const irep_idt &id)`
`112`	`112`
`113`	`113`	`void expr2ct::get_shorthands(const exprt &expr)`
`114`	`114`	`{`
`115`		`- find_symbols_sett symbols;`
`116`		`- find_symbols_or_nexts(expr, symbols);`
	`115`	`+ const std::unordered_set<irep_idt> symbols = find_symbol_identifiers(expr);`
`117`	`116`
`118`	`117`	`// avoid renaming parameters, if possible`
`119`	`118`	`for(const auto &symbol_id : symbols)`