Mojo: cleanup bindings generator.

R=davemoore@chromium.org

Review URL: https://codereview.chromium.org/181943005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254290 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 6 insertions, 22 deletions

diff --git a/mojo/public/bindings/generators/cpp_templates/module-internal.h.tmpl b/mojo/public/bindings/generators/cpp_templates/module-internal.h.tmpl
index 22236c0..6839207 100644
--- a/mojo/public/bindings/generators/cpp_templates/module-internal.h.tmpl
+++ b/mojo/public/bindings/generators/cpp_templates/module-internal.h.tmpl
@@ -3,14 +3,14 @@
 // found in the LICENSE file.
 
 {%- set header_guard = "%s_INTERNAL_H_"|
-        format(module_name|upper|replace("/","_")|replace(".","_")) %}
+        format(module.path|upper|replace("/","_")|replace(".","_")) %}
 
 #ifndef {{header_guard}}
 #define {{header_guard}}
 
 #include "mojo/public/bindings/lib/bindings_internal.h"
 {%- for import in imports %}
-#include "{{include_prefix}}{{import.module_name|camel_to_underscores}}-internal.h"
+#include "{{import.module.path}}-internal.h"
 {%- endfor %}
 
 namespace {{namespace}} {
diff --git a/mojo/public/bindings/generators/cpp_templates/module.cc.tmpl b/mojo/public/bindings/generators/cpp_templates/module.cc.tmpl
index 7bedd5f..2f017a0 100644
--- a/mojo/public/bindings/generators/cpp_templates/module.cc.tmpl
+++ b/mojo/public/bindings/generators/cpp_templates/module.cc.tmpl
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "{{include_prefix}}{{module_name|camel_to_underscores}}.h"
+#include "{{module.path}}.h"
 
 #include "mojo/public/bindings/lib/bindings_serialization.h"
 #include "mojo/public/bindings/lib/message_builder.h"
diff --git a/mojo/public/bindings/generators/cpp_templates/module.h.tmpl b/mojo/public/bindings/generators/cpp_templates/module.h.tmpl
index ca5aee8..8015298 100644
--- a/mojo/public/bindings/generators/cpp_templates/module.h.tmpl
+++ b/mojo/public/bindings/generators/cpp_templates/module.h.tmpl
@@ -3,16 +3,16 @@
 // found in the LICENSE file.
 
 {%- set header_guard = "%s_H_"|
-        format(module_path|upper|replace("/","_")|replace(".","_")) %}
+        format(module.path|upper|replace("/","_")|replace(".","_")) %}
 
 #ifndef {{header_guard}}
 #define {{header_guard}}
 
 #include "mojo/public/bindings/array.h"
 #include "mojo/public/bindings/interface.h"
-#include "{{include_prefix}}{{module_name|camel_to_underscores}}-internal.h"
+#include "{{module.path}}-internal.h"
 {%- for import in imports %}
-#include "{{include_prefix}}{{import.module_name|camel_to_underscores}}.h"
+#include "{{import.module.path}}.h"
 {%- endfor %}
 
 namespace {{namespace}} {
diff --git a/mojo/public/bindings/generators/mojom_cpp_generator.py b/mojo/public/bindings/generators/mojom_cpp_generator.py
index 754e42c..659b94f 100644
--- a/mojo/public/bindings/generators/mojom_cpp_generator.py
+++ b/mojo/public/bindings/generators/mojom_cpp_generator.py
@@ -145,7 +145,6 @@ _HEADER_SIZE = 8
 class Generator(mojom_generator.Generator):
 
   cpp_filters = {
-    "camel_to_underscores": mojom_generator.CamelToUnderscores,
     "cpp_const_wrapper_type": GetCppConstWrapperType,
     "cpp_field_type": GetCppFieldType,
     "cpp_type": GetCppType,
@@ -167,15 +166,12 @@ class Generator(mojom_generator.Generator):
   def GetJinjaExports(self):
     return {
       "module": self.module,
-      "module_name": self.module.name,
-      "module_path": self.module.path,
       "namespace": self.module.namespace,
       "imports": self.module.imports,
       "kinds": self.module.kinds,
       "enums": self.module.enums,
       "structs": self.GetStructs(),
       "interfaces": self.module.interfaces,
-      "include_prefix": self.GetIncludePrefix(),
     }
 
   @UseJinja("cpp_templates/module.h.tmpl", filters=cpp_filters)
@@ -195,10 +191,3 @@ class Generator(mojom_generator.Generator):
     self.Write(self.GenerateModuleInternalHeader(),
         "%s-internal.h" % self.module.name)
     self.Write(self.GenerateModuleSource(), "%s.cc" % self.module.name)
-
-  def GetIncludePrefix(self):
-    if not self.header_dir:
-      return ""
-    if self.header_dir[-1] == "/":
-      return self.header_dir
-    return self.header_dir + "/"
diff --git a/mojo/public/bindings/pylib/generate/mojom_generator.py b/mojo/public/bindings/pylib/generate/mojom_generator.py
index a65e95e..d9d12da 100644
--- a/mojo/public/bindings/pylib/generate/mojom_generator.py
+++ b/mojo/public/bindings/pylib/generate/mojom_generator.py
@@ -37,10 +37,6 @@ def IsObjectKind(kind):
 def IsHandleKind(kind):
   return kind.spec.startswith('h') or isinstance(kind, mojom.Interface)
 
-def CamelToUnderscores(camel):
-  s = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', camel)
-  return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s).lower()
-
 def StudlyCapsToCamel(studly):
   return studly[0].lower() + studly[1:]
 
@@ -69,7 +65,6 @@ class Generator(object):
   # files to stdout.
   def __init__(self, module, output_dir=None):
     self.module = module
-    self.header_dir = os.path.dirname(module.path);
     self.output_dir = output_dir
 
   def GetStructsFromMethods(self):