diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/slang-check-decl.cpp | 10 | ||||
| -rw-r--r-- | source/slang/slang-check-overload.cpp | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp index 0df9619b6..fe4a7d64c 100644 --- a/source/slang/slang-check-decl.cpp +++ b/source/slang/slang-check-decl.cpp @@ -528,6 +528,7 @@ namespace Slang } else if( auto enumCaseDeclRef = declRef.as<EnumCaseDecl>() ) { + sema->ensureDecl(declRef.declRefBase, DeclCheckState::Checked); QualType qualType; qualType.type = getType(astBuilder, enumCaseDeclRef); qualType.isLeftValue = false; @@ -5117,6 +5118,8 @@ namespace Slang // TODO: Do we need/want to support generic cases some day? auto parentEnumDecl = as<EnumDecl>(decl->parentDecl); SLANG_ASSERT(parentEnumDecl); + + decl->type.type = DeclRefType::create(m_astBuilder, makeDeclRef(parentEnumDecl)); // The tag type should have already been set by // the surrounding `enum` declaration. @@ -5852,6 +5855,13 @@ namespace Slang } } + if (as<ModuleDeclarationDecl>(oldDecl) || as<ModuleDeclarationDecl>(newDecl)) + { + // It is allowed to have a decl whose name is the same as the module. + return SLANG_OK; + } + + // For all other flavors of declaration, we do not // allow duplicate declarations with the same name. // diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp index 2912a79b0..37c92a317 100644 --- a/source/slang/slang-check-overload.cpp +++ b/source/slang/slang-check-overload.cpp @@ -992,6 +992,12 @@ namespace Slang if(leftIsInterfaceRequirement != rightIsInterfaceRequirement) return int(leftIsInterfaceRequirement) - int(rightIsInterfaceRequirement); + // Any decl is strictly better than a module decl. + bool leftIsModule = (as<ModuleDeclarationDecl>(left.declRef) != nullptr); + bool rightIsModule = (as<ModuleDeclarationDecl>(right.declRef) != nullptr); + if(leftIsModule != rightIsModule) + return int(rightIsModule) - int(leftIsModule); + // If both are interface requirements, prefer to more derived interface. if (leftIsInterfaceRequirement && rightIsInterfaceRequirement) { |