Clean up JSON Schema Compiler.

tools/json_schema_compiler/compiler.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 """Generator for C++ structs from api json files.
 
 The purpose of this tool is to remove the need for hand-written code that
 converts to and from base::Value types when receiving javascript api calls.
 Originally written for generating code for extension apis. Reference schemas
 are in chrome/common/extensions/api.
 
 Usage example:
   compiler.py --root /home/Work/src --namespace extensions windows.json
     tabs.json
   compiler.py --destdir gen --root /home/Work/src
     --namespace extensions windows.json tabs.json
 """
 
 import optparse
 import os
 import sys
 
 from cpp_bundle_generator import CppBundleGenerator
 from cpp_generator import CppGenerator
 from cpp_type_generator import CppTypeGenerator
 from dart_generator import DartGenerator
 import json_schema
-from model import Model, UnixName
+from model import Model
 from schema_loader import SchemaLoader
 
 # Names of supported code generators, as specified on the command-line.
 # First is default.
 GENERATORS = ['cpp', 'cpp-bundle', 'dart']
 
 def GenerateSchema(generator,
                    filenames,
                    root,
                    destdir,
@@ skipping 32 matching lines @@
     path, filename = os.path.split(schema_filename)
     short_filename, extension = os.path.splitext(filename)
 
     # Filenames are checked against the unix_names of the namespaces they
     # generate because the gyp uses the names of the JSON files to generate
     # the names of the .cc and .h files. We want these to be using unix_names.
     if namespace.unix_name != short_filename:
       sys.exit("Filename %s is illegal. Name files using unix_hacker style." %
                schema_filename)
 
-    # The output filename must match the input filename for gyp to deal with it
-    # properly.
-    out_file = namespace.unix_name
-
   # Construct the type generator with all the namespaces in this model.
   type_generator = CppTypeGenerator(api_model,
                                     schema_loader,
                                     default_namespace=default_namespace)
 
   if generator == 'cpp-bundle':
     cpp_bundle_generator = CppBundleGenerator(root,
                                               api_model,
                                               api_defs,
                                               type_generator,
@@ skipping 22 matching lines @@
   for filename, generator in generators:
     code = generator.Generate(namespace).Render()
     if destdir:
       with open(os.path.join(destdir, namespace.source_file_dir,
           filename), 'w') as f:
         f.write(code)
     output_code += [filename, '', code, '']
 
   return '\n'.join(output_code)
 
+
 if __name__ == '__main__':
   parser = optparse.OptionParser(
       description='Generates a C++ model of an API from JSON schema',
       usage='usage: %prog [option]... schema')
   parser.add_option('-r', '--root', default='.',
       help='logical include root directory. Path to schema files from specified'
       ' dir will be the include path.')
   parser.add_option('-d', '--destdir',
       help='root directory to output generated files.')
   parser.add_option('-n', '--namespace', default='generated_api_schemas',
@@ skipping 13 matching lines @@
   # Unless in bundle mode, only one file should be specified.
   if opts.generator != 'cpp-bundle' and len(filenames) > 1:
     # TODO(sashab): Could also just use filenames[0] here and not complain.
     raise Exception(
         "Unless in bundle mode, only one file can be specified at a time.")
 
   result = GenerateSchema(opts.generator, filenames, opts.root, opts.destdir,
                           opts.namespace, opts.dart_overrides_dir)
   if not opts.destdir:
     print result