Changeset 4fcbf26

Timestamp:

Jan 25, 2022, 4:16:04 PM (23 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

70b4aeb9, 97fed44

Parents:

7cf3b1d (diff), 120ab9d5 (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

Files:

• src/AST/Print.cpp (modified) (1 diff)
• tests/concurrent/.expect/ctor-check.txt (modified) (1 diff)

src/AST/Print.cpp

@@ -333 +333 @@
                 print( node->funcSpec );
 
-                if ( node->type ) {
+
+
+                if ( node->type && node->isTypeFixed ) {
                         node->type->accept( *this );
                 } else {
-                        os << "untyped entity";
+                        if (!node->type_params.empty()) {
+                                os << "forall" << endl;
+                                ++indent;
+                                printAll(node->type_params);
+                                os << indent;
+                                --indent;
+
+                                if (!node->assertions.empty()) {
+                                        os << "with assertions" << endl;
+                                        ++indent;
+                                        printAll(node->assertions);
+                                        os << indent;
+                                        --indent;
+                                }
+                        }
+
+                        os << "function" << endl;
+                        if ( ! node->params.empty() ) {
+                                os << indent << "... with parameters" << endl;
+                                ++indent;
+                                printAll( node->params );
+                                if ( node->type->isVarArgs ) {
+                                        os << indent << "and a variable number of other arguments" << endl;
+                                }
+                                --indent;
+                        } else if ( node->type->isVarArgs ) {
+                                os << indent+1 << "accepting unspecified arguments" << endl;
+                        }
+
+                        os << indent << "... returning";
+                        if ( node->returns.empty() ) {
+                                os << " nothing" << endl;
+                        } else {
+                                os << endl;
+                                ++indent;
+                                printAll( node->returns );
+                                --indent;
+                        }
                 }
 

tests/concurrent/.expect/ctor-check.txt

@@ -2 +2 @@
 ?{}: function
 ... with parameters
-  lvalue reference to instance of struct Empty with body
+  this: lvalue reference to instance of struct Empty with body
 ... returning nothing
  with body