mirror of
https://github.com/Nexoniarz/Finch.git
synced 2026-11-03 00:44:27 +00:00
Rename the Finch file extension from .fn to .fch
.fn is already used by other tools (e.g. Fennel). Modules are now looked up as name.fch; a leftover name.fn gets a clear message telling you to rename it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
01c5badc3e
commit
f897fb3140
92 changed files with 160 additions and 144 deletions
|
|
@ -7,10 +7,10 @@ cd "$(dirname "$0")/.."
|
|||
tmp=$(mktemp -d)
|
||||
trap 'rm -rf "$tmp"' EXIT
|
||||
|
||||
build/finch build boot/main.fn -o "$tmp/boot1" || exit 1
|
||||
"$tmp/boot1" build boot/main.fn -o "$tmp/boot2" || exit 1
|
||||
"$tmp/boot1" ir boot/main.fn > "$tmp/stage2.ll"
|
||||
"$tmp/boot2" ir boot/main.fn > "$tmp/stage3.ll"
|
||||
build/finch build boot/main.fch -o "$tmp/boot1" || exit 1
|
||||
"$tmp/boot1" build boot/main.fch -o "$tmp/boot2" || exit 1
|
||||
"$tmp/boot1" ir boot/main.fch > "$tmp/stage2.ll"
|
||||
"$tmp/boot2" ir boot/main.fch > "$tmp/stage3.ll"
|
||||
if cmp -s "$tmp/stage2.ll" "$tmp/stage3.ll"; then
|
||||
echo "bootstrap: stage 2 and stage 3 are identical ($(wc -l < "$tmp/stage3.ll") lines of IR)"
|
||||
else
|
||||
|
|
@ -19,17 +19,17 @@ else
|
|||
fi
|
||||
|
||||
pass=0; failed=0; skipped=0
|
||||
for f in tests/run/*.fn; do
|
||||
for f in tests/run/*.fch; do
|
||||
grep -q "^fn main" "$f" || continue
|
||||
# the bootstrap compiler doesn't do C imports, sized numbers or defer
|
||||
# (checked in the test and in the modules it imports)
|
||||
files="$f"
|
||||
for m in $(sed -n 's/^import \([a-z_]*\)$/\1/p' "$f"); do files="$files tests/run/$m.fn"; done
|
||||
for m in $(sed -n 's/^import \([a-z_]*\)$/\1/p' "$f"); do files="$files tests/run/$m.fch"; done
|
||||
if grep -qE '^import "|^link |\b(u8|u16|u32|u64|i8|i16|i32|f32|f64)\b|defer |0x' $files; then
|
||||
skipped=$((skipped + 1))
|
||||
continue
|
||||
fi
|
||||
input="${f%.fn}.in"
|
||||
input="${f%.fch}.in"
|
||||
[ -f "$input" ] || input=/dev/null
|
||||
if ! "$tmp/boot2" build "$f" -o "$tmp/prog" > "$tmp/err" 2>&1; then
|
||||
failed=$((failed + 1))
|
||||
|
|
@ -38,12 +38,12 @@ for f in tests/run/*.fn; do
|
|||
continue
|
||||
fi
|
||||
got=$("$tmp/prog" < "$input" 2>&1)
|
||||
if [ "$got" == "$(cat "${f%.fn}.out")" ]; then
|
||||
if [ "$got" == "$(cat "${f%.fch}.out")" ]; then
|
||||
pass=$((pass + 1))
|
||||
else
|
||||
failed=$((failed + 1))
|
||||
echo "FAIL (output) $f"
|
||||
diff <(echo "$got") "${f%.fn}.out" | head -10
|
||||
diff <(echo "$got") "${f%.fch}.out" | head -10
|
||||
fi
|
||||
done
|
||||
echo "self-hosted compiler: $pass passed, $failed failed, $skipped skipped (features it doesn't have)"
|
||||
|
|
|
|||
3
tests/fail/old_extension.fch
Normal file
3
tests/fail/old_extension.fch
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
// expect: but Finch files now end in .fch
|
||||
import oldmodule
|
||||
fn main() {}
|
||||
2
tests/fail/oldmodule.fn
Normal file
2
tests/fail/oldmodule.fn
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
fn hi() {
|
||||
}
|
||||
15
tests/run.sh
15
tests/run.sh
|
|
@ -1,9 +1,9 @@
|
|||
#!/usr/bin/env bash
|
||||
# Finch test suite.
|
||||
# tests/run/*.fn must compile and print exactly what is in the matching .out file
|
||||
# tests/run/*.fch must compile and print exactly what is in the matching .out file
|
||||
# (files without `fn main` are modules or helpers and are skipped;
|
||||
# a matching .in file is fed to the program as its input)
|
||||
# tests/fail/*.fn must fail; the first line is "// expect: <text that must appear in the error>"
|
||||
# tests/fail/*.fch must fail; the first line is "// expect: <text that must appear in the error>"
|
||||
# MEMCHECK=1 tests/run.sh also runs every program under valgrind: no leaks, no bad memory access
|
||||
set -u
|
||||
cd "$(dirname "$0")"
|
||||
|
|
@ -12,10 +12,10 @@ pass=0; failed=0
|
|||
tmp=$(mktemp -d)
|
||||
trap 'rm -rf "$tmp"' EXIT
|
||||
|
||||
for f in run/*.fn; do
|
||||
for f in run/*.fch; do
|
||||
grep -q "^fn main" "$f" || continue
|
||||
want="${f%.fn}.out"
|
||||
input="${f%.fn}.in"
|
||||
want="${f%.fch}.out"
|
||||
input="${f%.fch}.in"
|
||||
[ -f "$input" ] || input=/dev/null
|
||||
got=$("$FINCH" run "$f" < "$input" 2>&1)
|
||||
if [ "$got" != "$(cat "$want")" ]; then
|
||||
|
|
@ -25,7 +25,7 @@ for f in run/*.fn; do
|
|||
continue
|
||||
fi
|
||||
if [ "${MEMCHECK:-0}" = 1 ]; then
|
||||
exe="$tmp/$(basename "${f%.fn}")"
|
||||
exe="$tmp/$(basename "${f%.fch}")"
|
||||
"$FINCH" build "$f" -o "$exe" >/dev/null 2>&1
|
||||
if ! valgrind -q --leak-check=full --errors-for-leak-kinds=all --error-exitcode=99 "$exe" < "$input" >/dev/null 2>"$tmp/vg"; then
|
||||
failed=$((failed + 1))
|
||||
|
|
@ -37,7 +37,8 @@ for f in run/*.fn; do
|
|||
pass=$((pass + 1))
|
||||
done
|
||||
|
||||
for f in fail/*.fn; do
|
||||
for f in fail/*.fch; do
|
||||
grep -q "^// expect:" "$f" || continue
|
||||
expect=$(head -1 "$f" | sed -n 's|^// expect: ||p')
|
||||
got=$("$FINCH" run "$f" < /dev/null 2>&1)
|
||||
status=$?
|
||||
|
|
|
|||
Loading…
Reference in a new issue