#3 Fix wrong stream length bug

NoobDevTv · Jan 9, 2018 · dcf6c4e · dcf6c4e
1 parent 839fd66
commit dcf6c4e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Arrow.Core/Parsing/Definition/ScopeSyntax.cs b/Arrow.Core/Parsing/Definition/ScopeSyntax.cs
@@ -56,7 +56,7 @@ public override bool TryParse(SyntaxStream stream, Scanner scanner)
                         }
                         else
                         {
-                           Members.AddRange(SearchMember(1, i, stream, scanner));
+                            Members.AddRange(SearchMember(1, i, stream, scanner));
                         }
 
 
@@ -75,12 +75,13 @@ private IEnumerable<Syntax> SearchMember(int start, int end, SyntaxStream stream
         {
             int index = start;
 
-            while(scanner.TryScan(stream.Skip(index),out Syntax member))
+            //TODO:Skip to Get
+            while (index < end && scanner.TryScan(stream.Get(index, end - index), out Syntax member))
             {
                 index += member.Length;
                 yield return member;
 
-                if(index > end)
+                if (index > end)
                 {
                     break;
                 }

diff --git a/Arrow.Core/Parsing/Definition/StatmentSyntax.cs b/Arrow.Core/Parsing/Definition/StatmentSyntax.cs
@@ -26,10 +26,10 @@ public override bool TryParse(SyntaxStream stream, Scanner scanner)
 
             for (int i = 0; i < stream.Count; i++)
             {
-                if(stream[i].Name == "CodeLineEnd")
+                if (stream[i].Name == "CodeLineEnd")
                 {
-                    Statments.Add(scanner.Scan(stream.Get(lastPosition,i-lastPosition)));
-                    lastPosition = i +1 ;
+                    Statments.Add(scanner.Scan(stream.Get(lastPosition, i - lastPosition)));
+                    lastPosition = i + 1;
                     result = true;
                 }
             }

diff --git a/Arrow.Core/Parsing/SyntaxStream.cs b/Arrow.Core/Parsing/SyntaxStream.cs
@@ -39,6 +39,9 @@ public SyntaxStream(IEnumerable<Token> tokenList)
         }
         private SyntaxStream(SyntaxStream syntaxStream, int index, int length)
         {
+            if (index + length > syntaxStream.Count)
+                throw new ArgumentOutOfRangeException(nameof(length));
+
             baseStream = syntaxStream;
             this.index = index;
             this.length = length;