Changes in doc/uC++toCFA/uC++toCFA.tex [8659435:de8a0286]

File:

• doc/uC++toCFA/uC++toCFA.tex (modified) (11 diffs)

doc/uC++toCFA/uC++toCFA.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Fri Feb 20 11:19:31 2026
-%% Update Count     : 6717
+%% Last Modified On : Mon Nov 17 11:14:48 2025
+%% Update Count     : 6677
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -194 +194 @@
 
 The @choose@ statement provides an implicit @break@ after the @case@ clause for safety.
-It is possible to @fallthrough@ label in a @case@ clause to transfer to common code or the @default@ clause.
-\begin{cquote}
-\begin{tabular}{@{}l|l@{}}
-\begin{cfa}
+It is possible to @break default@ in a @case@ clause to transfer to common code in the @default@ clause.
+\begin{cquote}
+\begin{tabular}{@{}l|l@{}}
+\begin{uC++}
 switch ( i ) {
-  case 3: ... @fallthrough common@;
-  case 2: if ( ... ) @fallthrough@;
-  case 1:
-  common: ... ; // implicit fall through
+  case 1: ... @break@; // explicit break
+  case 2: ... @break@; // explicit break
   default: ... ;
 }
-\end{cfa}
+\end{uC++}
 &
 \begin{cfa}
 choose ( i ) {
-  case 3: ... @fallthrough common@; // labelled explicit fallthrough
-  case 2: if ( ... ) @fallthrough@; // conditional explicit fallthrough
-  case 1:
-  common: ... ; // implicit break
+  case 1: ... ; // implicit break
+  case 2: ... ; // implicit break
   default: ... ;
 }
@@ -254 +250 @@
 for ( i; @5@ ~ @15@ ~ @2@ ) { ... } // 5 to 14 by 2
 for ( i; -2 ~@=@ 10 ~ 3 ) { ... } // -2 to 10 by 3
-for ( i; -3 @-@~ 10 ) { ... } // 10 to -2 by -1, not 10 -~= -3
-for ( i; 0 @-@~@=@ 10 ) { ... } // 10 to 0 by -1, not 10 -~= 0
+for ( i; -3 @-@~ 10 ) { ... } // not 10 -~= -3, 10 to -2 by -1
+for ( i; 0 @-@~@=@ 10 ) { ... } // not 10 -~= 0, 10 to 0 by -1
 \end{cfa}
 \end{tabular}
@@ -912 +908 @@
   public:
 };
-T t;
-uProcessor p[3];
 \end{uC++}
 &
@@ -923 +917 @@
 };
 void main( @T & t@ ) {
-        ... @resumeAt( partner, ExceptionInst( E, ... ) )@;
+        ... @resumeAt( partner, ExceptionInst( E, ... )@ );
         ... @active_thread();@ ...
 }
-T t;  // create thread object and start thread in main
-processor p[3]; // 4 kernel threads including program main
-\end{cfa}
+\end{cfa}
+\\
+\multicolumn{2}{@{}l@{}}{\lstinline{T t; // start thread in main routine}}
 \end{tabular}
 \end{cquote}
@@ -1015 +1009 @@
         }
 };
-Barrier b{ 3 };
+enum { N = 3 };
+Barrier b{ N };
 \end{uC++}
 &
@@ -1039 +1034 @@
         }
 }
-Barrier b{ 3 };
+enum { N = 3 };
+Barrier b{ N };
 \end{cfa}
 \end{tabular}
@@ -1182 +1178 @@
 
 
-{\lstset{tabsize=4}
+{\lstset{tabsize=3}
 \setlength{\tabcolsep}{5pt}
 \begin{tabular}{@{}l|ll@{}}
@@ -1190 +1186 @@
 @Future_ISM@<double> fd;
 struct Msg { int i, j; }; @Future_ISM@<Msg> fm;
+struct Stop {}; @Future_ISM@<Stop> fs;
 struct Cont {}; @Future_ISM@<Cont> fc;
-_Exception Stop {};
 
 _Task Worker {
         void main() {
-                try {
-                        for ( ;; ) {
-                                _Select( fi ) { cout << fi() << endl; fi.reset(); }
-                                and _Select( fd ) { cout << fd() << endl; fd.reset(); }
-                                and _Select( fm ) {
-                                        cout << fm().i << " " << fm().j << endl; fm.reset();
-                                }
-                                fc( (Cont){} );         // synchronize
-                        }
-                } catch( Stop & ) { cout << "stop" << endl;}
-        }
+
+                for ( ;; ) {
+                        _Select( fi ) { cout << fi() << endl; fi.reset(); }
+                        and _Select( fd ) { cout << fd() << endl; fd.reset(); }
+                        and _Select( fm ) {
+                                cout << fm().i << " " << fm().j << endl; fm.reset();
+                        } or _Select( fs ) { cout << "stop" << endl; break; }
+                        fc.delivery( (Cont){} );        // synchronize
+                }
+        }
+
 };
 int main() {
         Worker worker;
         for ( int i = 0; i < 10; i += 1 ) {
-                fi( i );   fd( i + 2.5 );   fm( (Msg){ i, 2 } );  // fulfil
+                fi( i );   fd( i + 2.5 );   fm( (Msg){ i, 2 } ); // fulfil
                 fc(); fc.reset();                               // synchronize
         }
-        fi( new Stop{} );                               // trigger exception
+        fs( (Stop){} );
 } // wait for worker to terminate
 \end{uC++}
@@ -1219 +1215 @@
 \begin{cfa}
 #include <future.hfa>
-@future_rc@( int ) fi;
-@future_rc@( double ) fd;
-struct Msg { int i, j; }; @future_rc@( Msg ) fm;
-struct Cont {}; @future_rc@( Cont ) fc;
-ExceptionDecl( Stop );
-
+@future_rc@(int) fi;
+@future_rc@(double) fd;
+struct Msg { int i, j; }; @future_rc@(Msg) fm;
+struct Stop {}; @future_rc@(Stop) fs;
+struct Cont {}; @future_rc@(Cont) fc;
+ExceptionDecl( Break );
 thread Worker {};
 void main( Worker & ) {
@@ -1231 +1227 @@
                         waituntil( fi ) { sout | fi(); reset( fi ); }
                         and waituntil( fd ) { sout | fd(); reset( fd ); }
-                        and waituntil( fm ) {
-                                sout | fm().i | fm().j; reset( fm );
+                        and waituntil( fm ) { sout | fm().i | fm().j; reset( fm ); }
+                        or waituntil( fs ) { sout | "stop";
+                                throw ExceptionInst( Break );
                         }
                         fc( (Cont){} );         // synchronize
                 }
-        } catch( Stop * ) { sout | "stop"; }
-}
-
+        } catch( Break * ) {}
+}
 int main() {
         Worker worker;
         for ( i; 10 ) {
-                fi( i );   fd( i + 2.5 );   fm( (Msg){ i, 2 } );  // fulfil
+                fi( i );   fd( i + 2.5 );   fm( (Msg){ i, 2 } ); // fulfil
                 fc(); reset( fc );              // synchronize
         }
-        fi( ExceptionPtr( ExceptionInst( Stop ) ) );
+        fs( (Stop){} );
 } // wait for worker to terminate
 \end{cfa}