removed some commented-out code

2 files changed, 9 insertions, 58 deletions

diff --git a/src/pdabuild.cc b/src/pdabuild.cc
index 62baa06d..67ee20ac 100644
--- a/src/pdabuild.cc
+++ b/src/pdabuild.cc
@@ -234,8 +234,6 @@ void Compiler::makeLangElIds()
 	}
 
 	assert( ptrLangEl->id == LEL_ID_PTR );
-//	assert( boolLangEl->id == LEL_ID_BOOL );
-//	assert( intLangEl->id == LEL_ID_INT );
 	assert( strLangEl->id == LEL_ID_STR );
 	assert( ignoreLangEl->id == LEL_ID_IGNORE );
 }
@@ -268,35 +266,11 @@ void Compiler::refNameSpace( LangEl *lel, Namespace *nspace )
 void Compiler::makeLangElNames()
 {
 	for ( LelList::Iter lel = langEls; lel.lte(); lel++ ) {
-//		if ( lel->id == LEL_ID_VOID ) {
-//			lel->fullName = "_void";
-//			lel->fullLit = "_void";
-//			lel->refName = "_void";
-//			lel->declName = "_void";
-//			lel->xmlTag = "void";
-//
-//		}
-//		else if ( lel->id == LEL_ID_INT ) {
-//			lel->fullName = "_int";
-//			lel->fullLit = "_int";
-//			lel->refName = "_int";
-//			lel->declName = "_int";
-//			lel->xmlTag = "int";
-//		}
-//		else if ( lel->id == LEL_ID_BOOL ) {
-//			lel->fullName = "_bool";
-//			lel->fullLit = "_bool";
-//			lel->refName = "_bool";
-//			lel->declName = "_bool";
-//			lel->xmlTag = "bool";
-//		}
-//		else {
-			lel->fullName = lel->name;
-			lel->fullLit = lel->lit;
-			lel->refName = lel->lit;
-			lel->declName = lel->lit;
-			lel->xmlTag = lel->name;
-//		}
+		lel->fullName = lel->name;
+		lel->fullLit = lel->lit;
+		lel->refName = lel->lit;
+		lel->declName = lel->lit;
+		lel->xmlTag = lel->name;
 
 		/* If there is also a namespace next to the type, we add a prefix to
 		 * the type. It's not convenient to name C++ classes the same as a
diff --git a/src/tree.c b/src/tree.c
index 9d928fa4..165c59f9 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -841,25 +841,12 @@ tree_t *copy_real_tree( program_t *prg, tree_t *tree, kid_t *old_next_down, kid_
 
 tree_t *colm_copy_tree( program_t *prg, tree_t *tree, kid_t *old_next_down, kid_t **new_next_down )
 {
-//	struct lang_el_info *lelInfo = prg->rtd->lelInfo;
-//	long genericId = lelInfo[tree->id].genericId;
-//	if ( genericId > 0 )
-//		assert(false);
-	if ( tree->id == LEL_ID_PTR )
-		assert(false);
-//	else if ( tree->id == LEL_ID_BOOL )
-//		assert(false);
-//	else if ( tree->id == LEL_ID_INT )
-//		assert(false);
-	else if ( tree->id == LEL_ID_STR )
-		assert(false);
-//	else if ( tree->id == LEL_ID_STREAM )
-//		assert(false);
-	else {
-		tree = copy_real_tree( prg, tree, old_next_down, new_next_down );
-	}
+	assert( tree->id != LEL_ID_PTR && tree->id != LEL_ID_STR );
+
+	tree = copy_real_tree( prg, tree, old_next_down, new_next_down );
 
 	assert( tree->refs == 0 );
+
 	return tree;
 }
 
@@ -952,11 +939,8 @@ void colm_tree_downref( program_t *prg, tree_t **sp, tree_t *tree )
 void object_free_rec( program_t *prg, tree_t **sp, tree_t *tree )
 {
 	tree_t **top = vm_ptop();
-//	struct lang_el_info *lelInfo;
-//	long genericId;
 
 free_tree:
-//	lelInfo = prg->rtd->lelInfo;
 
 	switch ( tree->id ) {
 	case LEL_ID_STR: {
@@ -965,17 +949,10 @@ free_tree:
 		tree_free( prg, tree );
 		break;
 	}
-//	case LEL_ID_BOOL:
-//	case LEL_ID_INT: {
-//		tree_free( prg, tree );
-//		break;
-//	}
 	case LEL_ID_PTR: {
 		tree_free( prg, tree );
 		break;
 	}
-//	case LEL_ID_STREAM: {
-//	}
 	default: { 
 		if ( tree->id != LEL_ID_IGNORE )
 			string_free( prg, tree->tokdata );