janino\src\org\codehaus\janino\util\iterator\ScopeIterator.java

and:

janino\src\org\codehaus\janino\scope_iterator.patch

Then apply scope_iterator.patch to UnitCompiler.java.

This fixes up the ugly scope iteration issues for the break
and continue statements in try blocks.

The fix will go into 2.4.6.

The concept of your "ScopeIterator" is nice but not completely correct: It is not correct to iterate while "s instanceof Scope", but actually the conditions of when to terminate the iteration is very different depending on what you do (look up a type, a local variable, a breakable statement...). That's why I have not isolated that functionality in a "ScopeIterator" or alike.

However I am confident that now most of all bugs related to the introduction of the CatchClause (if not all) are now fixed.

CU

Arno