feat(objectionary#540): accuratly handle try-with-resources blocks

volodya-lombrozo · Oct 10, 2024 · dd76e0e · dd76e0e
1 parent 7f43c43
commit dd76e0e
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 3 deletions.
diff --git a/src/main/java/org/eolang/jeo/representation/bytecode/BytecodeMethod.java b/src/main/java/org/eolang/jeo/representation/bytecode/BytecodeMethod.java
@@ -701,9 +701,9 @@ private int computeLocalsWithCFG2() {
                 continue;
             }
 
-            catches(current).stream().forEach(ind -> {
-                worklist.put(ind, new Variables(curr.getValue()));
-            });
+//            catches(current).stream().forEach(ind -> {
+//                worklist.put(ind, new Variables(curr.getValue()));
+//            });
 
 
             currentVars = new Variables(curr.getValue());
@@ -738,6 +738,9 @@ private int computeLocalsWithCFG2() {
                     }
                 }
                 final Variables value = new Variables(currentVars);
+                this.catches(current).stream().forEach(ind -> {
+                    worklist.put(ind, new Variables(value));
+                });
                 all.put(current, value);
                 current++;
             }

diff --git a/src/test/resources/maxs/Maxs.java b/src/test/resources/maxs/Maxs.java
@@ -40,6 +40,7 @@
 import java.util.Locale;
 import java.util.function.Function;
 import java.util.stream.Stream;
+import java.util.ArrayList;
 
 
 /**
@@ -793,6 +794,40 @@ public long contentLength(int x) throws IOException, URISyntaxException {
             return connection.getContentLengthLong();
         }
     }
+    private final Object statusListenerListLock = new Object();
+    private final List<Object> statusListenerList = new ArrayList<>();
+
+    public boolean add(Object listener) {
+        synchronized (this.statusListenerListLock) {
+            if (listener instanceof String) {
+                boolean isPresent = this.checkForPresence(this.statusListenerList, listener.getClass());
+                if (isPresent) {
+                    return false;
+                }
+            }
+            this.statusListenerList.add(listener);
+            return true;
+        }
+    }
+
+    private boolean checkForPresence(List<Object> list, Class<?> cls) {
+        for (Object obj : list) {
+            if (obj.getClass().equals(cls)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void displayListeners() {
+        synchronized (this.statusListenerListLock) {
+            System.out.println("Current Listeners:");
+            for (Object listener : statusListenerList) {
+                System.out.println(" - " + listener + " (" + listener.getClass().getSimpleName() + ")");
+            }
+        }
+    }
+
 
     // Inner class to add complexity
     private class Inner {