refactor: Add Option.expect(Throwable)

Author: MarcellPerger1

src/main/java/net/marcellperger/mathexpr/util/rs/Option.java

@@ -1,5 +1,6 @@
 package net.marcellperger.mathexpr.util.rs;
 
+import net.marcellperger.mathexpr.util.ThrowingSupplier;
 import net.marcellperger.mathexpr.util.Util;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -143,6 +144,12 @@ default T expect(String msg) {
             throw new OptionPanicException(msg);
         });
     }
+    default <E extends Throwable> T expect(E excIfNone) throws E {
+        return switch (this) {
+            case None() -> throw excIfNone;
+            case Some(T value) -> value;
+        };
+    }
     default T unwrap() {
         return expect("Option.unwrap() got None value");
     }

src/test/java/net/marcellperger/mathexpr/util/rs/OptionTest.java

@@ -227,6 +227,54 @@ void expect() {
         assertNull(exc.getCause(), "Expected no cause for Option.expect()");
     }
 
+    @SuppressWarnings("unused")
+    static class MyCustomException extends RuntimeException {
+        public MyCustomException() {}
+        public MyCustomException(String message) {
+            super(message);
+        }
+        public MyCustomException(String message, Throwable cause) {
+            super(message, cause);
+        }
+        public MyCustomException(Throwable cause) {
+            super(cause);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    static class MyCustomCheckedException extends RuntimeException {
+        public MyCustomCheckedException() {}
+        public MyCustomCheckedException(String message) {
+            super(message);
+        }
+        public MyCustomCheckedException(String message, Throwable cause) {
+            super(message, cause);
+        }
+        public MyCustomCheckedException(Throwable cause) {
+            super(cause);
+        }
+    }
+
+    @Test
+    void expect_exc() {
+        {
+            MyCustomException actualExc = new MyCustomException("unchecked exc");
+            assertEquals(314, assertDoesNotThrow(() -> getSome().expect(actualExc)));
+            Option<Integer> err = getNone();
+            MyCustomException exc = assertThrows(
+                MyCustomException.class, () -> err.expect(actualExc));
+            assertEquals(exc, actualExc);
+        }
+        {
+            MyCustomCheckedException actualExc = new MyCustomCheckedException("checked exc");
+            assertEquals(314, assertDoesNotThrow(() -> getSome().expect(actualExc)));
+            Option<Integer> err = getNone();
+            MyCustomCheckedException exc = assertThrows(
+                MyCustomCheckedException.class, () -> err.expect(actualExc));
+            assertEquals(exc, actualExc);
+        }
+    }
+
     @Test
     void unwrap() {
         assertEquals(314, assertDoesNotThrow(() -> getSome().unwrap()));