LightSys · cscederborg · Aug 7, 2020 · Aug 7, 2020 · Aug 8, 2020 · Aug 10, 2020
diff --git a/centrallix-lib/include/datatypes.h b/centrallix-lib/include/datatypes.h
@@ -56,8 +56,7 @@ typedef struct _SV
 /** Money structure **/
 typedef struct _MN
     {
-    int                 WholePart;      /* integer part = floor($amount) */
-    unsigned short      FractionPart;   /* fract part = $amount - floor($amount) */
+    long long       Value;     /* Fixed-point representation in 1/10000 of a dollar */
     }
     MoneyType, *pMoneyType;
 

diff --git a/centrallix/Makefile.in b/centrallix/Makefile.in
@@ -367,6 +367,8 @@ ifeq ($TOTESTFILES,)
 else
     TOTESTDEPS=test_obj
 endif
+CTESTHELPERS:=$(wildcard tests/helpers/*.c)
+TESTHELPERS:=$(patsubst %.c,%.o,$(CTESTHELPERS))
 
 # Some basic build parameters.
 PROFILE=@PROFILE@
@@ -529,8 +531,8 @@ tests/centrallix.conf-test: tests/centrallix.conf-test.in
 tests/t_driver.o: tests/t_driver.c 
 	$(CC) $(CFLAGS) $< -c -o $@
 
-tests/test_%.bin: tests/test_%.o tests/t_driver.o centrallix.o $(V3LSOBJS) $(STATIC_LIBS)
-	$(CC) $< tests/t_driver.o centrallix.o $(V3LSOBJS) $(LIBDIRS) $(PROFILE) $(COVERAGE) -Wl@EXPORT_DYNAMIC@ -o $@ $(LIBS) @NCURSES_LIBS@
+tests/test_%.bin: tests/test_%.o tests/t_driver.o centrallix.o $(V3LSOBJS) $(STATIC_LIBS) $(TESTHELPERS)
+	$(CC) $< tests/t_driver.o centrallix.o $(V3LSOBJS) $(TESTHELPERS) $(LIBDIRS) $(PROFILE) $(COVERAGE) -Wl@EXPORT_DYNAMIC@ -o $@ $(LIBS) @NCURSES_LIBS@ @SYBASE_LIBS@
 
 test: tests/centrallix.conf-test $(TOTESTDEPS) $(TOTESTFILES) $(CBTESTFILES)
 	@printf "%-62.62s  %s\n" "Test Name" "Stat"
@@ -646,6 +648,7 @@ clean:
 	@rm -f man/*.gz
 	@rm -f tests/*.to.tmp tests/*.out
 	@rm -f tests/*.o tests/*.bin
+	@rm -f tests/helpers/*.o
 	@rm -rf thirdparty/*-inst
 	@rm -f *.gcov */*.gcov
 	@rm -f *.gcda */*.gcda

diff --git a/centrallix/expression/exp_compiler.c b/centrallix/expression/exp_compiler.c
@@ -152,8 +152,7 @@ exp_internal_CompileExpression_r(pLxSession lxs, int level, pParamObjects objlis
 			if (t == MLX_TOK_INTEGER)
 			    {
 			    i = mlxIntVal(lxs);
-			    etmp->Types.Money.WholePart = i;
-			    etmp->Types.Money.FractionPart = 0;
+			    etmp->Types.Money.Value = (i * 10000ll);
 			    }
 			else
 			    {

diff --git a/centrallix/expression/exp_evaluate.c b/centrallix/expression/exp_evaluate.c
@@ -191,7 +191,6 @@ expEvalDivide(pExpression tree, pParamObjects objlist)
     pExpression i0,i1;
     MoneyType m;
     int i;
-    int is_negative = 0;
     long long mv, mv2;
     double md;
 
@@ -227,7 +226,7 @@ expEvalDivide(pExpression tree, pParamObjects objlist)
 	/** Check for divide by zero **/
 	if ((i1->DataType == DATA_T_INTEGER && i1->Integer == 0) ||
 	    (i1->DataType == DATA_T_DOUBLE && i1->Types.Double == 0.0) ||
-	    (i1->DataType == DATA_T_MONEY && i1->Types.Money.WholePart == 0 && i1->Types.Money.FractionPart == 0))
+	    (i1->DataType == DATA_T_MONEY && i1->Types.Money.Value == 0))
 	    {
 	    mssError(1,"EXP","Attempted divide by zero");
 	    return -1;
@@ -280,38 +279,12 @@ expEvalDivide(pExpression tree, pParamObjects objlist)
 		    case DATA_T_INTEGER:
 		        tree->DataType = DATA_T_MONEY;
 			memcpy(&m, &(i0->Types.Money), sizeof(MoneyType));
-			if (m.WholePart < 0)
-		    	    {
-			    is_negative = !is_negative;
-			    if (m.FractionPart != 0)
-		        	{
-				m.WholePart = m.WholePart + 1;
-				m.FractionPart = 10000 - m.FractionPart;
-				}
-			    m.WholePart = -m.WholePart;
-		            }
-			i = i1->Integer;
-			if (i < 0) 
-			    {
-			    i = -i;
-			    is_negative = !is_negative;
-			    }
-			if (i == 0)
+			if (i1->Integer == 0)
 			    {
 			    mssError(1,"EXP","Attempted divide by zero");
 			    return -1;
 			    }
-			tree->Types.Money.WholePart = m.WholePart / i;
-			tree->Types.Money.FractionPart = (10000*(m.WholePart % i) + m.FractionPart)/i;
-			if (is_negative)
-			    {
-			    if (tree->Types.Money.FractionPart != 0)
-		        	{
-				tree->Types.Money.WholePart = tree->Types.Money.WholePart + 1;
-				tree->Types.Money.FractionPart = 10000 - tree->Types.Money.FractionPart;
-				}
-			    tree->Types.Money.WholePart = -tree->Types.Money.WholePart;
-			    }
+			tree->Types.Money.Value = (long long)(m.Value / i1->Integer);
 			break;
 		    case DATA_T_DOUBLE:
 			tree->DataType = DATA_T_MONEY;
@@ -320,23 +293,11 @@ expEvalDivide(pExpression tree, pParamObjects objlist)
 			    mssError(1,"EXP","Attempted divide by zero");
 			    return -1;
 			    }
-			mv = ((long long)(i0->Types.Money.WholePart)) * 10000 + i0->Types.Money.FractionPart;
-			md = mv / i1->Types.Double;
-			if (md < 0) md -= 0.5;
-			else md += 0.5;
-			mv = md;
-			tree->Types.Money.WholePart = mv/10000;
-			mv = mv % 10000;
-			if (mv < 0)
-			    {
-			    mv += 10000;
-			    tree->Types.Money.WholePart -= 1;
-			    }
-			tree->Types.Money.FractionPart = mv;
+			tree->Types.Money.Value = llround(i0->Types.Money.Value/i1->Types.Double);
 			break;
 		    case DATA_T_MONEY:
-			mv = ((long long)(i0->Types.Money.WholePart)) * 10000 + i0->Types.Money.FractionPart;
-			mv2 = ((long long)(i1->Types.Money.WholePart)) * 10000 + i1->Types.Money.FractionPart;
+			mv = i0->Types.Money.Value;
+			mv2 = i1->Types.Money.Value;
 			if (mv2 == 0)
 			    {
 			    mssError(1,"EXP","Attempted divide by zero");
@@ -428,8 +389,7 @@ expEvalMultiply(pExpression tree, pParamObjects objlist)
 			break;
 		    case DATA_T_MONEY:
 			tree->DataType = DATA_T_MONEY;
-			mv = ((long long)(i1->Types.Money.WholePart)) * 10000 + i1->Types.Money.FractionPart;
-			mv *= i0->Integer;
+			mv = i1->Types.Money.Value * i0->Integer;
 			break;
 		    case DATA_T_STRING:
 			tree->DataType = DATA_T_STRING;
@@ -453,8 +413,7 @@ expEvalMultiply(pExpression tree, pParamObjects objlist)
 		    {
 		    case DATA_T_MONEY:
 			tree->DataType = DATA_T_MONEY;
-			mv = ((long long)(i1->Types.Money.WholePart)) * 10000 + i1->Types.Money.FractionPart;
-			mv *= i0->Types.Double;
+			mv = i1->Types.Money.Value * i0->Types.Double;
 			break;
 		    default:
 			tree->Types.Double = i0->Types.Double * objDataToDouble(i1->DataType, dptr);
@@ -465,7 +424,7 @@ expEvalMultiply(pExpression tree, pParamObjects objlist)
 
 	    case DATA_T_MONEY:
 		tree->DataType = DATA_T_MONEY;
-		mv = ((long long)(i0->Types.Money.WholePart)) * 10000 + i0->Types.Money.FractionPart;
+		mv = i0->Types.Money.Value;
 		switch(i1->DataType)
 		    {
 		    case DATA_T_INTEGER:
@@ -505,14 +464,7 @@ expEvalMultiply(pExpression tree, pParamObjects objlist)
 	/** Common processing **/
 	if (tree->DataType == DATA_T_MONEY)
 	    {
-	    tree->Types.Money.WholePart = mv/10000;
-	    mv = mv % 10000;
-	    if (mv < 0)
-		{
-		mv += 10000;
-		tree->Types.Money.WholePart -= 1;
-		}
-	    tree->Types.Money.FractionPart = mv;
+	    tree->Types.Money.Value = mv;
 	    }
 	else if (tree->DataType == DATA_T_STRING)
 	    {
@@ -604,17 +556,9 @@ expEvalMinus(pExpression tree, pParamObjects objlist)
 			tree->Types.Double = (double)(i0->Integer) - i1->Types.Double;
 			break;
 		    case DATA_T_MONEY:
+		        /** Treat Int as a dollar value **/
 		        tree->DataType = DATA_T_MONEY;
-			tree->Types.Money.WholePart = i0->Integer - i1->Types.Money.WholePart;
-			if (i1->Types.Money.FractionPart == 0)
-			    {
-			    tree->Types.Money.FractionPart = 0;
-			    }
-			else
-			    {
-			    tree->Types.Money.WholePart--;
-			    tree->Types.Money.FractionPart = 10000 - i1->Types.Money.FractionPart;
-			    }
+		        tree->Types.Money.Value = (i0->Integer * 10000ll) - i1->Types.Money.Value;
 			break;
 		    default:
 			tree->Integer = i0->Integer - objDataToInteger(i1->DataType, dptr, NULL);
@@ -635,7 +579,7 @@ expEvalMinus(pExpression tree, pParamObjects objlist)
 			break;
 		    case DATA_T_MONEY:
 		        tree->DataType = DATA_T_DOUBLE;
-			tree->Types.Double = i0->Types.Double - (i1->Types.Money.WholePart + i1->Types.Money.FractionPart/10000.0);
+			tree->Types.Double = i0->Types.Double - (i1->Types.Money.Value / 10000.0);
 			break;
 		    default:
 		        tree->DataType = DATA_T_DOUBLE;
@@ -649,25 +593,16 @@ expEvalMinus(pExpression tree, pParamObjects objlist)
 		    {
 		    case DATA_T_INTEGER:
 		        tree->DataType = DATA_T_MONEY;
-			tree->Types.Money.WholePart = i0->Types.Money.WholePart - i1->Integer;
-			tree->Types.Money.FractionPart = i0->Types.Money.FractionPart;
+		        /** Since Value is in 1/10000 of a dollar, integer must be multiplied to scale **/
+			tree->Types.Money.Value = i0->Types.Money.Value - (i1->Integer * 10000ll);
 			break;
 		    case DATA_T_DOUBLE:
 		        tree->DataType = DATA_T_DOUBLE;
-			tree->Types.Double = (i0->Types.Money.WholePart + i0->Types.Money.FractionPart/10000.0) - i1->Types.Double;
+			tree->Types.Double = (i0->Types.Money.Value / 10000.0) - i1->Types.Double;
 			break;
 		    case DATA_T_MONEY:
 		        tree->DataType = DATA_T_MONEY;
-			tree->Types.Money.WholePart = i0->Types.Money.WholePart - i1->Types.Money.WholePart;
-			tree->Types.Money.FractionPart = 10000 + i0->Types.Money.FractionPart - i1->Types.Money.FractionPart;
-			if (tree->Types.Money.FractionPart >= 10000)
-			    {
-			    tree->Types.Money.FractionPart -= 10000;
-			    }
-			else
-			    {
-			    tree->Types.Money.WholePart--;
-			    }
+		        tree->Types.Money.Value = i0->Types.Money.Value - i1->Types.Money.Value;
 		        break;
 		    default:
 			if (objDataToMoney(i1->DataType, dptr, &m) < 0)
@@ -676,12 +611,7 @@ expEvalMinus(pExpression tree, pParamObjects objlist)
 			    return -1;
 			    }
 		        tree->DataType = DATA_T_MONEY;
-			tree->Types.Money.WholePart = i0->Types.Money.WholePart - m.WholePart;
-			tree->Types.Money.FractionPart = 10000 + i0->Types.Money.FractionPart - m.FractionPart;
-			if (tree->Types.Money.FractionPart >= 10000)
-			    tree->Types.Money.FractionPart -= 10000;
-			else
-			    tree->Types.Money.WholePart--;
+			tree->Types.Money.Value = i0->Types.Money.Value - m.Value;
 			break;
 		    }
 		break;
@@ -806,8 +736,8 @@ expEvalPlus(pExpression tree, pParamObjects objlist)
 
 		    case DATA_T_MONEY:
 			tree->DataType = DATA_T_MONEY;
-			tree->Types.Money.WholePart = i1->Types.Money.WholePart + i0->Integer;
-			tree->Types.Money.FractionPart = i1->Types.Money.FractionPart;
+			/** Int must be converted to 1/10000 of a dollar **/
+			tree->Types.Money.Value = i1->Types.Money.Value + (i0->Integer * 10000ll);
 			break;
 
 		    default:
@@ -843,13 +773,7 @@ expEvalPlus(pExpression tree, pParamObjects objlist)
 
 	    case DATA_T_MONEY:
 	        objDataToMoney(i1->DataType, dptr, &m);
-		tree->Types.Money.WholePart = i0->Types.Money.WholePart + m.WholePart;
-		tree->Types.Money.FractionPart = i0->Types.Money.FractionPart + m.FractionPart;
-		if (tree->Types.Money.FractionPart >= 10000)
-		    {
-		    tree->Types.Money.FractionPart -= 10000;
-		    tree->Types.Money.WholePart++;
-		    }
+	        tree->Types.Money.Value = i0->Types.Money.Value + m.Value;
 		break;
 
 	    case DATA_T_DATETIME:
@@ -1502,8 +1426,7 @@ expRevEvalProperty(pExpression tree, pParamObjects objlist)
 		}
 	    else if (tree->DataType == DATA_T_INTEGER && attr_type == DATA_T_MONEY)
 	        {
-		tree->Types.Money.WholePart = tree->Integer;
-		tree->Types.Money.FractionPart = 0;
+		tree->Types.Money.Value = (tree->Integer * 10000ll);
 		}
 	    else if (tree->DataType == DATA_T_DOUBLE && attr_type == DATA_T_MONEY)
 	        {