From 013bcf28da22fd569154bd9f98368e670fbeb873 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 25 Jan 2024 17:47:40 -0800 Subject: Fixes for `module` and `include`. (#3519) * Fix type checking of enum cases. * Allow decl to have same name as module. --------- Co-authored-by: Yong He --- source/slang/slang-check-overload.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/slang/slang-check-overload.cpp') 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(left.declRef) != nullptr); + bool rightIsModule = (as(right.declRef) != nullptr); + if(leftIsModule != rightIsModule) + return int(rightIsModule) - int(leftIsModule); + // If both are interface requirements, prefer to more derived interface. if (leftIsInterfaceRequirement && rightIsInterfaceRequirement) { -- cgit v1.2.3