--- trunk/src/selection/SelectionCompiler.hpp	2005/02/04 22:39:26	288
+++ trunk/src/selection/SelectionCompiler.hpp	2005/04/13 22:43:43	494
@@ -106,7 +106,6 @@ class SelectionCompiler{
                 strError += filename;
             }
 
-            strError += " line#" + lineCurrent;
             return strError;
         }
 
@@ -140,19 +139,18 @@ 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;
+        bool compileError(const std::string& errorMsg) {
+            std::cerr << "SelectionCompiler Error: " << errorMsg << std::endl;
             error = true;
-            this->errorMessage = errorMessage;
+            this->errorMessage = errorMsg;
             return false;
         }