wip

Signed-off-by: Christian Parpart <christian@parpart.family>
contour-terminal · Jun 20, 2024 · 4567597 · 4567597
1 parent 8cde861
commit 4567597
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/vtbackend/Line.cpp b/src/vtbackend/Line.cpp
@@ -173,9 +173,9 @@ struct TrivialLineInflater
     {
         vtParserLog()("Inflating TrivialLineBuffer: '{}'", input.text.data() ? crispy::escape(input.text.data()) : "");
         auto lineSegmenter = unicode::grapheme_line_segmenter { *this, input.text.view() };
-        auto result = lineSegmenter.process(std::numeric_limits<unsigned>::max());
+        [[maybe_unused]] auto result = lineSegmenter.process(std::numeric_limits<unsigned>::max());
         assert(result.stop_condition == unicode::StopCondition::EndOfInput);
-        auto const flushed = lineSegmenter.flush(std::numeric_limits<unsigned>::max());
+        [[maybe_unused]] auto const flushed = lineSegmenter.flush(std::numeric_limits<unsigned>::max());
         assert(flushed.stop_condition == unicode::StopCondition::EndOfInput);
         vtParserLog()("Inflated {}/{} columns", columns.size(), input.displayWidth);
 

diff --git a/src/vtbackend/Screen.h b/src/vtbackend/Screen.h
@@ -673,8 +673,8 @@ inline bool Screen<Cell>::isContiguousToCurrentLine(std::string_view continuatio
 #if !defined(_WIN32)
     return line.isTrivialBuffer() && line.trivialBuffer().text.view().end() == continuationChars.begin();
 #else
-    auto const end = line.trivialBuffer().text.data() + line.trivialBuffer().text.size();
-    auto const next = continuationChars.data();
+    char const* const end = line.trivialBuffer().text.data() + line.trivialBuffer().text.size();
+    char const* const next = continuationChars.data();
     return line.isTrivialBuffer() && end == next;
     // TODO: && line.trivialBuffer().text.view().end() == continuationChars.begin();
 #endif

diff --git a/src/vtbackend/ViCommands.cpp b/src/vtbackend/ViCommands.cpp
@@ -114,7 +114,7 @@ namespace
             return terminal.alternateScreen().grid().rightMostNonEmptyAt(lineOffset);
     }
 
-    constexpr std::optional<std::pair<char, bool>> matchingPairOfChar(char32_t input) noexcept
+    constexpr std::optional<std::pair<char32_t, bool>> matchingPairOfChar(char32_t input) noexcept
     {
         auto constexpr Pairs = std::array {
             std::pair { U'(', U')' },