Changeset fd54fef for libcfa/prelude/prelude-gen.cc

Timestamp:

Jan 19, 2021, 8:44:29 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

dafbde8

Parents:

2f47ea4

Message:

Converting the project to use the new syntax for otype, dtype and ttytpe.

Changed prelude (gen), libcfa and test suite to use it. Added a simple deprecation rule of the old syntax to the parser; we might wish to support both syntaxes "officially," like with an extra CLI switch, but this measure should serve as a simple reminder for our team to try the new syntax.

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;
                 }
         }