Changes in doc/papers/concurrency/Paper.tex [1e5d0f0c:a927662]

File:

• doc/papers/concurrency/Paper.tex (modified) (2 diffs)

doc/papers/concurrency/Paper.tex

@@ -654 +654 @@
 \centering
 \newbox\myboxA
-% \begin{lrbox}{\myboxA}
-% \begin{cfa}[aboveskip=0pt,belowskip=0pt]
-% `int fn1, fn2, state = 1;`   // single global variables
-% int fib() {
-%       int fn;
-%       `switch ( state )` {  // explicit execution state
-%         case 1: fn = 0;  fn1 = fn;  state = 2;  break;
-%         case 2: fn = 1;  fn2 = fn1;  fn1 = fn;  state = 3;  break;
-%         case 3: fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;  break;
-%       }
-%       return fn;
-% }
-% int main() {
-% 
-%       for ( int i = 0; i < 10; i += 1 ) {
-%               printf( "%d\n", fib() );
-%       }
-% }
-% \end{cfa}
-% \end{lrbox}
 \begin{lrbox}{\myboxA}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
-#define FIB_INIT { 0, 1 }
-typedef struct { int fn1, fn; } Fib;
+`int fn1, fn2, state = 1;`   // single global variables
+int fib() {
+        int fn;
+        `switch ( state )` {  // explicit execution state
+          case 1: fn = 0;  fn1 = fn;  state = 2;  break;
+          case 2: fn = 1;  fn2 = fn1;  fn1 = fn;  state = 3;  break;
+          case 3: fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;  break;
+        }
+        return fn;
+}
+int main() {
+
+        for ( int i = 0; i < 10; i += 1 ) {
+                printf( "%d\n", fib() );
+        }
+}
+\end{cfa}
+\end{lrbox}
+
+\newbox\myboxB
+\begin{lrbox}{\myboxB}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+#define FIB_INIT `{ 0, 1 }`
+typedef struct { int fn2, fn1; } Fib;
 int fib( Fib * f ) {
 
-        int ret = f->fn1;
-        f->fn1 = f->fn;
-        f->fn = ret + f->fn;
+        int ret = f->fn2;
+        int fn = f->fn1 + f->fn2;
+        f->fn2 = f->fn1; f->fn1 = fn;
+
         return ret;
 }
-
-
-
 int main() {
         Fib f1 = FIB_INIT, f2 = FIB_INIT;
         for ( int i = 0; i < 10; i += 1 ) {
-                printf( "%d %d\n",
-                                fib( &f1 ), fib( &f2 ) );
+                printf( "%d %d\n", fib( &fn1 ), fib( &f2 ) );
         }
 }
@@ -698 +697 @@
 \end{lrbox}
 
+\subfloat[3 states: global variables]{\label{f:GlobalVariables}\usebox\myboxA}
+\qquad
+\subfloat[1 state: encapsulated variables]{\label{f:ExternalState}\usebox\myboxB}
+\caption{C fibonacci fsm}
+\label{f:C-fibonacci}
+
+\bigskip
+
+\newbox\myboxA
+\begin{lrbox}{\myboxA}
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+`coroutine` Fib { int fn; };
+void main( Fib & fib ) with( fib ) {
+        fn = 0;  int fn1 = fn; `suspend()`;
+        fn = 1;  int fn2 = fn1;  fn1 = fn; `suspend()`;
+        for () {
+                fn = fn1 + fn2; fn2 = fn1; fn1 = fn; `suspend()`; }
+}
+int next( Fib & fib ) with( fib ) { `resume( fib );` return fn; }
+int main() {
+        Fib f1, f2;
+        for ( 10 )
+                sout | next( f1 ) | next( f2 );
+}
+\end{cfa}
+\end{lrbox}
 \newbox\myboxB
 \begin{lrbox}{\myboxB}
