diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2023-05-12 04:33:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-11 13:33:21 -0700 |
| commit | 332f60c19336252d907b83882aa70665ca93a9d2 (patch) | |
| tree | 45a3aa3ba0aa999f1a6cea00e8fcb11f7dafd9b8 /source/slang/slang-check-expr.cpp | |
| parent | f414a14c1eac050ff2e1bdaf4f3dd2e4ec6f644e (diff) | |
MVP for higher order functions (#2849)
* MVP for higher order functions
* Add shader subgroup partitioned glsl intrinsics
* Implement parsing and checking for tuple types
Currently there is no way to do anything useful with them from the source language however
* neaten
* Correct precedence of function type parsing
* neaten
* higher order function tests
* function types of any arity
* Inference for higher order functions
* Add second test for unsynchronized params
* regenerate vs projects
* dx11 -> dx12 for saturated cooperations tests
* Disable saturated cooperation tests on vulkan
They fail on release builds in CI, not essential for the higher order function work however
* remove saturated-cooperation tests
* Remove unnecessary assert and clarify control flow in AddDeclRefOverloadCandidates
* Add Tuple type name mangling
* Use functype keyword to introduce function types
* Add more inference tests for hof
---------
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'source/slang/slang-check-expr.cpp')
| -rw-r--r-- | source/slang/slang-check-expr.cpp | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/source/slang/slang-check-expr.cpp b/source/slang/slang-check-expr.cpp index 7b8be7a33..a91ec1e98 100644 --- a/source/slang/slang-check-expr.cpp +++ b/source/slang/slang-check-expr.cpp @@ -3677,4 +3677,43 @@ namespace Slang } } + Expr* SemanticsExprVisitor::visitFuncTypeExpr(FuncTypeExpr* expr) + { + // The input and output to a function type must both be types + for(auto& t : expr->parameters) + t = CheckProperType(t); + expr->result = CheckProperType(expr->result); + + // TODO: Kind checking? Where are we stopping someone passing + // constraints around as value-inhabitable types + + // The result of this expression is a `FuncType`, which we need + // to wrap in a `TypeType` to indicate that the result is the type + // itself and not a value of that type. + List<Type*> types; + types.reserve(expr->parameters.getCount()); + for(const auto& t : expr->parameters) + types.add(t.type); + auto funcType = m_astBuilder->getFuncType(std::move(types), expr->result.type); + expr->type = m_astBuilder->getTypeType(funcType); + + return expr; + } + + Expr* SemanticsExprVisitor::visitTupleTypeExpr(TupleTypeExpr* expr) + { + // All tuple members must be types + for(auto& t : expr->members) + t = CheckProperType(t); + + // As in the other cases above, wrap in TypeType + List<Type*> types; + types.reserve(expr->members.getCount()); + for(auto t : expr->members) + types.add(t.type); + auto tupleType = m_astBuilder->getTupleType(types); + expr->type = m_astBuilder->getTypeType(tupleType); + + return expr; + } } |
