[webkit-changes] [202896] trunk/Source/JavaScriptCore

Wed, 06 Jul 2016 23:23:13 -0700

Title: [202896] trunk/Source/_javascript_Core
Revision
202896
Author
[email protected]
Date
2016-07-06 23:22:23 -0700 (Wed, 06 Jul 2016)

Log Message

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

Patch by Youenn Fablet <[email protected]> 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/_javascript_Core-Builtin.Promise-Combined.js-result:
* Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result:
* Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result:
* Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result:
* Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result:
* Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result:
* Scripts/tests/builtins/expected/_javascript_Core-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:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (202895 => 202896)


--- trunk/Source/_javascript_Core/ChangeLog	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-07-07 06:22:23 UTC (rev 202896)
@@ -1,3 +1,28 @@
+2016-07-06  Youenn Fablet  <[email protected]>
+
+        Builtin generator should use pragma once for header files
+        https://bugs.webkit.org/show_bug.cgi?id=159462
+
+        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/_javascript_Core-Builtin.Promise-Combined.js-result:
+        * Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result:
+        * Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result:
+        * Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result:
+        * Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result:
+        * Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result:
+        * Scripts/tests/builtins/expected/_javascript_Core-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:
+
 2016-07-06  Benjamin Poulain  <[email protected]>
 
         [JSC] Unify how we throw TypeError from C++

Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_combined_header.py (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_combined_header.py	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_combined_header.py	2016-07-07 06:22:23 UTC (rev 202896)
@@ -53,7 +53,7 @@
         sections = []
         sections.append(self.generate_license())
         sections.append(Template(Templates.DoNotEditWarning).substitute(args))
-        sections.append(Template(Templates.HeaderIncludeGuardTop).substitute(args))
+        sections.append(Template(Templates.HeaderIncludeGuard).substitute(args))
         sections.append(self.generate_forward_declarations())
         sections.append(Template(Templates.NamespaceTop).substitute(args))
         for object in self.model().objects:
@@ -63,7 +63,6 @@
         sections.append(self.generate_section_for_global_private_code_name_macro())
         sections.append(Template(Templates.CombinedHeaderStaticMacros).substitute(args))
         sections.append(Template(Templates.NamespaceBottom).substitute(args))
-        sections.append(Template(Templates.HeaderIncludeGuardBottom).substitute(args))
 
         return "\n\n".join(sections)

Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_header.py (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_header.py	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_header.py	2016-07-07 06:22:23 UTC (rev 202896)
@@ -62,7 +62,7 @@
         sections = []
         sections.append(self.generate_license())
         sections.append(Template(Templates.DoNotEditWarning).substitute(args))
-        sections.append(Template(Templates.HeaderIncludeGuardTop).substitute(args))
+        sections.append(Template(Templates.HeaderIncludeGuard).substitute(args))
         if conditional_guard is not None:
             sections.append("#if %s" % conditional_guard)
         sections.append(self.generate_secondary_header_includes())
@@ -79,7 +79,6 @@
         sections.append(Template(Templates.NamespaceBottom).substitute(args))
         if conditional_guard is not None:
             sections.append("#endif // %s" % conditional_guard)
-        sections.append(Template(Templates.HeaderIncludeGuardBottom).substitute(args))
 
         return "\n\n".join(sections)

Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py	2016-07-07 06:22:23 UTC (rev 202896)
@@ -56,14 +56,9 @@
     """// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py""")
 
-    HeaderIncludeGuardTop = (
-    """#ifndef ${headerGuard}
-#define ${headerGuard}""")
+    HeaderIncludeGuard = (
+    """#pragma once""")
 
-    HeaderIncludeGuardBottom = (
-    """#endif // ${headerGuard}
-""")
-
     NamespaceTop = (
     """namespace ${namespace} {""")

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Combined.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Combined.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Combined.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef JSCBuiltins_h
-#define JSCBuiltins_h
+#pragma once
 
 namespace JSC {
 class FunctionExecutable;
@@ -69,9 +68,6 @@
 #undef DECLARE_BUILTIN_GENERATOR
 
 } // namespace JSC
-
-#endif // JSCBuiltins_h
-
 ### End File: JSCBuiltins.h
 
 ### Begin File: JSCBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef BuiltinPromiseBuiltins_h
-#define BuiltinPromiseBuiltins_h
+#pragma once
 
 
 
@@ -69,9 +68,6 @@
 #undef DECLARE_BUILTIN_GENERATOR
 
 } // namespace JSC
-
-#endif // BuiltinPromiseBuiltins_h
-
 ### End File: BuiltinPromiseBuiltins.h
 
 ### Begin File: BuiltinPromiseBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -29,8 +29,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef JSCBuiltins_h
-#define JSCBuiltins_h
+#pragma once
 
 namespace JSC {
 class FunctionExecutable;
@@ -70,9 +69,6 @@
 #undef DECLARE_BUILTIN_GENERATOR
 
 } // namespace JSC
