diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-09-11 13:50:14 -0700 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-11 21:45:20 +0000 |
commit | 5b5f096a038259b8d9084834f877588a0db80250 (patch) | |
tree | 1b78aa591c578a09012b1f8f8533c3fc3d9c1372 /src/sksl/SkSLSectionAndParameterHelper.h | |
parent | 9194706e8cf1ed72f07b2ed9207d81120f2135ad (diff) |
Revert "Revert "Switch to the new SkSL lexer.""
This reverts commit 358515491a0d6891e6a709688a30ad087df1beb1.
Bug: skia:
Change-Id: I013fac0ed83774d8ae7c6ee6819045cab37f5e97
Reviewed-on: https://skia-review.googlesource.com/45180
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); |