Merge branch '__rultor'

Author: rultor

pom.xml

@@ -119,7 +119,7 @@
     <dependency>
       <groupId>org.eolang</groupId>
       <artifactId>eo-parser</artifactId>
-      <version>0.53.0</version>
+      <version>0.55.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

src/main/resources/org/eolang/lints/critical/object-has-data.xsl

@@ -11,22 +11,30 @@
   <xsl:output encoding="UTF-8" method="xml"/>
   <xsl:template match="/">
     <defects>
-      <xsl:for-each select="//o[eo:has-data(.) and (not(@base) or @base!='Q.org.eolang.bytes')]">
+      <xsl:for-each select="//o[eo:has-data(.) and not(parent::o[@base='Q.org.eolang.bytes'])]">
         <defect>
-          <xsl:variable name="line" select="eo:lineno(@line)"/>
+          <xsl:variable name="parent" select="parent::o"/>
+          <xsl:variable name="line" select="eo:lineno($parent/@line)"/>
           <xsl:attribute name="line">
             <xsl:value-of select="$line"/>
           </xsl:attribute>
           <xsl:if test="$line = '0'">
             <xsl:attribute name="context">
-              <xsl:value-of select="eo:defect-context(.)"/>
+              <xsl:value-of select="eo:defect-context($parent)"/>
             </xsl:attribute>
           </xsl:if>
           <xsl:attribute name="severity">critical</xsl:attribute>
-          <xsl:text>Only object with @base equal to "Q.org.eolang.bytes" may contain data, </xsl:text>
-          <xsl:text>while object with @base "</xsl:text>
-          <xsl:value-of select="@base"/>
-          <xsl:text>" provided</xsl:text>
+          <xsl:text>Only object that have parent object with @base equal to "Q.org.eolang.bytes" may contain data, while</xsl:text>
+          <xsl:choose>
+            <xsl:when test="$parent/@base">
+              <xsl:text> parent object with @base </xsl:text>
+              <xsl:value-of select="eo:escape($parent/@base)"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text> anonymous parent object</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:text> provided</xsl:text>
         </defect>
       </xsl:for-each>
     </defects>

src/main/resources/org/eolang/lints/errors/empty-object.xsl

@@ -11,7 +11,7 @@
   <xsl:output encoding="UTF-8" method="xml"/>
   <xsl:template match="/">
     <defects>
-      <xsl:for-each select="/program/objects//o[not(@base) and not(o) and not(eo:atom(.))]">
+      <xsl:for-each select="/program/objects//o[not(@base) and not(o) and not(eo:atom(.)) and not(parent::o[@base='Q.org.eolang.bytes'])]">
         <xsl:element name="defect">
           <xsl:variable name="line" select="eo:lineno(@line)"/>
           <xsl:attribute name="line">

src/main/resources/org/eolang/lints/misc/sprintf-without-formatters.xsl

@@ -18,7 +18,7 @@
   <xsl:template match="/">
     <defects>
       <xsl:for-each select="//o[@base='Q.org.eolang.txt.sprintf']">
-        <xsl:variable name="text" select="o[1][@base='Q.org.eolang.string']/o[1][@base='Q.org.eolang.bytes']/text()"/>
+        <xsl:variable name="text" select="o[1][@base='Q.org.eolang.string']/o[1][@base='Q.org.eolang.bytes']/o/text()"/>
         <xsl:variable name="txt" select="translate($text, '-', '')"/>
         <xsl:variable name="formatters">
           <xsl:variable name="txt" select="translate($text, '-', '')"/>

src/main/resources/org/eolang/lints/misc/wrong-sprintf-arguments.xsl

@@ -10,25 +10,22 @@
   <!-- Find arguments in tuple -->
   <xsl:template match="o" mode="arguments" as="xs:integer">
     <xsl:choose>
-      <xsl:when test="@base='.with' and count(o)=2">
+      <xsl:when test="@base='Q.org.eolang.tuple.empty'">
+        <xsl:value-of select="0"/>
+      </xsl:when>
+      <xsl:when test="@base='Q.org.eolang.tuple'">
         <xsl:variable name="nested">
           <xsl:apply-templates select="o[1]" mode="arguments"/>
         </xsl:variable>
         <xsl:choose>
