#3735: show line number

objectionary · Dec 23, 2024 · f9d7a3c · f9d7a3c
1 parent c53993c
commit f9d7a3c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/eo-runtime/src/main/java/org/eolang/PhSafe.java b/eo-runtime/src/main/java/org/eolang/PhSafe.java
@@ -174,6 +174,11 @@ private <T> T through(final Action<T> action) {
 
     /**
      * Helper, for other methods.
+     *
+     * <p>No matter what happens inside the {@code action}, only
+     * an instance of {@link EOerror.ExError} may be thrown out
+     * of this method.</p>
+     *
      * @param action The action
      * @param suffix The suffix to add to the label
      * @param <T> Type of result
@@ -186,11 +191,27 @@ private <T> T through(final Action<T> action, final String suffix) {
             return action.act();
         } catch (final EOerror.ExError ex) {
             throw new EOerror.ExError(ex, this.label(suffix));
-        } catch (final RuntimeException | Error ex) {
+        } catch (final ExAbstract ex) {
             throw new EOerror.ExError(
                 new Data.ToPhi(ex.getMessage()),
                 this.label(suffix)
             );
+        } catch (final RuntimeException | Error ex) {
+            final StringBuilder msg = new StringBuilder(0);
+            final StackTraceElement[] stack = ex.getStackTrace();
+            if (stack != null && stack.length > 0) {
+                final StackTraceElement last = stack[0];
+                msg.append(last.getFileName()).append(':')
+                    .append(last.getLineNumber()).append(':')
+                    .append(' ');
+            }
+            msg.append(ex.getClass().getSimpleName())
+                .append(": ")
+                .append(ex.getMessage());
+            throw new EOerror.ExError(
+                new Data.ToPhi(msg.toString()),
+                this.label(suffix)
+            );
         }
     }
 

diff --git a/eo-runtime/src/test/java/org/eolang/PhSafeTest.java b/eo-runtime/src/test/java/org/eolang/PhSafeTest.java
@@ -107,7 +107,11 @@ public Phi take(final String name) {
                     "throws correct class"
                 ).enclosure()
             ).take(String.class),
-            Matchers.equalTo("intentional error")
+            Matchers.allOf(
+                Matchers.startsWith("PhSafeTest.java:"),
+                Matchers.containsString("IllegalArgumentException"),
+                Matchers.containsString("intentional error")
+            )
         );
     }