commit d9d33c33dee064da260301faa313703e465d44c5
author Ethan Nicholas <ethannicholas@google.com> Tue Jun 12 11:05:59 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 12 19:16:03 2018 +0000
tree f2e9a592acde1715d71381d8ff7c97fdaf58edac
parent 22be4c4801f957f2820b9001b02b892f4b87a157

renamed SkSL's assert macros

Since SkSL needs to run outside of Skia, it was originally using its
own ASSERT macro, which mapped to SkASSERT when inside of Skia. This is
causing conflicts with one or two other ASSERT macros defined around
Skia, so to avoid that I am switching SkSL over to just use Skia's
standard naming for these macros.

Bug: skia:
Change-Id: I115435d7282da03d076c6080f7b13d1972b9eb9f
Reviewed-on: https://skia-review.googlesource.com/134322
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLParser.cpp

diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index 986d8c0..46dce11 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -133,7 +133,7 @@
 }
 
 void Parser::pushback(Token t) {
-    ASSERT(fPushback.fKind == Token::INVALID);
+    SkASSERT(fPushback.fKind == Token::INVALID);
     fPushback = std::move(t);
 }
 
@@ -1198,7 +1198,7 @@
     // parts of the compiler may rely upon this assumption.
     if (this->peek().fKind == Token::DEFAULT) {
         Token defaultStart;
-        ASSERT_RESULT(this->expect(Token::DEFAULT, "'default'", &defaultStart));
+        SkAssertResult(this->expect(Token::DEFAULT, "'default'", &defaultStart));
         if (!this->expect(Token::COLON, "':'")) {
             return nullptr;
         }