Changeset 6ac5223 for src/GenPoly/GenPoly.h

Timestamp:

Aug 17, 2017, 3:42:21 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e50e9ff

Parents:

97e3296 (diff), 21f0aa8 (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

File:

• src/GenPoly/GenPoly.h (modified) (2 diffs)

src/GenPoly/GenPoly.h

@@ -16 +16 @@
 #pragma once
 
-#include <string>
-#include <iostream>
-#include <utility>
+#include <iostream>               // for ostream
+#include <string>                 // for string, allocator, operator+, basic...
 
-#include "ErasableScopedMap.h"
-
-#include "SymTab/Mangler.h"
-
-#include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
-#include "SynTree/TypeSubstitution.h"
+#include "ErasableScopedMap.h"    // for ErasableScopedMap
+#include "SymTab/Mangler.h"       // for Mangler
+#include "SynTree/Declaration.h"  // for TypeDecl::Data, AggregateDecl, Type...
+#include "SynTree/SynTree.h"      // for Visitor Nodes
 
 namespace GenPoly {
@@ -66 +62 @@
         Type *hasPolyBase( Type *type, const TyVarMap &tyVars, int *levels = 0, const TypeSubstitution *env = 0 );
 
-        /// true iff this type or some base of this type after dereferencing pointers is either polymorphic or a generic type with at least one 
+        /// true iff this type or some base of this type after dereferencing pointers is either polymorphic or a generic type with at least one
         /// polymorphic parameter; will look up substitution in env if provided.
         bool includesPolyType( Type *type, const TypeSubstitution *env = 0 );
 
-        /// true iff this type or some base of this type after dereferencing pointers is either polymorphic in tyVars, or a generic type with 
+        /// true iff this type or some base of this type after dereferencing pointers is either polymorphic in tyVars, or a generic type with
         /// at least one polymorphic parameter in tyVars; will look up substitution in env if provided.
         bool includesPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 );