Index: src/sksl/ast/SkSLASTIndexSuffix.h |
diff --git a/src/sksl/ast/SkSLASTIndexSuffix.h b/src/sksl/ast/SkSLASTIndexSuffix.h |
index 44d91fa4c4c11e4da9270bbab49130ebe9f49092..755029b0a212ffa03d744760627dd7c85907fb88 100644 |
--- a/src/sksl/ast/SkSLASTIndexSuffix.h |
+++ b/src/sksl/ast/SkSLASTIndexSuffix.h |
@@ -14,17 +14,27 @@ |
namespace SkSL { |
/** |
- * A bracketed expression, as in '[0]', indicating an array access. |
+ * A bracketed expression, as in '[0]', indicating an array access. Empty brackets (as occur in |
+ * 'float[](5, 6)' are represented with a null fExpression. |
*/ |
struct ASTIndexSuffix : public ASTSuffix { |
+ ASTIndexSuffix(Position position) |
+ : INHERITED(position, ASTSuffix::kIndex_Kind) |
+ , fExpression(nullptr) {} |
+ |
ASTIndexSuffix(std::unique_ptr<ASTExpression> expression) |
- : INHERITED(expression->fPosition, ASTSuffix::kIndex_Kind) |
+ : INHERITED(expression ? expression->fPosition : Position(), ASTSuffix::kIndex_Kind) |
, fExpression(std::move(expression)) {} |
std::string description() const override { |
- return "[" + fExpression->description() + "]"; |
+ if (fExpression) { |
+ return "[" + fExpression->description() + "]"; |
+ } else { |
+ return "[]"; |
+ } |
} |
+ // may be null |
std::unique_ptr<ASTExpression> fExpression; |
typedef ASTSuffix INHERITED; |