diff options
author | Bernard Normier <bernard@zeroc.com> | 2019-08-19 14:26:38 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2019-08-19 14:26:38 -0400 |
commit | 9460e0a103cf8fbca71732d8dc8beab4c969cd05 (patch) | |
tree | 9e59268ef00ba6efd98cfe907d887207f5574023 | |
parent | Fixed comments (diff) | |
download | ice-9460e0a103cf8fbca71732d8dc8beab4c969cd05.tar.bz2 ice-9460e0a103cf8fbca71732d8dc8beab4c969cd05.tar.xz ice-9460e0a103cf8fbca71732d8dc8beab4c969cd05.zip |
Fix for forward-declared only Slice proxies with typescript.
Fixes #483
-rw-r--r-- | cpp/src/slice2js/JsUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp index 2229d81f6a9..d8f8dfb70a7 100644 --- a/cpp/src/slice2js/JsUtil.cpp +++ b/cpp/src/slice2js/JsUtil.cpp @@ -190,7 +190,7 @@ Slice::JsGenerator::getModuleMetadata(const TypePtr& type) } ProxyPtr proxy = ProxyPtr::dynamicCast(type); - return getModuleMetadata(proxy ? ContainedPtr::dynamicCast(proxy->_class()->definition()) : + return getModuleMetadata(proxy ? ContainedPtr::dynamicCast(proxy->_class()) : ContainedPtr::dynamicCast(type)); } @@ -198,7 +198,7 @@ string Slice::JsGenerator::getModuleMetadata(const ContainedPtr& p) { // - // Check if the file contains the python:pkgdir global metadata. + // Check if the file contains the js:module global metadata. // DefinitionContextPtr dc = p->definitionContext(); assert(dc); @@ -267,7 +267,7 @@ Slice::JsGenerator::importPrefix(const TypePtr& type, else if(ProxyPtr::dynamicCast(type)) { ProxyPtr proxy = ProxyPtr::dynamicCast(type); - return importPrefix(ContainedPtr::dynamicCast(proxy->_class()->definition()), toplevel, imports); + return importPrefix(ContainedPtr::dynamicCast(proxy->_class()), toplevel, imports); } else if(ContainedPtr::dynamicCast(type)) { @@ -505,7 +505,7 @@ Slice::JsGenerator::typeToString(const TypePtr& type, string prefix; if(typescript) { - prefix = importPrefix(ContainedPtr::dynamicCast(def), toplevel, imports); + prefix = importPrefix(ContainedPtr::dynamicCast(proxy->_class()), toplevel, imports); os << prefix; } |