Changes in / [8fc15cf:83b52f1]

File:

• libcfa/prelude/prelude-gen.cc (modified) (4 diffs)

libcfa/prelude/prelude-gen.cc

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// prelude-gen.cc -- 
-// 
+//
+// prelude-gen.cc --
+//
 // Author           : Rob Schluntz and Thierry Delisle
 // Created On       : Sat Feb 16 08:44:58 2019
@@ -12 +12 @@
 // Last Modified On : Tue Apr  2 17:18:24 2019
 // Update Count     : 37
-// 
+//
 
 #include <algorithm>
@@ -264 +264 @@
                 for (auto cvq : qualifiersPair) {
                         for (auto is_vol : { "        ", "volatile" }) {
-                                cout << "forall(dtype DT) void ?{}(" << cvq.first << type << " * " << is_vol << " &, " << cvq.second << "DT *);" << endl;
+                                cout << "forall(dtype DT) void  ?{}(" << cvq.first << type << " * " << is_vol << " &, " << cvq.second << "DT *);" << endl;
                         }
                 }
-                for (auto cvq : qualifiersSingle) {
-                        for (auto is_vol : { "        ", "volatile" }) {
-                                cout << "forall(dtype DT) void ?{}(" << cvq << type << " * " << is_vol << " &);" << endl;
-                        }
-                        for (auto is_vol : { "        ", "volatile" }) {
-                                cout << "forall(dtype DT) void ^?{}(" << cvq << type << " * " << is_vol << " &);" << endl;
-                        }
+        }
+        for (auto cvq : qualifiersSingle) {
+                for (auto is_vol : { "        ", "volatile" }) {
+                        cout << "void  ?{}(" << cvq << "void" << " * " << is_vol << " &);" << endl;
+                }
+                for (auto is_vol : { "        ", "volatile" }) {
+                        cout << "void ^?{}(" << cvq << "void" << " * " << is_vol << " &);" << endl;
+                }
+        }
+
+        for (auto cvq : qualifiersSingle) {
+                for (auto is_vol : { "        ", "volatile" }) {
+                        cout << "forall(dtype DT) void  ?{}(" << cvq << "  DT" << " * " << is_vol << " &);" << endl;
+                }
+                for (auto is_vol : { "        ", "volatile" }) {
+                        cout << "forall(dtype DT) void ^?{}(" << cvq << "  DT" << " * " << is_vol << " &);" << endl;
                 }
         }
@@ -288 +297 @@
         cout << endl;
 
-        cout << "forall(ftype FT) void  ?{}( FT *          &, zero_t ); " << endl;
+        cout << "forall(ftype FT) void  ?{}( FT *          &, zero_t );" << endl;
         cout << "forall(ftype FT) FT *                  ?=?( FT *          &, zero_t );" << endl;
         cout << "forall(ftype FT) FT *                  ?=?( FT * volatile &, zero_t );" << endl;