Changes in src/Parser/TypeData.cc [8f91c9ae:f7e4db27]

File:

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

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 13:52:09 2018
-// Update Count     : 606
+// Last Modified On : Fri Jul 20 14:39:31 2018
+// Update Count     : 622
 //
 
@@ -76 +76 @@
                 aggregate.parent = nullptr;
                 aggregate.anon = false;
-                aggregate.inLine = false;
                 break;
           case AggregateInst:
@@ -83 +82 @@
                 aggInst.params = nullptr;
                 aggInst.hoistType = false;
-                aggInst.inLine = false;
                 break;
           case Symbolic:
@@ -221 +219 @@
                 newtype->aggregate.body = aggregate.body;
                 newtype->aggregate.anon = aggregate.anon;
-                newtype->aggregate.inLine = aggregate.inLine;
                 newtype->aggregate.tagged = aggregate.tagged;
                 newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr;
@@ -229 +226 @@
                 newtype->aggInst.params = maybeClone( aggInst.params );
                 newtype->aggInst.hoistType = aggInst.hoistType;
-                newtype->aggInst.inLine = aggInst.inLine;
                 break;
           case Enum:
@@ -275 +271 @@
 
         switch ( kind ) {
-          case Unknown:
-                os << "entity of unknown type ";
+          case Basic:
+                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
                 break;
           case Pointer:
@@ -285 +290 @@
                 } // if
                 break;
-          case EnumConstant:
-                os << "enumeration constant ";
-                break;
-          case Basic:
-                if ( signedness != DeclarationNode::NoSignedness ) os << DeclarationNode::signednessNames[ signedness ] << " ";
-                if ( length != DeclarationNode::NoLength ) os << DeclarationNode::lengthNames[ length ] << " ";
-                assert( basictype != DeclarationNode::NoBasicType );
-                os << DeclarationNode::basicTypeNames[ basictype ] << " ";
-                if ( complextype != DeclarationNode::NoComplexType ) os << DeclarationNode::complexTypeNames[ complextype ] << " ";
+          case Reference:
+                os << "reference ";
+                if ( base ) {
+                        os << "to ";
+                        base->print( os, indent );
+                } // if
                 break;
           case Array:
@@ -379 +381 @@
                 } // if
                 break;
-          case SymbolicInst:
-                os << "instance of type " << *symbolic.name;
-                if ( symbolic.actuals ) {
-                        os << " with parameters" << endl;
-                        symbolic.actuals->printList( os, indent + 2 );
-                } // if
+          case EnumConstant:
+                os << "enumeration constant ";
                 break;
           case Symbolic:
@@ -406 +404 @@
                 } // if
                 break;
+          case SymbolicInst:
+                os << *symbolic.name;
+                if ( symbolic.actuals ) {
+                        os << "(";
+                        symbolic.actuals->printList( os, indent + 2 );
+                        os << ")";
+                } // if
+                break;
           case Tuple:
                 os << "tuple ";
@@ -421 +427 @@
           case Builtin:
                 os << DeclarationNode::builtinTypeNames[builtintype];
+                break;
+          case GlobalScope:
+                break;
+          case Qualified:
+                qualified.parent->print( os );
+                os << ".";
+                qualified.child->print( os );
+                break;
+          case Unknown:
+                os << "entity of unknown type ";
                 break;
           default: