fix worlds-with-types.wit test case for Java generator (#480)

dicej · web-flow · commit 1e9a211d74d8 · 2023-02-02T16:55:49.000-06:00
Signed-off-by: Joel Dice &lt;joel.dice@fermyon.com&gt;
diff --git a/crates/gen-guest-teavm-java/src/lib.rs b/crates/gen-guest-teavm-java/src/lib.rs
@@ -43,6 +43,11 @@ impl Opts {
     }
 }
 
+struct InterfaceFragment {
+    src: String,
+    stub: String,
+}
+
 #[derive(Default)]
 pub struct TeaVmJava {
     opts: Opts,
@@ -52,7 +57,8 @@ pub struct TeaVmJava {
     tuple_counts: HashSet<usize>,
     needs_cleanup: bool,
     needs_result: bool,
-    classes: HashMap<String, String>,
+    interface_fragments: HashMap<String, Vec<InterfaceFragment>>,
+    world_fragments: Vec<InterfaceFragment>,
     sizes: SizeAlign,
     interface_names: HashMap<InterfaceId, String>,
 }
@@ -95,7 +101,7 @@ impl WorldGenerator for TeaVmJava {
             gen.import(name, func);
         }
 
-        gen.add_class();
+        gen.add_interface_fragment();
     }
 
     fn import_funcs(
@@ -105,14 +111,14 @@ impl WorldGenerator for TeaVmJava {
         funcs: &[(&str, &Function)],
         _files: &mut Files,
     ) {
-        let name = &resolve.worlds[world].name;
+        let name = &format!("{}-world", resolve.worlds[world].name);
         let mut gen = self.interface(resolve, name);
 
         for (_, func) in funcs {
             gen.import(name, func);
         }
 
-        gen.add_class();
+        gen.add_world_fragment();
     }
 
     fn export_interface(
@@ -130,7 +136,7 @@ impl WorldGenerator for TeaVmJava {
             gen.export(func, Some(name));
         }
 
-        gen.add_class();
+        gen.add_interface_fragment();
     }
 
     fn export_funcs(
@@ -140,14 +146,14 @@ impl WorldGenerator for TeaVmJava {
         funcs: &[(&str, &Function)],
         _files: &mut Files,
     ) {
-        let name = &resolve.worlds[world].name;
+        let name = &format!("{}-world", resolve.worlds[world].name);
         let mut gen = self.interface(resolve, name);
 
         for (_, func) in funcs {
             gen.export(func, None);
         }
 
-        gen.add_class();
+        gen.add_world_fragment();
     }
 
     fn export_types(
@@ -157,14 +163,14 @@ impl WorldGenerator for TeaVmJava {
         types: &[(&str, TypeId)],
         _files: &mut Files,
     ) {
-        let name = &resolve.worlds[world].name;
+        let name = &format!("{}-world", resolve.worlds[world].name);
         let mut gen = self.interface(resolve, name);
 
-        for (name, ty) in types {
-            gen.define_type(name, *ty);
+        for (ty_name, ty) in types {
+            gen.define_type(ty_name, *ty);
         }
 
-        gen.add_class();
+        gen.add_world_fragment();
     }
 
     fn finish(&mut self, resolve: &Resolve, id: WorldId, files: &mut Files) {
@@ -186,6 +192,15 @@ impl WorldGenerator for TeaVmJava {
             "
         );
 
+        src.push_str(
+            &self
+                .world_fragments
+                .iter()
+                .map(|f| f.src.deref())
+                .collect::<Vec<_>>()
+                .join("\n"),
+        );
+
         let component_type =
             wit_component::metadata::encode(resolve, id, wit_component::StringEncoding::UTF8)
                 .unwrap()
@@ -324,8 +339,56 @@ impl WorldGenerator for TeaVmJava {
 
         files.push(&format!("{name}World.java"), indent(&src).as_bytes());
 
-        for (name, body) in &self.classes {
-            files.push(&format!("{name}.java"), indent(body).as_bytes());
+        let generate_stub = |name, fragments: &[InterfaceFragment], files: &mut Files| {
+            let body = fragments
+                .iter()
+                .map(|f| f.stub.deref())
+                .collect::<Vec<_>>()
+                .join("\n");
+
+            let body = format!(
+                "package {package};
+
+                 {IMPORTS}
+
+                 public class {name} {{
+                     {body}
+                 }}
+                "
+            );
+
+            files.push(&format!("{name}.java"), indent(&body).as_bytes());
+        };
+
+        if self.opts.generate_stub {
+            generate_stub(format!("{name}WorldImpl"), &self.world_fragments, files);
+        }
+
+        for (name, fragments) in &self.interface_fragments {
+            let body = fragments
+                .iter()
+                .map(|f| f.src.deref())
+                .collect::<Vec<_>>()
+                .join("\n");
+
+            let body = format!(
+                "package {package};
+
+                 {IMPORTS}
+
+                 public final class {name} {{
+                     private {name}() {{}}
+
+                     {body}
+                 }}
+                "
+            );
+
+            files.push(&format!("{name}.java"), indent(&body).as_bytes());
+
+            if self.opts.generate_stub {
+                generate_stub(format!("{name}Impl"), fragments, files);
+            }
         }
     }
 }
@@ -356,41 +419,22 @@ impl InterfaceGenerator<'_> {
         }
     }
 
-    fn add_class(self) {
-        let package = format!("wit_{}", self.gen.name.to_snake_case());
-        let name = self.name.to_upper_camel_case();
-        let body = self.src;
-        let body = format!(
-            "package {package};
-
-             {IMPORTS}
-
-             public final class {name} {{
-                 private {name}() {{}}
-
-                 {body}
-             }}
-            "
-        );
-
-        if self.gen.opts.generate_stub {
-            let name = format!("{name}Impl");
-            let body = self.stub;
-            let body = format!(
-                "package {package};
-
-                 {IMPORTS}
-
-                 public class {name} {{
-                     {body}
-                 }}
-                "
-            );
-
-            self.gen.classes.insert(name, body);
-        }
+    fn add_interface_fragment(self) {
+        self.gen
+            .interface_fragments
+            .entry(self.name.to_upper_camel_case())
+            .or_default()
+            .push(InterfaceFragment {
+                src: self.src,
+                stub: self.stub,
+            });
+    }
 
-        self.gen.classes.insert(name, body);
+    fn add_world_fragment(self) {
+        self.gen.world_fragments.push(InterfaceFragment {
+            src: self.src,
+            stub: self.stub,
+        });
     }
 
     fn import(&mut self, module: &str, func: &Function) {
diff --git a/crates/gen-guest-teavm-java/tests/codegen.rs b/crates/gen-guest-teavm-java/tests/codegen.rs
@@ -4,8 +4,6 @@ use std::path::Path;
 use std::process::Command;
 
 macro_rules! codegen_test {
-    (worlds_with_types $name:tt $test:tt) => {};
-
     ($id:ident $name:tt $test:tt) => {
         #[test]
         fn $id() {
diff --git a/tests/runtime/lists/ExportsImpl.java b/tests/runtime/lists/ExportsImpl.java
@@ -1,6 +1,6 @@
 package wit_lists;
 
-import static wit_lists.ListsImpl.expect;
+import static wit_lists.ListsWorldImpl.expect;
 
 import java.util.ArrayList;
 
diff --git a/tests/runtime/lists/ListsWorldImpl.java b/tests/runtime/lists/ListsWorldImpl.java
@@ -6,7 +6,7 @@
 
 import wit_lists.ListsWorld.Tuple2;
 
-public class ListsImpl {
+public class ListsWorldImpl {
     public static int allocatedBytes() {
         return 0;
     }
diff --git a/tests/runtime/numbers/NumbersWorldImpl.java b/tests/runtime/numbers/NumbersWorldImpl.java
@@ -1,6 +1,6 @@
 package wit_numbers;
 
-public class NumbersImpl {
+public class NumbersWorldImpl {
     private static void expect(boolean v) {
         if (!v) {
             throw new AssertionError();
diff --git a/tests/runtime/records/RecordsWorldImpl.java b/tests/runtime/records/RecordsWorldImpl.java
@@ -5,7 +5,7 @@
 import wit_records.RecordsWorld.Tuple2;
 import wit_records.RecordsWorld.Tuple4;
 
-public class RecordsImpl {
+public class RecordsWorldImpl {
     public static void testImports() {
         {
             Tuple2<Byte, Short> results = Imports.multipleResults();
diff --git a/tests/runtime/smoke/SmokeWorldImpl.java b/tests/runtime/smoke/SmokeWorldImpl.java
@@ -1,6 +1,6 @@
 package wit_smoke;
 
-public class SmokeImpl {
+public class SmokeWorldImpl {
     public static void thunk() {
         Imports.thunk();
     }
diff --git a/tests/runtime/variants/VariantsWorldImpl.java b/tests/runtime/variants/VariantsWorldImpl.java
@@ -6,7 +6,7 @@
 import wit_variants.VariantsWorld.Tuple4;
 import wit_variants.VariantsWorld.Tuple6;
 
-public class VariantsImpl {
+public class VariantsWorldImpl {
     public static void testImports() {
         expect(Imports.roundtripOption(1.0F) == (byte) 1);
         expect(Imports.roundtripOption(null) == null);

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`import wit_lists.ListsWorld.Tuple2;`
`8`	`8`
`9`		`-public class ListsImpl {`
	`9`	`+public class ListsWorldImpl {`
`10`	`10`	`public static int allocatedBytes() {`
`11`	`11`	`return 0;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`import wit_records.RecordsWorld.Tuple2;`
`6`	`6`	`import wit_records.RecordsWorld.Tuple4;`
`7`	`7`
`8`		`-public class RecordsImpl {`
	`8`	`+public class RecordsWorldImpl {`
`9`	`9`	`public static void testImports() {`
`10`	`10`	`{`
`11`	`11`	`Tuple2<Byte, Short> results = Imports.multipleResults();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package wit_smoke;`
`2`	`2`
`3`		`-public class SmokeImpl {`
	`3`	`+public class SmokeWorldImpl {`
`4`	`4`	`public static void thunk() {`
`5`	`5`	`Imports.thunk();`
`6`	`6`	`}`