From cc5e29734b0a177eb01b5f9f2fee2284b38b6127 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 14 Sep 2019 11:56:02 -0700 Subject: [PATCH] Use maybe_t in string_last_char --- src/common.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common.cpp b/src/common.cpp index 7bd6cc92a..1dd7415df 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -1277,9 +1277,10 @@ wcstring debug_escape(const wcstring &in) { return result; } -/// Helper to return the last character in a string, or NOT_A_WCHAR. -static wint_t string_last_char(const wcstring &str) { - return str.empty() ? NOT_A_WCHAR : str.back(); +/// Helper to return the last character in a string, or none. +static maybe_t string_last_char(const wcstring &str) { + if (str.empty()) return none(); + return str.back(); } /// Given a null terminated string starting with a backslash, read the escape as if it is unquoted,