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 /src/sksl/SkSLSectionAndParameterHelper.h | |
| 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 '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 f70b82c439..fccfff473b 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->fPosition, + errors.error(s->fOffset, ("section '@" + s->fName + "' requires one parameter").c_str()); } } else if (s->fArgument.size()) { - errors.error(s->fPosition, + errors.error(s->fOffset, ("section '@" + s->fName + "' has no parameters").c_str()); } } else { - errors.error(s->fPosition, + errors.error(s->fOffset, ("unsupported section '@" + s->fName + "'").c_str()); } if (!SectionPermitsDuplicates(s->fName.c_str()) && fSections.find(s->fName) != fSections.end()) { - errors.error(s->fPosition, + errors.error(s->fOffset, ("duplicate section '@" + s->fName + "'").c_str()); } fSections[s->fName].push_back(s); |