Merge branch '__rultor'

objectionary · Apr 19, 2024 · b2aed6a · b2aed6a · 0pdd · Apr 19, 2024
2 parents a510606 + d5195dd
commit b2aed6a
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 113 deletions.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/optimization/OptTrain.java b/eo-maven-plugin/src/main/java/org/eolang/maven/optimization/OptTrain.java
@@ -35,6 +35,9 @@
 /**
  * Optimisation train of XLS`s.
  * @since 0.28.12
+ * @todo #3115:30min Return constant-folding.xsl when it's ready. This optimization was removed from
+ *  the train because it's not really ready and works only with `bool` object which was removed. We
+ *  need to make this optimization great again and add to the train.
  */
 public final class OptTrain implements Optimization {
 
@@ -57,7 +60,6 @@ public final class OptTrain implements Optimization {
             "/org/eolang/parser/optimize/fix-missed-names.xsl",
             "/org/eolang/parser/add-refs.xsl",
             "/org/eolang/parser/errors/broken-refs.xsl",
-            "/org/eolang/parser/optimize/constant-folding.xsl",
             "/org/eolang/parser/set-locators.xsl"
         ).back(),
         TrFast.class,

diff --git a/eo-parser/src/main/java/org/eolang/parser/StUnhex.java b/eo-parser/src/main/java/org/eolang/parser/StUnhex.java
@@ -29,7 +29,6 @@
 import com.yegor256.xsline.StSequence;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.Locale;
 import org.apache.commons.text.StringEscapeUtils;
 import org.xembly.Directive;
 import org.xembly.Directives;
@@ -72,17 +71,6 @@ public StUnhex() {
                             )
                         )
                     ),
-                    new StXPath(
-                        StUnhex.xpath("bool"),
-                        xml -> StUnhex.append(
-                            "bool",
-                            Boolean.toString(
-                                !"00".equals(
-                                    StUnhex.unspace(xml.xpath("./o/text()").get(0))
-                                )
-                            ).toUpperCase(Locale.ENGLISH)
-                        )
-                    ),
                     new StXPath(
                         StUnhex.xpath("string"),
                         xml -> StUnhex.append(

diff --git a/eo-parser/src/main/resources/org/eolang/parser/_datas.xsl b/eo-parser/src/main/resources/org/eolang/parser/_datas.xsl
@@ -28,6 +28,5 @@ SOFTWARE.
     <a>org.eolang.string</a>
     <a>org.eolang.int</a>
     <a>org.eolang.float</a>
-    <a>org.eolang.bool</a>
   </xsl:variable>
 </xsl:stylesheet>
diff --git a/eo-parser/src/main/resources/org/eolang/parser/explicit-data.xsl b/eo-parser/src/main/resources/org/eolang/parser/explicit-data.xsl
@@ -41,18 +41,16 @@ SOFTWARE.
         00 00 00 00 00 00 00 01                  =>      00 00 00 00 00 00 00 01
       </o>                                             </o>
     </o>                                             </o>
-  - <o base=".bool" name="b">                        <o base=".bool" name="b">
+  - <o base=".int" name="b">                        <o base=".int" name="b">
       <o base=".eolang">                               <o base=".eolang">
         <o base=".org">                                  <o base="org">
           <o base="Q"></o>                                 <o base="Q"/>
         </o>                                             </o>
       </o>                                             </o>
-      <o base="org.eolang.bool" data="bytes">    =>    <o base="org.eolang.bool">
-        01                                               <o base="org.eolang.bytes" data="bytes">
-      </o>                                                 01
-    </o>                                                 </o>
-                                                       </o>
-                                                     </o>
+      <o base="org.eolang.int" data="bytes">    =>    <o base="org.eolang.bytes" data="bytes">
+        01                                               01
+      </o>                                             </o>
+    </o>                                             </o>
   -->
   <xsl:import href="/org/eolang/parser/_datas.xsl"/>
   <xsl:output encoding="UTF-8" method="xml"/>

diff --git a/eo-parser/src/test/java/org/eolang/parser/StUnhexTest.java b/eo-parser/src/test/java/org/eolang/parser/StUnhexTest.java
@@ -115,38 +115,4 @@ void convertsFloatFromHexToEo() {
             )
         );
     }
-
-    @Test
-    void convertsTrueFromHexToEo() {
-        MatcherAssert.assertThat(
-            StUnhexTest.EMPTY_MSG,
-            new Xsline(new StUnhex()).pass(
-                new XMLDocument(
-                    String.join(
-                        "",
-                        "<p><o base='bool' name='a'><o base='bytes' data='bytes'>01</o></o>",
-                        "<o base='bool' name='b'><o base='bytes' data='bytes'>00</o></o></p>"
-                    )
-                )
-            ),
-            XhtmlMatchers.hasXPaths(
-                "//o[text()='TRUE' and @data='bool' and @name='a']",
-                "//o[text()='FALSE' and @data='bool' and @name='b']"
-            )
-        );
-    }
-
-    @Test
-    void convertsFalseFromHexToEo() {
-        MatcherAssert.assertThat(
-            StUnhexTest.EMPTY_MSG,
-            new Xsline(new StUnhex()).pass(
-                new XMLDocument(
-                    "<p><o base='bool'><o base='org.eolang.bytes' data='bytes'>00</o></o></p>"
-                )
-            ),
-            XhtmlMatchers.hasXPaths("//o[text()='FALSE' and @data='bool']")
-        );
-    }
-
 }
