summaryrefslogtreecommitdiff
path: root/source/slang/slang-check-overload.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2020-05-22 14:21:37 -0400
committerGitHub <noreply@github.com>2020-05-22 11:21:37 -0700
commit076a4c06767cca12c5205d950e9cd37451f91488 (patch)
treedc3bcc376e18e5233f61b2cedfa3419717798a01 /source/slang/slang-check-overload.cpp
parentdaf53bb2708982a2bcc6d6cc08fe88790ccf0bc2 (diff)
Tidy up around AST nodes (#1353)
* Fields from upper to lower case in slang-ast-decl.h * Lower camel field names in slang-ast-stmt.h * Fix fields in slang-ast-expr.h * slang-ast-type.h make fields lowerCamel. * slang-ast-base.h members functions lowerCamel. * Method names in slang-ast-type.h to lowerCamel. * GetCanonicalType -> getCanonicalType * Substitute -> substitute * Equals -> equals ToString -> toString * ParentDecl -> parentDecl Members -> members
Diffstat (limited to 'source/slang/slang-check-overload.cpp')
-rw-r--r--source/slang/slang-check-overload.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp
index e21258f09..2d7c7635a 100644
--- a/source/slang/slang-check-overload.cpp
+++ b/source/slang/slang-check-overload.cpp
@@ -37,7 +37,7 @@ namespace Slang
SemanticsVisitor::ParamCounts SemanticsVisitor::CountParameters(DeclRef<GenericDecl> genericRef)
{
ParamCounts counts = { 0, 0 };
- for (auto m : genericRef.getDecl()->Members)
+ for (auto m : genericRef.getDecl()->members)
{
if (auto typeParam = as<GenericTypeParamDecl>(m))
{
@@ -110,7 +110,7 @@ namespace Slang
if(auto prefixExpr = as<PrefixExpr>(expr))
{
- if(decl->HasModifier<PrefixModifier>())
+ if(decl->hasModifier<PrefixModifier>())
return true;
if (context.mode != OverloadResolveContext::Mode::JustTrying)
@@ -123,7 +123,7 @@ namespace Slang
}
else if(auto postfixExpr = as<PostfixExpr>(expr))
{
- if(decl->HasModifier<PostfixModifier>())
+ if(decl->hasModifier<PostfixModifier>())
return true;
if (context.mode != OverloadResolveContext::Mode::JustTrying)
@@ -343,7 +343,7 @@ namespace Slang
if( context.disallowNestedConversions )
{
// We need an exact match in this case.
- if(!GetType(param)->Equals(argType))
+ if(!GetType(param)->equals(argType))
return false;
}
else if (!canCoerce(GetType(param), argType, &cost))
@@ -469,7 +469,7 @@ namespace Slang
RefPtr<Expr> base;
if (auto mbrExpr = as<MemberExpr>(baseExpr))
- base = mbrExpr->BaseExpression;
+ base = mbrExpr->baseExpression;
return ConstructDeclRefExpr(
innerDeclRef,
@@ -527,11 +527,11 @@ namespace Slang
callExpr->loc = context.loc;
for(Index aa = 0; aa < context.argCount; ++aa)
- callExpr->Arguments.add(context.getArg(aa));
+ callExpr->arguments.add(context.getArg(aa));
}
- callExpr->FunctionExpr = baseExpr;
+ callExpr->functionExpr = baseExpr;
callExpr->type = QualType(candidate.resultType);
// A call may yield an l-value, and we should take a look at the candidate to be sure
@@ -1230,12 +1230,12 @@ namespace Slang
void SemanticsVisitor::formatType(StringBuilder& sb, RefPtr<Type> type)
{
- sb << type->ToString();
+ sb << type->toString();
}
void SemanticsVisitor::formatVal(StringBuilder& sb, RefPtr<Val> val)
{
- sb << val->ToString();
+ sb << val->toString();
}
static void formatDeclName(StringBuilder& sb, Decl* decl)
@@ -1429,7 +1429,7 @@ namespace Slang
for( UInt aa = 0; aa < argCount; ++aa )
{
if(aa != 0) argsListBuilder << ", ";
- argsListBuilder << context.getArgType(aa)->ToString();
+ argsListBuilder << context.getArgType(aa)->toString();
}
argsListBuilder << ")";
return argsListBuilder.ProduceString();
@@ -1461,7 +1461,7 @@ namespace Slang
}
// Look at the base expression for the call, and figure out how to invoke it.
- auto funcExpr = expr->FunctionExpr;
+ auto funcExpr = expr->functionExpr;
auto funcExprType = funcExpr->type;
// If we are trying to apply an erroneous expression, then just bail out now.
@@ -1472,7 +1472,7 @@ namespace Slang
// If any of the arguments is an error, then we should bail out, to avoid
// cascading errors where we successfully pick an overload, but not the one
// the user meant.
- for (auto arg : expr->Arguments)
+ for (auto arg : expr->arguments)
{
if (IsErrorExpr(arg))
return CreateErrorExpr(expr);
@@ -1481,13 +1481,13 @@ namespace Slang
context.originalExpr = expr;
context.funcLoc = funcExpr->loc;
- context.argCount = expr->Arguments.getCount();
- context.args = expr->Arguments.getBuffer();
+ context.argCount = expr->arguments.getCount();
+ context.args = expr->arguments.getBuffer();
context.loc = expr->loc;
if (auto funcMemberExpr = as<MemberExpr>(funcExpr))
{
- context.baseExpr = funcMemberExpr->BaseExpression;
+ context.baseExpr = funcMemberExpr->baseExpression;
}
else if (auto funcOverloadExpr = as<OverloadedExpr>(funcExpr))
{
@@ -1528,7 +1528,7 @@ namespace Slang
//
// If any argument was an error, we skip out on printing
// another message, to avoid cascading errors.
- for (auto arg : expr->Arguments)
+ for (auto arg : expr->arguments)
{
if (IsErrorExpr(arg))
{
@@ -1541,7 +1541,7 @@ namespace Slang
Expr* baseExpr = funcExpr;
if(auto baseGenericApp = as<GenericAppExpr>(baseExpr))
- baseExpr = baseGenericApp->FunctionExpr;
+ baseExpr = baseGenericApp->functionExpr;
if (auto baseVar = as<VarExpr>(baseExpr))
funcName = baseVar->name;
@@ -1631,7 +1631,7 @@ namespace Slang
else
{
// Nothing at all was found that we could even consider invoking
- getSink()->diagnose(expr->FunctionExpr, Diagnostics::expectedFunction, funcExprType);
+ getSink()->diagnose(expr->functionExpr, Diagnostics::expectedFunction, funcExprType);
expr->type = QualType(getSession()->getErrorType());
return expr;
}
@@ -1681,9 +1681,9 @@ namespace Slang
RefPtr<Expr> SemanticsExprVisitor::visitGenericAppExpr(GenericAppExpr* genericAppExpr)
{
// Start by checking the base expression and arguments.
- auto& baseExpr = genericAppExpr->FunctionExpr;
+ auto& baseExpr = genericAppExpr->functionExpr;
baseExpr = CheckTerm(baseExpr);
- auto& args = genericAppExpr->Arguments;
+ auto& args = genericAppExpr->arguments;
for (auto& arg : args)
{
arg = CheckTerm(arg);
@@ -1699,8 +1699,8 @@ namespace Slang
// declarations with the same name, so this becomes a specialized case of
// overload resolution.
- auto& baseExpr = genericAppExpr->FunctionExpr;
- auto& args = genericAppExpr->Arguments;
+ auto& baseExpr = genericAppExpr->functionExpr;
+ auto& args = genericAppExpr->arguments;
// If there was an error in the base expression, or in any of
// the arguments, then just bail.