std::try теперь может сразу возвращать значение из catch

try(def() = parseInt("oops"), 42)

Author: aNNiMON

src/main/java/com/annimon/ownlang/modules/std/std_try.java

@@ -14,12 +14,17 @@ public Value execute(Value... args) {
         try {
             return ((FunctionValue) args[0]).getValue().execute();
         } catch (Exception ex) {
-            if (args.length == 2 && args[1].type() == Types.FUNCTION) {
-                final String message = ex.getMessage();
-                final Function catchFunction = ((FunctionValue) args[1]).getValue();
-                return catchFunction.execute(
-                        new StringValue(ex.getClass().getName()),
-                        new StringValue(message == null ? "" : message));
+            if (args.length == 2) {
+                switch (args[1].type()) {
+                    case Types.FUNCTION:
+                        final String message = ex.getMessage();
+                        final Function catchFunction = ((FunctionValue) args[1]).getValue();
+                        return catchFunction.execute(
+                                new StringValue(ex.getClass().getName()),
+                                new StringValue(message == null ? "" : message));
+                    default:
+                        return args[1];
+                }
             }
             return NumberValue.MINUS_ONE;
         }

src/test/resources/modules/std/try.own

@@ -0,0 +1,16 @@
+use "std"
+
+def testTryOnly() {
+  assertEquals(1, try(def() = 1))
+  assertEquals(-1, try(def() = parseInt("oops")))
+}
+
+def testCatchFunction() {
+  actual = try(def() = parseInt("oops"), def(class, cause) = class)
+  assertEquals("java.lang.NumberFormatException", actual)
+}
+
+def testCatchValue() {
+  actual = try(def() = parseInt("oops"), 42)
+  assertEquals(42, actual)
+}