Merge pull request #3289 from maxonfjvipon/feat/#3283/int-float-to-nu…

…mber feat(#3283): replaced `float` and `int` with `number`
objectionary · Jul 26, 2024 · 28917b6 · 28917b6
2 parents 9a9b382 + d3e1cb6
commit 28917b6
Show file tree

Hide file tree

Showing 145 changed files with 750 additions and 2,476 deletions.
diff --git a/.codacy.yml b/.codacy.yml
@@ -25,5 +25,9 @@
 #  package name contains capital letter and such names are conventional.
 ---
 exclude_paths:
-  - "eo-runtime/src/main/java/EOorg/EOeolang/EOtxt/EOregex$EOpattern$EOmatch$EOmatched_from_index.java"
-  - "eo-runtime/src/main/java/EOorg/EOeolang/EOtxt/EOregex$EOcompiled.java"
+  - "eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOtimes.java"
+  - "eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOdiv.java"
+  - "eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOplus.java"
+  - "eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOgt.java"
+  - "eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOfloor.java"
+  - "eo-runtime/src/test/java/EOorg/EOeolang/EOnumberTest.java"
diff --git a/eo-maven-plugin/src/main/resources/org/eolang/maven/pre/to-java.xsl b/eo-maven-plugin/src/main/resources/org/eolang/maven/pre/to-java.xsl
@@ -531,7 +531,7 @@ SOFTWARE.
     <xsl:value-of select="eo:tabs($indent)"/>
     <xsl:text>Boolean obj = new Dataized(new </xsl:text>
     <xsl:value-of select="eo:class-name(@name, eo:suffix(@line, @pos))"/>
-    <xsl:text>()).take(Boolean.class);</xsl:text>
+    <xsl:text>()).asBool();</xsl:text>
     <xsl:value-of select="eo:eol(2 + $indent)"/>
     <xsl:text>Assertions.assertTrue(obj);</xsl:text>
   </xsl:template>

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/BinarizeParseTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/BinarizeParseTest.java
@@ -84,8 +84,8 @@ void parsesSimpleEoProgram(@TempDir final Path temp) throws Exception {
                 "pub fn foo(_portal: &Portal) -> Option<EO> {",
                 "  let mut rng = rand::thread_rng();",
                 "  print!(\"Hello world\");",
-                "  let i = rng.gen::<i64>();",
-                "  Some(EOInt(i))",
+                "  let i = rng.gen::<f64>();",
+                "  Some(EONumber(i))",
                 "}"
             )
         );
