more trying to get the iterator/pointer stuff right in a cross platfo…

…rm way
eteran · Jan 11, 2025 · 3109e5e · 3109e5e
1 parent 98ca392
commit 3109e5e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/Util/include/Util/algorithm.h b/Util/include/Util/algorithm.h
@@ -35,12 +35,15 @@ void moveItem(Cont &cont, int from, int to) {
 QT_WARNING_POP
 
 // string_view algorithms
-template <class Ch, class Tr = std::char_traits<Ch>>
-constexpr std::basic_string_view<Ch, Tr> substr(const Ch *first, const Ch *last) {
+template <class Iter>
+constexpr auto substr(Iter start, Iter end) {
 
-	const Ch *data = first;
-	auto size      = std::distance(first, last);
-	return std::basic_string_view<Ch, Tr>(data, static_cast<size_t>(size));
+	using Ch = typename std::iterator_traits<Iter>::value_type;
+
+	const Ch *first = &*start;
+	const Ch *last  = &*end;
+	auto size       = std::distance(first, last);
+	return std::basic_string_view<Ch>(first, static_cast<size_t>(size));
 }
 
 template <class Cont, class T, class Pred>

diff --git a/src/Highlight.cpp b/src/Highlight.cpp
@@ -1298,7 +1298,7 @@ bool parseString(const HighlightData *pattern, const char *&string_ptr, uint8_t
 							delimitersPtr,
 							look_behind_to,
 							match_to,
-							ctx->text.end())) {
+							end_ptr)) {
 						qCritical("NEdit: Internal error, failed to recover start match in parseString");
 						return false;
 					}

diff --git a/src/gap_buffer.h b/src/gap_buffer.h
@@ -8,8 +8,8 @@
 
 #include <algorithm>
 #include <cassert>
-#include <exception>
 #include <memory>
+#include <stdexcept>
 #include <string>
 #include <string_view>
 

diff --git a/src/shift.cpp b/src/shift.cpp
@@ -565,7 +565,9 @@ std::string shiftText(std::string_view text, ShiftDirection direction, int tabsA
 
 			auto segment = substr(lineStartPtr, text.end());
 
-			std::string shiftedLineString = (direction == ShiftDirection::Right) ? shiftLineRight(segment, textPtr - lineStartPtr, tabsAllowed, tabDist, nChars) : shiftLineLeft(segment, textPtr - lineStartPtr, tabDist, nChars);
+			std::string shiftedLineString = (direction == ShiftDirection::Right)
+												? shiftLineRight(segment, textPtr - lineStartPtr, tabsAllowed, tabDist, nChars)
+												: shiftLineLeft(segment, textPtr - lineStartPtr, tabDist, nChars);
 
 			std::copy(shiftedLineString.begin(), shiftedLineString.end(), shiftedPtr);