Changeset 515

Timestamp:

Dec 9, 2007, 3:38:34 AM (15 years ago)

Author:

Peter Johansson

Message:

adding dictionary variable in Configuration. Reading and usage of the variable needs to be implemented

Location:

trunk

Files:

• .svndigest/config (modified) (1 diff)
• lib/Configuration.cc (modified) (3 diffs)
• lib/Configuration.h (modified) (1 diff)

trunk/.svndigest/config

@@ -12 +12 @@
 ### Section for setting trac environment
 [trac]
-# If trac-root is set, svndigest will create anchors to # the Trac page.
-# trac-root = http://lev.thep.lu.se/trac/svndigest/
+# If trac-root is set, svndigest will create anchors to the Trac page.
+# trac-root = http://trac.thep.lu.se/trac/svndigest/
 trac-root = http://trac.thep.lu.se/trac/svndigest/
 
+### Section for setting dictionary for file names.
+### Prior looking for file name pattern in section [codon],
+### the file name may be translated according to the rules 
+### in this section. In default setting there is, for example,
+### a rule to translate `<FILENAME>.in' to `<FILENAME>'.
+### The format of the entries is:
+###    file-name-pattern = new-name
+### Left hand side may contain wildcards (such as '*' and '?').
+### Right hand side may contain "$i", which will be replaced 
+### with the ith wild card in lhs string.
+[file-name-dictionary]
+*.in = $1
+
+### Section for setting parsing modes
+### The format of the entries is:
+###   file-name-pattern = start-code : end-code
+### The file-name-pattern may contain wildcards (such as '*' and '?').
+### String "<NEWLINE>" can be used for codons containing newline
+### character: '\n'
+[parsing-codons]
+*.ac = # : <NEWLINE>  ;  dnl : <NEWLINE>
+*.am = # : <NEWLINE>  ;  dnl : <NEWLINE>
+*.m4 = # : <NEWLINE>  ;  dnl : <NEWLINE>
+*.c = // : <NEWLINE>  ;  /* : */
+*.cc = // : <NEWLINE>  ;  /* : */
+*.cpp = // : <NEWLINE>  ;  /* : */
+*.cxx = // : <NEWLINE>  ;  /* : */
+*.h = // : <NEWLINE>  ;  /* : */
+*.hh = // : <NEWLINE>  ;  /* : */
+*.hpp = // : <NEWLINE>  ;  /* : */
+*.java = // : <NEWLINE>  ;  /* : */
+*.pl = # : <NEWLINE>
+*.pm = # : <NEWLINE>
+*.sh = # : <NEWLINE>
+*config = # : <NEWLINE>
+bootstrap = # : <NEWLINE>
+Makefile = # : <NEWLINE>
+*.tex = % : <NEWLINE>
+*.m = % : <NEWLINE>
+*.jsp = <!-- : -->
+*.html = <%-- : --%>
+*.xml = <!-- : -->  ;  <!-- : -->
+*.xsl = <!-- : -->
+*.xsd = <!-- : -->
+*.xhtml = <!-- : -->
+*.shtml = <!-- : -->
+*.css = <!-- : -->
+*.rss = <!-- : -->
+*.sgml = <!-- : -->
+*.bat = <NEWLINE>REM : <NEWLINE>  ;  <NEWLINE>rem : <NEWLINE>

trunk/lib/Configuration.cc

@@ -56 +56 @@
     
     if (iter==string2codons_.end())
-      string2codons_.push_back(std::make_pair(key, codons(1,p)));
+      string2codons_.push_back(std::make_pair(key, VectorPair(1,p)));
     else
       iter->second.push_back(p);
@@ -293 +293 @@
     add_codon("*.bat", "\nREM", "\n");
     add_codon("*.bat", "\nrem", "\n");
+
+    dictionary_ = VectorPair(1, std::make_pair("*.in", "$1"));
   }
 
@@ -348 +350 @@
       os << "trac-root = " << conf.trac_root() << "\n";
 
+    if (!conf.dictionary_.empty()) {
+      os << "\n"
+         << "### Section for setting dictionary for file names.\n"
+         << "### Prior looking for file name pattern in section [codon],\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"
+         << "### The format of the entries is:\n"
+         << "###    file-name-pattern = new-name\n"
+         << "### Left hand side may contain wildcards (such as '*' and '?').\n"
+         << "### Right hand side may contain \"$i\", which will be replaced \n"
+         << "### with the ith wild card in lhs string.\n"
+         << "[file-name-dictionary]\n";
+      for (size_t i=0; i<conf.dictionary_.size(); ++i)
+        os << conf.dictionary_[i].first << " = " 
+           << conf.dictionary_[i].second << "\n"; 
+    }
     if (!conf.string2codons_.empty()) {
       os << "\n"

trunk/lib/Configuration.h

@@ -109 +109 @@
     bool missing_copyright_warning_;
     
-    typedef std::vector<std::pair<std::string, std::string> > codons;
-    typedef std::vector<std::pair<std::string, codons> > String2Codons; 
+    typedef std::vector<std::pair<std::string, std::string> > VectorPair;
+    typedef std::vector<std::pair<std::string, VectorPair> > String2Codons; 
     String2Codons string2codons_;
+
+    VectorPair dictionary_;
 
     std::string trac_root_;