Changeset bbf2cb1 for src/ResolvExpr

Timestamp:

Mar 6, 2024, 6:06:30 AM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

f6e8c67

Parents:

00eaeb8

Message:

Add the Working support to succ() and pred() pseudo function to Enum

Location:

src/ResolvExpr

Files:

• CommonType.cc (modified) (1 diff)
• ConversionCost.cc (modified) (2 diffs)
• Unify.cc (modified) (1 diff)

src/ResolvExpr/CommonType.cc

@@ -672 +672 @@
 
         void postvisit( const ast::EnumInstType * enumInst ) {
-                if (!dynamic_cast<const ast::EnumInstType *>(type2))
+                // if ( dynamic_cast<const ast::EnumPosType *>(enumInst) ) {
+                //      result = enumInst;
+                // } else 
+                if (!dynamic_cast<const ast::EnumInstType *>(type2)) {
                         result = commonType( type2, enumInst, tenv, need, have, open, widen);
                 }
+        }
+
+        void postvisit( const ast::EnumPosType * enumPos ) {
+                if ( auto type2AsPos = dynamic_cast<const ast::EnumPosType *>(type2) ) {
+                        // result = commonType( type2AsPos->instance, enumPos->instance, tenv, need, have, open, widen );
+                        result = enumPos;
+                } else if (  auto typeAsBasic = dynamic_cast<const ast::BasicType *>(type2) ) {
+                        result = type2;
+                }
+        }
 
         void postvisit( const ast::TraitInstType * ) {}

src/ResolvExpr/ConversionCost.cc

@@ -366 +366 @@
 }
 
-void ConversionCost::postvisit( const ast::EnumInstType * ) {
+void ConversionCost::postvisit( const ast::EnumInstType * inst ) {
         static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicType::SignedInt ) };
         cost = costCalc( integer, dst, srcIsLvalue, symtab, env );
@@ -374 +374 @@
 }
 
-void ConversionCost::postvisit( const ast::EnumPosType * ) {
-        if ( dynamic_cast<const ast::EnumPosType *>( dst ) ) {
-                // Tempoarary
-                cost = Cost::zero;
-        } else {
+void ConversionCost::postvisit( const ast::EnumPosType * src ) {
+        if ( auto dstBase = dynamic_cast<const ast::EnumPosType *>( dst ) ) {
+                // cost = costCalc( src->instance, dstBase->instance, srcIsLvalue, symtab, env );
+                // if ( cost < Cost::unsafe ) cost.incSafe();
+                cost = Cost::zero;
+        } 
+        // if ( auto dstBase = dynamic_cast<const ast::EnumInstType *>( dst ) ) {
+        //      cost = costCalc( src->instance, dstBase, srcIsLvalue, symtab, env );
+        //      if ( cost < Cost::unsafe ) cost.incSafe();
+        // } 
+        else {
                 static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicType::SignedInt ) };
                 cost = costCalc( integer, dst, srcIsLvalue, symtab, env );

src/ResolvExpr/Unify.cc

@@ -518 +518 @@
 
                 void postvisit( const ast::EnumPosType * ) {
-                        // Does nothing for now. Handled in ReplacePseudoFunc
-                        // Might move here in the future
+                        // Lazy approach for now
+                        auto otherPos = dynamic_cast< const ast::EnumPosType *>(type2);
+                        if (otherPos) this->result = otherPos;
                 }