Changeset b7d6a36 for src/Parser/TypeData.cc

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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 relaxed_ready

File:

• src/Parser/TypeData.cc (modified) (3 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 : Wed Dec 11 07:48:33 2019
-// Update Count     : 659
+// Last Modified On : Mon Dec 16 07:56:46 2019
+// Update Count     : 662
 //
 
@@ -489 +489 @@
         for ( typename ForallList::iterator i = outputList.begin(); i != outputList.end(); ++i, n = (DeclarationNode*)n->get_next() ) {
                 TypeDecl * td = static_cast<TypeDecl *>(*i);
-                if ( n->variable.tyClass == DeclarationNode::Otype ) {
+                if ( n->variable.tyClass == TypeDecl::Otype ) {
                         // add assertion parameters to `type' tyvars in reverse order
                         // add dtor:  void ^?{}(T *)
@@ -522 +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:
           case TypeData::Basetypeof:
-                        return buildTypeof( td );
+                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 ) );
-                        }
+                switch ( td->builtintype ) {
+                  case DeclarationNode::Zero:
+                        return new ZeroType( noQualifiers );
+                  case DeclarationNode::One:
+                        return new OneType( noQualifiers );
+                  default:
+                        return new VarArgsType( buildQualifiers( td ) );
+                } // switch
           case TypeData::GlobalScope:
-                        return new GlobalScopeType();
-                case TypeData::Qualified:
-                        return new QualifiedType( buildQualifiers( td ), typebuild( td->qualified.parent ), typebuild( td->qualified.child ) );
+                return new GlobalScopeType();
+          case TypeData::Qualified:
+                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