| 46 |  | TokenMap* TokenMap::instance_ = NULL; | 
| 47 |  |  | 
| 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")))); | 
| 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")))); | 
| 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("-")))); | 
| 54 | > | tokenMap_.insert(TokenMapType::value_type("(", Token(Token::leftparen, std::string("(")))); | 
| 55 | > | tokenMap_.insert(TokenMapType::value_type(")", Token(Token::rightparen, std::string(")")))); | 
| 56 |  |  | 
| 57 | < | tokenMap_.insert(std::make_pair("and", Token(Token::opAnd, std::string("and")))); | 
| 58 | < | tokenMap_.insert(std::make_pair("&", Token(Token::opAnd, std::string("and")))); | 
| 59 | < | tokenMap_.insert(std::make_pair("&&", Token(Token::opAnd, std::string("and")))); | 
| 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")))); | 
| 59 | > | tokenMap_.insert(TokenMapType::value_type("&&", Token(Token::opAnd, std::string("and")))); | 
| 60 |  |  | 
| 61 | < | tokenMap_.insert(std::make_pair("or", Token(Token::opOr, std::string("or")))); | 
| 62 | < | tokenMap_.insert(std::make_pair(",", 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")))); | 
| 61 | > | tokenMap_.insert(TokenMapType::value_type("or", Token(Token::opOr, std::string("or")))); | 
| 62 | > | tokenMap_.insert(TokenMapType::value_type(",", Token(Token::opOr, std::string("or")))); | 
| 63 | > | tokenMap_.insert(TokenMapType::value_type("|", Token(Token::opOr, std::string("or")))); | 
| 64 | > | tokenMap_.insert(TokenMapType::value_type("||", Token(Token::opOr, std::string("or")))); | 
| 65 |  |  | 
| 66 | < | tokenMap_.insert(std::make_pair("not", Token(Token::opNot, std::string("not")))); | 
| 67 | < | tokenMap_.insert(std::make_pair("!", Token(Token::opNot, std::string("not")))); | 
| 66 | > | tokenMap_.insert(TokenMapType::value_type("not", Token(Token::opNot, std::string("not")))); | 
| 67 | > | tokenMap_.insert(TokenMapType::value_type("!", Token(Token::opNot, std::string("not")))); | 
| 68 |  |  | 
| 69 | < | tokenMap_.insert(std::make_pair("<", Token(Token::opLT, std::string("<")))); | 
| 70 | < | tokenMap_.insert(std::make_pair("<=", Token(Token::opLE, std::string("<=")))); | 
| 71 | < | tokenMap_.insert(std::make_pair(">=", Token(Token::opGE, std::string(">=")))); | 
| 72 | < | tokenMap_.insert(std::make_pair(">", Token(Token::opGT, std::string(">=")))); | 
| 73 | < | tokenMap_.insert(std::make_pair("==", Token(Token::opEQ, std::string("==")))); | 
| 74 | < | tokenMap_.insert(std::make_pair("!=", Token(Token::opNE, std::string("!=")))); | 
| 75 | < | tokenMap_.insert(std::make_pair("within", Token(Token::within, std::string("within")))); | 
| 76 | < | tokenMap_.insert(std::make_pair(".", Token(Token::dot, std::string(".")))); | 
| 77 | < | tokenMap_.insert(std::make_pair("mass", Token(Token::mass, std::string("mass")))); | 
| 78 | < | tokenMap_.insert(std::make_pair("dipole", Token(Token::dipole, std::string("dipole")))); | 
| 79 | < | tokenMap_.insert(std::make_pair("charge", Token(Token::charge, std::string("charge")))); | 
| 80 | < | //tokenMap_.insert(std::make_pair("name", Token(Token::name, std::string("name")))); | 
| 81 | < | //tokenMap_.insert(std::make_pair("index", Token(Token::index, std::string("index")))); | 
| 82 | < | //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")))); | 
| 85 | < |  | 
| 86 | < | tokenMap_.insert(std::make_pair("*", Token(Token::asterisk, std::string("*")))); | 
| 87 | < | tokenMap_.insert(std::make_pair("all", Token(Token::all, std::string("all")))); | 
| 88 | < | tokenMap_.insert(std::make_pair("none", Token(Token::none, std::string("none")))); | 
| 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(">=")))); | 
| 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")))); | 
| 76 | > | tokenMap_.insert(TokenMapType::value_type(".", Token(Token::dot, std::string(".")))); | 
| 77 | > | tokenMap_.insert(TokenMapType::value_type("mass", Token(Token::mass, std::string("mass")))); | 
| 78 | > | tokenMap_.insert(TokenMapType::value_type("charge", Token(Token::charge, std::string("charge")))); | 
| 79 | > | tokenMap_.insert(TokenMapType::value_type("to", Token(Token::to, std::string("to")))); | 
| 80 | > |  | 
| 81 | > | tokenMap_.insert(TokenMapType::value_type("all", Token(Token::all, std::string("all")))); | 
| 82 | > | tokenMap_.insert(TokenMapType::value_type("none", Token(Token::none, std::string("none")))); | 
| 83 |  | } | 
| 84 |  |  | 
| 85 |  | Token* TokenMap::getToken(const std::string& ident) { |