Changeset f80e0218 for src/ResolvExpr/CommonType.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/ResolvExpr/CommonType.cc (modified) (3 diffs)

src/ResolvExpr/CommonType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CommonType.cc -- 
+// CommonType.cc --
 //
 // Author           : Richard C. Bilson
@@ -134 +134 @@
                                 result = new BasicType( basicType->get_qualifiers() + otherBasic->get_qualifiers(), newType );
                         } // if
+                } else if ( EnumInstType *enumInstType = dynamic_cast< EnumInstType * > ( type2 ) ) {
+                        // use signed int in lieu of the enum type
+                        BasicType::Kind newType = combinedType[ basicType->get_kind() ][ BasicType::SignedInt ];
+                        if ( ( ( newType == basicType->get_kind() && basicType->get_qualifiers() >= enumInstType->get_qualifiers() ) || widenFirst ) && ( ( newType != basicType->get_kind() && basicType->get_qualifiers() <= enumInstType->get_qualifiers() ) || widenSecond ) ) {
+                                result = new BasicType( basicType->get_qualifiers() + enumInstType->get_qualifiers(), newType );
+                        } // if
                 } // if
         }
@@ -183 +189 @@
         }
 
-        void CommonType::visit( EnumInstType *aggregateUseType ) {
+        void CommonType::visit( EnumInstType *enumInstType ) {
+                if ( dynamic_cast< BasicType * >( type2 ) ) {
+                        // reuse BasicType, EnumInstType code by swapping type2 with enumInstType
+                        Type * temp = type2;
+                        type2 = enumInstType;
+                        temp->accept( *this );
+                        type2 = temp;
+                } // if
         }