A snapshot of the development tree. The substantial changes since the last one:
COMMAND OUTPUT POLICY. The three commands display text in exactly three cases,
and each owns a stream: LOGGING under "-v" greater than 0 and an ERROR before
termination go to STDERR; OUTPUT THE USER ASKED FOR goes to STDOUT. For ktext
that output is a document, so "ktext doc.kt -d | ..." is now safe -- logging
used to share the stream and land inside the document. A bare command prints
its usage and succeeds rather than failing. Colour is emitted only to a
terminal, per stream, and NO_COLOR is honoured.
"-v 1" reports every decision whose outcome you could not have read off your own
input: the klammerset that was loaded and from which file, a font's directory, a
":files" name's file, how "-o" was expanded. Higher levels are the trace.
The commands no longer warn and continue: an anomaly is an error, described with
its location. Two exceptions remain, each for a stated reason -- a condition
that is expected and temporary by design, and a judgment that is a heuristic
rather than exact.
@cond IS NOW A TRUE SPECIAL FORM, resolved at APPLICATION time rather than when
the file is read. Two consequences for a writer:
* a state variable reaches the predicate. "@@@state Flag :value true @@@
@cond *Flag* | T | F @" renders "T"; it used to see the literal "*Flag*" and
silently take the false branch. The document now behaves like a klammer
body, whose arguments are bound before its conditionals are decided.
* nothing in a discarded branch happens -- it is not read, not evaluated, not
expanded. An @eval in the branch not taken used to run anyway.
Its predicate relation is total and strict: true, True, 1; false, False, 0, and
empty; anything else is an error at the @cond rather than silently false.
@eval REACHING OUTSIDE. ":shell" and ":haskell" now keep the command's standard
error out of the document (it appears under "-v 1") and treat a nonzero exit as
an error naming what the command reported. A command that exits nonzero on
purpose -- "grep" finding no match -- says so with "|| true".
KLAMMER SETS. Several combine: "--klammersets a b c" loads all three in the
order given, sharing one namespace, with the definition modes deciding
collisions. "none" means none and may not be combined with other symbols. A
klammerset with symbol X is declared in a file X/X.k, which is what lets two
sets require the same third set without loading it twice.
TESTS. Four new suites: the kdiag command's interface, the @eval primitive's
contract with the outside world, and verbosity at both tiers. Three suites
that could not run on macOS at all now do.
Assembled from dev commit 6c8ee6c22fca.
149 lines
4.8 KiB
Bash
Executable File
149 lines
4.8 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# filename_test.sh — Regression tests for filenames containing spaces.
|
|
#
|
|
# Filenames may contain spaces. The rules (see CLAUDE.md "Output directory
|
|
# policy" and the filename-list functions in mac/file.cpp):
|
|
# - argv boundaries are authoritative: a shell-quoted "my file.kt" is one
|
|
# filename (Argv stores the original argv vector; nothing re-splits it).
|
|
# - A filename LIST is separated by a standalone "/" token (whitespace on
|
|
# both sides) — never a legal input filename, since "/" alone is the
|
|
# root directory.
|
|
# - Rescue: without a separator, whitespace-split names that do not exist
|
|
# are greedily rejoined with their neighbors into names that do; the
|
|
# regrouping is announced on stderr.
|
|
# - A leading "~/" expands to $HOME (shells do not expand a quoted tilde).
|
|
#
|
|
# Engine tier: uses --klammersets none; no SKS.
|
|
#
|
|
# Usage: ./filename_test.sh
|
|
# Exit code: 0 if all tests pass, 1 otherwise.
|
|
|
|
PASS=0
|
|
FAIL=0
|
|
KTEXT=ktext
|
|
K=${KLAMMERTEXT_HOME:?KLAMMERTEXT_HOME must be set}
|
|
|
|
red=$'\033[31m'
|
|
green=$'\033[32m'
|
|
bold=$'\033[1m'
|
|
reset=$'\033[0m'
|
|
|
|
# Scratch input files
|
|
DIR=$(mktemp -d)
|
|
trap 'rm -rf "$DIR"' EXIT
|
|
mkdir "$DIR/my dir"
|
|
printf 'ALPHA\n' > "$DIR/my file.kt"
|
|
printf 'BETA\n' > "$DIR/b.kt"
|
|
printf 'GAMMA\n' > "$DIR/my dir/c.kt"
|
|
cd "$DIR" || exit 1
|
|
|
|
# check TEST_NAME EXPECTED_STDOUT EXPECTED_STDERR_SUBSTRING KTEXT_ARGS...
|
|
# EXPECTED_STDERR_SUBSTRING may be "" (no stderr requirement).
|
|
check() {
|
|
local test_name="$1" expected="$2" err_needle="$3"
|
|
shift 3
|
|
local output status errfile=$DIR/.stderr
|
|
output=$("$KTEXT" "$@" 2>"$errfile")
|
|
status=$?
|
|
output=$(printf '%s' "$output" | sed -e 's/[ \t]*$//' | grep -v '^$')
|
|
if [ $status -ne 0 ]; then
|
|
echo "${red}FAIL${reset} $test_name — ktext exited $status"
|
|
echo " stderr: $(head -3 "$errfile")"
|
|
FAIL=$((FAIL + 1))
|
|
return
|
|
fi
|
|
if [ "$output" != "$expected" ]; then
|
|
echo "${red}FAIL${reset} $test_name"
|
|
echo " expected: [$expected]"
|
|
echo " got: [$output]"
|
|
FAIL=$((FAIL + 1))
|
|
return
|
|
fi
|
|
if [ -n "$err_needle" ] && ! grep -qF "$err_needle" "$errfile"; then
|
|
echo "${red}FAIL${reset} $test_name — expected stderr to contain [$err_needle]"
|
|
echo " stderr: $(head -3 "$errfile")"
|
|
FAIL=$((FAIL + 1))
|
|
return
|
|
fi
|
|
echo "${green}PASS${reset} $test_name"
|
|
PASS=$((PASS + 1))
|
|
}
|
|
|
|
# check_error TEST_NAME EXPECTED_SUBSTRING KTEXT_ARGS...
|
|
# Expects a nonzero exit whose combined output contains EXPECTED_SUBSTRING.
|
|
check_error() {
|
|
local test_name="$1" needle="$2"
|
|
shift 2
|
|
local output status
|
|
output=$("$KTEXT" "$@" 2>&1)
|
|
status=$?
|
|
if [ $status -eq 0 ]; then
|
|
echo "${red}FAIL${reset} $test_name — expected an error, got exit 0"
|
|
FAIL=$((FAIL + 1))
|
|
return
|
|
fi
|
|
if echo "$output" | grep -qF "$needle"; then
|
|
echo "${green}PASS${reset} $test_name"
|
|
PASS=$((PASS + 1))
|
|
else
|
|
echo "${red}FAIL${reset} $test_name — expected output to contain [$needle]"
|
|
echo " output: $(echo "$output" | head -3)"
|
|
FAIL=$((FAIL + 1))
|
|
fi
|
|
}
|
|
|
|
echo "${bold}Filename-with-spaces tests${reset}"
|
|
echo "======================="
|
|
|
|
check "1. quoted filename with a space is one file" \
|
|
"ALPHA" "" \
|
|
"my file.kt" -d --klammersets none
|
|
|
|
# The regrouping is a DERIVED value -- the command completed a name the input
|
|
# left ambiguous -- so since 2026-08-15 it is reported at "-v 1" and the
|
|
# default run is silent. Silence is safe because a rescue only succeeds when
|
|
# the joined name names an existing file: a mistyped name fails instead of
|
|
# resolving to something else.
|
|
check "2. unquoted spaces are rescued into an existing file" \
|
|
"ALPHA" "" \
|
|
my file.kt -d --klammersets none
|
|
|
|
check "2a. ... silently at the default verbosity" \
|
|
"ALPHA" "" \
|
|
my file.kt -d --klammersets none
|
|
|
|
check "2b. ... and reported at -v 1" \
|
|
"ALPHA" "interpreting \"my file.kt\" as one filename" \
|
|
my file.kt -d --klammersets none -v 1
|
|
|
|
check "3. standalone / separates a filename list" \
|
|
"ALPHA
|
|
BETA" "" \
|
|
my file.kt / b.kt -d --klammersets none
|
|
|
|
check "4. space in a directory component" \
|
|
"GAMMA" "" \
|
|
"my dir/c.kt" -d --klammersets none
|
|
|
|
check "5. quoted name that exists is never split (b.kt also exists)" \
|
|
"ALPHA" "" \
|
|
"my file.kt" -d --klammersets none
|
|
|
|
HOME="$DIR" check "6. quoted ~/ expands to \$HOME inside ktext" \
|
|
"BETA" "" \
|
|
"~/b.kt" -d --klammersets none
|
|
|
|
check "7. @read argument keeps its internal space" \
|
|
"ALPHA" "" \
|
|
-s '@read my file.kt @' -d --klammersets none
|
|
|
|
check_error "8. unrescuable name is reported as written" \
|
|
"no such.kt" \
|
|
"no such.kt" -d --klammersets none
|
|
|
|
echo
|
|
echo "======================="
|
|
echo "Results: ${green}$PASS passed${reset}, ${red}$FAIL failed${reset}"
|
|
[ $FAIL -eq 0 ]
|