| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2016 Google Inc. | 2 * Copyright 2016 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SKSL_FUNCTIONDECLARATION | 8 #ifndef SKSL_FUNCTIONDECLARATION |
| 9 #define SKSL_FUNCTIONDECLARATION | 9 #define SKSL_FUNCTIONDECLARATION |
| 10 | 10 |
| 11 #include "SkSLModifiers.h" | 11 #include "SkSLModifiers.h" |
| 12 #include "SkSLSymbol.h" | 12 #include "SkSLSymbol.h" |
| 13 #include "SkSLSymbolTable.h" | |
| 14 #include "SkSLType.h" | 13 #include "SkSLType.h" |
| 15 #include "SkSLVariable.h" | 14 #include "SkSLVariable.h" |
| 16 | 15 |
| 17 namespace SkSL { | 16 namespace SkSL { |
| 18 | 17 |
| 19 /** | 18 /** |
| 20 * A function declaration (not a definition -- does not contain a body). | 19 * A function declaration (not a definition -- does not contain a body). |
| 21 */ | 20 */ |
| 22 struct FunctionDeclaration : public Symbol { | 21 struct FunctionDeclaration : public Symbol { |
| 23 FunctionDeclaration(Position position, std::string name, | 22 FunctionDeclaration(Position position, std::string name, |
| 24 std::vector<const Variable*> parameters, const Type& ret
urnType) | 23 std::vector<std::shared_ptr<Variable>> parameters, |
| 24 std::shared_ptr<Type> returnType) |
| 25 : INHERITED(position, kFunctionDeclaration_Kind, std::move(name)) | 25 : INHERITED(position, kFunctionDeclaration_Kind, std::move(name)) |
| 26 , fDefined(false) | 26 , fDefined(false) |
| 27 , fParameters(std::move(parameters)) | 27 , fParameters(parameters) |
| 28 , fReturnType(returnType) {} | 28 , fReturnType(returnType) {} |
| 29 | 29 |
| 30 std::string description() const override { | 30 std::string description() const override { |
| 31 std::string result = fReturnType.description() + " " + fName + "("; | 31 std::string result = fReturnType->description() + " " + fName + "("; |
| 32 std::string separator = ""; | 32 std::string separator = ""; |
| 33 for (auto p : fParameters) { | 33 for (auto p : fParameters) { |
| 34 result += separator; | 34 result += separator; |
| 35 separator = ", "; | 35 separator = ", "; |
| 36 result += p->description(); | 36 result += p->description(); |
| 37 } | 37 } |
| 38 result += ")"; | 38 result += ")"; |
| 39 return result; | 39 return result; |
| 40 } | 40 } |
| 41 | 41 |
| 42 bool matches(const FunctionDeclaration& f) const { | 42 bool matches(FunctionDeclaration& f) { |
| 43 if (fName != f.fName) { | 43 return fName == f.fName && fParameters == f.fParameters; |
| 44 return false; | |
| 45 } | |
| 46 if (fParameters.size() != f.fParameters.size()) { | |
| 47 return false; | |
| 48 } | |
| 49 for (size_t i = 0; i < fParameters.size(); i++) { | |
| 50 if (fParameters[i]->fType != f.fParameters[i]->fType) { | |
| 51 return false; | |
| 52 } | |
| 53 } | |
| 54 return true; | |
| 55 } | 44 } |
| 56 | 45 |
| 57 mutable bool fDefined; | 46 mutable bool fDefined; |
| 58 const std::vector<const Variable*> fParameters; | 47 const std::vector<std::shared_ptr<Variable>> fParameters; |
| 59 const Type& fReturnType; | 48 const std::shared_ptr<Type> fReturnType; |
| 60 | 49 |
| 61 typedef Symbol INHERITED; | 50 typedef Symbol INHERITED; |
| 62 }; | 51 }; |
| 63 | 52 |
| 64 } // namespace | 53 } // namespace |
| 65 | 54 |
| 66 #endif | 55 #endif |
| OLD | NEW |