bdd0e96d78
A block's value is now its last statement ONLY when that statement is a trailing expression with no `;`. A trailing `;` discards the value, leaving the block void. This makes value-vs-statement explicit and lets the compiler reject "this block was supposed to produce a value". Compiler: - Parser records `Block.produces_value` (last stmt is a no-`;` trailing expression) + `Block.discarded_semi` (the `;` that discarded a value), via `expectSemicolonAfter`. A trailing expression before `}` may now omit its `;` (previously a parse error). Match-arm and else-arm bodies are built value-producing regardless of the arm `;` (arms are exempt — the `;` is an arm terminator). - Lowering: `lowerBlockValue` / the block-expr path / `inferExprType` respect `produces_value`. A value-position block that discards its value is a hard error (`lowerValueBody` for function bodies; the value-context `.block` path for if/else branches, `catch` bodies, value bindings, match arms). Pure-failable `-> !` bodies (value rides the error channel) and a value-if whose branches are void are handled without false errors. - `defer`/`onfail` cleanup bodies lower as statements (void), so a trailing `;` there is fine. Migration (behavior-preserving — output unchanged): - stdlib + ~210 examples: dropped the trailing `;` on value-position last expressions. `format` now ends with an explicit `#insert "return result;"` (it relied on `#insert`-as-block-value, which `;` discards). - Two `main :: () -> s32` examples that relied on the old silent default-return got an explicit trailing `0`. - Rejection snapshots 0412 / 1013 regenerated (their quoted source lines lost a `;`); the diagnostics themselves are unchanged. Docs/tests: specs.md "Block values" section; examples 0040 (rules) + 0041 (rejection); 3 parser unit tests. Filed issue 0066 (pre-existing match-arm negated-literal phi-width quirk, surfaced not caused here). Gates: zig build, zig build test, run_examples.sh -> 343 passed, cross_compile.sh -> 7 passed (also refreshed its stale example names).
102 lines
3.7 KiB
Bash
Executable File
102 lines
3.7 KiB
Bash
Executable File
#!/bin/bash
|
|
# Cross-compile regression runner.
|
|
#
|
|
# For each (target, example) tuple, runs `./sx build --target <t> <example>`
|
|
# and asserts (a) exit 0 and (b) the expected output file was produced.
|
|
# Compile correctness only — these examples can't be executed on the host
|
|
# (iOS Obj-C runtime / Android NDK).
|
|
#
|
|
# Tuple list starts empty and grows as Phase 0 / 1 / 2 / 3 of the FFI plan
|
|
# add cross-only examples. Skips with a warning (still exits 0) when the
|
|
# required toolchain isn't installed, so contributors without the iOS SDK
|
|
# or Android NDK aren't blocked.
|
|
#
|
|
# Usage: ./tests/cross_compile.sh
|
|
|
|
set -uo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|
SX="$ROOT_DIR/zig-out/bin/sx"
|
|
TMP_DIR="${TMPDIR:-/tmp}/sx-cross-compile"
|
|
mkdir -p "$TMP_DIR"
|
|
|
|
# Tuple format: "<target>|<example_path>"
|
|
# Add entries as cross-only examples land. Verifies the example
|
|
# compiles cleanly for the target's NDK / SDK without needing the
|
|
# host to actually run it.
|
|
TUPLES=(
|
|
"android|examples/1336-ffi-objc-call-10-os-gate.sx"
|
|
"android|examples/1401-ffi-jni-call-02-void.sx"
|
|
# Step 1.24: verify the inverse OS gate — `inline if OS == .android
|
|
# { #jni_call(...) }` must strip its body before lowering on iOS so
|
|
# emit_llvm doesn't try to use libjvm symbols the iOS SDK lacks.
|
|
"ios-sim|examples/1401-ffi-jni-call-02-void.sx"
|
|
# #jni_main pipeline slice 2: an example carrying a `#jni_main
|
|
# #jni_class(...)` decl must continue to lower + link cleanly for
|
|
# android even without an APK build (compile-only check).
|
|
"android|examples/1423-ffi-jni-main-01-emit.sx"
|
|
# `super.method(args)` dispatch: lowers to JNI CallNonvirtualVoidMethod
|
|
# against the parent class (Activity by default). Compile-only check
|
|
# — runtime correctness is verified by on-device chess deploy.
|
|
"android|examples/1424-ffi-jni-main-02-super.sx"
|
|
# `Alias.new(args)` constructor dispatch: lowers to FindClass +
|
|
# GetMethodID("<init>") + NewObject. Compile-only — runtime via chess.
|
|
"android|examples/1425-ffi-jni-main-03-ctor.sx"
|
|
# Week 6: iOS-simulator branch of platform.bundle. Cross-compiles
|
|
# against the iPhoneSimulator SDK; the post-link callback then
|
|
# writes an `.app` with the iOS-shaped Info.plist (UIDeviceFamily,
|
|
# LSRequiresIPhoneOS, UIApplicationSceneManifest, DTPlatformName).
|
|
"ios-sim|examples/1615-platform-ios-sim-bundle.sx"
|
|
)
|
|
|
|
PASS=0
|
|
FAIL=0
|
|
SKIP=0
|
|
|
|
toolchain_available() {
|
|
local target="$1"
|
|
case "$target" in
|
|
ios|ios-sim)
|
|
xcrun --sdk iphonesimulator --show-sdk-path >/dev/null 2>&1
|
|
;;
|
|
android|android-arm64)
|
|
# discoverAndroidNdk in target.zig accepts $ANDROID_NDK_HOME,
|
|
# $ANDROID_NDK_ROOT, or a scan of $HOME/Library/Android/sdk/ndk.
|
|
[[ -n "${ANDROID_NDK_HOME:-}" || -n "${ANDROID_NDK_ROOT:-}" ]] \
|
|
|| [[ -d "$HOME/Library/Android/sdk/ndk" ]]
|
|
;;
|
|
*)
|
|
return 1
|
|
;;
|
|
esac
|
|
}
|
|
|
|
for tuple in "${TUPLES[@]:-}"; do
|
|
[[ -z "$tuple" ]] && continue
|
|
target="${tuple%%|*}"
|
|
example="${tuple#*|}"
|
|
label="$target / $(basename "$example" .sx)"
|
|
|
|
if ! toolchain_available "$target"; then
|
|
SKIP=$((SKIP + 1))
|
|
printf " %-50s SKIP (no toolchain)\n" "$label"
|
|
continue
|
|
fi
|
|
|
|
out_obj="$TMP_DIR/$(basename "$example" .sx).$target.o"
|
|
printf " %-50s" "$label"
|
|
"$SX" build --target "$target" -o "$out_obj" "$ROOT_DIR/$example" >/dev/null 2>&1
|
|
rc=$?
|
|
if [[ $rc -eq 0 && -s "$out_obj" ]]; then
|
|
PASS=$((PASS + 1))
|
|
echo "ok"
|
|
else
|
|
FAIL=$((FAIL + 1))
|
|
echo "FAIL (exit=$rc, output=$out_obj)"
|
|
fi
|
|
done
|
|
|
|
echo "$PASS passed, $FAIL failed, $SKIP skipped"
|
|
[[ $FAIL -eq 0 ]]
|