sizeof keyword + Correction of ulong missing in regex

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -517,6 +517,24 @@ public void TypeTesting(string expression, Type type)
         [TestCase("typeof(string) == 12.GetType()", ExpectedResult = false, Category = "typeof keyword")]
         #endregion
 
+        #region sizeof keyword
+
+        [TestCase("sizeof(sbyte)", ExpectedResult = sizeof(sbyte), Category = "sizeof keyword")]
+        [TestCase("sizeof(byte)", ExpectedResult = sizeof(byte), Category = "sizeof keyword")]
+        [TestCase("sizeof(short)", ExpectedResult = sizeof(short), Category = "sizeof keyword")]
+        [TestCase("sizeof(ushort)", ExpectedResult = sizeof(ushort), Category = "sizeof keyword")]
+        [TestCase("sizeof(int)", ExpectedResult = sizeof(int), Category = "sizeof keyword")]
+        [TestCase("sizeof(uint)", ExpectedResult = sizeof(uint), Category = "sizeof keyword")]
+        [TestCase("sizeof(long)", ExpectedResult = sizeof(long), Category = "sizeof keyword")]
+        [TestCase("sizeof(ulong)", ExpectedResult = sizeof(ulong), Category = "sizeof keyword")]
+        [TestCase("sizeof(char)", ExpectedResult = sizeof(char), Category = "sizeof keyword")]
+        [TestCase("sizeof(float)", ExpectedResult = sizeof(float), Category = "sizeof keyword")]
+        [TestCase("sizeof(double)", ExpectedResult = sizeof(double), Category = "sizeof keyword")]
+        [TestCase("sizeof(decimal)", ExpectedResult = sizeof(decimal), Category = "sizeof keyword")]
+        [TestCase("sizeof(bool)", ExpectedResult = sizeof(bool), Category = "sizeof keyword")]
+
+        #endregion
+
         #region Create instance with new Keyword
         [TestCase("new ClassForTest1().GetType()", ExpectedResult = typeof(ClassForTest1), Category = "Create instance with new Keyword")]
         [TestCase("new ClassForTest2(15).GetType()", ExpectedResult = typeof(ClassForTest2), Category = "Create instance with new Keyword")]

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -15,6 +15,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -57,7 +58,7 @@ public class ExpressionEvaluator
         private string CastRegexPattern { get { return $@"^\(\s*(?<typeName>[{ diactiticsKeywordsRegexPattern }][{ diactiticsKeywordsRegexPattern }0-9{ (OptionInlineNamespacesEvaluationActive ? @"\." : string.Empty) }\[\]<>]*[?]?)\s*\)"; } }
         private Regex castRegex = null;
 
-        private static readonly string primaryTypesRegexPattern = @"(?<=^|[^" + diactiticsKeywordsRegexPattern + @"])(?<primaryType>object|string|bool[?]?|byte[?]?|char[?]?|decimal[?]?|double[?]?|short[?]?|int[?]?|long[?]?|sbyte[?]?|float[?]?|ushort[?]?|uint[?]?|void)(?=[^a-zA-Z_]|$)";
+        private static readonly string primaryTypesRegexPattern = @"(?<=^|[^" + diactiticsKeywordsRegexPattern + @"])(?<primaryType>object|string|bool[?]?|byte[?]?|char[?]?|decimal[?]?|double[?]?|short[?]?|int[?]?|long[?]?|sbyte[?]?|float[?]?|ushort[?]?|uint[?]?|ulong[?]?|void)(?=[^a-zA-Z_]|$)";
         private Regex primaryTypesRegex = new Regex(primaryTypesRegexPattern);
 
         // To remove comments in scripts based on https://stackoverflow.com/questions/3524317/regex-to-strip-line-comments-from-c-sharp/3524689#3524689
@@ -431,6 +432,18 @@ private enum TryBlockEvaluatedState
                 }
             },
             { "Sign", (self, args) => Math.Sign(Convert.ToDouble(self.Evaluate(args[0]))) },
+            { "sizeof", (self, args) =>
+                {
+                    Type type = ((ClassOrTypeName)self.Evaluate(args[0])).Type;
+
+                    if(type == typeof(bool))
+                        return 1;
+                    else if(type == typeof(char))
+                        return 2;
+                    else
+                        return Marshal.SizeOf(type);
+                }
+            },
             { "typeof", (self, args) => ((ClassOrTypeName)self.Evaluate(args[0])).Type },
         };