fix PMD errors

| refactor: use Expect.Number
objectionary · Jan 19, 2025 · d7f02b1 · d7f02b1
1 parent a137f69
commit d7f02b1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 32 deletions.
diff --git a/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOdiv.java b/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOdiv.java
@@ -57,14 +57,8 @@ public final class EOnumber$EOdiv extends PhDefault implements Atom {
 
     @Override
     public Phi lambda() {
-        final Double left = Expect.at(this, Attr.RHO)
-            .that(phi -> new Dataized(phi).asNumber())
-            .otherwise("must be a number")
-            .it();
-        final Double right = Expect.at(this, "x")
-            .that(phi -> new Dataized(phi).asNumber())
-            .otherwise("must be a number")
-            .it();
+        final Double left = new Expect.Number(Expect.at(this, Attr.RHO)).it();
+        final Double right = new Expect.Number(Expect.at(this, "x")).it();
         return new Data.ToPhi(left / right);
     }
 }
diff --git a/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOgt.java b/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOgt.java
@@ -57,14 +57,8 @@ public final class EOnumber$EOgt extends PhDefault implements Atom {
 
     @Override
     public Phi lambda() {
-        final Double left = Expect.at(this, Attr.RHO)
-            .that(phi -> new Dataized(phi).asNumber())
-            .otherwise("must be a number")
-            .it();
-        final Double right = Expect.at(this, "x")
-            .that(phi -> new Dataized(phi).asNumber())
-            .otherwise("must be a number")
-            .it();
+        final Double left = new Expect.Number(Expect.at(this, Attr.RHO)).it();
+        final Double right = new Expect.Number(Expect.at(this, "x")).it();
         return new Data.ToPhi(left > right);
     }
 }
diff --git a/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOplus.java b/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOplus.java
@@ -57,14 +57,8 @@ public final class EOnumber$EOplus extends PhDefault implements Atom {
 
     @Override
     public Phi lambda() {
-        final Double left = Expect.at(this, Attr.RHO)
-            .that(phi -> new Dataized(phi).asNumber())
-            .otherwise("must be a number")
-            .it();
-        final Double right = Expect.at(this, "x")
-            .that(phi -> new Dataized(phi).asNumber())
-            .otherwise("must be a number")
-            .it();
+        final Double left = new Expect.Number(Expect.at(this, Attr.RHO)).it();
+        final Double right = new Expect.Number(Expect.at(this, "x")).it();
         return new Data.ToPhi(Double.sum(left, right));
     }
 }
diff --git a/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOtimes.java b/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOtimes.java
@@ -57,14 +57,8 @@ public final class EOnumber$EOtimes extends PhDefault implements Atom {
 
     @Override
     public Phi lambda() {
-        final Double left = Expect.at(this, Attr.RHO)
-            .that(phi -> new Dataized(phi).asNumber())
-            .otherwise("must be a number")
-            .it();
-        final Double right = Expect.at(this, "x")
-            .that(phi -> new Dataized(phi).asNumber())
-            .otherwise("must be a number")
-            .it();
+        final Double left = new Expect.Number(Expect.at(this, Attr.RHO)).it();
+        final Double right = new Expect.Number(Expect.at(this, "x")).it();
         return new Data.ToPhi(left * right);
     }
 }