summaryrefslogtreecommitdiff
path: root/src/resolve.cc
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2015-01-04 09:32:08 -0500
committerAdrian Thurston <thurston@complang.org>2015-01-04 09:32:08 -0500
commit650b70f4a55af12ee1ebb22a9afdd9fba7a3b626 (patch)
tree6bdcebe0091aed9936964cf37b4670ba21a7ef3c /src/resolve.cc
parente682fbd4a5f83142ada2aa92d7a642035c010348 (diff)
downloadcolm-650b70f4a55af12ee1ebb22a9afdd9fba7a3b626.tar.gz
no longer allocating a langEl to generics
enerics are now structs. Also added the TYPE_GERERIC unique type.
Diffstat (limited to 'src/resolve.cc')
-rw-r--r--src/resolve.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resolve.cc b/src/resolve.cc
index b701a092..88a79564 100644
--- a/src/resolve.cc
+++ b/src/resolve.cc
@@ -131,7 +131,7 @@ UniqueType *TypeRef::resolveTypeList( Compiler *pd )
}
generic = inMap->generic;
- return pd->findUniqueType( TYPE_PTR, pd->findUniqueType( TYPE_TREE, inMap->generic->langEl )->langEl );
+ return pd->findUniqueType( TYPE_GENERIC, inMap->generic );
}
UniqueType *TypeRef::resolveTypeListEl( Compiler *pd )
@@ -161,7 +161,7 @@ UniqueType *TypeRef::resolveTypeListEl( Compiler *pd )
}
generic = inMap->generic;
- return pd->findUniqueType( TYPE_TREE, inMap->generic->langEl );
+ return pd->findUniqueType( TYPE_GENERIC, inMap->generic );
}
UniqueType *TypeRef::resolveTypeMap( Compiler *pd )
@@ -193,7 +193,7 @@ UniqueType *TypeRef::resolveTypeMap( Compiler *pd )
}
generic = inMap->generic;
- return pd->findUniqueType( TYPE_PTR, pd->findUniqueType( TYPE_TREE, inMap->generic->langEl )->langEl );
+ return pd->findUniqueType( TYPE_GENERIC, inMap->generic );
}
UniqueType *TypeRef::resolveTypeMapEl( Compiler *pd )
@@ -223,7 +223,7 @@ UniqueType *TypeRef::resolveTypeMapEl( Compiler *pd )
}
generic = inMap->generic;
- return pd->findUniqueType( TYPE_TREE, inMap->generic->langEl );
+ return pd->findUniqueType( TYPE_GENERIC, inMap->generic );
}
UniqueType *TypeRef::resolveTypeParser( Compiler *pd )
@@ -253,7 +253,7 @@ UniqueType *TypeRef::resolveTypeParser( Compiler *pd )
}
generic = inMap->generic;
- return pd->findUniqueType( TYPE_PTR, pd->findUniqueType( TYPE_TREE, inMap->generic->langEl )->langEl );
+ return pd->findUniqueType( TYPE_GENERIC, inMap->generic );
}