5030 - Patch for slice2cs with scoped constants

1 files changed, 13 insertions, 5 deletions

diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index ea4a62b7752..dac53b55108 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -1228,6 +1228,7 @@ Slice::CsVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePt
     else
     {
         BuiltinPtr bp = BuiltinPtr::dynamicCast(type);
+        EnumPtr ep;
         if(bp && bp->kind() == Builtin::KindString)
         {
             //
@@ -1271,17 +1272,24 @@ Slice::CsVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePt
         {
             _out << value << "F";
         }
-        else
+        else if(ep = EnumPtr::dynamicCast(type))
         {
-            EnumPtr ep = EnumPtr::dynamicCast(type);
-            if(ep)
+            string enumName = fixId(ep->scoped());
+            string::size_type colon = value.rfind(':');
+            string enumerator;
+            if(colon != string::npos)
             {
-                _out << typeToString(type) << "." << fixId(value);
+                enumerator = fixId(value.substr(colon + 1));
             }
             else
             {
-                _out << value;
+                enumerator = fixId(value);
             }
+            _out << enumName << '.' << enumerator;
+        }
+        else
+        {
+            _out << value;
         }
     }
 }