--- trunk/src/selection/SelectionCompiler.hpp	2005/02/03 23:14:05	283
+++ trunk/src/selection/SelectionCompiler.hpp	2005/04/05 23:09:48	452
@@ -106,7 +106,6 @@ class SelectionCompiler{
                 strError += filename;
             }
 
-            strError += " line#" + lineCurrent;
             return strError;
         }
 
@@ -117,7 +116,7 @@ class SelectionCompiler{
 
 
         bool lookingAtLeadingWhitespace();
-        bool lookingAtComment();
+        //bool lookingAtComment();
         bool lookingAtEndOfLine();
         bool lookingAtEndOfStatement();
         bool lookingAtString();
@@ -140,15 +139,14 @@ class SelectionCompiler{
         bool clauseWithin();
         bool clauseComparator();
         bool clauseChemObjName();        
-        bool clauseName(std::string& name);
-
+        bool clauseIndex();
         Token tokenNext();
         boost::any valuePeek();
         int tokPeek();
 
         bool addTokenToPostfix(const Token& token);
+        bool isNameValid(const std::string& name);
 
-
         bool compileError(const std::string& errorMessage) {
             std::cerr << "SelectionCompiler Error: " << errorMessage << std::endl;
             error = true;
@@ -205,8 +203,8 @@ class SelectionCompiler{
             return compileError("comparison operator expected");
         }
 
-        bool integerExpected() {
-            return compileError("integer expected");
+        bool numberExpected() {
+            return compileError("number expected");
         }        
         
         bool numberOrKeywordExpected() {