X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FString.h;h=3df3f9c41a15758a90bed49cb9e244c718f65752;hb=df377ed2a89f02d266468ef2a2d4ea109f741138;hp=93a4c658363c145046bc5c83f80e20de2d7e0a94;hpb=6b0452df2faa5b6b001fd65127243bf507d2b158;p=folly.git diff --git a/folly/String.h b/folly/String.h index 93a4c658..3df3f9c4 100644 --- a/folly/String.h +++ b/folly/String.h @@ -1,5 +1,5 @@ /* - * Copyright 2013 Facebook, Inc. + * Copyright 2014 Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,16 +21,23 @@ #include #include -#ifdef __GNUC__ -# include -# include +#ifdef FOLLY_HAVE_DEPRECATED_ASSOC +#ifdef _GLIBCXX_SYMVER +#include +#include #endif +#endif + +#include +#include -#include "folly/Conv.h" -#include "folly/FBString.h" -#include "folly/FBVector.h" -#include "folly/Range.h" -#include "folly/ScopeGuard.h" +#include +#include +#include +#include +#include +#include +#include // Compatibility function, to make sure toStdString(s) can be called // to convert a std::string or fbstring variable s into type std::string @@ -168,16 +175,16 @@ String uriUnescape(StringPiece str, UriEscapeMode mode = UriEscapeMode::ALL) { * resulting string, and the second appends the produced characters to * the specified string and returns a reference to it. */ -std::string stringPrintf(const char* format, ...) - __attribute__ ((format (printf, 1, 2))); +std::string stringPrintf(FOLLY_PRINTF_FORMAT const char* format, ...) + FOLLY_PRINTF_FORMAT_ATTR(1, 2); -/** Similar to stringPrintf, with different signiture. - */ -void stringPrintf(std::string* out, const char* fmt, ...) - __attribute__ ((format (printf, 2, 3))); +/* Similar to stringPrintf, with different signature. */ +void stringPrintf(std::string* out, FOLLY_PRINTF_FORMAT const char* fmt, ...) + FOLLY_PRINTF_FORMAT_ATTR(2, 3); -std::string& stringAppendf(std::string* output, const char* format, ...) - __attribute__ ((format (printf, 2, 3))); +std::string& stringAppendf(std::string* output, + FOLLY_PRINTF_FORMAT const char* format, ...) + FOLLY_PRINTF_FORMAT_ATTR(2, 3); /** * Backslashify a string, that is, replace non-printable characters @@ -263,7 +270,8 @@ bool unhexlify(const InputString& input, OutputString& output); * PRETTY_UNITS_METRIC - k, M, G, etc (goes up by 10^3 = 1000 each time) * PRETTY_UNITS_BINARY - k, M, G, etc (goes up by 2^10 = 1024 each time) * PRETTY_UNITS_BINARY_IEC - Ki, Mi, Gi, etc - * + * PRETTY_SI - full SI metric prefixes from yocto to Yotta + * http://en.wikipedia.org/wiki/Metric_prefix * @author Mark Rabkin */ enum PrettyType { @@ -279,11 +287,38 @@ enum PrettyType { PRETTY_UNITS_BINARY, PRETTY_UNITS_BINARY_IEC, - PRETTY_NUM_TYPES + PRETTY_SI, + PRETTY_NUM_TYPES, }; std::string prettyPrint(double val, PrettyType, bool addSpace = true); +/** + * This utility converts StringPiece in pretty format (look above) to double, + * with progress information. Alters the StringPiece parameter + * to get rid of the already-parsed characters. + * Expects string in form {space}* [] + * If string is not in correct format, utility finds longest valid prefix and + * if there at least one, returns double value based on that prefix and + * modifies string to what is left after parsing. Throws and std::range_error + * exception if there is no correct parse. + * Examples(for PRETTY_UNITS_METRIC): + * '10M' => 10 000 000 + * '10 M' => 10 000 000 + * '10' => 10 + * '10 Mx' => 10 000 000, prettyString == "x" + * 'abc' => throws std::range_error + */ +double prettyToDouble(folly::StringPiece *const prettyString, + const PrettyType type); + +/* + * Same as prettyToDouble(folly::StringPiece*, PrettyType), but + * expects whole string to be correctly parseable. Throws std::range_error + * otherwise + */ +double prettyToDouble(folly::StringPiece prettyString, const PrettyType type); + /** * Write a hex dump of size bytes starting at ptr to out. * @@ -313,22 +348,6 @@ std::string hexDump(const void* ptr, size_t size); */ fbstring errnoStr(int err); -/** - * Return the demangled (prettyfied) version of a C++ type. - * - * This function tries to produce a human-readable type, but the type name will - * be returned unchanged in case of error or if demangling isn't supported on - * your system. - * - * Use for debugging -- do not rely on demangle() returning anything useful. - * - * This function may allocate memory (and therefore throw). - */ -fbstring demangle(const char* name); -inline fbstring demangle(const std::type_info& type) { - return demangle(type.name()); -} - /** * Debug string for an exception: include type and what(). */ @@ -395,16 +414,24 @@ void splitTo(const Delim& delimiter, bool ignoreEmpty = false); /* - * Split a string into a fixed number of pieces by delimiter. Returns 'true' if - * the fields were all successfully populated. + * Split a string into a fixed number of string pieces and/or numeric types + * by delimiter. Any numeric type that folly::to<> can convert to from a + * string piece is supported as a target. Returns 'true' if the fields were + * all successfully populated. * - * Example: + * Examples: * * folly::StringPiece name, key, value; * if (folly::split('\t', line, name, key, value)) * ... * - * The 'exact' template paremeter specifies how the function behaves when too + * folly::StringPiece name; + * double value; + * int id; + * if (folly::split('\t', line, name, value, id)) + * ... + * + * The 'exact' template parameter specifies how the function behaves when too * many fields are present in the input string. When 'exact' is set to its * default value of 'true', a call to split will fail if the number of fields in * the input string does not exactly match the number of output parameters @@ -414,14 +441,24 @@ void splitTo(const Delim& delimiter, * folly::StringPiece x, y. * if (folly::split(':', "a:b:c", x, y)) * assert(x == "a" && y == "b:c"); + * + * Note that this will likely not work if the last field's target is of numeric + * type, in which case folly::to<> will throw an exception. */ +template +using IsSplitTargetType = std::integral_constant::value || + std::is_same::value>; + template -bool split(const Delim& delimiter, - StringPiece input, - StringPiece& outHead, - StringPieces&... outTail); + class OutputType, + class... OutputTypes> +typename std::enable_if::value, bool>::type +split(const Delim& delimiter, + StringPiece input, + OutputType& outHead, + OutputTypes&... outTail); /* * Join list of tokens. @@ -443,6 +480,13 @@ void join(const Delim& delimiter, join(delimiter, container.begin(), container.end(), output); } +template +void join(const Delim& delimiter, + const std::initializer_list& values, + String& output) { + join(delimiter, values.begin(), values.end(), output); +} + template std::string join(const Delim& delimiter, const Container& container) { @@ -451,28 +495,34 @@ std::string join(const Delim& delimiter, return output; } -} // namespace folly +template +std::string join(const Delim& delimiter, + const std::initializer_list& values) { + std::string output; + join(delimiter, values.begin(), values.end(), output); + return output; +} -// Hash functions for string and fbstring usable with e.g. hash_map -#ifdef __GNUC__ -namespace __gnu_cxx { +/** + * Returns a subpiece with all whitespace removed from the front of @sp. + * Whitespace means any of [' ', '\n', '\r', '\t']. + */ +StringPiece skipWhitespace(StringPiece sp); -template -struct hash > : private hash { - size_t operator()(const folly::basic_fbstring & s) const { - return hash::operator()(s.c_str()); - } -}; +/** + * Fast, in-place lowercasing of ASCII alphabetic characters in strings. + * Leaves all other characters unchanged, including those with the 0x80 + * bit set. + * @param str String to convert + * @param len Length of str, in bytes + */ +void toLowerAscii(char* str, size_t length); -template -struct hash > : private hash { - size_t operator()(const std::basic_string & s) const { - return hash::operator()(s.c_str()); - } -}; +inline void toLowerAscii(MutableStringPiece str) { + toLowerAscii(str.begin(), str.size()); +} -} // namespace __gnu_cxx -#endif +} // namespace folly // Hook into boost's type traits namespace boost { @@ -482,6 +532,6 @@ struct has_nothrow_constructor > : true_type { }; } // namespace boost -#include "folly/String-inl.h" +#include #endif