From ff1f4f43d37d0f3c3b599e6a714239962e1cc2f7 Mon Sep 17 00:00:00 2001 From: Richard Walters Date: Sun, 1 Jul 2018 23:39:59 -0700 Subject: Rename IsCharacterInSet module to CharacterSet --- CMakeLists.txt | 4 +- src/CharacterSet.cpp | 87 +++++++++++++++++++++++ src/CharacterSet.hpp | 122 +++++++++++++++++++++++++++++++++ src/IsCharacterInSet.cpp | 87 ----------------------- src/IsCharacterInSet.hpp | 122 --------------------------------- src/PercentEncodedCharacterDecoder.cpp | 2 +- src/Uri.cpp | 2 +- 7 files changed, 213 insertions(+), 213 deletions(-) create mode 100644 src/CharacterSet.cpp create mode 100644 src/CharacterSet.hpp delete mode 100644 src/IsCharacterInSet.cpp delete mode 100644 src/IsCharacterInSet.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 9172e4f..6168290 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,13 @@ set(This Uri) set(Headers include/Uri/Uri.hpp - src/IsCharacterInSet.hpp + src/CharacterSet.hpp src/NormalizeCaseInsensitiveString.hpp src/PercentEncodedCharacterDecoder.hpp ) set(Sources - src/IsCharacterInSet.cpp + src/CharacterSet.cpp src/NormalizeCaseInsensitiveString.cpp src/PercentEncodedCharacterDecoder.cpp src/Uri.cpp diff --git a/src/CharacterSet.cpp b/src/CharacterSet.cpp new file mode 100644 index 0000000..3869ec5 --- /dev/null +++ b/src/CharacterSet.cpp @@ -0,0 +1,87 @@ +/** + * @file IsCharacterInSet.cpp + * + * This module contains the implementation of the + * Uri::IsCharacterInSet function and the CharacterSet class. + * + * © 2018 by Richard Walters + */ + +#include "CharacterSet.hpp" + +#include + +namespace Uri { + + /** + * This contains the private properties of the CharacterSet class. + */ + struct CharacterSet::Impl { + /** + * This holds the characters in the set. + */ + std::set< char > charactersInSet; + }; + + CharacterSet::~CharacterSet() = default; + CharacterSet::CharacterSet(const CharacterSet& other) + : impl_(new Impl(*other.impl_)) + { + } + CharacterSet::CharacterSet(CharacterSet&& other) = default; + CharacterSet& CharacterSet::operator=(const CharacterSet& other) { + if (this != &other) { + *impl_ = *other.impl_; + } + return *this; + } + CharacterSet& CharacterSet::operator=(CharacterSet&& other) = default; + + CharacterSet::CharacterSet() + : impl_(new Impl) + { + } + + CharacterSet::CharacterSet(char c) + : impl_(new Impl) + { + (void)impl_->charactersInSet.insert(c); + } + + CharacterSet::CharacterSet(char first, char last) + : impl_(new Impl) + { + for (char c = first; c < last + 1; ++c) { + (void)impl_->charactersInSet.insert(c); + } + } + + CharacterSet::CharacterSet( + std::initializer_list< const CharacterSet > characterSets + ) + : impl_(new Impl) + { + for ( + auto characterSet = characterSets.begin(); + characterSet != characterSets.end(); + ++characterSet + ) { + impl_->charactersInSet.insert( + characterSet->impl_->charactersInSet.begin(), + characterSet->impl_->charactersInSet.end() + ); + } + } + + bool CharacterSet::Contains(char c) const { + return impl_->charactersInSet.find(c) != impl_->charactersInSet.end(); + } + + bool IsCharacterInSet( + char c, + const CharacterSet& characterSet + ) { + return characterSet.Contains(c); + } + +} diff --git a/src/CharacterSet.hpp b/src/CharacterSet.hpp new file mode 100644 index 0000000..e93976f --- /dev/null +++ b/src/CharacterSet.hpp @@ -0,0 +1,122 @@ +#ifndef URI_CHARACTER_SET_HPP +#define URI_CHARACTER_SET_HPP + +/** + * @file CharacterSet.hpp + * + * This module declares the Uri::IsCharacterInSet function + * and the CharacterSet class. + * + * © 2018 by Richard Walters + */ + +#include +#include + +namespace Uri { + + /** + * This represents a set of characters which can be queried + * to find out if a character is in the set or not. + */ + class CharacterSet { + // Lifecycle management + public: + ~CharacterSet(); + CharacterSet(const CharacterSet&); + CharacterSet(CharacterSet&&); + CharacterSet& operator=(const CharacterSet&); + CharacterSet& operator=(CharacterSet&&); + + // Methods + public: + /** + * This is the default constructor. + */ + CharacterSet(); + + /** + * This constructs a character set that contains + * just the given character. + * + * @param[in] c + * This is the only character to put in the set. + */ + CharacterSet(char c); + + /** + * This constructs a character set that contains all the + * characters between the given "first" and "last" + * characters, inclusive. + * + * @param[in] first + * This is the first of the range of characters + * to put in the set. + * + * @param[in] last + * This is the last of the range of characters + * to put in the set. + */ + CharacterSet(char first, char last); + + /** + * This constructs a character set that contains all the + * characters in all the other given character sets. + * + * @param[in] characterSets + * These are the character sets to include. + */ + CharacterSet( + std::initializer_list< const CharacterSet > characterSets + ); + + /** + * This method checks to see if the given character + * is in the character set. + * + * @param[in] c + * This is the character to check. + * + * @return + * An indication of whether or not the given character + * is in the character set is returned. + */ + bool Contains(char c) const; + + // Private Properties + private: + /** + * This is the type of structure that contains the private + * properties of the instance. It is defined in the implementation + * and declared here to ensure that it is scoped inside the class. + */ + struct Impl; + + /** + * This contains the private properties of the instance. + */ + std::unique_ptr< struct Impl > impl_; + }; + + /** + * This function determines whether or not the given character + * is in the given character set. + * + * @param[in] c + * This is the character to check. + * + * @param[in] characterSet + * This is the set of characters that are allowed. + * + * @return + * An indication of whether or not the given character + * is in the given character set is returned. + */ + bool IsCharacterInSet( + char c, + const CharacterSet& characterSet + ); + +} + +#endif /* URI_CHARACTER_SET_HPP */ diff --git a/src/IsCharacterInSet.cpp b/src/IsCharacterInSet.cpp deleted file mode 100644 index 6b9f977..0000000 --- a/src/IsCharacterInSet.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/** - * @file IsCharacterInSet.cpp - * - * This module contains the implementation of the - * Uri::IsCharacterInSet function and the CharacterSet class. - * - * © 2018 by Richard Walters - */ - -#include "IsCharacterInSet.hpp" - -#include - -namespace Uri { - - /** - * This contains the private properties of the CharacterSet class. - */ - struct CharacterSet::Impl { - /** - * This holds the characters in the set. - */ - std::set< char > charactersInSet; - }; - - CharacterSet::~CharacterSet() = default; - CharacterSet::CharacterSet(const CharacterSet& other) - : impl_(new Impl(*other.impl_)) - { - } - CharacterSet::CharacterSet(CharacterSet&& other) = default; - CharacterSet& CharacterSet::operator=(const CharacterSet& other) { - if (this != &other) { - *impl_ = *other.impl_; - } - return *this; - } - CharacterSet& CharacterSet::operator=(CharacterSet&& other) = default; - - CharacterSet::CharacterSet() - : impl_(new Impl) - { - } - - CharacterSet::CharacterSet(char c) - : impl_(new Impl) - { - (void)impl_->charactersInSet.insert(c); - } - - CharacterSet::CharacterSet(char first, char last) - : impl_(new Impl) - { - for (char c = first; c < last + 1; ++c) { - (void)impl_->charactersInSet.insert(c); - } - } - - CharacterSet::CharacterSet( - std::initializer_list< const CharacterSet > characterSets - ) - : impl_(new Impl) - { - for ( - auto characterSet = characterSets.begin(); - characterSet != characterSets.end(); - ++characterSet - ) { - impl_->charactersInSet.insert( - characterSet->impl_->charactersInSet.begin(), - characterSet->impl_->charactersInSet.end() - ); - } - } - - bool CharacterSet::Contains(char c) const { - return impl_->charactersInSet.find(c) != impl_->charactersInSet.end(); - } - - bool IsCharacterInSet( - char c, - const CharacterSet& characterSet - ) { - return characterSet.Contains(c); - } - -} diff --git a/src/IsCharacterInSet.hpp b/src/IsCharacterInSet.hpp deleted file mode 100644 index 50deaa4..0000000 --- a/src/IsCharacterInSet.hpp +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef URI_IS_CHARACTER_IN_SET_HPP -#define URI_IS_CHARACTER_IN_SET_HPP - -/** - * @file IsCharacterInSet.hpp - * - * This module declares the Uri::IsCharacterInSet function - * and the CharacterSet class. - * - * © 2018 by Richard Walters - */ - -#include -#include - -namespace Uri { - - /** - * This represents a set of characters which can be queried - * to find out if a character is in the set or not. - */ - class CharacterSet { - // Lifecycle management - public: - ~CharacterSet(); - CharacterSet(const CharacterSet&); - CharacterSet(CharacterSet&&); - CharacterSet& operator=(const CharacterSet&); - CharacterSet& operator=(CharacterSet&&); - - // Methods - public: - /** - * This is the default constructor. - */ - CharacterSet(); - - /** - * This constructs a character set that contains - * just the given character. - * - * @param[in] c - * This is the only character to put in the set. - */ - CharacterSet(char c); - - /** - * This constructs a character set that contains all the - * characters between the given "first" and "last" - * characters, inclusive. - * - * @param[in] first - * This is the first of the range of characters - * to put in the set. - * - * @param[in] last - * This is the last of the range of characters - * to put in the set. - */ - CharacterSet(char first, char last); - - /** - * This constructs a character set that contains all the - * characters in all the other given character sets. - * - * @param[in] characterSets - * These are the character sets to include. - */ - CharacterSet( - std::initializer_list< const CharacterSet > characterSets - ); - - /** - * This method checks to see if the given character - * is in the character set. - * - * @param[in] c - * This is the character to check. - * - * @return - * An indication of whether or not the given character - * is in the character set is returned. - */ - bool Contains(char c) const; - - // Private Properties - private: - /** - * This is the type of structure that contains the private - * properties of the instance. It is defined in the implementation - * and declared here to ensure that it is scoped inside the class. - */ - struct Impl; - - /** - * This contains the private properties of the instance. - */ - std::unique_ptr< struct Impl > impl_; - }; - - /** - * This function determines whether or not the given character - * is in the given character set. - * - * @param[in] c - * This is the character to check. - * - * @param[in] characterSet - * This is the set of characters that are allowed. - * - * @return - * An indication of whether or not the given character - * is in the given character set is returned. - */ - bool IsCharacterInSet( - char c, - const CharacterSet& characterSet - ); - -} - -#endif /* URI_IS_CHARACTER_IN_SET_HPP */ diff --git a/src/PercentEncodedCharacterDecoder.cpp b/src/PercentEncodedCharacterDecoder.cpp index dc7cd58..1720ee9 100644 --- a/src/PercentEncodedCharacterDecoder.cpp +++ b/src/PercentEncodedCharacterDecoder.cpp @@ -7,7 +7,7 @@ * © 2018 by Richard Walters */ -#include "IsCharacterInSet.hpp" +#include "CharacterSet.hpp" #include "PercentEncodedCharacterDecoder.hpp" namespace { diff --git a/src/Uri.cpp b/src/Uri.cpp index 08304d3..03eff68 100644 --- a/src/Uri.cpp +++ b/src/Uri.cpp @@ -6,7 +6,7 @@ * © 2018 by Richard Walters */ -#include "IsCharacterInSet.hpp" +#include "CharacterSet.hpp" #include "NormalizeCaseInsensitiveString.hpp" #include "PercentEncodedCharacterDecoder.hpp" -- cgit v1.2.3