From 27a40a984364a1ed2619028babd854a4397a881b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 16 Oct 2015 08:59:47 +0200 Subject: util/StringView: add methods StripLeft(), StripRight() --- Makefile.am | 2 +- src/util/StringView.cxx | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/util/StringView.hxx | 10 ++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 src/util/StringView.cxx diff --git a/Makefile.am b/Makefile.am index e6ac686c0..445dbe535 100644 --- a/Makefile.am +++ b/Makefile.am @@ -401,7 +401,7 @@ libutil_a_SOURCES = \ src/util/CharUtil.hxx \ src/util/NumberParser.hxx \ src/util/StringPointer.hxx \ - src/util/StringView.hxx \ + src/util/StringView.cxx src/util/StringView.hxx \ src/util/AllocatedString.cxx src/util/AllocatedString.hxx \ src/util/StringUtil.cxx src/util/StringUtil.hxx \ src/util/WStringUtil.cxx src/util/WStringUtil.hxx \ diff --git a/src/util/StringView.cxx b/src/util/StringView.cxx new file mode 100644 index 000000000..904f92f65 --- /dev/null +++ b/src/util/StringView.cxx @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2013-2015 Max Kellermann + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "StringView.hxx" +#include "CharUtil.hxx" + +void +StringView::StripLeft() +{ + while (!IsEmpty() && IsWhitespaceOrNull(front())) + pop_front(); +} + +void +StringView::StripRight() +{ + while (!IsEmpty() && IsWhitespaceOrNull(back())) + pop_back(); +} diff --git a/src/util/StringView.hxx b/src/util/StringView.hxx index fbae9a7cc..dd6c4dc77 100644 --- a/src/util/StringView.hxx +++ b/src/util/StringView.hxx @@ -103,6 +103,16 @@ struct StringView : ConstBuffer { bool EqualsLiteralIgnoreCase(const char (&other)[n]) const { return EqualsIgnoreCase({other, n - 1}); } + + /** + * Skip all whitespace at the beginning. + */ + void StripLeft(); + + /** + * Skip all whitespace at the end. + */ + void StripRight(); }; #endif -- cgit v1.2.3