Rename `Name` fields to `name`

This is in preparation for using `Name` as a type name.

11 files changed, 64 insertions, 64 deletions

diff --git a/source/slang/check.cpp b/source/slang/check.cpp
index bb0b1b794..6b8617c66 100644
--- a/source/slang/check.cpp
+++ b/source/slang/check.cpp
@@ -1619,15 +1619,15 @@ namespace Slang
             {
                 checkDecl(para);
 
-                if (paraNames.Contains(para->Name.Content))
+                if (paraNames.Contains(para->name.Content))
                 {
                     if (!isRewriteMode())
                     {
-                        getSink()->diagnose(para, Diagnostics::parameterAlreadyDefined, para->Name);
+                        getSink()->diagnose(para, Diagnostics::parameterAlreadyDefined, para->name);
                     }
                 }
                 else
-                    paraNames.Add(para->Name.Content);
+                    paraNames.Add(para->name.Content);
             }
             this->function = NULL;
             functionNode->SetCheckState(DeclCheckState::CheckedHeader);
@@ -4559,7 +4559,7 @@ namespace Slang
                                 {
                                     if (!isRewriteMode())
                                     {
-                                        getSink()->diagnose(expr->Arguments[i], Diagnostics::argumentExpectedLValue, (*params)[i]->Name);
+                                        getSink()->diagnose(expr->Arguments[i], Diagnostics::argumentExpectedLValue, (*params)[i]->name);
                                     }
                                 }
                             }
