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

Comparing trunk/src/selection/TokenMap.cpp (file contents):
Revision 281 by tim, Wed Feb 2 23:13:11 2005 UTC vs.
Revision 295 by tim, Mon Feb 7 19:13:18 2005 UTC

# Line 48 | Line 48 | TokenMap::TokenMap() {
48   TokenMap::TokenMap() {
49      tokenMap_.insert(std::make_pair("define", Token(Token::define, std::string("define"))));
50      tokenMap_.insert(std::make_pair("select", Token(Token::select, std::string("select"))));
51 +    //tokenMap_.insert(std::make_pair("selected", Token(Token::selected, std::string("selected"))));
52 +    
53      //expressions
54      tokenMap_.insert(std::make_pair("(", Token(Token::leftparen, std::string("("))));
55      tokenMap_.insert(std::make_pair(")", Token(Token::rightparen, std::string(")"))));
56      tokenMap_.insert(std::make_pair("-", Token(Token::hyphen, std::string("-"))));
57 +
58      tokenMap_.insert(std::make_pair("and", Token(Token::opAnd, std::string("and"))));
59 +    tokenMap_.insert(std::make_pair("&", Token(Token::opAnd, std::string("and"))));
60 +    tokenMap_.insert(std::make_pair("&&", Token(Token::opAnd, std::string("and"))));
61 +
62      tokenMap_.insert(std::make_pair("or", Token(Token::opOr, std::string("or"))));
63 +    tokenMap_.insert(std::make_pair(",", Token(Token::opOr, std::string("or"))));
64 +    tokenMap_.insert(std::make_pair("|", Token(Token::opOr, std::string("or"))));
65 +    tokenMap_.insert(std::make_pair("||", Token(Token::opOr, std::string("or"))));
66 +
67      tokenMap_.insert(std::make_pair("not", Token(Token::opNot, std::string("not"))));
68 +    tokenMap_.insert(std::make_pair("!", Token(Token::opNot, std::string("not"))));
69 +    
70      tokenMap_.insert(std::make_pair("<", Token(Token::opLT, std::string("<"))));
71      tokenMap_.insert(std::make_pair("<=", Token(Token::opLE, std::string("<="))));
72      tokenMap_.insert(std::make_pair(">=", Token(Token::opGE, std::string(">="))));
# Line 66 | Line 78 | TokenMap::TokenMap() {
78      tokenMap_.insert(std::make_pair("mass", Token(Token::mass, std::string("mass"))));
79      tokenMap_.insert(std::make_pair("dipole", Token(Token::dipole, std::string("dipole"))));
80      tokenMap_.insert(std::make_pair("charge", Token(Token::charge, std::string("charge"))));
81 <    tokenMap_.insert(std::make_pair("name", Token(Token::name, std::string("name"))));
82 <    tokenMap_.insert(std::make_pair("index", Token(Token::index, std::string("index"))));
83 <    tokenMap_.insert(std::make_pair("molname", Token(Token::molname, std::string("molname"))));
84 <    tokenMap_.insert(std::make_pair("molindex", Token(Token::molindex, std::string("molindex"))));
81 >    tokenMap_.insert(std::make_pair("to", Token(Token::to, std::string("to"))));
82 >    
83 >    //tokenMap_.insert(std::make_pair("name", Token(Token::name, std::string("name"))));
84 >    //tokenMap_.insert(std::make_pair("index", Token(Token::index, std::string("index"))));
85 >    //tokenMap_.insert(std::make_pair("molname", Token(Token::molname, std::string("molname"))));
86 >    //tokenMap_.insert(std::make_pair("molindex", Token(Token::molindex, std::string("molindex"))));
87  
88      tokenMap_.insert(std::make_pair("*", Token(Token::asterisk, std::string("*"))));
89      tokenMap_.insert(std::make_pair("all", Token(Token::all, std::string("all"))));

Diff Legend

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