Changeset 0a061c0 for doc/theses/andrew_beach_MMath/code

Timestamp:

Aug 4, 2021, 4:54:14 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

d2cdd4f

Parents:

d83b266 (diff), 199894e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

doc/theses/andrew_beach_MMath/code

Files:

• ThrowFinally.java (modified) (1 diff)
• ThrowOther.java (modified) (1 diff)
• run.sh (added)

doc/theses/andrew_beach_MMath/code/ThrowFinally.java

@@ -7 +7 @@
                         throws EmptyException {
                 if (0 < frames) {
-                        unwind_finally(frames - 1);
+                        try {
+                                unwind_finally(frames - 1);
+                        } finally {
+                                // ...
+                        }
                 } else {
                         throw new EmptyException();

doc/theses/andrew_beach_MMath/code/ThrowOther.java

@@ -16 +16 @@
                                 // ...
                         }
+                } else if (should_throw) {
+                        throw new NotRaisedException();
                 } else {
-                        if (should_throw) {
-                                throw new NotRaisedException();
-                        }
                         throw new EmptyException();
                 }