summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-check-overload.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2020-05-29 08:36:10 -0400
committerGitHub <noreply@github.com>2020-05-29 08:36:10 -0400
commitf3d70425fa339a0d8f39b920235c98280d250bbb (patch)
tree24923917e3ca43fdc1b3ca67ee589973c92a4b60 /source/slang/slang-check-overload.cpp
parent95597d77b131ee2c41c2eb4481844c315b2c82eb (diff)
Feature/ast syntax standard (#1360)
* Small improvements to documentation and code around DiagnosticSink * Made methods/functions in slang-syntax.h be lowerCamel Removed some commented out source (was placed elsewhere in code) * Making AST related methods and function lowerCamel. Made IsLeftValue -> isLeftValue.
Diffstat (limited to 'source/slang/slang-check-overload.cpp')
-rw-r--r--source/slang/slang-check-overload.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp
index 6af2eec58..0bfb4ccaa 100644
--- a/source/slang/slang-check-overload.cpp
+++ b/source/slang/slang-check-overload.cpp
@@ -68,7 +68,7 @@ namespace Slang
switch (candidate.flavor)
{
case OverloadCandidate::Flavor::Func:
- paramCounts = CountParameters(GetParameters(candidate.item.declRef.as<CallableDecl>()));
+ paramCounts = CountParameters(getParameters(candidate.item.declRef.as<CallableDecl>()));
break;
case OverloadCandidate::Flavor::Generic:
@@ -257,7 +257,7 @@ namespace Slang
if (context.mode == OverloadResolveContext::Mode::JustTrying)
{
ConversionCost cost = kConversionCost_None;
- if (!canCoerce(GetType(m_astBuilder, valParamRef), arg->type, &cost))
+ if (!canCoerce(getType(m_astBuilder, valParamRef), arg->type, &cost))
{
success = false;
}
@@ -265,7 +265,7 @@ namespace Slang
}
else
{
- arg = coerce(GetType(m_astBuilder, valParamRef), arg);
+ arg = coerce(getType(m_astBuilder, valParamRef), arg);
}
}
@@ -316,7 +316,7 @@ namespace Slang
switch (candidate.flavor)
{
case OverloadCandidate::Flavor::Func:
- params = GetParameters(candidate.item.declRef.as<CallableDecl>()).toArray();
+ params = getParameters(candidate.item.declRef.as<CallableDecl>()).toArray();
break;
case OverloadCandidate::Flavor::Generic:
@@ -343,10 +343,10 @@ namespace Slang
if( context.disallowNestedConversions )
{
// We need an exact match in this case.
- if(!GetType(m_astBuilder, param)->equals(argType))
+ if(!getType(m_astBuilder, param)->equals(argType))
return false;
}
- else if (!canCoerce(GetType(m_astBuilder, param), argType, &cost))
+ else if (!canCoerce(getType(m_astBuilder, param), argType, &cost))
{
return false;
}
@@ -354,7 +354,7 @@ namespace Slang
}
else
{
- arg = coerce(GetType(m_astBuilder, param), arg);
+ arg = coerce(getType(m_astBuilder, param), arg);
}
}
return true;
@@ -396,8 +396,8 @@ namespace Slang
DeclRef<GenericTypeConstraintDecl> constraintDeclRef(
constraintDecl, subset);
- auto sub = GetSub(m_astBuilder, constraintDeclRef);
- auto sup = GetSup(m_astBuilder, constraintDeclRef);
+ auto sub = getSub(m_astBuilder, constraintDeclRef);
+ auto sup = getSup(m_astBuilder, constraintDeclRef);
auto subTypeWitness = tryGetSubtypeWitness(sub, sup);
if(subTypeWitness)
@@ -465,7 +465,7 @@ namespace Slang
subst->genericDecl = baseGenericRef.getDecl();
subst->outer = baseGenericRef.substitutions.substitutions;
- DeclRef<Decl> innerDeclRef(GetInner(baseGenericRef), subst);
+ DeclRef<Decl> innerDeclRef(getInner(baseGenericRef), subst);
RefPtr<Expr> base;
if (auto mbrExpr = as<MemberExpr>(baseExpr))
@@ -540,7 +540,7 @@ namespace Slang
const auto& decl = subscriptDeclRef.getDecl();
if (decl->getMembersOfType<SetterDecl>().isNonEmpty() || decl->getMembersOfType<RefAccessorDecl>().isNonEmpty())
{
- callExpr->type.IsLeftValue = true;
+ callExpr->type.isLeftValue = true;
}
}
@@ -584,9 +584,9 @@ namespace Slang
if(!declRef)
return false;
- auto parent = declRef.GetParent();
+ auto parent = declRef.getParent();
if(parent.as<GenericDecl>())
- parent = parent.GetParent();
+ parent = parent.getParent();
if(parent.as<InterfaceDecl>())
return true;
@@ -606,7 +606,7 @@ namespace Slang
// "inner" declaration of a generic. That means that
// the parent of the decl ref must be a generic.
//
- auto parentGeneric = declRef.GetParent().as<GenericDecl>();
+ auto parentGeneric = declRef.getParent().as<GenericDecl>();
if(!parentGeneric)
return 0;
//
@@ -940,7 +940,7 @@ namespace Slang
OverloadCandidate candidate;
candidate.flavor = OverloadCandidate::Flavor::Func;
candidate.item = item;
- candidate.resultType = GetResultType(m_astBuilder, funcDeclRef);
+ candidate.resultType = getResultType(m_astBuilder, funcDeclRef);
AddOverloadCandidate(context, candidate);
}
@@ -994,14 +994,14 @@ namespace Slang
// Construct a reference to the inner declaration that has any generic
// parameter substitutions in place already, but *not* any substutions
// for the generic declaration we are currently trying to infer.
- auto innerDecl = GetInner(genericDeclRef);
+ auto innerDecl = getInner(genericDeclRef);
DeclRef<Decl> unspecializedInnerRef = DeclRef<Decl>(innerDecl, genericDeclRef.substitutions);
// Check what type of declaration we are dealing with, and then try
// to match it up with the arguments accordingly...
if (auto funcDeclRef = unspecializedInnerRef.as<CallableDecl>())
{
- auto params = GetParameters(funcDeclRef).toArray();
+ auto params = getParameters(funcDeclRef).toArray();
Index argCount = context.getArgCount();
Index paramCount = params.getCount();
@@ -1037,7 +1037,7 @@ namespace Slang
// So the question is then whether a mismatch during the
// unification step should be taken as an immediate failure...
- TryUnifyTypes(constraints, context.getArgType(aa), GetType(m_astBuilder, params[aa]));
+ TryUnifyTypes(constraints, context.getArgType(aa), getType(m_astBuilder, params[aa]));
#endif
}
}
@@ -1253,14 +1253,14 @@ namespace Slang
void SemanticsVisitor::formatDeclPath(StringBuilder& sb, DeclRef<Decl> declRef)
{
// Find the parent declaration
- auto parentDeclRef = declRef.GetParent();
+ auto parentDeclRef = declRef.getParent();
// If the immediate parent is a generic, then we probably
// want the declaration above that...
auto parentGenericDeclRef = parentDeclRef.as<GenericDecl>();
if(parentGenericDeclRef)
{
- parentDeclRef = parentGenericDeclRef.GetParent();
+ parentDeclRef = parentGenericDeclRef.getParent();
}
// Depending on what the parent is, we may want to format things specially
@@ -1320,11 +1320,11 @@ namespace Slang
sb << "(";
bool first = true;
- for (auto paramDeclRef : GetParameters(funcDeclRef))
+ for (auto paramDeclRef : getParameters(funcDeclRef))
{
if (!first) sb << ", ";
- formatType(sb, GetType(m_astBuilder, paramDeclRef));
+ formatType(sb, getType(m_astBuilder, paramDeclRef));
first = false;
@@ -1343,23 +1343,23 @@ namespace Slang
if (!first) sb << ", ";
first = false;
- sb << getText(genericTypeParam.GetName());
+ sb << getText(genericTypeParam.getName());
}
else if(auto genericValParam = paramDeclRef.as<GenericValueParamDecl>())
{
if (!first) sb << ", ";
first = false;
- sb << getText(genericValParam.GetName());
+ sb << getText(genericValParam.getName());
sb << ":";
- formatType(sb, GetType(m_astBuilder, genericValParam));
+ formatType(sb, getType(m_astBuilder, genericValParam));
}
else
{}
}
sb << ">";
- formatDeclParams(sb, DeclRef<Decl>(GetInner(genericDeclRef), genericDeclRef.substitutions));
+ formatDeclParams(sb, DeclRef<Decl>(getInner(genericDeclRef), genericDeclRef.substitutions));
}
else
{
@@ -1383,7 +1383,7 @@ namespace Slang
DeclRef<Decl> declRef = inDeclRef;
if(auto genericDeclRef = declRef.as<GenericDecl>())
{
- declRef = DeclRef<Decl>(GetInner(genericDeclRef), genericDeclRef.substitutions);
+ declRef = DeclRef<Decl>(getInner(genericDeclRef), genericDeclRef.substitutions);
}
if(as<ConstructorDecl>(declRef))
@@ -1391,7 +1391,7 @@ namespace Slang
else if(auto callableDeclRef = declRef.as<CallableDecl>())
{
sb << " -> ";
- formatType(sb, GetResultType(m_astBuilder, callableDeclRef));
+ formatType(sb, getResultType(m_astBuilder, callableDeclRef));
}
}