feature(c#): Adds enum lifting and lowering (bytecodealliance#821)

* feature(c#): Adds enum lifting and lowering Signed-off-by: James Sturtevant <[email protected]> * use simplier version for conversion Signed-off-by: James Sturtevant <[email protected]> * Add Debug statement Signed-off-by: James Sturtevant <[email protected]> * Add correct qualifier Signed-off-by: James Sturtevant <[email protected]> --------- Signed-off-by: James Sturtevant <[email protected]>
dicej · Jan 24, 2024 · ce46cf4 · ce46cf4
1 parent 671c284
commit ce46cf4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/crates/csharp/src/lib.rs b/crates/csharp/src/lib.rs
@@ -33,6 +33,7 @@ using System.Runtime.CompilerServices;
 using System.Collections;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Diagnostics;
 
 ";
 
@@ -1580,7 +1581,7 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {
         uwrite!(
             self.src,
             "
-            public static enum {name} {{
+            public enum {name} {{
                 {cases}
             }}
             "
@@ -1968,9 +1969,20 @@ impl Bindgen for FunctionBindgen<'_, '_> {
 
             Instruction::ResultLift { .. } => todo!("ResultLift"),
 
-            Instruction::EnumLower { .. } => todo!("EnumLower"),
+            Instruction::EnumLower { .. } => results.push(format!("(int){}", operands[0])),
 
-            Instruction::EnumLift { .. } => todo!("EnumLift"),
+            Instruction::EnumLift { ty, .. } => {
+                let t = self.gen.type_name_with_qualifier(&Type::Id(*ty), true);
+                let op = &operands[0];
+                results.push(format!("({}){}", t, op));
+
+                uwriteln!(
+                    self.src,
+                    "Debug.Assert(Enum.IsDefined(typeof({}), {}));",
+                    t,
+                    op
+                );
+            }
 
             Instruction::ListCanonLower { .. } => todo!("ListCanonLower"),
 

diff --git a/tests/codegen/simple-enum.wit b/tests/codegen/simple-enum.wit
@@ -0,0 +1,24 @@
+package foo:foo;
+
+interface enums {
+  enum e1 {
+      a,
+      b,
+      c
+  }
+
+  enum e2 {
+      something,
+      else
+  }
+
+  e1-arg: func(x: e1);
+  e2-arg: func(x: e2);
+
+  e1-ret: func(x: e1) -> e2;
+}
+
+world the-world {
+  import enums;
+  export enums;
+}