Skip to content

Commit

Permalink
Use printf %q for simplicity and binary safety
Browse files Browse the repository at this point in the history 
Minor performance improvement from 11.331s to 10.937s.

Now it's able to hold arbitrary null-terminated bytes.
  • Loading branch information
@Artoria2e5
Artoria2e5 authored Sep 16, 2016
1 parent e38b282 commit 459f98d
Showing 1 changed file with 12 additions and 126 deletions.
138 changes: 12 additions & 126 deletions quinedb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,79 +10,22 @@ declare -A db
db=(
)

pr_str () {
s="$1"
if [[ "$s" =~ ^[-a-zA-Z0-9]+$ ]]; then
echo "$s"
else
ret=\$\'
for (( i=0; i<${#s}; i++ )); do
c="${s:$i:1}"
if [[ "$c" =~ [-_a-zA-Z0-9\ ] ]]; then
ret+="$c"
else
case "$c" in
$'\a')
ret+="\\a"
;;
$'\b')
ret+="\\b"
;;
$'\e')
ret+="\\e"
;;
$'\E')
ret+="\\E"
;;
$'\f')
ret+="\\f"
;;
$'\n')
ret+="\\n"
;;
$'\r')
ret+="\\r"
;;
$'\t')
ret+="\\t"
;;
$'\v')
ret+="\\v"
;;
$'\\')
ret+="\\\\"
;;
$'\'')
ret+="\\"\'
;;
$'\"')
ret+="\\"\"
;;
else)
ret+="\\$c"
esac
fi
done
echo "${ret}"\'
fi
}

print_db(){
echo "db=("
i=0
for k in "${!db[@]}"; do
escaped_keys[$i]=$(pr_str "$k")
escaped_keys[$i]=$(printf %q "$k")
i=$((i+1))
done

# sort the keys for deterministic printing
IFS=$'\n' sorted=($(for l in ${escaped_keys[@]}; do echo $l; done | sort))
IFS=$'\n' sorted=($(printf '%s' "${escaped_keys[*]}" | sort))
unset IFS

for k in "${sorted[@]}"; do
unescaped=$(eval "echo $k")
v=${db["$unescaped"]}
echo " [$k]=$(pr_str "$v")"
echo " [$k]=$(printf %q "$v")"
done
echo ")"
}
Expand All @@ -100,79 +43,22 @@ EOF
)

SEC2=$(cat <<'EOF'
pr_str () {
s="$1"
if [[ "$s" =~ ^[-a-zA-Z0-9]+$ ]]; then
echo "$s"
else
ret=\$\'
for (( i=0; i<${#s}; i++ )); do
c="${s:$i:1}"
if [[ "$c" =~ [-_a-zA-Z0-9\ ] ]]; then
ret+="$c"
else
case "$c" in
$'\a')
ret+="\\a"
;;
$'\b')
ret+="\\b"
;;
$'\e')
ret+="\\e"
;;
$'\E')
ret+="\\E"
;;
$'\f')
ret+="\\f"
;;
$'\n')
ret+="\\n"
;;
$'\r')
ret+="\\r"
;;
$'\t')
ret+="\\t"
;;
$'\v')
ret+="\\v"
;;
$'\\')
ret+="\\\\"
;;
$'\'')
ret+="\\"\'
;;
$'\"')
ret+="\\"\"
;;
else)
ret+="\\$c"
esac
fi
done
echo "${ret}"\'
fi
}
print_db(){
echo "db=("
i=0
for k in "${!db[@]}"; do
escaped_keys[$i]=$(pr_str "$k")
escaped_keys[$i]=$(printf %q "$k")
i=$((i+1))
done
# sort the keys for deterministic printing
IFS=$'\n' sorted=($(for l in ${escaped_keys[@]}; do echo $l; done | sort))
IFS=$'\n' sorted=($(printf '%s' "${escaped_keys[*]}" | sort))
unset IFS
for k in "${sorted[@]}"; do
unescaped=$(eval "echo $k")
v=${db["$unescaped"]}
echo " [$k]=$(pr_str "$v")"
echo " [$k]=$(printf %q "$v")"
done
echo ")"
}
Expand Down Expand Up @@ -201,9 +87,9 @@ print_self(){
case "$1" in
"get")
if [ ${db["$2"]+_} ]; then
if [ "${db["$2"]+_}" ]; then
v=${db["$2"]}
echo "$(pr_str "$v")" >&2
echo "$(printf %q "$v")" >&2
fi
;;
"set")
Expand All @@ -215,7 +101,7 @@ case "$1" in
echo 'OK' >&2
;;
"keys")
for k in "${!db[@]}"; do echo "$(pr_str "$k")"; done >&2
for k in "${!db[@]}"; do echo "$(printf %q "$k")"; done >&2
;;
*)
echo "USAGE: quinedb [get k | set k v | delete k | keys]" >&2
Expand Down Expand Up @@ -247,9 +133,9 @@ print_self(){

case "$1" in
"get")
if [ ${db["$2"]+_} ]; then
if [ "${db["$2"]+_}" ]; then
v=${db["$2"]}
echo "$(pr_str "$v")" >&2
echo "$(printf %q "$v")" >&2
fi
;;
"set")
Expand All @@ -261,7 +147,7 @@ case "$1" in
echo 'OK' >&2
;;
"keys")
for k in "${!db[@]}"; do echo "$(pr_str "$k")"; done >&2
for k in "${!db[@]}"; do echo "$(printf %q "$k")"; done >&2
;;
*)
echo "USAGE: quinedb [get k | set k v | delete k | keys]" >&2
Expand Down

0 comments on commit 459f98d

Please sign in to comment.