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-type-layout.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/slang/slang-type-layout.cpp') diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp index 3f005f18e..f26b8bda4 100644 --- a/source/slang/slang-type-layout.cpp +++ b/source/slang/slang-type-layout.cpp @@ -3170,7 +3170,7 @@ static TypeLayoutResult _createTypeLayout( else if(auto vecType = as(type)) { auto elementType = vecType->elementType; - size_t elementCount = (size_t) GetIntVal(vecType->elementCount); + size_t elementCount = (size_t) getIntVal(vecType->elementCount); auto element = _createTypeLayout( context, @@ -3198,8 +3198,8 @@ static TypeLayoutResult _createTypeLayout( } else if(auto matType = as(type)) { - size_t rowCount = (size_t) GetIntVal(matType->getRowCount()); - size_t colCount = (size_t) GetIntVal(matType->getColumnCount()); + size_t rowCount = (size_t) getIntVal(matType->getRowCount()); + size_t colCount = (size_t) getIntVal(matType->getColumnCount()); auto elementType = matType->getElementType(); auto elementResult = _createTypeLayout( @@ -3439,7 +3439,7 @@ static TypeLayoutResult _createTypeLayout( typeLayoutBuilder.beginLayout(type, rules); auto typeLayout = typeLayoutBuilder.getTypeLayout(); - for (auto field : GetFields(structDeclRef, MemberFilterStyle::Instance)) + for (auto field : getFields(structDeclRef, MemberFilterStyle::Instance)) { // The fields of a `struct` type may include existential (interface) // types (including as nested sub-fields), and any types present @@ -3463,7 +3463,7 @@ static TypeLayoutResult _createTypeLayout( TypeLayoutResult fieldResult = _createTypeLayout( fieldLayoutContext, - GetType(context.astBuilder, field).Ptr(), + getType(context.astBuilder, field).Ptr(), field.getDecl()); auto fieldTypeLayout = fieldResult.layout; @@ -3788,7 +3788,7 @@ RefPtr getSimpleVaryingParameterTypeLayout( else if(auto vecType = as(type)) { auto elementType = vecType->elementType; - size_t elementCount = (size_t) GetIntVal(vecType->elementCount); + size_t elementCount = (size_t) getIntVal(vecType->elementCount); BaseType elementBaseType = BaseType::Void; if( auto elementBasicType = as(elementType) ) @@ -3822,8 +3822,8 @@ RefPtr getSimpleVaryingParameterTypeLayout( } else if(auto matType = as(type)) { - size_t rowCount = (size_t) GetIntVal(matType->getRowCount()); - size_t colCount = (size_t) GetIntVal(matType->getColumnCount()); + size_t rowCount = (size_t) getIntVal(matType->getRowCount()); + size_t colCount = (size_t) getIntVal(matType->getColumnCount()); auto elementType = matType->getElementType(); BaseType elementBaseType = BaseType::Void; -- cgit v1.2.3