Merge 84dba0e into 28275f5

b3b00 · Jun 7, 2019 · 292947b · 292947b
2 parents 28275f5 + 84dba0e
commit 292947b
Show file tree

Hide file tree

Showing 17 changed files with 324 additions and 196 deletions.
diff --git a/ParserTests/comments/CommentsTestAlternative.cs b/ParserTests/comments/CommentsTestAlternative.cs
@@ -34,7 +34,9 @@ public void NotEndingMultiComment()
 2 /* not ending
 comment";
 
-            var tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(4, tokens.Count);
 
@@ -73,7 +75,9 @@ public void TestGenericMultiLineComment()
 2 /* multi line 
 comment on 2 lines */ 3.0";
 
-            var tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(5, tokens.Count);
 
@@ -111,9 +115,11 @@ public void TestGenericSingleLineComment()
 
             var dump = lexer.ToString();
 
-            var tokens = lexer.Tokenize(@"1
+            var r = lexer.Tokenize(@"1
 2 // single line comment
-3.0").ToList();
+3.0");
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(5, tokens.Count);
 
@@ -154,7 +160,9 @@ public void TestInnerMultiComment()
 4
             ";
 
-            var tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(6, tokens.Count);
 
@@ -199,8 +207,9 @@ public void TestMixedEOLComment()
 
             var dump = lexer.ToString();
             var code = "1\n2\r\n/* multi line \rcomment on 2 lines */ 3.0";
-            List<Token<CommentsTokenAlternative>> tokens = null;
-            tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(5, tokens.Count);
 

diff --git a/ParserTests/comments/CommentsTestGeneric.cs b/ParserTests/comments/CommentsTestGeneric.cs
@@ -33,7 +33,9 @@ public void NotEndingMultiComment()
 2 /* not ending
 comment";
 
-            var tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(4, tokens.Count);
 
@@ -72,7 +74,9 @@ public void TestGenericMultiLineComment()
 2 /* multi line 
 comment on 2 lines */ 3.0";
 
-            var tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(5, tokens.Count);
 
@@ -111,9 +115,11 @@ public void TestGenericSingleLineComment()
             var dump = lexer.ToString();
 
 
-            var tokens = lexer.Tokenize(@"1
+            var r = lexer.Tokenize(@"1
 2 // single line comment
-3.0").ToList();
+3.0");
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(5, tokens.Count);
 
@@ -156,7 +162,9 @@ public void TestInnerMultiComment()
 4
             ";
 
-            var tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(6, tokens.Count);
 
@@ -203,8 +211,10 @@ public void TestMixedEOLComment()
 
             var dump = lexer.ToString();
             var code = "1\n2\r\n/* multi line \rcomment on 2 lines */ 3.0";
-            List<Token<CommentsToken>> tokens = null;
-            tokens = lexer.Tokenize(code).ToList();
+
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(5, tokens.Count);
 

diff --git a/ParserTests/comments/MultiLineCommentsTest.cs b/ParserTests/comments/MultiLineCommentsTest.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using sly.buildresult;
@@ -33,7 +34,9 @@ public void NotEndingMultiComment()
 2 /* not ending
 comment";
 
-            var tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(4, tokens.Count);
 
@@ -72,7 +75,9 @@ public void TestGenericMultiLineComment()
 2 /* multi line 
 comment on 2 lines */ 3.0";
 
-            var tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(5, tokens.Count);
 
@@ -110,13 +115,11 @@ public void TestGenericSingleLineComment()
 
             var dump = lexer.ToString();
 
-            var error = Assert.Throws<LexerException>(() =>
-            {
-                lexer.Tokenize(@"1
+            var r = lexer.Tokenize(@"1
 2 // single line comment
 3.0");
-            });
-            Assert.Equal('/', error.Error.UnexpectedChar);
+            Assert.True(r.IsError);
+            Assert.Equal('/', r.Error.UnexpectedChar);
         }
 
         [Fact]
@@ -133,8 +136,9 @@ public void TestInnerMultiComment()
 4
             ";
 
-            var tokens = lexer.Tokenize(code).ToList();
-
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
             Assert.Equal(6, tokens.Count);
 
             var token1 = tokens[0];
@@ -178,8 +182,9 @@ public void TestMixedEOLComment()
 
             var dump = lexer.ToString();
             var code = "1\n2\r\n/* multi line \rcomment on 2 lines */ 3.0";
-            List<Token<MultiLineCommentsToken>> tokens = null;
-            tokens = lexer.Tokenize(code).ToList();
+            var r = lexer.Tokenize(code);
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(5, tokens.Count);
 

diff --git a/ParserTests/comments/SingleLineCommentsTest.cs b/ParserTests/comments/SingleLineCommentsTest.cs
@@ -30,13 +30,12 @@ public void TestGenericMultiLineCommentWithSingleLineComment()
 
             var dump = lexer.ToString();
 
-            var error = Assert.Throws<LexerException>(() =>
-            {
-                lexer?.Tokenize(@"1
+            var r =lexer?.Tokenize(@"1
 2 /* multi line 
-comment on 2 lines */ 3.0").ToList();
-            });
-            Assert.Equal('*', error.Error.UnexpectedChar);
+comment on 2 lines */ 3.0");
+            Assert.True(r.IsError);
+            var tokens = r.Tokens;
+            Assert.Equal('*', r.Error.UnexpectedChar);
         }
 
         [Fact]
@@ -48,9 +47,11 @@ public void TestGenericSingleLineComment()
 
             var dump = lexer.ToString();
 
-            var tokens = lexer.Tokenize(@"1
+            var r = lexer.Tokenize(@"1
 2 // single line comment
-3.0").ToList();
+3.0");
+            Assert.True(r.IsOk);
+            var tokens = r.Tokens;
 
             Assert.Equal(5, tokens.Count);