diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-09-07 15:44:01 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-11 16:17:00 +0000 |
| commit | c576e93d174f3106e072a2f506bca3990b541265 (patch) | |
| tree | d4a410200aa71183c95643535b440bec919f2e18 /tests/SkSLMemoryLayoutTest.cpp | |
| parent | a2bdf005f3c706065d1aa93f319f4b73932721d4 (diff) | |
Switch to the new SkSL lexer.
This completely replaces flex with a new in-house lexical analyzer generator,
which we have done for performance and memory usage reasons. Flex requires us
to copy strings every time we need the text of a token, whereas this new lexer
allows us to handle strings as a (non-null-terminated) pointer and length
everywhere, eliminating most string copies.
Bug: skia:
Change-Id: I2add26efc9e20cb699520e82abcf713af3968aca
Reviewed-on: https://skia-review.googlesource.com/39780
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'tests/SkSLMemoryLayoutTest.cpp')
| -rw-r--r-- | tests/SkSLMemoryLayoutTest.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/tests/SkSLMemoryLayoutTest.cpp b/tests/SkSLMemoryLayoutTest.cpp index 80188e61c7..ef1383573e 100644 --- a/tests/SkSLMemoryLayoutTest.cpp +++ b/tests/SkSLMemoryLayoutTest.cpp @@ -54,30 +54,30 @@ DEF_TEST(SkSLMemoryLayout140Test, r) { // struct 1 std::vector<SkSL::Type::Field> fields1; - fields1.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fFloat3_Type.get()); - SkSL::Type s1(SkSL::Position(), SkSL::String("s1"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("a"), context.fFloat3_Type.get()); + SkSL::Type s1(-1, SkSL::String("s1"), fields1); REPORTER_ASSERT(r, 16 == layout.size(s1)); REPORTER_ASSERT(r, 16 == layout.alignment(s1)); - fields1.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat_Type.get()); - SkSL::Type s2(SkSL::Position(), SkSL::String("s2"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("b"), context.fFloat_Type.get()); + SkSL::Type s2(-1, SkSL::String("s2"), fields1); REPORTER_ASSERT(r, 16 == layout.size(s2)); REPORTER_ASSERT(r, 16 == layout.alignment(s2)); - fields1.emplace_back(SkSL::Modifiers(), SkSL::String("c"), context.fBool_Type.get()); - SkSL::Type s3(SkSL::Position(), SkSL::String("s3"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("c"), context.fBool_Type.get()); + SkSL::Type s3(-1, SkSL::String("s3"), fields1); REPORTER_ASSERT(r, 32 == layout.size(s3)); REPORTER_ASSERT(r, 16 == layout.alignment(s3)); // struct 2 std::vector<SkSL::Type::Field> fields2; - fields2.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fInt_Type.get()); - SkSL::Type s4(SkSL::Position(), SkSL::String("s4"), fields2); + fields2.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("a"), context.fInt_Type.get()); + SkSL::Type s4(-1, SkSL::String("s4"), fields2); REPORTER_ASSERT(r, 16 == layout.size(s4)); REPORTER_ASSERT(r, 16 == layout.alignment(s4)); - fields2.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat3_Type.get()); - SkSL::Type s5(SkSL::Position(), SkSL::String("s5"), fields2); + fields2.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("b"), context.fFloat3_Type.get()); + SkSL::Type s5(-1, SkSL::String("s5"), fields2); REPORTER_ASSERT(r, 32 == layout.size(s5)); REPORTER_ASSERT(r, 16 == layout.alignment(s5)); @@ -135,30 +135,30 @@ DEF_TEST(SkSLMemoryLayout430Test, r) { // struct 1 std::vector<SkSL::Type::Field> fields1; - fields1.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fFloat3_Type.get()); - SkSL::Type s1(SkSL::Position(), SkSL::String("s1"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("a"), context.fFloat3_Type.get()); + SkSL::Type s1(-1, SkSL::String("s1"), fields1); REPORTER_ASSERT(r, 16 == layout.size(s1)); REPORTER_ASSERT(r, 16 == layout.alignment(s1)); - fields1.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat_Type.get()); - SkSL::Type s2(SkSL::Position(), SkSL::String("s2"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("b"), context.fFloat_Type.get()); + SkSL::Type s2(-1, SkSL::String("s2"), fields1); REPORTER_ASSERT(r, 16 == layout.size(s2)); REPORTER_ASSERT(r, 16 == layout.alignment(s2)); - fields1.emplace_back(SkSL::Modifiers(), SkSL::String("c"), context.fBool_Type.get()); - SkSL::Type s3(SkSL::Position(), SkSL::String("s3"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("c"), context.fBool_Type.get()); + SkSL::Type s3(-1, SkSL::String("s3"), fields1); REPORTER_ASSERT(r, 32 == layout.size(s3)); REPORTER_ASSERT(r, 16 == layout.alignment(s3)); // struct 2 std::vector<SkSL::Type::Field> fields2; - fields2.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fInt_Type.get()); - SkSL::Type s4(SkSL::Position(), SkSL::String("s4"), fields2); + fields2.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("a"), context.fInt_Type.get()); + SkSL::Type s4(-1, SkSL::String("s4"), fields2); REPORTER_ASSERT(r, 4 == layout.size(s4)); REPORTER_ASSERT(r, 4 == layout.alignment(s4)); - fields2.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat3_Type.get()); - SkSL::Type s5(SkSL::Position(), SkSL::String("s5"), fields2); + fields2.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("b"), context.fFloat3_Type.get()); + SkSL::Type s5(-1, SkSL::String("s5"), fields2); REPORTER_ASSERT(r, 32 == layout.size(s5)); REPORTER_ASSERT(r, 16 == layout.alignment(s5)); |