From f3d70425fa339a0d8f39b920235c98280d250bbb Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 29 May 2020 08:36:10 -0400 Subject: 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. --- source/slang/slang-syntax.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'source/slang/slang-syntax.h') diff --git a/source/slang/slang-syntax.h b/source/slang/slang-syntax.h index 266f27599..dff24435d 100644 --- a/source/slang/slang-syntax.h +++ b/source/slang/slang-syntax.h @@ -6,12 +6,12 @@ namespace Slang { - inline RefPtr GetSub(ASTBuilder* astBuilder, DeclRef const& declRef) + inline RefPtr getSub(ASTBuilder* astBuilder, DeclRef const& declRef) { return declRef.substitute(astBuilder, declRef.getDecl()->sub.Ptr()); } - inline RefPtr GetSup(ASTBuilder* astBuilder, DeclRef const& declRef) + inline RefPtr getSup(ASTBuilder* astBuilder, DeclRef const& declRef) { return declRef.substitute(astBuilder, declRef.getDecl()->getSup().type); } @@ -27,13 +27,13 @@ namespace Slang // - inline BaseType GetVectorBaseType(VectorExpressionType* vecType) + inline BaseType getVectorBaseType(VectorExpressionType* vecType) { auto basicExprType = as(vecType->elementType); return basicExprType->baseType; } - inline int GetVectorSize(VectorExpressionType* vecType) + inline int getVectorSize(VectorExpressionType* vecType) { auto constantVal = as(vecType->elementCount); if (constantVal) @@ -46,7 +46,7 @@ namespace Slang // Declarations // - inline ExtensionDecl* GetCandidateExtensions(DeclRef const& declRef) + inline ExtensionDecl* getCandidateExtensions(DeclRef const& declRef) { return declRef.getDecl()->candidateExtensions; } @@ -70,7 +70,7 @@ namespace Slang rs.add(d); if (auto aggDeclRef = declRef.as()) { - for (auto ext = GetCandidateExtensions(aggDeclRef); ext; ext = ext->nextCandidateExtension) + for (auto ext = getCandidateExtensions(aggDeclRef); ext; ext = ext->nextCandidateExtension) { auto extMembers = getMembersOfType(DeclRef(ext, declRef.substitutions), filterStyle); for (auto mbr : extMembers) @@ -95,7 +95,7 @@ namespace Slang /// Name* getReflectionName(VarDeclBase* varDecl); - inline RefPtr GetType(ASTBuilder* astBuilder, DeclRef const& declRef) + inline RefPtr getType(ASTBuilder* astBuilder, DeclRef const& declRef) { return declRef.substitute(astBuilder, declRef.getDecl()->type.Ptr()); } @@ -115,12 +115,12 @@ namespace Slang return declRef.substitute(astBuilder, declRef.getDecl()->tagExpr); } - inline RefPtr GetTargetType(ASTBuilder* astBuilder, DeclRef const& declRef) + inline RefPtr getTargetType(ASTBuilder* astBuilder, DeclRef const& declRef) { return declRef.substitute(astBuilder, declRef.getDecl()->targetType.Ptr()); } - inline FilteredMemberRefList GetFields(DeclRef const& declRef, MemberFilterStyle filterStyle) + inline FilteredMemberRefList getFields(DeclRef const& declRef, MemberFilterStyle filterStyle) { return getMembersOfType(declRef, filterStyle); } @@ -132,22 +132,22 @@ namespace Slang return declRef.substitute(astBuilder, declRef.getDecl()->base.type); } - inline RefPtr GetType(ASTBuilder* astBuilder, DeclRef const& declRef) + inline RefPtr getType(ASTBuilder* astBuilder, DeclRef const& declRef) { return declRef.substitute(astBuilder, declRef.getDecl()->type.Ptr()); } - inline RefPtr GetResultType(ASTBuilder* astBuilder, DeclRef const& declRef) + inline RefPtr getResultType(ASTBuilder* astBuilder, DeclRef const& declRef) { return declRef.substitute(astBuilder, declRef.getDecl()->returnType.type.Ptr()); } - inline FilteredMemberRefList GetParameters(DeclRef const& declRef) + inline FilteredMemberRefList getParameters(DeclRef const& declRef) { return getMembersOfType(declRef); } - inline Decl* GetInner(DeclRef const& declRef) + inline Decl* getInner(DeclRef const& declRef) { // TODO: Should really return a `DeclRef` for the inner // declaration, and not just a raw pointer @@ -192,11 +192,11 @@ namespace Slang template void FilteredModifierList::Iterator::operator++() { - current = Adjust(current->next.Ptr()); + current = adjust(current->next.Ptr()); } // template - Modifier* FilteredModifierList::Adjust(Modifier* modifier) + Modifier* FilteredModifierList::adjust(Modifier* modifier) { Modifier* m = modifier; for (;;) -- cgit v1.2.3