Changeset 521

Timestamp:

Dec 24, 2007, 11:34:54 PM (14 years ago)

Author:

Peter Johansson

Message:

changing format of parsing codons in config file

Location:

trunk

Files:

• .svndigest/config (modified) (1 diff)
• lib/Configuration.cc (modified) (5 diffs)
• test/repo/db/current (modified) (1 diff)
• test/repo/db/revprops/57 (added)
• test/repo/db/revs/57 (added)

trunk/.svndigest/config

@@ -31 +31 @@
 ### Section for setting parsing modes
 ### The format of the entries is:
-###   file-name-pattern = start-code : end-code
+###   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'
+### String "\n" can be used for codons containing newline
+### character.
 [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>
+*.ac = "#":"\n"  ;  "dnl":"\n"
+*.am = "#":"\n"  ;  "dnl":"\n"
+*.m4 = "#":"\n"  ;  "dnl":"\n"
+*.c = "//":"\n"  ;  "/*":"*/"
+*.cc = "//":"\n"  ;  "/*":"*/"
+*.cpp = "//":"\n"  ;  "/*":"*/"
+*.cxx = "//":"\n"  ;  "/*":"*/"
+*.h = "//":"\n"  ;  "/*":"*/"
+*.hh = "//":"\n"  ;  "/*":"*/"
+*.hpp = "//":"\n"  ;  "/*":"*/"
+*.java = "//":"\n"  ;  "/*":"*/"
+*.pl = "#":"\n"
+*.pm = "#":"\n"
+*.sh = "#":"\n"
+*config = "#":"\n"
+bootstrap = "#":"\n"
+Makefile = "#":"\n"
+*.tex = "%":"\n"
+*.m = "%":"\n"
+*.jsp = "<!--":"-->"
+*.html = "<%--":"--%>"
+*.xml = "<!--":"-->"  ;  "<!--":"-->"
+*.xsl = "<!--":"-->"
+*.xsd = "<!--":"-->"
+*.xhtml = "<!--":"-->"
+*.shtml = "<!--":"-->"
+*.css = "<!--":"-->"
+*.rss = "<!--":"-->"
+*.sgml = "<!--":"-->"
+*.bat = "\nREM":"\n"  ;  "\nrem":"\n"

trunk/lib/Configuration.cc

@@ -221 +221 @@
         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, "<NEWLINE>", "\n");
-            replace(end, "<NEWLINE>", "\n");
+            replace(start, "\\n", "\n");
+            replace(end, "\\n", "\n");
             add_codon(lhs, start, end);
           }
           else if (!start.empty() || !end.empty()) {
+            std::cout << start << "\n" << end << std::endl;
             std::stringstream mess;
             mess << "svndigest: invalid config file\n"
@@ -324 +327 @@
   {
     if (str.size()>0 && str[str.size()-1]=='\n')
-      return str.substr(0, str.size()-1) + std::string("<NEWLINE>");
+      return str.substr(0, str.size()-1) + std::string("\\n");
     return str;
   }
@@ -332 +335 @@
   {
     if (str.size()>0 && str[0]=='\n')
-      return std::string("<NEWLINE>") + str.substr(1); 
+      return std::string("\\n") + str.substr(1); 
     return str;
   }
@@ -464 +467 @@
          << "### Section for setting parsing modes\n"
          << "### The format of the entries is:\n"
-         << "###   file-name-pattern = start-code : end-code\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"
+         << "### String \"\\n\" can be used for codons containing newline"
+         << "\n### character.\n"
          << "[parsing-codons]\n";
       for (size_t i=0; i<conf.string2codons_.size(); ++i) {
@@ -475 +478 @@
           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";

trunk/test/repo/db/current

@@ -1 @@
-56 1l 1
+57 1l 1