@@ -130,7 +130,7 @@ void binarizesTwiceRustProgram(@TempDir final Path temp) throws Exception {
             new TextOf(res.get(one)).asString(),
             Matchers.stringContainsInOrder(
                 "use eo::eo_enum::EO;",
-                "use eo::eo_enum::EO::{EOInt};",
+                "use eo::eo_enum::EO::{EONumber};",
                 "pub fn foo(_portal: &Portal) -> Option<EO> {",
                 "println!(\"{}\", x);"
             )
@@ -140,7 +140,7 @@ void binarizesTwiceRustProgram(@TempDir final Path temp) throws Exception {
             new TextOf(res.get(two)).asString(),
             Matchers.stringContainsInOrder(
                 "use eo::eo_enum::EO;",
-                "use eo::eo_enum::EO::{EOInt};",
+                "use eo::eo_enum::EO::{EONumber};",
                 "pub fn foo(_portal: &Portal) -> Option<EO> {",
                 "print!(\"Hello 大 2\");"
             )

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/DiscoverMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/DiscoverMojoTest.java
@@ -72,7 +72,7 @@ final class DiscoverMojoTest {
 
     @ParameterizedTest
     @CsvSource({
-        "org/eolang/maven/mess.eo, 8",
+        "org/eolang/maven/mess.eo, 7",
         "org/eolang/maven/sum.eo, 0",
         "org/eolang/maven/withwarning.eo, 1"
     })

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java
@@ -97,11 +97,7 @@ void pullsFromProbes(@TempDir final Path temp) throws IOException {
                 "# This is the default 64+ symbols comment in front of named abstract object.",
                 "[] > main",
                 "  QQ.io.stdout > @",
-                "    QQ.txt.sprintf",
-                "      \"I am %d years old\"",
-                "      plus.",
-                "        1337",
-                "        228"
+                "    \"I am 18 years old\""
             )
             .with(
                 "objectionaries",

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/binarize/simple-rust.eo b/eo-maven-plugin/src/test/resources/org/eolang/maven/binarize/simple-rust.eo
@@ -30,13 +30,13 @@
     use rand::Rng;
     use eo::Portal;
     use eo::eo_enum::EO;
-    use eo::eo_enum::EO::{EOInt};
+    use eo::eo_enum::EO::{EONumber};
 
     pub fn foo(_portal: &Portal) -> Option<EO> {
       let mut rng = rand::thread_rng();
       print!("Hello world");
-      let i = rng.gen::<i64>();
-      Some(EOInt(i))
+      let i = rng.gen::<f64>();
+      Some(EONumber(i))
     }
     """
     *

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/binarize/twice-rust.eo b/eo-maven-plugin/src/test/resources/org/eolang/maven/binarize/twice-rust.eo
@@ -29,12 +29,12 @@
     """
     use eo::Portal;
     use eo::eo_enum::EO;
-    use eo::eo_enum::EO::{EOInt};
+    use eo::eo_enum::EO::{EONumber};
 
     pub fn foo(_portal: &Portal) -> Option<EO> {
       let x = rand::random::<i32>();
       println!("{}", x);
-      Some(EOInt(x as i64))
+      Some(EONumber(x as f64))
     }
     """
     *
@@ -47,12 +47,12 @@
     """
     use eo::Portal;
     use eo::eo_enum::EO;
-    use eo::eo_enum::EO::{EOInt};
+    use eo::eo_enum::EO::{EONumber};
 
     pub fn foo(_portal: &Portal) -> Option<EO> {
       print!("Hello 大 2");
       let x = rand::random::<i32>();
-      Some(EOInt(x as i64))
+      Some(EONumber(x as f64))
     }
     """
     *

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/data-as-bytes.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/data-as-bytes.yaml
@@ -31,7 +31,7 @@ tests:
   - /program/errors[count(*)=0]
   - //java[contains(text(), '.take("org").take("eolang").take("true")')]
   - //java[contains(text(), 'ret_1 = new PhData(ret_1, new byte[] {(byte) 0x00});')]
-  - //java[contains(text(), 'ret_1 = new PhData(ret_1, new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x2A});')]
+  - //java[contains(text(), 'ret_1 = new PhData(ret_1, new byte[] {(byte) 0x40, (byte) 0x45, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00});')]
   - //java[contains(text(), 'ret_1 = new PhData(ret_1, new byte[] {(byte) 0x40, (byte) 0x0C, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00});')]
   - //java[contains(text(), 'ret = new PhData(ret, new byte[] {(byte) 0x01, (byte) 0xAF});')]
 eo: |
@@ -46,7 +46,7 @@ eo: |
     42 > @
   # This is the default 64+ symbols comment in front of named abstract object.
   [] > f
-    float 3.5 > @
+    number 3.5 > @
   # This is the default 64+ symbols comment in front of named abstract object.
   [] > b
     01-AF > @
diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/test-object-to-java.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/test-object-to-java.yaml
@@ -30,7 +30,7 @@ tests:
   - /program/errors[count(*)=0]
   - //java[contains(text(), '  @Test')]
   - //java[contains(text(), '  public void works() throws java.lang.Exception {')]
-  - //java[contains(text(), '    Boolean obj = new Dataized(new EOcompares_two_bools()).take(Boolean.class);')]
+  - //java[contains(text(), '    Boolean obj = new Dataized(new EOcompares_two_bools()).asBool();')]
   - //java[contains(text(), '    Assertions.assertTrue(obj);')]
   - //java[contains(text(), '  }')]
 eo: |

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/as-phi.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/as-phi.yaml
@@ -36,7 +36,7 @@ phi: |-
             α0 ↦ ξ
           ).length,
           α1 ↦ ξ.greater-than(
-            α0 ↦ Φ.org.eolang.int(
+            α0 ↦ Φ.org.eolang.number(
               α0 ↦ Φ.org.eolang.bytes(
                 Δ ⤍ 00-00-00-00-00-00-00-00
               )

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/bindings.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/bindings.yaml
@@ -35,9 +35,9 @@ phi: |-
           z ↦ ∅,
           φ ↦ Φ.org.eolang.w
         ⟧,
-        five ↦ Φ.org.eolang.int(
+        five ↦ Φ.org.eolang.number(
           α0 ↦ Φ.org.eolang.bytes(
-            Δ ⤍ 00-00-00-00-00-00-00-05
+            Δ ⤍ 40-14-00-00-00-00-00-00
           )
         )
       )

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/bool-tests.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/bool-tests.yaml
@@ -99,9 +99,9 @@ phi: |-
           ⟧,
           compares-two-different-types ↦ ⟦
             φ ↦ Φ.org.eolang.true.eq(
-              α0 ↦ Φ.org.eolang.int(
+              α0 ↦ Φ.org.eolang.number(
                 α0 ↦ Φ.org.eolang.bytes(
-                  Δ ⤍ 00-00-00-00-00-00-00-2A
+                  Δ ⤍ 40-45-00-00-00-00-00-00
                 )
               )
             ).not

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/fibonaci.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/fibonaci.yaml
@@ -43,27 +43,27 @@ phi: |-
           fibonacci ↦ ⟦
             n ↦ ∅,
             φ ↦ ξ.n.lt(
-              α0 ↦ Φ.org.eolang.int(
+              α0 ↦ Φ.org.eolang.number(
                 α0 ↦ Φ.org.eolang.bytes(
-                  Δ ⤍ 00-00-00-00-00-00-00-02
+                  Δ ⤍ 40-00-00-00-00-00-00-00
                 )
               )
             ).if(
               α0 ↦ ξ.n,
               α1 ↦ ξ.ρ.fibonacci(
                 α0 ↦ ξ.n.minus(
-                  α0 ↦ Φ.org.eolang.int(
+                  α0 ↦ Φ.org.eolang.number(
                     α0 ↦ Φ.org.eolang.bytes(
-                      Δ ⤍ 00-00-00-00-00-00-00-01
+                      Δ ⤍ 3F-F0-00-00-00-00-00-00
                     )
                   )
                 )
               ).plus(
                 α0 ↦ ξ.ρ.fibonacci(
                   α0 ↦ ξ.n.minus(
-                    α0 ↦ Φ.org.eolang.int(
+                    α0 ↦ Φ.org.eolang.number(
                       α0 ↦ Φ.org.eolang.bytes(
-                        Δ ⤍ 00-00-00-00-00-00-00-02
+                        Δ ⤍ 40-00-00-00-00-00-00-00
                       )
                     )
                   )

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/iterates-over-counter.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/iterates-over-counter.yaml
@@ -40,48 +40,48 @@ phi: |-
     ⟦
       iterates-over-simple-counter ↦ ⟦
         x ↦ Φ.org.eolang.memory(
-          α0 ↦ Φ.org.eolang.int(
+          α0 ↦ Φ.org.eolang.number(
             α0 ↦ Φ.org.eolang.bytes(
               Δ ⤍ 00-00-00-00-00-00-00-00
             )
           )
         ),
         φ ↦ ξ.x.write(
-          α0 ↦ Φ.org.eolang.int(
+          α0 ↦ Φ.org.eolang.number(
             α0 ↦ Φ.org.eolang.bytes(
-              Δ ⤍ 00-00-00-00-00-00-00-05
+              Δ ⤍ 40-14-00-00-00-00-00-00
             )
           )
         ).eq(
-          α0 ↦ Φ.org.eolang.int(
+          α0 ↦ Φ.org.eolang.number(
             α0 ↦ Φ.org.eolang.bytes(
-              Δ ⤍ 00-00-00-00-00-00-00-05
+              Δ ⤍ 40-14-00-00-00-00-00-00
             )
           )
         ).and(
           α0 ↦ ξ.x.as-int.lt(
-            α0 ↦ Φ.org.eolang.int(
+            α0 ↦ Φ.org.eolang.number(
               α0 ↦ Φ.org.eolang.bytes(
-                Δ ⤍ 00-00-00-00-00-00-00-0A
+                Δ ⤍ 40-24-00-00-00-00-00-00
               )
             )
           ).while(
             α0 ↦ ⟦
               i ↦ ∅,
               φ ↦ ξ.ρ.x.write(
                 α0 ↦ ξ.ρ.x.as-int.plus(
-                  α0 ↦ Φ.org.eolang.int(
+                  α0 ↦ Φ.org.eolang.number(
                     α0 ↦ Φ.org.eolang.bytes(
-                      Δ ⤍ 00-00-00-00-00-00-00-01
+                      Δ ⤍ 3F-F0-00-00-00-00-00-00
                     )
                   )
                 )
               )
             ⟧
           ).eq(
-            α0 ↦ Φ.org.eolang.int(
+            α0 ↦ Φ.org.eolang.number(
               α0 ↦ Φ.org.eolang.bytes(
-                Δ ⤍ 00-00-00-00-00-00-00-0B
+                Δ ⤍ 40-26-00-00-00-00-00-00
               )
             )
           )

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/jeo-part.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/jeo-part.yaml
@@ -36,9 +36,9 @@ phi: |-
         eolang ↦ ⟦
           benchmark ↦ ⟦
             j$A ↦ ⟦
-              access ↦ Φ.org.eolang.int(
+              access ↦ Φ.org.eolang.number(
                 α0 ↦ Φ.org.eolang.bytes(
-                  Δ ⤍ 00-00-00-00-00-00-00-20
+                  Δ ⤍ 40-40-00-00-00-00-00-00
                 )
               ),
               supername ↦ Φ.org.eolang.string(

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/nested.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/nested.yaml
@@ -43,9 +43,9 @@ phi: |-
             d ↦ ξ.ρ.ρ.a,
             z ↦ ⟦
               five ↦ ξ.ρ.ρ.ρ.ρ.main(
-                α0 ↦ Φ.org.eolang.int(
+                α0 ↦ Φ.org.eolang.number(
                   α0 ↦ Φ.org.eolang.bytes(
-                    Δ ⤍ 00-00-00-00-00-00-00-05
+                    Δ ⤍ 40-14-00-00-00-00-00-00
                   )
                 )
               ),

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/with-data.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/yaml/with-data.yaml
@@ -24,9 +24,9 @@ eo: 5 > five
 phi: |-
   {
     ⟦
-      five ↦ Φ.org.eolang.int(
+      five ↦ Φ.org.eolang.number(
         α0 ↦ Φ.org.eolang.bytes(
-          Δ ⤍ 00-00-00-00-00-00-00-05
+          Δ ⤍ 40-14-00-00-00-00-00-00
         )
       )
     ⟧

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/abstracts.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/abstracts.yaml
@@ -21,10 +21,10 @@
 # SOFTWARE.
 ---
 locators:
-  - .org .eolang .int
-  - .foo .bar .a .x .α0 .α0 .Δ δ=00-00-00-00-00-00-00-2A
-  - .foo .bar .b .y .α0 .α0 .Δ δ=00-00-00-00-00-00-01-00
-  - .foo .bar .a .x .α0 .π >int ν=$Φ.org.eolang.int
+  - .org .eolang .number
+  - .foo .bar .a .x .α0 .α0 .Δ δ=40-45-00-00-00-00-00-00
+  - .foo .bar .b .y .α0 .α0 .Δ δ=40-70-00-00-00-00-00-00
+  - .foo .bar .a .x .α0 .π >int ν=$Φ.org.eolang.number
   - .foo .bar .a .x .π >bar .ρ ν=ν0
 eo: |
   +package foo.bar

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/arrays.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/arrays.yaml
@@ -22,12 +22,12 @@
 ---
 locators:
   - .org .eolang .test
-  - .org .eolang .int
+  - .org .eolang .number
   - .arrays .z .π >tuple
   - .arrays .z .α0 .α0 .ε >test
   - .arrays .z .α1 .π >tuple
-  - .arrays .z .α1 .α0 .α1 .α0 .Δ δ=00-00-00-00-00-00-00-2A
-  - .arrays .z .α1 .α1 .α0 .Δ δ=00-00-00-00-00-00-00-2B
+  - .arrays .z .α1 .α0 .α1 .α0 .Δ δ=40-45-00-00-00-00-00-00
+  - .arrays .z .α1 .α1 .α0 .Δ δ=40-45-80-00-00-00-00-00
 eo: |
   # This is the default 64+ symbols comment in front of named abstract object.
   [] > arrays

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/data.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/data.yaml
@@ -22,10 +22,10 @@
 ---
 locators:
   - .data .f .α0 .Δ δ=40-09-21-FB-4D-12-D8-4A
-  - .data .f .π >float
+  - .data .f .π >number
   - .org .eolang .true
-  - .data .i .α0 .Δ δ=00-00-00-00-00-01-00-00
-  - .data .i .π >int
+  - .data .i .α0 .Δ δ=40-F0-00-00-00-00-00-00
+  - .data .i .π >number
   - .data .s .α0 .Δ δ=D0-B4-D1-80-D1-83-D0-B3
   - .data .s .π >string
 eo: |

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/dots.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/dots.yaml
@@ -23,10 +23,10 @@
 locators:
   - .org .eolang .true
   - .org .eolang .true !.not
-  - .org .eolang .int !.plus
+  - .org .eolang .number !.plus
   - .dots .y >b
-  - .dots .z .π .β .times .π .β .plus .α0 .Δ δ=00-00-00-00-00-00-00-2A
-  - .dots .z .π .β .times .π .β .plus .π >int
+  - .dots .z .π .β .times .π .β .plus .α0 .Δ δ=40-45-00-00-00-00-00-00
+  - .dots .z .π .β .times .π .β .plus .π >number
 eo: |
   # This is the default 64+ symbols comment in front of named abstract object.
   [] > dots

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/inclusions.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/inclusions.yaml
@@ -23,8 +23,8 @@
 inclusion:
   - foo.x.*
 locators:
-  - .a .x .α0 .α0 .Δ δ=00-00-00-00-00-00-00-2A
-  - .b .y .α0 .α0 .Δ δ=00-00-00-00-00-00-01-00
+  - .a .x .α0 .α0 .Δ δ=40-45-00-00-00-00-00-00
+  - .b .y .α0 .α0 .Δ δ=40-70-00-00-00-00-00-00
 eo: |
   # This is the default 64+ symbols comment in front of named abstract object.
   [f] > a

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/simple.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/simple.yaml
@@ -21,13 +21,13 @@
 # SOFTWARE.
 ---
 locators:
-  - .org .eolang .int
+  - .org .eolang .number
   - .org .eolang .true
   - .boom
   - .foo
   - .bar
   - .simple .φ .ρ .φ .ρ .φ .α0 .α0 .ε
-  - .simple .φ .α1 .α0 .Δ δ=00-00-00-00-00-00-00-2A
+  - .simple .φ .α1 .α0 .Δ δ=40-45-00-00-00-00-00-00
   - .simple .φ .α1 .π >int
   - .simple .φ .α2 >boom
 eo: |