From 017c2e9ad9668215e205e45eefe9e589fa0422d6 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Mon, 23 Jan 2012 12:33:17 +0000
Subject: [PATCH] Calc/MathParser: Conditional limit increased to 30.

---
 Library/MathParser.cpp | 31 ++++++++++++++-----------------
 Library/StdAfx.h       | 27 ++++++++-------------------
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/Library/MathParser.cpp b/Library/MathParser.cpp
index 140de43b..0a7dcb7e 100644
--- a/Library/MathParser.cpp
+++ b/Library/MathParser.cpp
@@ -22,7 +22,7 @@
 #include "MeasureCalc.h"
 #include "MathParser.h"
 
-static const int MAX_STACK_SIZE = 32;
+static const int MAX_STACK_SIZE = 96;
 static const double M_E = 2.7182818284590452354;
 static const double M_PI = 3.14159265358979323846;
 
@@ -84,9 +84,9 @@ enum MathTokenType
 
 struct Operation
 {
-	void* proc;
-	BYTE prevTop;
-	OperationType type;
+	BYTE type;
+	BYTE funcIndex;
+	char prevTop;
 };
 
 struct Function
@@ -131,8 +131,8 @@ static const int FUNC_ROUND = 13;
 static const int FUNC_E = 18;
 static const int FUNC_PI = 19;
 
-static const Operation g_BrOp = { NULL, 0, OP_OBR };
-static const Operation g_NegOp = { (void*)&neg, 0, OP_FUNC_ONEARG };
+static const Operation g_BrOp = { OP_OBR, 0, 0};
+static const Operation g_NegOp = { OP_FUNC_ONEARG, 17, 0 };
 
 static const BYTE g_OpPriorities[OP_FUNC_MULTIARG + 1] =
 {
@@ -167,15 +167,15 @@ static const BYTE g_OpPriorities[OP_FUNC_MULTIARG + 1] =
 };
 
 static CharType GetCharType(WCHAR ch);
-static int GetFunction(const WCHAR* str, size_t len, void** data);
+static int GetFunction(const WCHAR* str, size_t len);
 static int FindSymbol(const WCHAR* str);
 
 struct Parser
 {
 	Operation opStack[MAX_STACK_SIZE];
 	double valStack[MAX_STACK_SIZE];
-	int opTop;
-	int valTop;
+	char opTop;
+	char valTop;
 	int obrDist;
 
 	Parser() : opTop(0), valTop(-1), obrDist(2) { opStack[0].type = OP_OBR; }
@@ -365,12 +365,10 @@ WCHAR* MathParser::Parse(const WCHAR* formula, CMeasureCalc* calc, double* resul
 		case TOK_NAME:
 			{
 				Operation op;
-				int funcnum, namelen = lexer.nameLen;
-
 				if (lexer.nameLen <= FUNC_MAX_LEN &&
-					((funcnum = GetFunction(lexer.name, lexer.nameLen, (void**)&op.proc)) >= 0))
+					((op.funcIndex = GetFunction(lexer.name, lexer.nameLen)) >= 0))
 				{
-					switch (funcnum)
+					switch (op.funcIndex)
 					{
 					case FUNC_E:
 						parser.valStack[++parser.valTop] = M_E;
@@ -427,7 +425,7 @@ static WCHAR* Calc(Parser& parser)
 		int paramcnt = parser.valTop - op.prevTop;
 
 		parser.valTop = op.prevTop;
-		WCHAR* error = (*(MultiArgProc)op.proc)(paramcnt, &parser.valStack[parser.valTop + 1], &res);
+		WCHAR* error = (*(MultiArgProc)g_Functions[op.funcIndex].proc)(paramcnt, &parser.valStack[parser.valTop + 1], &res);
 		if (error) return error;
 
 		parser.valStack[++parser.valTop] = res;
@@ -459,7 +457,7 @@ static WCHAR* Calc(Parser& parser)
 	}
 	else if (op.type == OP_FUNC_ONEARG)
 	{
-		res = (*(OneArgProc)op.proc)(right);
+		res = (*(OneArgProc)g_Functions[op.funcIndex].proc)(right);
 	}
 	else
 	{
@@ -785,7 +783,7 @@ bool MathParser::IsDelimiter(WCHAR ch)
 	return type == CH_SYMBOL || type == CH_SEPARAT;
 }
 
-int GetFunction(const WCHAR* str, size_t len, void** data)
+int GetFunction(const WCHAR* str, size_t len)
 {
 	const int funcCount = sizeof(g_Functions) / sizeof(Function);
 	for (int i = 0; i < funcCount; ++i)
@@ -793,7 +791,6 @@ int GetFunction(const WCHAR* str, size_t len, void** data)
 		if (g_Functions[i].length == len &&
 			_wcsnicmp(str, g_Functions[i].name, len) == 0)
 		{
-			*data = g_Functions[i].proc;
 			return i;
 		}
 	}
diff --git a/Library/StdAfx.h b/Library/StdAfx.h
index 3b653963..818df970 100644
--- a/Library/StdAfx.h
+++ b/Library/StdAfx.h
@@ -22,28 +22,23 @@
 #define _WIN32_IE 0x0600
 
 #define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
 #include <crtdbg.h>
 
 // WINAPI
-#include <winsock2.h>
+#define WIN32_LEAN_AND_MEAN
 #include <ws2tcpip.h>
 #include <windows.h>
 #include <windowsx.h>
+#include <ole2.h>
 #include <gdiplus.h>
 #include <dwmapi.h>
 #include <comdef.h>
 #include <Iphlpapi.h>
-#include <commctrl.h>
-#include <shellapi.h>
 #include <Mmsystem.h>
+#include <Shellapi.h>
 #include <shlobj.h>
 #include <shlwapi.h>
 #include <Wininet.h>
-#include <winperf.h>
-#include <Windns.h>
-#include <Ipexport.h>
-#include <Powrprof.h>
 
 // STL
 #include <map>
@@ -52,22 +47,16 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <list>
-#include <sstream>
+#include <algorithm>
 #include <ctime>
 #include <cstdlib>
-#include <algorithm>
+#include <cstdio>
 #include <cctype>
+#include <cmath>
+#include <cerrno>
+#include <cassert>
 
 // RUNTIME
-#include <stdio.h>
-#include <errno.h>
-#include <time.h>
-#include <math.h>
-#include <time.h>
-#include <assert.h>
-#include <io.h>
-#include <stdarg.h>
 #include <process.h>
-#include <float.h>
 
 #endif