Changeset 011c29e

Timestamp:

Jun 29, 2024, 5:22:57 PM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

64eeb06

Parents:

73d0e3f4 (diff), bc07190 (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/jiada_liang_MMath

Files:

• CFAenum.tex (modified) (1 diff)
• test2.cfa (modified) (1 diff)

doc/theses/jiada_liang_MMath/CFAenum.tex

@@ -429 +429 @@
         @choose( rp )@ {                                                $\C{// implicit breaks}$
           case MERCURY, VENUS, EARTH, MARS:
-                sout | @label( rp )@ | "is a rocky planet";
+                sout | @rp@ | "is a rocky planet";
           case JUPITER, SATURN, URANUS, NEPTUNE:
-                sout | label( rp ) | "is a gas-giant planet";
+                sout | rp | "is a gas-giant planet";
           default:
-                sout | label( rp ) | "is not a planet";
+                sout | rp | "is not a planet";
         }
         for ( @p; Planet@ ) {                                   $\C{// enumerate}$
-                sout | "Your weight on" | ( @p == MOON@ ? "the" : " " ) | label( p )
+                sout | "Your weight on" | ( @p == MOON@ ? "the" : " " ) | p
                            | "is" | wd( 1,1,  surfaceWeight( p, earthMass ) ) | "kg";
         }

doc/theses/jiada_liang_MMath/test2.cfa

@@ -37 +37 @@
         choose( rp ) {                                                                          // implicit breaks
           case MERCURY, VENUS, EARTH, MARS:
-                sout | label( rp ) | "is a rocky planet";
+                sout | rp | "is a rocky planet";
           case JUPITER, SATURN, URANUS, NEPTUNE:
-                sout | label( rp ) | "is a gas-giant planet";
+                sout | rp | "is a gas-giant planet";
           default:
-                sout | label( rp ) | "is not a planet";
+                sout | rp | "is not a planet";
         }
 
         for ( p; Planet ) {                                                                     // enumerate
-                sout | "Your weight on" | ( p == MOON ? "the" : " " ) | label( p )
+                sout | "Your weight on" | ( p == MOON ? "the" : " " ) | p
                          | "is" | wd( 1,1,  surfaceWeight( p, earthMass ) ) | "kg";
         }
+        
 }