replacing list and map with vlist and vmap

1 files changed, 3 insertions, 5 deletions

diff --git a/src/loadinit.cc b/src/loadinit.cc
index 34c0b9a0..f8454e3a 100644
--- a/src/loadinit.cc
+++ b/src/loadinit.cc
@@ -288,8 +288,7 @@ void LoadInit::consParseStmt( StmtList *stmtList )
 			curLocalFrame->rootScope, popQual, String("pop") );
 	LangExpr *pop = LangExpr::cons( LangTerm::cons( InputLoc(), popRef, popArgs ) );
 
-	NamespaceQual *nspaceQual = NamespaceQual::cons( curNspace() );
-	TypeRef *typeRef = TypeRef::cons( internal, nspaceQual, "argv_el", RepeatNone );
+	TypeRef *typeRef = TypeRef::cons( internal, pd->uniqueTypeStr );
 	ObjectField *objField = ObjectField::cons( internal,
 			ObjectField::UserLocalType, typeRef, "A" );
 
@@ -305,9 +304,8 @@ void LoadInit::consParseStmt( StmtList *stmtList )
 
 	/* Reference A->value */
 	QualItemVect *qual = new QualItemVect;
-	qual->append( QualItem( QualItem::Arrow, internal, "A" ) );
 	LangVarRef *varRef = LangVarRef::cons( internal, 0,
-			curLocalFrame->rootScope, qual, String("value") );
+			curLocalFrame->rootScope, qual, String("A") );
 	LangExpr *Avalue = LangExpr::cons( LangTerm::cons( internal,
 			LangTerm::VarRefType, varRef ) );
 	
@@ -329,7 +327,7 @@ void LoadInit::consParseStmt( StmtList *stmtList )
 			ObjectField::UserLocalType, 0, String("P") );
 
 	/* Ref the start def. */
-	nspaceQual = NamespaceQual::cons( curNspace() );
+	NamespaceQual *nspaceQual = NamespaceQual::cons( curNspace() );
 	typeRef = TypeRef::cons( internal, nspaceQual,
 			String("start"), RepeatNone );