feat(objectionary#2555): merge runtime without varargs

maxonfjvipon · Oct 27, 2023 · 8e1cd27 · 8e1cd27
2 parents f855f29 + d3f2096
commit 8e1cd27
Show file tree

Hide file tree

Showing 31 changed files with 281 additions and 1,335 deletions.
diff --git a/eo-maven-plugin/pom.xml b/eo-maven-plugin/pom.xml
@@ -209,7 +209,7 @@ SOFTWARE.
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.14.0</version>
+      <version>2.15.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/eo-runtime/src/main/eo/org/eolang/bool.eo b/eo-runtime/src/main/eo/org/eolang/bool.eo
@@ -43,10 +43,24 @@
       FALSE
 
   # AND
-  [x...] > and /bool
+  [x] > and
+    if. > @
+      ^
+      if.
+        x
+        TRUE
+        FALSE
+      FALSE
 
   # OR
-  [x...] > or /bool
+  [x] > or
+    if. > @
+      ^
+      TRUE
+      if.
+        x
+        TRUE
+        FALSE
 
   # While this is true copies the object
   # with "i" as the position of the cycle. The result

diff --git a/eo-runtime/src/main/eo/org/eolang/bytes.eo b/eo-runtime/src/main/eo/org/eolang/bytes.eo
@@ -50,13 +50,13 @@
   [] > as-float /float
 
   # Calculate bitwise and
-  [b...] > and /bytes
+  [b] > and /bytes
 
   # Calculate bitwise or
-  [b...] > or /bytes
+  [b] > or /bytes
 
   # Calculate bitwise xor
-  [b...] > xor /bytes
+  [b] > xor /bytes
 
   # Calculate bitwise not
   [] > not /bytes

diff --git a/eo-runtime/src/main/eo/org/eolang/float.eo b/eo-runtime/src/main/eo/org/eolang/float.eo
@@ -72,35 +72,21 @@
       ^.gt value
 
   # Multiplication of $ and x
-  [x...] > times /float
+  [x] > times /float
 
   # Sum of $ and x
-  [x...] > plus /float
+  [x] > plus /float
 
   # Negation of $
   [] > neg
     ^.times -1.0 > @
 
   # Difference between $ and x
-  [x...] > minus
-    [acc index terms] > rec-terms
-      if. > @
-        index.eq terms.length
-        acc
-        rec-terms
-          acc.with
-            (terms.at index).neg
-          index.plus 1
-          terms
-    rec-terms > neg-terms
-      *
-      0
-      x
-    ^.plus > @
-      ...neg-terms
+  [x] > minus
+    ^.plus x.neg > @
 
   # Quotient of the division of $ by x
-  [x...] > div /float
+  [x] > div /float
 
   # Converts this to bytes
   [] > as-bytes /bytes
diff --git a/eo-runtime/src/main/eo/org/eolang/int.eo b/eo-runtime/src/main/eo/org/eolang/int.eo
@@ -71,31 +71,17 @@
     ^.times -1 > @
 
   # Add to the current one
-  [x...] > plus /int
+  [x] > plus /int
 
   # Subtract from the current one
-  [x...] > minus
-    [acc index terms] > rec-terms
-      if. > @
-        index.eq terms.length
-        acc
-        rec-terms
-          acc.with
-            (terms.at index).neg
-          index.plus 1
-          terms
-    rec-terms > neg-terms
-      *
-      0
-      x
-    ^.plus > @
-      ...neg-terms
+  [x] > minus
+    ^.plus x.neg > @
 
   # Multiplication this one by another int
-  [x...] > times /int
+  [x] > times /int
 
   # Divide this one by another int
-  [x...] > div /int
+  [x] > div /int
 
   # Converts this to bytes
   [] > as-bytes /bytes
diff --git a/eo-runtime/src/main/eo/org/eolang/nan.eo b/eo-runtime/src/main/eo/org/eolang/nan.eo
@@ -51,21 +51,21 @@
     FALSE > @
 
   # Multiplication of $ and x
-  [x...] > times
+  [x] > times
     ^ > @
 
   # Sum of $ and x
-  [x...] > plus
+  [x] > plus
     ^ > @
 
   # Negation of $
   [] > neg
     ^ > @
 
   # Difference between $ and x
-  [x...] > minus
+  [x] > minus
     ^ > @
 
   # Quotient of the division of $ by x
-  [x...] > div
+  [x] > div
     ^ > @