Changeset 63bde81 for doc/theses/andrew_beach_MMath/code

Timestamp:

Jul 19, 2021, 4:03:19 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

f9b68d6

Parents:

12a1013 (diff), fcaa1e4 (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:

• .gitignore (added)
• cond-catch.cpp (modified) (1 diff)
• cond-fixup.cfa (modified) (3 diffs)
• cond_catch.py (added)
• cross_catch.py (added)
• cross_finally.py (added)
• resume-empty.cfa (modified) (2 diffs)
• test.sh (modified) (11 diffs)
• throw_empty.py (added)
• throw_finally.py (added)
• throw_other.py (added)
• throw_with.py (added)

doc/theses/andrew_beach_MMath/code/cond-catch.cpp

@@ -19 +19 @@
                 throw_exception();
         } catch (EmptyException & exc) {
-                if (should_catch) {
+                if (!should_catch) {
                         throw;
                 }

doc/theses/andrew_beach_MMath/code/cond-fixup.cfa

@@ -12 +12 @@
 
 void throw_exception() {
-        throw (empty_exception){&empty_vt};
+        throwResume (empty_exception){&empty_vt};
 }
 
@@ -18 +18 @@
         try {
                 throw_exception();
-        } catch (empty_exception * exc ; should_catch) {
+        } catchResume (empty_exception * exc ; should_catch) {
                 // ...
         }
@@ -36 +36 @@
                 try {
                         cond_catch();
-                } catch (empty_exception * exc) {
+                } catchResume (empty_exception * exc) {
                         // ...
                 }

doc/theses/andrew_beach_MMath/code/resume-empty.cfa

@@ -13 +13 @@
                 unwind_empty(frames - 1);
         } else {
-                throw (empty_exception){&empty_vt};
+                throwResume (empty_exception){&empty_vt};
         }
 }
@@ -31 +31 @@
                 try {
                         unwind_empty(total_frames);
-                } catch (empty_exception *) {
+                } catchResume (empty_exception *) {
                         // ...
                 }

doc/theses/andrew_beach_MMath/code/test.sh

@@ -18 +18 @@
         *.cfa)
                 # Requires a symbolic link.
-                mmake "${1%.cfa}" "$1" ./cfa "$1" -o "${1%.cfa}"
+                mmake "${1%.cfa}" "$1" ./cfa -DNDEBUG -nodebug -O3 "$1" -o "${1%.cfa}"
                 ;;
         *.cpp)
-                mmake "${1%.cpp}-cpp" "$1" g++ "$1" -o "${1%.cpp}-cpp"
+                mmake "${1%.cpp}-cpp" "$1" g++ -DNDEBUG -O3 "$1" -o "${1%.cpp}-cpp"
                 ;;
         *.java)
@@ -39 +39 @@
         exit 0
 elif [ 2 -eq "$#" ]; then
-    TEST_LANG="$1"
-    TEST_CASE="$2"
+        TEST_LANG="$1"
+        TEST_CASE="$2"
 else
-    echo "Unknown call pattern." >&2
-    exit 2
+        echo "Unknown call pattern." >&2
+        exit 2
 fi
 
@@ -58 +58 @@
         CPP="./cond-catch-cpp $ITERATIONS 1"
         JAVA="java CondCatch $ITERATIONS 1"
+        PYTHON="./cond_catch.py $ITERATIONS 1"
         ;;
 cond-match-none)
@@ -64 +65 @@
         CPP="./cond-catch-cpp $ITERATIONS 0"
         JAVA="java CondCatch $ITERATIONS 0"
+        PYTHON="./cond_catch.py $ITERATIONS 0"
         ;;
 cross-catch)
@@ -70 +72 @@
         CPP="./cross-catch-cpp $ITERATIONS"
         JAVA="java CrossCatch $ITERATIONS"
+        PYTHON="./cross_catch.py $ITERATIONS"
         ;;
 cross-finally)
@@ -76 +79 @@
         CPP=unsupported
         JAVA="java CrossFinally $ITERATIONS"
+        PYTHON="./cross_finally.py $ITERATIONS"
         ;;
 raise-detor)
@@ -82 +86 @@
         CPP="./throw-detor-cpp $ITERATIONS $STACK_HEIGHT"
         JAVA=unsupported
+        PYTHON=unsupported
         ;;
 raise-empty)
@@ -88 +93 @@
         CPP="./throw-empty-cpp $ITERATIONS $STACK_HEIGHT"
         JAVA="java ThrowEmpty $ITERATIONS $STACK_HEIGHT"
+        PYTHON="./throw_empty.py $ITERATIONS $STACK_HEIGHT"
         ;;
 raise-finally)
@@ -94 +100 @@
         CPP=unsupported
         JAVA="java ThrowFinally $ITERATIONS $STACK_HEIGHT"
+        PYTHON="./throw_finally.py $ITERATIONS $STACK_HEIGHT"
         ;;
 raise-other)
@@ -100 +107 @@
         CPP="./throw-other-cpp $ITERATIONS $STACK_HEIGHT"
         JAVA="java ThrowOther $ITERATIONS $STACK_HEIGHT"
+        PYTHON="./throw_other.py $ITERATIONS $STACK_HEIGHT"
         ;;
 *)
@@ -112 +120 @@
 cpp) echo $CPP; $CPP;;
 java) echo $JAVA; $JAVA;;
+python) echo $PYTHON; $PYTHON;;
 *)
         echo "No such language: $TEST_LANG" >&2
         exit 2
+        ;;
 esac