From 8585e5baf57e391b240da5e92b85d4c4c014a412 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Mon, 15 May 2017 23:38:39 +0100 Subject: [PATCH] Calculate string lengths at build time. --- src/tawashi_implem/cgi_environment_vars.cpp | 13 ++++- src/tawashi_implem/error_response.cpp | 15 +++++- src/tawashi_implem/string_lengths.hpp | 56 +++++++++++++++++++++ 3 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 src/tawashi_implem/string_lengths.hpp diff --git a/src/tawashi_implem/cgi_environment_vars.cpp b/src/tawashi_implem/cgi_environment_vars.cpp index 04d8c48..4073e13 100644 --- a/src/tawashi_implem/cgi_environment_vars.cpp +++ b/src/tawashi_implem/cgi_environment_vars.cpp @@ -17,12 +17,17 @@ #include "cgi_environment_vars.hpp" #include "sanitized_utf8.hpp" +#include "string_lengths.hpp" #include #include #include #include #include #include +#include +#if !defined(NDEBUG) +# include +#endif namespace std { template<> @@ -67,13 +72,19 @@ namespace tawashi { retlist.reserve(CGIVars::_size()); auto unrefined_env_vars = get_unrefined_env_vars(parEnvList); + auto enum_str_lengths = string_lengths(); + std::size_t z = 0; for (CGIVars var : CGIVars::_values()) { - auto it_found = unrefined_env_vars.find(var._to_string()); +#if !defined(NDEBUG) + assert(std::strlen(var._to_string()) == enum_str_lengths[z]); +#endif + auto it_found = unrefined_env_vars.find(boost::string_ref(var._to_string(), enum_str_lengths[z])); if (unrefined_env_vars.cend() != it_found) retlist.push_back(sanitized_utf8(it_found->second)); else retlist.push_back(std::string()); + ++z; } return retlist; } diff --git a/src/tawashi_implem/error_response.cpp b/src/tawashi_implem/error_response.cpp index f293669..3263001 100644 --- a/src/tawashi_implem/error_response.cpp +++ b/src/tawashi_implem/error_response.cpp @@ -18,10 +18,13 @@ #include "error_response.hpp" #include "error_reasons.hpp" #include "cgi_env.hpp" +#include "sprout/array/array.hpp" +#include "string_lengths.hpp" #include #include #include #include +#include namespace tawashi { ErrorResponse::ErrorResponse ( @@ -41,15 +44,23 @@ namespace tawashi { if (reason_int >= 0 and reason_int < ErrorReasons::_size()) reason_code = ErrorReasons::_from_integral(reason_int); - std::array err_descs { + constexpr const sprout::array err_descs { "Submitted pastie is either too short or too long and was rejected.", "Submitted pastie couldn't be saved.", "The pastie was not saved because the client is submitting too many pasties too quickly. Please wait a bit longer and try again.", "An unknown error was raised.", "Unable to connect to Redis." }; + constexpr const auto lengths = string_lengths(err_descs); + static_assert(err_descs.static_size == lengths.static_size, "Mismatching array sizes between strings and their lengths"); - parContext["error_message"] = std::string(err_descs[reason_code]); +#if !defined(NDEBUG) + for (std::size_t z = 0; z < err_descs.size(); ++z) { + assert(std::strlen(err_descs[z]) == lengths[z]); + } +#endif + + parContext["error_message"] = std::string(err_descs[reason_code], lengths[reason_code]); parContext["error_code"] = std::to_string(err_code); parContext["error_id"] = std::to_string(reason_code); } diff --git a/src/tawashi_implem/string_lengths.hpp b/src/tawashi_implem/string_lengths.hpp new file mode 100644 index 0000000..ff3509e --- /dev/null +++ b/src/tawashi_implem/string_lengths.hpp @@ -0,0 +1,56 @@ +/* Copyright 2017, Michele Santullo + * This file is part of "tawashi". + * + * "tawashi" is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * "tawashi" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with "tawashi". If not, see . + */ + +#pragma once + +#include "sprout/array/array.hpp" +#include "sprout/cstring/strlen.hpp" +#include "duckhandy/sequence_bt.hpp" +#include + +namespace tawashi { + namespace implem { + template + inline constexpr std::size_t string_length_at_index (const sprout::array& parStrings) { + return sprout::strlen(parStrings[I]); + } + + template + inline constexpr sprout::array string_lengths (const sprout::array& parStrings, dhandy::bt::index_seq) { + return sprout::array { + string_length_at_index(parStrings)... + }; + } + + template + inline constexpr sprout::array string_lengths (const typename Enum::_name_iterable& parEnumIterable, dhandy::bt::index_seq) { + return sprout::array { + sprout::strlen(parEnumIterable[Indices])... + }; + } + } //namespace implem + + template + inline constexpr sprout::array string_lengths (const sprout::array& parStrings) { + return implem::string_lengths(parStrings, dhandy::bt::index_range<0, S>()); + } + + template + inline constexpr sprout::array string_lengths() { + return implem::string_lengths(Enum::_names(), dhandy::bt::index_range<0, Enum::_size()>()); + } +} //namespace tawashi