Remove the block comments from the SimpleMaths grammar because they b…

…reak the tests and create a vicious cycle by not allowing the release of the version that would fix the bug.
teo-tsirpanis · Aug 20, 2019 · 2ecc66d · 2ecc66d
1 parent e704e5f
commit 2ecc66d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/sample/SimpleMaths.egt b/sample/SimpleMaths.egt
diff --git a/sample/SimpleMaths.grm b/sample/SimpleMaths.grm
@@ -5,11 +5,6 @@
 
 "Start Symbol" = <Expression>
 
-Comment Line = '//'
-
-Comment Start = '/*'
-Comment End = '*/'
-
 ! -------------------------------------------------
 ! Terminals
 ! -------------------------------------------------
@@ -21,18 +16,18 @@ Number = {Number}+
 ! -------------------------------------------------
 
 ! The grammar starts below
-<Expression>  ::= <Add Exp>
+<Expression>  ::= <Add Exp> 
 
 <Add Exp>     ::= <Add Exp> '+' <Mult Exp>
                |  <Add Exp> '-' <Mult Exp>
-               |  <Mult Exp>
+               |  <Mult Exp> 
 
-<Mult Exp>    ::= <Mult Exp> '*' <Negate Exp>
-               |  <Mult Exp> '/' <Negate Exp>
-               |  <Negate Exp>
+<Mult Exp>    ::= <Mult Exp> '*' <Negate Exp> 
+               |  <Mult Exp> '/' <Negate Exp> 
+               |  <Negate Exp> 
 
-<Negate Exp>  ::= '-' <Value>
-               |  <Value>
+<Negate Exp>  ::= '-' <Value> 
+               |  <Value> 
 
 !Add more values to the rule below - as needed
 

diff --git a/tests/Farkle.Tests/ParserTests.fs b/tests/Farkle.Tests/ParserTests.fs
@@ -43,12 +43,12 @@ let tests = testList "Parser tests" [
     test "Parsing a simple mathematical expression behaves correctly and consistently up to the parsing log" {
         let grammar = SimpleMaths.int.TryGetGrammar() |> returnOrFail "%O"
         let reduce idx = ParseMessage.Reduction grammar.Productions.[int idx]
-        let numberTerminal = Terminal(14u, "Number")
+        let numberTerminal = Terminal(9u, "Number")
 
         let expectedLog = [
             ParseMessage.TokenRead {Symbol = numberTerminal; Position = Position.Create 1UL 1UL 0UL; Data = 475}
             ParseMessage.Shift 3u
-            ParseMessage.TokenRead {Symbol = Terminal(13u, "+"); Position = Position.Create 1UL 5UL 4UL; Data = null}
+            ParseMessage.TokenRead {Symbol = Terminal(8u, "+"); Position = Position.Create 1UL 5UL 4UL; Data = null}
             reduce 9u
             reduce 8u
             reduce 6u
@@ -70,11 +70,6 @@ let tests = testList "Parser tests" [
         Expect.sequenceEqual actualLog expectedLog "The parsing log is different than the usual"
     }
 
-    test "Parsing a mathematical expression with comments works well" {
-        let num = RuntimeFarkle.parse SimpleMaths.int "/*I guess that */ 1 + 1\n// Is equal to two"
-        Expect.equal num (Ok 2) "Parsing a mathematical expression with comments failed"
-    }
-
     testProperty "The JSON parser works well" (fun json ->
         let jsonAsString = Chiron.Formatting.Json.format json
         let cs =