Changeset 26be854

Timestamp:

Oct 1, 2023, 12:25:55 PM (14 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

7a925a41

Parents:

fd775ae

Message:

a bit of cleanup of the hotpotato tests

Location:

tests/exceptions

Files:

• hotpotato.cfa (modified) (5 diffs)
• hotpotato_checked.cfa (modified) (4 diffs)

tests/exceptions/hotpotato.cfa

@@ -35 +35 @@
 ExceptionDecl( Explode );
 ExceptionDecl( Terminate, Player * victim; );
-ExceptionDecl( Election, Player * player; );
+ExceptionDecl( Election );
 ExceptionDecl( cmd_error ); // convert(...) throws out_of_range or invalid_argument
 
@@ -47 +47 @@
 void countdown( Potato & potato ) with(potato) {
         timer += 1;
-        if ( timer == deadline ) throw ExceptionInst( Explode );
+        if ( timer == deadline ) throwResume ExceptionInst( Explode );
 } // countdown
 
@@ -86 +86 @@
 void main( Player & player ) with(player) {
     suspend;                                                                    // return immediately after establishing starter
-    
         try {
         for ( ;; ) {
@@ -93 +92 @@
             if ( partner[LEFT] == &player ) {                   // stop when only one player
                 sout | id | " wins the Match!";
-                break;
+                return;
             } // exit
             
@@ -112 +111 @@
                 sout | "election";
                 sout | " -> " | id | nonl;
-                if ( id > getId( *election->player ) ) election->player = &player; // set umpire to highest id so far
+                if ( id > getId( umpire ) ) &umpire = &player; // set umpire to highest id so far
                 vote( *partner[RIGHT], *election );
-        } catch ( Explode * ) {
+        } catchResume ( Explode * ) {
         sout | id | " is eliminated";
         if ( &player == &umpire ) {
             id = -1;                                    // remove from election
-            vote( *partner[RIGHT], ExceptionInst( Election, &player ) );                // start election
-            try {
-                poll(); 
-            } catchResume( Election * election ) {
-                &umpire = election->player;
-                sout | " : umpire " | getId( *election->player );
-            }
+            vote( *partner[RIGHT], ExceptionInst( Election ) );         // start election
+            try { poll(); } catchResume( Election * election ) {} // handle end of election
+            sout | " : umpire " | getId( umpire );
         } // if
         resumeAt( umpire, ExceptionInst( Terminate, &player ) );

tests/exceptions/hotpotato_checked.cfa

@@ -35 +35 @@
 ExceptionDecl( Explode );
 ExceptionDecl( Terminate, Player * victim; );
-ExceptionDecl( Election, Player * player; );
+ExceptionDecl( Election );
 ExceptionDecl( cmd_error ); // convert(...) throws out_of_range or invalid_argument
 
@@ -47 +47 @@
 void countdown( Potato & potato ) with(potato) {
         timer += 1;
-        if ( timer == deadline ) throw ExceptionInst( Explode );
+        if ( timer == deadline ) throwResume ExceptionInst( Explode );
 } // countdown
 
@@ -96 +96 @@
             if ( partner[LEFT] == &player ) {                   // stop when only one player
                 sout | id | " wins the Match!";
-                break;
+                return;
             } // exit
 
@@ -116 +116 @@
                 sout | "election";
                 sout | " -> " | id | nonl;
-                if ( id > getId( *election->player ) ) election->player = &player; // set umpire to highest id so far
+                if ( id > getId( umpire ) ) &umpire = &player; // set umpire to highest id so far
         resumeAt( *partner[RIGHT], *election );
         disable_ehm();              // disable ehm since we can't handle execption thrown in vote here and want to poll later
                 vote( *partner[RIGHT] );
         enable_ehm();               // enable after vote
-        } catch ( Explode * ) {
+        } catchResume( Explode * ) {
         sout | id | " is eliminated";
         if ( &player == &umpire ) {
             try {
                 id = -1;                                        // remove from election
-                resumeAt( *partner[RIGHT], ExceptionInst( Election, &player ) );
+                resumeAt( *partner[RIGHT], ExceptionInst( Election ) );
                 vote( *partner[RIGHT] );                // start election
                 checked_poll(); 
             } catchResume( Election * election ) {
-                &umpire = election->player;
-                sout | " : umpire " | getId( *election->player );
+                sout | " : umpire " | getId( umpire );
             } // try
         } // if