Changed slice2cs to avoid generating unnecessary empty namespaces.

1 files changed, 117 insertions, 0 deletions

diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 20b4f2aeb21..3f1fd5ec1a5 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -1315,6 +1315,69 @@ Slice::Container::hasNonLocalClassDecls() const
 }
 
 bool
+Slice::Container::hasNonLocalInterfaceDefs() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p);
+	if(cl && !cl->isLocal() && cl->isInterface())
+	{
+	    return true;
+	}
+
+	ContainerPtr container = ContainerPtr::dynamicCast(*p);
+	if(container && container->hasNonLocalInterfaceDefs())
+	{
+	    return true;
+	}
+    }
+
+    return false;
+}
+
+bool
+Slice::Container::hasNonLocalSequences() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+	SequencePtr s = SequencePtr::dynamicCast(*p);
+	if(s && !s->isLocal())
+	{
+	    return true;
+	}
+
+	ContainerPtr container = ContainerPtr::dynamicCast(*p);
+	if(container && container->hasNonLocalSequences())
+	{
+	    return true;
+	}
+    }
+
+    return false;
+}
+
+bool
+Slice::Container::hasNonLocalDictionaries() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+	DictionaryPtr d = DictionaryPtr::dynamicCast(*p);
+	if(d && !d->isLocal())
+	{
+	    return true;
+	}
+
+	ContainerPtr container = ContainerPtr::dynamicCast(*p);
+	if(container && container->hasNonLocalDictionaries())
+	{
+	    return true;
+	}
+    }
+
+    return false;
+}
+
+bool
 Slice::Container::hasClassDecls() const
 {
     for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
@@ -1355,6 +1418,27 @@ Slice::Container::hasClassDefs() const
 }
 
 bool
+Slice::Container::hasAbstractClassDefs() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+	ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
+	if(cl && cl->isAbstract())
+	{
+	    return true;
+	}
+
+	ContainerPtr container = ContainerPtr::dynamicCast(*p);
+	if(container && container->hasAbstractClassDefs())
+	{
+	    return true;
+	}
+    }
+
+    return false;
+}
+
+bool
 Slice::Container::hasDataOnlyClasses() const
 {
     for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
@@ -1449,6 +1533,39 @@ Slice::Container::hasContentsWithMetaData(const string& meta) const
     return false;
 }
 
+bool
+Slice::Container::hasAsyncOps() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+	ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
+	if(cl && !cl->isLocal())
+	{
+	    OperationList ops = cl->operations();
+	    if(!ops.empty() && (cl->hasMetaData("ami") || cl->hasMetaData("amd")))
+	    {
+		return true;
+	    }
+	    for(OperationList::const_iterator i = ops.begin(); i != ops.end(); ++i)
+	    {
+	        OperationPtr op = *i;
+	        if(op->hasMetaData("ami") || op->hasMetaData("amd"))
+		{
+		    return true;
+		}
+	    }
+	}
+
+	ContainerPtr container = ContainerPtr::dynamicCast(*p);
+	if(container && container->hasAsyncOps())
+	{
+	    return true;
+	}
+    }
+
+    return false;
+}
+
 string
 Slice::Container::thisScope() const
 {