Changeset c3e41cda for doc/theses/mike_brooks_MMath/programs

Timestamp:

Nov 3, 2024, 9:13:16 PM (3 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7d95bce9

Parents:

63a7394

Message:

proofread new material in background and array chapters

Location:

doc/theses/mike_brooks_MMath/programs

Files:

• hello-accordion.cfa (modified) (3 diffs)
• hello-array.cfa (modified) (1 diff)
• sharing-demo.cfa (modified) (19 diffs)

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

@@ -30 +30 @@
 forall( [C], [S] )
 int getPref( @School( C, S ) & school@, int is, int pref ) {
-    for ( ic; C ) {
-        int curPref = @school.preferences@[ic][is];   $\C{// offset calculation implicit}$
+        for ( ic; C ) {
+                int curPref = @school.preferences@[ic][is];   $\C{// offset calculation implicit}$
                 if ( curPref == pref ) return ic;
         }
-    assert( false );
+        assert( false );
 }
 
@@ -59 +59 @@
 
         {       string sv;
-        int iv;
-        // headers' row
-        sin | "\nc\\s";
-        for ( is ; ns ) {
-            // column label
-            sin | sv;
-            school.student_ids[is] = sv;
-        }
-        // body rows
-        for ( ic ; nc ) {
-            // row label
-            sin | sv;
-            school.course_codes[ic] = sv;
-            for ( is ; ns ) {
-                // matrix item
-                sin | iv;
-                school.preferences[ic][is] = iv;
-            }
-        }
-    }
+                int iv;
+                // headers' row
+                sin | "\nc\\s";
+                for ( is ; ns ) {
+                        // column label
+                        sin | sv;
+                        school.student_ids[is] = sv;
+                }
+                // body rows
+                for ( ic ; nc ) {
+                        // row label
+                        sin | sv;
+                        school.course_codes[ic] = sv;
+                        for ( is ; ns ) {
+                                // matrix item
+                                sin | iv;
+                                school.preferences[ic][is] = iv;
+                        }
+                }
+        }
 
 
@@ -91 +91 @@
                 sout | school.student_ids[is] | ": " | nonl;
                 for ( pref; 1 ~= nc ) {
-            int ic = getPref(school, is, pref);
-            sout | school.course_codes[ ic ] | nonl;
+                        int ic = getPref(school, is, pref);
+                        sout | school.course_codes[ ic ] | nonl;
                 }
                 sout | nl;

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

@@ -114 +114 @@
         f( y, y );              $\C{// ok}$
         if ( M == N )
-                f( x, @(array( float, M ) &)@y ); $\C{// ok}$
+                f( x, @(array( float, M ) &)@y ); $\C{// ok}\CRT$
 }
 

doc/theses/mike_brooks_MMath/programs/sharing-demo.cfa

@@ -108 +108 @@
         assert( s2 == "bbb" );
         sout | xstr(S2bbb) | "\t& " | s1 | "\t& " | s1a | "\t& " | s2 | "\t\\\\";
-      
-    #define S2S1a s2  = s1a
+
+        #define S2S1a s2  = s1a
         S2S1a;
         assert( s1 == "aaa" );
@@ -122 +122 @@
         assert( s2 == "ccc" );
         sout | xstr(S2ccc) | "\t& " | s1 | "\t& " | s1a | "\t& " | s2 | "\t\\\\";
-      
+
         #define S1xxx s1  = "xxx"
         S1xxx;
@@ -149 +149 @@
 
         #define D2_s2_s1 string s2     = s1(1,2)
-        D2_s2_s1;      
+        D2_s2_s1;
         assert( s1 == "abcd" );
         assert( s1_mid == "bc" );
@@ -157 +157 @@
         sout | "\\par\\noindent";
 
-    sout | "Again, @`shareEdits@ passes changes in both directions; copy does not.  Note the difference in index values, with the \\emph{b} position being 1 in the longer string and 0 in the shorter strings.  In the case of s1 aliasing with @s1_mid@, the very same character is being accessed by different postitions.";
+        sout | "Again, @`shareEdits@ passes changes in both directions; copy does not.  Note the difference in index values, with the \\emph{b} position being 1 in the longer string and 0 in the shorter strings.  In the case of s1 aliasing with @s1_mid@, the very same character is being accessed by different postitions.";
         sout | "\\par\\noindent";
         sout | "\\begin{tabular}{llll}";
@@ -176 +176 @@
         assert( s2 == "bc" );
         sout | xstr(D2_s1mid_minus) | "\t& " | s1 | "\t& " | s1_mid | "\t& " | s2 | "\t\\\\";
-      
-    #define D2_s2_pipe s2    [0] = '|'
+
+        #define D2_s2_pipe s2    [0] = '|'
         D2_s2_pipe;
         assert( s1 == "a-cd" );
@@ -186 +186 @@
         sout | "\\par\\noindent";
 
-    sout | "Once again, assignment of a value is a modificiation that flows through the aliasing relationship, without affecting its structure.";
+        sout | "Once again, assignment of a value is a modificiation that flows through the aliasing relationship, without affecting its structure.";
         sout | "\\par\\noindent";
         sout | "\\begin{tabular}{llll}";
@@ -198 +198 @@
         assert( s2 == "|c" );
         sout | xstr(D2_s1mid_ff) | "\t& " | s1 | "\t& " | s1_mid | "\t& " | s2 | "\t\\\\";
-      
+
         #define D2_s2_gg s2     = "gg"
         D2_s2_gg;
@@ -208 +208 @@
         sout | "\\par\\noindent";
 
-    sout | "In the \\emph{ff} step, which is a positive example of flow across an aliasing relationship, the result is straightforward to accept because the flow direction is from contained (small) to containing (large).  The following rules for edits through aliasing substrings will guide how to flow in the opposite direction.";
+        sout | "In the \\emph{ff} step, which is a positive example of flow across an aliasing relationship, the result is straightforward to accept because the flow direction is from contained (small) to containing (large).  The following rules for edits through aliasing substrings will guide how to flow in the opposite direction.";
         sout | "\\par";
 
 
-    sout | "Growth and shrinkage are natural extensions.  An empty substring is a real thing, at a well-defined location, whose meaning is extrapolated from the examples so far.  The intended metaphor is to operating a GUI text editor.  Having an aliasing substring is like using the mouse to select a few words.  Assigning onto an aliasign substring is like typing from having a few words selected:  depending how much you type, the file being edited can get shorter or longer.";
+        sout | "Growth and shrinkage are natural extensions.  An empty substring is a real thing, at a well-defined location, whose meaning is extrapolated from the examples so far.  The intended metaphor is to operating a GUI text editor.  Having an aliasing substring is like using the mouse to select a few words.  Assigning onto an aliasign substring is like typing from having a few words selected:  depending how much you type, the file being edited can get shorter or longer.";
         sout | "\\par\\noindent";
         sout | "\\begin{tabular}{lll}";
@@ -219 +219 @@
 
         assert( s1 == "affd" );
-//      assert( s1_mid == "fc" );                                                     // ????????? bug?
+//      assert( s1_mid == "fc" );                                                                                                        // ????????? bug?
         sout | xstr(D2_s2_gg) | "\t& " | s1 | "\t& " | s1_mid | "\t\\\\";
 
@@ -227 +227 @@
         assert( s1_mid == "hhhh" );
         sout  | xstr(D2_s1mid_hhhh)  | "\t& " | s1 | "\t& " | s1_mid | "\t\\\\";
-      
+
         #define D2_s1mid_i s1_mid = "i"
         D2_s1mid_i;
@@ -248 +248 @@
         sout | "\\par\\noindent";
 
-    sout | "Multiple portions can be aliased.  When there are several aliasing substrings at once, the text editor analogy becomes an online multi-user editor.  I should be able to edit a paragraph in one place (changing the document's length), without my edits affecting which letters are within a mouse-selection that you had made previously, somewhere else.";
+        sout | "Multiple portions can be aliased.  When there are several aliasing substrings at once, the text editor analogy becomes an online multi-user editor.  I should be able to edit a paragraph in one place (changing the document's length), without my edits affecting which letters are within a mouse-selection that you had made previously, somewhere else.";
         sout | "\\par\\noindent";
         sout | "\\begin{tabular}{lllll}";
@@ -264 +264 @@
         assert( s1_end == "d" );
         sout  | xstr(D2_s1end_s1)  | "\t& " | s1 | "\t& " | s1_bgn | "\t& " | s1_mid | "\t& " | s1_end | "\t\\\\";
-      
+
         #define D1_s1bgn_zzz s1_bgn = "zzzz"
         D1_s1bgn_zzz;
@@ -275 +275 @@
         sout | "\\par\\noindent";
 
-    sout | "When an edit happens on an aliasing substring that overlaps another, an effect is unavoidable.  Here, the passive party sees its selection shortened, to exclude the characters that were not part of the original selection.";
+        sout | "When an edit happens on an aliasing substring that overlaps another, an effect is unavoidable.  Here, the passive party sees its selection shortened, to exclude the characters that were not part of the original selection.";
         sout | "\\par\\noindent";
         sout | "\\begin{tabular}{llllll}";
@@ -286 +286 @@
         assert( s1_crs == "zj" );
         assert( s1_mid == "jj" );
-        assert( s1_end == "d" );  
+        assert( s1_end == "d" );
         sout  | xstr(D2_s1crs_s1)  | "\t& " | s1 | "\t& " | s1_bgn | "\t& " | s1_crs | "\t& " | s1_mid | "\t& " | s1_end | "\t\\\\";
 
@@ -301 +301 @@
         sout | "TODO: finish typesetting the demo";
 
-    // "This shortening behaviour means that a modification has to occur entirely inside a substring, to show up in that substring.  Sharing changes through the intersection of partially overlapping aliases is still possible, so long as the receiver's boundary is not inside the edit."
+        // "This shortening behaviour means that a modification has to occur entirely inside a substring, to show up in that substring.  Sharing changes through the intersection of partially overlapping aliases is still possible, so long as the receiver's boundary is not inside the edit."
 
         string word = "Phi";
@@ -309 +309 @@
         assert( consonants == "Ph" );
         assert( miniscules == "hi" );
-      
+
         consonants[1] = 's';
         assert( word == "Psi" );
@@ -321 +321 @@
         string greet_bgn = all(10,1)`shareEdits;
         string greet_end = all(14,1)`shareEdits;
-      
+
         assert( all == "They said hello again" );
         assert( greet == "hello" );
         assert( greet_bgn == "h" );
         assert( greet_end == "o" );
-      
+
 
         greet = "sup";
@@ -333 +333 @@
         // assert( greet_bgn == "" );    ------ Should be so, but fails
         // assert( greet_end == "" );
-      
-
-  
-
-  
-    /* As in the earlier step where \emph{aj} becomes \emph{ajjd}, such empty substrings maintain their places in the total string, and can be used for filling it.  Because @greet_bgn@ was orginally at the start of the edit, in the outcome, the empty @greet_bgn@ sits just before the written value.  Similarly @greed_end@ goes after.  Though not shown, an overwritten substring at neither side goes arbitrarily to the before side. */
-  
-
-  
-
-        greet_bgn = "what"; 
-      
-      
+
+
+
+
+
+        /* As in the earlier step where \emph{aj} becomes \emph{ajjd}, such empty substrings maintain their places in the total string, and can be used for filling it.  Because @greet_bgn@ was orginally at the start of the edit, in the outcome, the empty @greet_bgn@ sits just before the written value.  Similarly @greed_end@ goes after.  Though not shown, an overwritten substring at neither side goes arbitrarily to the before side. */
+
+
+
+
+        greet_bgn = "what";
+
+
         assert( all == "They said whatsup again" );
-      
+
         assert( greet == "sup" );
-      
+
         assert( greet_bgn == "what" );
         // assert( greet_end == "" );    ------ Should be so, but fails
-      
-
-        greet_end = "..."; 
-      
-      
+
+
+        greet_end = "...";
+
+
         assert( all == "They said whatsup... again" );
-      
+
         assert( greet == "sup" );
-      
+
         assert( greet_bgn == "what" );
-      
+
         assert( greet_end == "..." );
-      
-
-  
-
-  
-    /* Though these empty substrings hold their places in the total string, an empty string only belongs to bigger strings when it occurs completely inside them.  There is no such state as including an empty substring at an edge.  For this reason, @word@ gains the characters added by assigning to @greet_bgn@ and @greet_end@, but the string @greet@ does not. */
-  
+
+
+
+
+
+        /* Though these empty substrings hold their places in the total string, an empty string only belongs to bigger strings when it occurs completely inside them.  There is no such state as including an empty substring at an edge.  For this reason, @word@ gains the characters added by assigning to @greet_bgn@ and @greet_end@, but the string @greet@ does not. */
+
 
 }
@@ -377 +377 @@
 int main(int argc, char ** argv) {
 
-    demo1();
-    demo2();
-    printf("%% %s done running\n", argv[0]);
+        demo1();
+        demo2();
+        printf("%% %s done running\n", argv[0]);
 }