Changeset 0052ada


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

Legend:

Unmodified
Added
Removed
  • doc/theses/andrew_beach_MMath/code/CondMatch.java

    re49b6f5 r0052ada  
    2222        public static void main(String[] args) {
    2323                int times = 1;
    24                 int total_frames = 1;
    2524                if (0 < args.length) {
    2625                        times = Integer.parseInt(args[0]);
    2726                }
    2827                if (1 < args.length) {
    29                         total_frames = Integer.parseInt(args[1]);
     28                        should_catch = 0 != Integer.parseInt(args[1]);
    3029                }
    3130
  • doc/theses/andrew_beach_MMath/code/cond-match-r.cfa

    re49b6f5 r0052ada  
    2525int main(int argc, char * argv[]) {
    2626        unsigned int times = 1;
    27         unsigned int total_frames = 1;
    2827        if (1 < argc) {
    2928                times = strtol(argv[1], 0p, 10);
    3029        }
    3130        if (2 < argc) {
    32                 total_frames = strtol(argv[2], 0p, 10);
     31                should_catch = strtol(argv[2], 0p, 10);
    3332        }
    3433
  • doc/theses/andrew_beach_MMath/code/cond-match.cfa

    re49b6f5 r0052ada  
    2828                times = strtol(argv[1], 0p, 10);
    2929        }
     30        if (2 < argc) {
     31                should_catch = strtol(argv[2], 0p, 10);
     32        }
    3033
    3134        Time start_time = time();
  • doc/theses/andrew_beach_MMath/code/cond-match.cpp

    re49b6f5 r0052ada  
    2727int main(int argc, char * argv[]) {
    2828        unsigned int times = 1;
    29         unsigned int total_frames = 1;
    3029        if (1 < argc) {
    3130                times = strtol(argv[1], nullptr, 10);
    3231        }
    3332        if (2 < argc) {
    34                 total_frames = strtol(argv[2], nullptr, 10);
     33                should_catch = strtol(argv[2], nullptr, 10);
    3534        }
    3635
Note: See TracChangeset for help on using the changeset viewer.