Add support cs:namespace metadata

Add support to map Slice modules to different namespaces using cs:namespace metadata Fixes zeroc-ice#122 slice2cs generates invalid namespace qualification
pepone · Jun 28, 2018 · a7d0df7 · a7d0df7
1 parent 0a0d063
commit a7d0df7
Show file tree

Hide file tree

Showing 34 changed files with 2,639 additions and 486 deletions.
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
diff --git a/cpp/src/slice2cs/CsUtil.h b/cpp/src/slice2cs/CsUtil.h
@@ -32,9 +32,24 @@ class CsGenerator : private ::IceUtil::noncopyable
     //
     static void validateMetaData(const UnitPtr&);
 
+    //
+    // Returns the namespace of a Contained entity.
+    //
+    static std::string getPackage(const ContainedPtr&);
+
+    static std::string getUnqualified(const std::string&, const std::string&, bool builtin = false);
+    static std::string getUnqualified(const ContainedPtr&,
+                                      const std::string& package = "",
+                                      const std::string& prefix = "",
+                                      const std::string& suffix = "");
+
 protected:
 
-    static std::string getUnqualified(const std::string&, const std::string&);
+    //
+    // Returns the namespace prefix of a Contained entity.
+    //
+    static std::string getPackagePrefix(const ContainedPtr&);
+
     static std::string resultStructName(const std::string&, const std::string&, bool = false);
     static std::string resultType(const OperationPtr&, const std::string&, bool = false);
     static std::string taskResultType(const OperationPtr&, const std::string&, bool = false);

diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
@@ -74,6 +74,10 @@ class CsVisitor : public CsGenerator, public ParserVisitor
     void writeDocCommentAMD(const OperationPtr&, const std::string&);
     void writeDocCommentParam(const OperationPtr&, ParamDir, bool);
 
+    virtual bool visitModuleStart(const ModulePtr&);
+    virtual void visitModuleEnd(const ModulePtr&);
+
+
     ::IceUtilInternal::Output& _out;
 };