Changeset 508

Timestamp:

Dec 8, 2007, 8:08:33 AM (13 years ago)

Author:

Peter Johansson

Message:

default parse codons in Configuration and implemented writing of variable

Location:

trunk/lib

Files:

• Configuration.cc (modified) (6 diffs)
• Configuration.h (modified) (4 diffs)
• utility.cc (modified) (1 diff)

trunk/lib/Configuration.cc

@@ -45 +45 @@
 
 
+  void Configuration::add_codon(std::string key, std::string start, 
+                                std::string end)
+  {
+    std::pair<std::string, std::string> p(start,end);
+    String2Codons::iterator iter = string2codons_.end();
+    for (String2Codons::iterator i=string2codons_.begin();
+         i!=string2codons_.end(); ++i)
+      if (i->first == key)
+        iter = i;
+    
+    if (iter==string2codons_.end())
+      string2codons_.push_back(std::make_pair(key, codons(1,p)));
+    else
+      iter->second.push_back(p);
+  }
+
+
   const std::map<std::string,Alias>& Configuration::copyright_alias(void) const
   {
@@ -76 +93 @@
     set_default();
 
+    //bool parsing_found=false;
     std::string line;
     std::string section;
@@ -135 +153 @@
           }
     }
+    add_codon("*", "", "");
   }
 
@@ -152 +171 @@
 
 
+  const std::vector<std::pair<std::string, std::string> >& 
+  Configuration::parse_codon(std::string file_name) const 
+  {
+    for (String2Codons::const_iterator i(string2codons_.begin());
+         i!=string2codons_.end(); ++i) {
+      if (svndigest::equal(file_name.begin(), file_name.end(), 
+                           i->first.begin(), i->first.end()) ) {
+        return i->second;
+      }
+    }
+    return string2codons_.back().second;
+  }
+
+
+  std::string trans_end_code(std::string str)
+  {
+    if (str.size()>0 && str[str.size()-1]=='\n')
+      return str.substr(0, str.size()-1) + std::string("<NEWLINE>");
+    return str;
+  }
+
+
+  std::string trans_beg_code(std::string str)
+  {
+    if (str.size()>0 && str[0]=='\n')
+      return std::string("<NEWLINE>") + str.substr(1); 
+    return str;
+  }
+
+
   void Configuration::set_default(void)
   {
@@ -157 +206 @@
     missing_copyright_warning_=false;
     trac_root_ = "";
+
+    add_codon("*.ac", "#", "\n");
+    add_codon("*.ac", "dnl", "\n");
+    add_codon("*.am", "#", "\n");
+    add_codon("*.am", "dnl", "\n");
+    add_codon("*.m4", "#", "\n");
+    add_codon("*.m4", "dnl", "\n");
+    add_codon("*.c", "//", "\n");
+    add_codon("*.c", "/*", "*/");
+    add_codon("*.cc", "//", "\n");
+    add_codon("*.cc", "/*", "*/");
+    add_codon("*.cpp", "//", "\n");
+    add_codon("*.cpp", "/*", "*/");
+    add_codon("*.cxx", "//", "\n");
+    add_codon("*.cxx", "/*", "*/");
+    add_codon("*.h", "//", "\n");
+    add_codon("*.h", "/*", "*/");
+    add_codon("*.hh", "//", "\n");
+    add_codon("*.hh", "/*", "*/");
+    add_codon("*.hpp", "//", "\n");
+    add_codon("*.hpp", "/*", "*/");
+    add_codon("*.java", "//", "\n");
+    add_codon("*.java", "/*", "*/");
+    add_codon("*.pl", "#", "\n");
+    add_codon("*.pm", "#", "\n");
+    add_codon("*.sh", "#", "\n");
+    add_codon("*config", "#", "\n");
+    add_codon("bootstrap", "#", "\n");
+    add_codon("Makefile", "#", "\n");
+    add_codon("*.tex", "%", "\n");
+    add_codon("*.m", "%", "\n");
+    add_codon("*.jsp", "<!--", "-->");
+    add_codon("*.html", "<%--", "--%>");
+    add_codon("*.xml", "<!--", "-->");
+    add_codon("*.xsl", "<!--", "-->");
+    add_codon("*.xsd", "<!--", "-->");
+    add_codon("*.xhtml", "<!--", "-->");
+    add_codon("*.shtml", "<!--", "-->");
+    add_codon("*.xml", "<!--", "-->");
+    add_codon("*.css", "<!--", "-->");
+    add_codon("*.rss", "<!--", "-->");
+    add_codon("*.sgml", "<!--", "-->");
+    add_codon("*.bat", "\nREM", "\n");
   }
 
@@ -212 +304 @@
       os << "trac-root = " << conf.trac_root() << "\n";
 
+    if (conf.string2codons_.size()>1) {
+      os << "\n"
+         << "### Section for setting parsing modes\n"
+         << "### The format of the entries is:\n"
+         << "###   file-name-pattern = start-code : end-code\n"
+         << "### The file-name-pattern may contain wildcards (such as '*' "
+         << "and '?').\n"
+         << "### 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) 
+             << " : " 
+             << trans_end_code(conf.string2codons_[i].second[j].second) 
+             << "\n";
+    }
+
     return os;
   }

trunk/lib/Configuration.h

@@ -31 +31 @@
 #include <string>
 #include <utility>
+#include <vector>
 
 namespace theplu{
@@ -66 +67 @@
     bool  missing_copyright_warning(void) const;
 
+    /**
+       \return vector of parse codons for the given \a file_name
+     */
+    const std::vector<std::pair<std::string, std::string> >& 
+    parse_codon(std::string file_name) const;
+
     ///
     /// @return root for the trac envrionment, e.g.,
@@ -84 +91 @@
     Configuration& operator=(const Configuration&);
 
+    friend std::ostream& operator<<(std::ostream&, const Configuration&);
+
+    void add_codon(std::string, std::string, std::string);
+
     void clear(void);
 
     bool equal_false(const std::string&) const;
     bool equal_true(const std::string&) const;
-
+    std::string trans_end_code(std::string) const;
+    std::string trans_beg_code(std::string) const;
     void set_default(void);
-
+    
     static Configuration* instance_;
 
@@ -96 +108 @@
 
     bool missing_copyright_warning_;
+    
+    typedef std::vector<std::pair<std::string, std::string> > codons;
+    typedef std::vector<std::pair<std::string, codons> > String2Codons; 
+    String2Codons string2codons_;
+
     std::string trac_root_;
   };

trunk/lib/utility.cc

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