Implemented expression conversion, tests now pass

3 files changed, 23 insertions, 12 deletions

diff --git a/src/main/java/sevenUnits/utils/NameSymbol.java b/src/main/java/sevenUnits/utils/NameSymbol.java
index aea274b..255e82f 100644
--- a/src/main/java/sevenUnits/utils/NameSymbol.java
+++ b/src/main/java/sevenUnits/utils/NameSymbol.java
@@ -278,15 +278,6 @@ public final class NameSymbol {
 		return this.primaryName.isEmpty() && this.symbol.isEmpty();
 	}
 	
-	/**
-	 * @return a short version of this NameSymbol (defaults to symbol instead of
-	 *         primary name)
-	 * @since 2022-02-26
-	 */
-	public String shortName() {
-		return this.symbol.or(this::getPrimaryName).orElse("EMPTY");
-	}
-	
 	@Override
 	public String toString() {
 		if (this.isEmpty())
diff --git a/src/main/java/sevenUnits/utils/Nameable.java b/src/main/java/sevenUnits/utils/Nameable.java
index 3cfc05a..e469d04 100644
--- a/src/main/java/sevenUnits/utils/Nameable.java
+++ b/src/main/java/sevenUnits/utils/Nameable.java
@@ -27,6 +27,16 @@ import java.util.Set;
  */
 public interface Nameable {
 	/**
+	 * @return a name for the object - if there's a primary name, it's that,
+	 *         otherwise the symbol, otherwise "Unnamed"
+	 * @since 2022-02-26
+	 */
+	default String getName() {
+		final NameSymbol ns = this.getNameSymbol();
+		return ns.getPrimaryName().or(ns::getSymbol).orElse("Unnamed");
+	}
+	
+	/**
 	 * @return a {@code NameSymbol} that contains this object's primary name,
 	 *         symbol and other names
 	 * @since 2020-09-07
@@ -50,6 +60,16 @@ public interface Nameable {
 	}
 	
 	/**
+	 * @return a short name for the object - if there's a symbol, it's that,
+	 *         otherwise the symbol, otherwise "Unnamed"
+	 * @since 2022-02-26
+	 */
+	default String getShortName() {
+		final NameSymbol ns = this.getNameSymbol();
+		return ns.getSymbol().or(ns::getPrimaryName).orElse("Unnamed");
+	}
+	
+	/**
 	 * @return short symbol representing object
 	 * @since 2020-09-07
 	 */
diff --git a/src/main/java/sevenUnits/utils/ObjectProduct.java b/src/main/java/sevenUnits/utils/ObjectProduct.java
index 926ce10..830f9d7 100644
--- a/src/main/java/sevenUnits/utils/ObjectProduct.java
+++ b/src/main/java/sevenUnits/utils/ObjectProduct.java
@@ -244,9 +244,9 @@ public class ObjectProduct<T> {
 	 */
 	@Override
 	public String toString() {
-		return this.toString(o -> o instanceof Nameable
-				? ((Nameable) o).getNameSymbol().shortName()
-				: o.toString());
+		return this
+				.toString(o -> o instanceof Nameable ? ((Nameable) o).getShortName()
+						: o.toString());
 	}
 	
 	/**