Changeset b0d9ff7 for src/ResolvExpr

Timestamp:

Sep 1, 2022, 1:27:52 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

12df6fe

Parents:

def751f

Message:

Fix up the QualifiedNameExpr. It should now work on both old AST and new AST. There are some known bugs to fix so make all-tests will fail.

Location:

src/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (1 diff)
• ConversionCost.cc (modified) (3 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -862 +862 @@
                                 }
                         }
+                }
+
+                void postvisit( const ast::QualifiedNameExpr * qualifiedNameExpr ) {
+                        auto mangleName = Mangle::mangle(qualifiedNameExpr->var);
+                        addCandidate( qualifiedNameExpr, tenv );
                 }
 

src/ResolvExpr/ConversionCost.cc

@@ -338 +338 @@
                 } else if ( const EnumInstType * enumInst = dynamic_cast< const EnumInstType * >( dest ) ) {
                         const EnumDecl * base_enum = enumInst->baseEnum;
-                        if ( const Type * base = base_enum->base ) { // if the base enum has a base (if it is typed)
+                        if ( const Type * base = base_enum->base ) {
                                 if ( const BasicType * enumBaseAstBasic = dynamic_cast< const BasicType *> (base) ) {
                                         conversionCostFromBasicToBasic(basicType, enumBaseAstBasic);
@@ -632 +632 @@
         } else if ( const ast::EnumInstType * enumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
                 const ast::EnumDecl * enumDecl = enumInst->base.get();
-                if ( const ast::Type * enumType = enumDecl->base.get() ) {
+                if ( enumDecl->isTyped && !enumDecl->base.get() ) {
+                        cost = Cost::infinity; 
+                } else if ( const ast::Type * enumType = enumDecl->base.get() ) {
                         if ( const ast::BasicType * enumTypeAsBasic = dynamic_cast<const ast::BasicType *>(enumType) ) {
                                 conversionCostFromBasicToBasic( basicType, enumTypeAsBasic );
@@ -694 +696 @@
         const ast::EnumDecl * baseEnum = enumInstType->base;
         if ( const ast::Type * baseType = baseEnum->base ) {
-                cost = costCalc( baseType, dst, srcIsLvalue, symtab, env );
-                // cost = Cost::safe;
+                costCalc( baseType, dst, srcIsLvalue, symtab, env );
         } else {
                 (void)enumInstType;