From 4d459b89ab80bf56cdcd42db01f5e3021e9ad4ae Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@donald.(none)>
Date: Sun, 4 Jul 2010 18:56:05 +0200
Subject: [PATCH 1/2] allow STRING(SUBSTRING) work with length -1 as "rest of the string"

This fixes the first half of bug 10740.
---
 Source/cmStringCommand.cxx          |    2 +-
 Tests/StringFileTest/CMakeLists.txt |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 3bd47a4..06e5fa7 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -606,7 +606,7 @@ bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const&
     return false;
     }
   int leftOverLength = intStringLength - begin;
-  if ( end < 0 || end > leftOverLength )
+  if ( end < -1 || end > leftOverLength )
     {
     cmOStringStream ostr;
     ostr << "end index: " << end << " is out of range " << 0 << " - "
diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index 2e052bf..7792a35 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -256,3 +256,27 @@ endif()
 if(NOT "${var_b}" STREQUAL "x")
   message(FATAL_ERROR "count incorrect \"b\": [${var_b}]")
 endif()
+
+# Test SUBSTRING command
+SET(ST_INPUTSTRING "0123456789")
+STRING(SUBSTRING ${ST_INPUTSTRING} 3 0 ST_EMPTY)
+STRING(SUBSTRING ${ST_INPUTSTRING} 1 1 ST_ONE)
+STRING(SUBSTRING ${ST_INPUTSTRING} 0 10 ST_ALL)
+STRING(SUBSTRING ${ST_INPUTSTRING} 0 -1 ST_ALL_MINUS)
+STRING(SUBSTRING ${ST_INPUTSTRING} 9 -1 ST_NINE)
+
+IF(ST_EMPTY)
+  MESSAGE(SEND_ERROR "SUBSTRING with length 0 does not return an empty string")
+ENDIF(ST_EMPTY)
+IF(NOT ST_ONE STREQUAL "1")
+  MESSAGE(SEND_ERROR "SUBSTING command does not cut the correct selected character, was \"" ${ST_ONE} "\", should be \"1\"")
+ENDIF(NOT ST_ONE STREQUAL "1")
+IF(NOT ST_INPUTSTRING STREQUAL ST_ALL)
+  MESSAGE(SEND_ERROR "SUBSTRING does not return the whole string when selected with length")
+ENDIF(NOT ST_INPUTSTRING STREQUAL ST_ALL)
+IF(NOT ST_INPUTSTRING STREQUAL ST_ALL_MINUS)
+  MESSAGE(SEND_ERROR "SUBSTRING does not return the whole string when selected with -1")
+ENDIF(NOT ST_INPUTSTRING STREQUAL ST_ALL_MINUS)
+IF(NOT ST_NINE STREQUAL "9")
+  MESSAGE(SEND_ERROR "SUBSTRING does not return the tail when selected with -1")
+ENDIF(NOT ST_NINE STREQUAL "9")
-- 
1.6.4.2

From 6c35b899c62112c24f67477cbc14956feaab4559 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@donald.(none)>
Date: Sun, 4 Jul 2010 19:43:08 +0200
Subject: [PATCH 2/2] add STRING(CHOP) command

Fixes the second half of bug 10740
---
 Source/cmStringCommand.cxx          |   43 ++++++++++++++++++++++++++++++++++-
 Source/cmStringCommand.h            |    5 +++-
 Tests/StringFileTest/CMakeLists.txt |   19 +++++++++++++++
 3 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 06e5fa7..9c8c287 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -72,7 +72,11 @@ bool cmStringCommand
     {
     return this->HandleRandomCommand(args);
     }
-  
+  else if(subCommand == "CHOP")
+    {
+    return this->HandleChopCommand(args);
+    }
+
   std::string e = "does not recognize sub-command "+subCommand;
   this->SetError(e.c_str());
   return false;
@@ -772,3 +776,40 @@ bool cmStringCommand
   this->Makefile->AddDefinition(variableName.c_str(), &*result.begin());
   return true;
 }
+
+bool cmStringCommand::HandleChopCommand(std::vector<std::string> const&
+                                             args)
+{
+  if(args.size() != 4)
+    {
+    this->SetError("sub-command SUBSTRING requires three arguments.");
+    return false;
+    }
+
+  const std::string& stringValue = args[1];
+  int length = atoi(args[2].c_str());
+  const std::string& variableName = args[3];
+
+  size_t stringLength = stringValue.size();
+  int intStringLength = static_cast<int>(stringLength);
+  if ( length < 0 )
+    {
+    cmOStringStream ostr;
+    ostr << "length: " << length << " is out of range 0 - "
+         << stringLength;
+    this->SetError(ostr.str().c_str());
+    return false;
+    }
+  int leftOverLength = intStringLength - length;
+  if ( leftOverLength <= 0 )
+    {
+    this->Makefile->AddDefinition(variableName.c_str(), "");
+    }
+  else
+    {
+    this->Makefile->AddDefinition(variableName.c_str(),
+                                  stringValue.substr(0, leftOverLength).c_str());
+    }
+
+  return true;
+}
diff --git a/Source/cmStringCommand.h b/Source/cmStringCommand.h
index 2a916b4..d2dc379 100644
--- a/Source/cmStringCommand.h
+++ b/Source/cmStringCommand.h
@@ -90,6 +90,7 @@ public:
       "  string(STRIP <string> <output variable>)\n"
       "  string(RANDOM [LENGTH <length>] [ALPHABET <alphabet>]\n"
       "         [RANDOM_SEED <seed>] <output variable>)\n"