-
-#endif // JSCBuiltins_h
-
 ### End File: JSCBuiltins.h
 
 ### Begin File: JSCBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -29,8 +29,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef BuiltinPrototypeBuiltins_h
-#define BuiltinPrototypeBuiltins_h
+#pragma once
 
 
 
@@ -70,9 +69,6 @@
 #undef DECLARE_BUILTIN_GENERATOR
 
 } // namespace JSC
-
-#endif // BuiltinPrototypeBuiltins_h
-
 ### End File: BuiltinPrototypeBuiltins.h
 
 ### Begin File: BuiltinPrototypeBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef JSCBuiltins_h
-#define JSCBuiltins_h
+#pragma once
 
 namespace JSC {
 class FunctionExecutable;
@@ -69,9 +68,6 @@
 #undef DECLARE_BUILTIN_GENERATOR
 
 } // namespace JSC
-
-#endif // JSCBuiltins_h
-
 ### End File: JSCBuiltins.h
 
 ### Begin File: JSCBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef BuiltinConstructorBuiltins_h
-#define BuiltinConstructorBuiltins_h
+#pragma once
 
 
 
@@ -69,9 +68,6 @@
 #undef DECLARE_BUILTIN_GENERATOR
 
 } // namespace JSC
-
-#endif // BuiltinConstructorBuiltins_h
-
 ### End File: BuiltinConstructorBuiltins.h
 
 ### Begin File: BuiltinConstructorBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-InternalClashingNames-Combined.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-InternalClashingNames-Combined.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-InternalClashingNames-Combined.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef JSCBuiltins_h
-#define JSCBuiltins_h
+#pragma once
 
 namespace JSC {
 class FunctionExecutable;
@@ -68,9 +67,6 @@
 #undef DECLARE_BUILTIN_GENERATOR
 
 } // namespace JSC
-
-#endif // JSCBuiltins_h
-
 ### End File: JSCBuiltins.h
 
 ### Begin File: JSCBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef ArbitraryConditionalGuardBuiltins_h
-#define ArbitraryConditionalGuardBuiltins_h
+#pragma once
 
 #if ENABLE(STREAMS_API) || USE(CF)
 
@@ -120,9 +119,6 @@
 } // namespace WebCore
 
 #endif // ENABLE(STREAMS_API) || USE(CF)
-
-#endif // ArbitraryConditionalGuardBuiltins_h
-
 ### End File: ArbitraryConditionalGuardBuiltins.h
 
 ### Begin File: ArbitraryConditionalGuardBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef GuardedBuiltinBuiltins_h
-#define GuardedBuiltinBuiltins_h
+#pragma once
 
 #if ENABLE(STREAMS_API)
 
@@ -120,9 +119,6 @@
 } // namespace WebCore
 
 #endif // ENABLE(STREAMS_API)
-
-#endif // GuardedBuiltinBuiltins_h
-
 ### End File: GuardedBuiltinBuiltins.h
 
 ### Begin File: GuardedBuiltinBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef GuardedInternalBuiltinBuiltins_h
-#define GuardedInternalBuiltinBuiltins_h
+#pragma once
 
 #if ENABLE(STREAMS_API)
 
@@ -152,9 +151,6 @@
 } // namespace WebCore
 
 #endif // ENABLE(STREAMS_API)
-
-#endif // GuardedInternalBuiltinBuiltins_h
-
 ### End File: GuardedInternalBuiltinBuiltins.h
 
 ### Begin File: GuardedInternalBuiltinBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef UnguardedBuiltinBuiltins_h
-#define UnguardedBuiltinBuiltins_h
+#pragma once
 
 #include <builtins/BuiltinUtils.h>
 #include <bytecode/UnlinkedFunctionExecutable.h>
@@ -116,9 +115,6 @@
 }
 
 } // namespace WebCore
-
-#endif // UnguardedBuiltinBuiltins_h
-
 ### End File: UnguardedBuiltinBuiltins.h
 
 ### Begin File: UnguardedBuiltinBuiltins.cpp

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result (202895 => 202896)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result	2016-07-07 05:55:30 UTC (rev 202895)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result	2016-07-07 06:22:23 UTC (rev 202896)
@@ -28,8 +28,7 @@
 // DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
 // builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
 
-#ifndef xmlCasingTestBuiltins_h
-#define xmlCasingTestBuiltins_h
+#pragma once
 
 #if ENABLE(STREAMS_API)
 
@@ -166,9 +165,6 @@
 } // namespace WebCore
 
 #endif // ENABLE(STREAMS_API)
-
-#endif // xmlCasingTestBuiltins_h
-
 ### End File: xmlCasingTestBuiltins.h
 
 ### Begin File: xmlCasingTestBuiltins.cpp

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to