add comment to exported functions (#4)

master
Guillaume Ballet 7 years ago committed by Felix Lange
parent 90983d99de
commit 408615857a
  1. 2
      internal/tests/ftypes/output.go
  2. 6
      internal/tests/funcoverride/output.go
  3. 6
      internal/tests/mapconv/output.go
  4. 6
      internal/tests/nameclash/output.go
  5. 6
      internal/tests/omitempty/output.go
  6. 2
      internal/tests/reqfield/output.go
  7. 6
      internal/tests/sliceconv/output.go
  8. 24
      main.go

@ -6,6 +6,7 @@ import (
"encoding/json" "encoding/json"
) )
// MarshalJSON marshals as JSON.
func (x X) MarshalJSON() ([]byte, error) { func (x X) MarshalJSON() ([]byte, error) {
type X struct { type X struct {
Int int Int int
@ -19,6 +20,7 @@ func (x X) MarshalJSON() ([]byte, error) {
return json.Marshal(&enc) return json.Marshal(&enc)
} }
// UnmarshalJSON unmarshals from JSON.
func (x *X) UnmarshalJSON(input []byte) error { func (x *X) UnmarshalJSON(input []byte) error {
type X struct { type X struct {
Int *int Int *int

@ -8,6 +8,7 @@ import (
var _ = (*Zo)(nil) var _ = (*Zo)(nil)
// MarshalJSON marshals as JSON.
func (z Z) MarshalJSON() ([]byte, error) { func (z Z) MarshalJSON() ([]byte, error) {
type Z struct { type Z struct {
S string `json:"s"` S string `json:"s"`
@ -23,6 +24,7 @@ func (z Z) MarshalJSON() ([]byte, error) {
return json.Marshal(&enc) return json.Marshal(&enc)
} }
// UnmarshalJSON unmarshals from JSON.
func (z *Z) UnmarshalJSON(input []byte) error { func (z *Z) UnmarshalJSON(input []byte) error {
type Z struct { type Z struct {
S *string `json:"s"` S *string `json:"s"`
@ -41,6 +43,7 @@ func (z *Z) UnmarshalJSON(input []byte) error {
return nil return nil
} }
// MarshalYAML marshals as YAML.
func (z Z) MarshalYAML() (interface{}, error) { func (z Z) MarshalYAML() (interface{}, error) {
type Z struct { type Z struct {
S string `json:"s"` S string `json:"s"`
@ -56,6 +59,7 @@ func (z Z) MarshalYAML() (interface{}, error) {
return &enc, nil return &enc, nil
} }
// UnmarshalYAML unmarshals from YAML.
func (z *Z) UnmarshalYAML(unmarshal func(interface{}) error) error { func (z *Z) UnmarshalYAML(unmarshal func(interface{}) error) error {
type Z struct { type Z struct {
S *string `json:"s"` S *string `json:"s"`
@ -74,6 +78,7 @@ func (z *Z) UnmarshalYAML(unmarshal func(interface{}) error) error {
return nil return nil
} }
// MarshalTOML marshals as TOML.
func (z Z) MarshalTOML() (interface{}, error) { func (z Z) MarshalTOML() (interface{}, error) {
type Z struct { type Z struct {
S string `json:"s"` S string `json:"s"`
@ -89,6 +94,7 @@ func (z Z) MarshalTOML() (interface{}, error) {
return &enc, nil return &enc, nil
} }
// UnmarshalTOML unmarshals from TOML.
func (z *Z) UnmarshalTOML(unmarshal func(interface{}) error) error { func (z *Z) UnmarshalTOML(unmarshal func(interface{}) error) error {
type Z struct { type Z struct {
S *string `json:"s"` S *string `json:"s"`

@ -8,6 +8,7 @@ import (
var _ = (*Xo)(nil) var _ = (*Xo)(nil)
// MarshalJSON marshals as JSON.
func (x X) MarshalJSON() ([]byte, error) { func (x X) MarshalJSON() ([]byte, error) {
type X struct { type X struct {
Map map[replacedString]replacedInt Map map[replacedString]replacedInt
@ -41,6 +42,7 @@ func (x X) MarshalJSON() ([]byte, error) {
return json.Marshal(&enc) return json.Marshal(&enc)
} }
// UnmarshalJSON unmarshals from JSON.
func (x *X) UnmarshalJSON(input []byte) error { func (x *X) UnmarshalJSON(input []byte) error {
type X struct { type X struct {
Map map[replacedString]replacedInt Map map[replacedString]replacedInt
@ -73,6 +75,7 @@ func (x *X) UnmarshalJSON(input []byte) error {
return nil return nil
} }
// MarshalYAML marshals as YAML.
func (x X) MarshalYAML() (interface{}, error) { func (x X) MarshalYAML() (interface{}, error) {
type X struct { type X struct {
Map map[replacedString]replacedInt Map map[replacedString]replacedInt
@ -106,6 +109,7 @@ func (x X) MarshalYAML() (interface{}, error) {
return &enc, nil return &enc, nil
} }
// UnmarshalYAML unmarshals from YAML.
func (x *X) UnmarshalYAML(unmarshal func(interface{}) error) error { func (x *X) UnmarshalYAML(unmarshal func(interface{}) error) error {
type X struct { type X struct {
Map map[replacedString]replacedInt Map map[replacedString]replacedInt
@ -138,6 +142,7 @@ func (x *X) UnmarshalYAML(unmarshal func(interface{}) error) error {
return nil return nil
} }
// MarshalTOML marshals as TOML.
func (x X) MarshalTOML() (interface{}, error) { func (x X) MarshalTOML() (interface{}, error) {
type X struct { type X struct {
Map map[replacedString]replacedInt Map map[replacedString]replacedInt
@ -171,6 +176,7 @@ func (x X) MarshalTOML() (interface{}, error) {
return &enc, nil return &enc, nil
} }
// UnmarshalTOML unmarshals from TOML.
func (x *X) UnmarshalTOML(unmarshal func(interface{}) error) error { func (x *X) UnmarshalTOML(unmarshal func(interface{}) error) error {
type X struct { type X struct {
Map map[replacedString]replacedInt Map map[replacedString]replacedInt

@ -11,6 +11,7 @@ import (
var _ = (*yo)(nil) var _ = (*yo)(nil)
// MarshalJSON marshals as JSON.
func (y Y) MarshalJSON() ([]byte, error) { func (y Y) MarshalJSON() ([]byte, error) {
type Y struct { type Y struct {
Foo json0.Foo Foo json0.Foo
@ -28,6 +29,7 @@ func (y Y) MarshalJSON() ([]byte, error) {
return json.Marshal(&enc0) return json.Marshal(&enc0)
} }
// UnmarshalJSON unmarshals from JSON.
func (y *Y) UnmarshalJSON(input []byte) error { func (y *Y) UnmarshalJSON(input []byte) error {
type Y struct { type Y struct {
Foo *json0.Foo Foo *json0.Foo
@ -58,6 +60,7 @@ func (y *Y) UnmarshalJSON(input []byte) error {
return nil return nil
} }
// MarshalYAML marshals as YAML.
func (y Y) MarshalYAML() (interface{}, error) { func (y Y) MarshalYAML() (interface{}, error) {
type Y struct { type Y struct {
Foo json0.Foo Foo json0.Foo
@ -75,6 +78,7 @@ func (y Y) MarshalYAML() (interface{}, error) {
return &enc0, nil return &enc0, nil
} }
// UnmarshalYAML unmarshals from YAML.
func (y *Y) UnmarshalYAML(unmarshal func(interface{}) error) error { func (y *Y) UnmarshalYAML(unmarshal func(interface{}) error) error {
type Y struct { type Y struct {
Foo *json0.Foo Foo *json0.Foo
@ -105,6 +109,7 @@ func (y *Y) UnmarshalYAML(unmarshal func(interface{}) error) error {
return nil return nil
} }
// MarshalTOML marshals as TOML.
func (y Y) MarshalTOML() (interface{}, error) { func (y Y) MarshalTOML() (interface{}, error) {
type Y struct { type Y struct {
Foo json0.Foo Foo json0.Foo
@ -122,6 +127,7 @@ func (y Y) MarshalTOML() (interface{}, error) {
return &enc0, nil return &enc0, nil
} }
// UnmarshalTOML unmarshals from TOML.
func (y *Y) UnmarshalTOML(unmarshal func(interface{}) error) error { func (y *Y) UnmarshalTOML(unmarshal func(interface{}) error) error {
type Y struct { type Y struct {
Foo *json0.Foo Foo *json0.Foo

@ -8,6 +8,7 @@ import (
var _ = (*Xo)(nil) var _ = (*Xo)(nil)
// MarshalJSON marshals as JSON.
func (x X) MarshalJSON() ([]byte, error) { func (x X) MarshalJSON() ([]byte, error) {
type X struct { type X struct {
Int replacedInt `json:",omitempty"` Int replacedInt `json:",omitempty"`
@ -17,6 +18,7 @@ func (x X) MarshalJSON() ([]byte, error) {
return json.Marshal(&enc) return json.Marshal(&enc)
} }
// UnmarshalJSON unmarshals from JSON.
func (x *X) UnmarshalJSON(input []byte) error { func (x *X) UnmarshalJSON(input []byte) error {
type X struct { type X struct {
Int *replacedInt `json:",omitempty"` Int *replacedInt `json:",omitempty"`
@ -31,6 +33,7 @@ func (x *X) UnmarshalJSON(input []byte) error {
return nil return nil
} }
// MarshalYAML marshals as YAML.
func (x X) MarshalYAML() (interface{}, error) { func (x X) MarshalYAML() (interface{}, error) {
type X struct { type X struct {
Int replacedInt `json:",omitempty"` Int replacedInt `json:",omitempty"`
@ -40,6 +43,7 @@ func (x X) MarshalYAML() (interface{}, error) {
return &enc, nil return &enc, nil
} }
// UnmarshalYAML unmarshals from YAML.
func (x *X) UnmarshalYAML(unmarshal func(interface{}) error) error { func (x *X) UnmarshalYAML(unmarshal func(interface{}) error) error {
type X struct { type X struct {
Int *replacedInt `json:",omitempty"` Int *replacedInt `json:",omitempty"`
@ -54,6 +58,7 @@ func (x *X) UnmarshalYAML(unmarshal func(interface{}) error) error {
return nil return nil
} }
// MarshalTOML marshals as TOML.
func (x X) MarshalTOML() (interface{}, error) { func (x X) MarshalTOML() (interface{}, error) {
type X struct { type X struct {
Int replacedInt `json:",omitempty"` Int replacedInt `json:",omitempty"`
@ -63,6 +68,7 @@ func (x X) MarshalTOML() (interface{}, error) {
return &enc, nil return &enc, nil
} }
// UnmarshalTOML unmarshals from TOML.
func (x *X) UnmarshalTOML(unmarshal func(interface{}) error) error { func (x *X) UnmarshalTOML(unmarshal func(interface{}) error) error {
type X struct { type X struct {
Int *replacedInt `json:",omitempty"` Int *replacedInt `json:",omitempty"`

@ -7,6 +7,7 @@ import (
"errors" "errors"
) )
// MarshalJSON marshals as JSON.
func (x X) MarshalJSON() ([]byte, error) { func (x X) MarshalJSON() ([]byte, error) {
type X struct { type X struct {
Required int `gencodec:"required"` Required int `gencodec:"required"`
@ -18,6 +19,7 @@ func (x X) MarshalJSON() ([]byte, error) {
return json.Marshal(&enc) return json.Marshal(&enc)
} }
// UnmarshalJSON unmarshals from JSON.
func (x *X) UnmarshalJSON(input []byte) error { func (x *X) UnmarshalJSON(input []byte) error {
type X struct { type X struct {
Required *int `gencodec:"required"` Required *int `gencodec:"required"`

@ -8,6 +8,7 @@ import (
var _ = (*Xo)(nil) var _ = (*Xo)(nil)
// MarshalJSON marshals as JSON.
func (x X) MarshalJSON() ([]byte, error) { func (x X) MarshalJSON() ([]byte, error) {
type X struct { type X struct {
Slice []replacedInt Slice []replacedInt
@ -43,6 +44,7 @@ func (x X) MarshalJSON() ([]byte, error) {
return json.Marshal(&enc) return json.Marshal(&enc)
} }
// UnmarshalJSON unmarshals from JSON.
func (x *X) UnmarshalJSON(input []byte) error { func (x *X) UnmarshalJSON(input []byte) error {
type X struct { type X struct {
Slice []replacedInt Slice []replacedInt
@ -79,6 +81,7 @@ func (x *X) UnmarshalJSON(input []byte) error {
return nil return nil
} }
// MarshalYAML marshals as YAML.
func (x X) MarshalYAML() (interface{}, error) { func (x X) MarshalYAML() (interface{}, error) {
type X struct { type X struct {
Slice []replacedInt Slice []replacedInt
@ -114,6 +117,7 @@ func (x X) MarshalYAML() (interface{}, error) {
return &enc, nil return &enc, nil
} }
// UnmarshalYAML unmarshals from YAML.
func (x *X) UnmarshalYAML(unmarshal func(interface{}) error) error { func (x *X) UnmarshalYAML(unmarshal func(interface{}) error) error {
type X struct { type X struct {
Slice []replacedInt Slice []replacedInt
@ -150,6 +154,7 @@ func (x *X) UnmarshalYAML(unmarshal func(interface{}) error) error {
return nil return nil
} }
// MarshalTOML marshals as TOML.
func (x X) MarshalTOML() (interface{}, error) { func (x X) MarshalTOML() (interface{}, error) {
type X struct { type X struct {
Slice []replacedInt Slice []replacedInt
@ -185,6 +190,7 @@ func (x X) MarshalTOML() (interface{}, error) {
return &enc, nil return &enc, nil
} }
// UnmarshalTOML unmarshals from TOML.
func (x *X) UnmarshalTOML(unmarshal func(interface{}) error) error { func (x *X) UnmarshalTOML(unmarshal func(interface{}) error) error {
type X struct { type X struct {
Slice []replacedInt Slice []replacedInt

@ -125,6 +125,7 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/garslo/gogen"
"golang.org/x/tools/go/buildutil" "golang.org/x/tools/go/buildutil"
"golang.org/x/tools/go/loader" "golang.org/x/tools/go/loader"
"golang.org/x/tools/imports" "golang.org/x/tools/imports"
@ -249,22 +250,27 @@ func generate(mtyp *marshalerType, cfg *Config) ([]byte, error) {
writeUseOfOverride(w, mtyp.override, mtyp.scope.qualify) writeUseOfOverride(w, mtyp.override, mtyp.scope.qualify)
} }
for _, format := range cfg.Formats { for _, format := range cfg.Formats {
var genMarshal, genUnmarshal gogen.Function
switch format { switch format {
case "json": case "json":
writeFunction(w, mtyp.fs, genMarshalJSON(mtyp)) genMarshal = genMarshalJSON(mtyp)
fmt.Fprintln(w) genUnmarshal = genUnmarshalJSON(mtyp)
writeFunction(w, mtyp.fs, genUnmarshalJSON(mtyp))
case "yaml": case "yaml":
writeFunction(w, mtyp.fs, genMarshalYAML(mtyp)) genMarshal = genMarshalYAML(mtyp)
fmt.Fprintln(w) genUnmarshal = genUnmarshalYAML(mtyp)
writeFunction(w, mtyp.fs, genUnmarshalYAML(mtyp))
case "toml": case "toml":
writeFunction(w, mtyp.fs, genMarshalTOML(mtyp)) genMarshal = genMarshalTOML(mtyp)
fmt.Fprintln(w) genUnmarshal = genUnmarshalTOML(mtyp)
writeFunction(w, mtyp.fs, genUnmarshalTOML(mtyp))
default: default:
return nil, fmt.Errorf("unknown format: %q", format) return nil, fmt.Errorf("unknown format: %q", format)
} }
fmt.Fprintf(w, "// %s marshals as %s.", genMarshal.Name, strings.ToUpper(format))
fmt.Fprintln(w)
writeFunction(w, mtyp.fs, genMarshal)
fmt.Fprintln(w)
fmt.Fprintf(w, "// %s unmarshals from %s.", genUnmarshal.Name, strings.ToUpper(format))
fmt.Fprintln(w)
writeFunction(w, mtyp.fs, genUnmarshal)
fmt.Fprintln(w) fmt.Fprintln(w)
} }
return w.Bytes(), nil return w.Bytes(), nil

Loading…
Cancel
Save