[cig-commits] commit: Adding context to parent _Init.

Mercurial hg at geodynamics.org
Mon Feb 1 15:32:12 PST 2010


changeset:   700:6137c145d96a
branch:      pcu_rejig
user:        JericoRevote
date:        Mon Nov 30 18:49:29 2009 +1100
files:       Base/Context/src/CompositeVC.c Base/Context/src/CompositeVC.h Base/Context/src/DynamicVC.c Base/Context/src/DynamicVC.h Base/Context/src/SetVC.c Base/Context/src/SetVC.h Base/Context/src/VariableAllVC.c Base/Context/src/VariableAllVC.h Base/Context/src/VariableCondition.c Base/Context/src/VariableCondition.h Base/Context/tests/SetVC_Suite.c Base/Context/tests/VariableAllVC_Suite.c
description:
Adding context to parent _Init.


diff -r 94417947cddc -r 6137c145d96a Base/Context/src/CompositeVC.c
--- a/Base/Context/src/CompositeVC.c	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/CompositeVC.c	Mon Nov 30 18:49:29 2009 +1100
@@ -58,16 +58,18 @@ const Name defaultCompositeVCName = "def
 */
 
 VariableCondition* CompositeVC_Factory(
+	AbstractContext*					context,
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register,
 	Dictionary*							dictionary,
 	void*									data )
 {
-	return (VariableCondition*)CompositeVC_New( defaultCompositeVCName, variable_Register, conFunc_Register, dictionary, data );
+	return (VariableCondition*)CompositeVC_New( defaultCompositeVCName, context, variable_Register, conFunc_Register, dictionary, data );
 }
 
 CompositeVC* CompositeVC_New(
 	Name									name,
+	AbstractContext*					context,
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register,
 	Dictionary*							dictionary,
@@ -76,7 +78,7 @@ CompositeVC* CompositeVC_New(
 	CompositeVC* self = _CompositeVC_DefaultNew( name );
 
 	self->isConstructed = True;
-	_VariableCondition_Init( self, variable_Register, conFunc_Register, dictionary );
+	_VariableCondition_Init( self, context, variable_Register, conFunc_Register, dictionary );
 	_CompositeVC_Init( self, data );
 
 	return self;
@@ -187,6 +189,7 @@ void _CompositeVC_ReadDictionary( void* 
 			}
 		}
 		vcList = Dictionary_Get( dictionary, "vcList" );
+
 		if( vcList ) {
 			Index	count;
 			Index	entry_I;
@@ -213,39 +216,35 @@ void _CompositeVC_ReadDictionary( void* 
 }
 
 void _CompositeVC_AssignFromXML( void* compositeVC, Stg_ComponentFactory* cf, void* data ) {
-	CompositeVC* self                      = (CompositeVC*)compositeVC;
-	void*        variableRegister          = NULL;
-	void*        conditionFunctionRegister = NULL;
-	void*        initData                      = NULL;
-	Dictionary*  vcDict                    = NULL;
-	Name         vcName;
+	CompositeVC*		self = (CompositeVC*)compositeVC;
+	void*       		variableRegister = NULL;
+	void*       		conditionFunctionRegister = NULL;
+	void*       		initData = NULL;
+	Dictionary* 		vcDict = NULL;
+	Name       			vcName;
+	AbstractContext*	context;
 	
-	self->dictionary = cf->rootDict;
-
 	/* Need to store this so we can get at components
 		later on when using the fucked up 'ReadDictionary' function. */
 	self->cf = cf;
 
-	self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
-	if( !self->context )
-		self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+	context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
+	if( !context )
+		context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
 	
-	variableRegister = self->context->variable_Register;
+	variableRegister = context->variable_Register;
 	assert( variableRegister );
 	conditionFunctionRegister = condFunc_Register; 
 	assert( conditionFunctionRegister );
 	
 	vcName = Stg_ComponentFactory_GetString( cf, self->name, "vcName", self->name );
+
 	if ( cf->rootDict )
 		vcDict = Dictionary_GetDictionary( cf->rootDict, vcName );
-/* 	Journal_Firewall( */
-/* 			vcDict != NULL, */
-/* 			Journal_Register( Error_Type, self->type ), */
-/* 			"For %s '%s' - Cannont find variable condition dictionary '%s'\n", self->type, self->name, vcName ); */
-	
+
 	initData = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Data", Stg_Component, False, data );
 	
-	_VariableCondition_Init( self, variableRegister, conditionFunctionRegister, vcDict );
+	_VariableCondition_Init( self, context, variableRegister, conditionFunctionRegister, vcDict );
 	_CompositeVC_Init( self, initData );
 }
 
@@ -283,10 +282,9 @@ void _CompositeVC_Destroy(void* composit
 	_VariableCondition_Destroy( self, data );
 }
 
-void _CompositeVC_Print(void* compositeVC, Stream* stream)
-{
+void _CompositeVC_Print(void* compositeVC, Stream* stream) {
 	CompositeVC*	self = (CompositeVC*)compositeVC;
-	Index		item_I;
+	Index				item_I;
 	
 	/* Set the Journal for printing informations */
 	Stream* info = stream;
diff -r 94417947cddc -r 6137c145d96a Base/Context/src/CompositeVC.h
--- a/Base/Context/src/CompositeVC.h	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/CompositeVC.h	Mon Nov 30 18:49:29 2009 +1100
@@ -60,13 +60,12 @@
 	
 	struct _CompositeVC { __CompositeVC };
 	
-
-
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Constructor
 	*/
 	
 	VariableCondition* CompositeVC_Factory(
+		AbstractContext*					context,
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register,
 		Dictionary*							dictionary,
@@ -74,6 +73,7 @@
 	
 	CompositeVC* CompositeVC_New(
 		Name									name,
+		AbstractContext*					context,
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register,
 		Dictionary*							dictionary,
diff -r 94417947cddc -r 6137c145d96a Base/Context/src/DynamicVC.c
--- a/Base/Context/src/DynamicVC.c	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/DynamicVC.c	Mon Nov 30 18:49:29 2009 +1100
@@ -54,16 +54,19 @@ const Name defaultDynamicVCName = "defau
 ** Constructor
 */
 
-VariableCondition* DynamicVC_Factory( Variable_Register* varReg, 
-	ConditionFunction_Register* conFuncReg, 
-	Dictionary* dict, 
-	void* data )
+VariableCondition* DynamicVC_Factory(
+	AbstractContext*					context,
+	Variable_Register*				varReg, 
+	ConditionFunction_Register*	conFuncReg, 
+	Dictionary*							dict, 
+	void*									data )
 {
-	return (VariableCondition*)DynamicVC_New( defaultDynamicVCName, varReg, conFuncReg, dict );
+	return (VariableCondition*)DynamicVC_New( defaultDynamicVCName, context, varReg, conFuncReg, dict );
 }
 
 DynamicVC* DynamicVC_New(
 	Name									name,
+	AbstractContext*					context,
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register, 
 	Dictionary*							dictionary )
@@ -71,7 +74,7 @@ DynamicVC* DynamicVC_New(
 	DynamicVC* self = _DynamicVC_DefaultNew( name );
 
 	self->isConstructed = True;
-	_VariableCondition_Init( self, variable_Register, conFunc_Register, dictionary );
+	_VariableCondition_Init( self, context, variable_Register, conFunc_Register, dictionary );
 	_DynamicVC_Init( self );	
 
 	return self;
diff -r 94417947cddc -r 6137c145d96a Base/Context/src/DynamicVC.h
--- a/Base/Context/src/DynamicVC.h	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/DynamicVC.h	Mon Nov 30 18:49:29 2009 +1100
@@ -51,18 +51,20 @@ extern const Type DynamicVC_Type;
 
 	struct DynamicVC { __DynamicVC };
 
-
-
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Constructor
 	*/
 
-	VariableCondition* DynamicVC_Factory( Variable_Register* varReg, 
+	VariableCondition* DynamicVC_Factory(
+		AbstractContext*					context,
+		Variable_Register*				varReg, 
 		ConditionFunction_Register*	conFuncReg, 
 		Dictionary*							dict, 
 		void*									data );
 
-	DynamicVC* DynamicVC_New( Name name,
+	DynamicVC* DynamicVC_New(
+		Name									name,
+		AbstractContext*					context,
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register,
 		Dictionary*							dict );
diff -r 94417947cddc -r 6137c145d96a Base/Context/src/SetVC.c
--- a/Base/Context/src/SetVC.c	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/SetVC.c	Mon Nov 30 18:49:29 2009 +1100
@@ -56,16 +56,18 @@ const Name defaultSetVCName = "defaultSe
 */
 
 VariableCondition* SetVC_Factory(
+	AbstractContext*					context,
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register, 
 	Dictionary*							dictionary,
 	void*									data )
 {
-	return (VariableCondition*)SetVC_New( defaultSetVCName, NULL, variable_Register, conFunc_Register, dictionary );
+	return (VariableCondition*)SetVC_New( defaultSetVCName, context, NULL, variable_Register, conFunc_Register, dictionary );
 }
 
 SetVC* SetVC_New(
 	Name									name,
+	AbstractContext*					context,
 	Name									_dictionaryEntryName, 
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register,
@@ -74,7 +76,7 @@ SetVC* SetVC_New(
 	SetVC* self = _SetVC_DefaultNew( name );
 
 	self->isConstructed = True;
-	_VariableCondition_Init( self, variable_Register, conFunc_Register, dictionary );
+	_VariableCondition_Init( self, context, variable_Register, conFunc_Register, dictionary );
 	_SetVC_Init( self,  _dictionaryEntryName );
 
 	return self;
diff -r 94417947cddc -r 6137c145d96a Base/Context/src/SetVC.h
--- a/Base/Context/src/SetVC.h	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/SetVC.h	Mon Nov 30 18:49:29 2009 +1100
@@ -59,13 +59,12 @@
 
 	struct _SetVC { __SetVC };
 
-
-	
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Constructor
 	*/
 	
 	VariableCondition* SetVC_Factory(
+		AbstractContext*					context,
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register, 
 		Dictionary*							dictionary,
@@ -73,6 +72,7 @@
 	
 	SetVC* SetVC_New(
 		Name									name,
+		AbstractContext*					context,
 		Name									_dictionaryEntryName, 
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register,
diff -r 94417947cddc -r 6137c145d96a Base/Context/src/VariableAllVC.c
--- a/Base/Context/src/VariableAllVC.c	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/VariableAllVC.c	Mon Nov 30 18:49:29 2009 +1100
@@ -55,17 +55,19 @@ const Name defaultVariableAllVCName = "d
 */
 
 VariableCondition* VariableAllVC_Factory(
+	AbstractContext*					context,
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register, 
 	Dictionary*							dictionary,
 	void*									data )
 {
-	return (VariableCondition*)VariableAllVC_New( defaultVariableAllVCName, NULL, variable_Register, conFunc_Register, dictionary, data );
+	return (VariableCondition*)VariableAllVC_New( defaultVariableAllVCName, context, NULL, variable_Register, conFunc_Register, dictionary, data );
 }
 
 
 VariableAllVC*	VariableAllVC_New(
 	Name									name,
+	AbstractContext*					context,
 	Name									_dictionaryEntryName, 
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register,
@@ -75,7 +77,7 @@ VariableAllVC*	VariableAllVC_New(
 	VariableAllVC*	self = _VariableAllVC_DefaultNew( name );
 
 	self->isConstructed = True;
-	_VariableCondition_Init( self, variable_Register, conFunc_Register, dictionary );
+	_VariableCondition_Init( self, context, variable_Register, conFunc_Register, dictionary );
 	_VariableAllVC_Init( self, _dictionaryEntryName, data );
 
 	return self;
diff -r 94417947cddc -r 6137c145d96a Base/Context/src/VariableAllVC.h
--- a/Base/Context/src/VariableAllVC.h	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/VariableAllVC.h	Mon Nov 30 18:49:29 2009 +1100
@@ -64,13 +64,12 @@
 
 	struct _VariableAllVC { __VariableAllVC };
 	
-
-
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Constructor
 	*/
 	
 	VariableCondition* VariableAllVC_Factory(
+		AbstractContext*					context,
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register, 
 		Dictionary*							dictionary,
@@ -78,6 +77,7 @@
 	
 	VariableAllVC* VariableAllVC_New(
 		Name									name,
+		AbstractContext*					context,
 		Name									_dictionaryEntryName, 
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register,
diff -r 94417947cddc -r 6137c145d96a Base/Context/src/VariableCondition.c
--- a/Base/Context/src/VariableCondition.c	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/VariableCondition.c	Mon Nov 30 18:49:29 2009 +1100
@@ -78,13 +78,14 @@ VariableCondition* _VariableCondition_Ne
 
 void _VariableCondition_Init(
 	void*									variableCondition, 
+	AbstractContext*					context,
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register,
 	Dictionary*							dictionary )
 {
 	VariableCondition*	self = (VariableCondition*)variableCondition;
 	
-	self->isConstructed = True;
+	self->context = context;
 	self->variable_Register = variable_Register;
 	self->conFunc_Register = conFunc_Register;
 	self->dictionary = dictionary;
@@ -103,19 +104,18 @@ void _VariableCondition_Init(
 */
 
 void _VariableCondition_Delete(void* variableCondition) {
-	VariableCondition*	self = (VariableCondition*)variableCondition;
+	VariableCondition* self = (VariableCondition*)variableCondition;
 	
 	/* Stg_Class_Delete parent */
 	_Stg_Component_Delete( self );
 }
 
 
-void _VariableCondition_Print(void* variableCondition)
-{
-	VariableCondition*		self = (VariableCondition*)variableCondition;
+void _VariableCondition_Print(void* variableCondition) {
+	VariableCondition*					self = (VariableCondition*)variableCondition;
 	VariableCondition_VariableIndex	vcVar_I;
-	VariableCondition_ValueIndex	val_I;
-	Index				i;
+	VariableCondition_ValueIndex		val_I;
+	Index										i;
 	
 	/* Set the Journal for printing informations */
 	Stream* variableConditionStream = Journal_Register( InfoStream_Type,	"VariableConditionStream");
@@ -140,6 +140,7 @@ void _VariableCondition_Print(void* vari
 	Journal_Printf( variableConditionStream, "\t_set (ptr): %p\n", self->_set);
 	Journal_Printf( variableConditionStream, "\tindexCount: %u\n", self->indexCount);
 	Journal_Printf( variableConditionStream, "\tindexTbl (ptr): %p\n", self->indexTbl);
+
 	if (self->indexTbl)
 		for (i = 0; i < self->indexCount; i++)
 			Journal_Printf( variableConditionStream, "\t\tindexTbl[%u]: %u\n", i, self->indexTbl[i]);
@@ -301,13 +302,12 @@ void* _VariableCondition_Copy( void* var
 */
 
 void _VariableCondition_AssignFromXML( void* variableCondition, Stg_ComponentFactory* cf, void* data ) {
-   VariableCondition* self = (VariableCondition*)variableCondition;
 }
 
 void _VariableCondition_Build( void* variableCondition, void* data ) {
-	VariableCondition*		self = (VariableCondition*)variableCondition;
+	VariableCondition*				self = (VariableCondition*)variableCondition;
 	VariableCondition_ValueIndex	val_I;
-	Index				i;
+	Index									i;
 	
 	/* Read the dictionary */
 	self->_readDictionary( self, self->dictionary );
@@ -316,8 +316,7 @@ void _VariableCondition_Build( void* var
 	self->_set = self->_getSet(self);
 	if (self->_set)
 		IndexSet_GetMembers(self->_set, &self->indexCount, &self->indexTbl);
-	else
-	{
+	else {
 		self->indexCount = 0;
 		self->indexTbl = NULL;
 	}
@@ -327,19 +326,16 @@ void _VariableCondition_Build( void* var
 		/* Build the variable to condition table */
 		self->vcVarCountTbl = Memory_Alloc_Array( VariableCondition_VariableIndex, self->indexCount, "VC->vcVarCountTbl" );
 		
-		for (i = 0; i < self->indexCount; i++)
-		{
+		for (i = 0; i < self->indexCount; i++) {
 			/* For the index, get the number of "variables" that have been assigned conditions */
 			self->vcVarCountTbl[i] = self->_getVariableCount(self, self->indexTbl[i]);
 		}
 
 		self->vcTbl = Memory_Alloc_2DComplex( VariableCondition_Tuple, self->indexCount, self->vcVarCountTbl, "VC->vcTbl" );
-		for ( i = 0; i < self->indexCount; i++ )
-		{
+		for ( i = 0; i < self->indexCount; i++ ) {
 			VariableCondition_VariableIndex vcVar_I;
 
-			for ( vcVar_I = 0; vcVar_I < self->vcVarCountTbl[i]; vcVar_I++ )
-			{
+			for ( vcVar_I = 0; vcVar_I < self->vcVarCountTbl[i]; vcVar_I++ ) {
 				Variable* var;
 
 				/* For the index's variable, get the variable i.d. and value i.d. */
@@ -365,8 +361,8 @@ void _VariableCondition_Build( void* var
 }
 
 void _VariableCondition_Initialise( void* variableCondition, void* data ) {
-	VariableCondition*		self = (VariableCondition*)variableCondition;
-	Index				i;
+	VariableCondition*	self = (VariableCondition*)variableCondition;
+	Index						i;
 	
 	for( i = 0; i < self->indexCount; i++ ) {
 		VariableCondition_VariableIndex	vcVar_I;
@@ -388,7 +384,7 @@ void _VariableCondition_Execute( void* v
 }
 
 void _VariableCondition_Destroy( void* variableCondition, void* data ) {
-	VariableCondition*	self = (VariableCondition*)variableCondition;
+	VariableCondition* self = (VariableCondition*)variableCondition;
 
 	if (self->_set) Stg_Class_Delete(self->_set);
 	if (self->indexTbl) Memory_Free(self->indexTbl);
@@ -398,7 +394,7 @@ void _VariableCondition_Destroy( void* v
 
 void _VariableCondition_Apply( void* variableCondition, void* context ) {
 	VariableCondition*	self = (VariableCondition*)variableCondition;
-	Index			i;
+	Index						i;
 	
 	for (i = 0; i < self->indexCount; i++)
 		VariableCondition_ApplyToIndex(variableCondition, self->indexTbl[i], context);
diff -r 94417947cddc -r 6137c145d96a Base/Context/src/VariableCondition.h
--- a/Base/Context/src/VariableCondition.h	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/src/VariableCondition.h	Mon Nov 30 18:49:29 2009 +1100
@@ -88,51 +88,49 @@
 		/* General info */ \
 		__Stg_Component \
 		\
-		AbstractContext*				context; \
+		AbstractContext*									context; \
 		/* Virtual info */ \
-		VariableCondition_BuildSelfFunc*		_buildSelf; \
-		VariableCondition_PrintConciseFunc*		_printConcise; \
+		VariableCondition_BuildSelfFunc*				_buildSelf; \
+		VariableCondition_PrintConciseFunc*			_printConcise; \
 		VariableCondition_ReadDictionaryFunc*		_readDictionary; \
-		VariableCondition_GetSetFunc*			_getSet; \
-		VariableCondition_GetVariableCountFunc*		_getVariableCount; \
-		VariableCondition_GetVariableIndexFunc*		_getVariableIndex; \
+		VariableCondition_GetSetFunc*					_getSet; \
+		VariableCondition_GetVariableCountFunc*	_getVariableCount; \
+		VariableCondition_GetVariableIndexFunc*	_getVariableIndex; \
 		VariableCondition_GetValueIndexFunc*		_getValueIndex; \
 		VariableCondition_GetValueCountFunc*		_getValueCount; \
-		VariableCondition_GetValueFunc*			_getValue; \
-		VariableCondition_ApplyFunc*			_apply; \
+		VariableCondition_GetValueFunc*				_getValue; \
+		VariableCondition_ApplyFunc*					_apply; \
 		\
 		/* Stg_Class info */ \
 		/** Register of Variables that may be operated on. */ \
-		Variable_Register*				variable_Register; \
+		Variable_Register*								variable_Register; \
 		/** Register of Condition functions that may be applied. */ \
-		ConditionFunction_Register*			conFunc_Register; \
-		Dictionary*					dictionary; \
+		ConditionFunction_Register*					conFunc_Register; \
+		Dictionary*											dictionary; \
 		\
 		/** Set specifying which indexes in the client structure are being controlled by this VC. */ \
-		IndexSet*					_set; \
+		IndexSet*											_set; \
 		/** the number of indexes this VC applies to. */ \
-		Index						indexCount; \
+		Index													indexCount; \
 		/** Array, of size indexCount, containing the indexes this VC applies to. */ \
-		Index*						indexTbl; \
+		Index*												indexTbl; \
 		/** Array containing the number of variables at each index that are controlled by this VC */ \
-		VariableCondition_VariableIndex*		vcVarCountTbl; \
+		VariableCondition_VariableIndex*				vcVarCountTbl; \
 		/** 2d Array, which for each index this VC controls, stores the VariableCondition_Tuple that relates
 		what condition is being applied to which Variable */ \
-		VariableCondition_Tuple**			vcTbl; \
+		VariableCondition_Tuple**						vcTbl; \
 		/** Number of values in the valueTbl which will be applied somewhere using this VC */ \
-		VariableCondition_ValueIndex			valueCount; \
+		VariableCondition_ValueIndex					valueCount; \
 		/** Array of values which are available to apply (which index/var pairs they apply to is determined
 		by VariableCondition::vcTbl). */ \
-		VariableCondition_Value*			valueTbl; \
-									\
-		UIntMap*		mapping;  \
-		Stg_ComponentFactory* cf;
+		VariableCondition_Value*						valueTbl; \
+		\
+		UIntMap*												mapping;  \
+		Stg_ComponentFactory*							cf;
 	
 	/** Abstract class for specifying (1 or more) conditions that apply to (1 or more) variables in an array - 
 	see VariableCondition.h for details */
 	struct _VariableCondition { __VariableCondition };
-	
-
 	
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Constructor
@@ -173,6 +171,7 @@
 	
 	void _VariableCondition_Init(
 		void*									variableCondition, 
+		AbstractContext*					context,
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register,
 		Dictionary*							dictionary );
diff -r 94417947cddc -r 6137c145d96a Base/Context/tests/SetVC_Suite.c
--- a/Base/Context/tests/SetVC_Suite.c	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/tests/SetVC_Suite.c	Mon Nov 30 18:49:29 2009 +1100
@@ -123,7 +123,7 @@ void SetVC_Suite_Setup( SetVC_SuiteData*
    Variable_Register_BuildAll( data->vr );
    
    /* Create the VC */
-   data->vc = (VariableCondition*)SetVC_New( "setVC", "setVC", data->vr, data->conFunc_Register, data->dict );
+   data->vc = (VariableCondition*)SetVC_New( "setVC", NULL, "setVC", data->vr, data->conFunc_Register, data->dict );
    Stg_Component_Build( data->vc, 0, False );
 
    /* Blank the memory to be applied to before the test */
diff -r 94417947cddc -r 6137c145d96a Base/Context/tests/VariableAllVC_Suite.c
--- a/Base/Context/tests/VariableAllVC_Suite.c	Mon Nov 30 02:00:28 2009 +1100
+++ b/Base/Context/tests/VariableAllVC_Suite.c	Mon Nov 30 18:49:29 2009 +1100
@@ -88,18 +88,11 @@ void VariableAllVC_Suite_Setup( Variable
    Stg_asprintf( &data->vcKey, "VariableAllVC" );
    VariableAllVC_Suite_CreateDictEntries( data );
 
-   data->var = Variable_NewScalar(
-         "test",
-         Variable_DataType_Double,
-         &data->arraySize,
-         NULL,
-         (void**)&data->testArray,
-         data->vr );
+   data->var = Variable_NewScalar( "test", Variable_DataType_Double, &data->arraySize, NULL, (void**)&data->testArray, data->vr );
       
    Variable_Register_BuildAll(data->vr);
    
-   data->vc = (VariableCondition*) VariableAllVC_New( "variableAllVC", "VariableAllVC", data->vr, data->conFunc_Register,
-      data->dict, NULL );
+   data->vc = (VariableCondition*) VariableAllVC_New( "variableAllVC", NULL, "VariableAllVC", data->vr, data->conFunc_Register, data->dict, NULL );
    
    Stg_Component_Build( data->vc, 0, False );
 }



More information about the CIG-COMMITS mailing list