diff --git a/eo-maven-plugin/pom.xml b/eo-maven-plugin/pom.xml index dfc99a1ad5..a829f4804f 100644 --- a/eo-maven-plugin/pom.xml +++ b/eo-maven-plugin/pom.xml @@ -108,7 +108,7 @@ SOFTWARE. org.apache.maven maven-core - 3.9.8 + 3.9.9 provided @@ -207,7 +207,7 @@ SOFTWARE. org.apache.commons commons-lang3 - 3.15.0 + 3.17.0 commons-io diff --git a/eo-runtime/src/test/eo/org/eolang/rust-tests.eo b/eo-runtime/src/test/eo/org/eolang/rust-tests.eo index ee494e0717..bf74fce260 100644 --- a/eo-runtime/src/test/eo/org/eolang/rust-tests.eo +++ b/eo-runtime/src/test/eo/org/eolang/rust-tests.eo @@ -401,7 +401,17 @@ applied.content "qwerty" -# This is the default 64+ symbols comment in front of named abstract object. +# Test. +# The bytes represent the next rust code: +# ``` +# use eo::Portal; +# use eo::eo_enum::EO; +# use eo::eo_enum::EO::{EONumber}; +# +# pub fn foo(_portal: &mut Portal) -> Option { +# Some(EONumber(2.0)) +# } +# ```. [] > rust-with-string-fqn Q .org @@ -415,7 +425,7 @@ .org .eolang .bytes:0 - 75-73-65-20-65-6F-3A-3A-50-6F-72-74-61-6C-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3A-3A-7B-45-4F-4E-75-6D-62-65-72-7D-3B-0A-0A-70-75-62-20-66-6E-20-66-6F-6F-28-5F-70-6F-72-74-61-6C-3A-20-26-6D-75-74-20-50-6F-72-74-61-6C-29-20-2D-3E-20-4F-70-74-69-6F-6E-3C-45-4F-3E-20-7B-0A-20-20-70-72-69-6E-74-6C-6E-21-28-22-48-65-6C-6C-6F-20-77-6F-72-6C-64-20-66-72-6F-6D-20-72-75-73-74-22-29-3B-0A-20-20-53-6F-6D-65-28-45-4F-4E-75-6D-62-65-72-28-32-2E-30-29-29-0A-7D + 75-73-65-20-65-6F-3A-3A-50-6F-72-74-61-6C-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3A-3A-7B-45-4F-4E-75-6D-62-65-72-7D-3B-0A-0A-70-75-62-20-66-6E-20-66-6F-6F-28-5F-70-6F-72-74-61-6C-3A-20-26-6D-75-74-20-50-6F-72-74-61-6C-29-20-2D-3E-20-4F-70-74-69-6F-6E-3C-45-4F-3E-20-7B-0A-20-20-53-6F-6D-65-28-45-4F-4E-75-6D-62-65-72-28-32-2E-30-29-29-0A-7D []:1 Q .org @@ -435,7 +445,17 @@ .bytes:0 40-00-00-00-00-00-00-00 -# This is the default 64+ symbols comment in front of named abstract object. +# Test. +# The bytes represent the next rust code: +# ``` +# use eo::Portal; +# use eo::eo_enum::EO; +# use eo::eo_enum::EO::{EONumber}; +# +# pub fn foo(_portal: &mut Portal) -> Option { +# Some(EONumber(2.0)) +# } +# ```. [] > rust-reversed-notation rust. > r eolang. @@ -449,7 +469,7 @@ eolang. org. Q - 75-73-65-20-65-6F-3A-3A-50-6F-72-74-61-6C-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3A-3A-7B-45-4F-4E-75-6D-62-65-72-7D-3B-0A-0A-70-75-62-20-66-6E-20-66-6F-6F-28-5F-70-6F-72-74-61-6C-3A-20-26-6D-75-74-20-50-6F-72-74-61-6C-29-20-2D-3E-20-4F-70-74-69-6F-6E-3C-45-4F-3E-20-7B-0A-20-20-70-72-69-6E-74-6C-6E-21-28-22-48-65-6C-6C-6F-20-77-6F-72-6C-64-20-66-72-6F-6D-20-72-75-73-74-22-29-3B-0A-20-20-53-6F-6D-65-28-45-4F-4E-75-6D-62-65-72-28-32-2E-30-29-29-0A-7D + 75-73-65-20-65-6F-3A-3A-50-6F-72-74-61-6C-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3A-3A-7B-45-4F-4E-75-6D-62-65-72-7D-3B-0A-0A-70-75-62-20-66-6E-20-66-6F-6F-28-5F-70-6F-72-74-61-6C-3A-20-26-6D-75-74-20-50-6F-72-74-61-6C-29-20-2D-3E-20-4F-70-74-69-6F-6E-3C-45-4F-3E-20-7B-0A-20-20-53-6F-6D-65-28-45-4F-4E-75-6D-62-65-72-28-32-2E-30-29-29-0A-7D []:1 empty.:2 tuple. @@ -470,6 +490,24 @@ 40-00-00-00-00-00-00-00 # Test. +# The bytes represent the next rust code: +# ``` +# use eo::Portal; +# use eo::eo_enum::EO; +# use eo::eo_enum::EO::{EONumber}; +# use byteorder::{BigEndian, ReadBytesExt}; +# +# pub fn foo(portal: &mut Portal) -> Option { +# let a = portal.find("$.^.a")?; +# let bytes_a = portal.dataize(a)?; +# let a = bytes_a.as_slice().read_f64::().ok()?; +# +# let b = portal.find("$.^.b")?; +# let bytes_b = portal.dataize(b)?; +# let b = bytes_b.as_slice().read_f64::().ok()?; +# Some(EONumber(a + b)) +# } +# ```. [] > rust-unwrapped-plus number. > a eolang. @@ -501,7 +539,7 @@ eolang. org. Q - 75-73-65-20-65-6F-3A-3A-50-6F-72-74-61-6C-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3A-3A-7B-45-4F-4E-75-6D-62-65-72-7D-3B-0A-75-73-65-20-62-79-74-65-6F-72-64-65-72-3A-3A-7B-42-69-67-45-6E-64-69-61-6E-2C-20-52-65-61-64-42-79-74-65-73-45-78-74-7D-3B-0A-0A-70-75-62-20-66-6E-20-66-6F-6F-28-70-6F-72-74-61-6C-3A-20-26-6D-75-74-20-50-6F-72-74-61-6C-29-20-2D-3E-20-4F-70-74-69-6F-6E-3C-45-4F-3E-20-7B-0A-20-20-6C-65-74-20-61-20-3D-20-70-6F-72-74-61-6C-2E-66-69-6E-64-28-22-24-2E-5E-2E-61-22-29-3F-3B-0A-20-20-6C-65-74-20-62-79-74-65-73-5F-61-20-3D-20-70-6F-72-74-61-6C-2E-64-61-74-61-69-7A-65-28-61-29-3F-3B-0A-20-20-6C-65-74-20-61-20-3D-20-62-79-74-65-73-5F-61-2E-61-73-5F-73-6C-69-63-65-28-29-2E-72-65-61-64-5F-66-36-34-3A-3A-3C-42-69-67-45-6E-64-69-61-6E-3E-28-29-2E-6F-6B-28-29-3F-3B-0A-0A-20-20-6C-65-74-20-62-20-3D-20-70-6F-72-74-61-6C-2E-66-69-6E-64-28-22-24-2E-5E-2E-62-22-29-3F-3B-0A-20-20-6C-65-74-20-62-79-74-65-73-5F-62-20-3D-20-70-6F-72-74-61-6C-2E-64-61-74-61-69-7A-65-28-62-29-3F-3B-0A-20-20-6C-65-74-20-62-20-3D-20-62-79-74-65-73-5F-62-2E-61-73-5F-73-6C-69-63-65-28-29-2E-72-65-61-64-5F-66-36-34-3A-3A-3C-42-69-67-45-6E-64-69-61-6E-3E-28-29-2E-6F-6B-28-29-3F-3B-0A-20-20-70-72-69-6E-74-6C-6E-21-28-22-73-75-6D-20-35-20-2B-20-31-30-20-3D-20-7B-7D-22-2C-20-61-20-2B-20-62-29-3B-0A-20-20-53-6F-6D-65-28-45-4F-4E-75-6D-62-65-72-28-61-20-2B-20-62-29-29-0A-7D + 75-73-65-20-65-6F-3A-3A-50-6F-72-74-61-6C-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3B-0A-75-73-65-20-65-6F-3A-3A-65-6F-5F-65-6E-75-6D-3A-3A-45-4F-3A-3A-7B-45-4F-4E-75-6D-62-65-72-7D-3B-0A-75-73-65-20-62-79-74-65-6F-72-64-65-72-3A-3A-7B-42-69-67-45-6E-64-69-61-6E-2C-20-52-65-61-64-42-79-74-65-73-45-78-74-7D-3B-0A-0A-70-75-62-20-66-6E-20-66-6F-6F-28-70-6F-72-74-61-6C-3A-20-26-6D-75-74-20-50-6F-72-74-61-6C-29-20-2D-3E-20-4F-70-74-69-6F-6E-3C-45-4F-3E-20-7B-0A-20-20-6C-65-74-20-61-20-3D-20-70-6F-72-74-61-6C-2E-66-69-6E-64-28-22-24-2E-5E-2E-61-22-29-3F-3B-0A-20-20-6C-65-74-20-62-79-74-65-73-5F-61-20-3D-20-70-6F-72-74-61-6C-2E-64-61-74-61-69-7A-65-28-61-29-3F-3B-0A-20-20-6C-65-74-20-61-20-3D-20-62-79-74-65-73-5F-61-2E-61-73-5F-73-6C-69-63-65-28-29-2E-72-65-61-64-5F-66-36-34-3A-3A-3C-42-69-67-45-6E-64-69-61-6E-3E-28-29-2E-6F-6B-28-29-3F-3B-0A-0A-20-20-6C-65-74-20-62-20-3D-20-70-6F-72-74-61-6C-2E-66-69-6E-64-28-22-24-2E-5E-2E-62-22-29-3F-3B-0A-20-20-6C-65-74-20-62-79-74-65-73-5F-62-20-3D-20-70-6F-72-74-61-6C-2E-64-61-74-61-69-7A-65-28-62-29-3F-3B-0A-20-20-6C-65-74-20-62-20-3D-20-62-79-74-65-73-5F-62-2E-61-73-5F-73-6C-69-63-65-28-29-2E-72-65-61-64-5F-66-36-34-3A-3A-3C-42-69-67-45-6E-64-69-61-6E-3E-28-29-2E-6F-6B-28-29-3F-3B-0A-20-20-53-6F-6D-65-28-45-4F-4E-75-6D-62-65-72-28-61-20-2B-20-62-29-29-0A-7D auto-named-attr-at-327-6.:1 $ tuple.:2 diff --git a/eo-runtime/src/test/java/EOorg/EOeolang/EOio/InputOutputTest.java b/eo-runtime/src/test/java/EOorg/EOeolang/EOio/InputOutputTest.java index 7132df6104..e5b72447f6 100644 --- a/eo-runtime/src/test/java/EOorg/EOeolang/EOio/InputOutputTest.java +++ b/eo-runtime/src/test/java/EOorg/EOeolang/EOio/InputOutputTest.java @@ -296,7 +296,7 @@ void dataizesConsoleWriteAsTrue() { @Test void writesToConsole(@TempDir final Path temp) throws IOException { - final String msg = "writes to posix console"; + final String msg = "writes to console"; final File file = InputOutputTest.redirectedStdout( temp, () -> new Dataized( @@ -308,7 +308,7 @@ void writesToConsole(@TempDir final Path temp) throws IOException { ).take() ); MatcherAssert.assertThat( - "The 'console.write' should have written to posix console, but it didn't", + "The 'console.write' should have written to console, but it didn't", new String( Files.readAllBytes(Paths.get(file.getAbsolutePath())), StandardCharsets.UTF_8 ), @@ -346,7 +346,7 @@ void writesToConsoleSequentially(@TempDir final Path temp) throws IOException { @Test void readsFromConsole(@TempDir final Path temp) throws IOException { - final String content = "read from posix console"; + final String content = "read from console"; final byte[] result = InputOutputTest.redirectedStdin( temp, content, @@ -368,7 +368,7 @@ void readsFromConsole(@TempDir final Path temp) throws IOException { @Test void readsSequentiallyFromInputBlockViaConsole(@TempDir final Path temp) throws IOException { - final String content = "read sequentially from posix console"; + final String content = "read sequentially from console"; final byte[] result = InputOutputTest.redirectedStdin( temp, content, @@ -392,7 +392,7 @@ void readsSequentiallyFromInputBlockViaConsole(@TempDir final Path temp) MatcherAssert.assertThat( "The `console.read` object should have return input block ready to `read` again, but it didn't", new String(result, StandardCharsets.UTF_8), - Matchers.equalTo("from posix console") + Matchers.equalTo("from console") ); } } diff --git a/pom.xml b/pom.xml index 391307c50e..c1dfd873ee 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ SOFTWARE. org.yaml snakeyaml - 2.2 + 2.3 com.jcabi