--- trunk/src/io/SectionParser.cpp	2005/01/12 22:41:40	246
+++ trunk/src/io/SectionParser.cpp	2005/04/21 14:12:19	514
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -43,45 +43,49 @@ namespace oopse {
 #include "utils/Trim.hpp"
 namespace oopse {
 
-void SectionParser::parse(std::istream& input, ForceField& ff, int lineNo) {
+  void SectionParser::parse(std::istream& input, ForceField& ff, int lineNo) {
     const int bufferSize = 65535;
     char buffer[bufferSize];
     std::string line;
     while(input.getline(buffer, bufferSize)) {
-        /**@todo */
-        line = trimLeftCopy(buffer);
-        //a line begins with "//" is comment
-        if (isEndSection(line)) {
-            break;
-        } else if ( line.empty() || (line.size() >= 2 && line[0] == '/' && line[1] == '/')) {
-            continue;
-        } else {
-            parseLine(ff, line, lineNo);
-        }
+      ++lineNo;
+      line = trimLeftCopy(buffer);
+      //a line begins with "//" is comment
+      // let's also call lines starting with # and ! as comments
+      if (isEndSection(line)) {
+        break;
+      } else if ( line.empty() || 
+                  (line.size() >= 2 && line[0] == '/' && line[1] == '/') ||
+                  (line.size() >= 1 && line[0] == '#') || 
+                  (line.size() >= 1 && line[0] == '!') ) {
+        continue;
+      } else {
+        parseLine(ff, line, lineNo);
+      }
     }
-}
-
-bool SectionParser::isEndSection(const std::string& line) {
+  }
+  
+  bool SectionParser::isEndSection(const std::string& line) {
     StringTokenizer tokenizer(line);
-
+    
     if (tokenizer.countTokens() >= 2) {
-        std::string keyword = tokenizer.nextToken();
-
-        if (keyword != "end"){
-            return false;
-        } 
-
-        std::string section = tokenizer.nextToken();
-        if (section == sectionName_) {
-            return true;
-        }else {
-            return false;
-        }
-        
-    }else {
+      std::string keyword = tokenizer.nextToken();
+      
+      if (keyword != "end"){
         return false;
+      } 
+      
+      std::string section = tokenizer.nextToken();
+      if (section == sectionName_) {
+        return true;
+      }else {
+        return false;
+      }
+      
+    }else {
+      return false;
     }
-        
-}
+    
+  }
 
 }//namespace oopse