--- trunk/src/selection/TokenMap.cpp	2005/02/02 23:13:11	281
+++ trunk/src/selection/TokenMap.cpp	2009/11/25 20:02:06	1390
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -6,19 +6,10 @@
  * redistribute this software in source and binary code form, provided
  * that the following conditions are met:
  *
- * 1. Acknowledgement of the program authors must be made in any
- *    publication of scientific results based in part on use of the
- *    program.  An acceptable form of acknowledgement is citation of
- *    the article in which the program was described (Matthew
- *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
- *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
- *    Parallel Simulation Engine for Molecular Dynamics,"
- *    J. Comput. Chem. 26, pp. 252-271 (2005))
- *
- * 2. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 3. Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the
  *    distribution.
@@ -37,48 +28,66 @@
  * arising out of the use of or inability to use software, even if the
  * University of Notre Dame has been advised of the possibility of
  * such damages.
+ *
+ * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
+ * research, please cite the appropriate papers when you publish your
+ * work.  Good starting points are:
+ *                                                                      
+ * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
+ * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
+ * [4]  Vardeman & Gezelter, in progress (2009).                        
  */
 
 #include "selection/TokenMap.hpp"
 
-namespace oopse {
+namespace OpenMD {
 
-TokenMap* TokenMap::instance_ = NULL;
+  TokenMap* TokenMap::instance_ = NULL;
 
-TokenMap::TokenMap() {
-    tokenMap_.insert(std::make_pair("define", Token(Token::define, std::string("define"))));
-    tokenMap_.insert(std::make_pair("select", Token(Token::select, std::string("select")))); 
+  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")))); 
+    
     //expressions
-    tokenMap_.insert(std::make_pair("(", Token(Token::leftparen, std::string("("))));
-    tokenMap_.insert(std::make_pair(")", Token(Token::rightparen, std::string(")"))));
-    tokenMap_.insert(std::make_pair("-", Token(Token::hyphen, std::string("-"))));
-    tokenMap_.insert(std::make_pair("and", Token(Token::opAnd, std::string("and"))));
-    tokenMap_.insert(std::make_pair("or", Token(Token::opOr, std::string("or"))));
-    tokenMap_.insert(std::make_pair("not", Token(Token::opNot, std::string("not"))));
-    tokenMap_.insert(std::make_pair("<", Token(Token::opLT, std::string("<"))));
-    tokenMap_.insert(std::make_pair("<=", Token(Token::opLE, std::string("<="))));
-    tokenMap_.insert(std::make_pair(">=", Token(Token::opGE, std::string(">="))));
-    tokenMap_.insert(std::make_pair(">", Token(Token::opGT, std::string(">="))));
-    tokenMap_.insert(std::make_pair("==", Token(Token::opEQ, std::string("=="))));
-    tokenMap_.insert(std::make_pair("!=", Token(Token::opNE, std::string("!="))));
-    tokenMap_.insert(std::make_pair("within", Token(Token::within, std::string("within"))));
-    tokenMap_.insert(std::make_pair(".", Token(Token::dot, std::string("."))));
-    tokenMap_.insert(std::make_pair("mass", Token(Token::mass, std::string("mass"))));
-    tokenMap_.insert(std::make_pair("dipole", Token(Token::dipole, std::string("dipole"))));
-    tokenMap_.insert(std::make_pair("charge", Token(Token::charge, std::string("charge"))));
-    tokenMap_.insert(std::make_pair("name", Token(Token::name, std::string("name"))));
-    tokenMap_.insert(std::make_pair("index", Token(Token::index, std::string("index"))));
-    tokenMap_.insert(std::make_pair("molname", Token(Token::molname, std::string("molname"))));
-    tokenMap_.insert(std::make_pair("molindex", Token(Token::molindex, std::string("molindex"))));
+    tokenMap_.insert(TokenMapType::value_type("(", Token(Token::leftparen, std::string("("))));
+    tokenMap_.insert(TokenMapType::value_type(")", Token(Token::rightparen, std::string(")"))));
 
-    tokenMap_.insert(std::make_pair("*", Token(Token::asterisk, std::string("*"))));
-    tokenMap_.insert(std::make_pair("all", Token(Token::all, std::string("all"))));
-    tokenMap_.insert(std::make_pair("none", Token(Token::none, std::string("none"))));
-}
+    tokenMap_.insert(TokenMapType::value_type("and", Token(Token::opAnd, std::string("and"))));
+    tokenMap_.insert(TokenMapType::value_type("&", Token(Token::opAnd, std::string("and"))));
+    tokenMap_.insert(TokenMapType::value_type("&&", Token(Token::opAnd, std::string("and"))));
 
-Token* TokenMap::getToken(const std::string& ident) {
+    tokenMap_.insert(TokenMapType::value_type("or", Token(Token::opOr, std::string("or"))));
+    tokenMap_.insert(TokenMapType::value_type(",", Token(Token::opOr, std::string("or"))));
+    tokenMap_.insert(TokenMapType::value_type("|", Token(Token::opOr, std::string("or"))));
+    tokenMap_.insert(TokenMapType::value_type("||", Token(Token::opOr, std::string("or"))));
+
+    tokenMap_.insert(TokenMapType::value_type("not", Token(Token::opNot, std::string("not"))));
+    tokenMap_.insert(TokenMapType::value_type("!", Token(Token::opNot, std::string("not"))));
+    
+    tokenMap_.insert(TokenMapType::value_type("<", Token(Token::opLT, std::string("<"))));
+    tokenMap_.insert(TokenMapType::value_type("<=", Token(Token::opLE, std::string("<="))));
+    tokenMap_.insert(TokenMapType::value_type(">=", Token(Token::opGE, std::string(">="))));
+    tokenMap_.insert(TokenMapType::value_type(">", Token(Token::opGT, std::string(">="))));
+    tokenMap_.insert(TokenMapType::value_type("==", Token(Token::opEQ, std::string("=="))));
+    tokenMap_.insert(TokenMapType::value_type("!=", Token(Token::opNE, std::string("!="))));
+    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("charge", Token(Token::charge, std::string("charge"))));
+    tokenMap_.insert(TokenMapType::value_type("x", Token(Token::x, std::string("x"))));
+    tokenMap_.insert(TokenMapType::value_type("y", Token(Token::y, std::string("y"))));
+    tokenMap_.insert(TokenMapType::value_type("z", Token(Token::z, std::string("z"))));
+    tokenMap_.insert(TokenMapType::value_type("to", Token(Token::to, std::string("to"))));
+    
+    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) {
     std::map<std::string, Token>::iterator i = tokenMap_.find(ident);
 
     return i != tokenMap_.end() ? &(i->second) : NULL;
+  }
 }
-}