diff options
Diffstat (limited to 'src/sksl/SkSLParser.h')
-rw-r--r-- | src/sksl/SkSLParser.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/sksl/SkSLParser.h b/src/sksl/SkSLParser.h index 9be017ce62..0fa00cb882 100644 --- a/src/sksl/SkSLParser.h +++ b/src/sksl/SkSLParser.h @@ -51,7 +51,7 @@ class SymbolTable; */ class Parser { public: - Parser(SkString text, SymbolTable& types, ErrorReporter& errors); + Parser(String text, SymbolTable& types, ErrorReporter& errors); ~Parser(); @@ -90,16 +90,16 @@ private: * Returns true if the read token was as expected, false otherwise. */ bool expect(Token::Kind kind, const char* expected, Token* result = nullptr); - bool expect(Token::Kind kind, SkString expected, Token* result = nullptr); + bool expect(Token::Kind kind, String expected, Token* result = nullptr); void error(Position p, const char* msg); - void error(Position p, SkString msg); - + void error(Position p, String msg); + /** * Returns true if the 'name' identifier refers to a type name. For instance, isType("int") will * always return true. */ - bool isType(SkString name); + bool isType(String name); // these functions parse individual grammar rules from the current parse position; you probably // don't need to call any of these outside of the parser. The function declarations in the .cpp @@ -119,12 +119,12 @@ private: std::unique_ptr<ASTVarDeclarations> varDeclarationEnd(Modifiers modifiers, std::unique_ptr<ASTType> type, - SkString name); + String name); std::unique_ptr<ASTParameter> parameter(); int layoutInt(); - + Layout layout(); Modifiers modifiers(); @@ -164,7 +164,7 @@ private: std::unique_ptr<ASTExpression> expression(); std::unique_ptr<ASTExpression> assignmentExpression(); - + std::unique_ptr<ASTExpression> ternaryExpression(); std::unique_ptr<ASTExpression> logicalOrExpression(); @@ -203,7 +203,7 @@ private: bool boolLiteral(bool* dest); - bool identifier(SkString* dest); + bool identifier(String* dest); void* fScanner; void* fLayoutScanner; |