better name

tests/attributes.rs

@@ -161,7 +161,7 @@ pub fn write() {
             let console = BaseType::class(ctx.console).into();
             let test_attr_t: MethodType = BaseType::class(test_attr).into();
 
-            common::WriteTestResult::WithVariables {
+            common::MainMethod::WithVariables {
                 locals: vec![
                     LocalVariable::new(ctype! { object[] }),
                     LocalVariable::new(ctype! { int }),
@@ -170,7 +170,7 @@ pub fn write() {
                     LocalVariable::new(ctype! { object[] }),
                     LocalVariable::new(ctype! { int }),
                 ],
-                main_body: asm! {
+                body: asm! {
                     load_token_type BaseType::class(ctx.class);
                     call get_type;
                     LoadTokenType test_attr_t;

tests/common/mod.rs

@@ -64,22 +64,22 @@ pub fn read_fixture(name: &str, source: &str, test: impl FnOnce(Resolution)) ->
     Ok(())
 }
 
-pub enum WriteTestResult {
-    MainBody(Vec<Instruction>),
+pub enum MainMethod {
+    Body(Vec<Instruction>),
     WithVariables {
-        main_body: Vec<Instruction>,
+        body: Vec<Instruction>,
         locals: Vec<LocalVariable>
     },
     WithExceptions {
-        main_body: Vec<Instruction>,
+        body: Vec<Instruction>,
         locals: Vec<LocalVariable>,
         exceptions: Vec<body::Exception>
     }
 }
 
 pub fn write_fixture(
     name: &str,
-    test: impl FnOnce(&mut WriteContext) -> WriteTestResult,
+    test: impl FnOnce(&mut WriteContext) -> MainMethod,
     expect: &[u8],
 ) -> Result<(), Box<dyn std::error::Error>> {
     let dll_name = format!("{}.dll", name);
@@ -110,9 +110,9 @@ pub fn write_fixture(
     };
 
     let (exceptions, vars, ins) = match test(&mut ctx) {
-        WriteTestResult::MainBody(ins) => (vec![], vec![], ins),
-        WriteTestResult::WithVariables { main_body, locals } => (vec![], locals, main_body),
-        WriteTestResult::WithExceptions { main_body, locals, exceptions } => (exceptions, locals, main_body),
+        MainMethod::Body(ins) => (vec![], vec![], ins),
+        MainMethod::WithVariables { body: main_body, locals } => (vec![], locals, main_body),
+        MainMethod::WithExceptions { body: main_body, locals, exceptions } => (exceptions, locals, main_body),
     };
 
     let main = ctx.resolution.push_method(

tests/events.rs

@@ -162,12 +162,12 @@ pub fn write() {
             let add = ctx.resolution.event_add_index(event);
             let remove = ctx.resolution.event_remove_index(event);
 
-            common::WriteTestResult::WithVariables {
+            common::MainMethod::WithVariables {
                 locals: vec![
                     LocalVariable::new(BaseType::class(ctx.class).into()),
                     LocalVariable::new(handler_method),
                 ],
-                main_body: asm! {
+                body: asm! {
                     // init obj
                     new_object ctx.default_ctor;
                     StoreLocal 0;

tests/exceptions.rs

@@ -169,7 +169,7 @@ pub fn write() {
                 Return;
             };
 
-            common::WriteTestResult::WithExceptions {
+            common::MainMethod::WithExceptions {
                 exceptions: vec![
                     body::Exception {
                         kind: body::ExceptionKind::Filter { offset: filter_start },
@@ -187,7 +187,7 @@ pub fn write() {
                     }
                 ],
                 locals: vec![LocalVariable::new(ctype! { object })],
-                main_body: instructions
+                body: instructions
             }
         },
         b"before throw\nerror code 1\nfinally\n",

tests/fields_props.rs

@@ -143,9 +143,9 @@ pub fn write() {
                 ),
             );
 
-            common::WriteTestResult::WithVariables {
+            common::MainMethod::WithVariables {
                 locals: vec![LocalVariable::new(BaseType::class(ctx.class).into())],
-                main_body: asm! {
+                body: asm! {
                     // init static
                     LoadConstantInt32 -1;
                     call static_setter;

tests/generics.rs

@@ -173,9 +173,9 @@ pub fn write() {
                 .resolution
                 .push_method_reference(method_ref! { static void #console_type::WriteLine(string, object) });
 
-            common::WriteTestResult::WithVariables {
+            common::MainMethod::WithVariables {
                 locals: vec![LocalVariable::new(enum_class)],
-                main_body: asm! {
+                body: asm! {
                     LoadConstantInt32 5;
                     call init_class;
                     call_virtual get_enum;
@@ -258,12 +258,12 @@ pub fn write_generic_class() {
             let string_container: MethodType =
                 BaseType::class(TypeSource::generic(container, vec![ctype! { string }])).into();
 
-            common::WriteTestResult::WithVariables {
+            common::MainMethod::WithVariables {
                 locals: vec![
                     LocalVariable::new(int_container.clone()),
                     LocalVariable::new(string_container.clone()),
                 ],
-                main_body: asm! {
+                body: asm! {
                     new_object ctx.resolution.push_method_reference(method_ref! { void @int_container::.ctor() });
                     StoreLocal 0;
                     new_object ctx.resolution.push_method_reference(method_ref! { void @string_container::.ctor() });

tests/hello_world.rs

@@ -40,7 +40,7 @@ pub fn write() {
                 .resolution
                 .push_method_reference(method_ref! { static void #console_type::WriteLine(string) });
 
-            common::WriteTestResult::MainBody(
+            common::MainMethod::Body(
                 asm! {
                     load_string "Hello, world!";
                     call write_line;

tests/oop.rs

@@ -156,9 +156,9 @@ pub fn write() {
 
             let console: MethodType = BaseType::class(ctx.console).into();
 
-            common::WriteTestResult::WithVariables {
+            common::MainMethod::WithVariables {
                 locals: vec![LocalVariable::new(array_list.clone()), LocalVariable::new(enumerator.clone())],
-                main_body: asm! {
+                body: asm! {
                     new_object ctx.resolution.push_method_reference(method_ref! { void @array_list::.ctor() });
                     StoreLocal 0;
                     LoadLocal 0;

tests/pinvoke.rs

@@ -42,7 +42,7 @@ pub fn write() {
 
             let puts = libc_method("puts", msig! { static void (string) });
 
-            common::WriteTestResult::MainBody(
+            common::MainMethod::Body(
                 asm! {
                     load_string "hello from libc";
                     call puts;

tests/resources.rs

@@ -62,7 +62,7 @@ pub fn write() {
                     .push_type_reference(type_ref! { System.Reflection.Assembly in #mscorlib })
             ).into();
 
-            common::WriteTestResult::MainBody(
+            common::MainMethod::Body(
                 asm! {
                     load_string "strings";
                     load_token_type BaseType::class(ctx.class);