Changeset f53acdf8 for src/ResolvExpr/typeops.h

Timestamp:

Jul 19, 2019, 2:16:01 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4eb43fa

Parents:

1f1c102 (diff), 8ac3b0e (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' into new-ast

File:

• src/ResolvExpr/typeops.h (modified) (7 diffs)

src/ResolvExpr/typeops.h

@@ -28 +28 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Type.h"
-#include "SymTab/Indexer.h"
+
+namespace SymTab {
+        class Indexer;
+}
 
 namespace ResolvExpr {
@@ -60 +63 @@
         // in AdjustExprType.cc
         /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function
-        void adjustExprType( Type *&type, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+        void adjustExprType( Type *& type, const TypeEnvironment & env, const SymTab::Indexer & indexer );
 
         /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function using empty TypeEnvironment and Indexer
@@ -66 +69 @@
 
         template< typename ForwardIterator >
-        void adjustExprTypeList( ForwardIterator begin, ForwardIterator end, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
+        void adjustExprTypeList( ForwardIterator begin, ForwardIterator end, const TypeEnvironment & env, const SymTab::Indexer & indexer ) {
                 while ( begin != end ) {
                         adjustExprType( *begin++, env, indexer );
@@ -73 +76 @@
 
         /// Replaces array types with equivalent pointer, and function types with a pointer-to-function
-        const ast::Type * adjustExprType( 
+        const ast::Type * adjustExprType(
                 const ast::Type * type, const ast::TypeEnvironment & env, const ast::SymbolTable & symtab );
 
         // in CastCost.cc
-        Cost castCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
-        Cost castCost( 
-                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab, 
+        Cost castCost( const Type * src, const Type * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        Cost castCost(
+                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
                 const ast::TypeEnvironment & env );
 
         // in ConversionCost.cc
-        Cost conversionCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
-        Cost conversionCost( 
-                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab, 
+        Cost conversionCost( const Type * src, const Type * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        Cost conversionCost(
+                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
                 const ast::TypeEnvironment & env );
 
         // in AlternativeFinder.cc
-        Cost computeConversionCost( Type *actualType, Type *formalType, 
-                const SymTab::Indexer &indexer, const TypeEnvironment &env );
+        Cost computeConversionCost( Type * actualType, Type * formalType,
+                const SymTab::Indexer & indexer, const TypeEnvironment & env );
 
         // in PtrsAssignable.cc
-        int ptrsAssignable( Type *src, Type *dest, const TypeEnvironment &env );
+        int ptrsAssignable( const Type * src, const Type * dest, const TypeEnvironment & env );
         int ptrsAssignable( const ast::Type * src, const ast::Type * dst,
                 const ast::TypeEnvironment & env );
 
         // in PtrsCastable.cc
-        int ptrsCastable( Type *src, Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
-        int ptrsCastable( 
-                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab, 
+        int ptrsCastable( const Type * src, const Type * dest, const TypeEnvironment & env, const SymTab::Indexer & indexer );
+        int ptrsCastable(
+                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab,
                 const ast::TypeEnvironment & env );
 
         // in Unify.cc
-        bool typesCompatible( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );
-        bool typesCompatibleIgnoreQualifiers( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );
-
-        inline bool typesCompatible( Type *t1, Type *t2, const SymTab::Indexer &indexer ) {
+        bool typesCompatible( const Type *, const Type *, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+        bool typesCompatibleIgnoreQualifiers( const Type *, const Type *, const SymTab::Indexer & indexer, const TypeEnvironment & env );
+
+        inline bool typesCompatible( const Type * t1, const Type * t2, const SymTab::Indexer & indexer ) {
                 TypeEnvironment env;
                 return typesCompatible( t1, t2, indexer, env );
         }
 
-        inline bool typesCompatibleIgnoreQualifiers( Type *t1, Type *t2, const SymTab::Indexer &indexer ) {
+        inline bool typesCompatibleIgnoreQualifiers( const Type * t1, const Type * t2, const SymTab::Indexer & indexer ) {
                 TypeEnvironment env;
                 return typesCompatibleIgnoreQualifiers( t1, t2, indexer, env );
         }
 
-        bool typesCompatible( 
-                const ast::Type *, const ast::Type *, const ast::SymbolTable & symtab = {}, 
+        bool typesCompatible(
+                const ast::Type *, const ast::Type *, const ast::SymbolTable & symtab = {},
                 const ast::TypeEnvironment & env = {} );
-        
+
         bool typesCompatibleIgnoreQualifiers(
-                const ast::Type *, const ast::Type *, const ast::SymbolTable &, 
+                const ast::Type *, const ast::Type *, const ast::SymbolTable &,
                 const ast::TypeEnvironment & env = {} );
 
@@ -131 +134 @@
 
         // in CommonType.cc
-        Type * commonType( Type *type1, Type *type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars );
+        Type * commonType( Type * type1, Type * type2, bool widenFirst, bool widenSecond, const SymTab::Indexer & indexer, TypeEnvironment & env, const OpenVarSet & openVars );
         ast::ptr< ast::Type > commonType(
-                const ast::ptr< ast::Type > & type1, const ast::ptr< ast::Type > & type2, WidenMode widen, 
+                const ast::ptr< ast::Type > & type1, const ast::ptr< ast::Type > & type2, WidenMode widen,
                 const ast::SymbolTable & symtab, ast::TypeEnvironment & env, const ast::OpenVarSet & open );
 
         // in PolyCost.cc
-        int polyCost( Type *type, const TypeEnvironment &env, const SymTab::Indexer &indexer );
-        int polyCost( 
+        int polyCost( Type * type, const TypeEnvironment & env, const SymTab::Indexer & indexer );
+        int polyCost(
                 const ast::Type * type, const ast::SymbolTable & symtab, const ast::TypeEnvironment & env );
 
         // in SpecCost.cc
-        int specCost( Type *type );
+        int specCost( Type * type );
         int specCost( const ast::Type * type );
 
         // in Occurs.cc
-        bool occurs( Type *type, std::string varName, const TypeEnvironment &env );
+        bool occurs( Type * type, std::string varName, const TypeEnvironment & env );
         // new AST version in TypeEnvironment.cpp (only place it was used in old AST)
 
-        template<typename Iter> 
-        bool occursIn( Type* ty, Iter begin, Iter end, const TypeEnvironment &env ) {
+        template<typename Iter>
+        bool occursIn( Type* ty, Iter begin, Iter end, const TypeEnvironment & env ) {
                 while ( begin != end ) {
                         if ( occurs( ty, *begin, env ) ) return true;
@@ -176 +179 @@
 
         /// flatten tuple type into existing list of types
-        static inline void flatten( 
-                const ast::Type * type, std::vector< ast::ptr< ast::Type > > & out 
+        static inline void flatten(
+                const ast::Type * type, std::vector< ast::ptr< ast::Type > > & out
         ) {
-                if ( auto tupleType = dynamic_cast< const ast::TupleType * >( type ) ) {        
+                if ( auto tupleType = dynamic_cast< const ast::TupleType * >( type ) ) {
                         for ( const ast::Type * t : tupleType->types ) {
                                 flatten( t, out );
@@ -197 +200 @@
 
         // in TypeEnvironment.cc
-        bool isFtype( Type *type );
+        bool isFtype( Type * type );
 } // namespace ResolvExpr