Changeset 0052ada

Timestamp:

Jul 5, 2021, 5:21:01 PM (4 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

Children:

8ee4475

Parents:

e49b6f5 (diff), 11ad42f (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:

• CondMatch.java (modified) (1 diff)
• cond-match-r.cfa (modified) (1 diff)
• cond-match.cfa (modified) (1 diff)
• cond-match.cpp (modified) (1 diff)

doc/theses/andrew_beach_MMath/code/CondMatch.java

@@ -22 +22 @@
         public static void main(String[] args) {
                 int times = 1;
-                int total_frames = 1;
                 if (0 < args.length) {
                         times = Integer.parseInt(args[0]);
                 }
                 if (1 < args.length) {
-                        total_frames = Integer.parseInt(args[1]);
+                        should_catch = 0 != Integer.parseInt(args[1]);
                 }
 

doc/theses/andrew_beach_MMath/code/cond-match-r.cfa

@@ -25 +25 @@
 int main(int argc, char * argv[]) {
         unsigned int times = 1;
-        unsigned int total_frames = 1;
         if (1 < argc) {
                 times = strtol(argv[1], 0p, 10);
         }
         if (2 < argc) {
-                total_frames = strtol(argv[2], 0p, 10);
+                should_catch = strtol(argv[2], 0p, 10);
         }
 

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

@@ -28 +28 @@
                 times = strtol(argv[1], 0p, 10);
         }
+        if (2 < argc) {
+                should_catch = strtol(argv[2], 0p, 10);
+        }
 
         Time start_time = time();

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

@@ -27 +27 @@
 int main(int argc, char * argv[]) {
         unsigned int times = 1;
-        unsigned int total_frames = 1;
         if (1 < argc) {
                 times = strtol(argv[1], nullptr, 10);
         }
         if (2 < argc) {
-                total_frames = strtol(argv[2], nullptr, 10);
+                should_catch = strtol(argv[2], nullptr, 10);
         }