Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aathan combined -- all aathan PRs combined #981

Open
wants to merge 7 commits into
base: v3
Choose a base branch
from
Open

Aathan combined -- all aathan PRs combined #981

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
964fd91
better detection of pointer receivers
aathan Aug 9, 2023
037bd8c
marshal opts
aathan Aug 9, 2023
1bb0e7d
Merge branch 'pointer_receivers' into aathan_combined
aathan Aug 9, 2023
968d7bf
fix isZero for pointer receivers
aathan Aug 9, 2023
7c0ebd4
Merge branch 'pointer_receivers' into aathan_combined
aathan Aug 9, 2023
0ec6209
struct_opter
aathan Aug 9, 2023
c585ce6
pass tag to isZero
aathan Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 36 additions & 23 deletions encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"sort"
"strconv"
"strings"
"time"
"unicode/utf8"
)

Expand Down Expand Up @@ -123,31 +122,34 @@ func (e *encoder) marshalDoc(tag string, in reflect.Value) {

func (e *encoder) marshal(tag string, in reflect.Value) {
tag = shortTag(tag)
if !in.IsValid() || in.Kind() == reflect.Ptr && in.IsNil() {
if !in.IsValid() { //|| in.Kind() == reflect.Ptr && in.IsNil() {
e.nilv()
return
}

iface := in.Interface()
switch value := iface.(type) {
case *Node:
e.nodev(in)
if iface == nil {
e.nilv()
return
case Node:
if !in.CanAddr() {
var n = reflect.New(in.Type()).Elem()
}

if in.Kind() != reflect.Ptr && in.Kind() != reflect.Interface {
if in.CanAddr() {
iface = in.Addr().Interface()
} else {
// uh, not sure about this but look at this project's original Node: case...
n := reflect.New(in.Type()).Elem()
n.Set(in)
in = n
iface = n.Addr().Interface()
}
e.nodev(in.Addr())
return
case time.Time:
e.timev(tag, in)
return
case *time.Time:
e.timev(tag, in.Elem())
return
case time.Duration:
e.stringv(tag, reflect.ValueOf(value.String()))
}

switch value := iface.(type) {
//case *time.Duration:
// e.stringv(tag, reflect.ValueOf(value.String()))
// return
case *Node:
e.nodev(in)
return
case Marshaler:
v, err := value.MarshalYAML(e.arg)
Expand All @@ -156,20 +158,25 @@ func (e *encoder) marshal(tag string, in reflect.Value) {
}
if v == nil {
e.nilv()
return
} else {
e.marshal(tag, reflect.ValueOf(v))
}
e.marshal(tag, reflect.ValueOf(v))
return
case encoding.TextMarshaler:
text, err := value.MarshalText()
if err != nil {
fail(err)
}
in = reflect.ValueOf(string(text))
e.rawstringv(tag, string(text))
return
case fmt.Stringer:
e.rawstringv(tag, value.String())
return
case nil:
e.nilv()
return
}

switch in.Kind() {
case reflect.Interface:
e.marshal(tag, in.Elem())
Expand Down Expand Up @@ -335,8 +342,12 @@ func isOldBool(s string) (result bool) {
}

func (e *encoder) stringv(tag string, in reflect.Value) {
var style yaml_scalar_style_t
s := in.String()
e.rawstringv(tag, s)
}

func (e *encoder) rawstringv(tag string, s string) {
var style yaml_scalar_style_t
canUsePlain := true
switch {
case !utf8.ValidString(s):
Expand Down Expand Up @@ -395,11 +406,13 @@ func (e *encoder) uintv(tag string, in reflect.Value) {
e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE, nil, nil, nil, nil)
}

/* Handled by TextMarshaler in time.Time
func (e *encoder) timev(tag string, in reflect.Value) {
t := in.Interface().(time.Time)
s := t.Format(time.RFC3339Nano)
e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE, nil, nil, nil, nil)
}
*/

func (e *encoder) floatv(tag string, in reflect.Value) {
// Issue #352: When formatting, use the precision of the underlying value
Expand Down