Build module namespaces as a hierarchal 'stdio' -> 'std' rather than …

…a singular 'std.stdio'

gcc/d/ChangeLog

@@ -1,3 +1,9 @@
+2014-02-17  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* d-codegen.cc(d_build_module): New function.
+	* d-decls.cc(Module::toSymbol): Use d_build_module to build up the
+	qualified module namespace.
+
 2014-02-16  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	* d-decls.cc(Module::toSymbol): Build a NAMESPACE_DECL to populate the

gcc/d/d-codegen.cc

@@ -76,6 +76,28 @@ d_decl_context (Dsymbol *dsym)
   return NULL_TREE;
 }
 
+// Build a complete module namespace, any modules in packages will
+// have their DECL_CONTEXT set as the symbol of the parent.
+
+tree
+d_build_module (Dsymbol *dsym)
+{
+  if (dsym->isModule() || dsym->isPackage())
+    {
+      tree decl = build_decl (UNKNOWN_LOCATION, NAMESPACE_DECL,
+			      get_identifier (dsym->ident->string),
+			      void_type_node);
+      set_decl_location (decl, dsym);
+
+      if (dsym->parent)
+	DECL_CONTEXT (decl) = d_build_module (dsym->parent);
+
+      return decl;
+    }
+
+  gcc_unreachable();
+}
+
 // Add local variable VD into the current body of function fd.
 
 void

gcc/d/d-codegen.h

@@ -113,6 +113,7 @@ class ArrayScope;
 
 // Code generation routines.
 extern tree d_decl_context (Dsymbol *dsym);
+extern tree d_build_module (Dsymbol *dsym);
 
 extern tree d_mark_addressable (tree exp);
 extern tree d_mark_used (tree exp);

gcc/d/d-decls.cc

@@ -590,14 +590,9 @@ Module::toSymbol (void)
       TREE_CONSTANT (decl) = 0;
       TREE_READONLY (decl) = 0;
 
-      // Build the module namespace, any enclosing members will have
-      // this set as their DECL_CONTEXT, see d_decl_context.
-      const char *name = this->toPrettyChars();
-      tree mod = build_decl (UNKNOWN_LOCATION, NAMESPACE_DECL,
-			     get_identifier (name), void_type_node);
-      set_decl_location (mod, this);
-      csym->ScontextDecl = mod;
-      d_keep (mod);
+      tree module = d_build_module (this);
+      csym->ScontextDecl = module;
+      d_keep (module);
     }
 
   return csym;