ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/selection/TokenMap.cpp
(Generate patch)

Comparing trunk/src/selection/TokenMap.cpp (file contents):
Revision 349 by tim, Tue Feb 15 17:35:30 2005 UTC vs.
Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 43 | Line 43 | namespace oopse {
43  
44   namespace oopse {
45  
46 < TokenMap* TokenMap::instance_ = NULL;
46 >  TokenMap* TokenMap::instance_ = NULL;
47  
48 < TokenMap::TokenMap() {
48 >  TokenMap::TokenMap() {
49      tokenMap_.insert(TokenMapType::value_type("define", Token(Token::define, std::string("define"))));
50      tokenMap_.insert(TokenMapType::value_type("select", Token(Token::select, std::string("select"))));
51      //tokenMap_.insert(TokenMapType::value_type("selected", Token(Token::selected, std::string("selected"))));
# Line 53 | Line 53 | TokenMap::TokenMap() {
53      //expressions
54      tokenMap_.insert(TokenMapType::value_type("(", Token(Token::leftparen, std::string("("))));
55      tokenMap_.insert(TokenMapType::value_type(")", Token(Token::rightparen, std::string(")"))));
56 –    tokenMap_.insert(TokenMapType::value_type("-", Token(Token::hyphen, std::string("-"))));
56  
57      tokenMap_.insert(TokenMapType::value_type("and", Token(Token::opAnd, std::string("and"))));
58      tokenMap_.insert(TokenMapType::value_type("&", Token(Token::opAnd, std::string("and"))));
# Line 76 | Line 75 | TokenMap::TokenMap() {
75      tokenMap_.insert(TokenMapType::value_type("within", Token(Token::within, std::string("within"))));
76      tokenMap_.insert(TokenMapType::value_type(".", Token(Token::dot, std::string("."))));
77      tokenMap_.insert(TokenMapType::value_type("mass", Token(Token::mass, std::string("mass"))));
79 –    tokenMap_.insert(TokenMapType::value_type("dipole", Token(Token::dipole, std::string("dipole"))));
78      tokenMap_.insert(TokenMapType::value_type("charge", Token(Token::charge, std::string("charge"))));
79 +    tokenMap_.insert(TokenMapType::value_type("x", Token(Token::x, std::string("x"))));
80 +    tokenMap_.insert(TokenMapType::value_type("y", Token(Token::y, std::string("y"))));
81 +    tokenMap_.insert(TokenMapType::value_type("z", Token(Token::z, std::string("z"))));
82      tokenMap_.insert(TokenMapType::value_type("to", Token(Token::to, std::string("to"))));
83      
83 –    //tokenMap_.insert(TokenMapType::value_type("name", Token(Token::name, std::string("name"))));
84 –    //tokenMap_.insert(TokenMapType::value_type("index", Token(Token::index, std::string("index"))));
85 –    //tokenMap_.insert(TokenMapType::value_type("molname", Token(Token::molname, std::string("molname"))));
86 –    //tokenMap_.insert(TokenMapType::value_type("molindex", Token(Token::molindex, std::string("molindex"))));
87 –
88 –    tokenMap_.insert(TokenMapType::value_type("*", Token(Token::asterisk, std::string("*"))));
84      tokenMap_.insert(TokenMapType::value_type("all", Token(Token::all, std::string("all"))));
85      tokenMap_.insert(TokenMapType::value_type("none", Token(Token::none, std::string("none"))));
86 < }
86 >  }
87  
88 < Token* TokenMap::getToken(const std::string& ident) {
88 >  Token* TokenMap::getToken(const std::string& ident) {
89      std::map<std::string, Token>::iterator i = tokenMap_.find(ident);
90  
91      return i != tokenMap_.end() ? &(i->second) : NULL;
92 +  }
93   }
98 – }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines