tools/json_schema_compiler/cpp_type_generator.py - Issue 487533005: Add support for references in different paths in apis

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/json_schema_compiler/cpp_type_generator.py

Issue 487533005: Add support for references in different paths in apis (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Renaming core_api::types->core_api::extension_types. Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« tools/json_schema_compiler/compiler.py ('K') | « tools/json_schema_compiler/cpp_generator.py ('k') | tools/json_schema_compiler/cpp_type_generator_test.py » ('j') | tools/json_schema_compiler/model.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/json_schema_compiler/cpp_type_generator.py

diff --git a/tools/json_schema_compiler/cpp_type_generator.py b/tools/json_schema_compiler/cpp_type_generator.py

index de6d1306287511d5419ed199174aae6b1663ac17..76e76e0c661526aa2b24a99caae78c7551e6773a 100644

--- a/tools/json_schema_compiler/cpp_type_generator.py

+++ b/tools/json_schema_compiler/cpp_type_generator.py

@@ -96,7 +96,10 @@ class CppTypeGenerator(object):

if self._default_namespace is type_.namespace:

cpp_type = cpp_util.Classname(type_.name)

else:

- cpp_type = '%s::%s' % (type_.namespace.unix_name,

+ cpp_namespace = cpp_util.GetCppNamespace(

+ type_.namespace.cpp_namespace_pattern,

+ type_.namespace.unix_name)

+ cpp_type = '%s::%s' % (cpp_namespace,

cpp_util.Classname(type_.name))

elif type_.property_type == PropertyType.ANY:

cpp_type = 'base::Value'

@@ -130,7 +133,7 @@ class CppTypeGenerator(object):

PropertyType.OBJECT,

PropertyType.CHOICES))

- def GenerateForwardDeclarations(self, cpp_namespace_pattern):

+ def GenerateForwardDeclarations(self):

"""Returns the forward declarations for self._default_namespace.

"""

c = Code()

@@ -144,7 +147,7 @@ class CppTypeGenerator(object):

if not filtered_deps:

continue

- cpp_namespace = cpp_util.GetCppNamespace(cpp_namespace_pattern,

+ cpp_namespace = cpp_util.GetCppNamespace(namespace.cpp_namespace_pattern,

namespace.unix_name)

c.Concat(cpp_util.OpenNamespace(cpp_namespace))

for dep in filtered_deps: