bug(objectionary#3481): tuple value and prev

maxonfjvipon · maxonfjvipon · commit 0348d42e6878 · 2025-01-18T19:41:11.000+03:00
diff --git a/eo-runtime/src/main/eo/org/eolang/fs/dir.eo b/eo-runtime/src/main/eo/org/eolang/fs/dir.eo
@@ -78,9 +78,9 @@
         ^.len.eq index
         true
         seq *
-          tup.tail.deleted.exists
+          tup.value.deleted.exists
           ^.rec-delete
-            tup.head
+            tup.prev
             index.plus 1
 
   # Creates an empty temporary file in the current directory.
diff --git a/eo-runtime/src/main/eo/org/eolang/fs/path.eo b/eo-runtime/src/main/eo/org/eolang/fs/path.eo
@@ -107,8 +107,8 @@
               if.
                 and.
                   accum.length.gt 0
-                  (accum.tail.eq "..").not
-                accum.head
+                  (accum.value.eq "..").not
+                accum.prev
                 if.
                   ^.is-absolute.not
                   accum.with segment
@@ -362,8 +362,8 @@
                 if.
                   and.
                     accum.length.gt 0
-                    (accum.tail.eq "..").not
-                  accum.head
+                    (accum.value.eq "..").not
+                  accum.prev
                   if.
                     and.
                       ^.is-root-relative.not
diff --git a/eo-runtime/src/main/eo/org/eolang/seq.eo b/eo-runtime/src/main/eo/org/eolang/seq.eo
@@ -34,7 +34,7 @@
     true
     if.
       steps.length.eq 1
-      steps.tail
+      steps.value
       loop steps
   steps.length.plus -1 > last-index!
 
@@ -46,8 +46,8 @@
     if. > @
       and.
         tup.length.gt 1
-        loop tup.head
-      tup.tail
+        loop tup.prev
+      tup.value
       or.
-        (dataized tup.tail).as-bool.eq --
+        (dataized tup.value).as-bool.eq --
         tup.length.eq last-index
diff --git a/eo-runtime/src/main/eo/org/eolang/structs/list.eo b/eo-runtime/src/main/eo/org/eolang/structs/list.eo
@@ -53,93 +53,90 @@
   # The first one for the accumulator, the second one
   # for the element of the collection and the third one for the index.
   [start func] > reducedi
-    ^.origin.length > origin-len!
     if. > @
-      0.eq origin-len
+      is-empty
       start
-      rec-reduced start 0.as-bytes
+      rec-reducedi origin
 
-    [accum index] > rec-reduced
-      index.as-number > idx-as-number
-      1.plus idx-as-number > next-index!
+    [tup] > rec-reducedi
       if. > @
-        next-index.eq ^.origin-len
-        ^.func > accumulated
-          accum
-          ^.^.origin.at idx-as-number
-          idx-as-number
-        ^.rec-reduced
-          accumulated
-          next-index
+        tup.length.eq 1
+        func
+          start
+          tup.value
+          0
+        func
+          rec-reducedi tup.prev
+          tup.value
+          tup.prev.length
 
   # Reduce from "start" using the function "func".
   # Here "func" must be an abstract object with two free attributes.
   # The first one for the accumulator, the second one for the element
   # of the collection.
   [start func] > reduced
-    ^.reducedi > @
+    reducedi > @
       start
-      ^.func accum item > [accum item idx] >>
+      func accum item > [accum item idx] >>
 
   # Map with index. Here "func" must be an abstract
   # object with two free attributes. The first
   # one for the element of the collection, the second one
   # for the index.
   [func] > mappedi
     list > @
-      ^.reducedi
+      reducedi
         *
         [accum item idx] >>
-          with. > @
-            accum
-            ^.func item idx
+          accum.with > @
+            func item idx
 
   # Map without index. Here "func" must be an abstract
   # object with one free attribute, for the element
   # of the collection.
   [func] > mapped
-    ^.mappedi > @
-      ^.func item > [item idx] >>
+    mappedi > @
+      func item > [item idx] >>
 
   # For each collection element dataize the object
   # Here "func" must be an abstract object with
   # two free attributes: the element of the
   # collection and its index.
   # The result of `func` must be dataizable.
   [func] > eachi
-    ^.reducedi > @
+    reducedi > @
       true
       [acc item index] >>
         seq * > @
           acc
-          ^.func item index
+          func item index
 
   # For each collection element dataize the object
   # Here "func" must be an abstract object with
   # one free attribute, the element of the collection.
   [func] > each
-    ^.eachi > @
-      ^.func item > [item index] >>
+    eachi > @
+      func item > [item index] >>
 
   # Create a new list without the i-th element.
   [i] > withouti
     list > @
-      ^.reducedi
+      reducedi
         *
         [accum item idx] >>
           if. > @
-            ^.i.eq idx
+            i.eq idx
             accum
             accum.with item
 
   # Create a new list without the `element` which is `.eq` to given one.
   [element] > without
     list > @
-      ^.reduced
+      reduced
         *
         [accum item] >>
           if. > @
-            ^.element.eq item
+            element.eq item
             accum
             accum.with item
 
@@ -148,46 +145,45 @@
   [other] > eq
     and. > @
       eq.
-        ^.origin.length
+        origin.length
         other.length
-      ^.reducedi
+      rec-eq origin other
+
+    [first second] > rec-eq
+      if. > @
+        first.length.eq 0
         true
-        [accum item idx] >>
-          and. > @
-            accum
-            eq.
-              item
-              ^.other.at idx
+        and.
+          first.value.eq second.value
+          rec-eq first.prev second.prev
 
   # Concatenates current list with given one.
   [passed] > concat
-    reduced. > @
-      list
-        passed
+    (list passed).reducedi > @
       ^
-      accum.with item > [accum item]
+      accum.with item > [accum item index]
 
   # Returns index of the first particular item in list.
   # If the list has no this item, index-of returns -1.
   [wanted] > index-of
-    ^.reducedi > @
+    reducedi > @
       -1
       [accum item index] >>
         if. > @
           and.
             -1.eq accum
-            item.eq ^.wanted
+            item.eq wanted
           index
           accum
 
   # Returns index of the last particular item in list.
   # If the list has no this item, returns -1.
   [wanted] > last-index-of
-    ^.reducedi > @
+    reducedi > @
       -1
       [accum item index] >>
         if. > @
-          item.eq ^.wanted
+          item.eq wanted
           index
           accum
 
@@ -197,7 +193,7 @@
     not. > @
       eq.
         -1
-        ^.index-of element
+        index-of element
 
   # Returns a new list sorted via `.lt` method.
   # @todo #3251:30min The object does not work. After moving `list` object
@@ -213,34 +209,29 @@
   # for the index. The result of dataization
   # the `func` should be boolean, that is `true` or `false`.
   [func] > filteredi
-    ^.origin.length > origin-length!
     list > @
-      rec-filtered 0.as-bytes *
+      rec-filteredi origin
 
-    [idx-as-bytes accum] > rec-filtered
-      ^.^.origin > original
-      idx-as-bytes.as-number > index
-      ^.^.origin.at index > item
+    [tup] > rec-filteredi
+      rec-filteredi tup.prev > next
       if. > @
-        idx-as-bytes.eq ^.origin-length
-        accum
-        ^.rec-filtered
-          (1.plus index).as-bytes
-          if.
-            ^.func item index
-            accum.with item
-            accum
+        tup.length.eq 0
+        *
+        if.
+          func tup.value tup.prev.length
+          next.with tup.value
+          next
 
   # Filter list without index with the function `func`.
   # Here `func` must be an abstract object
   # with one attribute for the element.
   # The result of dataization the `func`
   # should be boolean, that is `true` or `false`.
   [func] > filtered
-    ^.filteredi > @
-      ^.func item > [item index] >>
+    filteredi > @
+      func item > [item index] >>
 
-  # Get the first `index` elements from the start of the list.
+  # Get the first `index` elements from the start of the list. todo
   [index] > head
     index > idx!
     switch > @
@@ -268,15 +259,15 @@
   # Get the last `index` elements from the end of the list.
   [index] > tail
     index > idx!
-    ^.origin.length.minus idx.as-number > start!
+    origin.length.minus idx > start!
     if. > @
       0.gt start
       ^
       list
-        ^.reducedi
+        reducedi
           *
           [accum item idx] >>
             if. > @
-              idx.gte ^.start
+              idx.gte start
               accum.with item
               accum
diff --git a/eo-runtime/src/main/eo/org/eolang/tuple.eo b/eo-runtime/src/main/eo/org/eolang/tuple.eo
@@ -27,23 +27,24 @@
 
 # Tuple.
 # An ordered, immutable collection of elements.
-[head tail length] > tuple
-  $ > self
+[prev value length] > tuple
+  $ > as-tuple
 
   # Empty tuple.
   # A tuple with no elements. When dataized, it represents an immutable, empty collection.
   [] > empty
     $ > empty
+    $ > as-tuple
     0 > length
-    error "Can't get head from the empty tuple" > head
-    error "Can't get tail from the empty tuple" > tail
+    error "Can't get prev from the empty tuple" > prev
+    error "Can't get value from the empty tuple" > value
 
     # Take one element from the tuple, at the given position.
     error "Can't get an object from the empty tuple" > [i] > at
 
     # Create a new tuple with this element added to the end of it.
     [x] > with
-      self. > @
+      as-tuple. > @
         tuple
           ^
           x
@@ -66,12 +67,12 @@
     [tup] > at-fast
       if. > @
         (tup.length.plus -1).eq index
-        tup.tail
-        at-fast tup.head
+        tup.value
+        at-fast tup.prev
 
   # Create a new tuple with this element added to the end of it.
   [x] > with
-    self. > @
+    as-tuple. > @
       tuple
         ^
         x
diff --git a/eo-runtime/src/main/eo/org/eolang/txt/text.eo b/eo-runtime/src/main/eo/org/eolang/txt/text.eo
diff --git a/eo-runtime/src/test/eo/org/eolang/txt/sscanf-tests.eo b/eo-runtime/src/test/eo/org/eolang/txt/sscanf-tests.eo
