Changeset b78c54f for doc/theses/mike_brooks_MMath/programs

Timestamp:

Apr 12, 2024, 7:49:21 AM (18 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

3e1cd17, 90320ac

Parents:

feb999f (diff), ab780e6 (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-carray-arrty.c (modified) (1 diff)
• bkgd-carray-decay.c (modified) (2 diffs)

doc/theses/mike_brooks_MMath/programs/bkgd-carray-arrty.c

@@ -57 +57 @@
         f( &ar );
 
-        float fs[] = {3.14, 1.707};
+        float fs[] = {3.14, 1.77};
         char cs[] = "hello";
         static_assert( sizeof(fs) == 2 * sizeof(float) );
         static_assert( sizeof(cs) == 6 * sizeof(char) );  $\C{// 5 letters + 1 null terminator}$
 
+        float fm[][2] = { {3.14, 1.77}, {12.4, 0.01}, {7.8, 1.23} };  $\C{// brackets define structuring}$
+        char cm[][sizeof("hello")] = { "hello", "hello", "hello" };
+        static_assert( sizeof(fm) == 3 * 2 * sizeof(float) );
+        static_assert( sizeof(cm) == 3 * 6 * sizeof(char) );
 }
 

doc/theses/mike_brooks_MMath/programs/bkgd-carray-decay.c

@@ -4 +4 @@
         float (*pa)[10] = &a;           $\C{// pointer to array}$
         float a0 = a[0];                        $\C{// element}$
-        float *pa0 = &(a[0]);           $\C{// pointer to element}$
+        float * pa0 = &(a[0]);          $\C{// pointer to element}$
 
-        float *pa0x = a;                        $\C{// (ok)}$
+        float * pa0x = a;                       $\C{// (ok)}$
         assert( pa0 == pa0x );
         assert( sizeof(pa0x) != sizeof(a) );
 
-        void f( float x[10], float *y ) {
-                static_assert( sizeof(x) == sizeof(void*) );
-                static_assert( sizeof(y) == sizeof(void*) );
+        void f( float x[10], float * y ) {
+                static_assert( sizeof(x) == sizeof(void *) );
+                static_assert( sizeof(y) == sizeof(void *) );
         }
         f(0,0);
@@ -22 +22 @@
 
         char ca[] = "hello";            $\C{// array on stack, initialized from read-only data}$
-        char *cp = "hello";                     $\C{// pointer to read-only data [decay here]}$
-        void edit( char c[] ) {         $\C{// param is pointer}$
+        char * cp = "hello";            $\C{// pointer to read-only data [decay here]}$
+        void edit( char c[] ) {         $\C{// parameter is pointer}$
                 c[3] = 'p';
         }
         edit( ca );                                     $\C{// ok [decay here]}$
-        edit( c p );                            $\C{// Segmentation fault}$
+        edit( cp );                                     $\C{// Segmentation fault}$
         edit( "hello" );                        $\C{// Segmentation fault [decay here]}$
 
         void decay( float x[10] ) {
-                static_assert( sizeof(x) == sizeof(void*) );
+                static_assert( sizeof(x) == sizeof(void *) );
         }
         static_assert( sizeof(a) == 10 * sizeof(float) );