Commit 1e99ff96 authored by Yuki Shiino's avatar Yuki Shiino Committed by Commit Bot

bind-gen: Rename CodeGeneration{Context,Accumulator} to CodeGen{...}

"CodeGeneration" was a bit too long name and space consuming in code.
This patch shorten the names.

Bug: 839389
Change-Id: Ie1dae9d778c65aa7bb823675f530af7a48a2c6e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1906688
Commit-Queue: Hitoshi Yoshida <peria@chromium.org>
Reviewed-by: default avatarHitoshi Yoshida <peria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714128}
parent c814c709
......@@ -11,7 +11,7 @@ specific bindings, such as ECMAScript bindings.
import copy
import string
from .code_generation_accumulator import CodeGenerationAccumulator
from .codegen_accumulator import CodeGenAccumulator
from .mako_renderer import MakoRenderer
......@@ -286,7 +286,7 @@ class CodeNode(object):
return self._accumulator
def set_accumulator(self, accumulator):
assert isinstance(accumulator, CodeGenerationAccumulator)
assert isinstance(accumulator, CodeGenAccumulator)
assert self._accumulator is None
self._accumulator = accumulator
......
......@@ -3,7 +3,7 @@
# found in the LICENSE file.
class CodeGenerationAccumulator(object):
class CodeGenAccumulator(object):
"""
Accumulates a variety of information and helps generate code based on the
information.
......
......@@ -7,14 +7,14 @@ import copy
from . import name_style
class CodeGenerationContext(object):
class CodeGenContext(object):
"""
Represents a context of code generation.
Note that this is not relevant to Mako template context or any contexts.
Also note that CodeGenerationContext's attributes will be global template
variables. |CodeGenerationContext.interface| will be available in templates
as "${interface}".
Also note that CodeGenContext's attributes will be global template
variables. |CodeGenContext.interface| will be available in templates as
"${interface}".
"""
# "for_world" attribute values
......@@ -86,7 +86,7 @@ class CodeGenerationContext(object):
return "_{}".format(attr)
def __init__(self, **kwargs):
assert CodeGenerationContext._was_initialized
assert CodeGenContext._was_initialized
for arg in kwargs.iterkeys():
assert arg in self._context_attrs, "Unknown argument: {}".format(
......@@ -199,4 +199,4 @@ class CodeGenerationContext(object):
return name_style.class_("v8", self.idl_definition.identifier)
CodeGenerationContext.init()
CodeGenContext.init()
......@@ -5,10 +5,10 @@
import web_idl
from .clang_format import clang_format
from .code_generation_accumulator import CodeGenerationAccumulator
from .code_node import CodeNode
from .code_node import LiteralNode
from .code_node import SymbolScopeNode
from .codegen_accumulator import CodeGenAccumulator
from .path_manager import PathManager
......@@ -21,7 +21,7 @@ def make_copyright_header():
def make_header_include_directives(accumulator):
assert isinstance(accumulator, CodeGenerationAccumulator)
assert isinstance(accumulator, CodeGenAccumulator)
class HeaderIncludeDirectives(object):
def __init__(self, accumulator):
......
......@@ -7,7 +7,6 @@ import os.path
from blinkbuild.name_style_converter import NameStyleConverter
from .clang_format import clang_format
from .code_generation_context import CodeGenerationContext
from .code_node import CodeNode
from .code_node import FunctionDefinitionNode
from .code_node import LiteralNode
......@@ -17,6 +16,7 @@ from .code_node import SymbolNode
from .code_node import SymbolScopeNode
from .code_node import TextNode
from .code_node import UnlikelyExitNode
from .codegen_context import CodeGenContext
from .mako_renderer import MakoRenderer
_format = CodeNode.format_template
......@@ -32,7 +32,7 @@ def _upper_camel_case(name):
def bind_callback_local_vars(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
S = SymbolNode
T = TextNode
......@@ -146,7 +146,7 @@ def make_v8_to_blink_value(blink_var_name, v8_value_expr, idl_type):
def bind_blink_api_arguments(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
if cg_context.attribute_get:
return
......@@ -171,7 +171,7 @@ def bind_blink_api_arguments(code_node, cg_context):
def bind_blink_api_call(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
property_implemented_as = (
cg_context.member_like.code_generator_info.property_implemented_as)
......@@ -220,7 +220,7 @@ def bind_blink_api_call(code_node, cg_context):
def bind_return_value(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
def create_definition(symbol_node):
if cg_context.return_type.unwrap().is_void:
......@@ -243,7 +243,7 @@ def bind_return_value(code_node, cg_context):
def bind_v8_set_return_value(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
pattern = "{_1}({_2});"
_1 = "V8SetReturnValue"
......@@ -264,7 +264,7 @@ def bind_v8_set_return_value(code_node, cg_context):
def make_attribute_get_def(cg_context):
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
L = LiteralNode
T = TextNode
......@@ -298,7 +298,7 @@ def make_attribute_get_def(cg_context):
def make_operation_def(cg_context):
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
L = LiteralNode
T = TextNode
......@@ -331,7 +331,7 @@ def make_operation_def(cg_context):
def bind_template_installer_local_vars(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
S = SymbolNode
......@@ -364,7 +364,7 @@ def bind_template_installer_local_vars(code_node, cg_context):
def make_install_interface_template_def(cg_context):
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
L = LiteralNode
T = TextNode
......@@ -416,7 +416,7 @@ def run_example(web_idl_database, output_dirs):
namespace = list(web_idl_database.namespaces)[0]
cg_context = CodeGenerationContext(namespace=namespace)
cg_context = CodeGenContext(namespace=namespace)
root_node = SymbolScopeNode(separator_last="\n", renderer=renderer)
......
......@@ -7,8 +7,6 @@ import os.path
from . import name_style
from .blink_v8_bridge import blink_type_info
from .blink_v8_bridge import make_v8_to_blink_value
from .code_generation_accumulator import CodeGenerationAccumulator
from .code_generation_context import CodeGenerationContext
from .code_node import CodeNode
from .code_node import FunctionDefinitionNode
from .code_node import LiteralNode
......@@ -17,6 +15,8 @@ from .code_node import SymbolNode
from .code_node import SymbolScopeNode
from .code_node import TextNode
from .code_node import UnlikelyExitNode
from .codegen_accumulator import CodeGenAccumulator
from .codegen_context import CodeGenContext
from .codegen_utils import collect_include_headers
from .codegen_utils import enclose_with_namespace
from .codegen_utils import make_copyright_header
......@@ -29,7 +29,7 @@ _format = CodeNode.format_template
def bind_callback_local_vars(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
S = SymbolNode
T = TextNode
......@@ -115,7 +115,7 @@ def bind_callback_local_vars(code_node, cg_context):
def bind_blink_api_arguments(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
if cg_context.attribute_get:
return
......@@ -140,7 +140,7 @@ def bind_blink_api_arguments(code_node, cg_context):
def bind_blink_api_call(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
property_implemented_as = (
cg_context.member_like.code_generator_info.property_implemented_as)
......@@ -191,7 +191,7 @@ def bind_blink_api_call(code_node, cg_context):
def bind_return_value(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
def create_definition(symbol_node):
if cg_context.return_type.unwrap().is_void:
......@@ -216,7 +216,7 @@ def bind_return_value(code_node, cg_context):
def bind_v8_set_return_value(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
pattern = "{_1}({_2});"
_1 = "V8SetReturnValue"
......@@ -237,7 +237,7 @@ def bind_v8_set_return_value(code_node, cg_context):
def make_attribute_get_def(cg_context):
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
L = LiteralNode
T = TextNode
......@@ -271,7 +271,7 @@ def make_attribute_get_def(cg_context):
def make_operation_def(cg_context):
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
L = LiteralNode
T = TextNode
......@@ -304,7 +304,7 @@ def make_operation_def(cg_context):
def bind_template_installer_local_vars(code_node, cg_context):
assert isinstance(code_node, SymbolScopeNode)
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
S = SymbolNode
......@@ -337,7 +337,7 @@ def bind_template_installer_local_vars(code_node, cg_context):
def make_install_interface_template_def(cg_context):
assert isinstance(cg_context, CodeGenerationContext)
assert isinstance(cg_context, CodeGenContext)
L = LiteralNode
T = TextNode
......@@ -387,10 +387,10 @@ def generate_interfaces(web_idl_database, output_dirs):
interface = web_idl_database.find("Node")
cg_context = CodeGenerationContext(interface=interface)
cg_context = CodeGenContext(interface=interface)
root_node = SymbolScopeNode(separator_last="\n")
root_node.set_accumulator(CodeGenerationAccumulator())
root_node.set_accumulator(CodeGenAccumulator())
root_node.set_renderer(MakoRenderer())
root_node.accumulator.add_include_headers(
......
......@@ -29,9 +29,9 @@
bind_gen/__init__.py
bind_gen/blink_v8_bridge.py
bind_gen/clang_format.py
bind_gen/code_generation_accumulator.py
bind_gen/code_generation_context.py
bind_gen/code_node.py
bind_gen/codegen_accumulator.py
bind_gen/codegen_context.py
bind_gen/codegen_utils.py
bind_gen/example.py
bind_gen/interface.py
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment