Changes in src/AST/Type.cpp [3e5dd913:361bf01]

File:

• src/AST/Type.cpp (modified) (3 diffs)

src/AST/Type.cpp

@@ -21 +21 @@
 
 #include "Decl.hpp"
+#include "ForallSubstitutor.hpp" // for substituteForall
 #include "Init.hpp"
 #include "Common/utility.h"      // for copy, move
@@ -91 +92 @@
 // GENERATED END
 
+// --- ParameterizedType
+
+void FunctionType::initWithSub(
+        const FunctionType & o, Pass< ForallSubstitutor > & sub
+) {
+        forall = sub.core( o.forall );
+}
+
 // --- FunctionType
+
+
+FunctionType::FunctionType( const FunctionType & o )
+: Type( o.qualifiers, copy( o.attributes ) ), returns(), params(),
+  isVarArgs( o.isVarArgs ) {
+        Pass< ForallSubstitutor > sub;
+        initWithSub( o, sub );           // initialize substitution map
+        returns = sub.core( o.returns ); // apply to return and parameter types
+        params = sub.core( o.params );
+}
+
 namespace {
         bool containsTtype( const std::vector<ptr<Type>> & l ) {
@@ -179 +199 @@
                 // TODO: once TypeInstType representation is updated, it should properly check
                 // if the context id is filled. this is a temporary hack for now
-                return typeInst->formal_usage > 0;
+                return isUnboundType(typeInst->name);
+        }
+        return false;
+}
+
+bool isUnboundType(const std::string & tname) {
+        // xxx - look for a type name produced by renameTyVars.
+
+        // TODO: once TypeInstType representation is updated, it should properly check
+        // if the context id is filled. this is a temporary hack for now
+        if (std::count(tname.begin(), tname.end(), '_') >= 3) {
+                return true;
         }
         return false;