diff --git a/source/slang/decl-defs.h b/source/slang/decl-defs.h
index f30d4af82..a63df243b 100644
--- a/source/slang/decl-defs.h
+++ b/source/slang/decl-defs.h
@@ -84,7 +84,7 @@ RAW(
     {
         for (auto field : GetFields())
         {
-            if (field->Name.Content == name)
+            if (field->name.Content == name)
                 return field.Ptr();
         }
         return nullptr;
@@ -94,7 +94,7 @@ RAW(
         int index = 0;
         for (auto field : GetFields())
         {
-            if (field->Name.Content == name)
+            if (field->name.Content == name)
                 return index;
             index++;
         }
diff --git a/source/slang/diagnostics.cpp b/source/slang/diagnostics.cpp
index eb6a818d3..6f971ae76 100644
--- a/source/slang/diagnostics.cpp
+++ b/source/slang/diagnostics.cpp
@@ -40,7 +40,7 @@ void printDiagnosticArg(StringBuilder& sb, Slang::String const& str)
 
 void printDiagnosticArg(StringBuilder& sb, Decl* decl)
 {
-    sb << decl->Name.Content;
+    sb << decl->name.Content;
 }
 
 void printDiagnosticArg(StringBuilder& sb, Type* type)
diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index 5f6fca3c2..fff79ae51 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -335,14 +335,14 @@ struct EDeclarator
 {
     enum class Flavor
     {
-        Name,
+        name,
         Array,
         UnsizedArray,
     };
     Flavor flavor;
     EDeclarator* next = nullptr;
 
-    // Used for `Flavor::Name`
+    // Used for `Flavor::name`
     String name;
     SourceLoc loc;
 
@@ -778,7 +778,7 @@ struct EmitVisitor
 
         switch (declarator->flavor)
         {
-        case EDeclarator::Flavor::Name:
+        case EDeclarator::Flavor::name:
             emitName(declarator->name, declarator->loc);
             break;
 
@@ -1205,7 +1205,7 @@ struct EmitVisitor
         advanceToSourceLocation(typeLoc);
 
         EDeclarator nameDeclarator;
-        nameDeclarator.flavor = EDeclarator::Flavor::Name;
+        nameDeclarator.flavor = EDeclarator::Flavor::name;
         nameDeclarator.name = name;
         nameDeclarator.loc = nameLoc;
         emitTypeImpl(type, &nameDeclarator);
@@ -1253,7 +1253,7 @@ struct EmitVisitor
             }
 
             EDeclarator nameDeclarator;
-            nameDeclarator.flavor = EDeclarator::Flavor::Name;
+            nameDeclarator.flavor = EDeclarator::Flavor::name;
             nameDeclarator.name = name;
             nameDeclarator.loc = nameLoc;
 
@@ -2789,7 +2789,7 @@ struct EmitVisitor
         SLANG_RELEASE_ASSERT(context->shared->target != CodeGenTarget::GLSL);
 
         Emit("typedef ");
-        EmitType(decl->type, decl->Name.Content);
+        EmitType(decl->type, decl->name.Content);
         Emit(";\n");
     }
 
@@ -3100,7 +3100,7 @@ struct EmitVisitor
             return;
 
         Emit("struct ");
-        emitName(decl->Name);
+        emitName(decl->name);
         Emit("\n{\n");
 
         // TODO(tfoley): Need to hoist members functions, etc. out to global scope
@@ -3516,10 +3516,10 @@ struct EmitVisitor
         }
         Emit("}");
 
-        if( varDecl->Name.type != TokenType::Unknown )
+        if( varDecl->name.type != TokenType::Unknown )
         {
             Emit(" ");
-            emitName(varDecl->Name);
+            emitName(varDecl->name);
         }
 
         Emit(";\n");
@@ -3624,7 +3624,7 @@ struct EmitVisitor
         // isn't allowed by declarator syntax and/or language rules, we could
         // hypothetically wrap things in a `typedef` and work around it.
 
-        EmitType(decl->ReturnType, decl->Name);
+        EmitType(decl->ReturnType, decl->name);
 
         Emit("(");
         bool first = true;
diff --git a/source/slang/lookup.cpp b/source/slang/lookup.cpp
index 3370b369b..30db9d75e 100644
--- a/source/slang/lookup.cpp
+++ b/source/slang/lookup.cpp
@@ -42,7 +42,7 @@ void buildMemberDictionary(ContainerDecl* decl)
 
     for (auto m : decl->Members)
     {
-        auto name = m->Name.Content;
+        auto name = m->name.Content;
 
         // Add any transparent members to a separate list for lookup
         if (m->HasModifier<TransparentModifier>())
diff --git a/source/slang/lower.cpp b/source/slang/lower.cpp
index 0f4eca53f..68f61f8a5 100644
--- a/source/slang/lower.cpp
+++ b/source/slang/lower.cpp
@@ -317,7 +317,7 @@ private:
 class PseudoVarDecl : public RefObject
 {
 public:
-    Token Name;
+    Token name;
     SourceLoc Position;
     TypeExp type;
 };
@@ -918,7 +918,7 @@ struct LoweringVisitor
     RefPtr<Expr> moveTemp(RefPtr<Expr> expr)
     {
         RefPtr<Variable> varDecl = new Variable();
-        varDecl->Name.Content = generateName();
+        varDecl->name.Content = generateName();
         varDecl->type.type = expr->type.type;
         varDecl->initExpr = expr;
 
@@ -2575,7 +2575,7 @@ struct LoweringVisitor
 
         if (isReservedWord(decl->getName()))
         {
-            decl->Name.Content.append("_");
+            decl->name.Content.append("_");
         }
     }
 
@@ -2611,7 +2611,7 @@ struct LoweringVisitor
         registerLoweredDecl(loweredDecl, decl);
 
         loweredDecl->Position = decl->Position;
-        loweredDecl->Name = decl->getNameToken();
+        loweredDecl->name = decl->getNameToken();
 
         // Deal with renaming - we shouldn't allow decls with names that are reserved words
         ensureDeclHasAValidName(loweredDecl);
@@ -2948,7 +2948,7 @@ struct LoweringVisitor
         // Syntax class for declarations to create
         SyntaxClass<VarDeclBase>    varDeclClass;
 
-        // Name "stem" to use for any actual variables we create
+        // name "stem" to use for any actual variables we create
         String                      name;
 
         // The parent tuple type (or array thereof) we are scalarizing
@@ -3102,7 +3102,7 @@ struct LoweringVisitor
                 }
 
                 RefPtr<VarDeclBase> fieldVarDecl = info.varDeclClass.createInstance();
-                fieldVarDecl->Name.Content = fieldName;
+                fieldVarDecl->name.Content = fieldName;
                 fieldVarDecl->type.type = fieldVarType;
 
                 addDecl(fieldVarDecl);
@@ -3144,14 +3144,14 @@ struct LoweringVisitor
 
         // We'll need a placeholder declaration to wrap the whole thing up:
         RefPtr<TupleVarDecl> tupleDecl = new TupleVarDecl();
-        tupleDecl->Name.Content = name;
+        tupleDecl->name.Content = name;
 
         // First, if the tuple type had any "ordinary" data,
         // then we go ahead and create a declaration for that stuff
         if (tupleTypeMod->hasAnyNonTupleFields)
         {
             RefPtr<VarDeclBase> primaryVarDecl = varDeclClass.createInstance();
-            primaryVarDecl->Name.Content = name;
+            primaryVarDecl->name.Content = name;
             primaryVarDecl->type.type = tupleType;
 
             primaryVarDecl->modifiers = originalVarDecl->modifiers;
@@ -3939,7 +3939,7 @@ struct LoweringVisitor
         if (!globalVarExpr)
         {
             RefPtr<Variable> globalVarDecl = new Variable();
-            globalVarDecl->Name.Content = info.name;
+            globalVarDecl->name.Content = info.name;
             globalVarDecl->type.type = type;
 
             ensureDeclHasAValidName(globalVarDecl);
@@ -4168,7 +4168,7 @@ struct LoweringVisitor
         LoweredExpr         loweredExpr)
     {
         RefPtr<VaryingTupleVarDecl> loweredDecl = new VaryingTupleVarDecl();
-        loweredDecl->Name = originalVarDecl->Name;
+        loweredDecl->name = originalVarDecl->name;
         loweredDecl->type = loweredType;
         loweredDecl->expr = loweredExpr;
 
@@ -4200,11 +4200,11 @@ struct LoweringVisitor
         // Now we will generate a `void main() { ... }` function to call the lowered code.
         RefPtr<FuncDecl> mainDecl = new FuncDecl();
         mainDecl->ReturnType.type = getSession()->getVoidType();
-        mainDecl->Name.Content = "main";
+        mainDecl->name.Content = "main";
 
         // If the user's entry point was called `main` then rename it here
         if (loweredEntryPointFunc->getName() == "main")
-            loweredEntryPointFunc->Name.Content = "main_";
+            loweredEntryPointFunc->name.Content = "main_";
 
         RefPtr<BlockStmt> bodyStmt = new BlockStmt();
         bodyStmt->scopeDecl = new ScopeDecl();
@@ -4230,7 +4230,7 @@ struct LoweringVisitor
 
             RefPtr<Variable> localVarDecl = new Variable();
             localVarDecl->Position = paramDecl->Position;
-            localVarDecl->Name.Content = paramDecl->getName();
+            localVarDecl->name.Content = paramDecl->getName();
             localVarDecl->type = lowerType(paramDecl->type);
 
             ensureDeclHasAValidName(localVarDecl);
@@ -4268,7 +4268,7 @@ struct LoweringVisitor
         {
             resultVarDecl = new Variable();
             resultVarDecl->Position = loweredEntryPointFunc->Position;
-            resultVarDecl->Name.Content = "main_result";
+            resultVarDecl->name.Content = "main_result";
             resultVarDecl->type = TypeExp(loweredEntryPointFunc->ReturnType);
 
             ensureDeclHasAValidName(resultVarDecl);
@@ -4387,13 +4387,13 @@ struct LoweringVisitor
         {
             resultGlobal = new Variable();
             // TODO: need a scheme for generating unique names
-            resultGlobal->Name.Content = "_main_result";
+            resultGlobal->name.Content = "_main_result";
             resultGlobal->type = loweredReturnType;
 
             addMember(shared->loweredProgram, resultGlobal);
         }
 
-        loweredDecl->Name.Content = "main";
+        loweredDecl->name.Content = "main";
         loweredDecl->ReturnType.type = getSession()->getVoidType();
 
         // We will emit the body statement in a context where
diff --git a/source/slang/parameter-binding.cpp b/source/slang/parameter-binding.cpp
index eeaa04a3f..4a6eac472 100644
--- a/source/slang/parameter-binding.cpp
+++ b/source/slang/parameter-binding.cpp
@@ -1688,7 +1688,7 @@ void generateParameterBindings(
         programLayout->bindingForHackSampler = (int)binding;
 
         RefPtr<Variable> var = new Variable();
-        var->Name.Content = "SLANG_hack_samplerForTexelFetch";
+        var->name.Content = "SLANG_hack_samplerForTexelFetch";
         var->type.type = getSamplerStateType(request->mSession);
 
         auto typeLayout = new TypeLayout();
diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp
index d85363bb6..84935cb7f 100644
--- a/source/slang/parser.cpp
+++ b/source/slang/parser.cpp
@@ -538,7 +538,7 @@ namespace Slang
         auto nameToken = parser->ReadToken(TokenType::Identifier);
         typeDefDecl->Position = nameToken.Position;
 
-        typeDefDecl->Name = nameToken;
+        typeDefDecl->name = nameToken;
         typeDefDecl->type = type;
 
         return typeDefDecl;
@@ -859,7 +859,7 @@ namespace Slang
         // Different cases of declarator appear as "flavors" here
         enum class Flavor
         {
-            Name,
+            name,
             Pointer,
             Array,
         };
@@ -961,7 +961,7 @@ namespace Slang
         parser->FillPosition(decl.Ptr());
         decl->Position = declaratorInfo.nameToken.Position;
 
-        decl->Name = declaratorInfo.nameToken;
+        decl->name = declaratorInfo.nameToken;
         decl->ReturnType = TypeExp(declaratorInfo.typeSpec);
         parseParameterList(parser, decl);
         ParseOptSemantics(parser, decl.Ptr());
@@ -1043,12 +1043,12 @@ namespace Slang
         if( declaratorInfo.nameToken.type == TokenType::Unknown )
         {
             // HACK(tfoley): we always give a name, even if the declarator didn't include one... :(
-            decl->Name.Content = generateName(parser);
+            decl->name.Content = generateName(parser);
         }
         else
         {
             decl->Position = declaratorInfo.nameToken.Position;
-            decl->Name = declaratorInfo.nameToken;
+            decl->name = declaratorInfo.nameToken;
         }
         decl->type = TypeExp(declaratorInfo.typeSpec);
 
@@ -1068,7 +1068,7 @@ namespace Slang
         case TokenType::Identifier:
             {
                 auto nameDeclarator = new NameDeclarator();
-                nameDeclarator->flavor = Declarator::Flavor::Name;
+                nameDeclarator->flavor = Declarator::Flavor::name;
                 nameDeclarator->nameToken = ParseDeclName(parser);
                 declarator = nameDeclarator;
             }
@@ -1197,7 +1197,7 @@ namespace Slang
         {
             switch(declarator->flavor)
             {
-            case Declarator::Flavor::Name:
+            case Declarator::Flavor::name:
                 {
                     auto nameDeclarator = (NameDeclarator*) declarator.Ptr();
                     ioInfo->nameToken = nameDeclarator->nameToken;
@@ -1671,8 +1671,8 @@ namespace Slang
         addModifier(bufferVarDecl, reflectionNameModifier);
 
         // Both the buffer variable and its type need to have names generated
-        bufferVarDecl->Name.Content = generateName(parser, "parameterBlock_" + reflectionNameToken.Content);
-        bufferDataTypeDecl->Name.Content = generateName(parser, "ParameterBlock_" + reflectionNameToken.Content);
+        bufferVarDecl->name.Content = generateName(parser, "parameterBlock_" + reflectionNameToken.Content);
+        bufferDataTypeDecl->name.Content = generateName(parser, "ParameterBlock_" + reflectionNameToken.Content);
 
         addModifier(bufferDataTypeDecl, new ImplicitParameterBlockElementTypeModifier());
         addModifier(bufferVarDecl, new ImplicitParameterBlockVariableModifier());
@@ -1685,7 +1685,7 @@ namespace Slang
         // Construct a type expression to reference the buffer data type
         auto bufferDataTypeExpr = new VarExpr();
         bufferDataTypeExpr->Position = bufferDataTypeDecl->Position;
-        bufferDataTypeExpr->name = bufferDataTypeDecl->Name.Content;
+        bufferDataTypeExpr->name = bufferDataTypeDecl->name.Content;
         bufferDataTypeExpr->scope = parser->currentScope.Ptr();
 
         // Construct a type exrpession to reference the type constructor
@@ -1840,7 +1840,7 @@ namespace Slang
         parser->FillPosition(blockVarDecl.Ptr());
 
         // Generate a unique name for the data type
-        blockDataTypeDecl->Name.Content = generateName(parser, "ParameterBlock_" + reflectionNameToken.Content);
+        blockDataTypeDecl->name.Content = generateName(parser, "ParameterBlock_" + reflectionNameToken.Content);
 
         // TODO(tfoley): We end up constructing unchecked syntax here that
         // is expected to type check into the right form, but it might be
@@ -1850,7 +1850,7 @@ namespace Slang
         // Construct a type expression to reference the buffer data type
         auto blockDataTypeExpr = new VarExpr();
         blockDataTypeExpr->Position = blockDataTypeDecl->Position;
-        blockDataTypeExpr->name = blockDataTypeDecl->Name.Content;
+        blockDataTypeExpr->name = blockDataTypeDecl->name.Content;
         blockDataTypeExpr->scope = parser->currentScope.Ptr();
 
         // Construct a type exrpession to reference the type constructor
@@ -1877,7 +1877,7 @@ namespace Slang
         {
             // The user gave an explicit name to the block,
             // so we need to use that as our variable name
-            blockVarDecl->Name = parser->ReadToken(TokenType::Identifier);
+            blockVarDecl->name = parser->ReadToken(TokenType::Identifier);
 
             // TODO: in this case we make actually have a more complex
             // declarator, including `[]` brackets.
@@ -1885,7 +1885,7 @@ namespace Slang
         else
         {
             // synthesize a dummy name
-            blockVarDecl->Name.Content = generateName(parser, "parameterBlock_" + reflectionNameToken.Content);
+            blockVarDecl->name.Content = generateName(parser, "parameterBlock_" + reflectionNameToken.Content);
 
             // Otherwise we have a transparent declaration, similar
             // to an HLSL `cbuffer`
@@ -1924,7 +1924,7 @@ namespace Slang
         {
             // default case is a type parameter
             auto paramDecl = new GenericValueParamDecl();
-            paramDecl->Name = parser->ReadToken(TokenType::Identifier);
+            paramDecl->name = parser->ReadToken(TokenType::Identifier);
             if (AdvanceIf(parser, TokenType::Colon))
             {
                 paramDecl->type = parser->ParseTypeExp();
@@ -1940,7 +1940,7 @@ namespace Slang
             // default case is a type parameter
             auto paramDecl = new GenericTypeParamDecl();
             parser->FillPosition(paramDecl);
-            paramDecl->Name = parser->ReadToken(TokenType::Identifier);
+            paramDecl->name = parser->ReadToken(TokenType::Identifier);
             if (AdvanceIf(parser, TokenType::Colon))
             {
                 // The user is apply a constraint to this type parameter...
@@ -1999,7 +1999,7 @@ namespace Slang
         // it wraps, so that lookup can find it.
         if (decl->inner)
         {
-            decl->Name = decl->inner->Name;
+            decl->name = decl->inner->name;
             decl->Position = decl->inner->Position;
         }
 
@@ -2040,7 +2040,7 @@ namespace Slang
     {
         RefPtr<InterfaceDecl> decl = new InterfaceDecl();
         parser->FillPosition(decl.Ptr());
-        decl->Name = parser->ReadToken(TokenType::Identifier);
+        decl->name = parser->ReadToken(TokenType::Identifier);
 
         parseOptionalInheritanceClause(parser, decl.Ptr());
 
@@ -2102,7 +2102,7 @@ namespace Slang
         parser->FillPosition(decl.Ptr());
 
         // TODO: the use of this name here is a bit magical...
-        decl->Name.Content = "operator[]";
+        decl->name.Content = "operator[]";
 
         parseParameterList(parser, decl);
 
@@ -2224,7 +2224,7 @@ namespace Slang
         // up for downstream code?
 
         RefPtr<SyntaxDecl> syntaxDecl = new SyntaxDecl();
-        syntaxDecl->Name = nameToken;
+        syntaxDecl->name = nameToken;
         syntaxDecl->Position = nameToken.Position;
         syntaxDecl->syntaxClass = syntaxClass;
         syntaxDecl->parseCallback = parseCallback;
@@ -2453,7 +2453,7 @@ namespace Slang
         ReadToken("struct");
 
         // TODO: support `struct` declaration without tag
-        rs->Name = ReadToken(TokenType::Identifier);
+        rs->name = ReadToken(TokenType::Identifier);
 
         // We allow for an inheritance clause on a `struct`
         // so that it can conform to interfaces.
@@ -2469,7 +2469,7 @@ namespace Slang
         RefPtr<ClassDecl> rs = new ClassDecl();
         FillPosition(rs.Ptr());
         ReadToken("class");
-        rs->Name = ReadToken(TokenType::Identifier);
+        rs->name = ReadToken(TokenType::Identifier);
         ReadToken(TokenType::LBrace);
         parseOptionalInheritanceClause(this, rs.Ptr());
         parseAggTypeDeclBody(this, rs.Ptr());
@@ -2576,7 +2576,7 @@ namespace Slang
 
         Token varNameToken = parser->ReadToken(TokenType::Identifier);
         RefPtr<Variable> varDecl = new Variable();
-        varDecl->Name = varNameToken;
+        varDecl->name = varNameToken;
         varDecl->Position = varNameToken.Position;
 
         stmt->varDecl = varDecl;
@@ -3682,7 +3682,7 @@ namespace Slang
         String name(nameText);
 
         RefPtr<SyntaxDecl> syntaxDecl = new SyntaxDecl();
-        syntaxDecl->Name.Content = name;
+        syntaxDecl->name.Content = name;
         syntaxDecl->syntaxClass = syntaxClass;
         syntaxDecl->parseCallback = callback;
         syntaxDecl->parseUserData = userData;
diff --git a/source/slang/preprocessor.cpp b/source/slang/preprocessor.cpp
index 9c9a340ae..11e574064 100644
--- a/source/slang/preprocessor.cpp
+++ b/source/slang/preprocessor.cpp
@@ -1885,7 +1885,7 @@ enum PreprocessorDirectiveFlag : unsigned int
 // Information about a specific directive
 struct PreprocessorDirective
 {
-    // Name of the directive
+    // name of the directive
     char const*                     name;
 
     // Callback to handle the directive
diff --git a/source/slang/syntax-base-defs.h b/source/slang/syntax-base-defs.h
index 711c4425b..d67acbe5c 100644
--- a/source/slang/syntax-base-defs.h
+++ b/source/slang/syntax-base-defs.h
@@ -211,11 +211,11 @@ END_SYNTAX_CLASS()
 ABSTRACT_SYNTAX_CLASS(Decl, DeclBase)
     DECL_FIELD(ContainerDecl*, ParentDecl RAW(=nullptr))
 
-    FIELD(Token, Name)
+    FIELD(Token, name)
 
     RAW(
-    String const& getName() { return Name.Content; }
-    Token const& getNameToken() { return Name; }
+    String const& getName() { return name.Content; }
+    Token const& getNameToken() { return name; }
     )
 
 
diff --git a/source/slang/syntax.cpp b/source/slang/syntax.cpp
index 2bd6c122c..a03783825 100644
--- a/source/slang/syntax.cpp
+++ b/source/slang/syntax.cpp
@@ -949,7 +949,7 @@ void Type::accept(IValVisitor* visitor, void* extra)
     // Convenience accessors for common properties of declarations
     String const& DeclRefBase::GetName() const
     {
-        return decl->Name.Content;
+        return decl->name.Content;
     }
 
     DeclRefBase DeclRefBase::GetParent() const