Mojo C++ bindigns: fix generated namespace when variant is specified.

mojo/public/tools/bindings/generators/mojom_cpp_generator.py

Index: mojo/public/tools/bindings/generators/mojom_cpp_generator.py
diff --git a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py b/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
index 40b5acc36b69df41091c0b11122d9ab00cfe3f99..184c8bb16f8630733a6b624b430ca14e1336d834 100644
--- a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
+++ b/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
@@ -46,6 +46,9 @@ _kind_to_cpp_literal_suffix = {
 # generator library code so that filters can use the generator as context.
 _current_typemap = {}
 _for_blink = False
+# TODO(rockot, yzshen): The variant handling is kind of a hack currently. Make
+# it right.
+_variant = None
 
 
 def ConstantValue(constant):
@@ -66,7 +69,8 @@ def DefaultValue(field):
 def NamespaceToArray(namespace):
   return namespace.split(".") if namespace else []
 
-def GetNamePartsForKind(kind, add_same_module_namespaces, internal):
+def GetNamePartsForKind(kind, add_same_module_namespaces, add_variant,
+                        internal):
   def MapKindName_(kind):
     if not internal:
       return kind.name
@@ -80,8 +84,11 @@ def GetNamePartsForKind(kind, add_same_module_namespaces, internal):
   parts = []
   if kind.imported_from:

[Sam McNally, 2016/03/17 17:37:58]

We'll want to add the variant here too, but it can wait until variant imports
work.

[yzshen1, 2016/03/17 17:46:36]

Right. I know that part is incorrect currently. To fix that more fundamental
changes are necessary: we either need to assume all imported kinds are using the
same variant; or carry over the variant information if the kind actually is from
a different target which has variant specified.

     parts.extend(NamespaceToArray(kind.imported_from["namespace"]))
-  elif hasattr(kind, "module") and add_same_module_namespaces:
-    parts.extend(NamespaceToArray(kind.module.namespace))
+  elif add_same_module_namespaces:
+    if hasattr(kind, "module"):

[Sam McNally, 2016/03/17 17:37:58]

I don't think it makes sense to add the variant if we aren't adding a namespace
because the kind doesn't have a module.

[yzshen1, 2016/03/17 17:46:36]

I am not quite sure I have understood the problem:
Here |add_same_module_namespaces| basically mean whether we want to add the
namespaces beginning from  what is defined by the "module" definition in mojom.
If not, this method just produces <kind name>, or internal::<kind name>.
Otherwise, we will need to add the variant, right?

[Sam McNally, 2016/03/17 17:52:55]

Yes, but if kind.module doesn't exist when |add_same_module_namespaces| and
|add_variant| are true, we'll be returning just <variant>::<kind name> or
<variant>::internal::<kind name>.

+      parts.extend(NamespaceToArray(kind.module.namespace))
+    if _variant and add_variant:
+      parts.append(_variant)
   if internal:
     parts.append("internal")
   if kind.parent_kind:
@@ -90,17 +97,17 @@ def GetNamePartsForKind(kind, add_same_module_namespaces, internal):
   return parts
 
 def GetNameForKind(kind, internal=False):
-  parts = GetNamePartsForKind(kind, False, internal)
+  parts = GetNamePartsForKind(kind, False, False, internal)
   return "::".join(parts)
 
 def GetQualifiedNameForKind(kind, internal=False):
   # Always start with an empty part to force a leading "::" on output.
   parts = [""]
-  parts.extend(GetNamePartsForKind(kind, True, internal))
+  parts.extend(GetNamePartsForKind(kind, True, True, internal))
   return "::".join(parts)
 
 def GetFullMojomNameForKind(kind):
-  parts = GetNamePartsForKind(kind, True, False)
+  parts = GetNamePartsForKind(kind, True, False, False)
   return ".".join(parts)
 
 def IsTypemappedKind(kind):
@@ -559,6 +566,8 @@ class Generator(generator.Generator):
     _current_typemap = self.typemap
     global _for_blink
     _for_blink = self.for_blink
+    global _variant
+    _variant = self.variant
     suffix = "-%s" % self.variant if self.variant else ""
     self.Write(self.GenerateModuleHeader(),
         self.MatchMojomFilePath("%s%s.h" % (self.module.name, suffix)))