Changeset 175546 in webkit


Ignore:
Timestamp:
Nov 4, 2014 7:36:13 AM (9 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: Enum value collisions between different generators
https://bugs.webkit.org/show_bug.cgi?id=138343

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-11-04
Reviewed by Brian Burg.

Each generator was using its own filtered list of domains_to_generate
to build the shared unique list of enum value encodings. This list
was slightly different across different generators. Instead always
use the list of all non-supplemental domains to generate the shared
list of enum values.

  • inspector/scripts/codegen/generator.py:

(Generator.non_supplemental_domains):
(Generator.domains_to_generate):
(Generator._traverse_and_assign_enum_values):

  • inspector/scripts/tests/enum-values.json: Added.
  • inspector/scripts/tests/expected/enum-values.json-result: Added.
Location:
trunk/Source/JavaScriptCore
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r175514 r175546  
     12014-11-04  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: Enum value collisions between different generators
     4        https://bugs.webkit.org/show_bug.cgi?id=138343
     5
     6        Reviewed by Brian Burg.
     7
     8        Each generator was using its own filtered list of domains_to_generate
     9        to build the shared unique list of enum value encodings. This list
     10        was slightly different across different generators. Instead always
     11        use the list of all non-supplemental domains to generate the shared
     12        list of enum values.
     13
     14        * inspector/scripts/codegen/generator.py:
     15        (Generator.non_supplemental_domains):
     16        (Generator.domains_to_generate):
     17        (Generator._traverse_and_assign_enum_values):
     18        * inspector/scripts/tests/enum-values.json: Added.
     19        * inspector/scripts/tests/expected/enum-values.json-result: Added.
     20
    1212014-11-03  Akos Kiss  <akiss@inf.u-szeged.hu>
    222
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py

    r175385 r175546  
    9595
    9696    # These methods are overridden by subclasses.
     97    def non_supplemental_domains(self):
     98        return filter(lambda domain: not domain.is_supplemental, self.model().domains)
     99
    97100    def domains_to_generate(self):
    98         return filter(lambda domain: not domain.is_supplemental, self.model().domains)
     101        return self.non_supplemental_domains()
    99102
    100103    def generate_output(self):
     
    171174        all_types = []
    172175
    173         domains = self.domains_to_generate()
     176        domains = self.non_supplemental_domains()
    174177
    175178        for domain in domains:
Note: See TracChangeset for help on using the changeset viewer.