Changes in doc/papers/concurrency/examples/Format1.c [a573c22:466fa01]

File:

• doc/papers/concurrency/examples/Format1.c (modified) (1 diff)

doc/papers/concurrency/examples/Format1.c

@@ -2 +2 @@
 
 typedef struct {
-        int restart, g, b;
+        void * next;
         char ch;
+        int g, b;
 } Fmt;
 
 void format( Fmt * f ) {
-        static void * states[] = {&&s0, &&s1};
-        goto *states[f->restart];
-  s0: f->restart = 1;
+        if ( __builtin_expect(f->next != 0, 1) ) goto *f->next;
+        f->next = &&s1;
         for ( ;; ) {
                 for ( f->g = 0; f->g < 5; f->g += 1 ) {                 // groups
                         for ( f->b = 0; f->b < 4; f->b += 1 ) {         // blocks
                                 return;
-                          s1: if ( f->ch == '\0' ) goto fini;           // EOF ?
+                          s1: ;
+                                if ( f->ch == '\0' ) goto fini;                 // EOF ?
                                 while ( f->ch == '\n' ) return;                 // ignore
-//                              printf( "%c", f->ch );                                  // print character
+                                printf( "%c", f->ch );                                  // print character
                         }
-//                      printf( " " );                                                          // block separator
+                        printf( " " );                                                          // block separator
                 }
-//              printf( "\n" );                                                                 // group separator
+                printf( "\n" );                                                                 // group separator
         }
-  fini:;
-//      if ( f->g != 0 || f->b != 0 ) printf( "\n" );
+  fini:
+        if ( f->g != 0 || f->b != 0 ) printf( "\n" );
 }
 
 int main() {
-        Fmt fmt = { 0 };
+        Fmt fmt = { NULL };
         format( &fmt );                                                                         // prime
-        fmt.ch = 'a';
-        for ( long int i = 0; i < 1000000000; i += 1 ) {
-//              scanf( "%c", &fmt.ch );                                                 // direct read into communication variable
-//        if ( feof( stdin ) ) break;
+        for ( ;; ) {
+                scanf( "%c", &fmt.ch );                                                 // direct read into communication variable
+          if ( feof( stdin ) ) break;
                 format( &fmt );
         }
-        fmt.ch = '\0';                                                                          // sentential (EOF)
+        fmt.ch = '\0';
         format( &fmt );
 }