Improve performance of basic conv module

Author: CodingMarkus

lib/psst/basic/conv.inc.sh

@@ -28,33 +28,46 @@ INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-} _conv.inc.sh_"
 #	charCode: Character code of desired character.
 #
 # RETURNS
-#	0: Character code was valid.
-#	1: Character code was no integer number.
-#	2: Character code was out of valid range (0-255).
-#   3: Character code is newline (`\n``), which cannot be captured.
+#	0: Success.
+#	2: Character code was no integer number.
+#	3: Character code was out of valid range (0-255).
+#   4: One or more trailing newline characters (\n) have been dropped.
 #
 # OUTPUT
 #	stdout: The character whose code is `charCode`.
 #
+# NOTE
+#	To prevent that trailing newlines are getting dropped, just append an extra
+#	charcode and later on strip that char again as shown in the sample code.
+#
 # SAMPLE
 #	digit9=$( chr_psst 57 )
 #
+#	# Prevent newlines from getting dropped
+#	newline=$( chr_psst 10 95 )
+#	newline=${newline%_} # strip "_" at end as 95 == "_"
+#
 conv_chr_psst()
 (
 	func="chr_psst"
 	assert_minargc_psst "$func" 1 $#
 	assert_hasarg_psst "$func" "charCode" "$1"
 
-	while [ -n "${1-}" ]
+	for char in "$@"
 	do
-		charCode=$1
-		test_is_int_psst "$charCode" || return 1
-		{ [ "$charCode" -lt 0 ] || [ "$charCode" -gt 255 ]; } && return 2
-		[ "$charCode" != "10" ] || return 3
-
-		printf "%b" "$( printf '\%o' "$charCode" )"
-		shift
+		test_is_int_psst "$char" || return 2;
+		{ [ "$char" -lt 0 ] || [ "$char" -gt 255 ]; } && return 3
 	done
+
+	if [ $# -eq 1 ]
+	then
+		printf "%b" "$( printf '\\0%o' "$char" )"
+	else
+		printf "%s" "$*" | xargs printf '\\\\0%o' | xargs printf "%b"
+	fi
+
+	[ "$char" -eq 10 ] && return 4
+	return 0
 )
 
 
@@ -87,16 +100,7 @@ conv_ord_psst()
 	chars=$1
 	[ ${#chars} -eq 1 ] && { LC_CTYPE=C printf "%d" "'$chars"; return 0; }
 
-	printf "%s" "$chars" | (
-		sep=
-		while read -r _unused_ octalValue <<EOF
-$( dd bs=1 count=1 2>/dev/null | od -b )
-EOF
-		do
-			[ -n "$octalValue" ] || return 0
-			LC_CTYPE=C printf "%s%d" "$sep" "0$octalValue"
-			sep=" "
-		done
-	)
-
+	printf "%s" "$chars" \
+		| od -t u1 \
+		| awk '{for(i=2;i<=NF;i++){printf "%s%s",sep,$i;sep=" "}}'
 )

test/basic/bin/test_conv.sh

@@ -32,12 +32,12 @@ set -e
 
 # Argument must be integer number
 conv_chr_psst "abc" >/dev/null || {
-	[ $? = 1 ] || test_fail_psst $LINENO
+	[ $? = 2 ] || test_fail_psst $LINENO
 }
 
 # Argument must be in valid range
 conv_chr_psst "350"  >/dev/null || {
-	[ $? = 2 ] || test_fail_psst $LINENO
+	[ $? = 3 ] || test_fail_psst $LINENO
 }
 
 
@@ -48,12 +48,12 @@ conv_chr_psst "350"  >/dev/null || {
 [ "$( conv_chr_psst 65 97 32 )" = "Aa " ] || test_fail_psst $LINENO
 
 
-[ "$( conv_chr_psst 10 )" = "" ] || test_fail_psst $LINENO
-if conv_chr_psst "10"  >/dev/null
+[ "$( conv_chr_psst 65 10 )" = "A" ] || test_fail_psst $LINENO
+if conv_chr_psst 65 10  >/dev/null
 then
 	test_fail_psst $LINENO
 else
-	[ $? = 3 ] || test_fail_psst $LINENO
+	[ $? = 4 ] || test_fail_psst $LINENO
 fi
 
 
@@ -81,4 +81,12 @@ set -e
 [ "$( conv_ord_psst " " )" = 32 ] || test_fail_psst $LINENO
 [ "$( conv_ord_psst "$NL_CHAR_PSST" )" = 10 ] || test_fail_psst $LINENO
 [ "$( conv_ord_psst "Aa " )" = "65 97 32" ] || test_fail_psst $LINENO
-[ "$( conv_ord_psst "A$NL_CHAR_PSST" )" = "65 10" ] || test_fail_psst $LINENO
+[ "$( conv_ord_psst "A$NL_CHAR_PSST" )" = "65 10" ] || test_fail_psst $LINENO
+
+# =============================================================================
+# Test ord-chr roundtrip
+
+testStr="Hello World! How are you today?"
+testStr2=$( conv_ord_psst "$testStr" )
+testStr3=$( eval "conv_chr_psst $testStr2" )
+[ "$testStr" = "$testStr3" ] || test_fail_psst $LINENO