Merge pull request #52 from philandstuff/std-pr-1052-with

Add `with` as proper term

Author: philandstuff

CHANGELOG.md

@@ -1,7 +1,21 @@
 # Changelog
 
 ## [Unreleased]
-[Unreleased]: https://github.com/philandstuff/dhall-golang/compare/v4.1.0...HEAD
+[Unreleased]: https://github.com/philandstuff/dhall-golang/compare/v5.0.0...HEAD
+
+## [5.0.0] - 2020-09-20
+[5.0.0]: https://github.com/philandstuff/dhall-golang/compare/v4.1.0...v5.1.0
+
+This brings dhall-golang up to version 18.0.0 of the Dhall standard.
+
+### Changed
+
+ * Language changes
+   * Enable `with` optimizations
+
+This implements the newly-possible `with` optimizations such that
+deeply-nested `with` expressions do not experience pathological
+slowdown.
 
 ## [4.1.0] - 2020-08-10
 [4.1.0]: https://github.com/philandstuff/dhall-golang/compare/v4.0.0...v4.1.0

README.md

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/philandstuff/dhall-golang/v4"
+	"github.com/philandstuff/dhall-golang/v5"
 )
 
 // Config can be a fairly arbitrary Go datatype.  You would put your

binary/cbor.go

@@ -8,7 +8,7 @@ import (
 	"path"
 
 	"github.com/fxamacker/cbor/v2"
-	. "github.com/philandstuff/dhall-golang/v4/term"
+	. "github.com/philandstuff/dhall-golang/v5/term"
 )
 
 var nameToBuiltin = map[string]Term{
@@ -490,6 +490,20 @@ func decode(decodedCbor interface{}) (Term, error) {
 					return nil, err
 				}
 				return EmptyList{Type: t}, nil
+			case 29: // with
+				r, err := decode(val[1])
+				if err != nil {
+					return nil, err
+				}
+				path, ok := val[2].([]string)
+				if !ok {
+					return nil, fmt.Errorf("couldn't interpret %v as []string", val[2])
+				}
+				v, err := decode(val[3])
+				if err != nil {
+					return nil, err
+				}
+				return With{r, path, v}, nil
 			}
 		}
 	}

binary/performance_test.go

@@ -7,11 +7,11 @@ import (
 	"path"
 	"testing"
 
-	"github.com/philandstuff/dhall-golang/v4/binary"
-	"github.com/philandstuff/dhall-golang/v4/core"
-	"github.com/philandstuff/dhall-golang/v4/imports"
-	"github.com/philandstuff/dhall-golang/v4/internal"
-	"github.com/philandstuff/dhall-golang/v4/term"
+	"github.com/philandstuff/dhall-golang/v5/binary"
+	"github.com/philandstuff/dhall-golang/v5/core"
+	"github.com/philandstuff/dhall-golang/v5/imports"
+	"github.com/philandstuff/dhall-golang/v5/internal"
+	"github.com/philandstuff/dhall-golang/v5/term"
 )
 
 func BenchmarkDecodeLargeExpression(b *testing.B) {

binary/semantic_hash.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"crypto/sha256"
 
-	"github.com/philandstuff/dhall-golang/v4/core"
+	"github.com/philandstuff/dhall-golang/v5/core"
 )
 
 // SemanticHash returns the semantic hash of an evaluated expression.

cmd/main.go

@@ -6,10 +6,10 @@ import (
 	"log"
 	"os"
 
-	"github.com/philandstuff/dhall-golang/v4/binary"
-	"github.com/philandstuff/dhall-golang/v4/core"
-	"github.com/philandstuff/dhall-golang/v4/imports"
-	"github.com/philandstuff/dhall-golang/v4/parser"
+	"github.com/philandstuff/dhall-golang/v5/binary"
+	"github.com/philandstuff/dhall-golang/v5/core"
+	"github.com/philandstuff/dhall-golang/v5/imports"
+	"github.com/philandstuff/dhall-golang/v5/parser"
 )
 
 func main() {

core/ast.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/philandstuff/dhall-golang/v4/term"
+	"github.com/philandstuff/dhall-golang/v5/term"
 )
 
 // A Value is a Dhall value in beta-normal form.  You can think of

core/builtins.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/philandstuff/dhall-golang/v4/term"
+	"github.com/philandstuff/dhall-golang/v5/term"
 )
 
 func (naturalBuild) Call(x Value) Value {

core/builtins_test.go

@@ -3,8 +3,8 @@ package core_test
 import (
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
-	"github.com/philandstuff/dhall-golang/v4/core"
-	"github.com/philandstuff/dhall-golang/v4/parser"
+	"github.com/philandstuff/dhall-golang/v5/core"
+	"github.com/philandstuff/dhall-golang/v5/parser"
 )
 
 var _ = DescribeTable("ArgType of builtins", func(src, typ string) {

core/equivalence_test.go

@@ -5,7 +5,7 @@ import (
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/types"
-	"github.com/philandstuff/dhall-golang/v4/term"
+	"github.com/philandstuff/dhall-golang/v5/term"
 )
 
 // Ensure that alphaMatcher is a valid GomegaMatcher