⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 202896 in webkit


Ignore:
Timestamp:
Jul 6, 2016, 11:22:23 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Builtin generator should use pragma once for header files
​https://bugs.webkit.org/show_bug.cgi?id=159462

Patch by Youenn Fablet <​youenn@apple.com> on 2016-07-06
Reviewed by Alex Christensen.

  • Scripts/builtins/builtins_generate_combined_header.py:

(BuiltinsCombinedHeaderGenerator.generate_output):

  • Scripts/builtins/builtins_generate_separate_header.py:

(BuiltinsSeparateHeaderGenerator.generate_output):

  • Scripts/builtins/builtins_templates.py:
  • Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result:
  • Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Separate.js-result:
  • Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Combined.js-result:
  • Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Separate.js-result:
  • Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Combined.js-result:
  • Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Separate.js-result:
  • Scripts/tests/builtins/expected/JavaScriptCore-InternalClashingNames-Combined.js-result:
  • Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
  • Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
  • Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
  • Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
  • Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
Location:
trunk/Source/JavaScriptCore
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r202890 r202896  
     12016-07-06  Youenn Fablet  <youenn@apple.com>
     2
     3        Builtin generator should use pragma once for header files
     4        https://bugs.webkit.org/show_bug.cgi?id=159462
     5
     6        Reviewed by Alex Christensen.
     7
     8        * Scripts/builtins/builtins_generate_combined_header.py:
     9        (BuiltinsCombinedHeaderGenerator.generate_output):
     10        * Scripts/builtins/builtins_generate_separate_header.py:
     11        (BuiltinsSeparateHeaderGenerator.generate_output):
     12        * Scripts/builtins/builtins_templates.py:
     13        * Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result:
     14        * Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Separate.js-result:
     15        * Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Combined.js-result:
     16        * Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Separate.js-result:
     17        * Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Combined.js-result:
     18        * Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Separate.js-result:
     19        * Scripts/tests/builtins/expected/JavaScriptCore-InternalClashingNames-Combined.js-result:
     20        * Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
     21        * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
     22        * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
     23        * Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
     24        * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
     25
    1262016-07-06  Benjamin Poulain  <bpoulain@apple.com>
    227

  • trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py

    r202280 r202896  
    5454        sections.append(self.generate_license())
    5555        sections.append(Template(Templates.DoNotEditWarning).substitute(args))
    56         sections.append(Template(Templates.HeaderIncludeGuardTop).substitute(args))
     56        sections.append(Template(Templates.HeaderIncludeGuard).substitute(args))
    5757        sections.append(self.generate_forward_declarations())
    5858        sections.append(Template(Templates.NamespaceTop).substitute(args))
    … …  
    6464        sections.append(Template(Templates.CombinedHeaderStaticMacros).substitute(args))
    6565        sections.append(Template(Templates.NamespaceBottom).substitute(args))
    66         sections.append(Template(Templates.HeaderIncludeGuardBottom).substitute(args))
    6766
    6867        return "\n\n".join(sections)

  • trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py

    r192142 r202896  
    6363        sections.append(self.generate_license())
    6464        sections.append(Template(Templates.DoNotEditWarning).substitute(args))
    65         sections.append(Template(Templates.HeaderIncludeGuardTop).substitute(args))
     65        sections.append(Template(Templates.HeaderIncludeGuard).substitute(args))
    6666        if conditional_guard is not None:
    6767            sections.append("#if %s" % conditional_guard)
    … …  
    8080        if conditional_guard is not None:
    8181            sections.append("#endif // %s" % conditional_guard)
    82         sections.append(Template(Templates.HeaderIncludeGuardBottom).substitute(args))
    8382
    8483        return "\n\n".join(sections)

  • trunk/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py

    r198798 r202896  
    5757// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py""")
    5858
    59     HeaderIncludeGuardTop = (
    60     """#ifndef ${headerGuard}
    61 #define ${headerGuard}""")
    62 
    63     HeaderIncludeGuardBottom = (
    64     """#endif // ${headerGuard}
    65 """)
     59    HeaderIncludeGuard = (
     60    """#pragma once""")
    6661
    6762    NamespaceTop = (

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Combined.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef JSCBuiltins_h
    32 #define JSCBuiltins_h
     31#pragma once
    3332
    3433namespace JSC {
    … …  
    7069
    7170} // namespace JSC
    72 
    73 #endif // JSCBuiltins_h
    74 
    7571### End File: JSCBuiltins.h
    7672

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.Promise-Separate.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef BuiltinPromiseBuiltins_h
    32 #define BuiltinPromiseBuiltins_h
     31#pragma once
    3332
    3433
    … …  
    7069
    7170} // namespace JSC
    72 
    73 #endif // BuiltinPromiseBuiltins_h
    74 
    7571### End File: BuiltinPromiseBuiltins.h
    7672

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Combined.js-result

    r202280 r202896  
    3030// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3131
    32 #ifndef JSCBuiltins_h
    33 #define JSCBuiltins_h
     32#pragma once
    3433
    3534namespace JSC {
    … …  
    7170
    7271} // namespace JSC
    73 
    74 #endif // JSCBuiltins_h
    75 
    7672### End File: JSCBuiltins.h
    7773

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-Builtin.prototype-Separate.js-result

    r202280 r202896  
    3030// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3131
    32 #ifndef BuiltinPrototypeBuiltins_h
    33 #define BuiltinPrototypeBuiltins_h
     32#pragma once
    3433
    3534
    … …  
    7170
    7271} // namespace JSC
    73 
    74 #endif // BuiltinPrototypeBuiltins_h
    75 
    7672### End File: BuiltinPrototypeBuiltins.h
    7773

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Combined.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef JSCBuiltins_h
    32 #define JSCBuiltins_h
     31#pragma once
    3332
    3433namespace JSC {
    … …  
    7069
    7170} // namespace JSC
    72 
    73 #endif // JSCBuiltins_h
    74 
    7571### End File: JSCBuiltins.h
    7672

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-BuiltinConstructor-Separate.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef BuiltinConstructorBuiltins_h
    32 #define BuiltinConstructorBuiltins_h
     31#pragma once
    3332
    3433
    … …  
    7069
    7170} // namespace JSC
    72 
    73 #endif // BuiltinConstructorBuiltins_h
    74 
    7571### End File: BuiltinConstructorBuiltins.h
    7672

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/JavaScriptCore-InternalClashingNames-Combined.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef JSCBuiltins_h
    32 #define JSCBuiltins_h
     31#pragma once
    3332
    3433namespace JSC {
    … …  
    6968
    7069} // namespace JSC
    71 
    72 #endif // JSCBuiltins_h
    73 
    7470### End File: JSCBuiltins.h
    7571

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef ArbitraryConditionalGuardBuiltins_h
    32 #define ArbitraryConditionalGuardBuiltins_h
     31#pragma once
    3332
    3433#if ENABLE(STREAMS_API) || USE(CF)
    … …  
    121120
    122121#endif // ENABLE(STREAMS_API) || USE(CF)
    123 
    124 #endif // ArbitraryConditionalGuardBuiltins_h
    125 
    126122### End File: ArbitraryConditionalGuardBuiltins.h
    127123

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef GuardedBuiltinBuiltins_h
    32 #define GuardedBuiltinBuiltins_h
     31#pragma once
    3332
    3433#if ENABLE(STREAMS_API)
    … …  
    121120
    122121#endif // ENABLE(STREAMS_API)
    123 
    124 #endif // GuardedBuiltinBuiltins_h
    125 
    126122### End File: GuardedBuiltinBuiltins.h
    127123

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef GuardedInternalBuiltinBuiltins_h
    32 #define GuardedInternalBuiltinBuiltins_h
     31#pragma once
    3332
    3433#if ENABLE(STREAMS_API)
    … …  
    153152
    154153#endif // ENABLE(STREAMS_API)
    155 
    156 #endif // GuardedInternalBuiltinBuiltins_h
    157 
    158154### End File: GuardedInternalBuiltinBuiltins.h
    159155

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef UnguardedBuiltinBuiltins_h
    32 #define UnguardedBuiltinBuiltins_h
     31#pragma once
    3332
    3433#include <builtins/BuiltinUtils.h>
    … …  
    117116
    118117} // namespace WebCore
    119 
    120 #endif // UnguardedBuiltinBuiltins_h
    121 
    122118### End File: UnguardedBuiltinBuiltins.h
    123119

  • trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result

    r202280 r202896  
    2929// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
    3030
    31 #ifndef xmlCasingTestBuiltins_h
    32 #define xmlCasingTestBuiltins_h
     31#pragma once
    3332
    3433#if ENABLE(STREAMS_API)
    … …  
    167166
    168167#endif // ENABLE(STREAMS_API)
    169 
    170 #endif // xmlCasingTestBuiltins_h
    171 
    172168### End File: xmlCasingTestBuiltins.h
    173169
Note: See TracChangeset for help on using the changeset viewer.