diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-01-12 10:17:01 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-01-12 10:17:01 -0800 |
| commit | bac75f1c7aa9e7d1a2e1a1a7c5db02b2dabefc44 (patch) | |
| tree | f9590cb807a6d41d837777f2e3ac814eccf18474 /src/mbgl/util/token.hpp | |
| parent | ab7122831ad016d98bdb005fdacfea2d55ac3d37 (diff) | |
| download | qtlocation-mapboxgl-bac75f1c7aa9e7d1a2e1a1a7c5db02b2dabefc44.tar.gz | |
Allow characters outside \w to be used in token
https://github.com/mapbox/mapbox-gl-js/pull/926
Diffstat (limited to 'src/mbgl/util/token.hpp')
| -rw-r--r-- | src/mbgl/util/token.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/util/token.hpp b/src/mbgl/util/token.hpp index 64192a99f9..455190aabf 100644 --- a/src/mbgl/util/token.hpp +++ b/src/mbgl/util/token.hpp @@ -8,6 +8,8 @@ namespace mbgl { namespace util { +const static std::string tokenReservedChars = "{}()[]<>$=:;.,^"; + // Replaces {tokens} in a string by calling the lookup function. template <typename Lookup> std::string replaceTokens(const std::string &source, const Lookup &lookup) { @@ -22,7 +24,7 @@ std::string replaceTokens(const std::string &source, const Lookup &lookup) { result.append(pos, brace); pos = brace; if (pos != end) { - for (brace++; brace != end && (std::isalnum(*brace) || *brace == '_'); brace++); + for (brace++; brace != end && tokenReservedChars.find(*brace) == std::string::npos; brace++); if (brace != end && *brace == '}') { result.append(lookup({ pos + 1, brace })); pos = brace + 1; |