diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index a252dc07e..49bb3547c 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -9,8 +9,8 @@ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ @@ -28,7 +28,7 @@ bool cmListCommand::InitialPass(std::vector const& args) this->SetError("must be called with at least one argument."); return false; } - + const std::string &subCommand = args[0]; if(subCommand == "LENGTH") { @@ -54,7 +54,7 @@ bool cmListCommand::InitialPass(std::vector const& args) { return this->HandleRemoveItemCommand(args); } - + std::string e = "does not recognize sub-command "+subCommand; this->SetError(e.c_str()); return false; @@ -151,8 +151,8 @@ bool cmListCommand::HandleGetCommand(std::vector const& args) if ( item < 0 || nitem <= (size_t)item ) { cmOStringStream str; - str << "index: " << item << " out of range (-" - << varArgsExpanded.size() << ", " + str << "index: " << item << " out of range (-" + << varArgsExpanded.size() << ", " << varArgsExpanded.size()-1 << ")"; this->SetError(str.str().c_str()); return false; @@ -223,8 +223,8 @@ bool cmListCommand::HandleInsertCommand(std::vector const& args) if ( item < 0 || nitem <= (size_t)item ) { cmOStringStream str; - str << "index: " << item << " out of range (-" - << varArgsExpanded.size() << ", " + str << "index: " << item << " out of range (-" + << varArgsExpanded.size() << ", " << (varArgsExpanded.size() == 0?0:(varArgsExpanded.size()-1)) << ")"; this->SetError(str.str().c_str()); return false; @@ -299,7 +299,8 @@ bool cmListCommand } //---------------------------------------------------------------------------- -bool cmListCommand::HandleRemoveAtCommand(std::vector const& args) +bool cmListCommand::HandleRemoveAtCommand( + std::vector const& args) { if(args.size() < 3) { @@ -329,8 +330,8 @@ bool cmListCommand::HandleRemoveAtCommand(std::vector const& args) if ( item < 0 || nitem <= (size_t)item ) { cmOStringStream str; - str << "index: " << item << " out of range (-" - << varArgsExpanded.size() << ", " + str << "index: " << item << " out of range (-" + << varArgsExpanded.size() << ", " << varArgsExpanded.size()-1 << ")"; this->SetError(str.str().c_str()); return false; diff --git a/Source/cmListCommand.h b/Source/cmListCommand.h index fc91bad7d..2989a63a9 100644 --- a/Source/cmListCommand.h +++ b/Source/cmListCommand.h @@ -9,8 +9,8 @@ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ @@ -29,7 +29,7 @@ public: /** * This is a virtual constructor for the command. */ - virtual cmCommand* Clone() + virtual cmCommand* Clone() { return new cmListCommand; } @@ -53,11 +53,11 @@ public: /** * Succinct documentation. */ - virtual const char* GetTerseDocumentation() + virtual const char* GetTerseDocumentation() { return "List operations."; } - + /** * More documentation. */ @@ -79,12 +79,12 @@ public: "INSERT will insert elements to the list to the specified location.\n" "When specifying an index, negative value corresponds to index from the" " end of the list.\n" - "REMOVE_AT and REMOVE_ITEM will remove item from the list. The difference " - "is that REMOVE_ITEM will remove the given items, while REMOVE_AT will " - "remove the item at the given indices.\n" + "REMOVE_AT and REMOVE_ITEM will remove item from the list. The " + "difference is that REMOVE_ITEM will remove the given items, while " + "REMOVE_AT will remove the item at the given indices.\n" ; } - + cmTypeMacro(cmListCommand, cmCommand); protected: bool HandleLengthCommand(std::vector const& args);