Changeset 1459

Timestamp:

Jan 9, 2012, 3:49:37 AM (11 years ago)

Author:

Peter Johansson

Message:

quote consistently. update release year

Location:

trunk

Files:

• .release_year (modified) (1 diff)
• lib/Configuration.cc (modified) (32 diffs)
• lib/CopyrightVisitor.cc (modified) (2 diffs)
• lib/main_utility.cc (modified) (1 diff)
• lib/utility.cc (modified) (1 diff)

trunk/.release_year

@@ -1 @@
-2011
+2012

trunk/lib/Configuration.cc

@@ -53 +53 @@
 
 
-  void Configuration::add_codon(std::string key, std::string start, 
+  void Configuration::add_codon(std::string key, std::string start,
                                 std::string end)
   {
@@ -62 +62 @@
       if (i->first == key)
         iter = i;
-    
+
     if (iter==string2codons_.end())
       string2codons_.push_back(std::make_pair(key, VectorPair(1,p)));
@@ -89 +89 @@
   {
     std::ostringstream ss;
-    if (const std::vector<std::pair<std::string, std::string> >* 
+    if (const std::vector<std::pair<std::string, std::string> >*
         codons = codon(path)) {
       using std::string;
       typedef std::vector<std::pair<string, string> >::const_iterator citerator;
-      for ( citerator codon=codons->begin(); codon!=codons->end(); ++codon) 
+      for ( citerator codon=codons->begin(); codon!=codons->end(); ++codon)
         ss << codon->first << codon->second;
     }
@@ -105 +105 @@
     return result;
   }
-  
-
-  const std::vector<std::pair<std::string, std::string> >* 
-  Configuration::codon(std::string file_name) const 
+
+
+  const std::vector<std::pair<std::string, std::string> >*
+  Configuration::codon(std::string file_name) const
   {
     if (const std::pair<std::string,std::string>* dict=dictionary(file_name))
@@ -132 +132 @@
   }
 
-  const std::pair<std::string,std::string>* 
+  const std::pair<std::string,std::string>*
   Configuration::dictionary(std::string lhs) const
   {
@@ -204 +204 @@
       }
       if (section == "copyright-alias"){
-        std::map<std::string,Alias>::iterator iter = 
+        std::map<std::string,Alias>::iterator iter =
           copyright_alias_.lower_bound(lhs);
         if (iter!=copyright_alias_.end() && iter->first==lhs){
@@ -211 +211 @@
           throw Config_error(line, mess.str());
         }
-        
+
         // insert alias
         copyright_alias_.insert(iter,std::make_pair(lhs, Alias(rhs,copyright_alias_.size())));
@@ -246 +246 @@
           tab_size_ = strtoul(rhs.c_str(), NULL, 10);
           if (tab_size_==0) {
-            throw Config_error(line, 
+            throw Config_error(line,
                        "invalid value: tab-size must be a positive integer");
           }
@@ -277 +277 @@
         }
         author_color_[lhs] = rhs;
-      }     
+      }
       else if (section == "parsing-codons") {
         if (!parsing_found) {
@@ -284 +284 @@
           string2codons_.clear();
         }
-        
+
         if (codon(lhs)) {
           std::stringstream mess;
@@ -292 +292 @@
                i!=string2codons_.end(); ++i) {
             if (fnmatch(lhs.c_str(), i->first.c_str())) {
-              mess << "`" << i->first << "'";
+              mess << "'" << i->first << "'";
               break;
             }
@@ -313 +313 @@
             else if (start.size()<3) {
               std::stringstream mess;
-              mess << "start-code `" << start << "' is invalid";
+              mess << "start-code '" << start << "' is invalid";
               throw std::runtime_error(mess.str());
             }
@@ -322 +322 @@
             else if (end.size()<3) {
               std::stringstream mess;
-              mess << "end-code `" << end << "' is invalid";
+              mess << "end-code '" << end << "' is invalid";
               throw std::runtime_error(mess.str());
             }
@@ -334 +334 @@
           add_codon(lhs, start, end);
         }
-      } 
+      }
       else if (section == "file-name-dictionary") {
         if (!dictionary_found) {
@@ -341 +341 @@
           dictionary_.clear();
         }
-        
+
         if (const std::pair<std::string, std::string>* entry=dictionary(lhs)) {
           std::stringstream mess;
           mess << "clashes with previous given file name pattern: "
-               << "`" << entry->first << "'";
+               << "'" << entry->first << "'";
           throw Config_error(line, mess.str());
         }
         lhs = trim(lhs);
         rhs = trim(rhs);
-        if (!lhs.empty() && !rhs.empty()) 
+        if (!lhs.empty() && !rhs.empty())
           dictionary_.push_back(std::make_pair(lhs, rhs));
         else if (!lhs.empty() || !rhs.empty()) {
           throw Config_error(line, "");
         }
-      } 
+      }
       else if (section == "svn-props") {
         svn_props_.push_back(std::make_pair(lhs, empty_str_map_));
@@ -376 +376 @@
           }
           catch (std::runtime_error e) {
-            throw Config_error(line, 
+            throw Config_error(line,
                                "unknown format: " + rhs + "\n" + e.what());
           }
@@ -385 +385 @@
           }
           catch (std::runtime_error e) {
-            throw Config_error(line, 
+            throw Config_error(line,
                                "unknown format: " + rhs + "\n" + e.what());
           }
@@ -400 +400 @@
       std::ostringstream oss;
       oss << "Valid arguments are:\n"
-          << "  - `none'\n"
-          << "  - `pdf'\n"
-          << "  - `png'\n"
-          << "  - `svg'";
+          << "  - 'none'\n"
+          << "  - 'pdf'\n"
+          << "  - 'png'\n"
+          << "  - 'svg'";
       throw std::runtime_error(oss.str());
     }
