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/SkSLSectionAndParameterHelper.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/SkSLSectionAndParameterHelper.h')
| -rw-r--r-- | src/sksl/SkSLSectionAndParameterHelper.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sksl/SkSLSectionAndParameterHelper.h b/src/sksl/SkSLSectionAndParameterHelper.h index fccfff473b..f70b82c439 100644 --- a/src/sksl/SkSLSectionAndParameterHelper.h +++ b/src/sksl/SkSLSectionAndParameterHelper.h @@ -56,21 +56,21 @@ public: if (IsSupportedSection(s->fName.c_str())) { if (SectionAcceptsArgument(s->fName.c_str())) { if (!s->fArgument.size()) { - errors.error(s->fOffset, + errors.error(s->fPosition, ("section '@" + s->fName + "' requires one parameter").c_str()); } } else if (s->fArgument.size()) { - errors.error(s->fOffset, + errors.error(s->fPosition, ("section '@" + s->fName + "' has no parameters").c_str()); } } else { - errors.error(s->fOffset, + errors.error(s->fPosition, ("unsupported section '@" + s->fName + "'").c_str()); } if (!SectionPermitsDuplicates(s->fName.c_str()) && fSections.find(s->fName) != fSections.end()) { - errors.error(s->fOffset, + errors.error(s->fPosition, ("duplicate section '@" + s->fName + "'").c_str()); } fSections[s->fName].push_back(s); |