Add the skeleton for CompilerCompiler in C++

api/sixtyfps-cpp/include/sixtyfps_interpreter.h

@@ -248,7 +248,7 @@ private:
     friend struct Struct;
     friend class ComponentInstance;
     // Internal constructor that takes ownership of the value
-    explicit Value(ValueOpaque &inner) : inner(inner) {}
+    explicit Value(ValueOpaque &inner) : inner(inner) { }
 };
 
 inline Value::Value(const sixtyfps::SharedVector<Value> &array)
@@ -349,48 +349,57 @@ inline void Struct::set_field(std::string_view name, const Value &value)
     cbindgen_private::sixtyfps_interpreter_struct_set_field(&inner, name_view, &value.inner);
 }
 
-class ComponentInstance {
+class ComponentInstance
+{
     cbindgen_private::ComponentInstance inner;
     ComponentInstance() = delete;
     ComponentInstance(ComponentInstance &) = delete;
     ComponentInstance &operator=(ComponentInstance &) = delete;
+
 public:
-    void show() const {
+    void show() const
+    {
         cbindgen_private::sixtyfps_interpreter_component_instance_show(&inner, true);
     }
-    void hide() const {
+    void hide() const
+    {
         cbindgen_private::sixtyfps_interpreter_component_instance_show(&inner, false);
     }
-    void run() const {
+    void run() const
+    {
         show();
         cbindgen_private::sixtyfps_run_event_loop();
         hide();
     }
 
-    bool set_property(std::string_view name, const Value &value) const {
+    bool set_property(std::string_view name, const Value &value) const
+    {
         cbindgen_private::Slice<uint8_t> name_view {
             const_cast<unsigned char *>(reinterpret_cast<const unsigned char *>(name.data())),
             name.size()
         };
-        return cbindgen_private::sixtyfps_interpreter_component_instance_set_property(&inner, name_view, &value.inner);
+        return cbindgen_private::sixtyfps_interpreter_component_instance_set_property(
+                &inner, name_view, &value.inner);
     }
-    std::optional<Value> get_property(std::string_view name) const {
+    std::optional<Value> get_property(std::string_view name) const
+    {
         cbindgen_private::Slice<uint8_t> name_view {
             const_cast<unsigned char *>(reinterpret_cast<const unsigned char *>(name.data())),
             name.size()
         };
         cbindgen_private::ValueOpaque out;
-        if (cbindgen_private::sixtyfps_interpreter_component_instance_get_property(&inner, name_view, &out)) {
+        if (cbindgen_private::sixtyfps_interpreter_component_instance_get_property(
+                    &inner, name_view, &out)) {
             return Value(out);
         } else {
             return {};
         }
     }
     // FIXME! Slice in public API?  Should be std::span (c++20) or we need to improve the Slice API
-    std::optional<Value> invoke_callback(std::string_view name, Slice<Value> args) const {
+    std::optional<Value> invoke_callback(std::string_view name, Slice<Value> args) const
+    {
         cbindgen_private::Slice<cbindgen_private::ValueOpaque> args_view {
-            reinterpret_cast<cbindgen_private::ValueOpaque *>(args.ptr),
+            reinterpret_cast<cbindgen_private::ValueOpaque *>(args.ptr), args.len
-            args.len
         };
         cbindgen_private::Slice<uint8_t> name_view {
             const_cast<unsigned char *>(reinterpret_cast<const unsigned char *>(name.data())),
@@ -406,26 +415,39 @@ public:
     }
 
     template<typename F>
-    bool set_callback(std::string_view name, F callback) const {
+    bool set_callback(std::string_view name, F callback) const
+    {
         using cbindgen_private::ValueOpaque;
         cbindgen_private::Slice<uint8_t> name_view {
             const_cast<unsigned char *>(reinterpret_cast<const unsigned char *>(name.data())),
             name.size()
         };
         auto actual_cb = [](void *data, Slice<ValueOpaque> arg, ValueOpaque *ret) {
-            Slice<Value> args_view {
+            Slice<Value> args_view { reinterpret_cast<Value *>(arg.ptr), arg.len };
-                reinterpret_cast<Value*>(arg.ptr),
+            Value r = (*reinterpret_cast<F *>(data))(arg);
-                arg.len
-            };
-            Value r = (*reinterpret_cast<F*>(data))(arg);
             new (ret) Value(std::move(r));
         };
         return cbindgen_private::sixtyfps_interpreter_component_instance_set_callback(
-            &inner, name_view, actual_cb,
+                &inner, name_view, actual_cb, new F(std::move(callback)),
-            new F(std::move(callback)),
+                [](void *data) { delete reinterpret_cast<F *>(data); });
-            [](void *data) { delete reinterpret_cast<F*>(data); });
     }
 };
 
+class ComponentCompiler
+{
+    cbindgen_private::ComponentCompilerOpaque inner;
+
+    ComponentCompiler() = delete;
+    ComponentCompiler(ComponentCompiler &) = delete;
+    ComponentCompiler &operator=(ComponentCompiler &) = delete;
+
+public:
+    ComponentCompiler() { cbindgen_private::sixtyfps_interpreter_component_compiler_new(&inner); }
+
+    ~ComponentCompiler()
+    {
+        cbindgen_private::sixtyfps_interpreter_component_compiler_destructor(&inner);
+    }
+};
 
 }

api/sixtyfps-cpp/tests/tests.cpp

@@ -156,13 +156,12 @@ SCENARIO("Value API")
         REQUIRE(destroyed);
     }
 
-
     SECTION("Compare Values")
     {
-        Value str1{sixtyfps::SharedString("Hello1")};
+        Value str1 { sixtyfps::SharedString("Hello1") };
-        Value str2{sixtyfps::SharedString("Hello2")};
+        Value str2 { sixtyfps::SharedString("Hello2") };
-        Value fl1{10.};
+        Value fl1 { 10. };
-        Value fl2{12.};
+        Value fl2 { 12. };
 
         REQUIRE(str1 == str1);
         REQUIRE(str1 != str2);
@@ -177,7 +176,6 @@ SCENARIO("Value API")
         REQUIRE(fl1 != sixtyfps::SharedString("Hello2"));
         REQUIRE(fl2 == 12.);
     }
-
 }
 
 SCENARIO("Struct API")
@@ -240,3 +238,10 @@ SCENARIO("Struct Initializer List Constructor")
     REQUIRE(struc.get_field("field_a").value().to_bool().value());
     REQUIRE(struc.get_field("field_b").value().to_number().value() == 42.0);
 }
+
+SCENARIO("Component Compiler")
+{
+    using namespace sixtyfps::interpreter;
+
+    ComponentCompiler compiler;
+}

sixtyfps_runtime/interpreter/api.rs

@@ -1290,4 +1290,26 @@ pub(crate) mod ffi {
     ) {
         notify.as_model_notify().row_removed(row, count);
     }
+
+    #[repr(C)]
+    pub struct ComponentCompilerOpaque([usize; 12]);
+    /// Asserts that ComponentCompilerOpaque is as large as ComponentCompiler and has the same alignment, to make transmute safe.
+    const _: [(); std::mem::size_of::<ComponentCompilerOpaque>()] =
+        [(); std::mem::size_of::<ComponentCompiler>()];
+    const _: [(); std::mem::align_of::<ComponentCompilerOpaque>()] =
+        [(); std::mem::align_of::<ComponentCompiler>()];
+
+    #[no_mangle]
+    pub unsafe extern "C" fn sixtyfps_interpreter_component_compiler_new(
+        compiler: *mut ComponentCompilerOpaque,
+    ) {
+        std::ptr::write(compiler as *mut ComponentCompiler, ComponentCompiler::new())
+    }
+
+    #[no_mangle]
+    pub unsafe extern "C" fn sixtyfps_interpreter_component_compiler_destructor(
+        compiler: *mut ComponentCompilerOpaque,
+    ) {
+        drop(std::ptr::read(compiler as *mut ComponentCompiler))
+    }
 }