Changeset 17c6edeb for src/Parser/TypeData.cc

Timestamp:

Aug 16, 2022, 2:52:24 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

71cf630

Parents:

32d1383 (diff), e116db3 (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:

• src/Parser/TypeData.cc (modified) (4 diffs)

src/Parser/TypeData.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
-// Last Modified By : Henry Xue
-// Last Modified On : Tue Jul 20 04:10:50 2021
-// Update Count     : 673
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue May 10 22:36:52 2022
+// Update Count     : 677
 //
 
@@ -283 +283 @@
                 if ( signedness != DeclarationNode::NoSignedness ) os << DeclarationNode::signednessNames[ signedness ] << " ";
                 if ( length != DeclarationNode::NoLength ) os << DeclarationNode::lengthNames[ length ] << " ";
-                if ( complextype == DeclarationNode::NoComplexType ) { // basic type
-                        assert( basictype != DeclarationNode::NoBasicType );
-                        os << DeclarationNode::basicTypeNames[ basictype ] << " ";
-                } else {                                                                                // complex type
-                        // handle double _Complex
-                        if ( basictype != DeclarationNode::NoBasicType ) os << DeclarationNode::basicTypeNames[ basictype ] << " ";
-                        os << DeclarationNode::complexTypeNames[ complextype ] << " ";
-                } // if
+                if ( complextype != DeclarationNode::NoComplexType ) os << DeclarationNode::complexTypeNames[ complextype ] << " ";
+                if ( basictype != DeclarationNode::NoBasicType ) os << DeclarationNode::basicTypeNames[ basictype ] << " ";
                 break;
           case Pointer:
@@ -437 +431 @@
                         __attribute__((fallthrough));
                 #endif
+                // FALL THROUGH
           case Typeof:
                 os << "type-of expression ";
@@ -442 +437 @@
                         typeexpr->print( os, indent + 2 );
                 } // if
+                break;
+          case Vtable:
+                os << "vtable";
                 break;
           case Builtin: