Add bool support (#99)

* bool support

* remove borrows

Author: primoly

build.rs

@@ -142,7 +142,7 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
             run(Command::new(clang)
                 .arg("-shared")
                 .arg("-o")
-                .arg(&out_dir.join(name))
+                .arg(out_dir.join(name))
                 .arg("-Wl,--whole-archive")
                 .arg(&path)
                 .arg("-Wl,--no-whole-archive")

runtime/src/lib.rs

@@ -12,7 +12,7 @@ use {
     pyo3::{
         exceptions::PyAssertionError,
         intern,
-        types::{PyBytes, PyDict, PyList, PyMapping, PyModule, PyString, PyTuple},
+        types::{PyBool, PyBytes, PyDict, PyList, PyMapping, PyModule, PyString, PyTuple},
         Py, PyAny, PyErr, PyObject, PyResult, Python, ToPyObject,
     },
     std::{
@@ -512,6 +512,15 @@ pub unsafe extern "C" fn componentize_py_free(ptr: *mut u8, size: usize, align:
     alloc::dealloc(ptr, Layout::from_size_align(size, align).unwrap())
 }
 
+#[export_name = "componentize-py#ToCanonBool"]
+pub extern "C" fn componentize_py_to_canon_bool(_py: &Python, value: &PyAny) -> u32 {
+    if value.is_true().unwrap() {
+        1
+    } else {
+        0
+    }
+}
+
 #[export_name = "componentize-py#ToCanonI32"]
 pub extern "C" fn componentize_py_to_canon_i32(_py: &Python, value: &PyAny) -> i32 {
     value.extract().unwrap()
@@ -687,6 +696,11 @@ pub extern "C" fn componentize_py_get_list_element<'a>(
     value.downcast::<PyList>().unwrap().get_item(index).unwrap()
 }
 
+#[export_name = "componentize-py#FromCanonBool"]
+pub extern "C" fn componentize_py_from_canon_bool<'a>(py: &'a Python<'a>, value: u32) -> &'a PyAny {
+    PyBool::new(*py, value != 0)
+}
+
 #[export_name = "componentize-py#FromCanonI32"]
 pub extern "C" fn componentize_py_from_canon_i32<'a>(py: &'a Python<'a>, value: i32) -> &'a PyAny {
     value.to_object(*py).into_ref(*py).downcast().unwrap()

src/bindgen.rs

@@ -37,6 +37,11 @@ pub static IMPORT_SIGNATURES: &[(&str, &[ValType], &[ValType])] = &[
         &[ValType::I32],
     ),
     ("componentize-py#Free", &[ValType::I32; 3], &[]),
+    (
+        "componentize-py#ToCanonBool",
+        &[ValType::I32; 2],
+        &[ValType::I32],
+    ),
     (
         "componentize-py#ToCanonI32",
         &[ValType::I32; 2],
@@ -78,6 +83,11 @@ pub static IMPORT_SIGNATURES: &[(&str, &[ValType], &[ValType])] = &[
         &[ValType::I32; 3],
         &[ValType::I32],
     ),
+    (
+        "componentize-py#FromCanonBool",
+        &[ValType::I32; 2],
+        &[ValType::I32],
+    ),
     (
         "componentize-py#FromCanonI32",
         &[ValType::I32; 2],
@@ -575,7 +585,14 @@ impl<'a> FunctionBindgen<'a> {
 
     fn to_canon(&mut self, ty: Type, context: u32, value: u32) {
         match ty {
-            Type::Bool | Type::U8 | Type::U16 | Type::U32 | Type::S8 | Type::S16 | Type::S32 => {
+            Type::Bool => {
+                self.push(Ins::LocalGet(context));
+                self.push(Ins::LocalGet(value));
+                self.push(Ins::Call(
+                    *IMPORTS.get("componentize-py#ToCanonBool").unwrap(),
+                ));
+            }
+            Type::U8 | Type::U16 | Type::U32 | Type::S8 | Type::S16 | Type::S32 => {
                 self.push(Ins::LocalGet(context));
                 self.push(Ins::LocalGet(value));
                 self.push(Ins::Call(
@@ -850,7 +867,16 @@ impl<'a> FunctionBindgen<'a> {
 
     fn store(&mut self, ty: Type, context: u32, value: u32, destination: u32) {
         match ty {
-            Type::Bool | Type::U8 | Type::S8 => {
+            Type::Bool => {
+                self.push(Ins::LocalGet(destination));
+                self.push(Ins::LocalGet(context));
+                self.push(Ins::LocalGet(value));
+                self.push(Ins::Call(
+                    *IMPORTS.get("componentize-py#ToCanonBool").unwrap(),
+                ));
+                self.push(Ins::I32Store8(mem_arg(0, 0)));
+            }
+            Type::U8 | Type::S8 => {
                 self.push(Ins::LocalGet(destination));
                 self.to_canon(ty, context, value);
                 self.push(Ins::I32Store8(mem_arg(0, 0)));
@@ -1384,7 +1410,14 @@ impl<'a> FunctionBindgen<'a> {
 
     fn from_canon(&mut self, ty: Type, context: u32, value: &[u32]) {
         match ty {
-            Type::Bool | Type::U8 | Type::U16 | Type::U32 | Type::S8 | Type::S16 | Type::S32 => {
+            Type::Bool => {
+                self.push(Ins::LocalGet(context));
+                self.push(Ins::LocalGet(value[0]));
+                self.push(Ins::Call(
+                    *IMPORTS.get("componentize-py#FromCanonBool").unwrap(),
+                ));
+            }
+            Type::U8 | Type::U16 | Type::U32 | Type::S8 | Type::S16 | Type::S32 => {
                 self.push(Ins::LocalGet(context));
                 self.push(Ins::LocalGet(value[0]));
                 self.push(Ins::Call(

src/lib.rs

@@ -584,7 +584,7 @@ pub async fn componentize(
                 .with_context(|| format!("unable to open {path}"))?,
             DirPerms::all(),
             FilePerms::all(),
-            &index.to_string(),
+            index.to_string(),
         );
     }
 

src/summary.rs

@@ -2397,8 +2397,8 @@ impl<'a> TypeNames<'a> {
 
     fn type_name(&mut self, ty: Type, seen: &HashSet<TypeId>, resource: Option<TypeId>) -> String {
         match ty {
-            Type::Bool
-            | Type::U8
+            Type::Bool => "bool".into(),
+            Type::U8
             | Type::U16
             | Type::U32
             | Type::U64