Merge pull request #560 from frg2089/enum

refactor(sly): add Enum constraint to token type

Author: b3b00

src/sly/EnumConverter.cs

@@ -17,13 +17,13 @@ public static T ConvertIntToEnum<T>(int value) where T : struct
 
 
 
-        public static IN ConvertStringToEnum<IN>(string name)  where IN : struct
+        public static IN ConvertStringToEnum<IN>(string name)  where IN : struct, Enum
         {
             Enum.TryParse(name, out IN token);
             return token;
         }
 
-        public static bool IsEnumValue<IN>(string name)  where IN : struct
+        public static bool IsEnumValue<IN>(string name)  where IN : struct, Enum
         {
             return Enum.TryParse(name, out IN token);
         }

src/sly/lexer/CallBacksBuilder.cs

@@ -8,7 +8,7 @@ namespace sly.lexer
     public static class CallBacksBuilder
     {
 
-        public static void BuildCallbacks<IN>(GenericLexer<IN> lexer) where IN : struct
+        public static void BuildCallbacks<IN>(GenericLexer<IN> lexer) where IN : struct, Enum
         {
             var attributes =
                 (CallBacksAttribute[]) typeof(IN).GetCustomAttributes(typeof(CallBacksAttribute), true);
@@ -20,7 +20,7 @@ public static void BuildCallbacks<IN>(GenericLexer<IN> lexer) where IN : struct
 
         }
 
-        public static void ExtractCallBacks<IN>(Type callbackClass, GenericLexer<IN> lexer) where IN : struct
+        public static void ExtractCallBacks<IN>(Type callbackClass, GenericLexer<IN> lexer) where IN : struct, Enum
         {
             var methods = callbackClass.GetMethods().ToList();
             methods = methods.Where<MethodInfo>(m =>
@@ -37,13 +37,13 @@ public static void ExtractCallBacks<IN>(Type callbackClass, GenericLexer<IN> lex
             }
         }
 
-        public static void AddCallback<IN>(GenericLexer<IN> lexer, MethodInfo method, IN token) where IN : struct
+        public static void AddCallback<IN>(GenericLexer<IN> lexer, MethodInfo method, IN token) where IN : struct, Enum
         {
             var callbackDelegate = (Func<Token<IN>,Token<IN>>)Delegate.CreateDelegate(typeof(Func<Token<IN>,Token<IN>>), method);
             lexer.AddCallBack(token,callbackDelegate);
         }
 
-        public static List<(IN tokenId,Func<Token<IN>, Token<IN>> callback)> GetCallbacks<IN>(GenericLexer<IN> lexer) where IN : struct
+        public static List<(IN tokenId,Func<Token<IN>, Token<IN>> callback)> GetCallbacks<IN>(GenericLexer<IN> lexer) where IN : struct, Enum
         {
             List<(IN,Func<Token<IN>, Token<IN>>)> callbacks = new List<(IN,Func<Token<IN>, Token<IN>>)>();
             var classAttributes =

src/sly/lexer/GenericLexer.cs

@@ -9,7 +9,7 @@
 
 namespace sly.lexer
 {
-    public class GenericLexer<IN> : ILexer<IN> where IN : struct
+    public class GenericLexer<IN> : ILexer<IN> where IN : struct, Enum
     {
         public class Config
         {

src/sly/lexer/ILexer.cs

@@ -5,7 +5,7 @@
 
 namespace sly.lexer
 {
-    public interface ILexer<T> where T : struct
+    public interface ILexer<T> where T : struct, Enum
     {
 
         Dictionary<T, Dictionary<string, string>> LexemeLabels { get; set; }

src/sly/lexer/Lexer.cs

@@ -10,7 +10,7 @@ namespace sly.lexer
     ///     T is the token type
     /// </summary>
     /// <typeparam name="T">T is the enum Token type</typeparam>
-    public class Lexer<T> : ILexer<T> where T : struct
+    public class Lexer<T> : ILexer<T> where T : struct, Enum
     {
         public Dictionary<T, Dictionary<string, string>> LexemeLabels { get; set; }
         public string I18n { get; set; }

src/sly/lexer/LexerAttribute.cs

@@ -2,10 +2,14 @@
 
 namespace sly.lexer
 {
+
     [AttributeUsage(AttributeTargets.Enum)]
     public class LexerAttribute : Attribute
     {
-        private static readonly GenericLexer<int>.Config Defaults = new GenericLexer<int>.Config();
+        private enum DefaultEnum : int
+        {
+        }
+        private static readonly GenericLexer<DefaultEnum>.Config Defaults = new GenericLexer<DefaultEnum>.Config();
 
         private bool? ignoreWS;
 

src/sly/lexer/LexerBuilder.cs

@@ -45,13 +45,13 @@ public static T[] GetAttributesOfType<T>(this Enum enumVal) where T : Attribute
 
     public delegate (List<string> modes, bool isModePopper, string pushTarget) ModesForLexemeGetter<IN>(
         KeyValuePair<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)> attribute)
-        where IN : struct;
+        where IN : struct, Enum;
 
     public static class LexerBuilder
     {
 
         public static Dictionary<IN, (List<LexemeAttribute>,List<LexemeLabelAttribute>)> GetLexemesWithReflection<IN>(BuildResult<ILexer<IN>> result, string lang)
-            where IN : struct
+            where IN : struct, Enum
         {
             var attributes = new Dictionary<IN, (List<LexemeAttribute>,List<LexemeLabelAttribute>)>();
 
@@ -101,7 +101,7 @@ public static class LexerBuilder
 
         public static BuildResult<ILexer<IN>> BuildLexer<IN>(
             Action<IN, LexemeAttribute, GenericLexer<IN>> extensionBuilder = null,
-            LexerPostProcess<IN> lexerPostProcess = null) where IN : struct
+            LexerPostProcess<IN> lexerPostProcess = null) where IN : struct, Enum
         {
             return BuildLexer<IN>(new BuildResult<ILexer<IN>>(), extensionBuilder, lexerPostProcess: lexerPostProcess);
         }
@@ -115,7 +115,7 @@ public static BuildResult<ILexer<IN>> BuildLexer<IN>(BuildResult<ILexer<IN>> res
             Dictionary<IN,List<CommentAttribute>> comments = null,
             Func<KeyValuePair<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)>,(List<string> modes, bool isModePopper, string pushTarget)> modesGetter = null,
             Func<List<(IN tokenId, Func<Token<IN>, Token<IN>> callback)>> callbacksGetter = null)
-            where IN : struct
+            where IN : struct, Enum
         {
             attributes = attributes ?? GetLexemesWithReflection<IN>(result, lang);
             lexerAttribute = lexerAttribute ?? typeof(IN).GetCustomAttribute<LexerAttribute>();
@@ -143,7 +143,7 @@ public static BuildResult<ILexer<IN>> BuildLexer<IN>(BuildResult<ILexer<IN>> res
             return result;
         }
 
-        private static List<Token<IN>> LabelTokens<IN>(string lang, List<Token<IN>> tokens, Dictionary<IN, Dictionary<string, string>> labels) where IN : struct
+        private static List<Token<IN>> LabelTokens<IN>(string lang, List<Token<IN>> tokens, Dictionary<IN, Dictionary<string, string>> labels) where IN : struct, Enum
         {
             List<Token<IN>> labeledTokens;
             labeledTokens = tokens.Select(token =>
@@ -175,7 +175,7 @@ private static BuildResult<ILexer<IN>> Build<IN>(
             string lang = null,
             IList<string> explicitTokens = null, Dictionary<IN, List<CommentAttribute>> comments = null,
             Func<KeyValuePair<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)>, (List<string>
-                modes, bool isModePopper, string pushTarget)> modesGetter = null,  Func<List<(IN tokenId, Func<Token<IN>, Token<IN>> callback)>> callbacksGetter = null) where IN : struct
+                modes, bool isModePopper, string pushTarget)> modesGetter = null,  Func<List<(IN tokenId, Func<Token<IN>, Token<IN>> callback)>> callbacksGetter = null) where IN : struct, Enum
         {
             var hasRegexLexemes = IsRegexLexer<IN>(attributes);
             var hasGenericLexemes = IsGenericLexer<IN>(attributes);
@@ -214,7 +214,7 @@ private static BuildResult<ILexer<IN>> Build<IN>(
 
         private static BuildResult<ILexer<IN>> SetLabels<IN>(
             Dictionary<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)> attributes,
-            BuildResult<ILexer<IN>> result) where IN : struct
+            BuildResult<ILexer<IN>> result) where IN : struct, Enum
         {
             if (result.IsOk && result.Result != null)
             {
@@ -269,7 +269,7 @@ private static bool IsGenericLexer<IN>(Dictionary<IN, (List<LexemeAttribute> lex
         private static BuildResult<ILexer<IN>> BuildRegexLexer<IN>(
             Dictionary<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)> attributes,
             string lang,
-            BuildResult<ILexer<IN>> result) where IN : struct
+            BuildResult<ILexer<IN>> result) where IN : struct, Enum
         {
             var lexer = new Lexer<IN>()
             {
@@ -314,7 +314,7 @@ private static BuildResult<ILexer<IN>> BuildRegexLexer<IN>(
 
 
         private static Dictionary<string, IDictionary<IN, List<LexemeAttribute>>> GetSubLexers<IN>(
-            IDictionary<IN, (List<LexemeAttribute> lexemes,List<LexemeLabelAttribute> labels)> attributes, Func<KeyValuePair<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)>,(List<string> modes, bool isModePopper, string pushTarget)> modesGetter = null) where IN : struct
+            IDictionary<IN, (List<LexemeAttribute> lexemes,List<LexemeLabelAttribute> labels)> attributes, Func<KeyValuePair<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)>,(List<string> modes, bool isModePopper, string pushTarget)> modesGetter = null) where IN : struct, Enum
         {
             if (modesGetter == null)
             {
@@ -354,7 +354,7 @@ private static Dictionary<string, IDictionary<IN, List<LexemeAttribute>>> GetSub
             return subLexers;
         }
 
-        private static (List<string> modes,bool isModePopper, string pushTarget) GetModesForLexeme<IN>(KeyValuePair<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)> attribute) where IN : struct
+        private static (List<string> modes,bool isModePopper, string pushTarget) GetModesForLexeme<IN>(KeyValuePair<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)> attribute) where IN : struct, Enum
         {
             (List<string> modes, bool isModePopper, string pushTarget) result = (new List<string>(), false, null);
             if (attribute.Key is Enum enumValue)
@@ -403,7 +403,7 @@ private static (List<string> modes,bool isModePopper, string pushTarget) GetMode
 
         private static (GenericLexer<IN>.Config, GenericToken[]) GetConfigAndGenericTokens<IN>(
             IDictionary<IN, List<LexemeAttribute>> attributes, LexerAttribute lexerAttribute = null)
-            where IN : struct
+            where IN : struct, Enum
         {
             var config = new GenericLexer<IN>.Config();
             if (lexerAttribute != null)
@@ -460,7 +460,7 @@ private static IEnumerable<char[]> ParseIdentifierPattern(string pattern)
         }
 
         private static NodeCallback<GenericToken> GetCallbackSingle<IN>(IN token, int channel)
-            where IN : struct
+            where IN : struct, Enum
         {
             NodeCallback<GenericToken> callback = match =>
             {
@@ -474,7 +474,7 @@ private static NodeCallback<GenericToken> GetCallbackSingle<IN>(IN token, int ch
         }
 
         private static NodeCallback<GenericToken> GetCallbackMulti<IN>(IN token, int channel)
-            where IN : struct
+            where IN : struct, Enum
         {
             NodeCallback<GenericToken> callbackMulti = match =>
             {
@@ -494,7 +494,7 @@ public static BuildResult<ILexer<IN>> BuildGenericSubLexers<IN>(
             IList<string> explicitTokens = null, LexerAttribute lexerAttribute = null,
             Dictionary<IN, List<CommentAttribute>> comments = null,
             Func<KeyValuePair<IN, (List<LexemeAttribute> lexemes, List<LexemeLabelAttribute> labels)>, (List<string>
-                modes, bool isModePopper, string pushTarget)> modesGetter = null, Func<List<(IN tokenId, Func<Token<IN>, Token<IN>> callback) >> callbacksGetter = null) where IN : struct
+                modes, bool isModePopper, string pushTarget)> modesGetter = null, Func<List<(IN tokenId, Func<Token<IN>, Token<IN>> callback) >> callbacksGetter = null) where IN : struct, Enum
         {
             GenericLexer<IN> genLexer = null;
             var subLexers = GetSubLexers(attributes, modesGetter);
@@ -534,7 +534,7 @@ public static BuildResult<ILexer<IN>> BuildGenericSubLexers<IN>(
         private static BuildResult<ILexer<IN>> BuildGenericLexer<IN>(IDictionary<IN, List<LexemeAttribute>> attributes,
             Action<IN, LexemeAttribute, GenericLexer<IN>> extensionBuilder, BuildResult<ILexer<IN>> result, string lang,
             LexerAttribute lexerAttribute = null, Dictionary<IN, List<CommentAttribute>> comments = null,
-            IList<string> explicitTokens = null) where IN : struct
+            IList<string> explicitTokens = null) where IN : struct, Enum
         {
             result = CheckStringAndCharTokens<IN>(attributes, result, lang);
             var (config, tokens) = GetConfigAndGenericTokens<IN>(attributes, lexerAttribute);
@@ -783,7 +783,7 @@ private static (string delimiter, string escape, bool doEscape) GetDelimiters(Le
 
         private static BuildResult<ILexer<IN>> CheckStringAndCharTokens<IN>(
             IDictionary<IN, List<LexemeAttribute>> attributes, BuildResult<ILexer<IN>> result, string lang)
-            where IN : struct
+            where IN : struct, Enum
         {
             var allLexemes = attributes.Values.SelectMany<List<LexemeAttribute>, LexemeAttribute>(a => a);
 
@@ -809,7 +809,7 @@ private static BuildResult<ILexer<IN>> CheckStringAndCharTokens<IN>(
 
 
         private static Dictionary<IN, List<CommentAttribute>> GetCommentsAttribute<IN>(BuildResult<ILexer<IN>> result,
-            string lang) where IN : struct
+            string lang) where IN : struct, Enum
         {
             var attributes = new Dictionary<IN, List<CommentAttribute>>();
 
@@ -861,7 +861,7 @@ private static Dictionary<IN, List<CommentAttribute>> GetCommentsAttribute<IN>(B
         }
 
         private static void AddExtensions<IN>(Dictionary<IN, LexemeAttribute> extensions,
-            Action<IN, LexemeAttribute, GenericLexer<IN>> extensionBuilder, GenericLexer<IN> lexer) where IN : struct
+            Action<IN, LexemeAttribute, GenericLexer<IN>> extensionBuilder, GenericLexer<IN> lexer) where IN : struct, Enum
         {
             if (extensionBuilder != null)
             {

src/sly/lexer/LexerResult.cs

@@ -1,9 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 namespace sly.lexer
 {
-    public class LexerResult<IN> where IN : struct
+    public class LexerResult<IN> where IN : struct, Enum
     {
         public bool IsError { get; set; }
 

src/sly/lexer/Token.cs

@@ -15,7 +15,7 @@ public enum CommentType
     }
 
     [DebuggerDisplay("{TokenID} : {Value} - {IsExplicit}")]
-    public class Token<T> where T:struct
+    public class Token<T> where T:struct, Enum
     {
 
 

src/sly/lexer/TokenChannel.cs

@@ -2,10 +2,11 @@
 using System.Text;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System;
 
 namespace sly.lexer
 {
-    public class TokenChannel<IN>  where IN : struct
+    public class TokenChannel<IN>  where IN : struct, Enum
     {
         public readonly List<Token<IN>> Tokens;