commit 6f20b8d5f7d9717f16b801c689968842fd102ca9
author Ethan Nicholas <ethannicholas@google.com> Tue Aug 31 07:40:24 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Aug 31 12:45:45 2021 +0000
tree 7ce26b6883496511451f7e45a4c016ce5519efcc
parent 262713dc652a9ef0dc83af379fb32ec43e6c45da

Added line numbers to DSLParser errors

Change-Id: I895c3d94c9a49cc0350b287d3aa722050b91295e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/443036
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/sksl/dsl/DSLFunction.cpp

diff --git a/src/sksl/dsl/DSLFunction.cpp b/src/sksl/dsl/DSLFunction.cpp
index 78bafb0..1c9256c 100644
--- a/src/sksl/dsl/DSLFunction.cpp
+++ b/src/sksl/dsl/DSLFunction.cpp
@@ -20,7 +20,7 @@
 namespace dsl {
 
 void DSLFunction::init(DSLModifiers modifiers, const DSLType& returnType, skstd::string_view name,
-                       SkTArray<DSLParameter*> params) {
+                       SkTArray<DSLParameter*> params, PositionInfo pos) {
     // Conservatively assume all user-defined functions have side effects.
     if (!DSLWriter::IsModule()) {
         modifiers.fModifiers.fFlags |= Modifiers::kHasSideEffects_Flag;
@@ -51,7 +51,7 @@
     SkASSERT(paramVars.size() == params.size());
     fDecl = SkSL::FunctionDeclaration::Convert(DSLWriter::Context(),
                                                *DSLWriter::SymbolTable(),
-                                               /*offset=*/-1,
+                                               pos.offset(),
                                                DSLWriter::Modifiers(modifiers.fModifiers),
                                                name == "main" ? name : DSLWriter::Name(name),
                                                std::move(paramVars), &returnType.skslType(),
@@ -66,7 +66,7 @@
         // case the definition is delayed. If we end up defining the function immediately, we'll
         // remove the prototype in define().
         DSLWriter::ProgramElements().push_back(std::make_unique<SkSL::FunctionPrototype>(
-                /*offset=*/-1, fDecl, DSLWriter::IsModule()));
+                pos.offset(), fDecl, DSLWriter::IsModule()));
     }
 }