Changeset 515a037 for src/Parser/TypeData.cc

Timestamp:

Dec 12, 2018, 3:52:19 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

1b8f13f0

Parents:

cdc02f2 (diff), 85acec94 (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' into shared_library

File:

• src/Parser/TypeData.cc (modified) (8 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 : Fri Jul 20 14:39:31 2018
-// Update Count     : 622
+// Last Modified On : Fri Nov  2 07:54:26 2018
+// Update Count     : 624
 //
 
@@ -96 +96 @@
                 break;
           case Typeof:
+          case Basetypeof:
                 // typeexpr = new Typeof_t;
                 typeexpr = nullptr;
@@ -166 +167 @@
                 break;
           case Typeof:
+          case Basetypeof:
                 // delete typeexpr->expr;
                 delete typeexpr;
@@ -245 +247 @@
                 break;
           case Typeof:
+          case Basetypeof:
                 newtype->typeexpr = maybeClone( typeexpr );
                 break;
@@ -419 +422 @@
                 } // if
                 break;
+          case Basetypeof:
+                os << "base-";
+                #if defined(__GNUC__) && __GNUC__ >= 7
+                        __attribute__((fallthrough));
+                #endif
           case Typeof:
                 os << "type-of expression ";
@@ -457 +465 @@
           case Tuple:
           case Typeof:
+          case Basetypeof:
           case Builtin:
                 assertf(false, "Tried to get leaf name from kind without a name: %d", kind);
@@ -513 +522 @@
         switch ( td->kind ) {
           case TypeData::Unknown:
-                // fill in implicit int
-                return new BasicType( buildQualifiers( td ), BasicType::SignedInt );
+                        // fill in implicit int
+                        return new BasicType( buildQualifiers( td ), BasicType::SignedInt );
           case TypeData::Basic:
-                return buildBasicType( td );
+                        return buildBasicType( td );
           case TypeData::Pointer:
-                return buildPointer( td );
+                        return buildPointer( td );
           case TypeData::Array:
-                return buildArray( td );
+                        return buildArray( td );
           case TypeData::Reference:
-                return buildReference( td );
+                        return buildReference( td );
           case TypeData::Function:
-                return buildFunction( td );
+                        return buildFunction( td );
           case TypeData::AggregateInst:
-                return buildAggInst( td );
+                        return buildAggInst( td );
           case TypeData::EnumConstant:
-                // the name gets filled in later -- by SymTab::Validate
-                return new EnumInstType( buildQualifiers( td ), "" );
+                        // the name gets filled in later -- by SymTab::Validate
+                        return new EnumInstType( buildQualifiers( td ), "" );
           case TypeData::SymbolicInst:
-                return buildSymbolicInst( td );
+                        return buildSymbolicInst( td );
           case TypeData::Tuple:
-                return buildTuple( td );
+                        return buildTuple( td );
           case TypeData::Typeof:
-                return buildTypeof( td );
+          case TypeData::Basetypeof:
+                        return buildTypeof( td );
           case TypeData::Builtin:
-                if(td->builtintype == DeclarationNode::Zero) {
-                        return new ZeroType( noQualifiers );
-                }
-                else if(td->builtintype == DeclarationNode::One) {
-                        return new OneType( noQualifiers );
-                }
-                else {
-                        return new VarArgsType( buildQualifiers( td ) );
-                }
+                        if (td->builtintype == DeclarationNode::Zero) {
+                                return new ZeroType( noQualifiers );
+                        }
+                        else if (td->builtintype == DeclarationNode::One) {
+                                return new OneType( noQualifiers );
+                        }
+                        else {
+                                return new VarArgsType( buildQualifiers( td ) );
+                        }
           case TypeData::GlobalScope:
-                return new GlobalScopeType();
+                        return new GlobalScopeType();
                 case TypeData::Qualified:
-                return new QualifiedType( buildQualifiers( td ), typebuild( td->qualified.parent ), typebuild( td->qualified.child ) );
+                        return new QualifiedType( buildQualifiers( td ), typebuild( td->qualified.parent ), typebuild( td->qualified.child ) );
           case TypeData::Symbolic:
           case TypeData::Enum:
           case TypeData::Aggregate:
-                assert( false );
+                        assert( false );
         } // switch
 
@@ -929 +939 @@
 
 TypeofType * buildTypeof( const TypeData * td ) {
-        assert( td->kind == TypeData::Typeof );
+        assert( td->kind == TypeData::Typeof || td->kind == TypeData::Basetypeof );
         assert( td->typeexpr );
         // assert( td->typeexpr->expr );
-        return new TypeofType( buildQualifiers( td ), td->typeexpr->build() );
+        return new TypeofType{ 
+                buildQualifiers( td ), td->typeexpr->build(), td->kind == TypeData::Basetypeof };
 } // buildTypeof