summaryrefslogtreecommitdiff
path: root/source/slang/slang-check-constraint.cpp
diff options
context:
space:
mode:
authorEllie Hermaszewska <ellieh@nvidia.com>2023-05-12 04:33:21 +0800
committerGitHub <noreply@github.com>2023-05-11 13:33:21 -0700
commit332f60c19336252d907b83882aa70665ca93a9d2 (patch)
tree45a3aa3ba0aa999f1a6cea00e8fcb11f7dafd9b8 /source/slang/slang-check-constraint.cpp
parentf414a14c1eac050ff2e1bdaf4f3dd2e4ec6f644e (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-constraint.cpp')
-rw-r--r--source/slang/slang-check-constraint.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/source/slang/slang-check-constraint.cpp b/source/slang/slang-check-constraint.cpp
index 12988ebcf..cdffcf004 100644
--- a/source/slang/slang-check-constraint.cpp
+++ b/source/slang/slang-check-constraint.cpp
@@ -741,6 +741,20 @@ namespace Slang
return true;
}
+ } else if(auto fstFunType = as<FuncType>(fst))
+ {
+ if (auto sndFunType = as<FuncType>(snd))
+ {
+ const Index numParams = fstFunType->paramTypes.getCount();
+ if(numParams != sndFunType->paramTypes.getCount())
+ return false;
+ for(Index i = 0; i < numParams; ++i)
+ {
+ if(!TryUnifyTypes(constraints, fstFunType->paramTypes[i], sndFunType->paramTypes[i]))
+ return false;
+ }
+ return TryUnifyTypes(constraints, fstFunType->resultType, sndFunType->resultType);
+ }
}
return false;