Changeset 522

Timestamp:

Dec 25, 2007, 1:51:27 AM (13 years ago)

Author:

Peter Johansson

Message:

improved error message when config file is invalid

Location:

trunk

Files:

• bin/svndigest.cc (modified) (1 diff)
• lib/Configuration.cc (modified) (11 diffs)
• lib/Configuration.h (modified) (2 diffs)

trunk/bin/svndigest.cc

@@ -79 +79 @@
     }
     catch (std::runtime_error e) {
-      std::cerr << e.what() << std::endl;
+      std::cerr << "svndigest: invalid config file\n"
+                << e.what() << std::endl;
       exit(-1);
     }

trunk/lib/Configuration.cc

@@ -148 +148 @@
         continue;
       }
-      getline(ss, tmp, '=');
-      std::string lhs = trim(tmp);
-      getline(ss, tmp);
-      std::string rhs = trim(tmp);
+      std::string lhs;
+      getline(ss, lhs, '=');
+      lhs = trim(lhs);
+      std::string rhs;
+      getline(ss, rhs);
+      rhs = trim(rhs);
       if (rhs.empty()){
-        std::stringstream mess;
-        mess << "svndigest: invalid config file: "
-             << "line: `" << line << "' is invalid.";
-        throw std::runtime_error(mess.str());
+        throw Config_error(line, "expected format: <lhs> = <rhs>");
       }
       if (section == "copyright-alias"){
@@ -163 +162 @@
         if (iter!=copyright_alias_.end() && iter->first==lhs){
           std::stringstream mess;
-          mess << "svndigest: invalid config file: "
-               << "in copright-alias section " << lhs << " defined twice.";
-          throw std::runtime_error(mess.str());
+          mess << "in copright-alias section " << lhs << " defined twice.";
+          throw Config_error(line, mess.str());
         }
         
@@ -176 +174 @@
         else {
           std::stringstream mess;
-          mess << "svndigest: invalid config file: "
-               << "in trac section" << lhs + " is invalid option.";
-          throw std::runtime_error(mess.str());
+          mess << "in trac section" << lhs + " is invalid option.";
+          throw Config_error(line, mess.str());
         }
       }
@@ -188 +185 @@
             missing_copyright_warning_ = true;
           else {
-            std::stringstream mess;
-            mess << "svndigest: invalid config file: "
-                 << "line: `" << line << "' is invalid.";
-            throw std::runtime_error(mess.str());
+            throw Config_error(line, "");
           }
       }
@@ -203 +197 @@
         if (codon(lhs)) {
           std::stringstream mess;
-          mess << "svndigest: invalid config file\n"
-               << "line: `" << line << "' is invalid.\n"
-               << "clashes with previous given file name pattern: ";
+          mess << "clashes with previous given file name pattern: ";
           // find previous file-name-pattern
           for (String2Codons::const_iterator i(string2codons_.begin());
@@ -215 +207 @@
             }
           }
-          throw std::runtime_error(mess.str());
+          throw Config_error(line, mess.str());
         }
         std::stringstream ss(rhs);
@@ -221 +213 @@
         while (getline(ss, start, ':')) {
           start = trim(start);
-          start = start.substr(1, start.size()-2);
           std::string end;
           getline(ss, end, ';');
           end = trim(end);
-          end = end.substr(1, end.size()-2);
-          if (!start.empty() && !end.empty()) {
-            replace(start, "\\n", "\n");
-            replace(end, "\\n", "\n");
-            add_codon(lhs, start, end);
+          if (start.empty() && end.empty())
+            continue;
+          try {
+            if (start.empty() || start=="\"\"") {
+              throw std::runtime_error("start-code is empty");
+            }
+            else if (start.size()<3) {
+              std::stringstream mess;
+              mess << "start-code `" << start << "' is invalid";
+              throw std::runtime_error(mess.str());
+            }
+            start = trim(start, '"');
+            if (end.empty() || end=="\"\"") {
+              throw std::runtime_error("end-code is empty");
+            }
+            else if (end.size()<3) {
+              std::stringstream mess;
+              mess << "end-code `" << end << "' is invalid";
+              throw std::runtime_error(mess.str());
+            }
+            end = trim(end, '"');
           }
-          else if (!start.empty() || !end.empty()) {
-            std::cout << start << "\n" << end << std::endl;
-            std::stringstream mess;
-            mess << "svndigest: invalid config file\n"
-                 << "line: `" << line << "' is invalid.\n";
-            throw std::runtime_error(mess.str());
+          catch (std::runtime_error& e){
+            throw Config_error(line, e.what());
           }
+          replace(start, "\\n", "\n");
+          replace(end, "\\n", "\n");
+          add_codon(lhs, start, end);
         }
       } 
@@ -249 +255 @@
         if (const std::pair<std::string, std::string>* entry=dictionary(lhs)) {
           std::stringstream mess;
-          mess << "svndigest: invalid config file\n"
-               << "line: `" << line << "' is invalid.\n"
-               << "clashes with previous given file name pattern: "
+          mess << "clashes with previous given file name pattern: "
                << "`" << entry->first << "'";
-          throw std::runtime_error(mess.str());
+          throw Config_error(line, mess.str());
         }
         lhs = trim(lhs);
@@ -260 +264 @@
           dictionary_.push_back(std::make_pair(lhs, rhs));
         else if (!lhs.empty() || !rhs.empty()) {
-            std::stringstream mess;
-            mess << "svndigest: invalid config file\n"
-                 << "line: `" << line << "' is invalid.\n";
-            throw std::runtime_error(mess.str());
+          throw Config_error(line, "");
         }
       } 
@@ -337 +338 @@
       return std::string("\\n") + str.substr(1); 
     return str;
+  }
+
+
+  std::string trim(std::string str, char c)
+  {
+    if (str.size()<2 || str[0]!=c || str[str.size()-1]!=c){
+      std::stringstream mess;
+      mess << "expected `" << str << "' to be surrounded by `" << c << "'";
+      throw std::runtime_error(mess.str());
+    }
+    return str.substr(1, str.size()-2);
   }
 
@@ -489 +501 @@
   }
 
+  
+  Config_error::Config_error(const std::string& line,const std::string& message)
+    : std::runtime_error(std::string("line: `") + line + 
+                         std::string("' is invalid.\n") + message)
+  {}
 
 }} // end of namespace svndigest and namespace theplu

trunk/lib/Configuration.h

@@ -29 +29 @@
 #include <iostream>
 #include <map>
+#include <stdexcept>
 #include <string>
 #include <utility>
@@ -141 +142 @@
   std::string trans_beg_code(std::string);
 
+  /**
+     Trim \a c from beginning and end of string \a str;
+     
+     \return resulting string
+
+     \throw if first or last character of \a str is NOT character \a c
+  */
+  std::string trim(std::string str, char c);
+
+  /**
+     \brief Class for errors when reading config file.
+   */
+  class Config_error : public std::runtime_error
+  {
+  public:
+    Config_error(const std::string& line, const std::string& message);
+  };
+
 }} // end of namespace svndigest and namespace theplu