Index: doc/uC++toCFA/uC++toCFA.tex
===================================================================
--- doc/uC++toCFA/uC++toCFA.tex	(revision 07dbcbae4bf39705467bcaf95f971ef073011a1a)
+++ doc/uC++toCFA/uC++toCFA.tex	(revision fca78f10fcf2198f57e0f9e7ea3fe351ee91befa)
@@ -11,6 +11,6 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Fri Sep 13 07:48:54 2024
-%% Update Count     : 5987
+%% Last Modified On : Wed Sep 18 21:35:47 2024
+%% Update Count     : 5999
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -256,15 +256,17 @@
 \hline
 \begin{uC++}
-L1: for ( ;; ) {
-	L2: for ( ;; ) {
-		... @break L1@; ... @break L2@; ...
-	}
-}
-\end{uC++}
-&
-\begin{cfa}
-L1: for () {
-	L2: for () {
-		... @break L1@; ... @break L2@; ...
+@L1:@ for ( ;; ) {
+	@L2:@ for ( ;; ) {
+		... if ( ... ) @break L1@; ...
+		... if ( ... ) @break L2@; ...
+	}
+}
+\end{uC++}
+&
+\begin{cfa}
+@L1:@ for () {
+	@L2:@ for () {
+		... if ( ... ) @break L1@; ...
+		... if ( ... ) @break L2@; ...
 	}
 }
@@ -289,8 +291,8 @@
 	if ( ... ) @_Throw@ E( /* initialization */ );
 		...
-} @_CatchResume@( E & ) { // should be reference
-	...
-} catch( E & ) {
-	...
+} @_CatchResume@( E & ) { ... // reference
+} catch( E & ) { ...
+} catch( ... ) { ... // catch any
+} _Finally { ...
 }
 \end{uC++}
@@ -306,8 +308,8 @@
 	if ( ... ) @throw@ @ExceptionInst@( E, /* intialization */ );
 	...
-} @catchResume@( E * ) { // must be pointer
-	...
-} catch( E * ) {
-	...
+} @catchResume@( E * ) { ... // pointer
+} catch( E * ) { ...
+} catch( exception_t * ) { ... // catch any
+} finally { ...
 }
 \end{cfa}
@@ -362,6 +364,6 @@
 struct S {
 	... // fields
-	@S@(...) { ... }
-	@~S@(...) { ... }
+	@S@( ... ) { ... }
+	@~S@( ... ) { ... }
 };
 \end{uC++}
@@ -371,5 +373,5 @@
 	... // fields
 };
-@?{}@( @S & s,@ ...) { ... }
+@?{}@( @S & s,@ ... ) { ... }
 @^?{}@( @S & s@ ) { ... }
 \end{cfa}
@@ -432,5 +434,5 @@
 
 S s;
-@s.@setter( 3 );  // object-oriented calls
+@s.@setter( 3 );  // object calls
 int k = @s.@getter();
 \end{uC++}
@@ -444,5 +446,5 @@
 int getter( @S & s@ ) @with(s)@ { return i; }
 S s;
-setter( @s,@ 3 );  // normal routine calls
+setter( @s,@ 3 );  // normal calls
 int k = getter( @s@ );
 \end{cfa}
@@ -520,5 +522,5 @@
 }
 void mem( C & c, ... ) {
-	... resume(); ...
+	... resume( c ); ...
 }
 \end{cfa}
@@ -558,5 +560,5 @@
 	unlock( m );
 }
-@mutex( sout )@ sout | i;  // safe I/O
+@mutex( sout )@ sout | i;  // thread safe I/O
 \end{cfa}
 \end{tabular}