--- trunk/src/selection/TokenMap.cpp 2005/04/05 23:09:48 452 +++ trunk/src/selection/TokenMap.cpp 2009/09/07 16:31:51 1360 @@ -1,4 +1,4 @@ - /* +/* * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. * * The University of Notre Dame grants you ("Licensee") a @@ -43,9 +43,9 @@ namespace oopse { namespace oopse { -TokenMap* TokenMap::instance_ = NULL; + TokenMap* TokenMap::instance_ = NULL; -TokenMap::TokenMap() { + 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")))); @@ -76,15 +76,18 @@ TokenMap::TokenMap() { 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) { + Token* TokenMap::getToken(const std::string& ident) { std::map::iterator i = tokenMap_.find(ident); return i != tokenMap_.end() ? &(i->second) : NULL; + } } -}