Changeset 509

Timestamp:

Dec 8, 2007, 10:42:07 PM (13 years ago)

Author:

Peter Johansson

Message:

changed format of codons in config file. Also changed corresponding access function to return a pointer, allowing to return NULL when key is not found.

Location:

trunk/lib

Files:

• Configuration.cc (modified) (5 diffs)
• Configuration.h (modified) (1 diff)

trunk/lib/Configuration.cc

@@ -153 +153 @@
           }
     }
-    add_codon("*", "", "");
   }
 
@@ -171 +170 @@
 
 
-  const std::vector<std::pair<std::string, std::string> >& 
+  const std::vector<std::pair<std::string, std::string> >* 
   Configuration::parse_codon(std::string file_name) const 
   {
@@ -178 +177 @@
       if (svndigest::equal(file_name.begin(), file_name.end(), 
                            i->first.begin(), i->first.end()) ) {
-        return i->second;
+        return &i->second;
       }
     }
-    return string2codons_.back().second;
+    return NULL;
   }
 
@@ -304 +303 @@
       os << "trac-root = " << conf.trac_root() << "\n";
 
-    if (conf.string2codons_.size()>1) {
+    if (!conf.string2codons_.empty()) {
       os << "\n"
          << "### Section for setting parsing modes\n"
@@ -313 +312 @@
          << "### String \"<NEWLINE>\" can be used for codons containing newline"
          << "\n### character: '\\n'\n"
-         << "[parsing]\n";
-      for (size_t i=0; i<conf.string2codons_.size()-1; ++i)
-        for (size_t j=0; j<conf.string2codons_[i].second.size(); ++j)
-          os << conf.string2codons_[i].first << " = " 
-             << trans_beg_code(conf.string2codons_[i].second[j].first) 
+         << "[parsing-codons]\n";
+      for (size_t i=0; i<conf.string2codons_.size(); ++i) {
+        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) 
-             << "\n";
+             << trans_end_code(conf.string2codons_[i].second[j].second); 
+        }
+        os << "\n";
+      }
     }
-
     return os;
   }

trunk/lib/Configuration.h

@@ -70 +70 @@
        \return vector of parse codons for the given \a file_name
      */
-    const std::vector<std::pair<std::string, std::string> >& 
+    const std::vector<std::pair<std::string, std::string> >* 
     parse_codon(std::string file_name) const;