+      "  string(CHOP <string> <length> <output variable>)\n"
       "REGEX MATCH will match the regular expression once and store the "
       "match in the output variable.\n"
       "REGEX MATCHALL will match the regular expression as many times as "
@@ -131,7 +132,8 @@ public:
       "   ()        Saves a matched subexpression, which can be referenced \n"
       "             in the REGEX REPLACE operation. Additionally it is saved\n"
       "             by all regular expression-related commands, including \n"
-      "             e.g. if( MATCHES ), in the variables CMAKE_MATCH_(0..9).";
+      "             e.g. if( MATCHES ), in the variables CMAKE_MATCH_(0..9).\n"
+      "CHOP will remove the last characters of a given string";
     }
   
   cmTypeMacro(cmStringCommand, cmCommand);
@@ -152,6 +154,7 @@ protected:
   bool HandleSubstringCommand(std::vector<std::string> const& args);
   bool HandleStripCommand(std::vector<std::string> const& args);
   bool HandleRandomCommand(std::vector<std::string> const& args);
+  bool HandleChopCommand(std::vector<std::string> const& args);
 
   class RegexReplacement
   {
diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index 7792a35..c3b5511 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -280,3 +280,22 @@ ENDIF(NOT ST_INPUTSTRING STREQUAL ST_ALL_MINUS)
 IF(NOT ST_NINE STREQUAL "9")
   MESSAGE(SEND_ERROR "SUBSTRING does not return the tail when selected with -1")
 ENDIF(NOT ST_NINE STREQUAL "9")
+
+# Test the CHOP command
+STRING(CHOP ${ST_INPUTSTRING} 0 CHP_ALL)
+STRING(CHOP ${ST_INPUTSTRING} 10 CHP_EMPTY_EQUAL)
+STRING(CHOP ${ST_INPUTSTRING} 20 CHP_EMPTY_MORE)
+STRING(CHOP ${ST_INPUTSTRING} 2 CHP_TO_EIGHT)
+
+IF(NOT ST_INPUTSTRING STREQUAL CHP_ALL)
+  MESSAGE(SEND_ERROR "CHOP does not return the whole string when called with length 0")
+ENDIF(NOT ST_INPUTSTRING STREQUAL CHP_ALL)
+IF(CHP_EMPTY_EQUAL)
+  MESSAGE(SEND_ERROR "CHOP does not return an empty string when called with length")
+ENDIF(CHP_EMPTY_EQUAL)
+IF(CHP_EMPTY_MORE)
+  MESSAGE(SEND_ERROR "CHOP does not return an empty string when called with greater length")
+ENDIF(CHP_EMPTY_MORE)
+IF(NOT CHP_TO_EIGHT STREQUAL "01234567")
+  MESSAGE(SEND_ERROR "CHOP does not return the correct string, was \"" ${CHP_TO_EIGHT} \"" should be \"01234567\"")
+ENDIF(NOT CHP_TO_EIGHT STREQUAL "01234567")
-- 
1.6.4.2

From f9f1e302304eac083b324b5e1db3b7df6febc307 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Thu, 3 Feb 2011 21:10:28 +0100
Subject: [PATCH] update documentation of STRING(SUBSTRING) for length -1

---
 Source/cmStringCommand.cxx |    4 ++--
 Source/cmStringCommand.h   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 949fcf5..673ed10 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -602,7 +602,7 @@ bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const&
   if ( begin < 0 || begin > intStringLength )
     {
     cmOStringStream ostr;
-    ostr << "begin index: " << begin << " is out of range 0 - "
+    ostr << "begin index: " << begin << " is out of range -1 - "
          << stringLength;
     this->SetError(ostr.str().c_str());
     return false;
@@ -611,7 +611,7 @@ bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const&
   if ( end < -1 || end > leftOverLength )
     {
     cmOStringStream ostr;
-    ostr << "end index: " << end << " is out of range " << 0 << " - "
+    ostr << "end index: " << end << " is out of range -1 - "
          << leftOverLength;
     this->SetError(ostr.str().c_str());
     return false;
diff --git a/Source/cmStringCommand.h b/Source/cmStringCommand.h
index 2a916b4..4f713f4 100644
--- a/Source/cmStringCommand.h
+++ b/Source/cmStringCommand.h
@@ -109,7 +109,8 @@ public:
       "a file.\n"
       "TOUPPER/TOLOWER will convert string to upper/lower characters.\n"
       "LENGTH will return a given string's length.\n"
-      "SUBSTRING will return a substring of a given string.\n"
+      "SUBSTRING will return a substring of a given string. If length is "
+      "-1 the remainder of the string starting at begin will be returned.\n"
       "STRIP will return a substring of a given string with leading "
       "and trailing spaces removed.\n"
       "RANDOM will return a random string of given length consisting of "
-- 
1.7.3.2