-          <xsl:when test="$nested!=-1">
+          <xsl:when test="count(o) &gt;= 2">
             <xsl:value-of select="$nested + 1"/>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="-1"/>
+            <xsl:value-of select="$nested"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <xsl:when test="@base='Q.org.eolang.tuple.empty'">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:when test="@base='Q.org.eolang.tuple.empty.with' and count(o)=1">
-        <xsl:value-of select="1"/>
-      </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="-1"/>
       </xsl:otherwise>
@@ -37,7 +34,7 @@
   <xsl:template match="/">
     <defects>
       <xsl:for-each select="//o[@base='Q.org.eolang.txt.sprintf']">
-        <xsl:variable name="text" select="o[1][@base='Q.org.eolang.string']/o[1][@base='Q.org.eolang.bytes']/text()"/>
+        <xsl:variable name="text" select="o[1][@base='Q.org.eolang.string']/o[1][@base='Q.org.eolang.bytes']/o/text()"/>
         <xsl:choose>
           <xsl:when test="count(o)&gt;2">
             <defect>
@@ -112,7 +109,7 @@
                   <xsl:attribute name="severity">
                     <xsl:text>warning</xsl:text>
                   </xsl:attribute>
-                  <xsl:text>The second argument "Q.org.eolang.txt.sprintf" object must be a right structured "Q.org.eolang.tuple" object built via ".with" method</xsl:text>
+                  <xsl:text>The second argument "Q.org.eolang.txt.sprintf" object must be a right structured "Q.org.eolang.tuple" object</xsl:text>
                 </defect>
               </xsl:when>
               <xsl:otherwise>

src/main/resources/org/eolang/motives/critical/object-has-data.md

@@ -9,7 +9,7 @@ Incorrect:
 <program>
   <objects>
     <o name="bar" base="foo">
-      A1-B2-C3-D4-E5
+      <o>A1-B2-C3-D4-E5</o>
     </o>
   </objects>
 </program>
@@ -21,7 +21,7 @@ Correct:
 <program>
   <objects>
     <o name="bar" base="org.eolang.bytes">
-      A1-B2-C3-D4-E5
+      <o>A1-B2-C3-D4-E5</o>
     </o>
   </objects>
 </program>

src/test/resources/org/eolang/lints/packs/single/object-has-data/allows-data-in-bytes.yaml

@@ -9,7 +9,7 @@ document: |
   <program>
     <objects>
       <o name="foo" base="Q.org.eolang.bytes">
-       A1-B2-C3-D4-E5
+        <o>A1-B2-C3-D4-E5</o>
       </o>
     </objects>
   </program>

src/test/resources/org/eolang/lints/packs/single/object-has-data/allows-data-in-inner-objects.yaml

@@ -9,7 +9,9 @@ document: |
   <program>
     <objects>
       <o name="foo">
-        <o name="inner" base="Q.org.eolang.bytes">12-23-FF</o>
+        <o name="inner" base="Q.org.eolang.bytes">
+          <o>12-23-FF</o>
+        </o>
       </o>
     </objects>
   </program>

src/test/resources/org/eolang/lints/packs/single/object-has-data/catches-data-in-inner-objects-without-base.yaml

@@ -9,7 +9,9 @@ document: |
   <program>
     <objects>
       <o name="foo">
-        <o name="inner">12-23-FF</o>
+        <o name="inner">
+          <o>12-23-FF</o>
+        </o>
       </o>
     </objects>
   </program>

src/test/resources/org/eolang/lints/packs/single/object-has-data/catches-data-in-inner-objects.yaml

@@ -10,7 +10,9 @@ document: |
   <program>
     <objects>
       <o base="foo" name="o" line="1">
-        <o name="i" line="2">TEST</o>
+        <o name="i" line="2">
+          <o>TEST</o>
+        </o>
       </o>
     </objects>
   </program>