refactor: Change order yet again

Move `__body` before local methods

Author: volsa

src/codegen/tests/oop_tests/vtable_tests.rs

@@ -187,7 +187,7 @@ fn vtable_codegen_for_function_block_with_interfaces_show_interface_in_type() {
     source_filename = "<internal>"
 
     %Test = type { i32* }
-    %__vtable_Test_type = type { i32*, %__vtable_TestInt_type, %__vtable_TestInt2_type, i32* }
+    %__vtable_Test_type = type { %__vtable_TestInt_type, %__vtable_TestInt2_type, i32*, i32* }
     %__vtable_TestInt_type = type { i32* }
     %__vtable_TestInt2_type = type {}
 
@@ -215,10 +215,10 @@ fn vtable_codegen_for_function_block_with_interfaces_show_interface_in_type() {
       %self = alloca %__vtable_Test_type*, align 8
       store %__vtable_Test_type* %0, %__vtable_Test_type** %self, align 8
       %deref = load %__vtable_Test_type*, %__vtable_Test_type** %self, align 8
-      %__vtable_TestInt_type = getelementptr inbounds %__vtable_Test_type, %__vtable_Test_type* %deref, i32 0, i32 1
+      %__vtable_TestInt_type = getelementptr inbounds %__vtable_Test_type, %__vtable_Test_type* %deref, i32 0, i32 0
       call void @__init___vtable_testint_type(%__vtable_TestInt_type* %__vtable_TestInt_type)
       %deref1 = load %__vtable_Test_type*, %__vtable_Test_type** %self, align 8
-      %__vtable_TestInt2_type = getelementptr inbounds %__vtable_Test_type, %__vtable_Test_type* %deref1, i32 0, i32 2
+      %__vtable_TestInt2_type = getelementptr inbounds %__vtable_Test_type, %__vtable_Test_type* %deref1, i32 0, i32 1
       call void @__init___vtable_testint2_type(%__vtable_TestInt2_type* %__vtable_TestInt2_type)
       ret void
     }

src/vtable.rs

@@ -28,14 +28,14 @@ impl VTableIndexer {
                 variables.push(VTableIndexer::create_vtable_reference(parent));
             }
 
-            if pou.is_function_block() {
-                variables.push(VTableIndexer::create_void_pointer("__body"));
-            }
-
             for interface in pou.get_interfaces() {
                 variables.push(VTableIndexer::create_vtable_reference(interface));
             }
 
+            if pou.is_function_block() {
+                variables.push(VTableIndexer::create_void_pointer("__body"));
+            }
+
             for method in index.get_methods_local(pou.get_name()) {
                 variables.push(VTableIndexer::create_void_pointer(method.get_name()));
             }
@@ -422,15 +422,15 @@ mod tests {
                     ),
                     variables: [
                         Variable {
-                            name: "__body",
+                            name: "__vtable_TestInt_type",
                             data_type: DataTypeReference {
-                                referenced_type: "__VOID_POINTER",
+                                referenced_type: "__vtable_TestInt_type",
                             },
                         },
                         Variable {
-                            name: "__vtable_TestInt_type",
+                            name: "__body",
                             data_type: DataTypeReference {
-                                referenced_type: "__vtable_TestInt_type",
+                                referenced_type: "__VOID_POINTER",
                             },
                         },
                         Variable {
@@ -459,15 +459,15 @@ mod tests {
                             },
                         },
                         Variable {
-                            name: "__body",
+                            name: "__vtable_TestInt2_type",
                             data_type: DataTypeReference {
-                                referenced_type: "__VOID_POINTER",
+                                referenced_type: "__vtable_TestInt2_type",
                             },
                         },
                         Variable {
-                            name: "__vtable_TestInt2_type",
+                            name: "__body",
                             data_type: DataTypeReference {
-                                referenced_type: "__vtable_TestInt2_type",
+                                referenced_type: "__VOID_POINTER",
                             },
                         },
                     ],
@@ -544,15 +544,15 @@ mod tests {
                     ),
                     variables: [
                         Variable {
-                            name: "__body",
+                            name: "__vtable_TestInt_type",
                             data_type: DataTypeReference {
-                                referenced_type: "__VOID_POINTER",
+                                referenced_type: "__vtable_TestInt_type",
                             },
                         },
                         Variable {
-                            name: "__vtable_TestInt_type",
+                            name: "__body",
                             data_type: DataTypeReference {
-                                referenced_type: "__vtable_TestInt_type",
+                                referenced_type: "__VOID_POINTER",
                             },
                         },
                         Variable {
@@ -581,15 +581,15 @@ mod tests {
                             },
                         },
                         Variable {
-                            name: "__body",
+                            name: "__vtable_TestInt2_type",
                             data_type: DataTypeReference {
-                                referenced_type: "__VOID_POINTER",
+                                referenced_type: "__vtable_TestInt2_type",
                             },
                         },
                         Variable {
-                            name: "__vtable_TestInt2_type",
+                            name: "__body",
                             data_type: DataTypeReference {
-                                referenced_type: "__vtable_TestInt2_type",
+                                referenced_type: "__VOID_POINTER",
                             },
                         },
                         Variable {