From 358515491a0d6891e6a709688a30ad087df1beb1 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Mon, 11 Sep 2017 16:33:48 +0000 Subject: Revert "Switch to the new SkSL lexer." This reverts commit c576e93d174f3106e072a2f506bca3990b541265. Reason for revert: ASAN failures Original change's description: > 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 > Commit-Queue: Ethan Nicholas TBR=bsalomon@google.com,ethannicholas@google.com Change-Id: If27b750a5f696d06a6bcffed12fe9f0598e084a6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/44881 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- tests/SkSLMemoryLayoutTest.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'tests/SkSLMemoryLayoutTest.cpp') diff --git a/tests/SkSLMemoryLayoutTest.cpp b/tests/SkSLMemoryLayoutTest.cpp index ef1383573e..80188e61c7 100644 --- a/tests/SkSLMemoryLayoutTest.cpp +++ b/tests/SkSLMemoryLayoutTest.cpp @@ -54,30 +54,30 @@ DEF_TEST(SkSLMemoryLayout140Test, r) { // struct 1 std::vector fields1; - fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("a"), context.fFloat3_Type.get()); - SkSL::Type s1(-1, SkSL::String("s1"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fFloat3_Type.get()); + SkSL::Type s1(SkSL::Position(), SkSL::String("s1"), fields1); REPORTER_ASSERT(r, 16 == layout.size(s1)); REPORTER_ASSERT(r, 16 == layout.alignment(s1)); - fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("b"), context.fFloat_Type.get()); - SkSL::Type s2(-1, SkSL::String("s2"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat_Type.get()); + SkSL::Type s2(SkSL::Position(), SkSL::String("s2"), fields1); REPORTER_ASSERT(r, 16 == layout.size(s2)); REPORTER_ASSERT(r, 16 == layout.alignment(s2)); - fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("c"), context.fBool_Type.get()); - SkSL::Type s3(-1, SkSL::String("s3"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::String("c"), context.fBool_Type.get()); + SkSL::Type s3(SkSL::Position(), SkSL::String("s3"), fields1); REPORTER_ASSERT(r, 32 == layout.size(s3)); REPORTER_ASSERT(r, 16 == layout.alignment(s3)); // struct 2 std::vector fields2; - fields2.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("a"), context.fInt_Type.get()); - SkSL::Type s4(-1, SkSL::String("s4"), fields2); + fields2.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fInt_Type.get()); + SkSL::Type s4(SkSL::Position(), SkSL::String("s4"), fields2); REPORTER_ASSERT(r, 16 == layout.size(s4)); REPORTER_ASSERT(r, 16 == layout.alignment(s4)); - fields2.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("b"), context.fFloat3_Type.get()); - SkSL::Type s5(-1, SkSL::String("s5"), fields2); + fields2.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat3_Type.get()); + SkSL::Type s5(SkSL::Position(), 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 fields1; - fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("a"), context.fFloat3_Type.get()); - SkSL::Type s1(-1, SkSL::String("s1"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fFloat3_Type.get()); + SkSL::Type s1(SkSL::Position(), SkSL::String("s1"), fields1); REPORTER_ASSERT(r, 16 == layout.size(s1)); REPORTER_ASSERT(r, 16 == layout.alignment(s1)); - fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("b"), context.fFloat_Type.get()); - SkSL::Type s2(-1, SkSL::String("s2"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat_Type.get()); + SkSL::Type s2(SkSL::Position(), SkSL::String("s2"), fields1); REPORTER_ASSERT(r, 16 == layout.size(s2)); REPORTER_ASSERT(r, 16 == layout.alignment(s2)); - fields1.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("c"), context.fBool_Type.get()); - SkSL::Type s3(-1, SkSL::String("s3"), fields1); + fields1.emplace_back(SkSL::Modifiers(), SkSL::String("c"), context.fBool_Type.get()); + SkSL::Type s3(SkSL::Position(), SkSL::String("s3"), fields1); REPORTER_ASSERT(r, 32 == layout.size(s3)); REPORTER_ASSERT(r, 16 == layout.alignment(s3)); // struct 2 std::vector fields2; - fields2.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("a"), context.fInt_Type.get()); - SkSL::Type s4(-1, SkSL::String("s4"), fields2); + fields2.emplace_back(SkSL::Modifiers(), SkSL::String("a"), context.fInt_Type.get()); + SkSL::Type s4(SkSL::Position(), SkSL::String("s4"), fields2); REPORTER_ASSERT(r, 4 == layout.size(s4)); REPORTER_ASSERT(r, 4 == layout.alignment(s4)); - fields2.emplace_back(SkSL::Modifiers(), SkSL::StringFragment("b"), context.fFloat3_Type.get()); - SkSL::Type s5(-1, SkSL::String("s5"), fields2); + fields2.emplace_back(SkSL::Modifiers(), SkSL::String("b"), context.fFloat3_Type.get()); + SkSL::Type s5(SkSL::Position(), SkSL::String("s5"), fields2); REPORTER_ASSERT(r, 32 == layout.size(s5)); REPORTER_ASSERT(r, 16 == layout.alignment(s5)); -- cgit v1.2.3