Read the calculator's EGT file from the sample project's Base-64 grammar.

The hell of tinkering it needed!

Author: teo-tsirpanis

Diff for: sample/Farkle.Calculator/Program.fs

@@ -6,6 +6,7 @@
 open Farkle
 open System
 open Farkle.PostProcessor
+open SimpleMaths
 
 let inline prettyPrintResult x =
     match x with

Diff for: sample/Farkle.Samples.FSharp/Farkle.Samples.FSharp.fsproj

@@ -3,9 +3,7 @@
     <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <!-- I added the calculator here as well, to demonstrate that it works with many Farkle items.
-    It doesn't have anything to do with JSON, but renaming the project is too much of an effort. -->
-    <Farkle Include="..\SimpleMaths.egt" Namespace="SimpleMaths" />
+    <Farkle Include="SimpleMaths.egt" Namespace="SimpleMaths" />
     <Compile Include="SimpleMaths.g.fs" />
     <Compile Include="JSON.fs" />
     <Compile Include="GOLDMetaLanguage.fs" />

Diff for: sample/SimpleMaths.egt renamed to sample/Farkle.Samples.FSharp/SimpleMaths.egt

@@ -3,8 +3,9 @@
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
-module SimpleMaths
+// Having a midule named SimpleMaths effectively
+// hides the SimpleMaths.Definitions namespace.
+module SimpleMaths.SimpleMaths
 
 open Farkle
 open Farkle.Builder

Diff for: sample/Farkle.Samples.FSharp/SimpleMaths.fs

@@ -15,7 +15,7 @@ open Farkle.Collections
 open Farkle.Grammar
 open Farkle.IO
 open FsCheck
-open SimpleMaths
+open SimpleMaths.SimpleMaths
 open System.Collections.Generic
 open System.IO
 open System.Text

Diff for: sample/SimpleMaths.grm renamed to sample/Farkle.Samples.FSharp/SimpleMaths.grm

@@ -11,6 +11,7 @@ open Farkle.Builder
 open Farkle.Grammar
 open Farkle.PostProcessor
 open Farkle.Tests
+open SimpleMaths
 open System.Collections.Generic
 open System.Collections.Immutable
 
@@ -110,16 +111,20 @@ let rfIgnore x = RuntimeFarkle.changePostProcessor PostProcessor.syntaxCheck x
 [<Tests>]
 let farkleGOLDGrammarEquivalenceTests =
     [
-        "the calculator", rfIgnore SimpleMaths.int, "SimpleMaths.egt"
-        "the F# JSON parser", rfIgnore JSON.FSharp.Language.runtime, "JSON.egt"
-        "the C# JSON parser", rfIgnore JSON.CSharp.Language.Runtime, "JSON.egt"
-        "the language of balanced parentheses", balancedParentheses, "balanced-parentheses.egt"
-        "GOLD Meta-Language", rfIgnore GOLDMetaLanguage.runtime, "gml.egt"
+        "the calculator", rfIgnore SimpleMaths.int, SimpleMaths.Definitions.Grammar.asBase64
+        "the F# JSON parser", rfIgnore JSON.FSharp.Language.runtime, "./JSON.egt"
+        "the C# JSON parser", rfIgnore JSON.CSharp.Language.Runtime, "./JSON.egt"
+        "the language of balanced parentheses", balancedParentheses, "./balanced-parentheses.egt"
+        "GOLD Meta-Language", rfIgnore GOLDMetaLanguage.runtime, "./gml.egt"
     ]
     |> List.map (fun (name, gFarkle, egt) ->
         test (sprintf "Farkle and GOLD Parser generate an equivalent LALR parser for %s" name) {
             let gFarkle = extractGrammar gFarkle
-            let gGold = loadGrammar egt
+            let gGold =
+                if egt.StartsWith("./") then
+                    loadGrammar egt
+                else
+                    GOLDParser.EGT.ofBase64String egt
             checkParserEquivalence
                 (gFarkle.Productions, gFarkle.LALRStates)
                 (gGold.Productions, gGold.LALRStates)

Diff for: sample/JSON.egt

@@ -13,6 +13,7 @@ open Farkle.IO
 open Farkle.JSON
 open Farkle.Parser
 open Farkle.Tests
+open SimpleMaths
 open System.IO
 
 let logger = Log.create "Parser tests"