Changes in src/ResolvExpr/typeops.h [7870799:6f096d2]

File:

• src/ResolvExpr/typeops.h (modified) (10 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 );
@@ -77 +80 @@
 
         // in CastCost.cc
-        Cost castCost( const Type * src, const Type * dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
+        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,
@@ -83 +86 @@
 
         // in ConversionCost.cc
-        Cost conversionCost( const Type *src, const Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
+        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,
@@ -89 +92 @@
 
         // 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( const Type * src, const 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( const Type * src, const Type * dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+        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,
@@ -104 +107 @@
 
         // in Unify.cc
-        bool typesCompatible( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );
-        bool typesCompatibleIgnoreQualifiers( const Type *, const 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( const Type * t1, const 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 );
@@ -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,
@@ -137 +140 @@
 
         // in PolyCost.cc
-        int polyCost( Type *type, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+        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 ) {
+        bool occursIn( Type* ty, Iter begin, Iter end, const TypeEnvironment & env ) {
                 while ( begin != end ) {
                         if ( occurs( ty, *begin, env ) ) return true;
@@ -197 +200 @@
 
         // in TypeEnvironment.cc
-        bool isFtype( Type *type );
+        bool isFtype( Type * type );
 } // namespace ResolvExpr