better

jdescriptor/src/lib.rs

@@ -42,7 +42,7 @@ pub fn default_value(type_descriptor: &TypeDescriptor) -> Vec<i32> {
         Double => todo!(),
         Void => panic!("field can't be a void type"),
         Array(_, _) => vec![0],
-        Object(_) => todo!(),
+        Object(_) => vec![0],
     }
 }
 
@@ -52,7 +52,7 @@ pub fn get_length(type_descriptor: &TypeDescriptor) -> usize {
         Long | Double => 2,
         Void => panic!("field can't be a void type"),
         Array(_, _) => 1,
-        Object(_) => todo!(),
+        Object(_) => 1,
     }
 }
 

src/main.rs

@@ -46,8 +46,5 @@ fn main() {
         }
     };
 
-    println!(
-        "\nresult={:?}",
-        result.map_or_else(|| vec![], |v| v)
-    );
+    println!("\nresult={:?}", result.map_or_else(|| vec![], |v| v));
 }

tests/integration_test.rs

@@ -24,7 +24,7 @@ fn should_do_adding_with_negative_longs() {
         vec!["tests/test_data/AdderNegativeLong.class"],
         "tests/test_data/std",
     )
-        .unwrap();
+    .unwrap();
     let last_frame_value = vm.run("AdderNegativeLong").unwrap();
     assert_eq!(-1990000000000000, get_long(last_frame_value))
 }
@@ -66,7 +66,7 @@ fn should_write_read_instance_fields_with_longs() {
         ],
         "tests/test_data/std",
     )
-        .unwrap();
+    .unwrap();
     let last_frame_value = vm.run("InstanceFieldsUserLong").unwrap();
     assert_eq!(4_380_866_642_760, get_long(last_frame_value))
 }
@@ -102,7 +102,7 @@ fn should_do_extreme_stack_operations_with_longs() {
         vec!["tests/test_data/ExtremeStackTestLong.class"],
         "tests/test_data/std",
     )
-        .unwrap();
+    .unwrap();
     let last_frame_value = vm.run("ExtremeStackTestLong").unwrap();
     assert_eq!(454, get_long(last_frame_value))
 }
@@ -138,7 +138,11 @@ fn should_do_arrays() {
 
 #[test]
 fn should_do_arrays_with_longs() {
-    let vm = VM::new(vec!["tests/test_data/ArrayLong.class"], "tests/test_data/std").unwrap();
+    let vm = VM::new(
+        vec!["tests/test_data/ArrayLong.class"],
+        "tests/test_data/std",
+    )
+    .unwrap();
     let last_frame_value = vm.run("ArrayLong").unwrap();
     assert_eq!(233646220932000, get_long(last_frame_value))
 }
@@ -169,6 +173,51 @@ fn should_do_class_static_initialization_multiple_classes() {
     assert_eq!(350, get_int(last_frame_value))
 }
 
+#[test]
+fn should_do_class_static_initialization_within_one_class() {
+    let vm = VM::new(
+        vec!["tests/test_data/StaticInitializationWithinOneClass.class"],
+        "tests/test_data/std",
+    )
+    .unwrap();
+    let last_frame_value = vm.run("StaticInitializationWithinOneClass").unwrap();
+    assert_eq!(100, get_int(last_frame_value))
+}
+
+#[test]
+fn should_do_class_static_initialization_advanced() {
+    let vm = VM::new(
+        vec![
+            "tests/test_data/StaticInitializationAdvanced.class",
+            "tests/test_data/ClassA.class",
+            "tests/test_data/ClassB.class",
+            "tests/test_data/ClassC.class",
+            "tests/test_data/ClassD.class",
+            "tests/test_data/ClassE.class",
+            "tests/test_data/Helper.class",
+        ],
+        "tests/test_data/std",
+    )
+    .unwrap();
+    let last_frame_value = vm.run("StaticInitializationAdvanced").unwrap();
+    assert_eq!(826, get_int(last_frame_value))
+}
+
+#[test]
+fn should_do_class_static_initialization_circular() {
+    let vm = VM::new(
+        vec![
+            "tests/test_data/StaticInitializationCircular.class",
+            "tests/test_data/ClassACircular.class",
+            "tests/test_data/ClassBCircular.class",
+        ],
+        "tests/test_data/std",
+    )
+    .unwrap();
+    let last_frame_value = vm.run("StaticInitializationCircular").unwrap();
+    assert_eq!(700, get_int(last_frame_value))
+}
+
 fn get_int(locals: Option<Vec<i32>>) -> i32 {
     *locals.unwrap().last().unwrap()
 }

tests/test_data/StaticInitializationAdvanced.java

@@ -0,0 +1,56 @@
+public class StaticInitializationAdvanced {
+    public static void main(String[] args) {
+        int classCWithHelperNonStaticGetter = ClassC.staticField;
+
+        int classDWithHelperStaticGetter = ClassD.staticField;
+
+        ClassC.staticField = 600;
+        int classCIsModified = ClassC.staticField;
+
+        int classEAsSumOfCAndD = ClassE.staticField;
+
+        int result = classCWithHelperNonStaticGetter + classDWithHelperStaticGetter * classCIsModified / classEAsSumOfCAndD;
+    }
+}
+
+class ClassC {
+    static Helper helper;
+    static int staticField;
+
+    static {
+        helper = new Helper(500);
+        staticField = 150 + helper.calculateNonStaticFieldValue();
+    }
+}
+
+class ClassD {
+    static int staticField;
+
+    static {
+        staticField = Helper.calculateStaticFieldValue();
+    }
+}
+
+class ClassE {
+    static int staticField;
+
+    static {
+        staticField = ClassC.staticField + ClassD.staticField;
+    }
+}
+
+class Helper {
+    private final int value;
+
+    Helper(int value) {
+        this.value = value;
+    }
+
+    static int calculateStaticFieldValue() {
+        return 250;
+    }
+
+    public int calculateNonStaticFieldValue() {
+        return value;
+    }
+}

tests/test_data/StaticInitializationCircular.java

@@ -0,0 +1,25 @@
+
+
+public class StaticInitializationCircular {
+    public static void main(String[] args) {
+        int classA = ClassACircular.staticField;
+        int classB = ClassBCircular.staticField;
+        int result = classA + classB;
+    }
+}
+
+class ClassACircular {
+    static int staticField;
+
+    static {
+        staticField = 100 + ClassBCircular.staticField;
+    }
+}
+
+class ClassBCircular {
+    static int staticField;
+
+    static {
+        staticField = 300 + ClassACircular.staticField;
+    }
+}

tests/test_data/StaticInitializationWithinOneClass.java

@@ -0,0 +1,15 @@
+
+
+public class StaticInitializationWithinOneClass {
+    static int staticField;
+
+    static {
+        int xxx = 1337;
+        staticField = xxx;
+    }
+
+    public static void main(String[] args) {
+        staticField = 100;
+        int result = staticField;
+    }
+}