More cleanup around LangEl declarations. Set the type in the declare function.

Added a new declare function that does not insert the name into the namespace's
map. Language elements that are not declared by the user don't need to go into
the map (eg repeats, default tokens).

1 files changed, 1 insertions, 21 deletions

diff --git a/colm/resolve.cc b/colm/resolve.cc
index 2cbe6be8..6e1529b9 100644
--- a/colm/resolve.cc
+++ b/colm/resolve.cc
@@ -162,32 +162,12 @@ UniqueType *TypeRef::lookupType( ParseData *pd )
 	return uniqueType;
 }
 
-void ParseData::resolveLiteralFactor( ProdEl *fact )
-{
-	fact->typeRef->lookupType( this );
-	fact->langEl = fact->typeRef->uniqueType->langEl;
-}
-
-void ParseData::resolveReferenceFactor( ProdEl *fact )
+void ParseData::resolveFactor( ProdEl *fact )
 {
 	fact->typeRef->lookupType( this );
 	fact->langEl = fact->typeRef->uniqueType->langEl;
 }
 
-void ParseData::resolveFactor( ProdEl *fact )
-{
-	switch ( fact->type ) {
-		case ProdEl::LiteralType:
-			resolveLiteralFactor( fact );
-			break;
-		case ProdEl::ReferenceType:
-			resolveReferenceFactor( fact );
-			break;
-	}
-}
-
-
-
 void LangTerm::resolve( ParseData *pd ) const
 {
 	switch ( type ) {