Merge branch '__rultor'

objectionary · Feb 29, 2024 · da1ad91 · da1ad91
2 parents 071f198 + 977935f
commit da1ad91
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 13 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
@@ -42,7 +42,7 @@ SOFTWARE.
   <xsl:variable name="rho">
     <select>ρ</select>
   </xsl:variable>
-  <xsl:variable name="home">
+  <xsl:variable name="sigma">
     <select>σ</select>
   </xsl:variable>
   <xsl:variable name="program">
@@ -105,11 +105,11 @@ SOFTWARE.
       </xsl:when>
       <xsl:when test="$n='&amp;'">
         <xsl:value-of select="eo:add-xi(not($is-name))"/>
-        <xsl:value-of select="$home"/>
+        <xsl:value-of select="$sigma"/>
       </xsl:when>
       <xsl:when test="$n='.&amp;'">
         <xsl:text>.</xsl:text>
-        <xsl:value-of select="$home"/>
+        <xsl:value-of select="$sigma"/>
       </xsl:when>
       <xsl:when test="$n='$'">
         <xsl:value-of select="$xi"/>
@@ -243,14 +243,14 @@ SOFTWARE.
   <xsl:template match="*" mode="path">
     <xsl:param name="find"/>
     <xsl:variable name="parent" select="parent::*"/>
-    <xsl:variable name="rho-dot">
-      <xsl:value-of select="eo:specials('^', true())"/>
+    <xsl:variable name="sigma-dot">
+      <xsl:value-of select="eo:specials('&amp;', true())"/>
       <xsl:text>.</xsl:text>
     </xsl:variable>
     <xsl:choose>
       <xsl:when test="$parent[@abstract]">
         <xsl:if test="not($parent/o[@name=$find])">
-          <xsl:value-of select="$rho-dot"/>
+          <xsl:value-of select="$sigma-dot"/>
           <xsl:apply-templates select="$parent" mode="path">
             <xsl:with-param name="find" select="$find"/>
           </xsl:apply-templates>

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
@@ -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/iterates-over-counter.yaml 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
+              )
+            )
+          )
+        )
+      ⟧
+    ⟧
+  }
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
@@ -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
             ⟧
           ⟧
         ⟧

diff --git 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() {
             )
         );
     }
-
 }