Changeset 1227

Timestamp:

Oct 17, 2010, 11:16:13 PM (13 years ago)

Author:

Peter Johansson

Message:

refs #476 and #385. Move parsing to CopyrightVisitor?. Only parse Files because Directories have no copyrigt to update.

Location:

branches/visitor

Files:

• bin/svncopyright.cc (modified) (1 diff)
• lib/CopyrightVisitor.cc (modified) (2 diffs)
• lib/CopyrightVisitor.h (modified) (2 diffs)
• lib/main_utility.cc (modified) (2 diffs)
• lib/main_utility.h (modified) (1 diff)

branches/visitor/bin/svncopyright.cc

@@ -67 +67 @@
     Directory tree(0,option.root(),"");
 
-    if (option.verbose())
-      std::cout << "Parsing directory tree" << std::endl;
-    tree.parse(option.verbose(), option.ignore_cache());
-    update_copyright(tree, option.verbose());
+    update_copyright(tree, option.verbose(), option.ignore_cache());
   }
   catch (std::runtime_error& e) {

branches/visitor/lib/CopyrightVisitor.cc

@@ -31 +31 @@
   CopyrightVisitor::CopyrightVisitor(std::map<std::string, Alias>& alias, 
                                      bool verbose,
-                                     const std::map<int,svn_revnum_t>& year2rev)
-    : NodeVisitor(), alias_(alias), verbose_(verbose), year2rev_(year2rev)
+                                     const std::map<int,svn_revnum_t>& year2rev,
+                                     bool ignore_cache)
+    : NodeVisitor(), alias_(alias), verbose_(verbose), year2rev_(year2rev),
+      ignore_cache_(ignore_cache)
   {}
 
@@ -51 +53 @@
   void CopyrightVisitor::visit(File& file)
   {
+    file.parse(verbose_, ignore_cache_);
     file.print_copyright(alias_, verbose_, year2rev_);
   }

branches/visitor/lib/CopyrightVisitor.h

@@ -42 +42 @@
   public:
     CopyrightVisitor(std::map<std::string, Alias>&, bool verbose,
-                     const std::map<int, svn_revnum_t>& year2rev);
+                     const std::map<int, svn_revnum_t>& year2rev,
+                     bool ignore_cache);
 
     /**
@@ -61 +62 @@
     bool verbose_;
     const std::map<int, svn_revnum_t>& year2rev_;
+    bool ignore_cache_;
   };
 }} // end of namespace svndigest and namespace theplu

branches/visitor/lib/main_utility.cc

@@ -59 +59 @@
 
 
-  void update_copyright(Node& tree, bool verbose)
+  void update_copyright(Node& tree, bool verbose, bool ignore_cache)
   {
     if (verbose)
@@ -79 +79 @@
     }
 
-    CopyrightVisitor visitor(alias, verbose, year2rev);
+    CopyrightVisitor visitor(alias, verbose, year2rev, ignore_cache);
     tree.traverse(visitor);
   }

branches/visitor/lib/main_utility.h

@@ -46 +46 @@
      \brief update copyright statements in \a node
    */
-  void update_copyright(Node& node, bool verbose);
+  void update_copyright(Node& node, bool verbose, bool ignore_cache);
 
 }} // end of namespace svndigest end of namespace theplu