diff options
| author | Yong He <yongh@outlook.com> | 2018-01-03 17:15:03 -0800 |
|---|---|---|
| committer | Yong He <yongh@outlook.com> | 2018-01-03 17:15:03 -0800 |
| commit | 550405d2de2ca617046e73fe5ec7e5e1765a5c97 (patch) | |
| tree | 89b1e0e3f0e95ea0bf586bd67fa36066f0021ce7 /source/slang/slang.cpp | |
| parent | 61b206db5fc5a4c9d42fa3fbb4f50624b6c6c6c5 (diff) | |
Fix type lookup of global type arguments
Global type argument lookup should be done in both loaded modules and current trnaslation units. This is the same as the logic of spReflection_FindTypeByName, so it is extracted into `CompileRequest::lookupGlobalDecl(Name*)` method and reused in places.
Diffstat (limited to 'source/slang/slang.cpp')
| -rw-r--r-- | source/slang/slang.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 3156e5008..0b3e0ceb7 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -590,6 +590,22 @@ RefPtr<ModuleDecl> CompileRequest::findOrImportModule( loc); } +Decl * CompileRequest::lookupGlobalDecl(Name * name) +{ + Decl* resultDecl = nullptr; + for (auto module : loadedModulesList) + { + if (module->moduleDecl->memberDictionary.TryGetValue(name, resultDecl)) + break; + } + for (auto transUnit : translationUnits) + { + if (transUnit->SyntaxNode->memberDictionary.TryGetValue(name, resultDecl)) + break; + } + return resultDecl; +} + RefPtr<ModuleDecl> findOrImportModule( CompileRequest* request, Name* name, |
