Changeset 8e4aa05 for libcfa/prelude/prelude-gen.cc

Timestamp:

Mar 4, 2021, 7:40:25 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

77d601f

Parents:

342af53 (diff), a5040fe (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:

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

libcfa/prelude/prelude-gen.cc

@@ -159 +159 @@
 int main() {
         cout << "# 2 \"prelude.cfa\"  // needed for error messages from this file" << endl;
-        cout << "trait sized(dtype T) {};" << endl;
+        cout << "trait sized(T &) {};" << endl;
 
         cout << "//////////////////////////" << endl;
@@ -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(DT &) void  ?{}(" << cvq.first << type << " * " << is_vol << " &, " << cvq.second << "DT *);" << endl;
                         }
                 }
@@ -279 +279 @@
         for (auto cvq : qualifiersSingle) {
                 for (auto is_vol : { "        ", "volatile" }) {
-                        cout << "forall(dtype DT) void  ?{}(" << cvq << "  DT" << " * " << is_vol << " &);" << endl;
+                        cout << "forall(DT &) void  ?{}(" << cvq << "  DT" << " * " << is_vol << " &);" << endl;
                 }
                 for (auto is_vol : { "        ", "volatile" }) {
-                        cout << "forall(dtype DT) void ^?{}(" << cvq << "  DT" << " * " << is_vol << " &);" << endl;
+                        cout << "forall(DT &) void ^?{}(" << cvq << "  DT" << " * " << is_vol << " &);" << endl;
                 }
         }
@@ -290 +290 @@
                 for (auto is_vol : { "        ", "volatile" }) {
                         for (auto cvq : qualifiersSingle) {
-                                cout << "forall(dtype DT) void ?{}( " << cvq << type << " * " << is_vol << " &, zero_t);" << endl;
+                                cout << "forall(DT &) void ?{}( " << cvq << type << " * " << is_vol << " &, zero_t);" << endl;
                         }
                 }
@@ -317 +317 @@
         for (auto op : pointerOperators) {
                 auto forall = [&op]() {
-                        cout << "forall(dtype DT" << op.sized << ") ";
+                        cout << "forall(DT &" << op.sized << ") ";
                 };
                 for (auto type : { "DT"/*, "void"*/ } ) {
@@ -408 +408 @@
         for (auto is_vol : { "        ", "volatile" }) {
                 for (auto cvq : qualifiersPair) {
-                                cout << "forall(dtype DT) " << cvq.first << "void * ?=?( " << cvq.first << "void * " << is_vol << " &, " << cvq.second << "DT *);" << endl;
+                                cout << "forall(DT &) " << cvq.first << "void * ?=?( " << cvq.first << "void * " << is_vol << " &, " << cvq.second << "DT *);" << endl;
                 }
                 for (auto cvq : qualifiersSingle) {
-                        cout << "forall(dtype DT) " << cvq <<   "  DT * ?=?( " << cvq << "  DT * " << is_vol << " &, zero_t);" << endl;
+                        cout << "forall(DT &) " << cvq <<   "  DT * ?=?( " << cvq << "  DT * " << is_vol << " &, zero_t);" << endl;
                 }
         }