improved member name for rhsEl objField in ProdEl

2 files changed, 14 insertions, 14 deletions

diff --git a/colm/declare.cc b/colm/declare.cc
index 1b9fc588..a9dcc737 100644
--- a/colm/declare.cc
+++ b/colm/declare.cc
@@ -238,7 +238,7 @@ void Compiler::addProdRHSVars( ObjectDef *localFrame, ProdElList *prodElList )
 			 * demand. */
 			String name( 8, "r%d", position );
 			ObjectField *el = ObjectField::cons( InputLoc(), rhsEl->typeRef, name );
-			rhsEl->objField = el;
+			rhsEl->rhsElField = el;
 
 			/* Right hand side elements are constant. */
 			el->isConst = true;
@@ -258,10 +258,10 @@ void Compiler::addProdRHSLoads( Production *prod, CodeVect &code, long &insertPo
 	long elPos = 0;
 	for ( ProdElList::Iter rhsEl = *prod->prodElList; rhsEl.lte(); rhsEl++, elPos++ ) {
 		if ( rhsEl->type == ProdEl::ReferenceType ) {
-			if ( rhsEl->objField->beenReferenced ) {
+			if ( rhsEl->rhsElField->beenReferenced ) {
 				loads.append ( IN_INIT_RHS_EL );
 				loads.appendHalf( elPos );
-				loads.appendHalf( rhsEl->objField->offset );
+				loads.appendHalf( rhsEl->rhsElField->offset );
 			}
 		}
 	}
diff --git a/colm/parsedata.h b/colm/parsedata.h
index 7520dccb..6acf5e50 100644
--- a/colm/parsedata.h
+++ b/colm/parsedata.h
@@ -311,41 +311,41 @@ struct ProdEl
 	}; 
 
 	/* Construct with a reference to a var def. */
-	ProdEl( Type type, const InputLoc &loc, ObjectField *captureField, bool commit, TypeRef *typeRef, int priorVal )
+	ProdEl( Type type, const InputLoc &loc, ObjectField *captureField,
+			bool commit, TypeRef *typeRef, int priorVal )
 	:
+		type(type), 
 		production(0),
 		captureField(captureField),
+		rhsElField(0),
 		commit(commit),
 		typeRef(typeRef),
 		langEl(0),
-		priorVal(priorVal),
-		type(type), 
-		objField(0)
+		priorVal(priorVal)
 	{}
 
 	ProdEl( const InputLoc &loc, TypeRef *typeRef )
 	:
+		type(ReferenceType),
 		production(0),
 		captureField(0), 
+		rhsElField(0),
 		commit(false), 
 		typeRef(typeRef), 
 		langEl(0), 
-		priorVal(0), 
-		type(ReferenceType), 
-		objField(0)
+		priorVal(0)
 	{}
 
+	Type type;
 	Production *production;
 	int pos;
 	ObjectField *captureField;
+	ObjectField *rhsElField;
 	bool commit;
-
 	TypeRef *typeRef;
-
 	LangEl *langEl;
 	int priorVal;
-	Type type;
-	ObjectField *objField;
+
 	ProdEl *prev, *next;
 };