Use default member initializers and constructor delegation

[builder.git] / source / analyzer.cpp

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index 70f5f2076f3a68de00f74479f5f36f2565edee14..b3b1f217667951ec9df9e739bf8de20eb14f5cd9 100644 (file)
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -1,10 +1,12 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include "analyzer.h"
 #include "builder.h"
+#include "buildgraph.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 #include "target.h"
 #include "tool.h"
 
@@ -12,10 +14,7 @@ using namespace std;
 using namespace Msp;
 
 Analyzer::Analyzer(Builder &b):
-       builder(b),
-       mode(DEPS),
-       max_depth(0),
-       full_paths(false)
+       builder(b)
 { }
 
 void Analyzer::analyze()
@@ -23,12 +22,12 @@ void Analyzer::analyze()
        if(mode==RDEPS)
        {
                rdepends.clear();
-               const Builder::TargetMap &targets = builder.get_targets();
-               for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+               for(const auto &kvp: builder.get_build_graph().get_targets())
                {
-                       const Target::Dependencies &depends = i->second->get_depends();
-                       for(Target::Dependencies::const_iterator j=depends.begin(); j!=depends.end(); ++j)
-                               rdepends[*j].insert(i->second);
+                       for(Target *d: kvp.second->get_dependencies())
+                               rdepends[d].insert(kvp.second);
+                       for(Target *d: kvp.second->get_transitive_dependencies())
+                               rdepends[d].insert(kvp.second);
                }
        }
 
@@ -42,15 +41,14 @@ void Analyzer::analyze()
        row.push_back("Rebuild");
        table.push_back(row);
        
-       Target &cmdline = *builder.get_target("cmdline");
+       Target &goals = builder.get_build_graph().get_goals();
        if(mode==RDEPS)
        {
-               const Target::Dependencies &deps = cmdline.get_depends();
-               for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-                       build_depend_table(**i, 0);
+               for(Target *d: goals.get_dependencies())
+                       build_depend_table(*d, 0);
        }
        else
-               build_depend_table(cmdline, 0);
+               build_depend_table(goals, 0);
 
        print_table();
 }
@@ -66,7 +64,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
                if(const ObjectFile *obj = dynamic_cast<const ObjectFile *>(&tgt))
                        return build_depend_table(obj->get_source(), depth);
        }
-       else if(mode==REBUILD && !tgt.get_rebuild() && !real->get_rebuild())
+       else if(mode==REBUILD && !tgt.needs_rebuild())
                /* All targets that depend on to-be-built targets will be rebuilt
                themselves, so we can stop here. */
                return;
@@ -94,13 +92,8 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
        else
                row.push_back("");
 
-       if(tgt.get_rebuild())
-       {
-               if(tgt.get_rebuild_reason().empty())
-                       row.push_back("Yes (no reason)");
-               else
-                       row.push_back(tgt.get_rebuild_reason());
-       }
+       if(tgt.needs_rebuild())
+               row.push_back(tgt.get_rebuild_reason());
 
        table.push_back(row);
 
@@ -113,12 +106,16 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
                        depends.assign(rdeps.begin(), rdeps.end());
                }
                else
-                       depends = tgt.get_depends();
+               {
+                       depends = tgt.get_dependencies();
+                       const Target::Dependencies &tdeps = tgt.get_transitive_dependencies();
+                       depends.insert(depends.end(), tdeps.begin(), tdeps.end());
+               }
 
-               depends.sort(full_paths ? target_order_full : target_order);
+               sort(depends, (full_paths ? target_order_full : target_order));
 
-               for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
-                       build_depend_table(**i, depth+1);
+               for(Target *d: depends)
+                       build_depend_table(*d, depth+1);
        }
 }
 
@@ -127,22 +124,22 @@ void Analyzer::print_table() const
        vector<string::size_type> col_width;
 
        // Determine column widths
-       for(Table::const_iterator i=table.begin(); i!=table.end(); ++i)
+       for(const vector<string> &r: table)
        {
-               if(col_width.size()<i->size())
-                       col_width.resize(i->size(), 0);
-               for(unsigned j=0; j<i->size(); ++j)
-                       col_width[j] = max(col_width[j], (*i)[j].size());
+               if(col_width.size()<r.size())
+                       col_width.resize(r.size(), 0);
+               for(unsigned j=0; j<r.size(); ++j)
+                       col_width[j] = max(col_width[j], r[j].size());
        }
 
-       for(Table::const_iterator i=table.begin(); i!=table.end(); ++i)
+       for(const vector<string> &r: table)
        {
                string line;
-               for(unsigned j=0; j<i->size(); ++j)
+               for(unsigned j=0; j<r.size(); ++j)
                {
                        if(j>0)
                                line += "  ";
-                       line += lexical_cast((*i)[j], Fmt("%-s").width(col_width[j]));
+                       line += lexical_cast<string>(r[j], Fmt("%-s").width(col_width[j]));
                }
                IO::print("%s\n", line);
        }