--- trunk/src/selection/TokenMap.cpp	2005/02/15 17:35:30	349
+++ trunk/src/selection/TokenMap.cpp	2005/04/15 22:04:00	507
@@ -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,9 +43,9 @@ namespace oopse {
 
 namespace oopse {
 
-TokenMap* TokenMap::instance_ = NULL;
+  TokenMap* TokenMap::instance_ = NULL;
 
-TokenMap::TokenMap() {
+  TokenMap::TokenMap() {
     tokenMap_.insert(TokenMapType::value_type("define", Token(Token::define, std::string("define"))));
     tokenMap_.insert(TokenMapType::value_type("select", Token(Token::select, std::string("select")))); 
     //tokenMap_.insert(TokenMapType::value_type("selected", Token(Token::selected, std::string("selected")))); 
@@ -53,7 +53,6 @@ TokenMap::TokenMap() {
     //expressions
     tokenMap_.insert(TokenMapType::value_type("(", Token(Token::leftparen, std::string("("))));
     tokenMap_.insert(TokenMapType::value_type(")", Token(Token::rightparen, std::string(")"))));
-    tokenMap_.insert(TokenMapType::value_type("-", Token(Token::hyphen, std::string("-"))));
 
     tokenMap_.insert(TokenMapType::value_type("and", Token(Token::opAnd, std::string("and"))));
     tokenMap_.insert(TokenMapType::value_type("&", Token(Token::opAnd, std::string("and"))));
@@ -76,23 +75,16 @@ TokenMap::TokenMap() {
     tokenMap_.insert(TokenMapType::value_type("within", Token(Token::within, std::string("within"))));
     tokenMap_.insert(TokenMapType::value_type(".", Token(Token::dot, std::string("."))));
     tokenMap_.insert(TokenMapType::value_type("mass", Token(Token::mass, std::string("mass"))));
-    tokenMap_.insert(TokenMapType::value_type("dipole", Token(Token::dipole, std::string("dipole"))));
     tokenMap_.insert(TokenMapType::value_type("charge", Token(Token::charge, std::string("charge"))));
     tokenMap_.insert(TokenMapType::value_type("to", Token(Token::to, std::string("to"))));
     
-    //tokenMap_.insert(TokenMapType::value_type("name", Token(Token::name, std::string("name"))));
-    //tokenMap_.insert(TokenMapType::value_type("index", Token(Token::index, std::string("index"))));
-    //tokenMap_.insert(TokenMapType::value_type("molname", Token(Token::molname, std::string("molname"))));
-    //tokenMap_.insert(TokenMapType::value_type("molindex", Token(Token::molindex, std::string("molindex"))));
-
-    tokenMap_.insert(TokenMapType::value_type("*", Token(Token::asterisk, std::string("*"))));
     tokenMap_.insert(TokenMapType::value_type("all", Token(Token::all, std::string("all"))));
     tokenMap_.insert(TokenMapType::value_type("none", Token(Token::none, std::string("none"))));
-}
+  }
 
-Token* TokenMap::getToken(const std::string& ident) {
+  Token* TokenMap::getToken(const std::string& ident) {
     std::map<std::string, Token>::iterator i = tokenMap_.find(ident);
 
     return i != tokenMap_.end() ? &(i->second) : NULL;
+  }
 }
-}