Changeset bf4fe05 for src/ResolvExpr/CommonType.cpp

Timestamp:

May 13, 2024, 7:07:06 AM (17 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ca4f2b2

Parents:

ec20ab9 (diff), 5f225f5 (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:

fix merge

File:

• src/ResolvExpr/CommonType.cpp (moved) (moved from src/ResolvExpr/CommonType.cc ) (3 diffs)

src/ResolvExpr/CommonType.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CommonType.cc --
+// CommonType.cpp --
 //
 // Author           : Richard C. Bilson
@@ -23 +23 @@
 #include "AST/Pass.hpp"
 #include "AST/Type.hpp"
-#include "Unify.h"                       // for unifyExact, WidenMode
-#include "typeops.h"                     // for isFtype
-#include "Tuples/Tuples.h"
+#include "Unify.hpp"                     // for unifyExact, WidenMode
+#include "Typeops.hpp"                   // for isFtype
+#include "Tuples/Tuples.hpp"
 
 // #define DEBUG
@@ -650 +650 @@
 
         void postvisit( const ast::EnumInstType * enumInst ) {
-                if ( enumInst->base && !enumInst->base->base ) {
+                if ( enumInst->base && !enumInst->base->isTyped ) {
                         auto basicType = new ast::BasicType( ast::BasicKind::UnsignedInt );
                         result = commonType( basicType, type2, tenv, need, have, open, widen);