Changeset 60c5b6d

Timestamp:

Apr 18, 2024, 12:12:25 PM (13 days ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7a780ad, d4264e8

Parents:

fbe3f03 (diff), 8fd53b6e (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• AST/Type.hpp (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (4 diffs)
• ResolvExpr/CandidateFinder.hpp (modified) (2 diffs)
• Tuples/TupleAssignment.cc (modified) (1 diff)
• Tuples/Tuples.h (modified) (1 diff)

src/AST/Type.hpp

@@ -430 +430 @@
         TypeInstType( const TypeInstType & o ) = default;
 
-        TypeInstType( const TypeEnvKey & key );
+        explicit TypeInstType( const TypeEnvKey & key );
 
         /// sets `base`, updating `kind` correctly

src/ResolvExpr/CandidateFinder.cpp

@@ -1400 +1400 @@
                                 }
                         }
-                        
+
                         CandidateRef newCand = std::make_shared<Candidate>(
                                 newExpr, copy( tenv ), ast::OpenVarSet{}, ast::AssertionSet{}, bentConversion? Cost::safe: Cost::zero,
@@ -1794 +1794 @@
                                                 auto commonAsEnumAttr = common.as<ast::EnumAttrType>();
                                                 if ( commonAsEnumAttr && commonAsEnumAttr->attr == ast::EnumAttribute::Value ) {
-                                                        
                                                         auto callExpr = new ast::UntypedExpr(
                                                                 cand->expr->location, new ast::NameExpr( cand->expr->location, "valueE"), {cand->expr} );
@@ -1823 +1822 @@
                                                         // if this somehow changes in the future (e.g. delayed by indeterminate return type)
                                                         // we may need to revisit the logic.
-                                                        inferParameters( newCand, matches );    
+                                                        inferParameters( newCand, matches );
                                                 }
-                                        }                       
-                                }       
+                                        }
+                                }
                         }
                 }
@@ -2151 +2150 @@
 }
 
-// get the valueE(...) ApplicationExpr that returns the enum value
-const ast::Expr * getValueEnumCall( 
-        const ast::Expr * expr, 
-        const ResolvExpr::ResolveContext & context, const ast::TypeEnvironment & env ) {
-                auto callExpr = new ast::UntypedExpr(
-                        expr->location, new ast::NameExpr( expr->location, "valueE"), {expr} );
-                CandidateFinder finder( context, env );
-                finder.find( callExpr );
-                CandidateList winners = findMinCost( finder.candidates );
-                if (winners.size() != 1) {
-                        SemanticError( callExpr, "Ambiguous expression in valueE" );
-                }
-                CandidateRef & choice = winners.front();
-                return choice->expr;
+const ast::Expr * getValueEnumCall( const ast::Expr * expr,
+                const ResolveContext & context, const ast::TypeEnvironment & env ) {
+        auto callExpr = new ast::UntypedExpr(
+                expr->location, new ast::NameExpr( expr->location, "valueE"), {expr} );
+        CandidateFinder finder( context, env );
+        finder.find( callExpr );
+        CandidateList winners = findMinCost( finder.candidates );
+        if (winners.size() != 1) {
+                SemanticError( callExpr, "Ambiguous expression in valueE" );
+        }
+        CandidateRef & choice = winners.front();
+        return choice->expr;
 }
 

src/ResolvExpr/CandidateFinder.hpp

@@ -30 +30 @@
 struct CandidateFinder {
         CandidateList candidates;          ///< List of candidate resolutions
-        const ResolveContext & context;  ///< Information about where the canditates are being found.
+        const ResolveContext & context;    ///< Information about where the canditates are being found.
         const ast::TypeEnvironment & env;  ///< Substitutions performed in this resolution
         ast::ptr< ast::Type > targetType;  ///< Target type for resolution
         bool strictMode = false;           ///< If set to true, requires targetType to be exact match (inside return cast)
         bool allowVoid = false;            ///< If set to true, allow void-returning function calls (only top level, cast to void and first in comma)
-        std::set< std::string > otypeKeys;  /// different type may map to same key
+        std::set< std::string > otypeKeys; ///< different type may map to same key
 
         CandidateFinder(
@@ -70 +70 @@
         const ast::Expr * expr, Cost & cost );
 
-const ast::Expr * getValueEnumCall(const ast::Expr * expr,
-        const ResolvExpr::ResolveContext & context, const ast::TypeEnvironment & env );
+/// Get the valueE application that returns the enum's value.
+const ast::Expr * getValueEnumCall( const ast::Expr * expr,
+        const ResolveContext & context, const ast::TypeEnvironment & env );
+
 /// Wrap an expression to convert the result to a conditional result.
 const ast::Expr * createCondExpr( const ast::Expr * expr );

src/Tuples/TupleAssignment.cc

@@ -35 +35 @@
 #include "InitTweak/GenInit.h"             // for genCtorInit
 #include "InitTweak/InitTweak.h"           // for getPointerBase, isAssignment
+#include "ResolvExpr/CandidateFinder.hpp"  // for CandidateFinder
 #include "ResolvExpr/Cost.h"               // for Cost
 #include "ResolvExpr/Resolver.h"           // for resolveCtorInit

src/Tuples/Tuples.h

@@ -21 +21 @@
 #include "AST/Fwd.hpp"
 #include "AST/Node.hpp"
-#include "ResolvExpr/CandidateFinder.hpp"
+namespace ResolvExpr {
+        class CandidateFinder;
+}
 
 namespace Tuples {