Merge pull request #3401 from maxonfjvipon/fix/#3400/fix-try-object

fix(#3400): fixed `try` object

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

@@ -37,7 +37,7 @@
 # (dataized some-object).as-bytes > cached
 # ```
 #
-# Dataization is a process of retrieving data (bytes) from an object, by taking its \Delta
+# Dataization is a process of retrieving data (bytes) from an object, by taking its Δ
 # attribute.
 # An example of usage:
 #
@@ -50,9 +50,13 @@
 #     5 > five
 #
 # (dataized foo).as-bytes > result # result is 00-00-00-00-00-00-00-05
-# result.as-number > f                # f is 5
+# result.as-number > f             # f is 5
 # ```
 #
 # Here, when `.as-bytes` is taken, the `dataized` dataizes (takes `bytes`) from the object `foo`
 # and returns them. The `.as-bytes` is used to prevent double dataization.
-[target] > dataized /bytes
+[target] > dataized
+  try > @
+    target
+    error ex > [ex]
+    01-

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

@@ -28,8 +28,6 @@
  */
 package EOorg.EOeolang; // NOPMD
 
-import java.util.function.Consumer;
-import java.util.function.Function;
 import org.eolang.AtVoid;
 import org.eolang.Atom;
 import org.eolang.Data;
@@ -60,190 +58,16 @@ public EOtry() {
 
     @Override
     public Phi lambda() {
-        return new PhTry(this.take("main"), this.take("catch"), this.take("finally"));
-    }
-
-    /**
-     * Object that knows how to deal with {@link EOorg.EOeolang.EOerror.ExError}.
-     * @since 0.36.0
-     */
-    private static class PhTry implements Phi {
-        /**
-         * Body object.
-         */
-        private final Phi body;
-
-        /**
-         * Catch object.
-         */
-        private final Phi ctch;
-
-        /**
-         * Finally object.
-         */
-        private final Phi last;
-
-        /**
-         * Put function.
-         */
-        private final Consumer<Consumer<Phi>> func;
-
-        /**
-         * Ctor.
-         * @param body Body object
-         * @param ctch Catch object
-         * @param last Finally object
-         */
-        PhTry(final Phi body, final Phi ctch, final Phi last) {
-            this.body = body;
-            this.ctch = ctch;
-            this.last = last;
-            this.func = new TryExecute(body, ctch);
-        }
-
-        @Override
-        public void attach(final byte[] data) {
-            this.func.accept(phi -> phi.attach(data));
-        }
-
-        @Override
-        public byte[] delta() {
-            return new TryReturn<byte[]>(
-                this.body, this.ctch, this.last
-            ).apply(Data::delta);
-        }
-
-        @Override
-        public Phi copy() {
-            return new PhTry(this.body.copy(), this.ctch.copy(), this.last.copy());
-        }
-
-        @Override
-        public Phi take(final String name) {
-            return new TryReturn<Phi>(
-                this.body, this.ctch, this.last
-            ).apply(phi -> phi.take(name));
-        }
-
-        @Override
-        public boolean put(final int pos, final Phi object) {
-            return new TryReturn<Boolean>(
-                this.body, this.ctch, this.last
-            ).apply(phi -> phi.put(pos, object));
-        }
-
-        @Override
-        public boolean put(final String name, final Phi object) {
-            return new TryReturn<Boolean>(
-                this.body, this.ctch, this.last
-            ).apply(phi -> phi.put(name, object));
-        }
-
-        @Override
-        public String locator() {
-            return new TryReturn<String>(
-                this.body, this.ctch, this.last
-            ).apply(Phi::locator);
-        }
-
-        @Override
-        public String forma() {
-            return new TryReturn<String>(
-                this.body, this.ctch, this.last
-            ).apply(Phi::forma);
-        }
-
-        @Override
-        public String φTerm() {
-            return new TryReturn<String>(
-                this.body, this.ctch, this.last
-            ).apply(Phi::φTerm);
-        }
-    }
-
-    /**
-     * Tries to execute given function and catches {@link EOorg.EOeolang.EOerror.ExError}.
-     * @since 0.36.0
-     */
-    private static class TryExecute implements Consumer<Consumer<Phi>> {
-        /**
-         * Body object.
-         */
-        private final Phi body;
-
-        /**
-         * Catch object.
-         */
-        private final Phi ctch;
-
-        /**
-         * Ctor.
-         * @param main Body object
-         * @param ctch Catch object
-         */
-        TryExecute(final Phi main, final Phi ctch) {
-            this.body = main;
-            this.ctch = ctch;
-        }
-
-        @Override
-        public void accept(final Consumer<Phi> func) {
-            try {
-                func.accept(this.body);
-            } catch (final EOerror.ExError ex) {
-                final Phi caught = this.ctch.copy();
-                caught.put(0, ex.enclosure());
-                func.accept(caught);
-            }
-        }
-    }
-
-    /**
-     * Tries to return value from given function and catches {@link EOorg.EOeolang.EOerror.ExError}.
-     * @param <T> Type of return value.
-     * @since 0.36.0
-     */
-    private static class TryReturn<T> implements Function<Function<Phi, T>, T> {
-        /**
-         * Body object.
-         */
-        private final Phi body;
-
-        /**
-         * Catch object.
-         */
-        private final Phi ctch;
-
-        /**
-         * Finally object.
-         */
-        private final Phi last;
-
-        /**
-         * Ctor.
-         * @param main Body object
-         * @param ctch Catch object
-         * @param last Finally object
-         */
-        TryReturn(final Phi main, final Phi ctch, final Phi last) {
-            this.body = main;
-            this.ctch = ctch;
-            this.last = last;
-        }
-
-        @Override
-        public T apply(final Function<Phi, T> func) {
-            T result;
-            try {
-                result = func.apply(this.body);
-            } catch (final EOerror.ExError ex) {
-                final Phi caught = this.ctch.copy();
-                caught.put(0, ex.enclosure());
-                result = func.apply(caught);
-            } finally {
-                new Dataized(this.last).take();
-            }
-            return result;
+        byte[] result;
+        try {
+            result = new Dataized(this.take("main")).take();
+        } catch (final EOerror.ExError ex) {
+            final Phi caught = this.take("catch").copy();
+            caught.put(0, ex.enclosure());
+            result = new Dataized(caught).take();
+        } finally {
+            new Dataized(this.take("finally")).take();
         }
+        return new Data.ToPhi(result);
     }
 }

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

@@ -222,8 +222,7 @@
         e > [e]
         true
       0
-      length.
-        message
+      message.as-bytes.size
     message
 
 # Test.
@@ -251,9 +250,7 @@
     e > [e]
     true
   eq. > @
-    res.slice
-      0
-      to-check.length
+    res.slice 0 to-check.as-bytes.size
     to-check
 
 # Test.
@@ -348,11 +345,7 @@
     e > [e]
     true
   eq. > @
-    slice.
-      res
-      0
-      length.
-        message
+    res.slice 0 message.as-bytes.size
     message
 
 # Test.

eo-runtime/src/test/java/EOorg/EOeolang/EOnet/EOsocketTest.java

@@ -150,8 +150,8 @@ void refusesConnectionViaPosixSyscall() {
         assert socket >= 0;
         final SockaddrIn addr = new SockaddrIn(
             (short) CStdLib.AF_INET,
-            EOsocketTest.htons(1234),
-            Integer.reverseBytes(CStdLib.INSTANCE.inet_addr(EOsocketTest.LOCALHOST))
+            EOsocketTest.htons(8080),
+            Integer.reverseBytes(CStdLib.INSTANCE.inet_addr("127.0.0.0"))
         );
         final int connected = CStdLib.INSTANCE.connect(socket, addr, addr.size());
         MatcherAssert.assertThat(