Start work on code generation

escalier-next.sln

@@ -17,6 +17,10 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Escalier.TypeChecker", "src
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Escalier.TypeChecker.Tests", "src\Escalier.TypeChecker.Tests\Escalier.TypeChecker.Tests.fsproj", "{F3784E73-1D13-4EAD-8D18-CD6BDF3BC69C}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Escalier.Codegen", "src\Escalier.Codegen\Escalier.Codegen.fsproj", "{5D437CF2-4CBD-4912-8E49-5514E17A8511}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Escalier.Codegen.Tests", "src\Escalier.Codegen.Tests\Escalier.Codegen.Tests.fsproj", "{50C20403-EB03-4D2B-941B-55320C1EB970}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -50,6 +54,14 @@ Global
 		{F3784E73-1D13-4EAD-8D18-CD6BDF3BC69C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F3784E73-1D13-4EAD-8D18-CD6BDF3BC69C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3784E73-1D13-4EAD-8D18-CD6BDF3BC69C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D437CF2-4CBD-4912-8E49-5514E17A8511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D437CF2-4CBD-4912-8E49-5514E17A8511}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D437CF2-4CBD-4912-8E49-5514E17A8511}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D437CF2-4CBD-4912-8E49-5514E17A8511}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50C20403-EB03-4D2B-941B-55320C1EB970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50C20403-EB03-4D2B-941B-55320C1EB970}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50C20403-EB03-4D2B-941B-55320C1EB970}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50C20403-EB03-4D2B-941B-55320C1EB970}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{ECDE29DB-D373-48EF-AAFB-5E74CC122047} = {5AD00356-5D98-4E4F-90BC-6240E4AAF017}
@@ -58,5 +70,7 @@ Global
 		{27EED578-24C8-4BAE-90C7-5376CE92E437} = {5AD00356-5D98-4E4F-90BC-6240E4AAF017}
 		{8AD7FF86-E483-42D0-A71D-52754B2BF3A5} = {5AD00356-5D98-4E4F-90BC-6240E4AAF017}
 		{F3784E73-1D13-4EAD-8D18-CD6BDF3BC69C} = {5AD00356-5D98-4E4F-90BC-6240E4AAF017}
+		{5D437CF2-4CBD-4912-8E49-5514E17A8511} = {5AD00356-5D98-4E4F-90BC-6240E4AAF017}
+		{50C20403-EB03-4D2B-941B-55320C1EB970} = {5AD00356-5D98-4E4F-90BC-6240E4AAF017}
 	EndGlobalSection
 EndGlobal

src/Escalier.Codegen.Tests/Escalier.Codegen.Tests.fsproj

@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+
+        <IsPackable>false</IsPackable>
+        <GenerateProgramFile>false</GenerateProgramFile>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Include="Tests.fs"/>
+        <Compile Include="Program.fs"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="FsToolkit.ErrorHandling" Version="4.10.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
+        <PackageReference Include="Verify.Xunit" Version="22.1.4"/>
+        <PackageReference Include="xunit" Version="2.5.2"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Escalier.Codegen\Escalier.Codegen.fsproj"/>
+    </ItemGroup>
+
+</Project>

src/Escalier.Codegen.Tests/Program.fs

@@ -0,0 +1 @@
+module Program = let [<EntryPoint>] main _ = 0

src/Escalier.Codegen.Tests/Tests.fs

