Changeset 72

Timestamp:

Mar 2, 2006, 11:16:24 PM (18 years ago)

Author:

Peter Johansson

Message:

prefer stl algorithms...

Location:

trunk/lib

Files:

• Directory.cc (modified) (3 diffs)
• File.cc (modified) (1 diff)
• File.h (modified) (2 diffs)
• Node.cc (modified) (1 diff)
• Node.h (modified) (3 diffs)
• Stats.cc (modified) (2 diffs)
• Stats.h (modified) (1 diff)

trunk/lib/Directory.cc

@@ -7 +7 @@
 #include <algorithm>
 #include <fstream>
+#include <functional>
 #include <iostream>
 #include <iterator>
@@ -65 +66 @@
     stats_.reset();
 
-    // empty directory treated as one-liner file
-    if (daughters_.empty())
-      stats_.parse(path_,true);
-
     for (NodeIterator i=daughters_.begin(); i!=daughters_.end(); i++)
       stats_ += (*i)->parse(verbose);
@@ -86 +83 @@
     os << std::endl;
 
-    // Peter, use for_each
-    for (NodeConstIter_ i=daughters_.begin();i!=daughters_.end();i++){
-      (*i)->print_link(os);
-      os << "<br/>" << std::endl;
-    }
+    // print html links to daughter nodes
+    transform(daughters_.begin(), daughters_.end(), 
+              std::ostream_iterator<std::string>(os,"\n"), 
+              std::mem_fun(&Node::html_link));
 
     print_footer(os);
     os.close(); 
 
-    // Peter, use for_each
-    for (NodeConstIter_ i=daughters_.begin();i!=daughters_.end();i++) 
-      (*i)->print(verbose);
+    // print daughter nodes, i.e, this function is recursive
+    for_each(daughters_.begin(), daughters_.end(), 
+             std::bind1st(std::mem_fun(&Node::print), verbose));
+
   }
 

trunk/lib/File.cc

@@ -26 +26 @@
     ss >> revision_;
 
-    binary_ = stats_.parse(path_, binary_);
+    binary_ = stats_.parse(path_);
     return stats_;
   }

trunk/lib/File.h

@@ -18 +18 @@
     /// 
     File(const std::string& path, const std::string& output="") 
-      : Node(path,output), binary_(false) {}
+      : Node(path,output), binary_(false), ignore_(false) {}
 
     ///
@@ -47 +47 @@
     std::string author_;
     bool binary_;
+    bool ignore_;
     u_int revision_;
   

trunk/lib/Node.cc

@@ -51 +51 @@
 
 
+  std::string Node::html_link(void) const
+  { 
+    return "<a href=\"" + output_name() + ".html\">" + name() + "</a><br/>"; 
+  }
+ 
   bool Node::subversion_controlled(void) const
   {

trunk/lib/Node.h

@@ -8 +8 @@
 #include <ostream>
 #include <string>
+#include <sstream>
 
 namespace theplu{
@@ -28 +29 @@
     virtual inline ~Node(void) {};
 
-    const std::string& output_name(void) const { return output_name_; }
+    inline const std::string& output_name(void) const { return output_name_; }
 
     ///
@@ -41 +42 @@
 
     ///
-    /// Prints a html link.
+    /// @return html link.
     ///
-    inline void print_link(std::ostream& os) const
-    { os << "<a href=\"" << output_name() << ".html\">" << name() << "</a>"; }
+    std::string html_link(void) const;
  
     ///

trunk/lib/Stats.cc

@@ -66 +66 @@
 
 
-  bool Stats::parse(const std::string& path, const bool binary)
+  bool Stats::parse(const std::string& path)
   {
-    if (binary){
-      std::map<std::string,std::string> svn_info = info(path);
-      std::stringstream ss(svn_info["Last Changed Rev"]);
-      u_int revision;
-      ss >> revision;
-      add(svn_info["Last Changed Author"],revision);
-      return true;
-    }
-
     // Calling svn blame
     if (blame(path))
@@ -89 +80 @@
       if (line==std::string("binary")){
         is.close();
-        return parse(path,true);
+        return true;
       }
     }

trunk/lib/Stats.h

@@ -29 +29 @@
     /// @return true if file is binary
     ///
-    bool parse(const std::string&, const bool);
+    bool parse(const std::string&);
 
     ///