diff options
| author | Jose <pepone@users.noreply.github.com> | 2019-11-14 21:35:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 21:35:00 +0100 |
| commit | 45491f0f2b0deaa956f1bbd0d6d433e884e287f1 (patch) | |
| tree | fc6adfeed2babc6481352e6c2c78aeb86b1a3f23 /cpp/src/slice2js/JsUtil.h | |
| parent | Make build system fixes (diff) | |
| download | ice-45491f0f2b0deaa956f1bbd0d6d433e884e287f1.tar.bz2 ice-45491f0f2b0deaa956f1bbd0d6d433e884e287f1.tar.xz ice-45491f0f2b0deaa956f1bbd0d6d433e884e287f1.zip | |
Forward defined types not properly defined in TypeScript - Close 633 (#634)
* Forward defined types not properly defined in TypeScript - Close 633
* Add assert for constructing the definedIn path
Diffstat (limited to 'cpp/src/slice2js/JsUtil.h')
| -rw-r--r-- | cpp/src/slice2js/JsUtil.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/slice2js/JsUtil.h b/cpp/src/slice2js/JsUtil.h index 6486ba111c6..f943c471cc1 100644 --- a/cpp/src/slice2js/JsUtil.h +++ b/cpp/src/slice2js/JsUtil.h @@ -20,6 +20,7 @@ public: virtual ~JsGenerator() {}; static bool isClassType(const TypePtr&); + static std::string getDefinedIn(const ContainedPtr&); static std::string getModuleMetadata(const TypePtr&); static std::string getModuleMetadata(const ContainedPtr&); static std::string fixId(const std::string&); @@ -31,7 +32,8 @@ public: static std::string importPrefix(const ContainedPtr&, const ContainedPtr&, - const std::vector<std::pair<std::string, std::string> >&); + const std::vector<std::pair<std::string, std::string> >&, + const std::string& definedIn = ""); static std::string importPrefix(const std::string&, const ContainedPtr&); static std::string getUnqualified(const std::string&, const std::string&, const std::string&); |