fix marshal of unicode characters in candiedyaml

mandelsoft · Jul 22, 2020 · 7ba0a83 · 7ba0a83
1 parent 15eab47
commit 7ba0a83
Show file tree

Hide file tree

Showing 71 changed files with 29 additions and 3,118 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -25,9 +25,9 @@
 #   unused-packages = true
 
 
-[[constraint]]
-  name = "github.com/cloudfoundry-incubator/candiedyaml"
-  revision = "a41693b7b7afb422c7ecb1028458ab27da047bbb"
+#[[constraint]]
+#  name = "github.com/cloudfoundry-incubator/candiedyaml"
+#  revision = "a41693b7b7afb422c7ecb1028458ab27da047bbb"
 
 [[constraint]]
   name = "github.com/spf13/cobra"
@@ -54,7 +54,7 @@
   go-tests = true
   unused-packages = true
 
-  [[prune.project]]
-    name = "github.com/cloudfoundry-incubator/candiedyaml"
-    go-tests = false
-    unused-packages = false
+#  [[prune.project]]
+#    name = "github.com/cloudfoundry-incubator/candiedyaml"
+#    go-tests = false
+#    unused-packages = false
diff --git a/Makefile b/Makefile
@@ -30,4 +30,5 @@ spiff_darwin_amd64.zip: ensure
 ensure:
 	dep ensure
 	# restore patched version of candiedyaml/decode.go
-	git checkout -- vendor/github.com/cloudfoundry-incubator/candiedyaml/decode.go
+	#git checkout -- vendor/github.com/cloudfoundry-incubator/candiedyaml/decode.go
+	#git checkout -- vendor/github.com/cloudfoundry-incubator/candiedyaml/emitter.go
diff --git a/cmd/diff.go b/cmd/diff.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/cloudfoundry-incubator/candiedyaml"
 	"github.com/mandelsoft/spiff/compare"
+	"github.com/mandelsoft/spiff/legacy/candiedyaml"
 	"github.com/mandelsoft/spiff/yaml"
 )
 

diff --git a/cmd/merge.go b/cmd/merge.go
@@ -9,12 +9,13 @@ import (
 	"path"
 	"strings"
 
-	"github.com/cloudfoundry-incubator/candiedyaml"
+	"github.com/spf13/cobra"
+
 	"github.com/mandelsoft/spiff/debug"
 	"github.com/mandelsoft/spiff/dynaml"
 	"github.com/mandelsoft/spiff/flow"
+	"github.com/mandelsoft/spiff/legacy/candiedyaml"
 	"github.com/mandelsoft/spiff/yaml"
-	"github.com/spf13/cobra"
 )
 
 var asJSON bool

diff --git a/dynaml/exec.go b/dynaml/exec.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cloudfoundry-incubator/candiedyaml"
+	"github.com/mandelsoft/spiff/legacy/candiedyaml"
 
 	"github.com/mandelsoft/spiff/debug"
 	"github.com/mandelsoft/spiff/yaml"

diff --git a/dynaml/format.go b/dynaml/format.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/mandelsoft/spiff/yaml"
 
-	"github.com/cloudfoundry-incubator/candiedyaml"
+	"github.com/mandelsoft/spiff/legacy/candiedyaml"
 )
 
 func func_format(arguments []interface{}, binding Binding) (interface{}, EvaluationInfo, bool) {

diff --git a/dynaml/json.go b/dynaml/json.go
@@ -1,9 +1,10 @@
 package dynaml
 
 import (
-	"github.com/cloudfoundry-incubator/candiedyaml"
-	"github.com/mandelsoft/spiff/yaml"
 	"strings"
+
+	"github.com/mandelsoft/spiff/legacy/candiedyaml"
+	"github.com/mandelsoft/spiff/yaml"
 )
 
 func func_as_json(arguments []interface{}, binding Binding) (interface{}, EvaluationInfo, bool) {

diff --git a/dynaml/passwd/passwd.go b/dynaml/passwd/passwd.go
@@ -2,8 +2,9 @@ package passwd
 
 import (
 	"fmt"
-	"github.com/cloudfoundry-incubator/candiedyaml"
+
 	. "github.com/mandelsoft/spiff/dynaml"
+	"github.com/mandelsoft/spiff/legacy/candiedyaml"
 )
 
 type Encoding interface {

diff --git a/legacy/.gitignore b/legacy/.gitignore
@@ -0,0 +1 @@
+*.coverprofile
diff --git a/legacy/candiedyaml/emitter.go b/legacy/candiedyaml/emitter.go
@@ -1876,7 +1876,7 @@ func yaml_emitter_write_double_quoted_scalar(emitter *yaml_emitter_t, value []by
 				for k := (w - 1) * 4; k >= 0; k -= 4 {
 					digit := byte((v >> uint(k)) & 0x0F)
 					c := digit + '0'
-					if c > 9 {
+					if digit > 9 {
 						c = digit + 'A' - 10
 					}
 					if !put(emitter, c) {

diff --git a/vendor/github.com/cloudfoundry-incubator/candiedyaml/candiedyaml_suite_test.go b/vendor/github.com/cloudfoundry-incubator/candiedyaml/candiedyaml_suite_test.go
diff --git a/vendor/github.com/cloudfoundry-incubator/candiedyaml/decode.go b/vendor/github.com/cloudfoundry-incubator/candiedyaml/decode.go