Compare commits
1 Commits
v0.1.2
...
7c55b76dae
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c55b76dae |
42
CLAUDE.md
42
CLAUDE.md
@@ -42,45 +42,17 @@ When making changes:
|
|||||||
7. **Fix language limitations**: If you encounter parser/type system limitations, fix them (without regressions on guarantees or speed)
|
7. **Fix language limitations**: If you encounter parser/type system limitations, fix them (without regressions on guarantees or speed)
|
||||||
8. **Git commits**: Always use `--no-gpg-sign` flag
|
8. **Git commits**: Always use `--no-gpg-sign` flag
|
||||||
|
|
||||||
### Post-work checklist (run after each committable change)
|
### Post-work checklist (run after each major piece of work)
|
||||||
|
|
||||||
**MANDATORY: Run the full validation script after every committable change:**
|
|
||||||
```bash
|
|
||||||
./scripts/validate.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
This script runs ALL of the following checks and will fail if any regress:
|
|
||||||
1. `cargo check` — no Rust compilation errors
|
|
||||||
2. `cargo test` — all Rust tests pass (currently 387)
|
|
||||||
3. `cargo build --release` — release binary builds
|
|
||||||
4. `lux test` on every package (path, frontmatter, xml, rss, markdown) — all 286 package tests pass
|
|
||||||
5. `lux check` on every package — type checking + lint passes
|
|
||||||
|
|
||||||
If `validate.sh` is not available or you need to run manually:
|
|
||||||
```bash
|
```bash
|
||||||
nix develop --command cargo check # No Rust errors
|
nix develop --command cargo check # No Rust errors
|
||||||
nix develop --command cargo test # All Rust tests pass
|
nix develop --command cargo test # All tests pass (currently 381)
|
||||||
nix develop --command cargo build --release # Build release binary
|
./target/release/lux check # Type check + lint all .lux files
|
||||||
cd ../packages/path && ../../lang/target/release/lux test # Package tests
|
./target/release/lux fmt # Format all .lux files
|
||||||
cd ../packages/frontmatter && ../../lang/target/release/lux test
|
./target/release/lux lint # Standalone lint pass
|
||||||
cd ../packages/xml && ../../lang/target/release/lux test
|
|
||||||
cd ../packages/rss && ../../lang/target/release/lux test
|
|
||||||
cd ../packages/markdown && ../../lang/target/release/lux test
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**Do NOT commit if any check fails.** Fix the issue first.
|
|
||||||
|
|
||||||
### Commit after every piece of work
|
### Commit after every piece of work
|
||||||
**After completing each logical unit of work, commit immediately.** This is NOT optional — every fix, feature, or change MUST be committed right away. Do not let changes accumulate uncommitted across multiple features. Each commit should be a single logical change (one feature, one bugfix, etc.). Use `--no-gpg-sign` flag for all commits.
|
**After completing each logical unit of work, commit immediately.** Do not let changes accumulate uncommitted across multiple features. Each commit should be a single logical change (one feature, one bugfix, etc.). Use `--no-gpg-sign` flag for all commits.
|
||||||
|
|
||||||
**Commit workflow:**
|
|
||||||
1. Make the change
|
|
||||||
2. Run `./scripts/validate.sh` (all 13 checks must pass)
|
|
||||||
3. `git add` the relevant files
|
|
||||||
4. `git commit --no-gpg-sign -m "type: description"` (use conventional commits: fix/feat/chore/docs)
|
|
||||||
5. Move on to the next task
|
|
||||||
|
|
||||||
**Never skip committing.** If you fixed a bug, commit it. If you added a feature, commit it. If you updated docs, commit it. Do not batch unrelated changes into one commit.
|
|
||||||
|
|
||||||
**IMPORTANT: Always verify Lux code you write:**
|
**IMPORTANT: Always verify Lux code you write:**
|
||||||
- Run with interpreter: `./target/release/lux file.lux`
|
- Run with interpreter: `./target/release/lux file.lux`
|
||||||
@@ -137,7 +109,7 @@ When working on any major task that involves writing Lux code, **document every
|
|||||||
## Code Quality
|
## Code Quality
|
||||||
|
|
||||||
- Fix all compiler warnings before committing
|
- Fix all compiler warnings before committing
|
||||||
- Ensure all tests pass (currently 387 tests)
|
- Ensure all tests pass (currently 381 tests)
|
||||||
- Add new tests when adding features
|
- Add new tests when adding features
|
||||||
- Keep examples and documentation in sync
|
- Keep examples and documentation in sync
|
||||||
|
|
||||||
|
|||||||
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -770,7 +770,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lux"
|
name = "lux"
|
||||||
version = "0.1.1"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lsp-server",
|
"lsp-server",
|
||||||
"lsp-types",
|
"lsp-types",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lux"
|
name = "lux"
|
||||||
version = "0.1.2"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "A functional programming language with first-class effects, schema evolution, and behavioral types"
|
description = "A functional programming language with first-class effects, schema evolution, and behavioral types"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
printf "\n"
|
printf "\n"
|
||||||
printf " \033[1;35m╦ ╦ ╦╦ ╦\033[0m\n"
|
printf " \033[1;35m╦ ╦ ╦╦ ╦\033[0m\n"
|
||||||
printf " \033[1;35m║ ║ ║╔╣\033[0m\n"
|
printf " \033[1;35m║ ║ ║╔╣\033[0m\n"
|
||||||
printf " \033[1;35m╩═╝╚═╝╩ ╩\033[0m v0.1.2\n"
|
printf " \033[1;35m╩═╝╚═╝╩ ╩\033[0m v0.1.0\n"
|
||||||
printf "\n"
|
printf "\n"
|
||||||
printf " Functional language with first-class effects\n"
|
printf " Functional language with first-class effects\n"
|
||||||
printf "\n"
|
printf "\n"
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
packages.default = pkgs.rustPlatform.buildRustPackage {
|
packages.default = pkgs.rustPlatform.buildRustPackage {
|
||||||
pname = "lux";
|
pname = "lux";
|
||||||
version = "0.1.2";
|
version = "0.1.0";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
cargoLock.lockFile = ./Cargo.lock;
|
cargoLock.lockFile = ./Cargo.lock;
|
||||||
|
|
||||||
@@ -79,7 +79,7 @@
|
|||||||
};
|
};
|
||||||
in muslPkgs.rustPlatform.buildRustPackage {
|
in muslPkgs.rustPlatform.buildRustPackage {
|
||||||
pname = "lux";
|
pname = "lux";
|
||||||
version = "0.1.2";
|
version = "0.1.0";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
cargoLock.lockFile = ./Cargo.lock;
|
cargoLock.lockFile = ./Cargo.lock;
|
||||||
|
|
||||||
|
|||||||
@@ -5,20 +5,12 @@ set -euo pipefail
|
|||||||
# Builds a static binary, generates changelog, and creates a Gitea release.
|
# Builds a static binary, generates changelog, and creates a Gitea release.
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# ./scripts/release.sh # auto-bump patch (0.2.0 → 0.2.1)
|
# ./scripts/release.sh [version]
|
||||||
# ./scripts/release.sh patch # same as above
|
|
||||||
# ./scripts/release.sh minor # bump minor (0.2.0 → 0.3.0)
|
|
||||||
# ./scripts/release.sh major # bump major (0.2.0 → 1.0.0)
|
|
||||||
# ./scripts/release.sh v1.2.3 # explicit version
|
|
||||||
#
|
#
|
||||||
# Environment:
|
# Environment:
|
||||||
# GITEA_TOKEN - API token for git.qrty.ink (prompted if not set)
|
# GITEA_TOKEN - API token for git.qrty.ink (prompted if not set)
|
||||||
# GITEA_URL - Gitea instance URL (default: https://git.qrty.ink)
|
# GITEA_URL - Gitea instance URL (default: https://git.qrty.ink)
|
||||||
|
|
||||||
# cd to repo root (directory containing this script's parent)
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
||||||
cd "$SCRIPT_DIR/.."
|
|
||||||
|
|
||||||
GITEA_URL="${GITEA_URL:-https://git.qrty.ink}"
|
GITEA_URL="${GITEA_URL:-https://git.qrty.ink}"
|
||||||
REPO_OWNER="blu"
|
REPO_OWNER="blu"
|
||||||
REPO_NAME="lux"
|
REPO_NAME="lux"
|
||||||
@@ -38,33 +30,14 @@ warn() { printf "${YELLOW}!!${NC} %s\n" "$1"; }
|
|||||||
err() { printf "${RED}error:${NC} %s\n" "$1" >&2; exit 1; }
|
err() { printf "${RED}error:${NC} %s\n" "$1" >&2; exit 1; }
|
||||||
|
|
||||||
# --- Determine version ---
|
# --- Determine version ---
|
||||||
CURRENT=$(grep '^version' Cargo.toml | head -1 | sed 's/.*"\(.*\)".*/\1/')
|
VERSION="${1:-}"
|
||||||
BUMP="${1:-patch}"
|
if [ -z "$VERSION" ]; then
|
||||||
|
VERSION=$(grep '^version' Cargo.toml | head -1 | sed 's/.*"\(.*\)".*/\1/')
|
||||||
bump_version() {
|
info "Version from Cargo.toml: v$VERSION"
|
||||||
local ver="$1" part="$2"
|
fi
|
||||||
IFS='.' read -r major minor patch <<< "$ver"
|
# Ensure v prefix
|
||||||
case "$part" in
|
[[ "$VERSION" == v* ]] || VERSION="v$VERSION"
|
||||||
major) echo "$((major + 1)).0.0" ;;
|
TAG="$VERSION"
|
||||||
minor) echo "$major.$((minor + 1)).0" ;;
|
|
||||||
patch) echo "$major.$minor.$((patch + 1))" ;;
|
|
||||||
*) echo "$part" ;; # treat as explicit version
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$BUMP" in
|
|
||||||
major|minor|patch)
|
|
||||||
VERSION=$(bump_version "$CURRENT" "$BUMP")
|
|
||||||
info "Bumping $BUMP: $CURRENT → $VERSION"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# Explicit version — strip v prefix if present
|
|
||||||
VERSION="${BUMP#v}"
|
|
||||||
info "Explicit version: $VERSION"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
TAG="v$VERSION"
|
|
||||||
|
|
||||||
# --- Check for clean working tree ---
|
# --- Check for clean working tree ---
|
||||||
if [ -n "$(git status --porcelain)" ]; then
|
if [ -n "$(git status --porcelain)" ]; then
|
||||||
@@ -77,18 +50,7 @@ fi
|
|||||||
|
|
||||||
# --- Check if tag already exists ---
|
# --- Check if tag already exists ---
|
||||||
if git rev-parse "$TAG" >/dev/null 2>&1; then
|
if git rev-parse "$TAG" >/dev/null 2>&1; then
|
||||||
err "Tag $TAG already exists. Choose a different version."
|
err "Tag $TAG already exists. Bump version in Cargo.toml or choose a different version."
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Update version in source files ---
|
|
||||||
if [ "$VERSION" != "$CURRENT" ]; then
|
|
||||||
info "Updating version in Cargo.toml and flake.nix..."
|
|
||||||
sed -i "0,/^version = \"$CURRENT\"/s//version = \"$VERSION\"/" Cargo.toml
|
|
||||||
sed -i "s/version = \"$CURRENT\";/version = \"$VERSION\";/g" flake.nix
|
|
||||||
sed -i "s/v$CURRENT/v$VERSION/g" flake.nix
|
|
||||||
git add Cargo.toml flake.nix
|
|
||||||
git commit --no-gpg-sign -m "chore: bump version to $VERSION"
|
|
||||||
ok "Version updated and committed"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# --- Generate changelog ---
|
# --- Generate changelog ---
|
||||||
@@ -102,7 +64,7 @@ else
|
|||||||
info "First release — summarizing recent commits:"
|
info "First release — summarizing recent commits:"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CHANGELOG=$(git log "$RANGE" --pretty=format:"- %s" --no-merges 2>/dev/null | head -50 || true)
|
CHANGELOG=$(git log "$RANGE" --pretty=format:"- %s" --no-merges 2>/dev/null | head -50)
|
||||||
if [ -z "$CHANGELOG" ]; then
|
if [ -z "$CHANGELOG" ]; then
|
||||||
CHANGELOG="- Initial release"
|
CHANGELOG="- Initial release"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,73 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
# Lux Full Validation Script
|
|
||||||
# Runs all checks: Rust tests, package tests, type checking, formatting, linting.
|
|
||||||
# Run after every committable change to ensure no regressions.
|
|
||||||
|
|
||||||
# cd to repo root (directory containing this script's parent)
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
||||||
cd "$SCRIPT_DIR/.."
|
|
||||||
|
|
||||||
LUX="$(pwd)/target/release/lux"
|
|
||||||
PACKAGES_DIR="$(pwd)/../packages"
|
|
||||||
RED='\033[0;31m'
|
|
||||||
GREEN='\033[0;32m'
|
|
||||||
CYAN='\033[0;36m'
|
|
||||||
BOLD='\033[1m'
|
|
||||||
NC='\033[0m'
|
|
||||||
|
|
||||||
FAILED=0
|
|
||||||
TOTAL=0
|
|
||||||
|
|
||||||
step() {
|
|
||||||
TOTAL=$((TOTAL + 1))
|
|
||||||
printf "${CYAN}[%d]${NC} %s... " "$TOTAL" "$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
ok() { printf "${GREEN}ok${NC} %s\n" "${1:-}"; }
|
|
||||||
fail() { printf "${RED}FAIL${NC} %s\n" "${1:-}"; FAILED=$((FAILED + 1)); }
|
|
||||||
|
|
||||||
# --- Rust checks ---
|
|
||||||
step "cargo check"
|
|
||||||
if nix develop --command cargo check 2>&1 | grep -q "Finished"; then ok; else fail; fi
|
|
||||||
|
|
||||||
step "cargo test"
|
|
||||||
OUTPUT=$(nix develop --command cargo test 2>&1 || true)
|
|
||||||
RESULT=$(echo "$OUTPUT" | grep "test result:" || echo "no result")
|
|
||||||
if echo "$RESULT" | grep -q "0 failed"; then ok "$RESULT"; else fail "$RESULT"; fi
|
|
||||||
|
|
||||||
# --- Build release binary ---
|
|
||||||
step "cargo build --release"
|
|
||||||
if nix develop --command cargo build --release 2>&1 | grep -q "Finished"; then ok; else fail; fi
|
|
||||||
|
|
||||||
# --- Package tests ---
|
|
||||||
for pkg in path frontmatter xml rss markdown; do
|
|
||||||
PKG_DIR="$PACKAGES_DIR/$pkg"
|
|
||||||
if [ -d "$PKG_DIR" ]; then
|
|
||||||
step "lux test ($pkg)"
|
|
||||||
OUTPUT=$(cd "$PKG_DIR" && "$LUX" test 2>&1 || true)
|
|
||||||
RESULT=$(echo "$OUTPUT" | grep "passed" | tail -1 || echo "no result")
|
|
||||||
if echo "$RESULT" | grep -q "passed"; then ok "$RESULT"; else fail "$RESULT"; fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# --- Lux check on packages ---
|
|
||||||
for pkg in path frontmatter xml rss markdown; do
|
|
||||||
PKG_DIR="$PACKAGES_DIR/$pkg"
|
|
||||||
if [ -d "$PKG_DIR" ]; then
|
|
||||||
step "lux check ($pkg)"
|
|
||||||
OUTPUT=$(cd "$PKG_DIR" && "$LUX" check 2>&1 || true)
|
|
||||||
RESULT=$(echo "$OUTPUT" | grep "passed" | tail -1 || echo "no result")
|
|
||||||
if echo "$RESULT" | grep -q "passed"; then ok; else fail "$RESULT"; fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# --- Summary ---
|
|
||||||
printf "\n${BOLD}═══ Validation Summary ═══${NC}\n"
|
|
||||||
if [ $FAILED -eq 0 ]; then
|
|
||||||
printf "${GREEN}All %d checks passed.${NC}\n" "$TOTAL"
|
|
||||||
else
|
|
||||||
printf "${RED}%d/%d checks failed.${NC}\n" "$FAILED" "$TOTAL"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
@@ -1066,10 +1066,6 @@ impl JsBackend {
|
|||||||
let arg = self.emit_expr(&args[0])?;
|
let arg = self.emit_expr(&args[0])?;
|
||||||
return Ok(format!("String({})", arg));
|
return Ok(format!("String({})", arg));
|
||||||
}
|
}
|
||||||
if ident.name == "print" {
|
|
||||||
let arg = self.emit_expr(&args[0])?;
|
|
||||||
return Ok(format!("console.log({})", arg));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let arg_strs: Result<Vec<_>, _> = args.iter().map(|a| self.emit_expr(a)).collect();
|
let arg_strs: Result<Vec<_>, _> = args.iter().map(|a| self.emit_expr(a)).collect();
|
||||||
|
|||||||
@@ -1536,7 +1536,7 @@ impl TypeChecker {
|
|||||||
// Use the declared type if present, otherwise use inferred
|
// Use the declared type if present, otherwise use inferred
|
||||||
let final_type = if let Some(ref type_expr) = let_decl.typ {
|
let final_type = if let Some(ref type_expr) = let_decl.typ {
|
||||||
let declared = self.resolve_type(type_expr);
|
let declared = self.resolve_type(type_expr);
|
||||||
if let Err(e) = unify_with_env(&inferred, &declared, &self.env) {
|
if let Err(e) = unify(&inferred, &declared) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
"Variable '{}' has type {}, but declared type is {}: {}",
|
"Variable '{}' has type {}, but declared type is {}: {}",
|
||||||
@@ -1783,7 +1783,7 @@ impl TypeChecker {
|
|||||||
match op {
|
match op {
|
||||||
BinaryOp::Add => {
|
BinaryOp::Add => {
|
||||||
// Add supports both numeric types and string concatenation
|
// Add supports both numeric types and string concatenation
|
||||||
if let Err(e) = unify_with_env(&left_type, &right_type, &self.env) {
|
if let Err(e) = unify(&left_type, &right_type) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Operands of '{}' must have same type: {}", op, e),
|
message: format!("Operands of '{}' must have same type: {}", op, e),
|
||||||
span,
|
span,
|
||||||
@@ -1806,7 +1806,7 @@ impl TypeChecker {
|
|||||||
|
|
||||||
BinaryOp::Sub | BinaryOp::Mul | BinaryOp::Div | BinaryOp::Mod => {
|
BinaryOp::Sub | BinaryOp::Mul | BinaryOp::Div | BinaryOp::Mod => {
|
||||||
// Arithmetic: both operands must be same numeric type
|
// Arithmetic: both operands must be same numeric type
|
||||||
if let Err(e) = unify_with_env(&left_type, &right_type, &self.env) {
|
if let Err(e) = unify(&left_type, &right_type) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Operands of '{}' must have same type: {}", op, e),
|
message: format!("Operands of '{}' must have same type: {}", op, e),
|
||||||
span,
|
span,
|
||||||
@@ -1830,7 +1830,7 @@ impl TypeChecker {
|
|||||||
|
|
||||||
BinaryOp::Eq | BinaryOp::Ne => {
|
BinaryOp::Eq | BinaryOp::Ne => {
|
||||||
// Equality: operands must have same type
|
// Equality: operands must have same type
|
||||||
if let Err(e) = unify_with_env(&left_type, &right_type, &self.env) {
|
if let Err(e) = unify(&left_type, &right_type) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Operands of '{}' must have same type: {}", op, e),
|
message: format!("Operands of '{}' must have same type: {}", op, e),
|
||||||
span,
|
span,
|
||||||
@@ -1841,7 +1841,7 @@ impl TypeChecker {
|
|||||||
|
|
||||||
BinaryOp::Lt | BinaryOp::Le | BinaryOp::Gt | BinaryOp::Ge => {
|
BinaryOp::Lt | BinaryOp::Le | BinaryOp::Gt | BinaryOp::Ge => {
|
||||||
// Comparison: operands must be same orderable type
|
// Comparison: operands must be same orderable type
|
||||||
if let Err(e) = unify_with_env(&left_type, &right_type, &self.env) {
|
if let Err(e) = unify(&left_type, &right_type) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Operands of '{}' must have same type: {}", op, e),
|
message: format!("Operands of '{}' must have same type: {}", op, e),
|
||||||
span,
|
span,
|
||||||
@@ -1852,13 +1852,13 @@ impl TypeChecker {
|
|||||||
|
|
||||||
BinaryOp::And | BinaryOp::Or => {
|
BinaryOp::And | BinaryOp::Or => {
|
||||||
// Logical: both must be Bool
|
// Logical: both must be Bool
|
||||||
if let Err(e) = unify_with_env(&left_type, &Type::Bool, &self.env) {
|
if let Err(e) = unify(&left_type, &Type::Bool) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Left operand of '{}' must be Bool: {}", op, e),
|
message: format!("Left operand of '{}' must be Bool: {}", op, e),
|
||||||
span: left.span(),
|
span: left.span(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if let Err(e) = unify_with_env(&right_type, &Type::Bool, &self.env) {
|
if let Err(e) = unify(&right_type, &Type::Bool) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Right operand of '{}' must be Bool: {}", op, e),
|
message: format!("Right operand of '{}' must be Bool: {}", op, e),
|
||||||
span: right.span(),
|
span: right.span(),
|
||||||
@@ -1872,7 +1872,7 @@ impl TypeChecker {
|
|||||||
// right must be a function that accepts left's type
|
// right must be a function that accepts left's type
|
||||||
let result_type = Type::var();
|
let result_type = Type::var();
|
||||||
let expected_fn = Type::function(vec![left_type.clone()], result_type.clone());
|
let expected_fn = Type::function(vec![left_type.clone()], result_type.clone());
|
||||||
if let Err(e) = unify_with_env(&right_type, &expected_fn, &self.env) {
|
if let Err(e) = unify(&right_type, &expected_fn) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
"Pipe target must be a function accepting {}: {}",
|
"Pipe target must be a function accepting {}: {}",
|
||||||
@@ -1904,7 +1904,7 @@ impl TypeChecker {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
UnaryOp::Not => {
|
UnaryOp::Not => {
|
||||||
if let Err(e) = unify_with_env(&operand_type, &Type::Bool, &self.env) {
|
if let Err(e) = unify(&operand_type, &Type::Bool) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Operator '!' requires Bool operand: {}", e),
|
message: format!("Operator '!' requires Bool operand: {}", e),
|
||||||
span,
|
span,
|
||||||
@@ -1955,7 +1955,7 @@ impl TypeChecker {
|
|||||||
self.current_effects.clone(),
|
self.current_effects.clone(),
|
||||||
);
|
);
|
||||||
|
|
||||||
match unify_with_env(&func_type, &expected_fn, &self.env) {
|
match unify(&func_type, &expected_fn) {
|
||||||
Ok(subst) => result_type.apply(&subst),
|
Ok(subst) => result_type.apply(&subst),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
// Provide more detailed error message based on the type of mismatch
|
// Provide more detailed error message based on the type of mismatch
|
||||||
@@ -2032,7 +2032,7 @@ impl TypeChecker {
|
|||||||
let result_type = Type::var();
|
let result_type = Type::var();
|
||||||
let expected_fn = Type::function(arg_types, result_type.clone());
|
let expected_fn = Type::function(arg_types, result_type.clone());
|
||||||
|
|
||||||
if let Err(e) = unify_with_env(field_type, &expected_fn, &self.env) {
|
if let Err(e) = unify(field_type, &expected_fn) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
"Type mismatch in {}.{} call: {}",
|
"Type mismatch in {}.{} call: {}",
|
||||||
@@ -2104,7 +2104,7 @@ impl TypeChecker {
|
|||||||
for (i, (arg_type, (_, param_type))) in
|
for (i, (arg_type, (_, param_type))) in
|
||||||
arg_types.iter().zip(op.params.iter()).enumerate()
|
arg_types.iter().zip(op.params.iter()).enumerate()
|
||||||
{
|
{
|
||||||
if let Err(e) = unify_with_env(arg_type, param_type, &self.env) {
|
if let Err(e) = unify(arg_type, param_type) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
"Argument {} of '{}.{}' has type {}, expected {}: {}",
|
"Argument {} of '{}.{}' has type {}, expected {}: {}",
|
||||||
@@ -2137,7 +2137,6 @@ impl TypeChecker {
|
|||||||
|
|
||||||
fn infer_field(&mut self, object: &Expr, field: &Ident, span: Span) -> Type {
|
fn infer_field(&mut self, object: &Expr, field: &Ident, span: Span) -> Type {
|
||||||
let object_type = self.infer_expr(object);
|
let object_type = self.infer_expr(object);
|
||||||
let object_type = self.env.expand_type_alias(&object_type);
|
|
||||||
|
|
||||||
match &object_type {
|
match &object_type {
|
||||||
Type::Record(fields) => match fields.iter().find(|(n, _)| n == &field.name) {
|
Type::Record(fields) => match fields.iter().find(|(n, _)| n == &field.name) {
|
||||||
@@ -2218,7 +2217,7 @@ impl TypeChecker {
|
|||||||
// Check return type if specified
|
// Check return type if specified
|
||||||
let ret_type = if let Some(rt) = return_type {
|
let ret_type = if let Some(rt) = return_type {
|
||||||
let declared = self.resolve_type(rt);
|
let declared = self.resolve_type(rt);
|
||||||
if let Err(e) = unify_with_env(&body_type, &declared, &self.env) {
|
if let Err(e) = unify(&body_type, &declared) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
"Lambda body type {} doesn't match declared {}: {}",
|
"Lambda body type {} doesn't match declared {}: {}",
|
||||||
@@ -2284,7 +2283,7 @@ impl TypeChecker {
|
|||||||
span: Span,
|
span: Span,
|
||||||
) -> Type {
|
) -> Type {
|
||||||
let cond_type = self.infer_expr(condition);
|
let cond_type = self.infer_expr(condition);
|
||||||
if let Err(e) = unify_with_env(&cond_type, &Type::Bool, &self.env) {
|
if let Err(e) = unify(&cond_type, &Type::Bool) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("If condition must be Bool, got {}: {}", cond_type, e),
|
message: format!("If condition must be Bool, got {}: {}", cond_type, e),
|
||||||
span: condition.span(),
|
span: condition.span(),
|
||||||
@@ -2294,7 +2293,7 @@ impl TypeChecker {
|
|||||||
let then_type = self.infer_expr(then_branch);
|
let then_type = self.infer_expr(then_branch);
|
||||||
let else_type = self.infer_expr(else_branch);
|
let else_type = self.infer_expr(else_branch);
|
||||||
|
|
||||||
match unify_with_env(&then_type, &else_type, &self.env) {
|
match unify(&then_type, &else_type) {
|
||||||
Ok(subst) => then_type.apply(&subst),
|
Ok(subst) => then_type.apply(&subst),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
@@ -2335,7 +2334,7 @@ impl TypeChecker {
|
|||||||
// Check guard if present
|
// Check guard if present
|
||||||
if let Some(ref guard) = arm.guard {
|
if let Some(ref guard) = arm.guard {
|
||||||
let guard_type = self.infer_expr(guard);
|
let guard_type = self.infer_expr(guard);
|
||||||
if let Err(e) = unify_with_env(&guard_type, &Type::Bool, &self.env) {
|
if let Err(e) = unify(&guard_type, &Type::Bool) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Match guard must be Bool: {}", e),
|
message: format!("Match guard must be Bool: {}", e),
|
||||||
span: guard.span(),
|
span: guard.span(),
|
||||||
@@ -2351,7 +2350,7 @@ impl TypeChecker {
|
|||||||
match &result_type {
|
match &result_type {
|
||||||
None => result_type = Some(body_type),
|
None => result_type = Some(body_type),
|
||||||
Some(prev) => {
|
Some(prev) => {
|
||||||
if let Err(e) = unify_with_env(prev, &body_type, &self.env) {
|
if let Err(e) = unify(prev, &body_type) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
"Match arm has incompatible type: expected {}, got {}: {}",
|
"Match arm has incompatible type: expected {}, got {}: {}",
|
||||||
@@ -2401,7 +2400,7 @@ impl TypeChecker {
|
|||||||
|
|
||||||
Pattern::Literal(lit) => {
|
Pattern::Literal(lit) => {
|
||||||
let lit_type = self.infer_literal(lit);
|
let lit_type = self.infer_literal(lit);
|
||||||
if let Err(e) = unify_with_env(&lit_type, expected, &self.env) {
|
if let Err(e) = unify(&lit_type, expected) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Pattern literal type mismatch: {}", e),
|
message: format!("Pattern literal type mismatch: {}", e),
|
||||||
span: lit.span,
|
span: lit.span,
|
||||||
@@ -2415,7 +2414,7 @@ impl TypeChecker {
|
|||||||
// For now, handle Option specially
|
// For now, handle Option specially
|
||||||
match name.name.as_str() {
|
match name.name.as_str() {
|
||||||
"None" => {
|
"None" => {
|
||||||
if let Err(e) = unify_with_env(expected, &Type::Option(Box::new(Type::var())), &self.env) {
|
if let Err(e) = unify(expected, &Type::Option(Box::new(Type::var()))) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
"None pattern doesn't match type {}: {}",
|
"None pattern doesn't match type {}: {}",
|
||||||
@@ -2428,7 +2427,7 @@ impl TypeChecker {
|
|||||||
}
|
}
|
||||||
"Some" => {
|
"Some" => {
|
||||||
let inner_type = Type::var();
|
let inner_type = Type::var();
|
||||||
if let Err(e) = unify_with_env(expected, &Type::Option(Box::new(inner_type.clone())), &self.env)
|
if let Err(e) = unify(expected, &Type::Option(Box::new(inner_type.clone())))
|
||||||
{
|
{
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
@@ -2457,7 +2456,7 @@ impl TypeChecker {
|
|||||||
|
|
||||||
Pattern::Tuple { elements, span } => {
|
Pattern::Tuple { elements, span } => {
|
||||||
let element_types: Vec<Type> = elements.iter().map(|_| Type::var()).collect();
|
let element_types: Vec<Type> = elements.iter().map(|_| Type::var()).collect();
|
||||||
if let Err(e) = unify_with_env(expected, &Type::Tuple(element_types.clone()), &self.env) {
|
if let Err(e) = unify(expected, &Type::Tuple(element_types.clone())) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("Tuple pattern doesn't match type {}: {}", expected, e),
|
message: format!("Tuple pattern doesn't match type {}: {}", expected, e),
|
||||||
span: *span,
|
span: *span,
|
||||||
@@ -2507,7 +2506,7 @@ impl TypeChecker {
|
|||||||
|
|
||||||
if let Some(type_expr) = typ {
|
if let Some(type_expr) = typ {
|
||||||
let declared = self.resolve_type(type_expr);
|
let declared = self.resolve_type(type_expr);
|
||||||
if let Err(e) = unify_with_env(&value_type, &declared, &self.env) {
|
if let Err(e) = unify(&value_type, &declared) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
"Variable '{}' has type {}, but declared type is {}: {}",
|
"Variable '{}' has type {}, but declared type is {}: {}",
|
||||||
@@ -2550,7 +2549,7 @@ impl TypeChecker {
|
|||||||
let first_type = self.infer_expr(&elements[0]);
|
let first_type = self.infer_expr(&elements[0]);
|
||||||
for elem in &elements[1..] {
|
for elem in &elements[1..] {
|
||||||
let elem_type = self.infer_expr(elem);
|
let elem_type = self.infer_expr(elem);
|
||||||
if let Err(e) = unify_with_env(&first_type, &elem_type, &self.env) {
|
if let Err(e) = unify(&first_type, &elem_type) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!("List elements must have same type: {}", e),
|
message: format!("List elements must have same type: {}", e),
|
||||||
span,
|
span,
|
||||||
@@ -2856,7 +2855,7 @@ impl TypeChecker {
|
|||||||
// Check return type matches if specified
|
// Check return type matches if specified
|
||||||
if let Some(ref return_type_expr) = impl_method.return_type {
|
if let Some(ref return_type_expr) = impl_method.return_type {
|
||||||
let return_type = self.resolve_type(return_type_expr);
|
let return_type = self.resolve_type(return_type_expr);
|
||||||
if let Err(e) = unify_with_env(&body_type, &return_type, &self.env) {
|
if let Err(e) = unify(&body_type, &return_type) {
|
||||||
self.errors.push(TypeError {
|
self.errors.push(TypeError {
|
||||||
message: format!(
|
message: format!(
|
||||||
"Method '{}' body has type {}, but declared return type is {}: {}",
|
"Method '{}' body has type {}, but declared return type is {}: {}",
|
||||||
|
|||||||
Reference in New Issue
Block a user