remove do not ignore attribute on comments as it does not make sense …

…now we have channels
b3b00 · Dec 19, 2024 · 792d9e0 · 792d9e0
1 parent d233f94
commit 792d9e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/src/sly/lexer/GenericLexer.cs b/src/sly/lexer/GenericLexer.cs
@@ -1248,7 +1248,6 @@ public Token<IN> Transcode(FSMMatch<GenericToken> match)
             tok.IsIndent = match.IsIndent;
             tok.IsUnIndent = match.IsUnIndent;
             tok.IndentationLevel = match.IndentationLevel;
-            tok.Notignored = match.Result.Notignored;
             tok.Channel = match.Result.Channel;
             tok.DecimalSeparator = match.DecimalSeparator;
             tok.DateTimeValue = match.DateTimeValue;

diff --git a/src/sly/lexer/LexerBuilder.cs b/src/sly/lexer/LexerBuilder.cs
@@ -412,29 +412,27 @@ private static IEnumerable<char[]> ParseIdentifierPattern(string pattern)
             }
         }
 
-        private static NodeCallback<GenericToken> GetCallbackSingle<IN>(IN token, bool doNotIgnore, int channel)
+        private static NodeCallback<GenericToken> GetCallbackSingle<IN>(IN token, int channel)
             where IN : struct
         {
             NodeCallback<GenericToken> callback = match =>
             {
                 match.Properties[GenericLexer<IN>.DerivedToken] = token;
                 match.Result.IsComment = true;
                 match.Result.CommentType = CommentType.Single;
-                match.Result.Notignored = doNotIgnore;
                 match.Result.Channel = channel;
                 return match;
             };
             return callback;
         }
 
-        private static NodeCallback<GenericToken> GetCallbackMulti<IN>(IN token, bool doNotIgnore, int channel)
+        private static NodeCallback<GenericToken> GetCallbackMulti<IN>(IN token, int channel)
             where IN : struct
         {
             NodeCallback<GenericToken> callbackMulti = match =>
             {
                 match.Properties[GenericLexer<IN>.DerivedToken] = token;
                 match.Result.IsComment = true;
-                match.Result.Notignored = doNotIgnore;
                 match.Result.CommentType = CommentType.Multi;
                 match.Result.Channel = channel;
                 return match;
@@ -636,8 +634,7 @@ private static BuildResult<ILexer<IN>> BuildGenericLexer<IN>(IDictionary<IN, Lis
                             fsmBuilder.ConstantTransition(commentAttr.SingleLineCommentStart);
                             fsmBuilder.Mark(GenericLexer<IN>.single_line_comment_start);
                             fsmBuilder.End(GenericToken.Comment);
-                            fsmBuilder.CallBack(GetCallbackSingle<IN>(comment.Key, commentAttr.DoNotIgnore,
-                                commentAttr.Channel));
+                            fsmBuilder.CallBack(GetCallbackSingle<IN>(comment.Key, commentAttr.Channel));
                         }
 
                         var hasMultiLine = !string.IsNullOrWhiteSpace(commentAttr.MultiLineCommentStart);
@@ -650,8 +647,7 @@ private static BuildResult<ILexer<IN>> BuildGenericLexer<IN>(IDictionary<IN, Lis
                             fsmBuilder.ConstantTransition(commentAttr.MultiLineCommentStart);
                             fsmBuilder.Mark(GenericLexer<IN>.multi_line_comment_start);
                             fsmBuilder.End(GenericToken.Comment);
-                            fsmBuilder.CallBack(GetCallbackMulti(comment.Key, commentAttr.DoNotIgnore,
-                                commentAttr.Channel));
+                            fsmBuilder.CallBack(GetCallbackMulti(comment.Key, commentAttr.Channel));
                         }
                     }
                 }

diff --git a/src/sly/lexer/Token.cs b/src/sly/lexer/Token.cs
@@ -26,8 +26,7 @@ public class Token<T> where T:struct
         public char DecimalSeparator = '.';
         [JsonIgnore]
         public char CharDelimiter ='\'';
-        [JsonIgnore]
-        public bool Notignored;
+
 
         [JsonIgnore] private string _hexaPrefix = "0x";
 

diff --git a/src/sly/lexer/attributes/CommentsAttribute.cs b/src/sly/lexer/attributes/CommentsAttribute.cs
@@ -12,7 +12,6 @@ public class CommentAttribute : Attribute
 
         public string SingleLineCommentStart;
 
-        public bool DoNotIgnore = false;
 
         public int Channel = 1;
 
@@ -22,7 +21,7 @@ public CommentAttribute(string singleLineStart, string multiLineStart, string mu
             SingleLineCommentStart = singleLineStart;
             MultiLineCommentStart = multiLineStart;
             MultiLineCommentEnd = multiLineEnd;
-            DoNotIgnore = doNotIgnore;
+            //DoNotIgnore = doNotIgnore;
             Channel = channel;
         }
     }