Bugfix for pymlreplace

The offset had been converted to an idx_t, but in some circumstances it
needed to be negative.  Introduced an offset_t (int) typedef, and made
the currentOffset an offset_t.  This probably breaks some lint rules about
signed/unsigned conversions, but not sure what is best to do.

Also fixed a logic error with the "next" position to start from after
making a replacement.  The Python version of the string obviously doesn't
change after a replacement, therefore the next point can be immediately after
the end of the previous found target, ignoring the size of the replacement
string.

Author: bruderstein

PythonScript/src/ScintillaWrapper.cpp

@@ -558,7 +558,7 @@ void ScintillaWrapper::rereplace(boost::python::object searchExp, boost::python:
 void ScintillaWrapper::pymlreplace(boost::python::object searchExp, boost::python::object replaceStr, boost::python::object count, boost::python::object flags, boost::python::object startPosition, boost::python::object endPosition)
 {
 	boost::python::str contents;
-	idx_t currentOffset = 0;
+	offset_t currentOffset = 0;
 
 	if (startPosition.is_none() && endPosition.is_none())
 	{
@@ -586,7 +586,7 @@ void ScintillaWrapper::pymlreplace(boost::python::object searchExp, boost::pytho
 			range.chrg.cpMax = GetLength();
 		}
 
-		currentOffset = (idx_t)range.chrg.cpMin;
+		currentOffset = (offset_t)range.chrg.cpMin;
 
 		range.lpstrText = new char[size_t((range.chrg.cpMax - range.chrg.cpMin) + 1)];
 		callScintilla(SCI_GETTEXTRANGE, 0, reinterpret_cast<LPARAM>(&range));
@@ -654,9 +654,8 @@ void ScintillaWrapper::pymlreplace(boost::python::object searchExp, boost::pytho
 				currentOffset += replacementLength - (matchEnd - matchStart);
 
 
-				// Set startPos (the start of the last match (absolute from the start of the string,
-				// ignoring the old startPos), plus the length of the replacement
-				startPos = matchStart + replacementLength;
+				// Set startPos to the end of the last match - startPos is with the original document
+				startPos = matchEnd; 
 
 
 			}
@@ -916,7 +915,7 @@ void ScintillaWrapper::pymlsearch(boost::python::object searchExp, boost::python
 		{
 			match = re.attr("search")(contents, pos, endPos);
 
-			// If nothing found, then continue to next line
+			// If nothing found, then skip
 			if (!match.is_none())
 			{
 				pos = boost::python::extract<int>(match.attr("start")());

PythonScript/src/stdafx.h

@@ -77,7 +77,14 @@ typedef  std::basic_string<TCHAR>	tstring;
 
 // Index type
 typedef size_t idx_t;
+
+// Offset type
+typedef int    offset_t;
+
 #define IDX_MAX SIZE_MAX
 
+#define OFF_MIN INT_MIN
+#define OFF_MAX INT_MAX
+
 // Workaround to fix boost::python::len return type, ssize_t, which is a signed integer.
 #define _len(x) ((size_t)len(x))