Changeset 38093ae for src/ResolvExpr/CommonType.cc

Timestamp:

Apr 18, 2024, 8:44:24 PM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

19313be5, cf191ac

Parents:

748c751 (diff), 7a780ad (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:

Resolve conflict

File:

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

src/ResolvExpr/CommonType.cc

@@ -38 +38 @@
         // GENERATED START, DO NOT EDIT
         // GENERATED BY BasicTypes-gen.cc
-        #define BT ast::BasicType::
-        static const BT Kind commonTypes[BT NUMBER_OF_BASIC_TYPES][BT NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor
+        #define BT ast::BasicKind::
+        static const ast::BasicKind commonTypes[BT NUMBER_OF_BASIC_TYPES][BT NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor
                 /*                                      B                       C                      SC                      UC                      SI                     SUI
                                                         I                      UI                      LI                     LUI                     LLI                    LLUI
@@ -339 +339 @@
         // GENERATED END
         static_assert(
-                sizeof(commonTypes)/sizeof(commonTypes[0][0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES * ast::BasicType::NUMBER_OF_BASIC_TYPES,
+                sizeof(commonTypes)/sizeof(commonTypes[0][0]) == ast::BasicKind::NUMBER_OF_BASIC_TYPES * ast::BasicKind::NUMBER_OF_BASIC_TYPES,
                 "Each basic type kind should have a corresponding row in the combined type matrix"
         );
@@ -366 +366 @@
         void postvisit( const ast::BasicType * basic ) {
                 if ( auto basic2 = dynamic_cast< const ast::BasicType * >( type2 ) ) {
-                        ast::BasicType::Kind kind;
+                        ast::BasicKind kind;
                         if (basic->kind != basic2->kind && !widen.first && !widen.second) return;
                         else if (!widen.first) kind = basic->kind; // widen.second
@@ -386 +386 @@
                         const ast::EnumDecl* enumDecl = enumInst->base;
                         if ( !enumDecl->base ) {
-                                ast::BasicType::Kind kind = commonTypes[ basic->kind ][ ast::BasicType::SignedInt ];
+                                ast::BasicKind kind = commonTypes[ basic->kind ][ ast::BasicKind::SignedInt ];
                                 if (
                                         ( ( kind == basic->kind && basic->qualifiers >= type2->qualifiers )
@@ -398 +398 @@
                 } else if ( auto type2AsAttr = dynamic_cast< const ast::EnumAttrType * >( type2 ) ) {
             if ( type2AsAttr->attr == ast::EnumAttribute::Posn ) {
-                            ast::BasicType::Kind kind = commonTypes[ basic->kind ][ ast::BasicType::SignedInt ];
+                            ast::BasicKind kind = commonTypes[ basic->kind ][ ast::BasicKind::SignedInt ];
                             if (
                                     ( ( kind == basic->kind && basic->qualifiers >= type2->qualifiers )
@@ -649 +649 @@
         void postvisit( const ast::EnumInstType * enumInst ) {
                 if ( enumInst->base && !enumInst->base->base ) {
-                        auto basicType = new ast::BasicType( ast::BasicType::UnsignedInt );
+                        auto basicType = new ast::BasicType( ast::BasicKind::UnsignedInt );
                         result = commonType( basicType, type2, tenv, need, have, open, widen);
                 }
@@ -674 +674 @@
                 } else if ( widen.second && dynamic_cast< const ast::OneType * >( type2 ) ) {
                         result = new ast::BasicType{
-                                ast::BasicType::SignedInt, zero->qualifiers | type2->qualifiers };
+                                ast::BasicKind::SignedInt, zero->qualifiers | type2->qualifiers };
                 } else if ( const ast::EnumInstType * enumInst = dynamic_cast< const ast::EnumInstType * >( type2 ) ) {
                         const ast::EnumDecl * enumDecl = enumInst->base;
@@ -695 +695 @@
                 } else if ( widen.second && dynamic_cast< const ast::ZeroType * >( type2 ) ) {
                         result = new ast::BasicType{
-                                ast::BasicType::SignedInt, one->qualifiers | type2->qualifiers };
+                                ast::BasicKind::SignedInt, one->qualifiers | type2->qualifiers };
                 } else if ( const ast::EnumInstType * enumInst = dynamic_cast< const ast::EnumInstType * >( type2 ) ) {
                         const ast::EnumDecl * enumDecl = enumInst->base;