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

Jump to bottom

Made JSON encoder a public function #443

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Made JSON encoder a public function #443

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1be12f8
Made JSON encoder a public function
eastside Dec 8, 2022
6facf3d
Added public Decode functionality to a Starlark value
eastside Dec 9, 2022
894d433
Removed some auto-indentions that were accidentally committed
eastside Dec 9, 2022
8a8b15c
Improved name of JSON encoding function and changed its return value …
eastside Dec 9, 2022
ad5c184
Fixing improper bytes/string conversion; Updating comments
eastside Dec 10, 2022
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
38 changes: 25 additions & 13 deletions lib/json/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,8 @@ var Module = &starlarkstruct.Module{
},
}

func encode(thread *starlark.Thread, b *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
var x starlark.Value
if err := starlark.UnpackPositionalArgs(b.Name(), args, kwargs, 1, &x); err != nil {
return nil, err
}

// Encodes the given Starlark value as a string in JSON format.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// Encode returns the JSON encoding of a Starlark value.

adonovan marked this conversation as resolved.
Show resolved Hide resolved
func Encode(x starlark.Value) ([]byte, error) {
buf := new(bytes.Buffer)

var quoteSpace [128]byte
Expand Down Expand Up @@ -221,9 +217,21 @@ func encode(thread *starlark.Thread, b *starlark.Builtin, args starlark.Tuple, k
}

if err := emit(x); err != nil {
return nil, err
}
return buf.Bytes(), nil
}

func encode(thread *starlark.Thread, b *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
var x starlark.Value
if err := starlark.UnpackPositionalArgs(b.Name(), args, kwargs, 1, &x); err != nil {
return nil, err
}
bytes, err := Encode(x)
if err != nil {
return nil, fmt.Errorf("%s: %v", b.Name(), err)
}
return starlark.String(buf.String()), nil
return starlark.String(string(bytes[:])), nil
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

String(bytes)

}

func pointer(i interface{}) unsafe.Pointer {
Expand Down Expand Up @@ -283,12 +291,8 @@ func indent(thread *starlark.Thread, b *starlark.Builtin, args starlark.Tuple, k
return starlark.String(buf.String()), nil
}

func decode(thread *starlark.Thread, b *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (_ starlark.Value, err error) {
var s string
if err := starlark.UnpackPositionalArgs(b.Name(), args, kwargs, 1, &s); err != nil {
return nil, err
}

// Decodes the given JSON-encoded string into a Starlark value.
func Decode(s string) (_ starlark.Value, err error) {
// The decoder necessarily makes certain representation choices
// such as list vs tuple, struct vs dict, int vs float.
// In principle, we could parameterize it to allow the caller to
Expand Down Expand Up @@ -510,6 +514,14 @@ func decode(thread *starlark.Thread, b *starlark.Builtin, args starlark.Tuple, k
return x, nil
}

func decode(thread *starlark.Thread, b *starlark.Builtin, args starlark.Tuple, kwargs []starlark.Tuple) (_ starlark.Value, err error) {
var s string
if err := starlark.UnpackPositionalArgs(b.Name(), args, kwargs, 1, &s); err != nil {
return nil, err
}
return Decode(s)
}

func isdigit(b byte) bool {
return b >= '0' && b <= '9'
}