Changeset 106469 in webkit

Timestamp:

Feb 1, 2012 9:22:02 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: CodeGeneratorInspector.py: move type builder code to dedicated InspectorTypeBuilder .h/.cpp
​https://bugs.webkit.org/show_bug.cgi?id=77471

Patch by Peter Rybin <​peter.rybin@gmail.com> on 2012-02-01
Reviewed by Yury Semikhatsky.

Code is moved physically to other file -- generator is changed accrodingly.

• inspector/CodeGeneratorInspector.py:

(String):
(provides):
(typename):
(Array):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/CodeGeneratorInspector.py (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-01  Peter Rybin  <peter.rybin@gmail.com>
+
+        Web Inspector: CodeGeneratorInspector.py: move type builder code to dedicated InspectorTypeBuilder .h/.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=77471
+
+        Reviewed by Yury Semikhatsky.
+
+        Code is moved physically to other file -- generator is changed accrodingly.
+
+        * inspector/CodeGeneratorInspector.py:
+        (String):
+        (provides):
+        (typename):
+        (Array):
+
 2012-02-01  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/inspector/CodeGeneratorInspector.py

@@ -1644 +1644 @@
 #if ENABLE(INSPECTOR)
 
-namespace TypeBuilder {
-
-// This class provides "Traits" type for the input type T. It is programmed using C++ template specialization
-// technique. By default it simply takes "ItemTraits" type from T, but it doesn't work with the base types.
-template<typename T>
-struct ArrayItemHelper {
-    typedef typename T::ItemTraits Traits;
-};
-
-template<typename T>
-class Array : public InspectorArray {
-private:
-    Array() { }
-
-public:
-    void addItem(PassRefPtr<T> value)
-    {
-        ArrayItemHelper<T>::Traits::pushRefPtr(this, value);
-    }
-
-    void addItem(T value)
-    {
-        ArrayItemHelper<T>::Traits::pushRaw(this, value);
-    }
-
-    static PassRefPtr<Array<T> > create()
-    {
-        return adoptRef(new Array<T>());
-    }
-
-#if """ + VALIDATOR_IFDEF_NAME + """
-    static void assertCorrectValue(InspectorValue* value);
-#endif // """ + VALIDATOR_IFDEF_NAME + """
-};
-
-struct StructItemTraits {
-    static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorObject> value)
-    {
-        array->pushObject(value);
-    }
-
-    template<typename T>
-    static void assertCorrectValue(InspectorValue* value) {
-        T::assertCorrectValue(value);
-    }
-};
-
-template<>
-struct ArrayItemHelper<String> {
-    struct Traits {
-        static void pushRaw(InspectorArray* array, const String& value)
-        {
-            array->pushString(value);
-        }
-    };
-};
-
-template<>
-struct ArrayItemHelper<InspectorObject> {
-    struct Traits {
-        static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorObject> value)
-        {
-            array->pushObject(value);
-        }
-    };
-};
-
-${forwards}
-
-String getEnumConstantValue(int code);
-
-${typeBuilders}
-} // namespace TypeBuilder
-
 class InspectorFrontend {
 public:
@@ -2180 +2106 @@
 $methods
 
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
+""")
+
+    typebuilder_h = string.Template(file_header_ +
+"""
+#ifndef InspectorTypeBuilder_h
+#define InspectorTypeBuilder_h
+
+#if ENABLE(INSPECTOR)
+
+#include "InspectorValues.h"
+#include <PlatformString.h>
+#include <wtf/PassRefPtr.h>
+
+namespace WebCore {
+
+namespace TypeBuilder {
+
+// This class provides "Traits" type for the input type T. It is programmed using C++ template specialization
+// technique. By default it simply takes "ItemTraits" type from T, but it doesn't work with the base types.
+template<typename T>
+struct ArrayItemHelper {
+    typedef typename T::ItemTraits Traits;
+};
+
+template<typename T>
+class Array : public InspectorArray {
+private:
+    Array() { }
+
+public:
+    void addItem(PassRefPtr<T> value)
+    {
+        ArrayItemHelper<T>::Traits::pushRefPtr(this, value);
+    }
+
+    void addItem(T value)
+    {
+        ArrayItemHelper<T>::Traits::pushRaw(this, value);
+    }
+
+    static PassRefPtr<Array<T> > create()
+    {
+        return adoptRef(new Array<T>());
+    }
+
+#if """ + VALIDATOR_IFDEF_NAME + """
+    static void assertCorrectValue(InspectorValue* value);
+#endif // """ + VALIDATOR_IFDEF_NAME + """
+};
+
+struct StructItemTraits {
+    static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorObject> value)
+    {
+        array->pushObject(value);
+    }
+
+    template<typename T>
+    static void assertCorrectValue(InspectorValue* value) {
+        T::assertCorrectValue(value);
+    }
+};
+
+template<>
+struct ArrayItemHelper<String> {
+    struct Traits {
+        static void pushRaw(InspectorArray* array, const String& value)
+        {
+            array->pushString(value);
+        }
+    };
+};
+
+template<>
+struct ArrayItemHelper<InspectorObject> {
+    struct Traits {
+        static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorObject> value)
+        {
+            array->pushObject(value);
+        }
+    };
+};
+
+${forwards}
+
+String getEnumConstantValue(int code);
+
+${typeBuilders}
+} // namespace TypeBuilder
+
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(InspectorTypeBuilder_h)
+
+""")
+
+    typebuilder_cpp = string.Template(file_header_ +
+"""
+
+#include "config.h"
+#if ENABLE(INSPECTOR)
+
+#include "InspectorTypeBuilder.h"
+
+namespace WebCore {
+
 namespace TypeBuilder {
 
@@ -2186 +2223 @@
 
 String getEnumConstantValue(int code) {
-    // Test variable from generated sources, declared in InspectorTypeBuilder.h and defined in InspectorTypeBuilder.cpp
-    ASSERT(typeBuilderTestVariable);
     return enum_constant_values[code];
 }
@@ -2208 +2243 @@
 
 #endif // """ + VALIDATOR_IFDEF_NAME + """
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-""")
-
-    typebuilder_h = string.Template(file_header_ +
-"""
-#ifndef InspectorTypeBuilder_h
-#define InspectorTypeBuilder_h
-
-namespace WebCore {
-
-// FIXME: move here TypeBuilder namespace from InspectorFrontend.h
-
-// FIXME: Used to test that we don't miss .cpp file. Remove once tested.
-extern bool typeBuilderTestVariable;
-
-} // namespace WebCore
-#endif // !defined(InspectorTypeBuilder_h)
-
-""")
-
-    typebuilder_cpp = string.Template(file_header_ +
-"""
-
-#include "config.h"
-#if ENABLE(INSPECTOR)
-
-#include "InspectorTypeBuilder.h"
-
-namespace WebCore {
-
-// FIXME: move here TypeBuilder namespace from InspectorFrontend.cpp
-
-// FIXME: Used to test that we don't miss .cpp file. Remove once tested.
-bool typeBuilderTestVariable = true;
 
 } // namespace WebCore
@@ -2819 +2817 @@
 
 frontend_h_file.write(Templates.frontend_h.substitute(None,
-         fieldDeclarations=join(Generator.frontend_class_field_lines, ""),
-         domainClassList=join(Generator.frontend_domain_class_lines, ""),
-         typeBuilders=join(flatten_list(Generator.type_builder_fragments), ""),
-         forwards=join(Generator.type_builder_forwards, "")))
+    fieldDeclarations=join(Generator.frontend_class_field_lines, ""),
+    domainClassList=join(Generator.frontend_domain_class_lines, "")))
 
 frontend_cpp_file.write(Templates.frontend_cpp.substitute(None,
     constructorInit=join(Generator.frontend_constructor_init_list, ""),
-    methods=join(Generator.frontend_method_list, "\n"),
+    methods=join(Generator.frontend_method_list, "\n")))
+
+typebuilder_h_file.write(Templates.typebuilder_h.substitute(None,
+    typeBuilders=join(flatten_list(Generator.type_builder_fragments), ""),
+    forwards=join(Generator.type_builder_forwards, "")))
+
+typebuilder_cpp_file.write(Templates.typebuilder_cpp.substitute(None,
     enumConstantValues=EnumConstants.get_enum_constant_code(),
     validatorCode=join(flatten_list(Generator.validator_impl_list), "")))
 
-typebuilder_h_file.write(Templates.typebuilder_h.substitute(None))
-
-typebuilder_cpp_file.write(Templates.typebuilder_cpp.substitute(None))
-
 backend_js_file.write(Templates.backend_js.substitute(None,
     domainInitializers=join(Generator.backend_js_domain_initializer_list, "")))