Changeset bd72f517 for doc/theses/mike_brooks_MMath/programs

Timestamp:

May 13, 2025, 1:17:50 PM (10 months ago)

Author:

Mike Brooks <mlbrooks@…>

Branches:

master, stuck-waitfor-destruct

Children:

0528d79

Parents:

7d02d35 (diff), 2410424 (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/mike_brooks_MMath/programs

Files:

• bkgd-cfa-arrayinteract.cfa (modified) (1 diff)
• hello-accordion.cfa (modified) (2 diffs)

doc/theses/mike_brooks_MMath/programs/bkgd-cfa-arrayinteract.cfa

@@ -3 +3 @@
 
 struct tm { int x; };
-forall (T*) T* alloc();
+forall( T * ) T * alloc();
 
 int main () {

doc/theses/mike_brooks_MMath/programs/hello-accordion.cfa

@@ -31 +31 @@
 int getPref( @School( C, S ) & school@, int is, int pref ) {
         for ( ic; C ) {
-                int curPref = @school.preferences@[ic][is];   $\C{// offset calculation implicit}$
-                if ( curPref == pref ) return ic;
+                if ( pref == @school.preferences@[ic][is]; ) return ic; $\C{// offset calculation implicit}$
         }
         assert( false );
 }
+
 
 
@@ -91 +91 @@
                 sout | school.student_ids[is] | ": " | nonl;
                 for ( pref; 1 ~= nc ) {
-                        int ic = getPref(school, is, pref);
+                        int ic = getPref( school, is, pref );
                         sout | school.course_codes[ ic ] | nonl;
                 }