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 1517 by gezelter, Tue Oct 19 18:40:54 2010 UTC vs.
Revision 1518 by gezelter, Wed Oct 20 15:24:09 2010 UTC

# Line 69 | Line 69 | namespace OpenMD {
69      tokenMap_.insert(TokenMapType::value_type("<", Token(Token::opLT, std::string("<"))));
70      tokenMap_.insert(TokenMapType::value_type("<=", Token(Token::opLE, std::string("<="))));
71      tokenMap_.insert(TokenMapType::value_type(">=", Token(Token::opGE, std::string(">="))));
72 <    tokenMap_.insert(TokenMapType::value_type(">", Token(Token::opGT, std::string(">="))));
72 >    tokenMap_.insert(TokenMapType::value_type(">", Token(Token::opGT, std::string(">"))));
73      tokenMap_.insert(TokenMapType::value_type("==", Token(Token::opEQ, std::string("=="))));
74      tokenMap_.insert(TokenMapType::value_type("!=", Token(Token::opNE, std::string("!="))));
75      tokenMap_.insert(TokenMapType::value_type("within", Token(Token::within, std::string("within"))));
# Line 80 | Line 80 | namespace OpenMD {
80      tokenMap_.insert(TokenMapType::value_type("x", Token(Token::x, std::string("x"))));
81      tokenMap_.insert(TokenMapType::value_type("y", Token(Token::y, std::string("y"))));
82      tokenMap_.insert(TokenMapType::value_type("z", Token(Token::z, std::string("z"))));
83 <    tokenMap_.insert(TokenMapType::value_type("r", Token(Token::z, std::string("r"))));
83 >    tokenMap_.insert(TokenMapType::value_type("r", Token(Token::r, std::string("r"))));
84      tokenMap_.insert(TokenMapType::value_type("to", Token(Token::to, std::string("to"))));
85      
86      tokenMap_.insert(TokenMapType::value_type("all", Token(Token::all, std::string("all"))));

Diff Legend

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