Chromium Code Reviews| Index: tools/json_schema_compiler/cc_generator.py |
| diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py |
| index 43434b8892389a788b02b092a9b57c3779d16c06..da766ac59d5b780021ebaf21083e8a60c12362a3 100644 |
| --- a/tools/json_schema_compiler/cc_generator.py |
| +++ b/tools/json_schema_compiler/cc_generator.py |
| @@ -9,23 +9,21 @@ import schema_util |
| import util_cc_helper |
| class CCGenerator(object): |
| - def __init__(self, type_generator, cpp_namespace_pattern): |
| + def __init__(self, type_generator): |
| self._type_generator = type_generator |
| - self._cpp_namespace_pattern = cpp_namespace_pattern |
| def Generate(self, namespace): |
| - return _Generator(namespace, |
| - self._type_generator, |
| - self._cpp_namespace_pattern).Generate() |
| + return _Generator(namespace, self._type_generator).Generate() |
| class _Generator(object): |
| """A .cc generator for a namespace. |
| """ |
| - def __init__(self, namespace, cpp_type_generator, cpp_namespace_pattern): |
| + def __init__(self, namespace, cpp_type_generator): |
| + if namespace.environment is None: |
| + raise "CppNamespaceEnvironment not defined" |
|
not at google - send to devlin
2014/08/27 23:14:20
When I said assert I literally meant call "assert"
lfg
2014/08/28 18:57:10
Done.
|
| self._namespace = namespace |
| self._type_helper = cpp_type_generator |
| - self._cpp_namespace_pattern = cpp_namespace_pattern |
| self._util_cc_helper = ( |
| util_cc_helper.UtilCCHelper(self._type_helper)) |
| self._generate_error_messages = namespace.compiler_options.get( |
| @@ -34,8 +32,9 @@ class _Generator(object): |
| def Generate(self): |
| """Generates a Code object with the .cc for a single namespace. |
| """ |
| - cpp_namespace = cpp_util.GetCppNamespace(self._cpp_namespace_pattern, |
| - self._namespace.unix_name) |
| + cpp_namespace = cpp_util.GetCppNamespace( |
| + self._namespace.environment.namespace_pattern, |
| + self._namespace.unix_name) |
| c = Code() |
| (c.Append(cpp_util.CHROMIUM_LICENSE) |