Changeset 260 for trunk/lib

Timestamp:

Apr 30, 2007, 7:32:52 PM (16 years ago)

Author:

Peter Johansson

Message:

adding parse function in Parser. refs #121

Location:

trunk/lib

Files:

• Parser.cc (modified) (1 diff)
• Parser.h (modified) (1 diff)

trunk/lib/Parser.cc

@@ -169 +169 @@
 
 
+  void Parser::parse(std::istream& is,
+                     std::vector<std::pair<std::string, std::string> >& codon)
+  {
+    // mode zero means we are currently not in a comment
+    // if mode!=0 comment is closed by codon[mode-1].second -> mode=0
+    // if codon[x-1].start is found and x >= mode -> mode=x 
+    size_t mode = 0;
+    std::string str;
+    while(getline(is,str)) {
+      line_type lt=empty;
+      for (std::string::iterator iter=str.begin(); iter!=str.end(); ++iter){
+        for (size_t i=mode; i<codon.size(); ++i) {
+          if (match_begin(iter, str.end(), codon[i].first)) {
+            mode = i+1;
+            break;
+          }
+        }
+        if (!mode && match_begin(iter,str.end(), codon[mode-1].second)){
+          mode=0;
+          continue;
+        }
+
+        // A line of code or comment must contain at least one
+        // alphanumerical character.
+        if (isalnum(*iter)) {
+          if (!mode)
+            lt=code;
+          else if (mode!=code)
+            lt=comment;
+        }
+      }
+      if (!mode && codon[mode-1].second==std::string("\n"))
+        mode=0;
+
+      type_.push_back(lt);
+    }
+  }
+
+
   void Parser::text_mode(std::istream& is)
   {

trunk/lib/Parser.h

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