Changeset 184

Timestamp:

Sep 5, 2006, 1:19:53 PM (17 years ago)

Author:

Peter Johansson

Message:

fixes #68 Parser detects block comments of type /* bla bla */

File:

• trunk/lib/Parser.cc (modified) (1 diff)

trunk/lib/Parser.cc

@@ -45 +45 @@
   void Parser::cc_mode(std::istream& is)
   {
+    bool block_com=false;
     std::string str;
     while(getline(is,str)) {
-      std::string::iterator where;
-      where = std::find_if(str.begin(), str.end(), std::not1(WhiteSpace()));
-      if (where==str.end())
-        type_.push_back(empty);
-      else if (match_begin(where, str.end(), "//")) {
-        where = std::find_if(where, str.end(), AlphaNum());
-        if (where==str.end())
-          type_.push_back(empty);
-        else
-          type_.push_back(comment);
+      bool line_com=false;
+      line_type lt=empty;
+      for (std::string::iterator iter=str.begin(); iter!=str.end(); ++iter){
+        if (!block_com && match_begin(iter,str.end(), "/*")){
+          block_com=true;
+          continue;
+        }
+        if (block_com && match_begin(iter,str.end(), "*/")){
+          block_com=false;
+          continue;
+        }
+        if (block_com){
+          if (line_com){
+            if (lt==empty && isalnum(*iter))
+              lt = comment;
+          }
+          else if (lt==empty) {
+            if (match_begin(iter, str.end(), "//"))
+              line_com=true;
+            else if (isalnum(*iter))
+              lt = comment;
+          }
+        }
+        else if (lt==empty){
+          if (isalnum(*iter)){
+            if (line_com){
+              lt = comment;
+            }
+            else{
+              lt = code;
+            }
+          }
+          else if (match_begin(iter, str.end(), "//")){
+            line_com=true;
+          }
+          else if (!line_com && !isspace(*iter)){
+            lt = code;
+          }
+
+        }
       }
-      else {
-        type_.push_back(code);
-      }
+      type_.push_back(lt);
     }
   }