Changeset 523

Timestamp:

Dec 25, 2007, 2:51:54 AM (13 years ago)

Author:

Peter Johansson

Message:

fixes ticket:284 - validate [file-name-dictionary] section in config file

Location:

trunk

Files:

• lib/Configuration.cc (modified) (5 diffs)
• lib/Configuration.h (modified) (2 diffs)
• lib/utility.cc (modified) (1 diff)
• test/utility_test.cc (modified) (1 diff)

trunk/lib/Configuration.cc

@@ -66 +66 @@
   {
     if (const std::pair<std::string,std::string>* dict=dictionary(file_name))
-      try {
-        file_name = translate(file_name, *dict);
-      }
-      catch (std::runtime_error& e) {
-        std::stringstream mess;
-        mess << "svndigest: invalid config file: "
-             << "expression " << dict->second << " is invalid";
-        if (e.what()[0])
-          mess << "because " << e.what() << " is a too large.";
-        else
-          mess << ".";
-        throw std::runtime_error(mess.str());
-      }
+      file_name = translate(file_name, *dict);
     for (String2Codons::const_iterator i(string2codons_.begin());
          i!=string2codons_.end(); ++i) {
@@ -125 +113 @@
   {
     set_default();
+    validate_dictionary();
   }
 
@@ -268 +257 @@
       } 
     }
+    validate_dictionary();
   }
 
@@ -300 +290 @@
         size_t n = 0;
         ss >> n;
-        if (n>vec.size()){
+        if (n>vec.size() || n==0){
           std::stringstream mess;
-          mess << n;
-          throw std::runtime_error(mess.str());
-        }
-        if (n) {
-          res += vec[n-1];
+          mess << "svndigest: invalid config file: "
+               << "expression " << dic.second << " is invalid";
+          if (n)
+            mess << "because " << n << " is a too large.";
+          throw std::runtime_error("");       
+        }
+        res += vec[n-1];
+        ++i;
+        if (n>9){
           ++i;
-          if (n>9){
+          if (n>99)
             ++i;
-            if (n>99)
-              ++i;
-          }
-        }
-        else
-          throw std::runtime_error("");
+
+        }
       }
       else
@@ -412 +402 @@
 
 
+  void Configuration::validate_dictionary(void) const
+  {
+    VectorPair::const_iterator end(dictionary_.end());
+    for (VectorPair::const_iterator iter(dictionary_.begin());iter!=end;++iter){
+      std::string word(iter->first);
+      replace(word, "*", "");
+      replace(word, "?", "");
+      // throws if dictionary is invalid
+      translate(word, *iter);
+    }
+
+  }
+
+
   std::ostream& operator<<(std::ostream& os, const Configuration& conf)
   {

trunk/lib/Configuration.h

@@ -104 +104 @@
        Translate string \a str using dictionary \a dict
 
-       \note \a str must be equal to d.first, or behavior is unspecified.
+       \note \a str must be equal to d.first (see function equal), 
+       or behavior is unspecified.
 
        \throw if a '$' character is not followed by a positive integer
@@ -112 +113 @@
                           const std::pair<std::string, std::string>& d) const;
     
+    void validate_dictionary(void) const;
+
     static Configuration* instance_;
 

trunk/lib/utility.cc

@@ -102 +102 @@
         equal(first1+1, end1, first2+1, end2) )
       return true;
-    if (first1!=end1 && *first1=='*' && first2!=end2 && 
-        equal(first1, end1, first2+1, end2) )
+    if ( (first1!=end1 && first2!=end2 && (*first1=='*'|| *first2=='*') ) && 
+         (equal(first1+1, end1, first2, end2) || 
+          equal(first1, end1, first2+1, end2))
+         )
       return true;
-    if (first2!=end2 && *first2=='*' && first1!=end1 && 
-        equal(first1+1, end1, first2, end2) )
-      return true;
-        
     return false;
   }

trunk/test/utility_test.cc

@@ -47 +47 @@
   ok &= test_equal(true,"peter", "p*"); 
   ok &= test_equal(false,"peter", "p*j"); 
+  ok &= test_equal(true,"peter", "*peter"); 
 
   std::vector<std::string> vec;