diff --git a/eo-parser/src/test/resources/org/eolang/parser/packs/explicit-data.yaml b/eo-parser/src/test/resources/org/eolang/parser/packs/explicit-data.yaml
@@ -8,8 +8,6 @@ tests:
   - //o[@base='org.eolang.int' and @name='first' and o[@base='org.eolang.bytes' and @data]]
   - //o[@base='org.eolang.float' and @name='bts' and o[@base='org.eolang.bytes' and @data]]
   - //o[@base='org.eolang.float' and @name='second' and o[@base='org.eolang.bytes' and @data]]
-  - //o[@name='third' or (@base='true' and @name='third' and not(@data) and count(o)=0)]
-  - //o[@name='tfalse' or (@base='false' and @name='tfalse' and not(@data) and count(o)=0)]
   - //o[@base='org.eolang.bytes' and @name='fourth' and count(o)=0 and @data]
   - //o[@base='.string' and @name='str' and count(o)=2 and o[last() and @base='org.eolang.bytes' and @data]]
   - //o[@base='org.eolang.bytes' and @name='bt' and count(o)=0 and @data]
@@ -18,8 +16,6 @@ eo: |
   42 > first
   float 11-21 > bts
   float 22.2 > second
-  QQ.bool 01- > third
-  Q.org.eolang.bool 00- > tfalse
   QQ.bytes > fourth
     11-21
   Q.org.eolang.string "Hey" > str

diff --git a/eo-runtime/src/main/eo/org/eolang/bool.eo b/eo-runtime/src/main/eo/org/eolang/bool.eo
diff --git a/eo-runtime/src/main/eo/org/eolang/bytes.eo b/eo-runtime/src/main/eo/org/eolang/bytes.eo
@@ -29,7 +29,7 @@
 # Bytes.
 [] > bytes
   # Equals to another object.
-  [x] > eq /bool
+  [b] > eq /bool
 
   # Total number of bytes.
   [] > size /int

diff --git a/eo-runtime/src/main/eo/org/eolang/false.eo b/eo-runtime/src/main/eo/org/eolang/false.eo
@@ -26,9 +26,10 @@
 +rt jvm org.eolang:eo-runtime:0.0.0
 +version 0.0.0
 
-# True.
+# False.
 [] > false
-  bool 00- > @
+  00- > @
+  true > not
 
   # Control structure that allows for conditional execution of code.
   # Since $ is FALSE - behaves as `right` object.

diff --git a/eo-runtime/src/main/eo/org/eolang/true.eo b/eo-runtime/src/main/eo/org/eolang/true.eo
@@ -28,7 +28,8 @@
 
 # True.
 [] > true
-  bool 01- > @
+  01- > @
+  false > not
 
   # Control structure that allows for conditional execution of code.
   # Since $ is TRUE - behaves as `left` object.

diff --git a/eo-runtime/src/test/eo/org/eolang/while-tests.eo b/eo-runtime/src/test/eo/org/eolang/while-tests.eo
@@ -28,10 +28,10 @@
 
 # Test.
 [] > simple-while-with-false-first
-  while > res
-    false
-    true > [i]
-  (bool res).not > @
+  not. > @
+    while > res
+      false
+      true > [i]
 
 # Test.
 [] > simple-bool-expression-via-memory-in-while

diff --git a/eo-runtime/src/test/resources/org/eolang/snippets/all.yaml b/eo-runtime/src/test/resources/org/eolang/snippets/all.yaml
@@ -12,7 +12,7 @@ eo: |
         42
     # This is the default 64+ symbols comment in front of named abstract object.
     [x] > foo
-      if > @
+      if. > @
         x.eq 0
         error "x is zero"
         42

diff --git a/eo-runtime/src/test/resources/org/eolang/snippets/fibo.yaml b/eo-runtime/src/test/resources/org/eolang/snippets/fibo.yaml
@@ -11,7 +11,7 @@ eo: |
   [args] > fibo
     # This is the default 64+ symbols comment in front of named abstract object.
     [n] > f
-      if > @
+      if. > @
         n.lt 2
         n
         plus.

diff --git a/eo-runtime/src/test/resources/org/eolang/snippets/ifthenelse.yaml b/eo-runtime/src/test/resources/org/eolang/snippets/ifthenelse.yaml
@@ -10,7 +10,7 @@ eo: |
   [args] > ifthenelse
     # This is the default 64+ symbols comment in front of named abstract object.
     [n] > f
-      if > @
+      if. > @
         n.lt 0
         "smaller"
         "greater"
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ eo: | @@
         # This is the default 64+ symbols comment in front of named abstract object.
         [x] > foo
-          if > @
+          if. > @
             x.eq 0
             error "x is zero"
@@ Expand Down @@