Version 1.3.0.

Deprecate some null-wrapping methods. Add sortedInReverse. Add I/O functions based on Input and Output typeclasses and deprecate some old I/O. Add dot. Simplify PrintingMode givens. Make timers AutoCloseable. (Redo grading code in T module.)
charpov · Aug 15, 2024 · c354d24 · c354d24
1 parent fe49c2b
commit c354d24
Show file tree

Hide file tree

Showing 139 changed files with 6,373 additions and 1,009 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,10 +13,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up JDK 21
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
-        java-version: '21'
+        java-version: '11'
         distribution: 'temurin'
         cache: 'sbt'
 

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.17
+version = 3.8.3
 runner.dialect = scala3
 
 fileOverride {
@@ -27,16 +27,16 @@ newlines {
 }
 
 spaces {
-  beforeContextBoundColon = Always
+  beforeContextBoundColon = IfMultipleBounds
   inImportCurlyBraces = true
   afterSymbolicDefs = true
 }
 
 literals {
-  long=Upper
-  float=Lower
-  double=Lower
-  hexPrefix=Lower
-  hexDigits=Upper
-  scientific=Upper
+  long = Upper
+  float = Lower
+  double = Lower
+  hexPrefix = Lower
+  hexDigits = Upper
+  scientific = Upper
 }
diff --git a/J/src/main/java/tinyscalautils/java/Text.java b/J/src/main/java/tinyscalautils/java/Text.java
@@ -8,167 +8,167 @@
  * @see tinyscalautils.text
  */
 public final class Text {
-    private Text() {
-        throw new AssertionError("this class cannot be instantiated");
-    }
+  private Text() {
+    throw new AssertionError("this class cannot be instantiated");
+  }
 
-    public final static class SILENT_MODE {
-        private SILENT_MODE() {
-            throw new AssertionError("this class cannot be instantiated");
-        }
+  public final static class SILENT_MODE {
+    private SILENT_MODE() {
+      throw new AssertionError("this class cannot be instantiated");
+    }
 
-        public static void print(Object ignoredArg) {
-        }
+    public static void print(Object ignoredArg) {
+    }
 
-        public static void println(Object ignoredArg) {
-        }
+    public static void println(Object ignoredArg) {
+    }
 
-        public static void printf(String ignoredFormat, Object... ignoredArgs) {
-        }
+    public static void printf(String ignoredFormat, Object... ignoredArgs) {
     }
+  }
 
-    public final static class STANDARD_MODE {
-        private STANDARD_MODE() {
-            throw new AssertionError("this class cannot be instantiated");
-        }
+  public final static class STANDARD_MODE {
+    private STANDARD_MODE() {
+      throw new AssertionError("this class cannot be instantiated");
+    }
 
-        public static void print(Object arg) {
-            tinyscalautils.text.StandardMode.print(arg, false);
-        }
+    public static void print(Object arg) {
+      textScala.standardMode().print(arg, false);
+    }
 
-        public static void println(Object arg) {
-            tinyscalautils.text.StandardMode.print(arg, true);
-        }
+    public static void println(Object arg) {
+      textScala.standardMode().print(arg, true);
+    }
 
-        public static void printf(String format, Object... arg) {
-            tinyscalautils.text.StandardMode.print(String.format(format, arg), false);
-        }
+    public static void printf(String format, Object... arg) {
+      textScala.standardMode().print(String.format(format, arg), false);
     }
+  }
 
-    public final static class THREAD_MODE {
-        private THREAD_MODE() {
-            throw new AssertionError("this class cannot be instantiated");
-        }
+  public final static class THREAD_MODE {
+    private THREAD_MODE() {
+      throw new AssertionError("this class cannot be instantiated");
+    }
 
-        public static void print(Object arg) {
-            tinyscalautils.text.ThreadMode.print(arg, false);
-        }
+    public static void print(Object arg) {
+      textScala.threadMode().print(arg, false);
+    }
 
-        public static void println(Object arg) {
-            tinyscalautils.text.ThreadMode.print(arg, true);
-        }
+    public static void println(Object arg) {
+      textScala.threadMode().print(arg, true);
+    }
 
-        public static void printf(String format, Object... arg) {
-            tinyscalautils.text.ThreadMode.print(String.format(format, arg), false);
-        }
+    public static void printf(String format, Object... arg) {
+      textScala.threadMode().print(String.format(format, arg), false);
     }
+  }
 
-    public final static class THREAD_TIME_DEMO_MODE {
-        private THREAD_TIME_DEMO_MODE() {
-            throw new AssertionError("this class cannot be instantiated");
-        }
+  public final static class THREAD_TIME_DEMO_MODE {
+    private THREAD_TIME_DEMO_MODE() {
+      throw new AssertionError("this class cannot be instantiated");
+    }
 
-        public static void print(Object arg) {
-            tinyscalautils.text.ThreadTimeDemoMode.print(arg, false);
-        }
+    public static void print(Object arg) {
+      textScala.threadTimeDemoMode().print(arg, false);
+    }
 
-        public static void println(Object arg) {
-            tinyscalautils.text.ThreadTimeDemoMode.print(arg, true);
-        }
+    public static void println(Object arg) {
+      textScala.threadTimeDemoMode().print(arg, true);
+    }
 
-        public static void printf(String format, Object... arg) {
-            tinyscalautils.text.ThreadTimeDemoMode.print(String.format(format, arg), false);
-        }
+    public static void printf(String format, Object... arg) {
+      textScala.threadTimeDemoMode().print(String.format(format, arg), false);
     }
+  }
 
-    public final static class THREAD_TIME_MODE {
-        private THREAD_TIME_MODE() {
-            throw new AssertionError("this class cannot be instantiated");
-        }
+  public final static class THREAD_TIME_MODE {
+    private THREAD_TIME_MODE() {
+      throw new AssertionError("this class cannot be instantiated");
+    }
 
-        public static void print(Object arg) {
-            tinyscalautils.text.ThreadTimeMode.print(arg, false);
-        }
+    public static void print(Object arg) {
+      textScala.threadTimeMode().print(arg, false);
+    }
 
-        public static void println(Object arg) {
-            tinyscalautils.text.ThreadTimeMode.print(arg, true);
-        }
+    public static void println(Object arg) {
+      textScala.threadTimeMode().print(arg, true);
+    }
 
-        public static void printf(String format, Object... arg) {
-            tinyscalautils.text.ThreadTimeMode.print(String.format(format, arg), false);
-        }
+    public static void printf(String format, Object... arg) {
+      textScala.threadTimeMode().print(String.format(format, arg), false);
     }
+  }
 
-    public final static class TIME_DEMO_MODE {
-        private TIME_DEMO_MODE() {
-            throw new AssertionError("this class cannot be instantiated");
-        }
+  public final static class TIME_DEMO_MODE {
+    private TIME_DEMO_MODE() {
+      throw new AssertionError("this class cannot be instantiated");
+    }
 
-        public static void print(Object arg) {
-            tinyscalautils.text.TimeDemoMode.print(arg, false);
-        }
+    public static void print(Object arg) {
+      textScala.timeDemoMode().print(arg, false);
+    }
 
-        public static void println(Object arg) {
-            tinyscalautils.text.TimeDemoMode.print(arg, true);
-        }
+    public static void println(Object arg) {
+      textScala.timeDemoMode().print(arg, true);
+    }
 
-        public static void printf(String format, Object... arg) {
-            tinyscalautils.text.TimeDemoMode.print(String.format(format, arg), false);
-        }
+    public static void printf(String format, Object... arg) {
+      textScala.timeDemoMode().print(String.format(format, arg), false);
     }
+  }
 
-    public final static class TIME_MODE {
-        private TIME_MODE() {
-            throw new AssertionError("this class cannot be instantiated");
-        }
+  public final static class TIME_MODE {
+    private TIME_MODE() {
+      throw new AssertionError("this class cannot be instantiated");
+    }
 
-        public static void print(Object arg) {
-            tinyscalautils.text.TimeMode.print(arg, false);
-        }
+    public static void print(Object arg) {
+      textScala.timeMode().print(arg, false);
+    }
 
-        public static void println(Object arg) {
-            tinyscalautils.text.TimeMode.print(arg, true);
-        }
+    public static void println(Object arg) {
+      textScala.timeMode().print(arg, true);
+    }
 
-        public static void printf(String format, Object... arg) {
-            tinyscalautils.text.TimeMode.print(String.format(format, arg), false);
-        }
+    public static void printf(String format, Object... arg) {
+      textScala.timeMode().print(String.format(format, arg), false);
     }
+  }
 
-    private static final TextScala textScala = new TextScala();
+  private static final TextScala textScala = new TextScala();
 
-    /**
-     * Note that, contrary to the Scala variant, this method sets {@code includeSystem} to true by default.
-     */
-    public static String printout(Runnable code) {
-        return printout(false, true, Charset.defaultCharset(), code);
-    }
+  /**
+   * Note that, contrary to the Scala variant, this method sets {@code includeSystem} to true by default.
+   */
+  public static String printout(Runnable code) {
+    return printout(false, true, Charset.defaultCharset(), code);
+  }
 
-    public static String printout(boolean includeErr, boolean includeSystem, Runnable code) {
-        return printout(includeErr, includeSystem, Charset.defaultCharset(), code);
-    }
+  public static String printout(boolean includeErr, boolean includeSystem, Runnable code) {
+    return printout(includeErr, includeSystem, Charset.defaultCharset(), code);
+  }
 
-    public static String printout(boolean includeErr, boolean includeSystem, Charset charset, Runnable code) {
-        return textScala.printout(code, includeErr, includeSystem, charset);
-    }
+  public static String printout(boolean includeErr, boolean includeSystem, Charset charset, Runnable code) {
+    return textScala.printout(code, includeErr, includeSystem, charset);
+  }
 
-    public static void info() {
-        textScala.info();
-    }
+  public static void info() {
+    textScala.info();
+  }
 
-    public static String plural(Number x, String singularForm, String pluralForm) {
-        return textScala.plural(x, singularForm, pluralForm);
-    }
+  public static String plural(Number x, String singularForm, String pluralForm) {
+    return textScala.plural(x, singularForm, pluralForm);
+  }
 
-    public static String plural(Number x, String singularForm) {
-        return textScala.plural(x, singularForm);
-    }
-
-    public static String timeString(double seconds, int unitsCount) {
-        return textScala.timeString(seconds, unitsCount);
-    }
+  public static String plural(Number x, String singularForm) {
+    return textScala.plural(x, singularForm);
+  }
 
-    public static String timeString(double seconds) {
-        return timeString(seconds, 2);
-    }
+  public static String timeString(double seconds, int unitsCount) {
+    return textScala.timeString(seconds, unitsCount);
+  }
+
+  public static String timeString(double seconds) {
+    return timeString(seconds, 2);
+  }
 }
diff --git a/J/src/main/scala/tinyscalautils/java/TextScala.scala b/J/src/main/scala/tinyscalautils/java/TextScala.scala
@@ -18,3 +18,10 @@ private final class TextScala:
 
    def timeString(seconds: Double, unitsCount: Int): String =
       tinyscalautils.text.timeString(seconds, unitsCount)
+
+   def standardMode       = tinyscalautils.text.standardMode
+   def timeMode           = tinyscalautils.text.timeMode
+   def timeDemoMode       = tinyscalautils.text.timeDemoMode
+   def threadMode         = tinyscalautils.text.threadMode
+   def threadTimeMode     = tinyscalautils.text.threadTimeMode
+   def threadTimeDemoMode = tinyscalautils.text.threadTimeDemoMode
diff --git a/S/src/main/scala/tinyscalautils/assertions/implies.scala b/S/src/main/scala/tinyscalautils/assertions/implies.scala
@@ -6,8 +6,6 @@ extension (left: Boolean)
    /** Logical implication. LHS is always evaluated. RHS is only evaluated if LHS side evaluated to
      * true.
      *
-     * Also available as `==>`
-     *
      * @since 1.1
      */
    inline infix def implies(inline right: Boolean): Boolean = !left || right

diff --git a/S/src/main/scala/tinyscalautils/collection/Queue.scala b/S/src/main/scala/tinyscalautils/collection/Queue.scala
@@ -3,14 +3,8 @@ package tinyscalautils.collection
 import java.util
 
 extension [A](queue: util.Queue[A])
-   /** Like `poll` but wrapping `null` in an option.
-    *
-    * @since 1.2
-    */
+   @deprecated("use Option instead", since = "1.3")
    def pollOption(): Option[A] = Option(queue.poll())
 
-   /** Like `peek` but wrapping `null` in an option.
-    *
-    * @since 1.2
-    */
+   @deprecated("use Option instead", since = "1.3")
    def peekOption: Option[A] = Option(queue.peek())
diff --git a/S/src/main/scala/tinyscalautils/collection/sorted.scala b/S/src/main/scala/tinyscalautils/collection/sorted.scala
@@ -0,0 +1,7 @@
+package tinyscalautils.collection
+
+import scala.collection.SeqOps
+
+extension [A, CC[_]](self: SeqOps[A, CC, CC[A]])
+   /** Sorted according to implicit order, but in reverse. */
+   def sortedInReverse[B >: A : Ordering]: CC[A] = self.sorted(using Ordering[B].reverse)