From 115d20373c21b107a428a55247c64f900e116038 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 6 Apr 2019 22:18:25 +0200
Subject: Update tengo vendor and load the stdlib. Fixes #789 (#792)

---
 vendor/github.com/d5/tengo/objects/builtin_json.go | 60 ----------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 vendor/github.com/d5/tengo/objects/builtin_json.go

(limited to 'vendor/github.com/d5/tengo/objects/builtin_json.go')

diff --git a/vendor/github.com/d5/tengo/objects/builtin_json.go b/vendor/github.com/d5/tengo/objects/builtin_json.go
deleted file mode 100644
index b3413651..00000000
--- a/vendor/github.com/d5/tengo/objects/builtin_json.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package objects
-
-import (
-	"encoding/json"
-
-	"github.com/d5/tengo"
-)
-
-// to_json(v object) => bytes
-func builtinToJSON(args ...Object) (Object, error) {
-	if len(args) != 1 {
-		return nil, ErrWrongNumArguments
-	}
-
-	res, err := json.Marshal(objectToInterface(args[0]))
-	if err != nil {
-		return &Error{Value: &String{Value: err.Error()}}, nil
-	}
-
-	if len(res) > tengo.MaxBytesLen {
-		return nil, ErrBytesLimit
-	}
-
-	return &Bytes{Value: res}, nil
-}
-
-// from_json(data string/bytes) => object
-func builtinFromJSON(args ...Object) (Object, error) {
-	if len(args) != 1 {
-		return nil, ErrWrongNumArguments
-	}
-
-	var target interface{}
-
-	switch o := args[0].(type) {
-	case *Bytes:
-		err := json.Unmarshal(o.Value, &target)
-		if err != nil {
-			return &Error{Value: &String{Value: err.Error()}}, nil
-		}
-	case *String:
-		err := json.Unmarshal([]byte(o.Value), &target)
-		if err != nil {
-			return &Error{Value: &String{Value: err.Error()}}, nil
-		}
-	default:
-		return nil, ErrInvalidArgumentType{
-			Name:     "first",
-			Expected: "bytes/string",
-			Found:    args[0].TypeName(),
-		}
-	}
-
-	res, err := FromInterface(target)
-	if err != nil {
-		return nil, err
-	}
-
-	return res, nil
-}
-- 
cgit v1.2.3