Changeset c1ea11b for doc/papers/concurrency/examples/Fib.cfa

Timestamp:

Jun 24, 2019, 11:12:01 AM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b58affe7, c1398e4

Parents:

18e683b (diff), 9e0a360 (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

File:

• doc/papers/concurrency/examples/Fib.cfa (modified) (2 diffs)

doc/papers/concurrency/examples/Fib.cfa

@@ -13 +13 @@
 }
 
-#define FibCtor { 0, 1 }
-typedef struct { int fn, fn1; } Fib;
-int fib_state( Fib & f ) with( f ) {
-        int fn0 = fn1 + fn2;  fn2 = fn1;  fn = fn0;
-        return fn1;
+#define FibCtor { 1, 0 }
+typedef struct { int fn1, fn; } Fib;
+int fib_state( Fib & f ) with(f) {
+        int ret = fn; fn = fn1; fn1 = fn + ret;
+        return ret;
 }
 
@@ -32 +32 @@
 coroutine Fib2 { int fn; };                                             // used for communication
 void main( Fib2 & fib ) with( fib ) {                   // called on first resume
-        int fn1 = 1, fn2 = 0;                                           // precompute first two states
+        int fn1;                                                                        // precompute first two states
+        [fn1, fn] = [1, 0];
         for () {
-                fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;  // general case
                 suspend();                                                              // restart last resume
+                [fn1, fn] = [fn, fn + fn1];
         }
 }
-int ?()( Fib2 & fib ) with( fib ) {
+int ?()( Fib2 & fib ) {                                                 // function-call interface
         return resume( fib ).fn;                                        // restart last suspend
 }
-int ?()( Fib2 & fib, int N ) with( fib ) {
-        for ( N - 1 ) fib();
+int ?()( Fib2 & fib, int N ) {                                  // skip N values
+        for ( N - 1 ) fib();                                            // use function-call interface
         return fib();
 }
-double ?()( Fib2 & fib ) with( fib ) {
-        return (int)(fib()) / 3.14159;                                          // restart last suspend
+double ?()( Fib2 & fib ) {                                              // different return type
+        return (int)(fib()) / 3.14159;                          // cast prevents recursive call
 }