diff options
author | tv <tv@also> | 2010-11-03 16:26:00 +0100 |
---|---|---|
committer | tv <tv@also> | 2010-11-03 16:26:00 +0100 |
commit | 1b9f91da01ae46d7d316c676ce2c121dd2a9588f (patch) | |
tree | ae5321f371b882ac5af6a948f70fbc782284e413 /json.sh | |
parent | 2439a77d0c4f77420edb04e77be6aa664b85f842 (diff) |
json.sh: renamed types like STR -> string
Diffstat (limited to 'json.sh')
-rwxr-xr-x | json.sh | 81 |
1 files changed, 44 insertions, 37 deletions
@@ -3,6 +3,8 @@ set -euf # TODO check json first +# XXX json_key is something like PWD^^ + normalize_json() { sed -rn ' 1s/^/cat<<EOF\n/ @@ -19,8 +21,8 @@ json_to_sh() { s/\[/begin_json_array;/g; s/\]/end_json_array;/g s/\{/begin_json_object;/g; s/\}/end_json_object;/g s/("[^"]+"):/json_set_key \1;/g - s/;("[^"]+")/;json_set STR \1;/g - s/;([0-9]+)/;json_set INT `echo -n \1 | base64`;/g + s/;("[^"]+")/;json_set string \1;/g + s/;([0-9]+)/;json_set number `echo -n \1 | base64`;/g s/;;/;/g s/;/\n/g p @@ -31,12 +33,11 @@ begin_json_object() { push_key %%%MAKEJSONOBJ%%% } end_json_object() { - #echo end_json_object: $key >&2 - #echo `echo "$key_stack" | head -n 1` >&2 + #echo end_json_object: $json_key >&2 pop_key # TODO check if is %%%MAKEJSONOBJ%%% - set -- `print_key` - #echo object: $1 >&2; set | sed -rn "s/^($1_[a-zA-Z]+)_VALUE=(.*)/\1/p" >&2 - json_set OBJ "`set | sed -rn "s/^($1_[a-zA-Z]+)_VALUE=(.*)/\1/p"`" + #echo obj: $1 `set | sed -rn "s/^(${json_key}_[a-zA-Z]+)_VALUE=(.*)/\1/p"` >&2 + #json_set object "`set | sed -rn "s/^(${json_key}_[a-zA-Z]+)_VALUE=(.*)/\1/p"`" + json_set object "`set | sed -rn "s/^(${json_key}_[a-zA-Z]+)=(.*)/\1/p"`" } begin_json_array() { :; } end_json_array() { :; } @@ -48,62 +49,68 @@ json_set_key() { json_push_key "$1" } json_set() { - ##echo "`print_key`$1=$2 (`echo -n $2 | base64 -d`)" >&2 - #echo "`print_key`TYPE=$1" >&2 - #echo "`print_key`VALUE=\"$2\"" >&2 # (`echo -n $2 | base64 -d`)" >&2 - eval "`print_key`_TYPE=$1" - eval "`print_key`_VALUE=\"$2\"" + ##echo "typeof_$json_key=$1" >&2 + ##echo "${json_key}_VALUE=\"$2\"" >&2 # (`echo -n $2 | base64 -d`)" >&2 + #eval "${json_key}_TYPE=$1" + #eval "${json_key}_VALUE=\"$2\"" + eval "typeof_${json_key}=$1" + eval "${json_key}=\"$2\"" } push_key() { - key="${key+${key}_}$1" - #key_stack="$1 -#$key_stack" + json_key="${json_key+${json_key}_}$1" } pop_key() { - key="`echo $key | sed 's/_[^_]\+$//'`" - #key_stack="`echo "$key_stack" | sed 1d`" -} -print_key() { - ##echo \<`echo print_key: $key`, `echo "$key_stack" | tac | tr '\n' _`\> >&2 - #echo "$key_stack" | tac | tr '\n' _ - echo -n "$key" + json_key="`echo $json_key | sed 's/_[^_]\+$//'`" } json() { - #eval echo "\"\$`echo -n JSON "$@" | tr "$IFS" _`\" | base64 -d" - NAME="`echo -n JSON "$@" | tr "$IFS" _`" - eval "TYPE=\"\$${NAME}_TYPE\"" + #eval echo "\"\$`echo -n "$json_key" "$@" | tr "$IFS" _`\" | base64 -d" + NAME="`echo -n "$json_key" "$@" | tr "$IFS" _`" + #eval "TYPE=\"\$${NAME}_TYPE\"" + eval "TYPE=\"\$typeof_$NAME\"" echo -n "$TYPE $NAME: " case "$TYPE" in - (OBJ) - eval echo -n \$${NAME}_VALUE + (object) + #eval echo -n \$${NAME}_VALUE + eval echo -n \$$NAME ;; #set | sed -rn "s/^(${NAME})_([a-zA-Z]+)[a-zA-Z_]*_VALUE=(.*)/\1_\2/p" | # sort | uniq | tr \\n \ ;; (*) #echo -n "$VALUE";; #eval "VALUE=\"\$(echo -n \"\$${NAME}_VALUE\" | base64 -d)\"" - eval echo -n \"\$${NAME}_VALUE\" | base64 -d + #eval echo -n \"\$${NAME}_VALUE\" | base64 -d + eval echo -n \$${NAME} | base64 -d esac echo } -key='JSON' -#key_stack='JSON' -meh="`cat`" -echo "$meh" -#echo "$meh" | normalize_json | json_to_sh; exit -eval "`echo "$meh" | normalize_json | json_to_sh`" -#echo ==== -#set | grep '^JSON[A-Za-z_]*=' -#echo ==== +read_json() { + json_key="${1-JSON}" + #meh="`cat`" + #echo "$meh" + ##echo "$meh" | normalize_json | json_to_sh; exit + #eval "`echo "$meh" | normalize_json | json_to_sh`" + eval "`normalize_json | json_to_sh`" +} + +# TODO print_json x, print_json x ca ... to print as json + +read_json x +echo ==== +set | egrep "^(typeof_)?$json_key[A-Za-z_]*=" +echo ==== json json a json b json c json c ca json c cb +json d +#echo ==== +#echo $JSON_VALUE +#echo $JSON_c_cb_VALUE | base64 -d; echo echo READY. #### End of file. |