-\begin{cfa}[aboveskip=0pt,belowskip=0pt]
-`coroutine` Fib { int fn1; };
-void main( Fib & fib ) with( fib ) {
-        int fn;
-        [fn1, fn] = [0, 1];
-        for () {
-                `suspend();`
-                [fn1, fn] = [fn, fn1 + fn];
-        }
-}
-int ?()( Fib & fib ) with( fib ) {
-        `resume( fib );`  return fn1;
-}
-int main() {
-        Fib f1, f2;
-        for ( 10 ) {
-                sout | f1() | f2();
-}
-
-
-\end{cfa}
-\end{lrbox}
-
-\newbox\myboxC
-\begin{lrbox}{\myboxC}
 \begin{python}[aboveskip=0pt,belowskip=0pt]
 
-def Fib():
-
-    fn1, fn = 0, 1
-    while True:
-        `yield fn1`
-        fn1, fn = fn, fn1 + fn
-
-
-// next prewritten
-
-
-f1 = Fib()
-f2 = Fib()
+def Fibonacci():
+        fn = 0; fn1 = fn; `yield fn`  # suspend
+        fn = 1; fn2 = fn1; fn1 = fn; `yield fn`
+        while True:
+                fn = fn1 + fn2; fn2 = fn1; fn1 = fn; `yield fn`
+
+
+f1 = Fibonacci()
+f2 = Fibonacci()
 for i in range( 10 ):
-        print( next( f1 ), next( f2 ) )
-
-
+        print( `next( f1 )`, `next( f2 )` ) # resume
 
 \end{python}
 \end{lrbox}
-
-\subfloat[C]{\label{f:GlobalVariables}\usebox\myboxA}
-\hspace{3pt}
-\vrule
-\hspace{3pt}
-\subfloat[\CFA]{\label{f:ExternalState}\usebox\myboxB}
-\hspace{3pt}
-\vrule
-\hspace{3pt}
-\subfloat[Python]{\label{f:ExternalState}\usebox\myboxC}
-\caption{Fibonacci Generator}
-\label{f:C-fibonacci}
-
-% \bigskip
-% 
-% \newbox\myboxA
-% \begin{lrbox}{\myboxA}
-% \begin{cfa}[aboveskip=0pt,belowskip=0pt]
-% `coroutine` Fib { int fn; };
-% void main( Fib & fib ) with( fib ) {
-%       fn = 0;  int fn1 = fn; `suspend()`;
-%       fn = 1;  int fn2 = fn1;  fn1 = fn; `suspend()`;
-%       for () {
-%               fn = fn1 + fn2; fn2 = fn1; fn1 = fn; `suspend()`; }
-% }
-% int next( Fib & fib ) with( fib ) { `resume( fib );` return fn; }
-% int main() {
-%       Fib f1, f2;
-%       for ( 10 )
-%               sout | next( f1 ) | next( f2 );
-% }
-% \end{cfa}
-% \end{lrbox}
-% \newbox\myboxB
-% \begin{lrbox}{\myboxB}
-% \begin{python}[aboveskip=0pt,belowskip=0pt]
-% 
-% def Fibonacci():
-%       fn = 0; fn1 = fn; `yield fn`  # suspend
-%       fn = 1; fn2 = fn1; fn1 = fn; `yield fn`
-%       while True:
-%               fn = fn1 + fn2; fn2 = fn1; fn1 = fn; `yield fn`
-% 
-% 
-% f1 = Fibonacci()
-% f2 = Fibonacci()
-% for i in range( 10 ):
-%       print( `next( f1 )`, `next( f2 )` ) # resume
-% 
-% \end{python}
-% \end{lrbox}
-% \subfloat[\CFA]{\label{f:Coroutine3States}\usebox\myboxA}
-% \qquad
-% \subfloat[Python]{\label{f:Coroutine1State}\usebox\myboxB}
-% \caption{Fibonacci input coroutine, 3 states, internal variables}
-% \label{f:cfa-fibonacci}
+\subfloat[\CFA]{\label{f:Coroutine3States}\usebox\myboxA}
+\qquad
+\subfloat[Python]{\label{f:Coroutine1State}\usebox\myboxB}
+\caption{Fibonacci input coroutine, 3 states, internal variables}
+\label{f:cfa-fibonacci}
 \end{figure}