Implement core 0.2 changes

- Make code generator emit C functions that take in a single object that contains both the object and the return context. This simplifies usage from C/C++. - Remove zero wrapper optimization. The above is incompatible with it. - Remove CtxBox, as context has been moved into the container object.
h33p · Oct 7, 2021 · e589a01 · e589a01
1 parent f09a768
commit e589a01
Show file tree

Hide file tree

Showing 20 changed files with 1,007 additions and 1,007 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,11 @@ If all code is glued together, our glue is the safest on the market.
 
 ## FFI-safe trait generation, helper structures, and more!
 
+**WARNING: following documentation is currently valid for
+[stable 0.1.x series](https://github.com/h33p/cglue/tree/v0.1.3)**
+
+*This is a 0.2 development branch, documentation is to be updated ASAP*
+
 <!-- toc -->
 - [Overview](#overview)
 - [In-depth look](#in-depth-look)
@@ -58,7 +63,7 @@ fn use_info_printer(printer: &impl InfoPrinter) {
     printer.print_info();
 }
 
-fn main() {
+fn main() -> () {
     let mut info = Info {
         value: 5
     };

diff --git a/cglue-gen/Cargo.toml b/cglue-gen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cglue-gen"
-version = "0.1.4"
+version = "0.2.0"
 authors = ["Aurimas Blažulionis <0x60@pm.me>"]
 edition = "2018"
 description = "FFI safe code generation for making plugins and C-compatible libraries"

diff --git a/cglue-gen/src/ext/mod.rs b/cglue-gen/src/ext/mod.rs
@@ -187,18 +187,14 @@ pub fn impl_store() -> TokenStream {
                     "Ext",
                     "Vtbl",
                     "RetTmp",
-                    "OpaqueVtbl",
-                    "Any",
                     "Box",
                     "CtxBox",
-                    "NoCtxBox",
                     "ArcBox",
                     "Mut",
                     "Ref",
                     "Base",
                     "BaseBox",
                     "BaseCtxBox",
-                    "BaseNoCtxBox",
                     "BaseArcBox",
                     "BaseMut",
                     "BaseRef",

diff --git a/cglue-gen/src/forward.rs b/cglue-gen/src/forward.rs
@@ -17,6 +17,7 @@ pub fn gen_forward(tr: ItemTrait, ext_path: Option<TokenStream>) -> TokenStream
         format_ident!("Self"),
         WrappedType {
             ty: parse2(quote!(Self)).unwrap(),
+            ty_ret_tmp: None,
             ty_static: None,
             return_conv: None,
             lifetime_bound: None,
@@ -26,7 +27,6 @@ pub fn gen_forward(tr: ItemTrait, ext_path: Option<TokenStream>) -> TokenStream
             impl_return_conv: None,
             inject_ret_tmp: false,
             unbounded_hrtb: false,
-            needs_ctx: false,
         },
     );