aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/ast/SkSLASTFunction.h
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2017-09-11 16:33:48 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-11 16:34:02 +0000
commit358515491a0d6891e6a709688a30ad087df1beb1 (patch)
treece64223230053df7db85c94b848ad526e64269cd /src/sksl/ast/SkSLASTFunction.h
parentc576e93d174f3106e072a2f506bca3990b541265 (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/ast/SkSLASTFunction.h')
-rw-r--r--src/sksl/ast/SkSLASTFunction.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sksl/ast/SkSLASTFunction.h b/src/sksl/ast/SkSLASTFunction.h
index 4fa2482d8b..36d8a3af9f 100644
--- a/src/sksl/ast/SkSLASTFunction.h
+++ b/src/sksl/ast/SkSLASTFunction.h
@@ -19,13 +19,13 @@ namespace SkSL {
* A function declaration or definition. The fBody field will be null for declarations.
*/
struct ASTFunction : public ASTDeclaration {
- ASTFunction(int offset, Modifiers modifiers, std::unique_ptr<ASTType> returnType,
- StringFragment name, std::vector<std::unique_ptr<ASTParameter>> parameters,
+ ASTFunction(Position position, Modifiers modifiers, std::unique_ptr<ASTType> returnType,
+ String name, std::vector<std::unique_ptr<ASTParameter>> parameters,
std::unique_ptr<ASTBlock> body)
- : INHERITED(offset, kFunction_Kind)
+ : INHERITED(position, kFunction_Kind)
, fModifiers(modifiers)
, fReturnType(std::move(returnType))
- , fName(name)
+ , fName(std::move(name))
, fParameters(std::move(parameters))
, fBody(std::move(body)) {}
@@ -47,7 +47,7 @@ struct ASTFunction : public ASTDeclaration {
const Modifiers fModifiers;
const std::unique_ptr<ASTType> fReturnType;
- const StringFragment fName;
+ const String fName;
const std::vector<std::unique_ptr<ASTParameter>> fParameters;
const std::unique_ptr<ASTBlock> fBody;