diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-09-11 16:33:48 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-11 16:34:02 +0000 |
| commit | 358515491a0d6891e6a709688a30ad087df1beb1 (patch) | |
| tree | ce64223230053df7db85c94b848ad526e64269cd /src/sksl/disable_flex_warnings.h | |
| parent | c576e93d174f3106e072a2f506bca3990b541265 (diff) | |
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 <bsalomon@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
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 <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/disable_flex_warnings.h')
| -rw-r--r-- | src/sksl/disable_flex_warnings.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/sksl/disable_flex_warnings.h b/src/sksl/disable_flex_warnings.h new file mode 100644 index 0000000000..ad73b63583 --- /dev/null +++ b/src/sksl/disable_flex_warnings.h @@ -0,0 +1,28 @@ +/* + * Copyright 2017 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +// useless include to avoid "#if before #include" complaint from Skia presubmit +#include "SkSLUtil.h" +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunneeded-internal-declaration" +#pragma clang diagnostic ignored "-Wnull-conversion" +#pragma clang diagnostic ignored "-Wsign-compare" +#pragma clang diagnostic ignored "-Wunused-function" +#pragma clang diagnostic ignored "-Wdeprecated-register" +#endif +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wsign-compare" +#pragma GCC diagnostic ignored "-Wunused-function" +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4018) +#endif + +#define YY_NO_UNPUT |