a2d22b2e08
Previously, DSLVar represented local, global, and parameter variables. This splits it into three separate subclasses. In addition to just being a cleaner API in general, this also addresses an issue we ran into with the upcoming DSLParser: previously, a global DSLVar's storage was not set correctly until DeclareGlobal was called, so an AddToSymbolTable call prior to DeclareGlobal would create the SkSL variable with the wrong storage, causing spurious errors on global-only modifiers. But holding off on the AddToSymbolTable tends to break constructs like "int x = 0, y = x", so improving the API seemed like the best way to address it. Now that we have greater type safety around variables, we can potentially avoid having to call AddToSymbolTable for DSLVar and DSLGlobalVar altogether, since we know they are both supposed to end up in the symbol table, but that isn't something I want to change in this CL. Change-Id: I5f390a7384ce0af6a2131d84f97fc5e5b318063f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/428576 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
113 lines
3.4 KiB
C++
113 lines
3.4 KiB
C++
/*
|
|
* Copyright 2021 Google LLC.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SKSL_DSL_FUNCTION
|
|
#define SKSL_DSL_FUNCTION
|
|
|
|
#include "include/sksl/DSLBlock.h"
|
|
#include "include/sksl/DSLExpression.h"
|
|
#include "include/sksl/DSLType.h"
|
|
#include "include/sksl/DSLVar.h"
|
|
#include "include/sksl/DSLWrapper.h"
|
|
|
|
namespace SkSL {
|
|
|
|
class Block;
|
|
class FunctionDeclaration;
|
|
class Variable;
|
|
|
|
namespace dsl {
|
|
|
|
class DSLType;
|
|
|
|
class DSLFunction {
|
|
public:
|
|
template<class... Parameters>
|
|
DSLFunction(const DSLType& returnType, skstd::string_view name, Parameters&... parameters)
|
|
: DSLFunction(DSLModifiers(), returnType, name, parameters...) {}
|
|
|
|
template<class... Parameters>
|
|
DSLFunction(DSLModifiers modifiers, const DSLType& returnType, skstd::string_view name,
|
|
Parameters&... parameters) {
|
|
SkTArray<DSLParameter*> parameterArray;
|
|
parameterArray.reserve_back(sizeof...(parameters));
|
|
|
|
// in C++17, we could just do:
|
|
// (parameterArray.push_back(¶meters), ...);
|
|
int unused[] = {0, (static_cast<void>(parameterArray.push_back(¶meters)), 0)...};
|
|
static_cast<void>(unused);
|
|
this->init(modifiers, returnType, name, std::move(parameterArray));
|
|
}
|
|
|
|
DSLFunction(const DSLType& returnType, skstd::string_view name,
|
|
SkTArray<DSLParameter*> parameters) {
|
|
this->init(DSLModifiers(), returnType, name, std::move(parameters));
|
|
}
|
|
|
|
DSLFunction(DSLModifiers modifiers, const DSLType& returnType, skstd::string_view name,
|
|
SkTArray<DSLParameter*> parameters) {
|
|
this->init(modifiers, returnType, name, std::move(parameters));
|
|
}
|
|
|
|
DSLFunction(const SkSL::FunctionDeclaration* decl)
|
|
: fDecl(decl) {}
|
|
|
|
virtual ~DSLFunction() = default;
|
|
|
|
template<class... Stmt>
|
|
void define(Stmt... stmts) {
|
|
DSLBlock block = DSLBlock(DSLStatement(std::move(stmts))...);
|
|
this->define(std::move(block));
|
|
}
|
|
|
|
void define(DSLBlock block);
|
|
|
|
/**
|
|
* Invokes the function with the given arguments.
|
|
*/
|
|
template<class... Args>
|
|
DSLExpression operator()(Args&&... args) {
|
|
SkTArray<DSLWrapper<DSLExpression>> argArray;
|
|
argArray.reserve_back(sizeof...(args));
|
|
this->collectArgs(argArray, std::forward<Args>(args)...);
|
|
return this->call(std::move(argArray));
|
|
}
|
|
|
|
/**
|
|
* Invokes the function with the given arguments.
|
|
*/
|
|
DSLExpression call(SkTArray<DSLWrapper<DSLExpression>> args);
|
|
|
|
private:
|
|
void collectArgs(SkTArray<DSLWrapper<DSLExpression>>& args) {}
|
|
|
|
template<class... RemainingArgs>
|
|
void collectArgs(SkTArray<DSLWrapper<DSLExpression>>& args, DSLVar& var,
|
|
RemainingArgs&&... remaining) {
|
|
args.push_back(DSLWrapper<DSLExpression>(var));
|
|
collectArgs(args, std::forward<RemainingArgs>(remaining)...);
|
|
}
|
|
|
|
template<class... RemainingArgs>
|
|
void collectArgs(SkTArray<DSLWrapper<DSLExpression>>& args, DSLExpression expr,
|
|
RemainingArgs&&... remaining) {
|
|
args.push_back(DSLWrapper<DSLExpression>(std::move(expr)));
|
|
collectArgs(args, std::forward<RemainingArgs>(remaining)...);
|
|
}
|
|
|
|
void init(DSLModifiers modifiers, const DSLType& returnType, skstd::string_view name,
|
|
SkTArray<DSLParameter*> params);
|
|
|
|
const SkSL::FunctionDeclaration* fDecl = nullptr;
|
|
};
|
|
|
|
} // namespace dsl
|
|
|
|
} // namespace SkSL
|
|
|
|
#endif
|