Merge branch '__rultor'

eo-maven-plugin/src/main/resources/org/eolang/maven/pre/to-java.xsl

@@ -206,7 +206,6 @@ SOFTWARE.
  <xsl:text>super(sigma);</xsl:text>
  </xsl:otherwise>
  </xsl:choose>
- <xsl:variable name="type" select="concat(//meta[head='package']/tail, '.', @name)"/>
  <xsl:apply-templates select="attr">
  <xsl:with-param name="class" select="."/>
  <xsl:with-param name="indent">

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

@@ -101,6 +101,11 @@ private static class PhTry implements Phi {
  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[]>(
@@ -120,13 +125,6 @@ public Phi take(final String name) {
  ).apply(phi -> phi.take(name));
  }
 
- @Override
- public Phi take(final String name, final Phi rho) {
- return new TryReturn<Phi>(
- this.body, this.ctch, this.last
- ).apply(phi -> phi.take(name, rho));
- }
-
  @Override
  public void put(final int pos, final Phi object) {
  this.func.accept(phi -> phi.put(pos, object));

eo-runtime/src/main/java/org/eolang/Bytes.java

@@ -93,6 +93,12 @@ public interface Bytes {
  */
  <T extends Number> T asNumber(Class<T> type);
 
+ /**
+ * Convert to string.
+ * @return String.
+ */
+ String asString();
+
  /**
  * Get bytes itself.
  * @return Bytes.

eo-runtime/src/main/java/org/eolang/BytesOf.java

@@ -214,6 +214,21 @@ public <T extends Number> T asNumber(final Class<T> type) {
  return type.cast(res);
  }
 
+ @Override
+ public String asString() {
+ final StringBuilder out = new StringBuilder(0);
+ for (final byte bte : this.data) {
+ if (out.length() > 0) {
+ out.append('-');
+ }
+ out.append(String.format("%02X", bte));
+ }
+ if (this.data.length == 0) {
+ out.append("--");
+ }
+ return out.toString();
+ }
+
  @Override
  public byte[] take() {
  return Arrays.copyOf(this.data, this.data.length);

eo-runtime/src/main/java/org/eolang/Data.java

@@ -35,6 +35,18 @@
  */
 @Versionized
 public interface Data {
+ /**
+ * Attach data to the object.
+ * @param data Data.
+ * @todo #2931:60min Change the data storage architecture. Current implementation allows the
+ * presence of two methods for data manipulations: {@link Data#attach(byte[])} to set data and
+ * {@link Data#delta()} to get data; which does not seem to be object oriented. It also
+ * requires every object to have reserved place for possible injected data. In our case, every
+ * {@link PhDefault} has {@link PhDefault#data} variable. It would be much better to have this
+ * data only inside some decorator. The main difficulty here is - child attributes of
+ * decorated object should know that their \rho is decorated and contains data.
+ */
+ void attach(byte[] data);
 
  /**
  * Take the data.
@@ -87,11 +99,6 @@ public Phi take(final String name) {
  return this.object.take(name);
  }
 
- @Override
- public Phi take(final String name, final Phi rho) {
- return this.object.take(name, rho);
- }
-
  @Override
  public void put(final int pos, final Phi obj) {
  this.object.put(pos, obj);
@@ -122,6 +129,11 @@ public String toString() {
  return this.object.toString();
  }
 
+ @Override
+ public void attach(final byte[] data) {
+ this.object.attach(data);
+ }
+
  @Override
  public byte[] delta() {
  return this.object.delta();
@@ -171,15 +183,14 @@ private static Phi toPhi(final Object obj) {
  )
  );
  }
- final Phi object;
  if (delta) {
- object = new PhData(phi, bytes);
+ phi.attach(bytes);
  } else {
- final Phi bts = new PhData(eolang.take("bytes").copy(), bytes);
+ final Phi bts = eolang.take("bytes").copy();
+ bts.attach(bytes);
  phi.put(0, bts);
- object = phi;
  }
- return object;
+ return phi;
  }
 
  /**

eo-runtime/src/main/java/org/eolang/Dataized.java

@@ -105,7 +105,7 @@ public byte[] take() {
  String.join("", Collections.nCopies(before, "·")),
  this.phi.locator(),
  this.phi.toString().replaceAll("[\n\t]", ""),
- new PhData(Phi.Φ, data).bytes().replaceAll("[\n\t]", "")
+ new BytesOf(data).asString().replaceAll("[\n\t]", "")
  )
  );
  }

eo-runtime/src/main/java/org/eolang/PhConst.java

@@ -96,11 +96,6 @@ public Phi take(final String name) {
  return this.primitive().take(name);
  }
 
- @Override
- public Phi take(final String name, final Phi rho) {
- return this.primitive().take(name, rho);
- }
-
  @Override
  public void put(final int pos, final Phi object) {
  this.primitive().put(pos, object);
@@ -121,6 +116,11 @@ public String forma() {
  return this.wrapped.forma();
  }
 
+ @Override
+ public void attach(final byte[] data) {
+ this.primitive().attach(data);
+ }
+
  @Override
  public byte[] delta() {
  return this.primitive().delta();

eo-runtime/src/main/java/org/eolang/PhData.java

@@ -25,108 +25,34 @@
 package org.eolang;
 
 /**
- * Object with data.
+ * Object with attached data.
  * @since 0.36.0
  */
-public final class PhData implements Phi {
-
- /**
- * The original object.
- */
- private final Phi object;
-
- /**
- * Data.
- */
- private final byte[] data;
+public final class PhData extends PhOnce {
 
  /**
  * Ctor.
- * @param obj Original object
- * @param data Data
+ * @param phi Object
+ * @param bytes Data to attach
  */
- public PhData(final Phi obj, final byte[] data) {
- this.object = obj;
- this.data = data;
- }
-
- @Override
- public Phi copy() {
- return new PhData(this.object.copy(), this.data);
- }
-
- @Override
- public Phi take(final String name) {
- return this.take(name, this);
- }
-
- @Override
- public Phi take(final String name, final Phi rho) {
- return this.object.take(name, rho);
- }
-
- @Override
- public void put(final int pos, final Phi obj) {
- this.object.put(pos, obj);
- }
-
- @Override
- public void put(final String name, final Phi obj) {
- this.object.put(name, obj);
- }
-
- @Override
- public String locator() {
- return this.object.locator();
- }
-
- @Override
- public String forma() {
- return this.object.forma();
- }
-
- @Override
- public String φTerm() {
- return this.object.φTerm()
- .replaceFirst(
- "⟦\n",
- String.format(
- "⟦\n\t%s ↦ %s,\n",
- Attr.DELTA,
- this.bytes()
- )
- );
- }
-
- @Override
- public byte[] delta() {
- return this.data;
- }
-
- @Override
- public String toString() {
- return String.format(
- "%s=%s",
- this.object.toString(),
- this.bytes()
+ public PhData(final Phi phi, final byte[] bytes) {
+ super(
+ () -> {
+ phi.attach(bytes);
+ return phi;
+ },
+ () -> String.format(
+ "%s[%s=%s]",
+ phi,
+ Attr.DELTA,
+ new BytesOf(bytes).asString()
+ ),
+ () -> String.format(
+ "%s(%s ↦ %s)",
+ phi.φTerm(),
+ Attr.DELTA,
+ new BytesOf(bytes).asString()
+ )
  );
  }
-
- /**
- * Converts byte array to string.
- * @return Byte array as string
- */
- public String bytes() {
- final StringBuilder out = new StringBuilder(0);
- for (final byte bte : this.data) {
- if (out.length() > 0) {
- out.append('-');
- }
- out.append(String.format("%02X", bte));
- }
- if (this.data.length == 0) {
- out.append("--");
- }
- return out.toString();
- }
 }