Fix ifs naming and tests

Author: CodingMarkus

lib/psst/basic/ifs.inc.sh

@@ -9,16 +9,16 @@ esac
 INCLUDE_SEEN_PSST="$INCLUDE_SEEN_PSST _ifs.inc.sh_"
 
 
-# shellcheck source=stack.inc.sh
-. "$INCLUDE_PSST/basic/stack.inc.sh"
-
 # shellcheck source=assert.inc.sh
 . "$INCLUDE_PSST/basic/assert.inc.sh"
 
+# shellcheck source=stack.inc.sh
+. "$INCLUDE_PSST/basic/stack.inc.sh"
+
 
 ##
 # FUNCTION
-#	set_ifs_psst [<newValue>]
+#	ifs_set_psst [<newValue>]
 #
 # SUMMARY
 #	Save the current IFS value to a stack and replace it with a new value. New
@@ -33,17 +33,17 @@ INCLUDE_SEEN_PSST="$INCLUDE_SEEN_PSST _ifs.inc.sh_"
 #	1: Current $IFS value could not be saved.
 #
 # SAMPLE
-#	set_ifs_psst "$FS_CHAR_PSST"
+#	ifs_set_psst "$FS_CHAR_PSST"
 #
-set_ifs_psst()
+ifs_set_psst()
 {
 	#newIFSValue=$1
 
 	# We cannot use a subshell for this function as we need to register the
 	# variables in the main shell. Thus we need to be careful to not conflict
 	# when defining local variables.
 
-	_func_psst="set_ifs_psst"
+	_func_psst="ifs_set_psst"
 	assert_argc_psst "$_func_psst" 1 $#
 	unset _func_psst
 
@@ -57,22 +57,22 @@ set_ifs_psst()
 
 ##
 # FUNCTION
-#	restore_ifs_psst
+#	ifs_restore_psst
 #
 # SUMMARY
 #	Restore the last saved IFS value or set IFS to default if no value has been
 #	saved at all or all saved values have already been restored.
 ##
 # SAMPLE
-#	restore_ifs_psst
+#	ifs_restore_psst
 #
-restore_ifs_psst()
+ifs_restore_psst()
 {
 	# We cannot use a subshell for this function as we need to register the
 	# variables in the main shell. Thus we need to be careful to not conflict
 	# when defining local variables.
 
-	_func_psst="set_ifs_psst"
+	_func_psst="ifs_restore_psst"
 	assert_argc_psst "$_func_psst" 0 $#
 	unset _func_psst
 

test/basic/bin/test_ifs.sh

@@ -16,20 +16,17 @@ fi
 
 # set_ifs must accept exactly one argument
 set +e
-( abspath_psst 2>/dev/null )
+( ifs_set_psst 2>/dev/null )
 [ $? = 127 ] || test_fail_psst $LINENO
 
-( abspath_psst 1 2  2>/dev/null )
+( ifs_set_psst 1 2  2>/dev/null )
 [ $? = 127 ] || test_fail_psst $LINENO
 set -e
 
 
-# restore_ifs_psst must accept exactly no argument
+# ifs_restore must accept exactly no argument
 set +e
-( abspath_psst 2>/dev/null )
-[ $? = 127 ] || test_fail_psst $LINENO
-
-( abspath_psst 1 2  2>/dev/null )
+( ifs_restore_psst 1 2>/dev/null )
 [ $? = 127 ] || test_fail_psst $LINENO
 set -e
 
@@ -38,46 +35,46 @@ set -e
 # Test push, pop
 oldIFS="$IFS"
 
-set_ifs_psst "a" || test_fail_psst $LINENO
+ifs_set_psst "a" || test_fail_psst $LINENO
 test "$IFS" == "a" || test_fail_psst $LINENO
 
-restore_ifs_psst
+ifs_restore_psst
 test "$IFS" = "$oldIFS" || test_fail_psst $LINENO
 
 
 # Test push, push, pop, pop
 oldIFS="$IFS"
 
-set_ifs_psst "a" || test_fail_psst $LINENO
+ifs_set_psst "a" || test_fail_psst $LINENO
 test "$IFS" == "a" || test_fail_psst $LINENO
 
-set_ifs_psst "b" || test_fail_psst $LINENO
+ifs_set_psst "b" || test_fail_psst $LINENO
 test "$IFS" == "b" || test_fail_psst $LINENO
 
-restore_ifs_psst
+ifs_restore_psst
 test "$IFS" == "a" || test_fail_psst $LINENO
 
-restore_ifs_psst
+ifs_restore_psst
 test "$IFS" = "$oldIFS" || test_fail_psst $LINENO
 
 
 # Test push, push, pop, push, pop, pop
 oldIFS="$IFS"
 
-set_ifs_psst "a" || test_fail_psst $LINENO
+ifs_set_psst "a" || test_fail_psst $LINENO
 test "$IFS" == "a" || test_fail_psst $LINENO
 
-set_ifs_psst "b" || test_fail_psst $LINENO
+ifs_set_psst "b" || test_fail_psst $LINENO
 test "$IFS" == "b" || test_fail_psst $LINENO
 
-restore_ifs_psst
+ifs_restore_psst
 test "$IFS" == "a" || test_fail_psst $LINENO
 
-set_ifs_psst "c" || test_fail_psst $LINENO
+ifs_set_psst "c" || test_fail_psst $LINENO
 test "$IFS" == "c" || test_fail_psst $LINENO
 
-restore_ifs_psst
+ifs_restore_psst
 test "$IFS" == "a" || test_fail_psst $LINENO
 
-restore_ifs_psst
+ifs_restore_psst
 test "$IFS" = "$oldIFS" || test_fail_psst $LINENO