Use different names for new impure helper methods

Author: Artyom Abakumov

src/dsql/ExprNodes.cpp

@@ -3753,7 +3753,7 @@ dsc* CastNode::perform(thread_db* tdbb, impure_value* impure, dsc* value,
 		}
 
 		// Allocate a string block of sufficient size.
-		impure->allocateTextImpureDscAddress(*tdbb->getDefaultPool());
+		impure->makeTextValueAddress(*tdbb->getDefaultPool());
 	}
 
 	EVL_validate(tdbb, Item(Item::TYPE_CAST), itemInfo,
@@ -7122,7 +7122,7 @@ dsc* FieldNode::execute(thread_db* tdbb, Request* request) const
 		dsc desc = impure->vlu_desc;
 		impure->vlu_desc = format->fmt_desc[fieldId];
 
-		impure->makeImpureDscAddress(*tdbb->getDefaultPool());
+		impure->makeValueAddress(*tdbb->getDefaultPool());
 		MOV_move(tdbb, &desc, &impure->vlu_desc);
 	}
 
@@ -13648,7 +13648,7 @@ dsc* UdfCallNode::execute(thread_db* tdbb, Request* request) const
 		const Parameter* const returnParam = function->getOutputFields()[0];
 		value->vlu_desc = returnParam->prm_desc;
 
-		value->makeImpureDscAddress(*tdbb->getDefaultPool());
+		value->makeValueAddress(*tdbb->getDefaultPool());
 
 		if (!impureArea->temp)
 		{

src/dsql/StmtNodes.cpp

@@ -2248,7 +2248,7 @@ const StmtNode* DeclareVariableNode::execute(thread_db* tdbb, Request* request,
 		variable->vlu_desc = varDesc;
 		variable->vlu_desc.clearFlags();
 
-		variable->makeImpureDscAddress(*tdbb->getDefaultPool());
+		variable->makeValueAddress(*tdbb->getDefaultPool());
 
 		request->req_operation = Request::req_return;
 	}

src/jrd/SysFunction.cpp

@@ -5545,7 +5545,7 @@ dsc* evlMaxMinValue(thread_db* tdbb, const SysFunction* function, const NestValu
 
 	DataTypeUtil(tdbb).makeFromList(&impure->vlu_desc, function->name, argTypes.getCount(), argTypes.begin());
 
-	impure->makeImpureDscAddress(*tdbb->getDefaultPool());
+	impure->makeValueAddress(*tdbb->getDefaultPool());
 	MOV_move(tdbb, result, &impure->vlu_desc);
 
 	if (impure->vlu_desc.dsc_dtype == dtype_text)

src/jrd/val.h

@@ -174,8 +174,8 @@ struct impure_value
 	VaryingString* getString(MemoryPool& pool, const T length) = delete; // Prevent dangerous length shrink
 	VaryingString* getString(MemoryPool& pool, const USHORT length);
 
-	void makeImpureDscAddress(MemoryPool& pool);
-	void allocateTextImpureDscAddress(MemoryPool& pool);
+	void makeValueAddress(MemoryPool& pool);
+	void makeTextValueAddress(MemoryPool& pool);
 };
 
 // Do not use these methods where dsc_sub_type is not explicitly set to zero.
@@ -246,18 +246,18 @@ inline VaryingString* impure_value::getString(MemoryPool& pool, const USHORT len
 	return vlu_string;
 }
 
-inline void impure_value::makeImpureDscAddress(MemoryPool& pool)
+inline void impure_value::makeValueAddress(MemoryPool& pool)
 {
 	if (type_lengths[vlu_desc.dsc_dtype] == 0)
 	{
 		// If the data type is any of the string types, allocate space to hold value.
-		allocateTextImpureDscAddress(pool);
+		makeTextValueAddress(pool);
 	}
 	else
 		vlu_desc.dsc_address = (UCHAR*) &vlu_misc;
 }
 
-inline void impure_value::allocateTextImpureDscAddress(MemoryPool& pool)
+inline void impure_value::makeTextValueAddress(MemoryPool& pool)
 {
 	vlu_desc.dsc_address = getString(pool, vlu_desc.dsc_length)->str_data;
 }