diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PhiMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PhiMojo.java index 38397ab473..febeb475f3 100644 --- a/eo-maven-plugin/src/main/java/org/eolang/maven/PhiMojo.java +++ b/eo-maven-plugin/src/main/java/org/eolang/maven/PhiMojo.java @@ -45,7 +45,7 @@ /** * Read XMIR files and translate them to the phi-calculus expression. - * @since 0.33.0 + * @since 0.34.0 */ @Mojo( name = "xmir-to-phi", diff --git a/eo-maven-plugin/src/main/resources/org/eolang/maven/phi/to-phi.xsl b/eo-maven-plugin/src/main/resources/org/eolang/maven/phi/to-phi.xsl index fd2984a472..ed52a05a7e 100644 --- a/eo-maven-plugin/src/main/resources/org/eolang/maven/phi/to-phi.xsl +++ b/eo-maven-plugin/src/main/resources/org/eolang/maven/phi/to-phi.xsl @@ -52,6 +52,18 @@ SOFTWARE. + + + + + + + + + + + + @@ -128,9 +140,26 @@ SOFTWARE. - [ - - ] + { + + + + + + + + + + + + + + + + + + + } @@ -143,7 +172,7 @@ SOFTWARE. - ? + @@ -184,7 +213,7 @@ SOFTWARE. ( - + ) @@ -195,11 +224,11 @@ SOFTWARE. - [ + - - lambda + + Lambda , @@ -208,7 +237,7 @@ SOFTWARE. - ] + diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/PhiMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/PhiMojoTest.java index 708224b0b4..a70f214e56 100644 --- a/eo-maven-plugin/src/test/java/org/eolang/maven/PhiMojoTest.java +++ b/eo-maven-plugin/src/test/java/org/eolang/maven/PhiMojoTest.java @@ -36,8 +36,7 @@ /** * Test cases for {@link PhiMojo}. - * - * @since 0.33.0 + * @since 0.34.0 */ class PhiMojoTest { @Test @@ -66,6 +65,10 @@ void createsFiles(@TempDir final Path temp) throws Exception { void checksPhiPacks(final String pack, @TempDir final Path temp) throws Exception { final Map map = new Yaml().load(pack); MatcherAssert.assertThat( + String.format( + "Result phi expression should be equal to %s, but it doesn't", + map.get("phi").toString() + ), new TextOf( new FakeMaven(temp) .withProgram(map.get("eo").toString()) diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/application.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/application.yaml index a8bd69f300..077a1a03de 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/application.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/application.yaml @@ -5,4 +5,4 @@ eo: | w > @ 5 phi: - "[xyz ↦ Φ.org.eolang.x(attr ↦ Φ.org.eolang.y, α1 ↦ [z ↦ ?, φ ↦ Φ.org.eolang.w], α2 ↦ Φ.org.eolang.int(α0 ↦ Φ.org.eolang.bytes(Δ ↦ 00-00-00-00-00-00-00-05)))]" \ No newline at end of file + "{xyz ↦ Φ.org.eolang.x(attr ↦ Φ.org.eolang.y, α1 ↦ ⟦z ↦ ∅, φ ↦ Φ.org.eolang.w⟧, α2 ↦ Φ.org.eolang.int(α0 ↦ Φ.org.eolang.bytes(Δ ⤍ 00-00-00-00-00-00-00-05)))}" \ No newline at end of file diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/atoms.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/atoms.yaml index e456305133..40dccf7ccd 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/atoms.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/atoms.yaml @@ -3,4 +3,4 @@ eo: | [] > outer [] > inner /bytes phi: - "[main ↦ [λ ↦ lambda], outer ↦ [inner ↦ [λ ↦ lambda]]]" \ No newline at end of file + "{main ↦ ⟦λ ⤍ Lambda⟧, outer ↦ ⟦inner ↦ ⟦λ ⤍ Lambda⟧⟧}" \ No newline at end of file diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/empty-bytes.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/empty-bytes.yaml index e6b7d805cd..34a3b65221 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/empty-bytes.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/empty-bytes.yaml @@ -1,2 +1,2 @@ eo: -- > empty -phi: "[empty ↦ Φ.org.eolang.bytes(Δ ↦ --)]" \ No newline at end of file +phi: "{empty ↦ Φ.org.eolang.bytes(Δ ⤍ --)}" \ No newline at end of file diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/full-path.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/full-path.yaml index 00adf55b80..5b64bd8ce3 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/full-path.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/full-path.yaml @@ -2,4 +2,4 @@ eo: | QQ.io.stdout > std Q.org.eolang.x > y phi: - "[std ↦ Φ.org.eolang.io.stdout, y ↦ Φ.org.eolang.x]" \ No newline at end of file + "{std ↦ Φ.org.eolang.io.stdout, y ↦ Φ.org.eolang.x}" \ No newline at end of file diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/method.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/method.yaml index 52ce240fa4..309b7b901a 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/method.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/method.yaml @@ -1,2 +1,2 @@ eo: x.y.z > xyz -phi: [xyz ↦ Φ.org.eolang.x.y.z] \ No newline at end of file +phi: "{xyz ↦ Φ.org.eolang.x.y.z}" \ No newline at end of file diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/one-byte.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/one-byte.yaml index 3d701fde86..284f3dcfd2 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/one-byte.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/one-byte.yaml @@ -1,2 +1,2 @@ eo: A2- > bts -phi: "[bts ↦ Φ.org.eolang.bytes(Δ ↦ A2-)]" \ No newline at end of file +phi: "{bts ↦ Φ.org.eolang.bytes(Δ ⤍ A2-)}" \ No newline at end of file diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/package.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/package.yaml new file mode 100644 index 0000000000..7399f34d6d --- /dev/null +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/package.yaml @@ -0,0 +1,6 @@ +eo: | + +package foo.bar.baz + + [] > main + stdout > @ +phi: "{foo ↦ ⟦bar ↦ ⟦baz ↦ ⟦main ↦ ⟦φ ↦ Φ.org.eolang.stdout⟧⟧⟧⟧}" \ No newline at end of file diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/specials.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/specials.yaml index d11e663cfd..37dd79b3af 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/specials.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/specials.yaml @@ -5,4 +5,4 @@ eo: | $.a > a < > vtx ^.< > self -phi: "[main ↦ [x ↦ ρ.x, h ↦ Φ.org.eolang.y.σ, a ↦ ρ.a, vtx ↦ ν, self ↦ ρ.ν]]" \ No newline at end of file +phi: "{main ↦ ⟦x ↦ ρ.x, h ↦ Φ.org.eolang.y.σ, a ↦ ρ.a, vtx ↦ ν, self ↦ ρ.ν⟧}" \ No newline at end of file diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-data.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-data.yaml index 011837c1ee..f5333e55a8 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-data.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-data.yaml @@ -1,2 +1,2 @@ eo: 5 > five -phi: "[five ↦ Φ.org.eolang.int(α0 ↦ Φ.org.eolang.bytes(Δ ↦ 00-00-00-00-00-00-00-05))]" +phi: "{five ↦ Φ.org.eolang.int(α0 ↦ Φ.org.eolang.bytes(Δ ⤍ 00-00-00-00-00-00-00-05))}" diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-free-attributes.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-free-attributes.yaml index f88764b255..de5353fb8c 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-free-attributes.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-free-attributes.yaml @@ -2,4 +2,4 @@ eo: | [a b] > c d > @ phi: - "[c ↦ [a ↦ ?, b ↦ ?, φ ↦ Φ.org.eolang.d]]" \ No newline at end of file + "{c ↦ ⟦a ↦ ∅, b ↦ ∅, φ ↦ Φ.org.eolang.d⟧}" \ No newline at end of file