Style update: add spaces around assignment operators

[builder.git] / source / analyzer.cpp

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index 6664477598d653aa3d4a05950a08c62a808e6a42..f8af44ff9a6295497102bd80989ef3f64c24c096 100644 (file)
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -5,10 +5,8 @@ Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <iomanip>
-#include <iostream>
-#include <sstream>
 #include <msp/fs/utils.h>
+#include <msp/io/print.h>
 #include "analyzer.h"
 #include "builder.h"
 #include "install.h"
@@ -29,6 +27,8 @@ Analyzer::Analyzer(Builder &b):
 
 void Analyzer::analyze()
 {
+       table.clear();
+
        TableRow row;
        row.push_back("Name");
        row.push_back("Package");
@@ -46,9 +46,9 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
        if(mode!=REBUILD && mode!=ALLDEPS)
        {
                // Skip trivial targets
-               if(ObjectFile *obj=dynamic_cast<ObjectFile *>(&tgt))
+               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(&tgt))
                        return build_depend_table(obj->get_source(), depth);
-               else if(Install *inst=dynamic_cast<Install *>(&tgt))
+               else if(Install *inst = dynamic_cast<Install *>(&tgt))
                        return build_depend_table(inst->get_source(), depth);
        }
        else if(mode==REBUILD && !tgt.get_rebuild())
@@ -60,12 +60,12 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 
        string fn;
        if(full_paths)
-               fn=tgt.get_name();
+               fn = tgt.get_name();
        else
-               fn=FS::basename(tgt.get_name());
+               fn = FS::basename(tgt.get_name());
        row.push_back(string(depth*2, ' ')+fn);
 
-       const Package *pkg=tgt.get_package();
+       const Package *pkg = tgt.get_package();
        if(pkg)
                row.push_back(pkg->get_name());
        else
@@ -85,7 +85,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 
        if(!max_depth || depth<max_depth-1)
        {
-               const TargetList &depends=tgt.get_depends();
+               const TargetList &depends = tgt.get_depends();
                //XXX If we want to sort the targets, we need to take the value of full_paths into account
                //depends.sort(target_order);
                for(TargetList::const_iterator i=depends.begin(); i!=depends.end(); ++i)
@@ -95,7 +95,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 
 void Analyzer::print_table() const
 {
-       vector<unsigned> col_width;
+       vector<string::size_type> col_width;
 
        // Determine column widths
        for(Table::const_iterator i=table.begin(); i!=table.end(); ++i)
@@ -103,20 +103,19 @@ void Analyzer::print_table() const
                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());
+                       col_width[j] = max(col_width[j], (*i)[j].size());
        }
 
        for(Table::const_iterator i=table.begin(); i!=table.end(); ++i)
        {
-               ostringstream ss;
-               ss<<left;
+               string line;
                for(unsigned j=0; j<i->size(); ++j)
                {
                        if(j>0)
-                               ss<<"  ";
-                       ss<<setw(col_width[j])<<(*i)[j];
+                               line += "  ";
+                       line += lexical_cast((*i)[j], Fmt("%-s").width(col_width[j]));
                }
-               cout<<ss.str()<<'\n';
+               IO::print("%s\n", line);
        }
 }