removed number of enumerator from data type enumeration

to eliminate the need for the number of enumerator changed the bit mask
data type array to an unordered map in table constructor, and removed
the equivalent data type function from the table class (was only
returning the input value), removed the call to equivalent data type
function in LET translate function, and added an enum class hash for
converting enum class values to integers (needed for unordered maps
using enum class enumerators)

basic/let.cpp

@@ -142,8 +142,8 @@ TokenStatus letTranslate(Translator &translator, Token *commandToken,
 	while (!done);
 
 	// get expression for value to assign
-	if ((status = translator.getExpression(token,
-		translator.equivalentDataType(dataType))) != Done_TokenStatus)
+	if ((status = translator.getExpression(token, dataType))
+		!= Done_TokenStatus)
 	{
 		if (status == Parser_TokenStatus && token->isDataType(None_DataType))
 		{

ibcp.h

@@ -25,6 +25,8 @@
 #ifndef IBCP_H
 #define IBCP_H
 
+#include <cstddef>
+
 // include auto-generated enumerations
 #include "autoenums.h"
 
@@ -72,8 +74,6 @@ enum DataType
 	// end of the actual execution data types
 	// the following data types are used internally for other uses
 	None_DataType,		// indicates none of the above data types
-	// number of actual execution data types
-	numberof_DataType = None_DataType,
 	Number_DataType,	// either Double or Integer
 	Any_DataType,		// any type (Double, Integer or String)
 	sizeof_DataType
@@ -99,4 +99,15 @@ enum SubCode
 };
 
 
+// provide generic hash for enum class with std::unordered_map
+struct EnumClassHash
+{
+    template <typename T>
+    std::size_t operator()(T t) const
+    {
+        return static_cast<std::size_t>(t);
+    }
+};
+
+
 #endif  // IBCP_H

table.cpp

@@ -22,6 +22,8 @@
 //
 //	2010-02-18	initial version
 
+#include <unordered_map>
+
 #include <QChar>
 #include <QString>
 
@@ -1618,10 +1620,10 @@ Table::Table(TableEntry *entry, int entryCount) :
 				Num_BitMask = Dbl_BitMask | Int_BitMask,
 				Any_BitMask = Num_BitMask | Str_BitMask
 			};
-			int bitMaskDataType[numberof_DataType] = {
-				Dbl_BitMask,	// Double
-				Int_BitMask,	// Integer
-				Str_BitMask		// String
+			std::unordered_map<DataType, int, EnumClassHash> bitMaskDataType {
+				{Double_DataType,  Dbl_BitMask},
+				{Integer_DataType, Int_BitMask},
+				{String_DataType,  Str_BitMask}
 			};
 
 			// set expected data type (start with data type of last operand)

translator.cpp

@@ -1232,20 +1232,6 @@ Token *Translator::doneStackPopErrorToken(void)
 }
 
 
-// function to return equivalent data type for data type
-// (really to convert the various string data types to String_DataType)
-DataType Translator::equivalentDataType(DataType dataType)
-{
-	static DataType equivalent[numberof_DataType] = {
-		Double_DataType,	// Double
-		Integer_DataType,	// Integer
-		String_DataType		// String
-	};
-
-	return equivalent[dataType];
-}
-
-
 // function to return the token error status for an expected data type
 // and reference type
 TokenStatus Translator::expectedErrStatus(DataType dataType,

translator.h

@@ -73,7 +73,6 @@ class Translator
 		Token **first = NULL, Token **last = NULL);
 
 	// Public Support Functions
-	static DataType equivalentDataType(DataType dataType);
 	static TokenStatus expectedErrStatus(DataType dataType,
 		Reference reference = None_Reference);