Miscellaneous minor code cleanups

[builder.git] / source / analyzer.cpp

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index 0db55c76b637942ba997bff9b2ee90d05237e58b..37c8911c4bcb3e8562837eaae5634c8d9e961bcd 100644 (file)
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -1,19 +1,18 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <msp/path/path.h>
+#include <msp/fs/utils.h>
+#include <msp/io/print.h>
 #include "analyzer.h"
 #include "builder.h"
 #include "install.h"
 #include "objectfile.h"
 #include "package.h"
+#include "sourcefile.h"
 #include "target.h"
 
 using namespace std;
@@ -26,11 +25,10 @@ Analyzer::Analyzer(Builder &b):
        full_paths(false)
 { }
 
-/**
-Performs the analysis and prints out the resulting dependency tree.
-*/
 void Analyzer::analyze()
 {
+       table.clear();
+
        TableRow row;
        row.push_back("Name");
        row.push_back("Package");
@@ -43,25 +41,19 @@ void Analyzer::analyze()
        print_table();
 }
 
-/**
-Adds rows to the table for the given target and it' dependencies.
-
-@param   tgt    Target to be processed
-@param   depth  Recursion level of the target (top level is 0)
-*/
 void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 {
        if(mode!=REBUILD && mode!=ALLDEPS)
        {
                // Skip trivial targets
-               if(dynamic_cast<ObjectFile *>(&tgt))
-                       return build_depend_table(*tgt.get_depends().front(), depth);
-               else if(dynamic_cast<Install *>(&tgt))
-                       return build_depend_table(*tgt.get_depends().front(), depth);
+               if(ObjectFile *obj=dynamic_cast<ObjectFile *>(&tgt))
+                       return build_depend_table(obj->get_source(), depth);
+               else if(Install *inst=dynamic_cast<Install *>(&tgt))
+                       return build_depend_table(inst->get_source(), depth);
        }
        else if(mode==REBUILD && !tgt.get_rebuild())
                /* All targets that depend on to-be-built targets will be rebuilt
-                  themselves, so we cn stop here. */
+               themselves, so we cn stop here. */
                return;
        
        TableRow row;
@@ -70,7 +62,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
        if(full_paths)
                fn=tgt.get_name();
        else
-               fn=Path::Path(tgt.get_name())[-1];
+               fn=FS::basename(tgt.get_name());
        row.push_back(string(depth*2, ' ')+fn);
 
        const Package *pkg=tgt.get_package();
@@ -101,9 +93,6 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
        }
 }
 
-/**
-Prints out the table that resulted from the analysis.
-*/
 void Analyzer::print_table() const
 {
        vector<unsigned> col_width;
@@ -119,15 +108,14 @@ void Analyzer::print_table() const
 
        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);
        }
 }