From 8583395bd38f9a883bd7b63d5a3a55acff42fa23 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 15 Feb 2019 12:59:19 +0000 Subject: [PATCH 1/2] Use ranged-for to iterate over value_sett:valuest This is easier to read and simplifies switching between representations. --- src/pointer-analysis/value_set.cpp | 7 ++----- src/pointer-analysis/value_set_analysis.cpp | 8 ++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/pointer-analysis/value_set.cpp b/src/pointer-analysis/value_set.cpp index 833caffc799..9ef0478aced 100644 --- a/src/pointer-analysis/value_set.cpp +++ b/src/pointer-analysis/value_set.cpp @@ -99,14 +99,11 @@ void value_sett::output( const namespacet &ns, std::ostream &out) const { - for(valuest::const_iterator - v_it=values.begin(); - v_it!=values.end(); - v_it++) + for(const auto &values_entry : values) { irep_idt identifier, display_name; - const entryt &e=v_it->second; + const entryt &e = values_entry.second; if(has_prefix(id2string(e.identifier), "value_set::dynamic_object")) { diff --git a/src/pointer-analysis/value_set_analysis.cpp b/src/pointer-analysis/value_set_analysis.cpp index b93877e9921..6c20e8ba1a0 100644 --- a/src/pointer-analysis/value_set_analysis.cpp +++ b/src/pointer-analysis/value_set_analysis.cpp @@ -41,14 +41,10 @@ void value_sets_to_xml( xmlt &i=dest.new_element("instruction"); i.new_element()=::xml(location); - for(value_sett::valuest::const_iterator - v_it=value_set.values.begin(); - v_it!=value_set.values.end(); - v_it++) + for(const auto &values_entry : value_set.values) { xmlt &var=i.new_element("variable"); - var.new_element("identifier").data= - id2string(v_it->first); + var.new_element("identifier").data = id2string(values_entry.first); #if 0 const value_sett::expr_sett &expr_set= From 24f1625ba702b5373b4fb7edf829e71c05e7a1df Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Mon, 25 Feb 2019 00:53:35 +0000 Subject: [PATCH 2/2] clang-format compatible indent of preprocessor commands Update required as the preceding commit touches nearby lines. --- src/pointer-analysis/value_set_analysis.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pointer-analysis/value_set_analysis.cpp b/src/pointer-analysis/value_set_analysis.cpp index 6c20e8ba1a0..59e5fa54545 100644 --- a/src/pointer-analysis/value_set_analysis.cpp +++ b/src/pointer-analysis/value_set_analysis.cpp @@ -46,7 +46,7 @@ void value_sets_to_xml( xmlt &var=i.new_element("variable"); var.new_element("identifier").data = id2string(values_entry.first); - #if 0 +#if 0 const value_sett::expr_sett &expr_set= v_it->second.expr_set(); @@ -61,7 +61,7 @@ void value_sets_to_xml( var.new_element("value").data= xmlt::escape(value_str); } - #endif +#endif } } }