Mojo C++ bindings: extract code shared by different variants.

mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 {%- if variant -%}
 {%-   set variant_path = "%s-%s"|format(module.path, variant) -%}
 {%- else -%}
 {%-   set variant_path = module.path -%}
 {%- endif -%}
 
 {%- set header_guard = "%s_H_"|format(
         variant_path|upper|replace("/","_")|replace(".","_")|
             replace("-", "_")) %}
 
-{%- from "enum_macros.tmpl" import enum_decl %}
-{%- from "enum_macros.tmpl" import enum_stream_operator %}
-{%- from "enum_macros.tmpl" import is_known_enum_value %}
-{%- from "enum_macros.tmpl" import enum_hash %}
-
 {%- macro namespace_begin() %}
 {%-   for namespace in namespaces_as_array %}
 namespace {{namespace}} {
 {%-   endfor %}
 {%-   if variant %}
 namespace {{variant}} {
 {%-   endif %}
 {%- endmacro %}
 
 {%- macro namespace_end() %}
@@ skipping 14 matching lines @@
 };
 }  // namespace internal
 }  // namespace mojo
 {%- endmacro %}
 
 #ifndef {{header_guard}}
 #define {{header_guard}}
 
 #include <stdint.h>
 
-#include <functional>
-#include <ostream>
 #include <type_traits>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/optional.h"
 #include "mojo/public/cpp/bindings/array_data_view.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/associated_interface_request.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/lib/control_message_handler.h"
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
+#include "mojo/public/cpp/bindings/lib/union_accessor.h"
 #include "mojo/public/cpp/bindings/map.h"
 #include "mojo/public/cpp/bindings/map_data_view.h"
 #include "mojo/public/cpp/bindings/message_filter.h"
-#include "mojo/public/cpp/bindings/native_enum.h"
 #include "mojo/public/cpp/bindings/native_struct.h"
 #include "mojo/public/cpp/bindings/native_struct_data_view.h"
 #include "mojo/public/cpp/bindings/no_interface.h"
 #include "mojo/public/cpp/bindings/string_data_view.h"
 #include "mojo/public/cpp/bindings/struct_ptr.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "mojo/public/cpp/bindings/union_traits.h"
-#include "{{variant_path}}-internal.h"
+#include "{{module.path}}-shared.h"
 {%- for import in imports %}
 {%-   if variant %}
 #include "{{"%s-%s.h"|format(import.module.path, variant)}}"
 {%-   else %}
 #include "{{import.module.path}}.h"
 {%-   endif %}
 {%- endfor %}
 {%- if not for_blink %}
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/string.h"
 {%- else %}
 #include "mojo/public/cpp/bindings/wtf_array.h"
 #include "mojo/public/cpp/bindings/wtf_map.h"
 #include "third_party/WebKit/Source/wtf/Optional.h"
 #include "third_party/WebKit/Source/wtf/text/WTFString.h"
 {%- endif %}
 
 {%- for header in extra_public_headers %}
 #include "{{header}}"
 {%- endfor %}
 
 {%- if export_header %}
 #include "{{export_header}}"
 {%- endif %}
 
