Changeset 512

Timestamp:

Dec 9, 2007, 12:29:36 AM (13 years ago)

Author:

Peter Johansson

Message:

remove devel printout

Location:

trunk/lib

Files:

• Configuration.cc (modified) (2 diffs)
• Parser.cc (modified) (3 diffs)
• Parser.h (modified) (1 diff)

trunk/lib/Configuration.cc

@@ -171 +171 @@
           parsing_found=true;
           string2codons_.clear();
-          std::cout << "clear" << std::endl;
         }
         
@@ -190 +189 @@
           throw std::runtime_error(mess.str());
         }
-        std::cout << "lhs:" << lhs << "   " << "rhs:" << rhs << std::endl;
         std::stringstream ss(rhs);
         std::string start;

trunk/lib/Parser.cc

@@ -23 +23 @@
 
 #include "Parser.h"
+#include "Configuration.h"
 #include "utility.h"
 
@@ -42 +43 @@
     std::ifstream is(path.c_str());
     assert(is.good());
-    std::vector<std::pair<std::string, std::string> > codon;
     // Ignore trailing '.in' in file names
     if (match_end(path.rbegin(), path.rend(), ".in"))
       path = path.substr(0, path.size()-3);
-    if (match_end(path.rbegin(), path.rend(), ".ac") ||
-        match_end(path.rbegin(), path.rend(), ".am") ||
-        match_end(path.rbegin(), path.rend(), ".m4")) {
-      codon.reserve(2);
-      codon.push_back(std::make_pair("#", "\n"));
-      codon.push_back(std::make_pair("dnl", "\n"));
-      parse(is, codon);
-    }
-    else if (match_end(path.rbegin(), path.rend(), ".c") ||
-             match_end(path.rbegin(), path.rend(), ".cc") ||
-             match_end(path.rbegin(), path.rend(), ".cpp") ||
-             match_end(path.rbegin(), path.rend(), ".cxx") ||
-             match_end(path.rbegin(), path.rend(), ".h") ||
-             match_end(path.rbegin(), path.rend(), ".hh") ||
-             match_end(path.rbegin(), path.rend(), ".hpp") ||
-             match_end(path.rbegin(), path.rend(), ".java")) {
-      codon.reserve(2);
-      codon.push_back(std::make_pair("//", "\n"));
-      codon.push_back(std::make_pair("/*", "*/"));
-      parse(is, codon);
-    }
-    else if (match_end(path.rbegin(), path.rend(), ".pl") ||
-             match_end(path.rbegin(), path.rend(), ".pm") ||
-             match_end(path.rbegin(), path.rend(), ".sh") ||
-             match_end(path.rbegin(), path.rend(), "config") ||
-             file_name(path)=="bootstrap" ||
-             file_name(path)=="Makefile") {
-      codon.push_back(std::make_pair("#", "\n"));
-      parse(is,codon);
-    }
-    else if (match_end(path.rbegin(), path.rend(), ".tex") || 
-             match_end(path.rbegin(), path.rend(), ".m")) {
-      codon.push_back(std::make_pair("%", "\n"));
-      parse(is,codon);
-    }
-    else if (match_end(path.rbegin(), path.rend(), ".jsp")) {
-      codon.reserve(2);
-      codon.push_back(std::make_pair("<!--", "-->"));
-      codon.push_back(std::make_pair("<%--", "--%>"));
-      parse(is,codon);
-    }
-    else if (match_end(path.rbegin(), path.rend(), ".html") || 
-             match_end(path.rbegin(), path.rend(), ".xml") ||
-             match_end(path.rbegin(), path.rend(), ".xsl") ||
-             match_end(path.rbegin(), path.rend(), ".xsd") ||
-             match_end(path.rbegin(), path.rend(), ".xhtml") ||
-             match_end(path.rbegin(), path.rend(), ".shtml") ||
-             match_end(path.rbegin(), path.rend(), ".xml") ||
-             match_end(path.rbegin(), path.rend(), ".css") ||
-             match_end(path.rbegin(), path.rend(), ".rss") ||
-             match_end(path.rbegin(), path.rend(), ".sgml") ){
-      codon.push_back(std::make_pair("<!--", "-->"));
-      parse(is,codon);
-    }
+    const std::vector<std::pair<std::string, std::string> >* codon = 
+      Configuration::instance().codon(path); 
+    if (codon)
+      parse(is, *codon);
     else
       text_mode(is);
@@ -107 +57 @@
 
   void Parser::parse(std::istream& is,
-                     std::vector<std::pair<std::string, std::string> >& codon)
+                     const std::vector<std::pair<std::string, std::string> >& codon)
   {
     // mode zero means we are currently not in a comment

trunk/lib/Parser.h

@@ -70 +70 @@
 
     void parse(std::istream& is,
-               std::vector<std::pair<std::string, std::string> >& codon);
+               const std::vector<std::pair<std::string, std::string> >& codon);
 
     void text_mode(std::istream&);