Changeset 7d55e4d for src/ResolvExpr

Timestamp:

Oct 30, 2023, 4:59:34 PM (16 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

4ac402d

Parents:

36e6f10

Message:

Simple rework to BasicTypes?-gen.cc to avoid refering to the old ast. No larger rework at this time.

Location:

src/ResolvExpr

Files:

• CommonType.cc (modified) (6 diffs)
• ConversionCost.cc (modified) (2 diffs)

src/ResolvExpr/CommonType.cc

@@ -184 +184 @@
         // GENERATED START, DO NOT EDIT
         // GENERATED BY BasicTypes-gen.cc
-        #define BT BasicType::
-        static const BasicType::Kind commonTypes[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor
+        #define BT ast::BasicType::
+        static const BT Kind 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
@@ -497 +497 @@
         void CommonType_old::postvisit( BasicType * basicType ) {
                 if ( BasicType * otherBasic = dynamic_cast< BasicType * >( type2 ) ) {
-                        BasicType::Kind newType = commonTypes[ basicType->get_kind() ][ otherBasic->get_kind() ];
+                        BasicType::Kind newType = (BasicType::Kind)(int)commonTypes[ (ast::BasicType::Kind)(int)basicType->get_kind() ][ (ast::BasicType::Kind)(int)otherBasic->get_kind() ];
                         if ( ( ( newType == basicType->get_kind() && basicType->tq >= otherBasic->tq ) || widenFirst ) && ( ( newType == otherBasic->get_kind() && basicType->tq <= otherBasic->tq ) || widenSecond ) ) {
                                 result = new BasicType( basicType->tq | otherBasic->tq, newType );
@@ -503 +503 @@
                 } else if (  dynamic_cast< ZeroType * >( type2 ) || dynamic_cast< OneType * >( type2 ) ) {
                         // use signed int in lieu of the enum/zero/one type
-                        BasicType::Kind newType = commonTypes[ basicType->get_kind() ][ BasicType::SignedInt ];
+                        BasicType::Kind newType = (BasicType::Kind)(int)commonTypes[ (ast::BasicType::Kind)(int)basicType->get_kind() ][ ast::BasicType::SignedInt ];
                         if ( ( ( newType == basicType->get_kind() && basicType->tq >= type2->tq ) || widenFirst ) && ( ( newType != basicType->get_kind() && basicType->tq <= type2->tq ) || widenSecond ) ) {
                                 result = new BasicType( basicType->tq | type2->tq, newType );
@@ -512 +512 @@
                                 result = baseType->clone();
                         } else {
-                                BasicType::Kind newType = commonTypes[ basicType->get_kind() ][ BasicType::SignedInt ];
+                                BasicType::Kind newType = (BasicType::Kind)(int)commonTypes[ (ast::BasicType::Kind)(int)basicType->get_kind() ][ ast::BasicType::SignedInt ];
                                 if ( ( ( newType == basicType->get_kind() && basicType->tq >= type2->tq ) || widenFirst ) && ( ( newType != basicType->get_kind() && basicType->tq <= type2->tq ) || widenSecond ) ) {
                                         result = new BasicType( basicType->tq | type2->tq, newType );
@@ -700 +700 @@
                                 else if (!widen.first) kind = basic->kind; // widen.second
                                 else if (!widen.second) kind = basic2->kind;
-                                else kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)basic2->kind ];
+                                else kind = commonTypes[ basic->kind ][ basic2->kind ];
                                 // xxx - what does qualifiers even do here??
                                 if ( (basic->qualifiers >= basic2->qualifiers || widen.first)
@@ -719 +719 @@
                                 } else {
                                         #warning remove casts when `commonTypes` moved to new AST
-                                        ast::BasicType::Kind kind = (ast::BasicType::Kind)(int)commonTypes[ (BasicType::Kind)(int)basic->kind ][ (BasicType::Kind)(int)ast::BasicType::SignedInt ];
+                                        ast::BasicType::Kind kind = commonTypes[ basic->kind ][ ast::BasicType::SignedInt ];
                                         if (
                                                 ( ( kind == basic->kind && basic->qualifiers >= type2->qualifiers )

src/ResolvExpr/ConversionCost.cc

@@ -226 +226 @@
         // GENERATED START, DO NOT EDIT
         // GENERATED BY BasicTypes-gen.cc
-        static const int costMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // path length from root to node
+        static const int costMatrix[ast::BasicType::NUMBER_OF_BASIC_TYPES][ast::BasicType::NUMBER_OF_BASIC_TYPES] = { // path length from root to node
                 /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
                 /*      B */ {   0,   1,   1,   2,   2,   3,   3,   4,   4,   5,   5,   6,   6,   7,   7,   8,   8,   9,   9,  10,  10,  11,  11,  12,  12,  13,  13,  14,  14,  15,  15,  16,  17,  16,  18,  17, },
@@ -274 +274 @@
         // GENERATED START, DO NOT EDIT
         // GENERATED BY BasicTypes-gen.cc
-        static const int signMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion
+        static const int signMatrix[ast::BasicType::NUMBER_OF_BASIC_TYPES][ast::BasicType::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion
                 /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
                 /*      B */ {   0,   0,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, },