-{#--- Enums #}
-{%- if enums %}
-{{namespace_begin()}}
-{%-   for enum in enums %}
-{%-     if enum|is_native_only_kind %}
-using {{enum.name}} = mojo::NativeEnum;
-{%-     else %}
-{{enum_decl(enum)}}
-{{enum_stream_operator(enum)}}
-{{is_known_enum_value(enum)}}
-{%-     endif %}
-{%-   endfor %}
-{{namespace_end()}}
-
-namespace std {
-
-{%-   for enum in enums %}
-{%-     if not enum|is_native_only_kind %}
-{{enum_hash(enum)}}
-{%-     endif %}
-{%-   endfor %}
-
-}  // namespace std
-{%- endif %}
-
 {{namespace_begin()}}
 
+{#--- Enums #}
+{%- if variant %}
+{%-   for enum in enums %}
+using {{enum.name}} = {{enum.name}};  // Alias for definition in the parent namespace.
+{%-   endfor %}
+{%- endif %}
+
+
 {#--- Constants #}
 {%- for constant in module.constants %}
 {#-   To be consistent with constants defined inside interfaces, only make
       integral types compile-time constants. #}
 {%-   if constant.kind|is_integral_kind %}
 const {{constant.kind|cpp_pod_type}} {{constant.name}} = {{constant|constant_value}};
 {%-   else %}
 extern const {{constant.kind|cpp_pod_type}} {{constant.name}};
 {%-   endif %}
 {%- endfor %}
@@ skipping 36 matching lines @@
 {%    if union|should_inline_union %}
 typedef mojo::InlinedStructPtr<{{union.name}}> {{union.name}}Ptr;
 {%    else %}
 typedef mojo::StructPtr<{{union.name}}> {{union.name}}Ptr;
 {%    endif %}
 {%- endfor %}
 
 {#--- Interfaces -#}
 {%  for interface in interfaces %}
 {%    include "interface_declaration.tmpl" %}
-
-{%-   if interface.enums %}
-{{namespace_end()}}
-namespace std {
-
-{%-     for enum in interface.enums %}
-{%-       if not enum|is_native_only_kind %}
-{{enum_hash(enum)}}
-{%-       endif %}
-{%-     endfor %}
-
-}  // namespace std
-{{namespace_begin()}}
-{%-   endif %}
-
-{%-   for enum in interface.enums %}
-{%-     if not enum|is_native_only_kind %}
-{{enum_stream_operator(enum)}}
-{{is_known_enum_value(enum)}}
-{%-     endif %}
-{%-   endfor %}
 {%- endfor %}
 
 {#--- Interface Proxies -#}
 {%  for interface in interfaces %}
 {%    include "interface_proxy_declaration.tmpl" %}
 {%- endfor %}
 
 {#--- Interface Stubs -#}
 {%  for interface in interfaces %}
 {%    include "interface_stub_declaration.tmpl" %}
@@ skipping 54 matching lines @@
 {%- for union in unions %}
 {%    include "wrapper_union_class_template_definition.tmpl" %}
 {%    include "union_data_view_definition.tmpl" %}
 {%- endfor %}
 
 {%- for struct in structs %}
 {%-   if not struct|is_native_only_kind %}
 {%      include "wrapper_class_template_definition.tmpl" %}
 {%      include "struct_data_view_definition.tmpl" %}
 {%-   endif %}
-
-{%-   if struct.enums %}
-{{namespace_end()}}
-namespace std {
-
-{%-     for enum in struct.enums %}
-{%-       if not enum|is_native_only_kind %}
-{{enum_hash(enum)}}
-{%-       endif %}
-{%-     endfor %}
-
-}  // namespace std
-{{namespace_begin()}}
-{%-   endif %}
-
-{%-   for enum in struct.enums %}
-{%-     if not enum|is_native_only_kind %}
-{{enum_stream_operator(enum)}}
-{{is_known_enum_value(enum)}}
-{%-     endif %}
-{%-   endfor %}
 {%- endfor %}
 
 {{namespace_end()}}
 
 namespace mojo {
 
-{#--- Enum Serialization Helpers -#}
-{%- for enum in enums %}
-{%-   if not enum|is_native_only_kind %}
-{%      include "enum_serialization_declaration.tmpl" %}
-{%-   endif %}
-{%- endfor %}
-
-{%- for struct in structs %}
-{%-   for enum in struct.enums %}
-{%-     if not enum|is_native_only_kind %}
-{%        include "enum_serialization_declaration.tmpl" %}
-{%-     endif %}
-{%-   endfor %}
-{%- endfor %}
-
-{%- for interface in interfaces %}
-{%-   for enum in interface.enums %}
-{%-     if not enum|is_native_only_kind %}
-{%        include "enum_serialization_declaration.tmpl" %}
-{%-     endif %}
-{%-   endfor %}
-{%- endfor %}
-
 {#--- Struct Serialization Helpers -#}
 {%  for struct in structs %}
 {%-   if not struct|is_native_only_kind %}
 {%      include "struct_serialization_declaration.tmpl" %}
 {%-   endif %}
 {%- endfor %}
 
 {#--- Union Serialization Helpers -#}
 {%  if unions %}
 {%-   for union in unions %}
 {%      include "union_serialization_declaration.tmpl" %}
 {%-   endfor %}
 {%- endif %}
 
 }  // namespace mojo
 
 #endif  // {{header_guard}}