summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2014-01-03 20:23:42 -0500
committerAdrian Thurston <thurston@complang.org>2014-01-03 20:24:11 -0500
commiteaa8e91ffcf86479ed332281948c9799976fbb9a (patch)
tree0bfd00aab06482958a84e2bfe9f86384fc770de1
parentecad8de32f90ad7272484920d8b4536c2f7de927 (diff)
downloadcolm-eaa8e91ffcf86479ed332281948c9799976fbb9a.tar.gz
enabled parsed var ref and parsed type ref lookups
-rw-r--r--src/resolve.cc17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/resolve.cc b/src/resolve.cc
index 1eee603d..c52d03e8 100644
--- a/src/resolve.cc
+++ b/src/resolve.cc
@@ -30,15 +30,18 @@ using std::endl;
Namespace *TypeRef::lookupNspace( Compiler *pd )
{
-// if ( parsedVarRef != 0 && !nspaceQual->thisOnly() ) {
-// std::cerr << "parsed var ref is present" << std:: endl;
-// UniqueType *ut = parsedVarRef->lookup( pd );
-// nspace = ut->langEl->nspace;
-// }
-// else {
+ if ( parsedVarRef != 0 && !nspaceQual->thisOnly() ) {
+ UniqueType *ut = parsedVarRef->lookup( pd );
+ return ut->langEl->nspace;
+ }
+ else if ( parsedTypeRef != 0 && !nspaceQual->thisOnly() ) {
+ UniqueType *ut = parsedTypeRef->lookupType( pd );
+ return ut->langEl->nspace;
+ }
+ else {
/* Lookup up the qualifiction and then the name. */
return nspaceQual->getQual( pd );
-// }
+ }
}
UniqueType *TypeRef::lookupTypeName( Compiler *pd )