Changeset 4520b77e for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Sep 20, 2022, 8:37:05 PM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

a065f1f

Parents:

d489da8 (diff), 12df6fe (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:

Merge to Master Sept 19

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -864 +864 @@
                 }
 
+                void postvisit( const ast::QualifiedNameExpr * qualifiedNameExpr ) {
+                        auto mangleName = Mangle::mangle(qualifiedNameExpr->var);
+                        addCandidate( qualifiedNameExpr, tenv );
+                }
+
                 void postvisit( const ast::UntypedExpr * untypedExpr ) {
                         std::vector< CandidateFinder > argCandidates =
@@ -897 +902 @@
                                                 }
 
-                                                if (argType.as<ast::PointerType>()) funcFinder.otypeKeys.insert(Mangle::Encoding::pointer);
-                                                else if (const ast::EnumInstType * enumInst = argType.as<ast::EnumInstType>()) {
-                                                        const ast::EnumDecl * enumDecl = enumInst->base;
-                                                        if ( const ast::Type* enumType = enumDecl->base ) {
-                                                                // instance of enum (T) is a instance of type (T)
-                                                                funcFinder.otypeKeys.insert(Mangle::mangle(enumType, Mangle::NoGenericParams | Mangle::Type));
-                                                        } else {
-                                                                // instance of an untyped enum is techically int
-                                                                funcFinder.otypeKeys.insert(Mangle::mangle(enumDecl, Mangle::NoGenericParams | Mangle::Type));
-                                                        }
-                                                }
+                                                if (argType.as<ast::PointerType>()) funcFinder.otypeKeys.insert(Mangle::Encoding::pointer);                                             
+                                                // else if (const ast::EnumInstType * enumInst = argType.as<ast::EnumInstType>()) {
+                                                //      const ast::EnumDecl * enumDecl = enumInst->base; // Here
+                                                //      if ( const ast::Type* enumType = enumDecl->base ) {
+                                                //              // instance of enum (T) is a instance of type (T) 
+                                                //              funcFinder.otypeKeys.insert(Mangle::mangle(enumType, Mangle::NoGenericParams | Mangle::Type));
+                                                //      } else {
+                                                //              // instance of an untyped enum is techically int
+                                                //              funcFinder.otypeKeys.insert(Mangle::mangle(enumDecl, Mangle::NoGenericParams | Mangle::Type));
+                                                //      }
+                                                // }
                                                 else funcFinder.otypeKeys.insert(Mangle::mangle(argType, Mangle::NoGenericParams | Mangle::Type));
                                         }