DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jshn: clear more variables on json_init, fix adding array elements

Browse source
This commit is contained in:
Felix Fietkau 2011-08-11 15:29:23 -06:00
parent bdf717425a
commit ec56b91662
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sh/jshn.sh
View file

@ -10,7 +10,7 @@ jshn_append() {
json_init() { json_init() {
[ -n "$JSON_UNSET" ] && eval "unset $JSON_UNSET" [ -n "$JSON_UNSET" ] && eval "unset $JSON_UNSET"
export -- JSON_SEQ=0 JSON_STACK= JSON_CUR="JSON_VAR" JSON_UNSET= export -- JSON_SEQ=0 JSON_STACK= JSON_CUR="JSON_VAR" JSON_UNSET="" KEYS_JSON_VAR= TYPE_JSON_VAR=
} }
json_add_generic() { json_add_generic() {
@ -19,6 +19,12 @@ json_add_generic() {
local val="$3" local val="$3"
local cur="${4:-$JSON_CUR}" local cur="${4:-$JSON_CUR}"
[ "${cur%%[0-9]*}" = "JSON_ARRAY" ] && {
eval "local aseq=\"\${SEQ_$cur}\""
var=$(( ${aseq:-0} + 1 ))
export -- "SEQ_$cur=$var"
}
export -- "${cur}_$var=$val" export -- "${cur}_$var=$val"
export -- "TYPE_${cur}_$var=$type" export -- "TYPE_${cur}_$var=$type"
jshn_append JSON_UNSET "${cur}_$var TYPE_${cur}_$var" jshn_append JSON_UNSET "${cur}_$var TYPE_${cur}_$var"
@ -26,18 +32,20 @@ json_add_generic() {
} }
json_add_table() { json_add_table() {
local TYPE="$1"
JSON_SEQ=$(($JSON_SEQ + 1)) JSON_SEQ=$(($JSON_SEQ + 1))
jshn_append JSON_STACK "$JSON_CUR" jshn_append JSON_STACK "$JSON_CUR"
local table="JSON_TABLE$JSON_SEQ" local table="JSON_$TYPE$JSON_SEQ"
export -- "UP_$table=$JSON_CUR" export -- "UP_$table=$JSON_CUR"
export -- "KEYS_$table=" export -- "KEYS_$table="
jshn_append JSON_UNSET "KEYS_$table UP_$table" jshn_append JSON_UNSET "KEYS_$table UP_$table"
[ "$TYPE" = "ARRAY" ] && jshn_append JSON_UNSET "SEQ_$table"
JSON_CUR="$table" JSON_CUR="$table"
} }
json_add_object() { json_add_object() {
local cur="$JSON_CUR" local cur="$JSON_CUR"
json_add_table json_add_table TABLE
json_add_generic object "$1" "$JSON_CUR" "$cur" json_add_generic object "$1" "$JSON_CUR" "$cur"
} }
@ -50,7 +58,7 @@ json_close_object() {
json_add_array() { json_add_array() {
local cur="$JSON_CUR" local cur="$JSON_CUR"
json_add_table json_add_table ARRAY
json_add_generic array "$1" "$JSON_CUR" "$cur" json_add_generic array "$1" "$JSON_CUR" "$cur"
} }