diff options
author | 2017-09-11 13:50:14 -0700 | |
---|---|---|
committer | 2017-09-11 21:45:20 +0000 | |
commit | 5b5f096a038259b8d9084834f877588a0db80250 (patch) | |
tree | 1b78aa591c578a09012b1f8f8533c3fc3d9c1372 /src/sksl/ir/SkSLPrefixExpression.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/ir/SkSLPrefixExpression.h')
-rw-r--r-- | src/sksl/ir/SkSLPrefixExpression.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sksl/ir/SkSLPrefixExpression.h b/src/sksl/ir/SkSLPrefixExpression.h index 5ac84c66b1..d5d97b2517 100644 --- a/src/sksl/ir/SkSLPrefixExpression.h +++ b/src/sksl/ir/SkSLPrefixExpression.h @@ -11,7 +11,7 @@ #include "SkSLExpression.h" #include "SkSLFloatLiteral.h" #include "SkSLIRGenerator.h" -#include "SkSLToken.h" +#include "SkSLLexer.h" namespace SkSL { @@ -20,7 +20,7 @@ namespace SkSL { */ struct PrefixExpression : public Expression { PrefixExpression(Token::Kind op, std::unique_ptr<Expression> operand) - : INHERITED(operand->fPosition, kPrefix_Kind, operand->fType) + : INHERITED(operand->fOffset, kPrefix_Kind, operand->fType) , fOperand(std::move(operand)) , fOperator(op) {} @@ -38,7 +38,7 @@ struct PrefixExpression : public Expression { if (fOperand->fKind == Expression::kFloatLiteral_Kind) { return std::unique_ptr<Expression>(new FloatLiteral( irGenerator.fContext, - Position(), + fOffset, -((FloatLiteral&) *fOperand).fValue)); } @@ -46,7 +46,7 @@ struct PrefixExpression : public Expression { } String description() const override { - return Token::OperatorName(fOperator) + fOperand->description(); + return Compiler::OperatorName(fOperator) + fOperand->description(); } std::unique_ptr<Expression> fOperand; |