Merge branch '__rultor'

eo-runtime/src/main/eo/org/eolang/rust.eo

@@ -26,4 +26,4 @@
 +rt jvm org.eolang:eo-runtime:0.0.0
 +version 0.0.0
 
-[code params] > rust /int
+[code params] > rust /?

eo-runtime/src/main/java/EOorg/EOeolang/EOrust.java

@@ -46,6 +46,7 @@
 import org.eolang.AtComposite;
 import org.eolang.AtFree;
 import org.eolang.Data;
+import org.eolang.Dataized;
 import org.eolang.ExFailure;
 import org.eolang.PhDefault;
 import org.eolang.Phi;
@@ -144,8 +145,17 @@ public EOrust(final Phi sigma) {
                             byte[].class
                         );
                     }
+                    final Phi portal = new Dataized(
+                        rho
+                        .attr("params").get()
+                        .attr("Δ").get()
+                    ).take(Phi[].class)[0];
                     return EOrust.translate(
-                        (byte[]) method.invoke(null, new Universe(rho))
+                        (byte[]) method.invoke(
+                            null, new Universe(
+                                portal
+                            )
+                        )
                     );
                 }
             )

eo-runtime/src/main/rust/eo_env/src/eo_env.rs

@@ -24,7 +24,7 @@
 
 pub mod eo_enum;
 use jni::JNIEnv;
-use jni::objects::{JClass, JObject, JValue};
+use jni::objects::{JClass, JObject, JValue, JByteArray};
 
 pub struct EOEnv<'local> {
     pub java_env: JNIEnv<'local>,
@@ -98,13 +98,22 @@ impl<'local> EOEnv<'_> {
         }
     }
 
-    /*
-     * @todo #2237:60min Implement "dataize" method. It must
-     *  call java dataizing method and get byte array from it.
-     *  Then it have to return byte array as a result of dataization.
-     */
-    #[allow(unused_variables)]
-    pub fn dataize(&mut self, v: u32) -> Option<&[u32]> {
-        Some(&[0x0])
+    pub fn dataize(&mut self, v: u32) -> Option<Vec<i8>> {
+        let java_array = JByteArray::from(
+            self.java_env
+            .call_method(
+                &self.java_obj,
+                "dataize",
+                "(I)[B",
+                &[
+                    JValue::Int(v as i32),
+                ]
+            ).unwrap().l().unwrap());
+        let size = self.java_env.get_array_length(&java_array).unwrap();
+        let mut bytes = vec![0; size.try_into().unwrap()];
+        if self.java_env.get_byte_array_region(&java_array, 0, &mut bytes[0..]).is_err() {
+            return None;
+        }
+        return Some(bytes);
     }
 }

eo-runtime/src/test/eo/org/eolang/rust-tests.eo

@@ -39,6 +39,7 @@
     }
     """
     *
+      []
   assert-that > @
     r
     $.equal-to
@@ -57,6 +58,7 @@
     }
     """
     *
+      []
   assert-that > @
     r
     $.equal-to
@@ -74,6 +76,7 @@
     }
     """
     *
+      []
   assert-that > @
     r
     $.equal-to
@@ -91,6 +94,7 @@
     }
     """
     *
+      []
   assert-that > @
     r
     $.equal-to
@@ -109,6 +113,7 @@
     }
     """
     *
+      []
   assert-that > @
     r
     $.not
@@ -127,6 +132,7 @@
     }
     """
     *
+      []
   assert-that > @
     r
     $.not
@@ -149,6 +155,7 @@
     }
     """
     *
+      []
   assert-that > @
     insert
     $.not
@@ -169,6 +176,7 @@
     }
     """
     *
+      []
   assert-that > @
     copy
     $.not
@@ -183,14 +191,49 @@
     use eo_env::eo_enum::EO;
     use eo_env::eo_enum::EO::{EOInt};
     pub fn foo(env: &mut EOEnv) -> EO {
-        let v = env.find("^.a") as u32;
-        let _bytes = env.dataize(v).unwrap();
-        EOInt(v as i64)
+      let v = env.find("^.a") as u32;
+      let _bytes = env.dataize(v).unwrap();
+      EOInt(v as i64)
     }
     """
     *
+      []
+      3
   assert-that > @
     dataized
     $.not
       $.less-than
         0
+
+[] > rust-plus
+  5 > a
+  10 > b
+  QQ.rust > plus
+    """
+    use eo_env::EOEnv;
+    use eo_env::eo_enum::EO;
+    use eo_env::eo_enum::EO::{EOInt};
+    use byteorder::{BigEndian, ReadBytesExt};
+
+    pub fn foo(env: &mut EOEnv) -> EO {
+      let a = env.find("^.a") as u32;
+      let b = env.find("^.b") as u32;
+      let bytes_a = env.dataize(a).unwrap();
+      let mut arr_a = unsafe { &*(&bytes_a[0..] as *const _  as *const [u8]) };
+
+      let bytes_b = env.dataize(b).unwrap();
+      let mut arr_b = unsafe { &*(&bytes_b[0..] as *const _  as *const [u8]) };
+
+      let a = arr_a.read_i64::<BigEndian>().unwrap();
+      let b = arr_b.read_i64::<BigEndian>().unwrap();
+      println!("sum 5 + 10 = {}", a + b);
+
+      EOInt(a + b)
+    }
+    """
+    *
+      []
+      "byteorder:1.4.3"
+  assert-that > @
+    plus
+    $.equal-to 15