diff options
author | 2017-09-11 13:50:14 -0700 | |
---|---|---|
committer | 2017-09-11 21:45:20 +0000 | |
commit | 5b5f096a038259b8d9084834f877588a0db80250 (patch) | |
tree | 1b78aa591c578a09012b1f8f8533c3fc3d9c1372 /src/sksl/SkSLString.h | |
parent | 9194706e8cf1ed72f07b2ed9207d81120f2135ad (diff) |
Revert "Revert "Switch to the new SkSL lexer.""
This reverts commit 358515491a0d6891e6a709688a30ad087df1beb1.
Bug: skia:
Change-Id: I013fac0ed83774d8ae7c6ee6819045cab37f5e97
Reviewed-on: https://skia-review.googlesource.com/45180
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLString.h')
-rw-r--r-- | src/sksl/SkSLString.h | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/src/sksl/SkSLString.h b/src/sksl/SkSLString.h index 93bd7a5773..9cfdce4768 100644 --- a/src/sksl/SkSLString.h +++ b/src/sksl/SkSLString.h @@ -8,6 +8,8 @@ #ifndef SKSL_STRING #define SKSL_STRING +#include <cstring> + #define SKSL_USE_STD_STRING #include <stdarg.h> @@ -22,6 +24,33 @@ namespace SkSL { +// Represents a (not necessarily null-terminated) slice of a string. +struct StringFragment { + StringFragment() + : fChars(nullptr) + , fLength(0) {} + + StringFragment(const char* chars) + : fChars(chars) + , fLength(strlen(chars)) {} + + StringFragment(const char* chars, size_t length) + : fChars(chars) + , fLength(length) {} + + char operator[](size_t idx) const { + return fChars[idx]; + } + + bool operator==(const char* s) const; + bool operator!=(const char* s) const; + bool operator==(StringFragment s) const; + bool operator!=(StringFragment s) const; + + const char* fChars; + size_t fLength; +}; + class String : public SKSL_STRING_BASE { public: String() = default; @@ -41,6 +70,9 @@ public: String(const char* s, size_t size) : INHERITED(s, size) {} + String(StringFragment s) + : INHERITED(s.fChars, s.fLength) {} + static String printf(const char* fmt, ...); #ifdef SKSL_USE_STD_STRING @@ -53,6 +85,11 @@ public: String operator+(const char* s) const; String operator+(const String& s) const; + String operator+(StringFragment s) const; + String& operator+=(char c); + String& operator+=(const char* s); + String& operator+=(const String& s); + String& operator+=(StringFragment s); bool operator==(const char* s) const; bool operator!=(const char* s) const; bool operator==(const String& s) const; @@ -86,6 +123,18 @@ long stol(const String& s); } // namespace +namespace std { + template<> struct hash<SkSL::StringFragment> { + size_t operator()(const SkSL::StringFragment& s) const { + size_t result = 0; + for (size_t i = 0; i < s.fLength; ++i) { + result = result * 101 + s.fChars[i]; + } + return result; + } + }; +} // namespace + #ifdef SKSL_USE_STD_STRING namespace std { template<> struct hash<SkSL::String> { |