Merge pull request #4 from axone-protocol/feat/apd-v3-upgrade

Feat/apd v3 upgrade

Author: amimart

engine/atom.go

@@ -56,13 +56,9 @@ var (
 
 	atomAbs                     = NewAtom("abs")
 	atomAccess                  = NewAtom("access")
-	atomAcos                    = NewAtom("acos")
 	atomAlias                   = NewAtom("alias")
 	atomAppend                  = NewAtom("append")
-	atomAsin                    = NewAtom("asin")
 	atomAt                      = NewAtom("at")
-	atomAtan                    = NewAtom("atan")
-	atomAtan2                   = NewAtom("atan2")
 	atomAtom                    = NewAtom("atom")
 	atomAtomic                  = NewAtom("atomic")
 	atomBinary                  = NewAtom("binary")
@@ -80,7 +76,6 @@ var (
 	atomCloseOption             = NewAtom("close_option")
 	atomCodes                   = NewAtom("codes")
 	atomCompound                = NewAtom("compound")
-	atomCos                     = NewAtom("cos")
 	atomCreate                  = NewAtom("create")
 	atomDebug                   = NewAtom("debug")
 	atomDiscontiguous           = NewAtom("discontiguous")
@@ -172,7 +167,6 @@ var (
 	atomResourceError           = NewAtom("resource_error")
 	atomRound                   = NewAtom("round")
 	atomSign                    = NewAtom("sign")
-	atomSin                     = NewAtom("sin")
 	atomSingletons              = NewAtom("singletons")
 	atomSmallE                  = NewAtom("e")
 	atomSourceSink              = NewAtom("source_sink")
@@ -184,7 +178,6 @@ var (
 	atomStreamPosition          = NewAtom("stream_position")
 	atomStreamProperty          = NewAtom("stream_property")
 	atomSyntaxError             = NewAtom("syntax_error")
-	atomTan                     = NewAtom("tan")
 	atomTermExpansion           = NewAtom("term_expansion")
 	atomText                    = NewAtom("text")
 	atomTextStream              = NewAtom("text_stream")

engine/float.go

@@ -2,15 +2,18 @@ package engine
 
 import (
 	"fmt"
-	"github.com/cockroachdb/apd"
+	"github.com/cockroachdb/apd/v3"
 	"io"
 	"strings"
 )
 
-// Float is a prolog floating-point number.
+// Float is a prolog "falsy" floating-point number.
+//
 // The underlying implementation is not based on floating-point, it's a [GDA](https://speleotrove.com/decimal/)
 // compatible implementation to avoid approximation and determinism issues.
-// It uses under the hood a decimal128 with 34 precision digits.
+// It uses under the hood a decimal128 with 34 precision digits and must be manipulated using the `decimal128Ctx` only.
+//
+// It serves as an immutable wrapper over `apd.Decimal`.
 type Float struct {
 	dec *apd.Decimal
 }

engine/number.go

@@ -2,7 +2,7 @@ package engine
 
 import (
 	"errors"
-	"github.com/cockroachdb/apd"
+	"github.com/cockroachdb/apd/v3"
 	"math"
 )
 

engine/number_test.go

@@ -2,7 +2,7 @@ package engine
 
 import (
 	"context"
-	"github.com/cockroachdb/apd"
+	"github.com/cockroachdb/apd/v3"
 	"io"
 	"math"
 	"testing"

go.mod

@@ -3,7 +3,7 @@ module github.com/ichiban/prolog
 go 1.19
 
 require (
-	github.com/cockroachdb/apd v1.1.0
+	github.com/cockroachdb/apd/v3 v3.2.1
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
 )
@@ -12,7 +12,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.1.1 // indirect
 	golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect

go.sum

@@ -1,5 +1,5 @@
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
+github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg=
+github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -10,8 +10,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

interpreter_test.go

@@ -606,7 +606,7 @@ a.`, output: `syntax err.`},
 		{name: "171", premise: `set_prolog_flag(double_quotes,chars).`, input: `writeq("a").`, output: `[a]`},
 		{name: "229", premise: `set_prolog_flag(double_quotes,chars).`, input: `writeq("\z").`, output: `syntax err.`},
 		{name: "300", premise: `set_prolog_flag(double_quotes,chars).`, input: `writeq("\0\").`, output: `['\x0\']`},
-		{name: "172", input: `X is 10.0** -323, writeq(X).`, output: `1.0e-323`},
+		{name: "172", input: `X is 10.0** -323, writeq(X).`, output: `1.000000000000000000000000000000000e-323`},
 		{name: "173", input: `1.0e-323=:=10.0** -323.`},
 		{name: "174", input: `-1 = -0x1.`},
 		{name: "175", input: `T = t(0b1,0o1,0x1), T = t(1,1,1).`},