From ffc237605649c8d9cf3b6574ac771df44e5a6816 Mon Sep 17 00:00:00 2001 From: maxonfjvipon Date: Wed, 28 Feb 2024 14:10:18 +0300 Subject: [PATCH 1/4] fix(#2873): changed rho with sigma --- .../src/main/resources/org/eolang/maven/phi/to-phi.xsl | 2 +- .../src/test/resources/org/eolang/maven/phi/fibonaci.yaml | 4 ++-- .../src/test/resources/org/eolang/maven/phi/nested.yaml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) 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 2b0cbe1dc6..feb0f8588d 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 @@ -244,7 +244,7 @@ SOFTWARE. - + . diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/fibonaci.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/fibonaci.yaml index 0627a04e51..6532f578c8 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/fibonaci.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/fibonaci.yaml @@ -28,7 +28,7 @@ phi: | ) ).if( α0 ↦ ξ.n, - α1 ↦ ξ.ρ.fibonacci( + α1 ↦ ξ.σ.fibonacci( α0 ↦ ξ.n.minus( α0 ↦ Φ.org.eolang.int( α0 ↦ Φ.org.eolang.bytes( @@ -37,7 +37,7 @@ phi: | ) ) ).plus( - α0 ↦ ξ.ρ.fibonacci( + α0 ↦ ξ.σ.fibonacci( α0 ↦ ξ.n.minus( α0 ↦ Φ.org.eolang.int( α0 ↦ Φ.org.eolang.bytes( diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/nested.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/nested.yaml index 8f0a745552..1b9b58899c 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/nested.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/nested.yaml @@ -18,17 +18,17 @@ phi: | a ↦ ∅, x ↦ ⟦ y ↦ ⟦ - d ↦ ξ.ρ.ρ.a, + d ↦ ξ.σ.σ.a, z ↦ ⟦ - five ↦ ξ.ρ.ρ.ρ.ρ.main( + five ↦ ξ.σ.σ.σ.σ.main( α0 ↦ Φ.org.eolang.int( α0 ↦ Φ.org.eolang.bytes( Δ ⤍ 00-00-00-00-00-00-00-05 ) ) ), - b ↦ ξ.ρ.ρ.ρ.a, - e ↦ ξ.ρ.d + b ↦ ξ.σ.σ.σ.a, + e ↦ ξ.σ.d ⟧ ⟧ ⟧ From 75c631a6cd31c92577567e20b788cb56c62adf8c Mon Sep 17 00:00:00 2001 From: maxonfjvipon Date: Wed, 28 Feb 2024 14:15:13 +0300 Subject: [PATCH 2/4] fix(#2873): renamed sigma --- .../src/main/resources/org/eolang/maven/phi/to-phi.xsl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 feb0f8588d..dba1fdb9b3 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 @@ -42,7 +42,7 @@ SOFTWARE. - + @@ -105,11 +105,11 @@ SOFTWARE. - + . - + @@ -243,14 +243,14 @@ SOFTWARE. - + . - + From 48e0798ea38b7313f9f80e7c8b9c5849cb51ec1b Mon Sep 17 00:00:00 2001 From: maxonfjvipon Date: Wed, 28 Feb 2024 15:27:50 +0300 Subject: [PATCH 3/4] fix(#2873): pack --- .../maven/phi/iterates-over-counter.yaml | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 eo-maven-plugin/src/test/resources/org/eolang/maven/phi/iterates-over-counter.yaml diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/iterates-over-counter.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/iterates-over-counter.yaml new file mode 100644 index 0000000000..874c3c559e --- /dev/null +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/iterates-over-counter.yaml @@ -0,0 +1,69 @@ +eo: | + # This is the default 64+ symbols comment in front of named abstract object. + [] > iterates-over-simple-counter + memory 0 > x + and. > @ + eq. + x.write 5 + 5 + eq. + while. + x.as-int.lt 10 + [i] + x.write > @ + x.as-int.plus 1 + 11 +phi: | + { + ⟦ + iterates-over-simple-counter ↦ ⟦ + x ↦ Φ.org.eolang.memory( + α0 ↦ Φ.org.eolang.int( + α0 ↦ Φ.org.eolang.bytes( + Δ ⤍ 00-00-00-00-00-00-00-00 + ) + ) + ), + φ ↦ ξ.x.write( + α0 ↦ Φ.org.eolang.int( + α0 ↦ Φ.org.eolang.bytes( + Δ ⤍ 00-00-00-00-00-00-00-05 + ) + ) + ).eq( + α0 ↦ Φ.org.eolang.int( + α0 ↦ Φ.org.eolang.bytes( + Δ ⤍ 00-00-00-00-00-00-00-05 + ) + ) + ).and( + α0 ↦ ξ.x.as-int.lt( + α0 ↦ Φ.org.eolang.int( + α0 ↦ Φ.org.eolang.bytes( + Δ ⤍ 00-00-00-00-00-00-00-0A + ) + ) + ).while( + α0 ↦ ⟦ + i ↦ ∅, + φ ↦ ξ.σ.x.write( + α0 ↦ ξ.σ.x.as-int.plus( + α0 ↦ Φ.org.eolang.int( + α0 ↦ Φ.org.eolang.bytes( + Δ ⤍ 00-00-00-00-00-00-00-01 + ) + ) + ) + ) + ⟧ + ).eq( + α0 ↦ Φ.org.eolang.int( + α0 ↦ Φ.org.eolang.bytes( + Δ ⤍ 00-00-00-00-00-00-00-0B + ) + ) + ) + ) + ⟧ + ⟧ + } \ No newline at end of file From 977935f81cc080bdc558409c2ded524441613ac4 Mon Sep 17 00:00:00 2001 From: maxonfjvipon Date: Wed, 28 Feb 2024 15:37:38 +0300 Subject: [PATCH 4/4] fix(#2873): restart --- eo-parser/src/main/java/org/eolang/parser/ParsingTrain.java | 1 - 1 file changed, 1 deletion(-) diff --git a/eo-parser/src/main/java/org/eolang/parser/ParsingTrain.java b/eo-parser/src/main/java/org/eolang/parser/ParsingTrain.java index 070ff98ac7..032c403b9c 100644 --- a/eo-parser/src/main/java/org/eolang/parser/ParsingTrain.java +++ b/eo-parser/src/main/java/org/eolang/parser/ParsingTrain.java @@ -160,5 +160,4 @@ public ParsingTrain() { ) ); } - }