@@ -8,15 +8,13 @@ import (
88 "log"
99 "os"
1010 "reflect"
11- "strings"
1211
1312 "github.com/mstgnz/transformer/node"
1413 "github.com/pkg/errors"
1514)
1615
1716var (
18- Knot * node.Node
19- Parent * node.Node
17+ Knot * node.Node
2018
2119 key string
2220 objStart bool
@@ -46,7 +44,7 @@ func ReadJson(filename string) ([]byte, error) {
4644// DecodeJson
4745// Converts a byte slice to a `node.Node` structure.
4846func DecodeJson (data []byte ) (* node.Node , error ) {
49- dec := json .NewDecoder (strings .NewReader (string ( data ) ))
47+ dec := json .NewDecoder (bytes .NewReader (data ))
5048 for {
5149 token , err := dec .Token ()
5250 if err == io .EOF || err != nil {
@@ -56,109 +54,94 @@ func DecodeJson(data []byte) (*node.Node, error) {
5654 value := fmt .Sprintf ("%v" , token )
5755 // If the type of the object is json.Delim
5856 if reflect .TypeOf (token ).String () == "json.Delim" {
59- jsonDelim (token , value )
57+ jsonDelim (value )
6058 } else {
61- nonJsonDelim (token , value )
59+ nonJsonDelim (value )
6260 }
6361 }
6462}
6563
6664// jsonDelim
67- func jsonDelim (token json.Token , value string ) {
68- // If no Node has been created yet, don't enter here, skip JSON start -> {
65+ func jsonDelim (value string ) {
6966 if ! Knot .Exists () {
67+ objStart = true
68+ Knot = & node.Node {}
7069 return
7170 }
72- // If the value of object token is a JSON object or array
7371 switch value {
7472 case "{" : // set open object - {
75- // If the key is not empty; this is an object. A new Node will be added next to the existing Node, and the newly added Node will return.
76- // If the key is empty; There is an array object, and the Node will be created in the array and the newly added Node will be returned.
7773 if arrStart && len (key ) == 0 {
78- // An object only starts without a key in an array.
79- Knot = Knot .AddToValue (Knot , node.Value {Node : & node.Node {Prev : Knot }})
74+ sub := & node.Node {}
75+ Knot .Value .Array = append (Knot .Value .Array , & node.Value {Node : sub })
76+ sub .Parent = Knot
77+ Knot = sub
8078 } else {
81- Knot = Knot .AddToNext (Knot , Parent , key )
79+ sub := & node.Node {}
80+ Knot .Next = & node.Node {Key : key , Value : & node.Value {Node : sub }, Prev : Knot , Parent : Knot .Parent }
81+ sub .Parent = Knot .Next
82+ Knot = sub
8283 }
83- Parent = Knot
8484 objStart = true
8585 arrStart = false
8686 key = ""
8787 case "[" : // set open array - [
88- // If the key is not null and objStart is true; The initial value of the Node will be set.
89- // If the key is not empty and objStart is false; A new Node will be created next to the Node.
90- // If the key is empty; this is a nested array object. will be added directly to the current Node's array.
9188 if len (key ) > 0 {
92- // If objStart is true, then the initial value of the Node is set.
9389 if objStart {
94- Knot = Knot .AddToValue (Knot , node.Value {Array : []node.Value {}})
90+ Knot .Key = key
91+ Knot .Value = & node.Value {Array : []* node.Value {}}
9592 } else {
96- // If objStart is false, a new Node is created next to the current Node.
97- Knot = Knot .AddToNext ( Knot , Parent , key )
93+ Knot . Next = & node. Node { Key : key , Value : & node. Value {}, Parent : Knot . Parent , Prev : Knot }
94+ Knot = Knot .Next
9895 }
99- Parent = Knot
10096 arrStart = true
10197 objStart = false
10298 arrCount ++
10399 key = ""
104- } else {
105- // If there is no key, it is a nested array.
106- _ = append (Knot .Value .Array , node.Value {Worth : value })
107100 }
108101 case "]" : // set close array
109- arrCount --
110102 arrStart = false
103+ if arrCount > 0 {
104+ arrCount --
105+ }
111106 case "}" : // set close object and set parent Node
112- Parent = nil
113- // if the parent is not empty
107+ objStart = false
108+ if arrCount > 0 {
109+ arrStart = true
110+ }
114111 if Knot .Parent != nil {
115- // if there is an unclosed array and there is no key
116- if arrCount > 0 && len (Knot .Key ) == 0 {
117- arrStart = true
118- }
119- // use parent as a node
120112 Knot = Knot .Parent
121- // assign the parent of the node as parent, it can be nil or node
122- Parent = Knot .Parent
123113 }
124114 default : // shouldn't go here
125- log .Println ("default not set -> " , token )
115+ log .Println ("default not set" )
126116 }
127117}
128118
129119// nonJsonDelim
130- func nonJsonDelim (_ json.Token , value string ) {
131- // If the loop object is not a json.Delim, the key and value fields will be set.
132- // Since the JSON object is a key-value pair, first the key will be set and then the value will be set.
120+ func nonJsonDelim (value string ) {
133121 if len (key ) == 0 {
134- // If an array object is open, this key-value is essentially an array object.
135- // If the array is not empty
136122 if arrStart {
137- _ = append (Knot .Value .Array , node.Value {Worth : value })
123+ Knot . Value . Array = append (Knot .Value .Array , & node.Value {Worth : value })
138124 } else {
139125 key = value
140126 }
141127 } else {
142- // If objStart is true, then the initial value of the Node is set.
143128 if objStart {
144- Knot = Knot .AddToValue (Knot , node.Value {Worth : value })
129+ Knot .Key = key
130+ Knot .Value = & node.Value {Worth : value }
145131 } else {
146- Knot = Knot .AddToNext (Knot , Parent , key )
132+ Knot .Next = & node.Node {Key : key , Parent : Knot .Parent , Prev : Knot }
133+ Knot .Next .Value = & node.Value {Worth : value }
134+ Knot = Knot .Next
147135 }
148- // Here objStart and key values are reset.
149136 objStart = false
150137 key = ""
151138 }
152139}
153140
154141// NodeToJson
155- // TODO test
156142func NodeToJson (node * node.Node ) ([]byte , error ) {
157- var (
158- buf bytes.Buffer
159- enc * json.Encoder
160- )
161- enc = json .NewEncoder (& buf )
143+ var buf bytes.Buffer
144+ enc := json .NewEncoder (& buf )
162145 enc .SetIndent (" " , " " )
163146 err := enc .Encode (node )
164147 if err != nil {
0 commit comments