Merge pull request #4887 from volodya-lombrozo/4884-qulice-upgrade

build(#4884): upgrade qulice to version 0.25.1 for eo-parser

Author: yegor256

eo-parser/pom.xml

@@ -213,6 +213,7 @@
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
+            <version>0.25.1</version>
             <configuration>
               <excludes>
                 <exclude>checkstyle:/src/main/java/org/eolang/parser/XeEoListener.java</exclude>

eo-parser/src/main/java/org/eolang/parser/DrListing.java

@@ -33,16 +33,19 @@ final class DrListing implements Iterable<Directive> {
 
     @Override
     public Iterator<Directive> iterator() {
-        final String text = this.context.getStart().getInputStream().getText(
-            new Interval(
-                this.context.getStart().getStartIndex(),
-                this.context.getStop().getStopIndex()
-            )
-        );
         return new Directives()
             .xpath("/object")
             .strict(1).add("listing")
-            .set(StringEscapeUtils.escapeXml11(text))
+            .set(
+                StringEscapeUtils.escapeXml11(
+                    this.context.getStart().getInputStream().getText(
+                        new Interval(
+                            this.context.getStart().getStartIndex(),
+                            this.context.getStop().getStopIndex()
+                        )
+                    )
+                )
+            )
             .iterator();
     }
 }

eo-parser/src/main/java/org/eolang/parser/EoIndentLexer.java

@@ -8,7 +8,7 @@
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedList;
-import java.util.Stack;
+import java.util.concurrent.ConcurrentLinkedDeque;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonToken;
@@ -35,7 +35,7 @@ final class EoIndentLexer extends EoLexer {
     /**
      * Spaces.
      */
-    private final Stack<String> spaces;
+    private final Deque<String> spaces;
 
     /**
      * Ctor.
@@ -56,7 +56,7 @@ private EoIndentLexer(final CharStream stream) {
             Collections.singletonList(0)
         );
         this.tokens = new LinkedList<>();
-        this.spaces = new Stack<>();
+        this.spaces = new ConcurrentLinkedDeque<>();
     }
 
     @Override

eo-parser/src/main/java/org/eolang/parser/EoSyntax.java

@@ -173,6 +173,7 @@ public EoSyntax(final Input ipt) {
      * @return Parsed XML
      * @throws IOException If fails
      */
+    @SuppressWarnings("PMD.UnnecessaryLocalRule")
     public XML parsed() throws IOException {
         final List<Text> lines = this.lines();
         final GeneralErrors spy = new GeneralErrors(lines);

eo-parser/src/main/java/org/eolang/parser/ObjectName.java

@@ -10,5 +10,6 @@
  * Object name.
  * @since 0.56.5
  */
+@FunctionalInterface
 public interface ObjectName extends Supplier<String> {
 }

eo-parser/src/main/java/org/eolang/parser/OnDefault.java

@@ -40,6 +40,7 @@ public OnDefault(final Xnav nav) {
     }
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryLocalRule")
     public String get() {
         final String obj = this.name()
             .orElseThrow(

eo-parser/src/main/java/org/eolang/parser/StrictXmir.java

@@ -44,8 +44,14 @@
  * then encapsulate it into this decorator.</p>
  *
  * @since 0.49.0
+ * @todo #4884:30min Replace synchronized statements with ReentrantLock.
+ *  We are getting the following complaint about {@ling StrictXmir}:
+ *  StrictXmir.java[244-289]: Use ReentrantLock rather than synchronization
+ *  (AvoidSynchronizedStatement). It's better to consider this replacement.
+ *  Don't forget to remove  PMD.AvoidSynchronizedStatement from the
+ *  SuppressWarnings annotation of this class.
  */
-@SuppressWarnings("PMD.TooManyMethods")
+@SuppressWarnings({"PMD.TooManyMethods", "PMD.AvoidSynchronizedStatement"})
 public final class StrictXmir implements XML {
     /**
      * XSD for current EO version.
@@ -76,7 +82,6 @@ public StrictXmir(final XML src) {
      * @param before The XML source
      * @param tmp The directory with cached XSD files
      */
-    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
     public StrictXmir(final XML before, final Path tmp) {
         this.xml = new Unchecked<>(
             new Synced<>(

eo-parser/src/main/java/org/eolang/parser/Syntax.java

@@ -22,6 +22,7 @@
  * @see org.eolang.parser.EoSyntax Implementation for EO language
  * @since 0.34.0
  */
+@FunctionalInterface
 interface Syntax {
     /**
      * Parses the source input and transforms it into XMIR format.

eo-parser/src/main/java/org/eolang/parser/XeEoListener.java

@@ -31,8 +31,8 @@
     "PMD.TooManyMethods",
     "PMD.AvoidDuplicateLiterals",
     "PMD.ExcessivePublicCount",
-    "PMD.ExcessiveClassLength",
-    "PMD.GodClass"
+    "PMD.GodClass",
+    "PMD.CouplingBetweenObjects"
 })
 final class XeEoListener implements EoListener, Iterable<Directive> {
     /**
@@ -102,10 +102,9 @@ public void enterMetas(final EoParser.MetasContext ctx) {
         this.dirs.addIf("metas");
         for (final TerminalNode node : ctx.META()) {
             final String[] pair = node.getText().split(" ", 2);
-            final String head = pair[0].substring(1);
             this.dirs.add("meta")
                 .attr("line", node.getSymbol().getLine())
-                .add("head").set(head).up()
+                .add("head").set(pair[0].substring(1)).up()
                 .add("tail");
             if (pair.length > 1) {
                 this.dirs.set(XeEoListener.qqToGlobalPhi(pair[1].trim())).up();
@@ -416,7 +415,6 @@ public void exitHapplicationHeadExtended(
     }
 
     @Override
-    @SuppressWarnings("PMD.ConfusingTernary")
     public void enterApplicable(final EoParser.ApplicableContext ctx) {
         this.objects.start(ctx);
         final String base;
@@ -539,6 +537,7 @@ public void enterCompactTuple(final EoParser.CompactTupleContext ctx) {
     }
 
     @Override
+    @SuppressWarnings("PMD.UseStringIsEmptyRule")
     public void exitCompactTuple(final EoParser.CompactTupleContext ctx) {
         final int count;
         if (ctx.INT() != null) {
@@ -807,7 +806,6 @@ public void exitMethodTail(final EoParser.MethodTailContext ctx) {
     }
 
     @Override
-    @SuppressWarnings("PMD.ConfusingTernary")
     public void enterBeginner(final EoParser.BeginnerContext ctx) {
         this.objects.start(ctx);
         if (ctx.data() == null) {
@@ -836,7 +834,6 @@ public void exitBeginner(final EoParser.BeginnerContext ctx) {
     }
 
     @Override
-    @SuppressWarnings("PMD.ConfusingTernary")
     public void enterFinisher(final EoParser.FinisherContext ctx) {
         this.objects.start(ctx);
         final String base;
@@ -944,7 +941,6 @@ public void exitTarrow(final EoParser.TarrowContext ctx) {
     }
 
     @Override
-    @SuppressWarnings("PMD.ConfusingTernary")
     public void enterSuffix(final EoParser.SuffixContext ctx) {
         this.objects.enter();
         if (ctx.PHI() != null) {
@@ -980,7 +976,6 @@ public void exitScope(final EoParser.ScopeContext ctx) {
     }
 
     @Override
-    @SuppressWarnings("PMD.ConfusingTernary")
     public void enterAs(final EoParser.AsContext ctx) {
         this.objects.enter();
         final String has;
@@ -998,7 +993,6 @@ public void exitAs(final EoParser.AsContext ctx) {
     }
 
     @Override
-    @SuppressWarnings("PMD.ConfusingTernary")
     public void enterData(final EoParser.DataContext ctx) {
         final String text = ctx.getText();
         if (ctx.BYTES() != null) {
@@ -1023,7 +1017,7 @@ public void enterData(final EoParser.DataContext ctx) {
                 data = new BytesToHex(
                     ByteBuffer
                         .allocate(Double.BYTES)
-                        .putDouble(((Long) Long.parseLong(text.substring(2), 16)).doubleValue())
+                        .putDouble(Long.parseLong(text.substring(2), 16))
                         .array()
                 );
             } else if (ctx.STRING() != null) {
@@ -1035,10 +1029,9 @@ public void enterData(final EoParser.DataContext ctx) {
                 );
             } else {
                 base = "Φ.org.eolang.string";
-                final int indent = ctx.getStart().getCharPositionInLine();
                 data = new BytesToHex(
                     StringEscapeUtils.unescapeJava(
-                        XeEoListener.trimMargin(text, indent)
+                        XeEoListener.trimMargin(text, ctx.getStart().getCharPositionInLine())
                     ).getBytes(StandardCharsets.UTF_8)
                 );
             }
@@ -1113,6 +1106,7 @@ private Objects startTest(final ParserRuleContext ctx) {
      * @param comment As they come from the parser
      * @param stop Stop line of the comment
      */
+    @SuppressWarnings("PMD.UseStringIsEmptyRule")
     private void putComment(final List<EoParser.CommentContext> comment, final Token stop) {
         if (!comment.isEmpty()) {
             this.dirs.push().xpath("/object").addIf("comments").add("comment").set(
@@ -1161,13 +1155,12 @@ private String alphaAttr(final ParserRuleContext ctx, final String msg) {
      * @return Trimmed text.
      */
     private static String trimMargin(final String text, final int indent) {
-        final String rexp = "[\\s]{%d}";
         final String cutted = text
             .substring(3, text.length() - 3).trim();
         final String[] splitted = cutted.split("\n");
         StringBuilder res = new StringBuilder();
         for (final String line : splitted) {
-            res.append(line.replaceAll(String.format(rexp, indent), "")).append('\n');
+            res.append(line.replaceAll(String.format("[\\s]{%d}", indent), "")).append('\n');
         }
         if (res.length() > 0 && res.charAt(0) == '\n') {
             res = new StringBuilder(res.substring(1));

eo-parser/src/test/java/benchmarks/XmirBench.java

@@ -51,7 +51,6 @@ public class XmirBench {
      * @param args Arguments.
      * @throws RunnerException If something goes wrong.
      */
-    @SuppressWarnings("PMD.ProhibitPublicStaticMethods")
     public static void main(final String[] args) throws RunnerException {
         new Runner(
             new OptionsBuilder()