WIP: Fixed comments intendation and handling in resolvers

elamaunt · Jun 21, 2021 · aaa6898 · aaa6898
1 parent 0f2c44e
commit aaa6898
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 1 deletion.
diff --git a/src/GDShrapt.Reader/Expressions/GDExpression.cs b/src/GDShrapt.Reader/Expressions/GDExpression.cs
@@ -135,5 +135,11 @@ public bool IsHigherPriorityThan(GDExpression other, GDSideType consideringSide)
 
             return false;
         }
+
+        internal override void HandleSharpChar(GDReadingState state)
+        {
+            state.Pop();
+            state.PassSharpChar();
+        }
     }
 }
diff --git a/src/GDShrapt.Reader/Resolvers/GDClassAtributesResolver.cs b/src/GDShrapt.Reader/Resolvers/GDClassAtributesResolver.cs
@@ -44,6 +44,21 @@ internal override void HandleNewLineAfterIntendation(GDReadingState state)
             state.PassNewLine();
         }
 
+        internal override void HandleSharpCharAfterIntendation(GDReadingState state)
+        {
+            if (_sequenceBuilder?.Length > 0)
+            {
+                var sequence = _sequenceBuilder.ToString();
+                ResetSequence();
+                Complete(state, sequence);
+                state.PassSharpChar();
+                return;
+            }
+
+            Owner.HandleReceivedToken(state.Push(new GDComment()));
+            state.PassSharpChar();
+        }
+
         private void ResetSequence()
         {
             _sequenceBuilder.Clear();

diff --git a/src/GDShrapt.Reader/Resolvers/GDClassMembersResolver.cs b/src/GDShrapt.Reader/Resolvers/GDClassMembersResolver.cs
@@ -60,6 +60,21 @@ internal override void HandleNewLineAfterIntendation(GDReadingState state)
             state.PassNewLine();
         }
 
+        internal override void HandleSharpCharAfterIntendation(GDReadingState state)
+        {
+            if (_sequenceBuilder?.Length > 0)
+            {
+                var sequence = _sequenceBuilder.ToString();
+                ResetSequence();
+                Complete(state, sequence);
+                state.PassSharpChar();
+                return;
+            }
+
+            Owner.HandleReceivedToken(state.Push(new GDComment()));
+            state.PassSharpChar();
+        }
+
         private void ResetSequence()
         {
             _sequenceBuilder.Clear();

diff --git a/src/GDShrapt.Reader/Resolvers/GDExpressionResolver.cs b/src/GDShrapt.Reader/Resolvers/GDExpressionResolver.cs
@@ -284,6 +284,13 @@ internal override void HandleNewLineChar(GDReadingState state)
             state.PassNewLine();
         }
 
+        internal override void HandleSharpChar(GDReadingState state)
+        {
+            if (!CheckKeywords(state))
+                CompleteExpression(state);
+            state.PassSharpChar();
+        }
+
         private void CompleteExpression(GDReadingState state)
         {
             if (_isCompleted)

diff --git a/src/GDShrapt.Reader/Resolvers/GDIntendedResolver.cs b/src/GDShrapt.Reader/Resolvers/GDIntendedResolver.cs
@@ -32,6 +32,7 @@ internal sealed override void HandleChar(char c, GDReadingState state)
 
         internal abstract void HandleCharAfterIntendation(char c, GDReadingState state);
         internal abstract void HandleNewLineAfterIntendation(GDReadingState state);
+        internal abstract void HandleSharpCharAfterIntendation(GDReadingState state);
 
         bool HandleIntendation(char c, GDReadingState state)
         {
@@ -112,7 +113,7 @@ internal sealed override void HandleNewLineChar(GDReadingState state)
         internal override void HandleSharpChar(GDReadingState state)
         {
             if (_lineIntendationEnded)
-                base.HandleSharpChar(state);
+                HandleSharpCharAfterIntendation(state);
             else
             {
                 _inComment = true;
@@ -178,6 +179,7 @@ protected void SendIntendationTokensToOwner()
 
             if (space != null)
             {
+                space.Complete();
                 Owner.HandleReceivedToken(new GDIntendation()
                 {
                     Sequence = space.Sequence,

diff --git a/src/GDShrapt.Reader/Resolvers/GDIntendedSequenceResolver.cs b/src/GDShrapt.Reader/Resolvers/GDIntendedSequenceResolver.cs
@@ -54,5 +54,19 @@ internal override void ForceComplete(GDReadingState state)
             for (int i = 0; i < Index - 1; i++)
                 state.PassChar(s[i]);
         }
+
+        internal override void HandleSharpCharAfterIntendation(GDReadingState state)
+        {
+            var s = Sequence;
+            state.Pop();
+            OnFail(state);
+
+            PassIntendationSequence(state);
+
+            for (int i = 0; i < Index - 1; i++)
+                state.PassChar(s[i]);
+
+            state.PassSharpChar();
+        }
     }
 }
diff --git a/src/GDShrapt.Reader/Resolvers/GDMatchCasesResolver.cs b/src/GDShrapt.Reader/Resolvers/GDMatchCasesResolver.cs
@@ -39,6 +39,12 @@ internal override void HandleNewLineAfterIntendation(GDReadingState state)
             state.PassNewLine();
         }
 
+        internal override void HandleSharpCharAfterIntendation(GDReadingState state)
+        {
+            Owner.HandleReceivedToken(state.Push(new GDComment()));
+            state.PassSharpChar();
+        }
+
         internal override void ForceComplete(GDReadingState state)
         {
             if (_lastSpace != null)

diff --git a/src/GDShrapt.Reader/Resolvers/GDStatementsResolver.cs b/src/GDShrapt.Reader/Resolvers/GDStatementsResolver.cs
@@ -80,6 +80,21 @@ internal override void HandleNewLineAfterIntendation(GDReadingState state)
             state.PassNewLine();
         }
 
+        internal override void HandleSharpCharAfterIntendation(GDReadingState state)
+        {
+            if (_sequenceBuilder.Length > 0)
+            {
+                var sequence = _sequenceBuilder.ToString();
+                _sequenceBuilder.Clear();
+                CompleteAsStatement(state, sequence);
+                state.PassSharpChar();
+                return;
+            }
+
+            Owner.HandleReceivedToken(state.Push(new GDComment()));
+            state.PassSharpChar();
+        }
+
         private GDStatement CompleteAsStatement(GDReadingState state, string sequence)
         {
             _sequenceBuilder.Clear();