@@ -415 +415 @@
       std::ostringstream oss;
       oss << "Valid arguments are:\n"
-          << "  - `none'\n"
-          << "  - `png'\n"
-          << "  - `svg'";
+          << "  - 'none'\n"
+          << "  - 'png'\n"
+          << "  - 'svg'";
       throw std::runtime_error(oss.str());
     }
@@ -440 +440 @@
 
 
-  std::string 
+  std::string
   Configuration::translate(const std::string& str,
                            const std::pair<std::string, std::string>& dic) const
@@ -450 +450 @@
       mess << "invalid config file: "
            << "expression " << dic.first << " is invalid";
-      throw std::runtime_error(mess.str());       
-    }
-    for (std::string::const_iterator i(dic.second.begin()); 
+      throw std::runtime_error(mess.str());
+    }
+    for (std::string::const_iterator i(dic.second.begin());
          i!=dic.second.end(); ++i) {
       if (*i == '$') {
@@ -464 +464 @@
           if (n)
             mess << "because " << n << " is a too large.";
-          throw std::runtime_error(mess.str());       
+          throw std::runtime_error(mess.str());
         }
         res += vec[n-1];
@@ -494 +494 @@
   {
     if (str.size()>0 && str[0]=='\n')
-      return std::string("\\n") + str.substr(1); 
+      return std::string("\\n") + str.substr(1);
     return str;
   }
@@ -503 +503 @@
     if (str.size()<2 || str[0]!=c || str[str.size()-1]!=c){
       std::stringstream mess;
-      mess << "expected `" << str << "' to be surrounded by `" << c << "'";
+      mess << "expected '" << str << "' to be surrounded by '" << c << "'";
       throw std::runtime_error(mess.str());
     }
@@ -587 +587 @@
   Configuration::svn_properties(const std::string& filename) const
   {
-    // reverse backwards as we prefer to to pick properties defined later 
-    std::vector<props>::const_reverse_iterator iter = 
+    // reverse backwards as we prefer to to pick properties defined later
+    std::vector<props>::const_reverse_iterator iter =
       find_fn(svn_props_.rbegin(), svn_props_.rend(), filename);
     if (iter==svn_props_.rend())
@@ -657 +657 @@
       os << "no\n";
     os << "# defining start of copyright statement\n";
-    os << "copyright-string = " << conf.copyright_string_ << "\n"; 
+    os << "copyright-string = " << conf.copyright_string_ << "\n";
 
     os << "\n"
@@ -674 +674 @@
     PairSecondCompare<const std::string, Alias, IdCompare> comp(id);
     std::sort(vec.begin(),vec.end(), comp);
-              
+
 
     for (vector::const_iterator i(vec.begin()); i!=vec.end(); ++i) {
@@ -704 +704 @@
        << "[svn-props]\n";
     os << "# COPYING = svndigest:ignore\n";
-    std::vector<props>::const_iterator p=conf.svn_props_.begin(); 
+    std::vector<props>::const_iterator p=conf.svn_props_.begin();
     for ( ; p!=conf.svn_props_.end(); ++p) {
       os << p->first << " = ";
@@ -729 +729 @@
     os << "\n"
        << "### Section for setting dictionary for file names.\n"
-       << "### Prior looking for file name pattern in section " 
+       << "### Prior looking for file name pattern in section "
        << "[parsing-codons],\n"
        << "### the file name may be translated according to the rules \n"
        << "### in this section. In default setting there is, for example,\n"
-       << "### a rule to translate `<FILENAME>.in' to `<FILENAME>'.\n"
+       << "### a rule to translate '<FILENAME>.in' to '<FILENAME>'.\n"
        << "### The format of the entries is:\n"
        << "###    file-name-pattern = new-name\n"
@@ -741 +741 @@
     os << "[file-name-dictionary]\n";
     for (size_t i=0; i<conf.dictionary_.size(); ++i)
-      os << conf.dictionary_[i].first << " = " 
-         << conf.dictionary_[i].second << "\n"; 
+      os << conf.dictionary_[i].first << " = "
+         << conf.dictionary_[i].second << "\n";
 
     if (!conf.string2codons_.empty()) {
@@ -755 +755 @@
          << "[parsing-codons]\n";
       for (size_t i=0; i<conf.string2codons_.size(); ++i) {
-        os << conf.string2codons_[i].first << " = "; 
+        os << conf.string2codons_[i].first << " = ";
         for (size_t j=0; j<conf.string2codons_[i].second.size(); ++j) {
           if (j)
             os << "  ;  ";
-          os << "\"" << trans_beg_code(conf.string2codons_[i].second[j].first) 
-             << "\":\"" 
-             << trans_end_code(conf.string2codons_[i].second[j].second) 
-             << "\""; 
+          os << "\"" << trans_beg_code(conf.string2codons_[i].second[j].first)
+             << "\":\""
+             << trans_end_code(conf.string2codons_[i].second[j].second)
+             << "\"";
         }
         os << "\n";
@@ -770 +770 @@
   }
 
-  
+
   Config_error::Config_error(const std::string& line,const std::string& message)
-    : std::runtime_error(std::string("line: `") + line + 
+    : std::runtime_error(std::string("line: '") + line +
                          std::string("' is invalid.\n") + message)
   {}

trunk/lib/CopyrightVisitor.cc

@@ -140 +140 @@
     if (!detect_copyright(file.path(),old_block, start_line, end_line, prefix)){
       if (Configuration::instance().missing_copyright_warning())
-        std::cerr << "svncopyright: warning: no copyright statement found in `"
+        std::cerr << "svncopyright: warning: no copyright statement found in '"
                   << file.path() << "'\n";
       return;
@@ -231 +231 @@
       // if alias not found for author
       if (i==alias_.end()) {
-        std::cerr << "svncopyright: warning: no copyright alias found for `"
+        std::cerr << "svncopyright: warning: no copyright alias found for '"
                   << *user << "'\n";
         // insert alias to avoid multiple warnings.

trunk/lib/main_utility.cc

@@ -47 +47 @@
       assert(is.good());
       if (verbose)
-        std::cout << "Reading configuration file: `" << file << "'\n";
+        std::cout << "Reading configuration file: '" << file << "'\n";
       try {
         config.load(is);

trunk/lib/utility.cc

@@ -214 +214 @@
     if (code){
       std::stringstream ss;
-      ss << "mkdir: `" << dir << "': ";
+      ss << "mkdir: '" << dir << "': ";
       throw yat::utility::errno_error(ss.str());
     }