Reset to v1.1.55

Author: ohill

.github/workflows/build.yml

@@ -10,5 +10,5 @@ jobs:
       - uses: actions/checkout@v3.5.3
       - uses: actions/setup-go@v4.0.1
         with:
-          go-version: '1.20.6'
+          go-version: '1.20.5'
       - run: make test

gen/elem.go

@@ -165,7 +165,6 @@ func (c *common) SetVarname(s string)       { c.vname = s }
 func (c *common) Varname() string           { return c.vname }
 func (c *common) Alias(typ string)          { c.alias = typ }
 func (c *common) SortInterface() string     { return "" }
-func (c *common) LessFunction() string      { return "" }
 func (c *common) SetAllocBound(s string)    { c.allocbound = s }
 func (c *common) AllocBound() string        { return c.allocbound }
 func (c *common) SetMaxTotalBytes(s string) { c.maxtotalbytes = s }
@@ -230,9 +229,6 @@ type Elem interface {
 	// slice of this type.
 	SortInterface() string
 
-	// LessFunction returns the Less implementation for values of this type.
-	LessFunction() string
-
 	// Comparable returns whether the type is comparable, along the lines
 	// of the Go spec (https://golang.org/ref/spec#Comparison_operators),
 	// used to determine whether we can compare to a zero value to determine
@@ -799,8 +795,6 @@ func (s *BaseElem) BaseType() string {
 		return "[]byte"
 	case Time:
 		return "time.Time"
-	case Duration:
-		return "time.Duration"
 	case Ext:
 		return "msgp.Extension"
 
@@ -915,14 +909,6 @@ func (s *BaseElem) SortInterface() string {
 	return ""
 }
 
-func (s *BaseElem) LessFunction() string {
-	lessThan, ok := lessFunctions[s.TypeName()]
-	if ok {
-		return lessThan
-	}
-	return ""
-}
-
 func (k Primitive) String() string {
 	switch k {
 	case String:
@@ -1004,13 +990,3 @@ func SetSortInterface(sorttype string, sortintf string) {
 
 	sortInterface[sorttype] = sortintf
 }
-
-var lessFunctions map[string]string
-
-func SetLessFunction(sorttype string, lessfn string) {
-	if lessFunctions == nil {
-		lessFunctions = make(map[string]string)
-	}
-
-	lessFunctions[sorttype] = lessfn
-}

gen/maxsize.go

@@ -38,11 +38,10 @@ func maxSizes(w io.Writer, topics *Topics) *maxSizeGen {
 
 type maxSizeGen struct {
 	passes
-	p        printer
-	state    maxSizeState
-	ctx      *Context
-	topics   *Topics
-	panicked bool
+	p      printer
+	state  maxSizeState
+	ctx    *Context
+	topics *Topics
 }
 
 func (s *maxSizeGen) Method() Method { return MaxSize }
@@ -54,7 +53,7 @@ func (s *maxSizeGen) Apply(dirs []string) error {
 // this lets us chain together addition
 // operations where possible
 func (s *maxSizeGen) addConstant(sz string) {
-	if !s.p.ok() || s.panicked {
+	if !s.p.ok() {
 		return
 	}
 
@@ -83,7 +82,6 @@ func (s *maxSizeGen) Execute(p Elem) ([]string, error) {
 	if !s.p.ok() {
 		return nil, s.p.err
 	}
-	s.panicked = false
 	p = s.applyall(p)
 	if p == nil {
 		return nil, nil
@@ -111,17 +109,13 @@ func (s *maxSizeGen) Execute(p Elem) ([]string, error) {
 	s.p.printf("\nfunc  %s (s int) {", getMaxSizeMethod(p.TypeName()))
 	s.state = assignM
 	next(s, p)
-	if s.panicked {
-		s.p.print("\n}\n")
-	} else {
-		s.p.nakedReturn()
-	}
+	s.p.nakedReturn()
 	s.topics.Add(p.TypeName(), getMaxSizeMethod(p.TypeName()))
 	return nil, s.p.err
 }
 
 func (s *maxSizeGen) gStruct(st *Struct) {
-	if !s.p.ok() || s.panicked {
+	if !s.p.ok() {
 		return
 	}
 
@@ -140,7 +134,7 @@ func (s *maxSizeGen) gStruct(st *Struct) {
 				continue
 			}
 
-			if !s.p.ok() || s.panicked {
+			if !s.p.ok() {
 				return
 			}
 			next(s, st.Fields[i].FieldElem)
@@ -162,23 +156,19 @@ func (s *maxSizeGen) gStruct(st *Struct) {
 }
 
 func (s *maxSizeGen) gPtr(p *Ptr) {
-	if s.panicked {
-		return
-	}
 	s.state = addM // inner must use add
 	next(s, p.Value)
 	s.state = addM // closing block; reset to add
 }
 
 func (s *maxSizeGen) gSlice(sl *Slice) {
-	if !s.p.ok() || s.panicked {
+	if !s.p.ok() {
 		return
 	}
 	s.state = addM
 	s.p.comment("Calculating size of slice: " + sl.Varname())
 	if (sl.AllocBound() == "" || sl.AllocBound() == "-") && (sl.MaxTotalBytes() == "" || sl.MaxTotalBytes() == "-") {
 		s.p.printf("\npanic(\"Slice %s is unbounded\")", sl.Varname())
-		s.panicked = true
 		s.state = addM // reset the add to prevent further + expressions from being added to the end the panic statement
 		return
 	}
@@ -204,14 +194,13 @@ func (s *maxSizeGen) gSlice(sl *Slice) {
 		s.addConstant(fmt.Sprintf("((%s) * (%s))", topLevelAllocBound, str))
 	} else {
 		s.p.printf("\npanic(\"Unable to determine max size: %s\")", err)
-		s.panicked = true
 	}
 	s.state = addM
 	return
 }
 
 func (s *maxSizeGen) gArray(a *Array) {
-	if !s.p.ok() || s.panicked {
+	if !s.p.ok() {
 		return
 	}
 	// If this is not the first line where we define s = ... then we need to reset the state
@@ -227,23 +216,19 @@ func (s *maxSizeGen) gArray(a *Array) {
 		s.addConstant(fmt.Sprintf("((%s) * (%s))", a.Size, str))
 	} else {
 		s.p.printf("\npanic(\"Unable to determine max size: %s\")", err)
-		s.panicked = true
+
 	}
 	s.state = addM
 	return
 }
 
 func (s *maxSizeGen) gMap(m *Map) {
-	if s.panicked {
-		return
-	}
 	vn := m.Varname()
 	s.state = addM
 	s.addConstant(builtinSize(mapHeader))
 	topLevelAllocBound := m.AllocBound()
 	if topLevelAllocBound != "" && topLevelAllocBound == "-" {
 		s.p.printf("\npanic(\"Map %s is unbounded\")", m.Varname())
-		s.panicked = true
 		s.state = addM // reset the add to prevent further + expressions from being added to the end the panic statement
 		return
 	}
@@ -256,25 +241,21 @@ func (s *maxSizeGen) gMap(m *Map) {
 		}
 	}
 
-	if !s.panicked {
-		s.p.comment("Adding size of map keys for " + vn)
-		s.p.printf("\ns += %s", topLevelAllocBound)
-		s.state = multM
-		next(s, m.Key)
-	}
+	s.p.comment("Adding size of map keys for " + vn)
+	s.p.printf("\ns += %s", topLevelAllocBound)
+	s.state = multM
+	next(s, m.Key)
 
-	if !s.panicked {
-		s.p.comment("Adding size of map values for " + vn)
-		s.p.printf("\ns += %s", topLevelAllocBound)
-		s.state = multM
-		next(s, m.Value)
-	}
+	s.p.comment("Adding size of map values for " + vn)
+	s.p.printf("\ns += %s", topLevelAllocBound)
+	s.state = multM
+	next(s, m.Value)
 
 	s.state = addM
 }
 
 func (s *maxSizeGen) gBase(b *BaseElem) {
-	if !s.p.ok() || s.panicked {
+	if !s.p.ok() {
 		return
 	}
 	if b.MaxTotalBytes() != "" {
@@ -295,7 +276,6 @@ func (s *maxSizeGen) gBase(b *BaseElem) {
 		value, err := baseMaxSizeExpr(b.Value, vname, b.BaseName(), b.TypeName(), b.common.AllocBound())
 		if err != nil {
 			s.p.printf("\npanic(\"Unable to determine max size: %s\")", err)
-			s.panicked = true
 			s.state = addM // reset the add to prevent further + expressions from being added to the end the panic statement
 			return
 		}
@@ -310,7 +290,6 @@ func (s *maxSizeGen) gBase(b *BaseElem) {
 		value, err := baseMaxSizeExpr(b.Value, vname, b.BaseName(), b.TypeName(), b.common.AllocBound())
 		if err != nil {
 			s.p.printf("\npanic(\"Unable to determine max size: %s\")", err)
-			s.panicked = true
 			s.state = addM // reset the add to prevent further + expressions from being added to the end the panic statement
 			return
 		}

gen/unmarshal.go

@@ -60,17 +60,12 @@ func (u *unmarshalGen) Execute(p Elem) ([]string, error) {
 		u.p.printf("\n  return ((*(%s))(%s)).UnmarshalMsg(bts)", baseType, c)
 		u.p.printf("\n}")
 
-		u.p.printf("\nfunc (%s %s) UnmarshalValidateMsg(bts []byte) ([]byte, error) {", c, methodRecv)
-		u.p.printf("\n  return ((*(%s))(%s)).UnmarshalValidateMsg(bts)", baseType, c)
-		u.p.printf("\n}")
-
 		u.p.printf("\nfunc (_ %[2]s) CanUnmarshalMsg(%[1]s interface{}) bool {", c, methodRecv)
 		u.p.printf("\n  _, ok := (%s).(%s)", c, methodRecv)
 		u.p.printf("\n  return ok")
 		u.p.printf("\n}")
 
 		u.topics.Add(methodRecv, "UnmarshalMsg")
-		u.topics.Add(methodRecv, "UnmarshalValidateMsg")
 		u.topics.Add(methodRecv, "CanUnmarshalMsg")
 
 		return u.msgs, u.p.err
@@ -80,7 +75,7 @@ func (u *unmarshalGen) Execute(p Elem) ([]string, error) {
 	c := p.Varname()
 	methodRecv := methodReceiver(p)
 
-	u.p.printf("\nfunc (%s %s) unmarshalMsg(bts []byte, validate bool) (o []byte, err error) {", c, methodRecv)
+	u.p.printf("\nfunc (%s %s) UnmarshalMsg(bts []byte) (o []byte, err error) {", c, methodRecv)
 	next(u, p)
 	u.p.print("\no = bts")
 
@@ -96,21 +91,12 @@ func (u *unmarshalGen) Execute(p Elem) ([]string, error) {
 	}
 	u.p.nakedReturn()
 
-	u.p.printf("\nfunc (%s %s) UnmarshalMsg(bts []byte) (o []byte, err error) {", c, methodRecv)
-	u.p.printf("\n return %s.unmarshalMsg(bts, false)", c)
-	u.p.printf("\n}")
-
-	u.p.printf("\nfunc (%s %s) UnmarshalValidateMsg(bts []byte) (o []byte, err error) {", c, methodRecv)
-	u.p.printf("\n return %s.unmarshalMsg(bts, true)", c)
-	u.p.printf("\n}")
-
 	u.p.printf("\nfunc (_ %[2]s) CanUnmarshalMsg(%[1]s interface{}) bool {", c, methodRecv)
 	u.p.printf("\n  _, ok := (%s).(%s)", c, methodRecv)
 	u.p.printf("\n  return ok")
 	u.p.printf("\n}")
 
 	u.topics.Add(methodRecv, "UnmarshalMsg")
-	u.topics.Add(methodRecv, "UnmarshalValidateMsg")
 	u.topics.Add(methodRecv, "CanUnmarshalMsg")
 
 	return u.msgs, u.p.err
@@ -158,13 +144,8 @@ func (u *unmarshalGen) mapstruct(s *Struct) {
 	u.needsField()
 	sz := randIdent()
 	isnil := randIdent()
-	last := randIdent()
-	lastIsSet := randIdent()
 	u.p.declare(sz, "int")
-	u.p.declare(last, "string")
-	u.p.declare(lastIsSet, "bool")
 	u.p.declare(isnil, "bool")
-	u.p.printf("\n_=%s;\n_=%s", last, lastIsSet) // we might not use these for empty structs
 
 	// go-codec compat: decode an array as sequential elements from this struct,
 	// in the order they are defined in the Go type (as opposed to canonical
@@ -174,11 +155,6 @@ func (u *unmarshalGen) mapstruct(s *Struct) {
 
 	u.assignAndCheck(sz, isnil, arrayHeader)
 
-	u.p.print("\nif validate {")  // map encoded as array => non canonical
-	u.p.print("\nerr = &msgp.ErrNonCanonical{}")
-	u.p.print("\nreturn")
-	u.p.print("\n}")
-
 	u.ctx.PushString("struct-from-array")
 	for i := range s.Fields {
 		if !ast.IsExported(s.Fields[i].FieldName) {
@@ -219,19 +195,13 @@ func (u *unmarshalGen) mapstruct(s *Struct) {
 			return
 		}
 		u.p.printf("\ncase \"%s\":", s.Fields[i].FieldTag)
-		u.p.printf("\nif validate && %s && \"%s\" < %s {", lastIsSet, s.Fields[i].FieldTag, last)
-		u.p.print("\nerr = &msgp.ErrNonCanonical{}")
-		u.p.printf("\nreturn")
-		u.p.print("\n}")
 		u.ctx.PushString(s.Fields[i].FieldName)
 		next(u, s.Fields[i].FieldElem)
 		u.ctx.Pop()
-		u.p.printf("\n%s = \"%s\"", last, s.Fields[i].FieldTag)
 	}
 	u.p.print("\ndefault:\nerr = msgp.ErrNoField(string(field))")
 	u.p.wrapErrCheck(u.ctx.ArgsStr())
 	u.p.print("\n}") // close switch
-	u.p.printf("\n%s = true", lastIsSet)
 	u.p.print("\n}") // close for loop
 	u.p.print("\n}") // close else statement for array decode
 }
@@ -355,27 +325,9 @@ func (u *unmarshalGen) gMap(m *Map) {
 	u.msgs = append(u.msgs, resizemsgs...)
 
 	// loop and get key,value
-	last := randIdent()
-	lastSet := randIdent()
-	u.p.printf("\nvar %s %s; _ = %s", last, m.Key.TypeName(), last) // we might not use the sort if it's not defined
-	u.p.declare(lastSet, "bool")
-	u.p.printf("\n_ = %s", lastSet) // we might not use the flag
 	u.p.printf("\nfor %s > 0 {", sz)
 	u.p.printf("\nvar %s %s; var %s %s; %s--", m.Keyidx, m.Key.TypeName(), m.Validx, m.Value.TypeName(), sz)
 	next(u, m.Key)
-	u.p.printf("\nif validate {")
-	if m.Key.LessFunction() != "" {
-		u.p.printf("\nif %s && %s(%s, %s) {", lastSet, m.Key.LessFunction(), m.Keyidx, last)
-		u.p.printf("\nerr = &msgp.ErrNonCanonical{}")
-		u.p.printf("\nreturn")
-		u.p.printf("\n}")
-	} else {
-		u.p.printf("\nerr = &msgp.ErrMissingLessFn{}")
-		u.p.printf("\nreturn")
-	}
-	u.p.printf("\n}") // close if validate block
-	u.p.printf("\n%s=%s", last, m.Keyidx)
-	u.p.printf("\n%s=true", lastSet)
 	u.ctx.PushVar(m.Keyidx)
 	next(u, m.Value)
 	u.ctx.Pop()