@@ -0,0 +1,245 @@
+[<VerifyXunit.UsesVerify>]
+module Tests
+
+open Xunit
+open VerifyXunit
+open VerifyTests
+open FsToolkit.ErrorHandling
+
+open Escalier.Codegen.TypeScript
+open Escalier.Codegen.Printer
+open Escalier.Codegen.Codegen
+open Escalier.Parser
+
+
+let settings = VerifySettings()
+settings.UseDirectory("snapshots")
+settings.DisableDiff()
+
+let printCtx: PrintCtx = { Indent = 0; Precedence = 0 }
+
+[<Fact>]
+let CodegenIdent () =
+  let ident: Identifier = { Name = "foo"; Loc = None }
+  let code = printExpr printCtx (Expression.Identifier ident)
+
+  Assert.Equal("foo", code.ToString())
+
+[<Fact>]
+let CodegenLiteral () =
+  let lit: Literal =
+    { Value = LiteralValue.Number 1.23
+      Loc = None }
+
+  let code = printExpr printCtx (Expression.Literal lit)
+
+  Assert.Equal("1.23", code.ToString())
+
+[<Fact>]
+let CodegenAddition () =
+  let a: Identifier = { Name = "a"; Loc = None }
+  let b: Identifier = { Name = "b"; Loc = None }
+
+  let sum =
+    Expression.Binary
+      { Operator = BinaryOperator.Plus
+        Left = Expression.Identifier a
+        Right = Expression.Identifier b
+        Loc = None }
+
+  let code = printExpr printCtx sum
+
+  Assert.Equal("a + b", code.ToString())
+
+[<Fact>]
+let CodegenExpressRequiresParens () =
+  let a: Identifier = { Name = "a"; Loc = None }
+  let b: Identifier = { Name = "b"; Loc = None }
+
+  let one: Literal =
+    { Value = LiteralValue.Number 1.0
+      Loc = None }
+
+  let two: Literal =
+    { Value = LiteralValue.Number 2.0
+      Loc = None }
+
+  let sum =
+    Expression.Binary
+      { Operator = BinaryOperator.Plus
+        Left = Expression.Identifier a
+        Right = Expression.Literal one
+        Loc = None }
+
+  let diff =
+    Expression.Binary
+      { Operator = BinaryOperator.Minus
+        Left = Expression.Identifier b
+        Right = Expression.Literal two
+        Loc = None }
+
+  let prod =
+    Expression.Binary
+      { Operator = BinaryOperator.Multiply
+        Left = sum
+        Right = diff
+        Loc = None }
+
+  let code = printExpr printCtx prod
+
+  Assert.Equal("(a + 1) * (b - 2)", code.ToString())
+
+[<Fact>]
+let CodegenNoParensExpression () =
+  let a: Identifier = { Name = "a"; Loc = None }
+  let b: Identifier = { Name = "b"; Loc = None }
+
+  let one: Literal =
+    { Value = LiteralValue.Number 1.0
+      Loc = None }
+
+  let two: Literal =
+    { Value = LiteralValue.Number 2.0
+      Loc = None }
+
+  let prod =
+    Expression.Binary
+      { Operator = BinaryOperator.Multiply
+        Left = Expression.Identifier a
+        Right = Expression.Literal one
+        Loc = None }
+
+  let quot =
+    Expression.Binary
+      { Operator = BinaryOperator.Divide
+        Left = Expression.Identifier b
+        Right = Expression.Literal two
+        Loc = None }
+
+  let sum =
+    Expression.Binary
+      { Operator = BinaryOperator.Plus
+        Left = prod
+        Right = quot
+        Loc = None }
+
+  let code = printExpr printCtx sum
+
+  Assert.Equal("a * 1 + b / 2", code.ToString())
+
+[<Fact>]
+let CodegenDoExpression () =
+  let res =
+    result {
+      let src =
+        """
+        let sum = do {
+          let x = 5
+          let y = 10
+          x + y
+        }
+        """
+
+      let! escAst = Parser.parseScript src
+      let ctx: Ctx = { NextTempId = 0 }
+      let block = buildScript ctx escAst
+      let js = block.Body |> List.map (printStmt printCtx) |> String.concat "\n"
+
+      return $"input: %s{src}\noutput:\n{js}"
+    }
+
+  match res with
+  | Ok(res) -> Verifier.Verify(res, settings).ToTask() |> Async.AwaitTask
+  | Error(error) ->
+    printfn "error = %A" error
+    failwith "ParseError"
+
+[<Fact>]
+let CodegenNestedDoExpressions () =
+  let res =
+    result {
+      let src =
+        """
+        let sum = do {
+          let x = do {
+            let a = 5
+            let b = 10
+            a + b
+          }
+          let y = do {
+            let c = 15
+            let d = 20
+            c - d
+          }
+          x * y
+        }
+        """
+
+      let! escAst = Parser.parseScript src
+      let ctx: Ctx = { NextTempId = 0 }
+      let block = buildScript ctx escAst
+      let js = block.Body |> List.map (printStmt printCtx) |> String.concat "\n"
+
+      return $"input: %s{src}\noutput:\n{js}"
+    }
+
+  match res with
+  | Ok(res) -> Verifier.Verify(res, settings).ToTask() |> Async.AwaitTask
+  | Error(error) ->
+    printfn "error = %A" error
+    failwith "ParseError"
+
+[<Fact>]
+let CodegenFunction () =
+  let res =
+    result {
+      let src =
+        """
+        let factorial = fn (n) =>
+          if (n == 0) { 1 } else { n * factorial(n - 1) } 
+        """
+
+      let! escAst = Parser.parseScript src
+      let ctx: Ctx = { NextTempId = 0 }
+      let block = buildScript ctx escAst
+
+      let js = block.Body |> List.map (printStmt printCtx) |> String.concat "\n"
+
+      return $"input: %s{src}\noutput:\n{js}"
+    }
+
+  match res with
+  | Ok(res) -> Verifier.Verify(res, settings).ToTask() |> Async.AwaitTask
+  | Error(error) ->
+    printfn "error = %A" error
+    failwith "ParseError"
+
+[<Fact>]
+let CodegenChainedIfElse () =
+  let res =
+    result {
+      let src =
+        """
+        let result = if (cond1) {
+          foo
+        } else if (cond2) {
+          bar
+        } else {
+          baz
+        }
+        """
+
+      let! escAst = Parser.parseScript src
+      let ctx: Ctx = { NextTempId = 0 }
+      let block = buildScript ctx escAst
+
+      let js = block.Body |> List.map (printStmt printCtx) |> String.concat "\n"
+
+      return $"input: %s{src}\noutput:\n{js}"
+    }
+
+  match res with
+  | Ok(res) -> Verifier.Verify(res, settings).ToTask() |> Async.AwaitTask
+  | Error(error) ->
+    printfn "error = %A" error
+    failwith "ParseError"

src/Escalier.Codegen.Tests/snapshots/Tests.CodegenChainedIfElse.verified.txt

@@ -0,0 +1,23 @@
+input: 
+        let result = if (cond1) {
+          foo
+        } else if (cond2) {
+          bar
+        } else {
+          baz
+        }
+
+output:
+var temp0;
+if (cond1) {
+  temp0 = foo;
+} else {
+  var temp1;
+  if (cond2) {
+    temp1 = bar;
+  } else {
+    temp1 = baz;
+  }
+  temp0 = temp1;
+}
+var result = temp0;

src/Escalier.Codegen.Tests/snapshots/Tests.CodegenDoExpression.verified.txt

@@ -0,0 +1,15 @@
+input: 
+        let sum = do {
+          let x = 5
+          let y = 10
+          x + y
+        }
+
+output:
+var temp0;
+{
+  var x = 5;
+  var y = 10;
+  temp0 = x + y;
+}
+var sum = temp0;

src/Escalier.Codegen.Tests/snapshots/Tests.CodegenFunction.verified.txt

@@ -0,0 +1,14 @@
+input: 
+        let factorial = fn (n) =>
+          if (n == 0) { 1 } else { n * factorial(n - 1) } 
+
+output:
+var factorial = (n) => {
+  var temp0;
+  if (n == 0) {
+    temp0 = 1;
+  } else {
+    temp0 = n * factorial((n - 1));
+  }
+  return temp0;
+};