SQUASHME

Author: whyrusleeping

obj/atlas/atlas.go

@@ -22,6 +22,7 @@ type Atlas struct {
 	// unmarshaller hits a tag.  Values are a subset of `mappings`.
 	tagMappings map[int]*AtlasEntry
 
+	// MapMorphism specifies the default map sorting scheme
 	MapMorphism *MapMorphism
 }
 

obj/atlas/mapMorphism.go

@@ -4,8 +4,8 @@ package atlas
 type KeySortMode string
 
 const (
-	KeySortMode_Default = "default" // e.g. lexical string sort for strings, etc
-	KeySortMode_RFC7049 = "rfc7049" // "Canonical" as proposed by rfc7049 § 3.9 (shorter byte sequences sort to top)
+	KeySortMode_Default = KeySortMode("default") // e.g. lexical string sort for strings, etc
+	KeySortMode_RFC7049 = KeySortMode("rfc7049") // "Canonical" as proposed by rfc7049 § 3.9 (shorter byte sequences sort to top)
 )
 
 type MapMorphism struct {

obj/marshalMapWildcard.go

@@ -47,7 +47,13 @@ func (mach *marshalMachineMapWildcard) Reset(slab *marshalSlab, rv reflect.Value
 		mach.keys[i].rv = v
 		mach.keys[i].s = v.String()
 	}
-	switch mach.morphism.KeySortMode {
+
+	ksm := atlas.KeySortMode_Default
+	if mach.morphism != nil {
+		ksm = mach.morphism.KeySortMode
+	}
+
+	switch ksm {
 	case atlas.KeySortMode_Default:
 		sort.Sort(wildcardMapStringyKey_byString(mach.keys))
 	case atlas.KeySortMode_RFC7049: