Changeset bf4fe05 for src/ResolvExpr

Timestamp:

May 13, 2024, 7:07:06 AM (17 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ca4f2b2

Parents:

ec20ab9 (diff), 5f225f5 (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:

fix merge

Location:

src/ResolvExpr

Files:

• AdjustExprType.cpp (moved) (moved from src/ResolvExpr/AdjustExprType.cc ) (1 diff)
• Candidate.hpp (modified) (1 diff)
• CandidateFinder.cpp (modified) (4 diffs)
• CandidateFinder.hpp (modified) (1 diff)
• CandidatePrinter.cpp (modified) (1 diff)
• CastCost.cpp (moved) (moved from src/ResolvExpr/CastCost.cc ) (4 diffs)
• CastCost.hpp (modified) (2 diffs)
• CommonType.cpp (moved) (moved from src/ResolvExpr/CommonType.cc ) (3 diffs)
• CommonType.hpp (modified) (1 diff)
• ConversionCost.cpp (moved) (moved from src/ResolvExpr/ConversionCost.cc ) (6 diffs)
• ConversionCost.hpp (moved) (moved from src/ResolvExpr/ConversionCost.h ) (2 diffs)
• Cost.hpp (moved) (moved from src/ResolvExpr/Cost.h )
• CurrentObject.cpp (moved) (moved from src/ResolvExpr/CurrentObject.cc ) (3 diffs)
• CurrentObject.hpp (moved) (moved from src/ResolvExpr/CurrentObject.h ) (2 diffs)
• ExplodedArg.cpp (modified) (1 diff)
• ExplodedArg.hpp (modified) (1 diff)
• FindOpenVars.cpp (moved) (moved from src/ResolvExpr/FindOpenVars.cc ) (2 diffs)
• FindOpenVars.hpp (moved) (moved from src/ResolvExpr/FindOpenVars.h )
• PolyCost.cpp (moved) (moved from src/ResolvExpr/PolyCost.cc ) (1 diff)
• PtrsAssignable.cpp (moved) (moved from src/ResolvExpr/PtrsAssignable.cc ) (1 diff)
• PtrsCastable.cpp (moved) (moved from src/ResolvExpr/PtrsCastable.cc ) (1 diff)
• RenameVars.cpp (moved) (moved from src/ResolvExpr/RenameVars.cc ) (2 diffs)
• RenameVars.hpp (moved) (moved from src/ResolvExpr/RenameVars.h ) (1 diff)
• ResolveTypeof.cpp (moved) (moved from src/ResolvExpr/ResolveTypeof.cc ) (3 diffs)
• ResolveTypeof.hpp (moved) (moved from src/ResolvExpr/ResolveTypeof.h ) (1 diff)
• Resolver.cpp (moved) (moved from src/ResolvExpr/Resolver.cc ) (3 diffs)
• Resolver.hpp (moved) (moved from src/ResolvExpr/Resolver.h ) (1 diff)
• SatisfyAssertions.cpp (modified) (2 diffs)
• SpecCost.cpp (moved) (moved from src/ResolvExpr/SpecCost.cc ) (1 diff)
• Typeops.hpp (moved) (moved from src/ResolvExpr/typeops.h ) (1 diff)
• Unify.cpp (moved) (moved from src/ResolvExpr/Unify.cc ) (3 diffs)
• Unify.hpp (moved) (moved from src/ResolvExpr/Unify.h ) (2 diffs)
• WidenMode.hpp (moved) (moved from src/ResolvExpr/WidenMode.h )
• module.mk (modified) (2 diffs)

src/ResolvExpr/AdjustExprType.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// AdjustExprType_old.cc --
+// AdjustExprType.cpp --
 //
 // Author           : Richard C. Bilson

src/ResolvExpr/Candidate.hpp

@@ -20 +20 @@
 #include <vector>
 
-#include "Cost.h"
+#include "Cost.hpp"
 #include "AST/Node.hpp"
 #include "AST/TypeEnvironment.hpp"
-#include "Common/Indenter.h"
+#include "Common/Indenter.hpp"
 
 namespace ast {

src/ResolvExpr/CandidateFinder.cpp

@@ -17 +17 @@
 
 #include <deque>
-#include <iterator>               // for back_inserter
+#include <iterator>                 // for back_inserter
 #include <sstream>
 #include <string>
@@ -25 +25 @@
 #include "AdjustExprType.hpp"
 #include "Candidate.hpp"
-#include "CastCost.hpp"           // for castCost
+#include "CastCost.hpp"             // for castCost
 #include "CompilationState.hpp"
-#include "ConversionCost.h"       // for conversionCast
-#include "Cost.h"
+#include "ConversionCost.hpp"       // for conversionCast
+#include "Cost.hpp"
 #include "ExplodedArg.hpp"
 #include "PolyCost.hpp"
-#include "RenameVars.h"           // for renameTyVars
-#include "Resolver.h"
-#include "ResolveTypeof.h"
+#include "RenameVars.hpp"           // for renameTyVars
+#include "Resolver.hpp"
+#include "ResolveTypeof.hpp"
 #include "SatisfyAssertions.hpp"
 #include "SpecCost.hpp"
-#include "typeops.h"              // for combos
-#include "Unify.h"
-#include "WidenMode.h"
+#include "Typeops.hpp"              // for combos
+#include "Unify.hpp"
+#include "WidenMode.hpp"
 #include "AST/Expr.hpp"
 #include "AST/Node.hpp"
@@ -45 +45 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
-#include "Common/utility.h"       // for move, copy
-#include "SymTab/Mangler.h"
-#include "Tuples/Tuples.h"        // for handleTupleAssignment
-#include "InitTweak/InitTweak.h"  // for getPointerBase
-
-#include "Common/Stats/Counter.h"
+#include "Common/Utility.hpp"       // for move, copy
+#include "SymTab/Mangler.hpp"
+#include "Tuples/Tuples.hpp"        // for handleTupleAssignment
+#include "InitTweak/InitTweak.hpp"  // for getPointerBase
+
+#include "Common/Stats/Counter.hpp"
 
 #include "AST/Inspect.hpp"             // for getFunctionName
@@ -2138 +2138 @@
 }
 
-// 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 * createCondExpr( const ast::Expr * expr ) {
         assert( expr );

src/ResolvExpr/CandidateFinder.hpp

@@ -70 +70 @@
         const ast::Expr * expr, Cost & cost );
 
-/// 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/ResolvExpr/CandidatePrinter.cpp

@@ -24 +24 @@
 #include "AST/TranslationUnit.hpp"
 #include "ResolvExpr/CandidateFinder.hpp"
-#include "ResolvExpr/Resolver.h"
+#include "ResolvExpr/Resolver.hpp"
 
 namespace ResolvExpr {

src/ResolvExpr/CastCost.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CastCost.cc --
+// CastCost.cpp --
 //
 // Author           : Richard C. Bilson
@@ -22 +22 @@
 #include "AST/Type.hpp"
 #include "AST/TypeEnvironment.hpp"
-#include "ConversionCost.h"              // for ConversionCost
-#include "Cost.h"                        // for Cost, Cost::infinity
-#include "ResolvExpr/ConversionCost.h"   // for conversionCost
+#include "ConversionCost.hpp"            // for ConversionCost
+#include "Cost.hpp"                      // for Cost, Cost::infinity
+#include "ResolvExpr/ConversionCost.hpp" // for conversionCost
 #include "ResolvExpr/PtrsCastable.hpp"   // for ptrsCastable
-#include "ResolvExpr/Unify.h"            // for typesCompatibleIgnoreQualifiers
+#include "ResolvExpr/Unify.hpp"          // for typesCompatibleIgnoreQualifiers
 
 #if 0
@@ -54 +54 @@
                                 cost = conversionCost( basicType, dst, srcIsLvalue, symtab, env );
                                 if ( Cost::unsafe < cost ) {
-                                        if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                                assert(enumInst->base->base);
-                                                cost = Cost::unsafe;
+                                        if (auto enumInst = dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                                // Always explict cast only for typed enum
+                                                if (enumInst->base->isTyped) cost = Cost::unsafe;
                                         }
                                 }
@@ -63 +63 @@
 
                 void postvisit( const ast::ZeroType * zero ) {
-                        // auto ptr = dynamic_cast< const ast::PointerType * >( dst );
-                        // if ( ptr && basicType->isInteger() ) {
-                        //      // needed for, e.g. unsigned long => void *
-                        //      cost = Cost::unsafe;
-                        // } else {
                         cost = conversionCost( zero, dst, srcIsLvalue, symtab, env );
                         if ( Cost::unsafe < cost ) {
                                 if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                        assert(enumInst->base->base);
-                                        cost = Cost::unsafe;
+                                        if (enumInst->base->isTyped) cost = Cost::unsafe;
                                 }
                         }
-                        // }
                 }
 
                 void postvisit( const ast::OneType * one ) {
-                        // auto ptr = dynamic_cast< const ast::PointerType * >( dst );
-                        // if ( ptr && basicType->isInteger() ) {
-                        //      // needed for, e.g. unsigned long => void *
-                        //      cost = Cost::unsafe;
-                        // } else {
                         cost = conversionCost( one, dst, srcIsLvalue, symtab, env );
                         if ( Cost::unsafe < cost ) {
-                                if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                        assert(enumInst->base->base);
-                                        cost = Cost::unsafe;
+                                if (auto enumInst = dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                        if (enumInst->base->isTyped) cost = Cost::unsafe;
                                 }
                         }
-                        // }
                 }
 

src/ResolvExpr/CastCost.hpp

@@ -16 +16 @@
 #pragma once
 
-#include "ResolvExpr/Cost.h"     // for Cost
-
 namespace ast {
         class SymbolTable;
@@ -25 +23 @@
 
 namespace ResolvExpr {
+
+class Cost;
 
 Cost castCost(

src/ResolvExpr/CommonType.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CommonType.cc --
+// CommonType.cpp --
 //
 // Author           : Richard C. Bilson
@@ -23 +23 @@
 #include "AST/Pass.hpp"
 #include "AST/Type.hpp"
-#include "Unify.h"                       // for unifyExact, WidenMode
-#include "typeops.h"                     // for isFtype
-#include "Tuples/Tuples.h"
+#include "Unify.hpp"                     // for unifyExact, WidenMode
+#include "Typeops.hpp"                   // for isFtype
+#include "Tuples/Tuples.hpp"
 
 // #define DEBUG
@@ -650 +650 @@
 
         void postvisit( const ast::EnumInstType * enumInst ) {
-                if ( enumInst->base && !enumInst->base->base ) {
+                if ( enumInst->base && !enumInst->base->isTyped ) {
                         auto basicType = new ast::BasicType( ast::BasicKind::UnsignedInt );
                         result = commonType( basicType, type2, tenv, need, have, open, widen);

src/ResolvExpr/CommonType.hpp

@@ -18 +18 @@
 #include "AST/Fwd.hpp"
 #include "AST/TypeEnvironment.hpp"  // for AssertionSet, OpenVarSet
-#include "WidenMode.h"              // for WidenMode
+#include "WidenMode.hpp"            // for WidenMode
 
 namespace ResolvExpr {

src/ResolvExpr/ConversionCost.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ConversionCost.cc --
+// ConversionCost.cpp --
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
-#include "ConversionCost.h"
+#include "ConversionCost.hpp"
 
 #include <cassert>                       // for assert
@@ -20 +20 @@
 #include <string>                        // for operator==, string
 
-#include "ResolvExpr/Cost.h"             // for Cost
-#include "ResolvExpr/Unify.h"            // for typesCompatibleIgnoreQualifiers
+#include "ResolvExpr/Cost.hpp"           // for Cost
+#include "ResolvExpr/Unify.hpp"          // for typesCompatibleIgnoreQualifiers
 #include "ResolvExpr/PtrsAssignable.hpp" // for ptrsAssignable
 
@@ -283 +283 @@
                 cost = costCalc( basicType, integer, srcIsLvalue, symtab, env );
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && !dstAsEnumInst->base->base ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
                         cost = Cost::unsafe;
                 }
@@ -480 +480 @@
                 // assuming 0p is supposed to be used for pointers?
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && !dstAsEnumInst->base->base ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
                         cost = Cost::unsafe;
                 }
@@ -501 +501 @@
                 }
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && !dstAsEnumInst->base->base ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
                         cost = Cost::unsafe;
                 }

src/ResolvExpr/ConversionCost.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ConversionCost.h --
+// ConversionCost.hpp --
 //
 // Author           : Richard C. Bilson
@@ -18 +18 @@
 #include <functional>         // for function
 
-#include "Cost.h"             // for Cost
+#include "Cost.hpp"           // for Cost
 
 #include "AST/Fwd.hpp"

src/ResolvExpr/CurrentObject.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CurrentObject.h --
+// CurrentObject.cpp --
 //
 // Author           : Rob Schluntz
@@ -14 +14 @@
 //
 
+#include "CurrentObject.hpp"
+
 #include <stddef.h>                    // for size_t
 #include <cassert>                     // for assertf, assert, safe_dynamic_...
@@ -28 +30 @@
 #include "AST/Print.hpp"               // for readonly
 #include "AST/Type.hpp"
-#include "Common/Eval.h"               // for eval
-#include "Common/Indenter.h"           // for Indenter, operator<<
-#include "Common/SemanticError.h"      // for SemanticError
-#include "Common/utility.h"            // for toString
-#include "CurrentObject.h"
+#include "Common/Eval.hpp"             // for eval
+#include "Common/Indenter.hpp"         // for Indenter, operator<<
+#include "Common/SemanticError.hpp"    // for SemanticError
+#include "Common/Utility.hpp"          // for toString
 
 #if 0

src/ResolvExpr/CurrentObject.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CurrentObject.h --
+// CurrentObject.hpp --
 //
 // Author           : Rob Schluntz
@@ -21 +21 @@
 
 #include "AST/Node.hpp"  // for ptr
-#include "Common/CodeLocation.h"
+#include "Common/CodeLocation.hpp"
 
 namespace ast {

src/ResolvExpr/ExplodedArg.cpp

@@ -16 +16 @@
 #include "ExplodedArg.hpp"
 
-#include "Tuples/Explode.h"   // for Tuples::explode
+#include "Tuples/Explode.hpp"   // for Tuples::explode
 
 namespace ResolvExpr {

src/ResolvExpr/ExplodedArg.hpp

@@ -19 +19 @@
 
 #include "Candidate.hpp"            // for Candidate, CandidateList
-#include "Cost.h"                   // for Cost
+#include "Cost.hpp"                 // for Cost
 #include "AST/Expr.hpp"
 #include "AST/Node.hpp"             // for ptr

src/ResolvExpr/FindOpenVars.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FindOpenVars.cc --
+// FindOpenVars.cpp --
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
-#include "FindOpenVars.h"
+#include "FindOpenVars.hpp"
 
 #include "AST/Pass.hpp"

src/ResolvExpr/PolyCost.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PolyCost.cc --
+// PolyCost.cpp --
 //
 // Author           : Richard C. Bilson

src/ResolvExpr/PtrsAssignable.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PtrsAssignable.cc --
+// PtrsAssignable.cpp --
 //
 // Author           : Richard C. Bilson

src/ResolvExpr/PtrsCastable.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PtrsCastable.cc --
+// PtrsCastable.cpp --
 //
 // Author           : Richard C. Bilson

src/ResolvExpr/RenameVars.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// RenameVars.cc --
+// RenameVars.cpp --
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
-#include <ext/alloc_traits.h>      // for __alloc_traits<>::value_type
-#include <memory>                  // for allocator_traits<>::value_type
-#include <sstream>                 // for operator<<, basic_ostream, ostring...
-#include <utility>                 // for pair
+#include <ext/alloc_traits.h>         // for __alloc_traits<>::value_type
+#include <memory>                     // for allocator_traits<>::value_type
+#include <sstream>                    // for operator<<, basic_ostream, ostr...
+#include <utility>                    // for pair
 
 #include "AST/Pass.hpp"
 #include "AST/Type.hpp"
-#include "Common/ScopedMap.h"
-#include "Common/SemanticError.h"  // for SemanticError
-#include "RenameVars.h"
+#include "Common/ScopedMap.hpp"
+#include "Common/SemanticError.hpp"   // for SemanticError
+#include "RenameVars.hpp"
 
 #include "AST/Copy.hpp"

src/ResolvExpr/RenameVars.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// RenameVars.h --
+// RenameVars.hpp --
 //
 // Author           : Richard C. Bilson

src/ResolvExpr/ResolveTypeof.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ResolveTypeof.cc --
+// ResolveTypeof.cpp --
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
-#include "ResolveTypeof.h"
+#include "ResolveTypeof.hpp"
 
-#include <cassert>  // for assert
+#include <cassert>                  // for assert
 
 #include "AST/CVQualifiers.hpp"
@@ -24 +24 @@
 #include "AST/Type.hpp"
 #include "AST/TypeEnvironment.hpp"
-#include "Common/utility.h"       // for copy
-#include "InitTweak/InitTweak.h"  // for isConstExpr
-#include "RenameVars.h"
-#include "Resolver.h"  // for resolveInVoidContext
-#include "SymTab/Mangler.h"
+#include "Common/Utility.hpp"       // for copy
+#include "InitTweak/InitTweak.hpp"  // for isConstExpr
+#include "RenameVars.hpp"
+#include "Resolver.hpp"             // for resolveInVoidContext
+#include "SymTab/Mangler.hpp"
 
 namespace ResolvExpr {

src/ResolvExpr/ResolveTypeof.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ResolveTypeof.h --
+// ResolveTypeof.hpp --
 //
 // Author           : Richard C. Bilson

src/ResolvExpr/Resolver.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Resolver.cc --
+// Resolver.cpp --
 //
 // Author           : Aaron B. Moss
@@ -21 +21 @@
 #include "Candidate.hpp"
 #include "CandidateFinder.hpp"
-#include "CurrentObject.h"               // for CurrentObject
-#include "RenameVars.h"                  // for RenameVars, global_renamer
-#include "Resolver.h"
-#include "ResolveTypeof.h"
+#include "CurrentObject.hpp"             // for CurrentObject
+#include "RenameVars.hpp"                // for RenameVars, global_renamer
+#include "Resolver.hpp"
+#include "ResolveTypeof.hpp"
 #include "ResolveMode.hpp"               // for ResolveMode
-#include "typeops.h"                     // for extractResultType
-#include "Unify.h"                       // for unify
+#include "Typeops.hpp"                   // for extractResultType
+#include "Unify.hpp"                     // for unify
 #include "CompilationState.hpp"
 #include "AST/Decl.hpp"
@@ -35 +35 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
-#include "Common/Eval.h"                 // for eval
+#include "Common/Eval.hpp"               // for eval
 #include "Common/Iterate.hpp"            // for group_iterate
-#include "Common/SemanticError.h"        // for SemanticError
-#include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
+#include "Common/SemanticError.hpp"      // for SemanticError
+#include "Common/Stats/ResolveTime.hpp"  // for ResolveTime::start(), ResolveTime::stop()
 #include "Common/ToString.hpp"           // for toCString
-#include "Common/UniqueName.h"           // for UniqueName
-#include "InitTweak/GenInit.h"
-#include "InitTweak/InitTweak.h"         // for isIntrinsicSingleArgCallStmt
-#include "SymTab/Mangler.h"              // for Mangler
-#include "Tuples/Tuples.h"
-#include "Validate/FindSpecialDecls.h"   // for SizeType
+#include "Common/UniqueName.hpp"         // for UniqueName
+#include "InitTweak/GenInit.hpp"
+#include "InitTweak/InitTweak.hpp"       // for isIntrinsicSingleArgCallStmt
+#include "SymTab/Mangler.hpp"            // for Mangler
+#include "Tuples/Tuples.hpp"
+#include "Validate/FindSpecialDecls.hpp" // for SizeType
 
 using namespace std;

src/ResolvExpr/Resolver.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Resolver.h --
+// Resolver.hpp --
 //
 // Author           : Richard C. Bilson

src/ResolvExpr/SatisfyAssertions.cpp

@@ -28 +28 @@
 #include "CandidateFinder.hpp"
 #include "CommonType.hpp"
-#include "Cost.h"
-#include "RenameVars.h"
+#include "Cost.hpp"
+#include "RenameVars.hpp"
 #include "SpecCost.hpp"
-#include "typeops.h"
-#include "Unify.h"
+#include "Typeops.hpp"
+#include "Unify.hpp"
 #include "AST/Decl.hpp"
 #include "AST/Expr.hpp"
@@ -40 +40 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/TypeEnvironment.hpp"
-#include "FindOpenVars.h"
-#include "Common/FilterCombos.h"
-#include "Common/Indenter.h"
-#include "GenPoly/GenPoly.h"
-#include "SymTab/Mangler.h"
+#include "FindOpenVars.hpp"
+#include "Common/FilterCombos.hpp"
+#include "Common/Indenter.hpp"
+#include "GenPoly/GenPoly.hpp"
+#include "SymTab/Mangler.hpp"
 
 namespace ResolvExpr {

src/ResolvExpr/SpecCost.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SpecCost.cc --
+// SpecCost.cpp --
 //
 // Author           : Aaron B. Moss

src/ResolvExpr/Typeops.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// typeops.h --
+// Typeops.hpp --
 //
 // Author           : Richard C. Bilson

src/ResolvExpr/Unify.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Unify.cc --
+// Unify.cpp --
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
-#include "Unify.h"
+#include "Unify.hpp"
 
 #include <cassert>                  // for assertf, assert
@@ -32 +32 @@
 #include "AST/Type.hpp"
 #include "AST/TypeEnvironment.hpp"
-#include "Common/Eval.h"            // for eval
+#include "Common/Eval.hpp"          // for eval
 #include "CommonType.hpp"           // for commonType
-#include "FindOpenVars.h"           // for findOpenVars
+#include "FindOpenVars.hpp"         // for findOpenVars
 #include "SpecCost.hpp"             // for SpecCost
-#include "Tuples/Tuples.h"          // for isTtype
-#include "typeops.h"                // for flatten, occurs
+#include "Tuples/Tuples.hpp"        // for isTtype
+#include "Typeops.hpp"              // for flatten, occurs
 
 namespace ast {

src/ResolvExpr/Unify.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Unify.h --
+// Unify.hpp --
 //
 // Author           : Richard C. Bilson
@@ -18 +18 @@
 #include "AST/Node.hpp"             // for ptr
 #include "AST/TypeEnvironment.hpp"  // for TypeEnvironment, AssertionSet, OpenVarSet
-#include "WidenMode.h"              // for WidenMode
+#include "WidenMode.hpp"            // for WidenMode
 
 namespace ast {

src/ResolvExpr/module.mk

@@ -16 +16 @@
 
 SRC_RESOLVEXPR = \
-      ResolvExpr/AdjustExprType.cc \
+      ResolvExpr/AdjustExprType.cpp \
       ResolvExpr/AdjustExprType.hpp \
       ResolvExpr/Candidate.cpp \
@@ -22 +22 @@
       ResolvExpr/CandidateFinder.hpp \
       ResolvExpr/Candidate.hpp \
-      ResolvExpr/CastCost.cc \
+      ResolvExpr/CastCost.cpp \
       ResolvExpr/CastCost.hpp \
-      ResolvExpr/CommonType.cc \
+      ResolvExpr/CommonType.cpp \
       ResolvExpr/CommonType.hpp \
-      ResolvExpr/ConversionCost.cc \
-      ResolvExpr/ConversionCost.h \
-      ResolvExpr/Cost.h \
-      ResolvExpr/CurrentObject.cc \
-      ResolvExpr/CurrentObject.h \
+      ResolvExpr/ConversionCost.cpp \
+      ResolvExpr/ConversionCost.hpp \
+      ResolvExpr/Cost.hpp \
+      ResolvExpr/CurrentObject.cpp \
+      ResolvExpr/CurrentObject.hpp \
       ResolvExpr/ExplodedArg.cpp \
       ResolvExpr/ExplodedArg.hpp \
-      ResolvExpr/FindOpenVars.cc \
-      ResolvExpr/FindOpenVars.h \
-      ResolvExpr/PolyCost.cc \
+      ResolvExpr/FindOpenVars.cpp \
+      ResolvExpr/FindOpenVars.hpp \
+      ResolvExpr/PolyCost.cpp \
       ResolvExpr/PolyCost.hpp \
-      ResolvExpr/PtrsAssignable.cc \
+      ResolvExpr/PtrsAssignable.cpp \
       ResolvExpr/PtrsAssignable.hpp \
-      ResolvExpr/PtrsCastable.cc \
+      ResolvExpr/PtrsCastable.cpp \
       ResolvExpr/PtrsCastable.hpp \
-      ResolvExpr/RenameVars.cc \
-      ResolvExpr/RenameVars.h \
-      ResolvExpr/Resolver.cc \
-      ResolvExpr/Resolver.h \
-      ResolvExpr/ResolveTypeof.cc \
-      ResolvExpr/ResolveTypeof.h \
+      ResolvExpr/RenameVars.cpp \
+      ResolvExpr/RenameVars.hpp \
+      ResolvExpr/Resolver.cpp \
+      ResolvExpr/Resolver.hpp \
+      ResolvExpr/ResolveTypeof.cpp \
+      ResolvExpr/ResolveTypeof.hpp \
       ResolvExpr/ResolveMode.hpp \
       ResolvExpr/SatisfyAssertions.cpp \
       ResolvExpr/SatisfyAssertions.hpp \
-      ResolvExpr/SpecCost.cc \
+      ResolvExpr/SpecCost.cpp \
       ResolvExpr/SpecCost.hpp \
-      ResolvExpr/typeops.h \
-      ResolvExpr/Unify.cc \
-      ResolvExpr/Unify.h \
-      ResolvExpr/WidenMode.h
+      ResolvExpr/Typeops.hpp \
+      ResolvExpr/Unify.cpp \
+      ResolvExpr/Unify.hpp \
+      ResolvExpr/WidenMode.hpp
 
 SRC += $(SRC_RESOLVEXPR) \