some more cleanup

preparing for a new, higher performance, variant object type

1 files changed, 0 insertions, 326 deletions

diff --git a/runtime/var.c b/runtime/var.c
index ef7cc8e6..eecc5d6a 100644
--- a/runtime/var.c
+++ b/runtime/var.c
@@ -90,324 +90,6 @@ CODESTARTobjDebugPrint(var)
 ENDobjDebugPrint(var)
 
 
-/* This function is similar to DebugPrint, but does not send its output to
- * the debug log but instead to a caller-provided string. The idea here is that
- * we can use this string to get a textual representation of a variable.
- * Among others, this is useful for creating testbenches, our first use case for
- * it. Here, it enables simple comparison of the resulting program to a
- * reference program by simple string compare.
- * Note that the caller must initialize the string object. We always add
- * data to it. So, it can be easily combined into a chain of methods
- * to generate the final string.
- * rgerhards, 2008-07-07
- */
-static rsRetVal
-Obj2Str(var_t *pThis, cstr_t *pstrPrg)
-{
-	DEFiRet;
-	size_t lenBuf;
-	uchar szBuf[2048];
-
-	ISOBJ_TYPE_assert(pThis, var);
-	assert(pstrPrg != NULL);
-	switch(pThis->varType) {
-		case VARTYPE_STR:
-			lenBuf = snprintf((char*) szBuf, sizeof(szBuf), "%s[cstr]", rsCStrGetSzStr(pThis->val.pStr)); 
-			break;
-		case VARTYPE_NUMBER:
-			lenBuf = snprintf((char*) szBuf, sizeof(szBuf), "%lld[nbr]", pThis->val.num);
-			break;
-		default:
-			lenBuf = snprintf((char*) szBuf, sizeof(szBuf), "**UNKNOWN**[%d]", pThis->varType);
-			break;
-	}
-	CHKiRet(rsCStrAppendStrWithLen(pstrPrg, szBuf, lenBuf));
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* duplicates a var instance
- * rgerhards, 2008-02-25
- */
-static rsRetVal
-Duplicate(var_t *pThis, var_t **ppNew)
-{
-	DEFiRet;
-	var_t *pNew = NULL;
-	cstr_t *pstr;
-
-	ISOBJ_TYPE_assert(pThis, var);
-	assert(ppNew != NULL);
-
-	CHKiRet(varConstruct(&pNew));
-	CHKiRet(varConstructFinalize(pNew));
-
-	/* we have the object, now copy value */
-	pNew->varType = pThis->varType;
-	if(pThis->varType == VARTYPE_NUMBER) {
-		pNew->val.num = pThis->val.num;
-	} else if(pThis->varType == VARTYPE_STR) {
-		CHKiRet(rsCStrConstructFromCStr(&pstr, pThis->val.pStr));
-		pNew->val.pStr = pstr;
-	}
-
-	*ppNew = pNew;
-
-finalize_it:
-	if(iRet != RS_RET_OK && pNew != NULL)
-		varDestruct(&pNew);
-
-	RETiRet;
-}
-
-
-/* free the current values (destructs objects if necessary)
- */
-static rsRetVal
-varUnsetValues(var_t *pThis)
-{
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, var);
-	if(pThis->varType == VARTYPE_STR)
-		rsCStrDestruct(&pThis->val.pStr);
-
-	pThis->varType = VARTYPE_NONE;
-
-	RETiRet;
-}
-
-
-/* set a string value 
- * The caller hands over the string and must n longer use it after this method
- * has been called.
- */
-static rsRetVal
-varSetString(var_t *pThis, cstr_t *pStr)
-{
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, var);
-
-	CHKiRet(varUnsetValues(pThis));
-	pThis->varType = VARTYPE_STR;
-	pThis->val.pStr = pStr;
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* set an int64 value */
-static rsRetVal
-varSetNumber(var_t *pThis, number_t iVal)
-{
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, var);
-
-	CHKiRet(varUnsetValues(pThis));
-	pThis->varType = VARTYPE_NUMBER;
-	pThis->val.num = iVal;
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* Change the provided object to be of type number.
- * rgerhards, 2008-02-22
- */
-rsRetVal
-ConvToNumber(var_t *pThis)
-{
-	DEFiRet;
-	number_t n;
-
-	if(pThis->varType == VARTYPE_NUMBER) {
-		FINALIZE;
-	} else if(pThis->varType == VARTYPE_STR) {
-		iRet = rsCStrConvertToNumber(pThis->val.pStr, &n);
-		if(iRet == RS_RET_NOT_A_NUMBER) {
-			n = 0;
-			iRet = RS_RET_OK; /* we accept this as part of the language definition */
-		} else if (iRet != RS_RET_OK) {
-			FINALIZE;
-		}
-
-		/* we need to destruct the string first, because string and number are
-		 * inside a union and share the memory area! -- rgerhards, 2008-04-03
-		 */
-		rsCStrDestruct(&pThis->val.pStr);
-	
-		pThis->val.num = n;
-		pThis->varType = VARTYPE_NUMBER;
-	}
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* convert the provided var to type string. This is always possible
- * (except, of course, for things like out of memory...)
- * TODO: finish implementation!!!!!!!!!
- * rgerhards, 2008-02-24
- */
-rsRetVal
-ConvToString(var_t *pThis)
-{
-	DEFiRet;
-	uchar szNumBuf[64];
-
-	if(pThis->varType == VARTYPE_STR) {
-		FINALIZE;
-	} else if(pThis->varType == VARTYPE_NUMBER) {
-		CHKiRet(srUtilItoA((char*)szNumBuf, sizeof(szNumBuf)/sizeof(uchar), pThis->val.num));
-		CHKiRet(rsCStrConstructFromszStr(&pThis->val.pStr, szNumBuf));
-		pThis->varType = VARTYPE_STR;
-	}
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* convert (if necessary) the value to a boolean. In essence, this means the
- * value must be a number, but in case of a string special logic is used as
- * some string-values may represent a boolean (e.g. "true").
- * rgerhards, 2008-02-25
- */
-rsRetVal
-ConvToBool(var_t *pThis)
-{
-	DEFiRet;
-	number_t n;
-
-	if(pThis->varType == VARTYPE_NUMBER) {
-		FINALIZE;
-	} else if(pThis->varType == VARTYPE_STR) {
-		iRet = rsCStrConvertToBool(pThis->val.pStr, &n);
-		if(iRet == RS_RET_NOT_A_NUMBER) {
-			n = 0;
-			iRet = RS_RET_OK; /* we accept this as part of the language definition */
-		} else if (iRet != RS_RET_OK) {
-			FINALIZE;
-		}
-
-		/* we need to destruct the string first, because string and number are
-		 * inside a union and share the memory area! -- rgerhards, 2008-04-03
-		 */
-		rsCStrDestruct(&pThis->val.pStr);
-		pThis->val.num = n;
-		pThis->varType = VARTYPE_NUMBER;
-	}
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* This function is used to prepare two var_t objects for a common operation,
- * e.g before they are added, compared. The function looks at
- * the data types of both operands and finds the best data type suitable for
- * the operation (in respect to current types). Then, it converts those
- * operands that need conversion. Please note that the passed-in var objects
- * *are* modified and returned as new type. So do call this function only if
- * you actually need the conversion.
- *
- * This is how the common data type is selected. Note that op1 and op2 are
- * just the two operands, their order is irrelevant (this would just take up
- * more table space - so string/number is the same thing as number/string).
- *
- * Common Types:
- * op1		op2	operation data type
- * string	string	string
- * string	number	number if op1 can be converted to number, string else
- * date		string  date if op1 can be converted to date, string else
- * number	number  number
- * date		number	string (maybe we can do better?)
- * date		date	date
- * none         n/a     error
- *
- * If a boolean value is required, we need to have a number inside the
- * operand. If it is not, conversion rules to number apply. Once we
- * have a number, things get easy: 0 is false, anything else is true.
- * Please note that due to this conversion rules, "0" becomes false
- * while "-4712" becomes true. Using a date as boolen is not a good
- * idea. Depending on the ultimate conversion rules, it may always
- * become true or false. As such, using dates as booleans is
- * prohibited and the result defined to be undefined.
- *
- * rgerhards, 2008-02-22
- */
-static rsRetVal
-ConvForOperation(var_t *pThis, var_t *pOther)
-{
-	DEFiRet;
-
-	if(pThis->varType == VARTYPE_NONE || pOther->varType == VARTYPE_NONE)
-		ABORT_FINALIZE(RS_RET_INVALID_VAR);
-
-	switch(pThis->varType) {
-		case VARTYPE_NONE:
-			ABORT_FINALIZE(RS_RET_INVALID_VAR);
-			break;
-		case VARTYPE_STR:
-			switch(pOther->varType) {
-				case VARTYPE_NONE:
-					ABORT_FINALIZE(RS_RET_INVALID_VAR);
-					break;
-				case VARTYPE_STR:
-					FINALIZE; /* two strings, we are all set */
-					break;
-				case VARTYPE_NUMBER:
-					/* check if we can convert pThis to a number, if so use number format. */
-					iRet = ConvToNumber(pThis);
-					if(iRet == RS_RET_NOT_A_NUMBER) {
-						CHKiRet(ConvToString(pOther));
-					} else {
-						FINALIZE; /* OK or error */
-					}
-					break;
-				case VARTYPE_SYSLOGTIME:
-					ABORT_FINALIZE(RS_RET_NOT_IMPLEMENTED);
-					break;
-			}
-			break;
-		case VARTYPE_NUMBER:
-			switch(pOther->varType) {
-				case VARTYPE_NONE:
-					ABORT_FINALIZE(RS_RET_INVALID_VAR);
-					break;
-				case VARTYPE_STR:
-					iRet = ConvToNumber(pOther);
-					if(iRet == RS_RET_NOT_A_NUMBER) {
-						CHKiRet(ConvToString(pThis));
-					} else {
-						FINALIZE; /* OK or error */
-					}
-					break;
-				case VARTYPE_NUMBER:
-					FINALIZE; /* two numbers, so we are all set */
-					break;
-				case VARTYPE_SYSLOGTIME:
-					ABORT_FINALIZE(RS_RET_NOT_IMPLEMENTED);
-					break;
-			}
-			break;
-		case VARTYPE_SYSLOGTIME:
-			ABORT_FINALIZE(RS_RET_NOT_IMPLEMENTED);
-			break;
-	}
-
-finalize_it:
-	RETiRet;
-}
-
-
 /* queryInterface function
  * rgerhards, 2008-02-21
  */
@@ -426,14 +108,6 @@ CODESTARTobjQueryInterface(var)
 	pIf->ConstructFinalize = varConstructFinalize;
 	pIf->Destruct = varDestruct;
 	pIf->DebugPrint = varDebugPrint;
-	pIf->Obj2Str = Obj2Str;
-	pIf->SetNumber = varSetNumber;
-	pIf->SetString = varSetString;
-	pIf->ConvForOperation = ConvForOperation;
-	pIf->ConvToNumber = ConvToNumber;
-	pIf->ConvToBool = ConvToBool;
-	pIf->ConvToString = ConvToString;
-	pIf->Duplicate = Duplicate;
 finalize_it:
 ENDobjQueryInterface(var)