Changeset 265

Timestamp:

May 1, 2007, 2:27:59 PM (16 years ago)

Author:

Peter Johansson

Message:

fixes #170

Location:

trunk/lib

Files:

• Parser.cc (modified) (2 diffs)
• Stats.cc (modified) (5 diffs)

trunk/lib/Parser.cc

@@ -40 +40 @@
   {
     std::ifstream is(path.c_str());
+    assert(is.good());
     std::vector<std::pair<std::string, std::string> > codon;
     if (match_end(path.rbegin(), path.rend(), ".ac") ||
@@ -116 +117 @@
           }
         }
-        if (!mode && match_begin(iter,str.end(), codon[mode-1].second)){
+        assert(mode==0 || mode-1<codon.size());
+        if (mode && match_begin(iter,str.end(), codon[mode-1].second)){
           mode=0;
           continue;
         }
-
         // A line of code or comment must contain at least one
         // alphanumerical character.
         if (isalnum(*iter)) {
-          if (!mode)
+          if (!mode) {
             lt=code;
-          else if (mode!=code)
+          }
+          else if (lt!=code) {
             lt=comment;
+          }
         }
       }
-      if (!mode && codon[mode-1].second==std::string("\n"))
+      if (mode && codon[mode-1].second==std::string("\n"))
         mode=0;
-
       type_.push_back(lt);
     }

trunk/lib/Stats.cc

@@ -92 +92 @@
 
     std::vector<u_int>* total = &(total_[user]);
+    assert(total);
     if (total->size() < rev+1){
       total->reserve(revision_ + 1);
@@ -101 +102 @@
 
     std::vector<u_int>* code = &(code_[user]);
+    assert(code);
     if (code->size() < rev+1){
       code->reserve(revision_ + 1);
@@ -113 +115 @@
 
     std::vector<u_int>* comments = &(comments_[user]);
+    assert(comments);
     if (comments->size() < rev+1){
       comments->reserve(revision_ + 1);
@@ -125 +128 @@
 
     std::vector<u_int>* empty = &(empty_[user]);
+    assert(empty);
     if (empty->size() < rev+1){
       empty->reserve(revision_ + 1);
@@ -145 +149 @@
     SVNblame svn_blame(path);
     while (const SVNblame::blame_information * bi=svn_blame.next()) {
+      assert(bi);
       // to handle symbolic links
       if (count==parser.type().end())
         add(bi->author, bi->revision, Parser::empty);
-      else 
+      else {
         add(bi->author, bi->revision, *count);
-      ++count;
+        ++count;
+      }
     }