From 53b43b0f795905465cc41fb7e0527c187778f0b2 Mon Sep 17 00:00:00 2001 From: dimgigov Date: Sun, 19 Jul 2026 16:35:08 +0300 Subject: [PATCH] feat: lifetime elision, tooling CI, registry, and LSP locals Ship the QUALITY_PLAN stretch from ownership through ecosystem: C.1 lifetime elision (bootstrap + selfhost), bux fmt/test/doc CI hooks, stdlib goldens, package registry (bux search/add), and LSP 0.4 position-sensitive locals with inferred let types. Full-tree format pass plus Map/Set remove double-free fix. --- Makefile | 57 +- PLAN.md | 6 +- README.md | 31 +- apps/boko-framework/src/Boko.bux | 232 +- apps/boko-framework/src/Main.bux | 170 +- apps/jwt-pitbul/src/Main.bux | 850 +- apps/nexus/src/Config.bux | 32 +- apps/nexus/src/Errors.bux | 100 +- apps/nexus/src/Handlers.bux | 144 +- apps/nexus/src/Http.bux | 194 +- apps/nexus/src/Main.bux | 74 +- apps/nexus/src/Parser.bux | 220 +- apps/nexus/src/Router.bux | 74 +- apps/nexus/src/Server.bux | 296 +- apps/simpledb/src/Main.bux | 604 +- bootstrap/cli.nim | 360 +- bootstrap/docgen.nim | 202 + bootstrap/fmt.nim | 106 + bootstrap/registry.nim | 167 + bootstrap/sema.nim | 183 +- config/registry.toml | 22 + docs/BuildAndTest.md | 53 +- docs/LanguageRef.md | 38 + docs/Packages.md | 104 +- docs/QUALITY_PLAN.md | 154 +- docs/SEMVER.md | 76 + docs/api/stdlib.md | 749 ++ examples/algebraic_enums.bux | 8 +- examples/borrow.bux | 4 +- examples/enums.bux | 4 +- examples/extend_generic.bux | 2 +- examples/factorial.bux | 4 +- examples/fibonacci.bux | 4 +- examples/generic_infer.bux | 8 +- examples/generic_infer2.bux | 2 +- examples/generics.bux | 6 +- examples/generics_struct.bux | 8 +- examples/json.bux | 10 +- examples/jwt.bux | 14 +- examples/lifetime_elision.bux | 51 + examples/map.bux | 14 +- examples/methods.bux | 6 +- examples/os_time.bux | 6 +- examples/ownership.bux | 8 +- examples/process.bux | 6 +- examples/result_option.bux | 12 +- examples/strings.bux | 14 +- examples/strings2.bux | 4 +- examples/structs.bux | 4 +- examples/try_operator.bux | 6 +- lib/Array.bux | 236 +- lib/Channel.bux | 96 +- lib/Crypto.bux | 122 +- lib/Fmt.bux | 148 +- lib/Fs.bux | 24 +- lib/Io.bux | 42 +- lib/Iter.bux | 402 +- lib/Json.bux | 816 +- lib/Map.bux | 414 +- lib/Math.bux | 80 +- lib/Mem.bux | 40 +- lib/Net.bux | 100 +- lib/Option.bux | 104 +- lib/Os.bux | 58 +- lib/Path.bux | 30 +- lib/Process.bux | 16 +- lib/Result.bux | 126 +- lib/Set.bux | 186 +- lib/Slice.bux | 56 +- lib/String.bux | 531 +- lib/Sync.bux | 84 +- lib/Task.bux | 62 +- lib/Test.bux | 140 +- lib/Time.bux | 24 +- lib/crypto/aes.bux | 98 +- lib/crypto/base64.bux | 50 +- lib/crypto/ecdsa.bux | 86 +- lib/crypto/ed25519.bux | 118 +- lib/crypto/hash.bux | 128 +- lib/crypto/hmac.bux | 166 +- lib/crypto/jwt.bux | 412 +- lib/crypto/random.bux | 90 +- lib/crypto/rsa.bux | 162 +- registry/packages/greet/README.md | 15 + registry/packages/greet/bux.toml | 9 + registry/packages/greet/src/Greet.bux | 14 + src/Main.bux | 32 +- src/ast.bux | 867 +- src/c_backend.bux | 3068 +++---- src/cli.bux | 649 +- src/fmt.bux | 276 +- src/hir.bux | 500 +- src/hir_lower.bux | 7920 ++++++++--------- src/lexer.bux | 1437 +-- src/manifest.bux | 426 +- src/parser.bux | 4533 +++++----- src/scope.bux | 186 +- src/sema.bux | 4212 ++++----- src/source_location.bux | 16 +- src/token.bux | 656 +- src/types.bux | 542 +- tests/borrow_test.nim | 121 + .../error_golden/elision_multi_input/bux.toml | 7 + .../elision_multi_input/expected.err | 7 + .../elision_multi_input/src/Main.bux | 9 + tests/error_golden/return_local_ref/bux.toml | 7 + .../return_local_ref/expected.err | 7 + .../return_local_ref/src/Main.bux | 10 + tests/golden/algebraic_enums/src/Main.bux | 8 +- tests/golden/enums/src/Main.bux | 4 +- tests/golden/fibonacci/src/Main.bux | 4 +- tests/golden/generics/src/Main.bux | 6 +- tests/golden/methods/src/Main.bux | 6 +- tests/golden/modern_features/src/Main.bux | 74 +- tests/golden/strings/src/Main.bux | 14 +- tests/golden/structs/src/Main.bux | 4 +- tests/stdlib_golden/array/bux.toml | 7 + tests/stdlib_golden/array/expected.out | 3 + tests/stdlib_golden/array/src/Main.bux | 50 + tests/stdlib_golden/collections/bux.toml | 7 + tests/stdlib_golden/collections/expected.out | 3 + tests/stdlib_golden/collections/src/Main.bux | 67 + tests/stdlib_golden/run.sh | 103 + tests/stdlib_golden/string/bux.toml | 7 + tests/stdlib_golden/string/expected.out | 3 + tests/stdlib_golden/string/src/Main.bux | 35 + tools/lsp_server.nim | 316 +- tools/smoke_lsp_hover.sh | 78 + tools/smoke_registry.sh | 64 + tools/test_lsp_locals.nim | 93 + 130 files changed, 20494 insertions(+), 16738 deletions(-) create mode 100644 bootstrap/docgen.nim create mode 100644 bootstrap/fmt.nim create mode 100644 bootstrap/registry.nim create mode 100644 config/registry.toml create mode 100644 docs/SEMVER.md create mode 100644 docs/api/stdlib.md create mode 100644 examples/lifetime_elision.bux create mode 100644 registry/packages/greet/README.md create mode 100644 registry/packages/greet/bux.toml create mode 100644 registry/packages/greet/src/Greet.bux create mode 100644 tests/error_golden/elision_multi_input/bux.toml create mode 100644 tests/error_golden/elision_multi_input/expected.err create mode 100644 tests/error_golden/elision_multi_input/src/Main.bux create mode 100644 tests/error_golden/return_local_ref/bux.toml create mode 100644 tests/error_golden/return_local_ref/expected.err create mode 100644 tests/error_golden/return_local_ref/src/Main.bux create mode 100644 tests/stdlib_golden/array/bux.toml create mode 100644 tests/stdlib_golden/array/expected.out create mode 100644 tests/stdlib_golden/array/src/Main.bux create mode 100644 tests/stdlib_golden/collections/bux.toml create mode 100644 tests/stdlib_golden/collections/expected.out create mode 100644 tests/stdlib_golden/collections/src/Main.bux create mode 100755 tests/stdlib_golden/run.sh create mode 100644 tests/stdlib_golden/string/bux.toml create mode 100644 tests/stdlib_golden/string/expected.out create mode 100644 tests/stdlib_golden/string/src/Main.bux create mode 100755 tools/smoke_lsp_hover.sh create mode 100755 tools/smoke_registry.sh create mode 100644 tools/test_lsp_locals.nim diff --git a/Makefile b/Makefile index 6270f1a..e384fb8 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,9 @@ SRC := bootstrap/main.nim OUT := buxc BUILD_DIR := build -EXAMPLES := hello fibonacci factorial structs enums methods algebraic_enums generics generics_struct generic_infer generic_infer2 extend_generic pattern_matching strings strings2 map result_option try_operator ownership ownership_checked drop_early_return ctfe async concurrency os_time process json iter trait_bounds channel sync jwt stdlib_ergonomics tuples func_ptr map_remove array_iter_extra string_extra multi_closure iter_hof closure_control match_let string_interp iter_generic generic_infer_hof struct_tuple_pat match_block nested_patterns match_guards pattern_shadow +EXAMPLES := hello fibonacci factorial structs enums methods algebraic_enums generics generics_struct generic_infer generic_infer2 extend_generic pattern_matching strings strings2 map result_option try_operator ownership ownership_checked drop_early_return lifetime_elision ctfe async concurrency os_time process json iter trait_bounds channel sync jwt stdlib_ergonomics tuples func_ptr map_remove array_iter_extra string_extra multi_closure iter_hof closure_control match_let string_interp iter_generic generic_infer_hof struct_tuple_pat match_block nested_patterns match_guards pattern_shadow -.PHONY: all build dev debug test clean clean-all test-examples selfhost test-golden test-errors selfhost-loop lsp +.PHONY: all build dev debug test clean clean-all test-examples selfhost test-golden test-errors test-stdlib selfhost-loop lsp fmt-check docs all: build @@ -19,7 +19,7 @@ dev: debug: dev @echo "Debug binary: buxc_debug" -test: build test-examples test-errors +test: build fmt-check test-examples test-errors test-stdlib @echo "Running lexer tests..." $(NIM) c -r tests/lexer_test.nim @echo "Running parser tests..." @@ -105,6 +105,43 @@ test-errors: build @chmod +x tests/error_golden/run.sh @tests/error_golden/run.sh ./$(OUT) +test-stdlib: build + @echo "=== Stdlib golden tests ===" + @chmod +x tests/stdlib_golden/run.sh + @tests/stdlib_golden/run.sh ./$(OUT) + +# Generate stdlib API docs from /// comments → docs/api/stdlib.md +docs: build + @mkdir -p docs/api + @./$(OUT) doc --out docs/api/stdlib.md lib/ + @echo "docs/api/stdlib.md updated" + +# CI: full-tree format check (lib / examples / src / tests / apps) + dirty-path smoke. +fmt-check: build + @echo "=== fmt --check (full tree) ===" + @./$(OUT) fmt --check lib/ + @./$(OUT) fmt --check examples/ + @./$(OUT) fmt --check src/ + @./$(OUT) fmt --check tests/ + @./$(OUT) fmt --check apps/ + @echo "=== fmt --check dirty-path smoke ===" + @mkdir -p /tmp/bux_fmt_smoke + @printf 'func Main() -> int {\nreturn 0;\n}\n' > /tmp/bux_fmt_smoke/bad.bux + @if ./$(OUT) fmt --check /tmp/bux_fmt_smoke/bad.bux >/dev/null 2>&1; then \ + echo "error: expected --check to fail on dirty file"; exit 1; \ + fi + @echo "fmt --check passed (tree clean + dirty exits 1)" + +# One-shot reformat of the same trees (run before committing style-only fixes) +.PHONY: fmt +fmt: build + @./$(OUT) fmt lib/ + @./$(OUT) fmt examples/ + @./$(OUT) fmt src/ + @./$(OUT) fmt tests/ + @./$(OUT) fmt apps/ + @echo "Formatted lib/ examples/ src/ tests/ apps/" + selfhost-loop: build @echo "=== Selfhost loop: bootstrap determinism check ===" @echo "Build A..." @@ -145,3 +182,17 @@ lsp: tools/bux-lsp tools/bux-lsp: tools/lsp_server.nim bootstrap/*.nim cd tools && $(NIM) c -d:release --opt:size --path:../bootstrap -o:bux-lsp lsp_server.nim + +.PHONY: test-lsp +test-lsp: lsp + @echo "=== LSP unit (locals / inference) ===" + $(NIM) r --path:bootstrap tools/test_lsp_locals.nim + @echo "=== LSP hover smoke ===" + @chmod +x tools/smoke_lsp_hover.sh + @tools/smoke_lsp_hover.sh + +.PHONY: test-registry +test-registry: build + @echo "=== Registry smoke (E.1) ===" + @chmod +x tools/smoke_registry.sh + @tools/smoke_registry.sh diff --git a/PLAN.md b/PLAN.md index 2f7a1bc..7ef0736 100644 --- a/PLAN.md +++ b/PLAN.md @@ -432,7 +432,7 @@ func ReadFile(path: String) -> Result { | `8.2.1` `own` keyword | ✅ | `own T` parsed and resolves to `T`; ready for borrow checker integration | | `8.2.2` `borrow` / `&` | ✅ | `&T` shared reference type checked and enforced | | `8.2.3` `mut` references | ✅ | `&mut T` mutable reference type checked and enforced | -| `8.2.4` Lifetime elision | ⏳ | Simple rules for common cases; explicit `'a` for complex | +| `8.2.4` Lifetime elision | ✅ | Single-input elision + dangling return; explicit `'a` for multi-input | | `8.2.5` Opt-in checker | ✅ | `@[Checked]` attribute enables borrow checking: writes through `&T` are rejected | ```bux @@ -681,8 +681,8 @@ buxc2 == buxc3 ✅ (binary-identical) | `10.2.3` `&mut T` exclusive mutable check | ✅ | No aliasing of mutable refs | | `10.2.4` Bounds checking on slices | ✅ | `Slice_Get` / `Array_Get` with `bux_bounds_check` | | `10.2.5` `@[Release]` zero-cost mode | ✅ | Disables borrow + bounds checks, passes `-O3 -flto` | -| `10.2.6` Lifetime elision (simple rules) | ⏳ | 80% of cases without annotations | -| `10.2.7` Explicit lifetimes `'a` | ⏳ | Only for complex cases | +| `10.2.6` Lifetime elision (simple rules) | ✅ | Single-input elision; multi-input requires `'a` | +| `10.2.7` Explicit lifetimes `'a` | ✅ | Parsed + checked; multi-input + mismatch | ### 10.3 — Compiler Architecture Upgrade (v0.6.0 target) diff --git a/README.md b/README.md index c9571b6..e29d583 100644 --- a/README.md +++ b/README.md @@ -246,7 +246,7 @@ func Main() -> int { | **Package Manager** | `bux add`, `bux install`, `bux.lock`, path + git deps | | **Cross-Compilation** | `--target ` via clang (e.g. `aarch64-linux-gnu`) | | **Diagnostics** | Rust-style snippets, multi-char underlines, `= help:` hints | -| **Tooling** | `bux new/build/run/test/check/fmt`, LSP (`tools/lsp_server.nim` + `buxc check`) | +| **Tooling** | `bux new/build/run/test/check/fmt/doc`, LSP 0.4.0 (locals + inferred lets) | --- @@ -299,6 +299,8 @@ bux/ | [`docs/Stdlib.md`](docs/Stdlib.md) | Standard library API | | [`docs/BuildAndTest.md`](docs/BuildAndTest.md) | Build, test, and tooling | | [`docs/QUALITY_PLAN.md`](docs/QUALITY_PLAN.md) | Roadmap toward a “good” v1.0 | +| [`docs/Packages.md`](docs/Packages.md) | Package manager + registry | +| [`docs/SEMVER.md`](docs/SEMVER.md) | Versioning policy | | [`docs/ROADMAP.md`](docs/ROADMAP.md) | Feature status (constructs) | | [`PLAN.md`](PLAN.md) | Long-form phase plan | @@ -319,14 +321,33 @@ make test-errors # Full unit + example suite make test +# Full-tree format check (lib/ examples/ src/ tests/ apps/) +make fmt-check +# Reformat those trees +make fmt + +# Stdlib behavioral goldens (Array / String / collections) +make test-stdlib + +# Generate stdlib API docs from /// comments +make docs + # Build self-hosted compiler (Bux → C → native) make selfhost -# Run all tests -make test +# Package tests (filter + summary table) +./buxc test --filter first _test_runner -# Run example programs -make test-examples +# Format / CI format check +./buxc fmt path/to/file.bux +./buxc fmt --check path/ + +# API docs +./buxc doc --out docs/api/stdlib.md lib/ + +# Package registry +./buxc search greet +make test-registry # add greet → install → build temp app # Verify selfhost binary parity (buxc2 → buxc3, identical) make selfhost-loop diff --git a/apps/boko-framework/src/Boko.bux b/apps/boko-framework/src/Boko.bux index 7afe4bd..dc6aebc 100644 --- a/apps/boko-framework/src/Boko.bux +++ b/apps/boko-framework/src/Boko.bux @@ -5,143 +5,143 @@ // ============================================================================= module Boko { -import Std::Io::{PrintLine, Print, PrintInt}; -import Std::Net::{Net_Create, Net_SetReuse, Net_Bind, Net_Listen, Net_Accept, Net_Send, Net_Recv, Net_Close, Net_LastError}; -import Std::String::{ - String_Len, String_Eq, String_IsNull, - String_StartsWith, String_Contains, - String_Find, String_Offset, String_Slice, - String_SplitCount, String_SplitPart, - StringBuilder, StringBuilder_New, StringBuilder_Append, - StringBuilder_AppendInt, StringBuilder_Build, StringBuilder_Free -}; -import Std::Map::{StringMap, StringMap_New, StringMap_Set, StringMap_Get, StringMap_Has}; + import Std::Io::{PrintLine, Print, PrintInt}; + import Std::Net::{Net_Create, Net_SetReuse, Net_Bind, Net_Listen, Net_Accept, Net_Send, Net_Recv, Net_Close, Net_LastError}; + import Std::String::{ + String_Len, String_Eq, String_IsNull, + String_StartsWith, String_Contains, + String_Find, String_Offset, String_Slice, + String_SplitCount, String_SplitPart, + StringBuilder, StringBuilder_New, StringBuilder_Append, + StringBuilder_AppendInt, StringBuilder_Build, StringBuilder_Free + }; + import Std::Map::{StringMap, StringMap_New, StringMap_Set, StringMap_Get, StringMap_Has}; -// ============================================================================= -// HTTP Methods -// ============================================================================= -enum HttpVerb { - GET, - POST, - PUT, - DELETE, - PATCH, - HEAD, - OPTIONS, -} + // ============================================================================= + // HTTP Methods + // ============================================================================= + enum HttpVerb { + GET, + POST, + PUT, + DELETE, + PATCH, + HEAD, + OPTIONS, + } -func HttpVerb_MethodName(verb: HttpVerb) -> String { - if verb.tag == HttpVerb_GET { return "GET"; } - if verb.tag == HttpVerb_POST { return "POST"; } - if verb.tag == HttpVerb_PUT { return "PUT"; } - if verb.tag == HttpVerb_DELETE { return "DELETE"; } - if verb.tag == HttpVerb_PATCH { return "PATCH"; } - if verb.tag == HttpVerb_HEAD { return "HEAD"; } - if verb.tag == HttpVerb_OPTIONS { return "OPTIONS"; } - return "?"; -} + func HttpVerb_MethodName(verb: HttpVerb) -> String { + if verb.tag == HttpVerb_GET { return "GET"; } + if verb.tag == HttpVerb_POST { return "POST"; } + if verb.tag == HttpVerb_PUT { return "PUT"; } + if verb.tag == HttpVerb_DELETE { return "DELETE"; } + if verb.tag == HttpVerb_PATCH { return "PATCH"; } + if verb.tag == HttpVerb_HEAD { return "HEAD"; } + if verb.tag == HttpVerb_OPTIONS { return "OPTIONS"; } + return "?"; + } -func HttpVerb_Parse(methodStr: String) -> HttpVerb { - if String_Eq(methodStr, "GET") { return HttpVerb { tag: HttpVerb_GET }; } - if String_Eq(methodStr, "POST") { return HttpVerb { tag: HttpVerb_POST }; } - if String_Eq(methodStr, "PUT") { return HttpVerb { tag: HttpVerb_PUT }; } - if String_Eq(methodStr, "DELETE") { return HttpVerb { tag: HttpVerb_DELETE }; } - if String_Eq(methodStr, "PATCH") { return HttpVerb { tag: HttpVerb_PATCH }; } - if String_Eq(methodStr, "HEAD") { return HttpVerb { tag: HttpVerb_HEAD }; } - if String_Eq(methodStr, "OPTIONS") { return HttpVerb { tag: HttpVerb_OPTIONS }; } - return HttpVerb { tag: HttpVerb_GET }; -} + func HttpVerb_Parse(methodStr: String) -> HttpVerb { + if String_Eq(methodStr, "GET") { return HttpVerb { tag: HttpVerb_GET }; } + if String_Eq(methodStr, "POST") { return HttpVerb { tag: HttpVerb_POST }; } + if String_Eq(methodStr, "PUT") { return HttpVerb { tag: HttpVerb_PUT }; } + if String_Eq(methodStr, "DELETE") { return HttpVerb { tag: HttpVerb_DELETE }; } + if String_Eq(methodStr, "PATCH") { return HttpVerb { tag: HttpVerb_PATCH }; } + if String_Eq(methodStr, "HEAD") { return HttpVerb { tag: HttpVerb_HEAD }; } + if String_Eq(methodStr, "OPTIONS") { return HttpVerb { tag: HttpVerb_OPTIONS }; } + return HttpVerb { tag: HttpVerb_GET }; + } -// ============================================================================= -// Request — parsed incoming HTTP request -// ============================================================================= -struct Request { - method: HttpVerb, - path: String, - body: String, - headers: StringMap, - query: StringMap, - pathParams: StringMap, -} + // ============================================================================= + // Request — parsed incoming HTTP request + // ============================================================================= + struct Request { + method: HttpVerb, + path: String, + body: String, + headers: StringMap, + query: StringMap, + pathParams: StringMap, + } -extend Request { - func GetHeader(self: Request, name: String) -> String { - if StringMap_Has(&self.headers, name) { - return StringMap_Get(&self.headers, name); + extend Request { + func GetHeader(self: Request, name: String) -> String { + if StringMap_Has(&self.headers, name) { + return StringMap_Get(&self.headers, name); + } + return ""; } - return ""; - } - func GetQuery(self: Request, name: String) -> String { - if StringMap_Has(&self.query, name) { - return StringMap_Get(&self.query, name); + func GetQuery(self: Request, name: String) -> String { + if StringMap_Has(&self.query, name) { + return StringMap_Get(&self.query, name); + } + return ""; } - return ""; - } - func HasQuery(self: Request, name: String) -> bool { - return StringMap_Has(&self.query, name); - } - - func GetPathParam(self: Request, name: String) -> String { - if StringMap_Has(&self.pathParams, name) { - return StringMap_Get(&self.pathParams, name); + func HasQuery(self: Request, name: String) -> bool { + return StringMap_Has(&self.query, name); + } + + func GetPathParam(self: Request, name: String) -> String { + if StringMap_Has(&self.pathParams, name) { + return StringMap_Get(&self.pathParams, name); + } + return ""; } - return ""; } -} -// ============================================================================= -// Response — outgoing HTTP response -// ============================================================================= -struct Response { - statusCode: int, - contentType: String, - body: String, - extraHeaders: String, -} + // ============================================================================= + // Response — outgoing HTTP response + // ============================================================================= + struct Response { + statusCode: int, + contentType: String, + body: String, + extraHeaders: String, + } -// --- Constructors --- -func Response_New(status: int, contentType: String, body: String) -> Response { - return Response { statusCode: status, contentType: contentType, body: body, extraHeaders: "" }; -} + // --- Constructors --- + func Response_New(status: int, contentType: String, body: String) -> Response { + return Response { statusCode: status, contentType: contentType, body: body, extraHeaders: "" }; + } -func Response_Ok(body: String) -> Response { - return Response_New(200, "text/html; charset=utf-8", body); -} + func Response_Ok(body: String) -> Response { + return Response_New(200, "text/html; charset=utf-8", body); + } -func Response_Html(html: String) -> Response { - return Response_New(200, "text/html; charset=utf-8", html); -} + func Response_Html(html: String) -> Response { + return Response_New(200, "text/html; charset=utf-8", html); + } -func Response_Json(json: String) -> Response { - return Response_New(200, "application/json; charset=utf-8", json); -} + func Response_Json(json: String) -> Response { + return Response_New(200, "application/json; charset=utf-8", json); + } -func Response_Text(text: String) -> Response { - return Response_New(200, "text/plain; charset=utf-8", text); -} + func Response_Text(text: String) -> Response { + return Response_New(200, "text/plain; charset=utf-8", text); + } -func Response_Redirect(url: String) -> Response { - let sb: StringBuilder = StringBuilder_New(); - StringBuilder_Append(&sb, "Location: "); - StringBuilder_Append(&sb, url); - StringBuilder_Append(&sb, "\r\n"); - let headers: String = StringBuilder_Build(&sb); - StringBuilder_Free(&sb); - return Response { statusCode: 302, contentType: "", body: "", extraHeaders: headers }; -} + func Response_Redirect(url: String) -> Response { + let sb: StringBuilder = StringBuilder_New(); + StringBuilder_Append(&sb, "Location: "); + StringBuilder_Append(&sb, url); + StringBuilder_Append(&sb, "\r\n"); + let headers: String = StringBuilder_Build(&sb); + StringBuilder_Free(&sb); + return Response { statusCode: 302, contentType: "", body: "", extraHeaders: headers }; + } -func Response_NotFound() -> Response { - return Response_New(404, "application/json; charset=utf-8", "{\"error\":\"not_found\"}"); -} + func Response_NotFound() -> Response { + return Response_New(404, "application/json; charset=utf-8", "{\"error\":\"not_found\"}"); + } -func Response_Error(status: int, message: String) -> Response { - let sb: StringBuilder = StringBuilder_New(); - StringBuilder_Append(&sb, "{\"error\":\""); - StringBuilder_Append(&sb, message); - StringBuilder_Append(&sb, "\"}"); + func Response_Error(status: int, message: String) -> Response { + let sb: StringBuilder = StringBuilder_New(); + StringBuilder_Append(&sb, "{\"error\":\""); + StringBuilder_Append(&sb, message); + StringBuilder_Append(&sb, "\"}"); let body: String = StringBuilder_Build(&sb); StringBuilder_Free(&sb); return Response_New(status, "application/json; charset=utf-8", body); diff --git a/apps/boko-framework/src/Main.bux b/apps/boko-framework/src/Main.bux index d8058fc..2dc8eb0 100644 --- a/apps/boko-framework/src/Main.bux +++ b/apps/boko-framework/src/Main.bux @@ -3,56 +3,56 @@ // ============================================================================= module Main { -import Std::Io::{PrintLine, Print}; -import Std::String::{ - String_Eq, String_Len, - StringBuilder, StringBuilder_New, StringBuilder_Append, - StringBuilder_Build, StringBuilder_Free -}; -import Boko::{ - App, App_New, App_Run, - Request, Response, - Response_Html, Response_Json, Response_NotFound, Response_Redirect, - Path_Match, - HttpVerb -}; + import Std::Io::{PrintLine, Print}; + import Std::String::{ + String_Eq, String_Len, + StringBuilder, StringBuilder_New, StringBuilder_Append, + StringBuilder_Build, StringBuilder_Free + }; + import Boko::{ + App, App_New, App_Run, + Request, Response, + Response_Html, Response_Json, Response_NotFound, Response_Redirect, + Path_Match, + HttpVerb + }; -// ============================================================================= -// Boko_Router — user-defined dispatch (called by the framework) -// ============================================================================= -func Boko_Router(req: Request) -> Response { - // --- GET / --- - if String_Eq(req.path, "/") && req.method.tag == HttpVerb_GET { - return Response_Html(PageHome()); - } + // ============================================================================= + // Boko_Router — user-defined dispatch (called by the framework) + // ============================================================================= + func Boko_Router(req: Request) -> Response { + // --- GET / --- + if String_Eq(req.path, "/") && req.method.tag == HttpVerb_GET { + return Response_Html(PageHome()); + } - // --- GET /api/health --- - if String_Eq(req.path, "/api/health") { - return Response_Json("{\"status\":\"ok\",\"framework\":\"Boko\",\"version\":\"0.2.0\"}"); - } + // --- GET /api/health --- + if String_Eq(req.path, "/api/health") { + return Response_Json("{\"status\":\"ok\",\"framework\":\"Boko\",\"version\":\"0.2.0\"}"); + } - // --- GET /api/info --- - if String_Eq(req.path, "/api/info") { - return Response_Json("{\"name\":\"Boko\",\"language\":\"Bux\",\"inspiration\":\"FastAPI\",\"features\":[\"routing\",\"path-params\",\"query-params\",\"json\"]}"); - } + // --- GET /api/info --- + if String_Eq(req.path, "/api/info") { + return Response_Json("{\"name\":\"Boko\",\"language\":\"Bux\",\"inspiration\":\"FastAPI\",\"features\":[\"routing\",\"path-params\",\"query-params\",\"json\"]}"); + } - // --- GET /hello?name=World --- - if String_Eq(req.path, "/hello") { - var name: String = req.GetQuery("name"); - if String_Len(name) == 0 { name = "World"; } - let html: String = f"

Hello, {name}!

"; - return Response_Html(html); - } + // --- GET /hello?name=World --- + if String_Eq(req.path, "/hello") { + var name: String = req.GetQuery("name"); + if String_Len(name) == 0 { name = "World"; } + let html: String = f"

Hello, {name}!

"; + return Response_Html(html); + } - // --- GET /users/{id} --- - if Path_Match("/users/{id}", req.path, &req) { - let id: String = req.GetPathParam("id"); - let sb: StringBuilder = StringBuilder_New(); - StringBuilder_Append(&sb, "{\"id\":"); - StringBuilder_Append(&sb, id); - StringBuilder_Append(&sb, ",\"name\":\"User "); - StringBuilder_Append(&sb, id); - StringBuilder_Append(&sb, "\"}"); + // --- GET /users/{id} --- + if Path_Match("/users/{id}", req.path, &req) { + let id: String = req.GetPathParam("id"); + let sb: StringBuilder = StringBuilder_New(); + StringBuilder_Append(&sb, "{\"id\":"); + StringBuilder_Append(&sb, id); + StringBuilder_Append(&sb, ",\"name\":\"User "); + StringBuilder_Append(&sb, id); + StringBuilder_Append(&sb, "\"}"); let json: String = StringBuilder_Build(&sb); StringBuilder_Free(&sb); return Response_Json(json); @@ -98,46 +98,46 @@ func Boko_Router(req: Request) -> Response { // ============================================================================= func PageHome() -> String { return ` - - - - -Boko Framework - - - -
-

⚡ Boko

-

Async web framework for Bux — inspired by FastAPI

-

Try it

-
GET/hello?name=Buxquery param
-
GET/users/42path param
-
GET/posts/7/comments/3multi params
-
GET/redirect302 → /
-
GET/api/healthJSON
-
GET/api/infoJSON
-

Features

-
✓Path routing with {params}
-
✓Query parameter extraction
-
✓JSON / HTML / Text responses
-
✓Multi-threaded (configurable)
-
✓Redirects (302)
-
✓POST body access
-
- -`; + + + + + Boko Framework + + + +
+

⚡ Boko

+

Async web framework for Bux — inspired by FastAPI

+

Try it

+
GET/hello?name=Buxquery param
+
GET/users/42path param
+
GET/posts/7/comments/3multi params
+
GET/redirect302 → /
+
GET/api/healthJSON
+
GET/api/infoJSON
+

Features

+
✓Path routing with {params}
+
✓Query parameter extraction
+
✓JSON / HTML / Text responses
+
✓Multi-threaded (configurable)
+
✓Redirects (302)
+
✓POST body access
+
+ + `; } // ============================================================================= diff --git a/apps/jwt-pitbul/src/Main.bux b/apps/jwt-pitbul/src/Main.bux index 95f865a..3455ae0 100644 --- a/apps/jwt-pitbul/src/Main.bux +++ b/apps/jwt-pitbul/src/Main.bux @@ -5,464 +5,464 @@ // ============================================================================= module Main { -import Std::Io::{PrintLine, Print, PrintInt}; -import Std::String::{ - String_Len, String_Eq, - String_SplitCount, String_SplitPart, - StringBuilder, StringBuilder_New, StringBuilder_Append, - StringBuilder_AppendInt, StringBuilder_Build, StringBuilder_Free -}; -import Std::Crypto::Jwt::{ - JwtAlg, - Jwt_MakeHeader, - Jwt_Encode, - Jwt_Decode, - Jwt_EncodeHS256, Jwt_EncodeHS384, Jwt_EncodeHS512, - Jwt_EncodeRS256, Jwt_EncodeES256, Jwt_EncodeEdDSA -}; -import Std::Crypto::Base64::{Base64URL_Decode, Base64_Encode}; -import Std::Crypto::Ed25519::{Ed25519_Keypair}; + import Std::Io::{PrintLine, Print, PrintInt}; + import Std::String::{ + String_Len, String_Eq, + String_SplitCount, String_SplitPart, + StringBuilder, StringBuilder_New, StringBuilder_Append, + StringBuilder_AppendInt, StringBuilder_Build, StringBuilder_Free + }; + import Std::Crypto::Jwt::{ + JwtAlg, + Jwt_MakeHeader, + Jwt_Encode, + Jwt_Decode, + Jwt_EncodeHS256, Jwt_EncodeHS384, Jwt_EncodeHS512, + Jwt_EncodeRS256, Jwt_EncodeES256, Jwt_EncodeEdDSA + }; + import Std::Crypto::Base64::{Base64URL_Decode, Base64_Encode}; + import Std::Crypto::Ed25519::{Ed25519_Keypair}; -extern func bux_argc() -> int; -extern func bux_argv(index: int) -> String; -extern func bux_alloc(size: uint) -> *void; -extern func bux_read_file(path: String) -> String; -extern func bux_file_exists(path: String) -> int; -extern func bux_base64_encode(data: String, len: int) -> String; + extern func bux_argc() -> int; + extern func bux_argv(index: int) -> String; + extern func bux_alloc(size: uint) -> *void; + extern func bux_read_file(path: String) -> String; + extern func bux_file_exists(path: String) -> int; + extern func bux_base64_encode(data: String, len: int) -> String; -// ============================================================================= -// Constants -// ============================================================================= -const AppName: String = "jwt-pitbul"; -const Version: String = "0.2.0"; + // ============================================================================= + // Constants + // ============================================================================= + const AppName: String = "jwt-pitbul"; + const Version: String = "0.2.0"; -// ============================================================================= -// Algebraic enums for optionals and results -// ============================================================================= -enum AlgOption { - Some(JwtAlg), - None, -} - -func AlgOption_MakeSome(value: JwtAlg) -> AlgOption { - let o: AlgOption = AlgOption { tag: AlgOption_Some }; - o.data.Some_0 = value; - return o; -} - -func AlgOption_MakeNone() -> AlgOption { - return AlgOption { tag: AlgOption_None }; -} - -enum CmdOption { - Some(Cmd), - None, -} - -func CmdOption_MakeSome(value: Cmd) -> CmdOption { - let o: CmdOption = CmdOption { tag: CmdOption_Some }; - o.data.Some_0 = value; - return o; -} - -func CmdOption_MakeNone() -> CmdOption { - return CmdOption { tag: CmdOption_None }; -} - -enum KeyTypeOption { - Some(KeyType), - None, -} - -func KeyTypeOption_MakeSome(value: KeyType) -> KeyTypeOption { - let o: KeyTypeOption = KeyTypeOption { tag: KeyTypeOption_Some }; - o.data.Some_0 = value; - return o; -} - -func KeyTypeOption_MakeNone() -> KeyTypeOption { - return KeyTypeOption { tag: KeyTypeOption_None }; -} - -enum KeyResult { - Ok(String), - Err(String), -} - -func KeyResult_MakeOk(value: String) -> KeyResult { - let r: KeyResult = KeyResult { tag: KeyResult_Ok }; - r.data.Ok_0 = value; - return r; -} - -func KeyResult_MakeErr(msg: String) -> KeyResult { - let r: KeyResult = KeyResult { tag: KeyResult_Err }; - r.data.Err_0 = msg; - return r; -} - -enum ExitResult { - Ok(int), - Err(String), -} - -func ExitResult_MakeOk(value: int) -> ExitResult { - let r: ExitResult = ExitResult { tag: ExitResult_Ok }; - r.data.Ok_0 = value; - return r; -} - -func ExitResult_MakeErr(msg: String) -> ExitResult { - let r: ExitResult = ExitResult { tag: ExitResult_Err }; - r.data.Err_0 = msg; - return r; -} - -// ============================================================================= -// Commands -// ============================================================================= -enum Cmd { - Sign, - Verify, - Decode, - Keygen, - Help, -} - -func ParseCmd(name: String) -> CmdOption { - if String_Eq(name, "sign") { return CmdOption_MakeSome(Cmd { tag: Cmd_Sign }); } - if String_Eq(name, "verify") { return CmdOption_MakeSome(Cmd { tag: Cmd_Verify }); } - if String_Eq(name, "decode") { return CmdOption_MakeSome(Cmd { tag: Cmd_Decode }); } - if String_Eq(name, "keygen") { return CmdOption_MakeSome(Cmd { tag: Cmd_Keygen }); } - if String_Eq(name, "help") || String_Eq(name, "--help") || String_Eq(name, "-h") { - return CmdOption_MakeSome(Cmd { tag: Cmd_Help }); + // ============================================================================= + // Algebraic enums for optionals and results + // ============================================================================= + enum AlgOption { + Some(JwtAlg), + None, } - return CmdOption_MakeNone(); -} -// ============================================================================= -// Key type generation -// ============================================================================= -enum KeyType { - Rsa, - Ecdsa, - Ed25519, -} + func AlgOption_MakeSome(value: JwtAlg) -> AlgOption { + let o: AlgOption = AlgOption { tag: AlgOption_Some }; + o.data.Some_0 = value; + return o; + } -func ParseKeyType(name: String) -> KeyTypeOption { - if String_Eq(name, "rsa") { return KeyTypeOption_MakeSome(KeyType { tag: KeyType_Rsa }); } - if String_Eq(name, "ecdsa") { return KeyTypeOption_MakeSome(KeyType { tag: KeyType_Ecdsa }); } - if String_Eq(name, "ed25519") { return KeyTypeOption_MakeSome(KeyType { tag: KeyType_Ed25519 }); } - return KeyTypeOption_MakeNone(); -} + func AlgOption_MakeNone() -> AlgOption { + return AlgOption { tag: AlgOption_None }; + } -// ============================================================================= -// Extend JwtAlg with parsing / introspection methods -// ============================================================================= -extend JwtAlg { - func Name(self: JwtAlg) -> String { - match self { - JwtAlg::HS256 => "HS256", - JwtAlg::HS384 => "HS384", - JwtAlg::HS512 => "HS512", - JwtAlg::RS256 => "RS256", - JwtAlg::RS384 => "RS384", - JwtAlg::RS512 => "RS512", - JwtAlg::ES256 => "ES256", - JwtAlg::ES384 => "ES384", - JwtAlg::EdDSA => "EdDSA", - _ => "HS256", + enum CmdOption { + Some(Cmd), + None, + } + + func CmdOption_MakeSome(value: Cmd) -> CmdOption { + let o: CmdOption = CmdOption { tag: CmdOption_Some }; + o.data.Some_0 = value; + return o; + } + + func CmdOption_MakeNone() -> CmdOption { + return CmdOption { tag: CmdOption_None }; + } + + enum KeyTypeOption { + Some(KeyType), + None, + } + + func KeyTypeOption_MakeSome(value: KeyType) -> KeyTypeOption { + let o: KeyTypeOption = KeyTypeOption { tag: KeyTypeOption_Some }; + o.data.Some_0 = value; + return o; + } + + func KeyTypeOption_MakeNone() -> KeyTypeOption { + return KeyTypeOption { tag: KeyTypeOption_None }; + } + + enum KeyResult { + Ok(String), + Err(String), + } + + func KeyResult_MakeOk(value: String) -> KeyResult { + let r: KeyResult = KeyResult { tag: KeyResult_Ok }; + r.data.Ok_0 = value; + return r; + } + + func KeyResult_MakeErr(msg: String) -> KeyResult { + let r: KeyResult = KeyResult { tag: KeyResult_Err }; + r.data.Err_0 = msg; + return r; + } + + enum ExitResult { + Ok(int), + Err(String), + } + + func ExitResult_MakeOk(value: int) -> ExitResult { + let r: ExitResult = ExitResult { tag: ExitResult_Ok }; + r.data.Ok_0 = value; + return r; + } + + func ExitResult_MakeErr(msg: String) -> ExitResult { + let r: ExitResult = ExitResult { tag: ExitResult_Err }; + r.data.Err_0 = msg; + return r; + } + + // ============================================================================= + // Commands + // ============================================================================= + enum Cmd { + Sign, + Verify, + Decode, + Keygen, + Help, + } + + func ParseCmd(name: String) -> CmdOption { + if String_Eq(name, "sign") { return CmdOption_MakeSome(Cmd { tag: Cmd_Sign }); } + if String_Eq(name, "verify") { return CmdOption_MakeSome(Cmd { tag: Cmd_Verify }); } + if String_Eq(name, "decode") { return CmdOption_MakeSome(Cmd { tag: Cmd_Decode }); } + if String_Eq(name, "keygen") { return CmdOption_MakeSome(Cmd { tag: Cmd_Keygen }); } + if String_Eq(name, "help") || String_Eq(name, "--help") || String_Eq(name, "-h") { + return CmdOption_MakeSome(Cmd { tag: Cmd_Help }); } + return CmdOption_MakeNone(); } - func IsHmac(self: JwtAlg) -> bool { - return self.tag == JwtAlg_HS256 || self.tag == JwtAlg_HS384 || self.tag == JwtAlg_HS512; + // ============================================================================= + // Key type generation + // ============================================================================= + enum KeyType { + Rsa, + Ecdsa, + Ed25519, } - func NeedsPemFile(self: JwtAlg) -> bool { - return self.tag == JwtAlg_RS256 || self.tag == JwtAlg_RS384 || self.tag == JwtAlg_RS512 || - self.tag == JwtAlg_ES256 || self.tag == JwtAlg_ES384; + func ParseKeyType(name: String) -> KeyTypeOption { + if String_Eq(name, "rsa") { return KeyTypeOption_MakeSome(KeyType { tag: KeyType_Rsa }); } + if String_Eq(name, "ecdsa") { return KeyTypeOption_MakeSome(KeyType { tag: KeyType_Ecdsa }); } + if String_Eq(name, "ed25519") { return KeyTypeOption_MakeSome(KeyType { tag: KeyType_Ed25519 }); } + return KeyTypeOption_MakeNone(); } -} - -func ParseAlg(name: String) -> AlgOption { - if String_Eq(name, "HS256") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_HS256 }); } - if String_Eq(name, "HS384") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_HS384 }); } - if String_Eq(name, "HS512") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_HS512 }); } - if String_Eq(name, "RS256") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_RS256 }); } - if String_Eq(name, "RS384") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_RS384 }); } - if String_Eq(name, "RS512") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_RS512 }); } - if String_Eq(name, "ES256") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_ES256 }); } - if String_Eq(name, "ES384") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_ES384 }); } - if String_Eq(name, "EdDSA") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_EdDSA }); } - return AlgOption_MakeNone(); -} - -// ============================================================================= -// Help / Usage -// ============================================================================= -func PrintUsage() { - PrintLine("╔══════════════════════════════════════════════════════╗"); - PrintLine(f"║ {AppName} — JWT CLI Tool v{Version} ║"); - PrintLine("║ Sign, verify, decode JSON Web Tokens ║"); - PrintLine("╚══════════════════════════════════════════════════════╝"); - PrintLine(""); - PrintLine("Usage:"); - PrintLine(f" {AppName} sign "); - PrintLine(f" {AppName} verify "); - PrintLine(f" {AppName} decode "); - PrintLine(f" {AppName} keygen "); - PrintLine(""); - PrintLine("Commands:"); - PrintLine(" sign Create a signed JWT from claims JSON"); - PrintLine(" verify Verify a JWT signature and print payload"); - PrintLine(" decode Decode a JWT without verification"); - PrintLine(" keygen Generate cryptographic keys"); - PrintLine(""); - PrintLine("Algorithms:"); - PrintLine(" HS256, HS384, HS512 — HMAC (symmetric)"); - PrintLine(" RS256, RS384, RS512 — RSA PKCS#1 v1.5"); - PrintLine(" ES256, ES384 — ECDSA P-256 / P-384"); - PrintLine(" EdDSA — Ed25519"); - PrintLine(""); - PrintLine("Key formats:"); - PrintLine(" HMAC: raw secret string"); - PrintLine(" RSA: path to PEM private/public key file"); - PrintLine(" ECDSA: path to PEM private/public key file"); - PrintLine(" EdDSA: base64-encoded 32-byte raw key"); - PrintLine(""); - PrintLine("Key generation:"); - PrintLine(f" {AppName} keygen rsa # RSA 2048-bit (PEM)"); - PrintLine(f" {AppName} keygen ecdsa # ECDSA P-256 (PEM)"); - PrintLine(f" {AppName} keygen ed25519 # Ed25519 (raw base64)"); - PrintLine(""); - PrintLine("Examples:"); - Print(f" {AppName} sign HS256 'my-secret' "); - PrintLine("'{\"sub\":\"123\"}'"); - PrintLine(f" {AppName} verify eyJh... HS256 'my-secret'"); - PrintLine(f" {AppName} decode eyJh..."); - PrintLine(f" {AppName} keygen ed25519"); -} - -// ============================================================================= -// Key resolution — for RSA/ECDSA, read PEM file; for HMAC/EdDSA, pass through -// ============================================================================= -func ResolveKey(alg: JwtAlg, keyArg: String) -> KeyResult { - if !alg.NeedsPemFile() { - return KeyResult_MakeOk(keyArg); - } - - if bux_file_exists(keyArg) == 0 { - return KeyResult_MakeErr(f"ERROR: PEM file not found: {keyArg}"); - } - - let pem: String = bux_read_file(keyArg); - if String_Len(pem) == 0 { - return KeyResult_MakeErr(f"ERROR: could not read PEM file: {keyArg}"); - } - return KeyResult_MakeOk(pem); -} - -// ============================================================================= -// Command: sign -// ============================================================================= -func CmdSign(algName: String, keyArg: String, claimsJson: String) -> ExitResult { - let algOpt: AlgOption = ParseAlg(algName); - if algOpt.tag != AlgOption_Some { - return ExitResult_MakeErr(f"ERROR: unknown algorithm '{algName}'"); - } - let alg: JwtAlg = algOpt.data.Some_0; - - let keyRes: KeyResult = ResolveKey(alg, keyArg); - if keyRes.tag != KeyResult_Ok { - return ExitResult_MakeErr(keyRes.data.Err_0); - } - let key: String = keyRes.data.Ok_0; - - let header: String = Jwt_MakeHeader(alg); - let token: String = Jwt_Encode(header, claimsJson, alg, key); - - if String_Len(token) == 0 { - return ExitResult_MakeErr("ERROR: signing failed"); - } - - PrintLine(token); - return ExitResult_MakeOk(0); -} - -// ============================================================================= -// Command: verify -// ============================================================================= -func CmdVerify(token: String, algName: String, keyArg: String) -> ExitResult { - let algOpt: AlgOption = ParseAlg(algName); - if algOpt.tag != AlgOption_Some { - return ExitResult_MakeErr(f"ERROR: unknown algorithm '{algName}'"); - } - let alg: JwtAlg = algOpt.data.Some_0; - - let keyRes: KeyResult = ResolveKey(alg, keyArg); - if keyRes.tag != KeyResult_Ok { - return ExitResult_MakeErr(keyRes.data.Err_0); - } - let key: String = keyRes.data.Ok_0; - - var header: String = ""; - var payload: String = ""; - - if !Jwt_Decode(token, alg, key, &header, &payload) { - return ExitResult_MakeErr("✗ Signature INVALID (or malformed token)"); - } - - PrintLine("✓ Signature valid"); - PrintLine(""); - PrintLine("Header:"); - PrintLine(header); - PrintLine(""); - PrintLine("Payload:"); - PrintLine(payload); - return ExitResult_MakeOk(0); -} - -// ============================================================================= -// Command: decode (no verification) -// ============================================================================= -func CmdDecode(token: String) -> ExitResult { - let partCount: uint = String_SplitCount(token, "."); - if partCount != 3 { - return ExitResult_MakeErr("ERROR: not a valid JWT (expected 3 parts)"); - } - - let headerB64: String = String_SplitPart(token, ".", 0); - let payloadB64: String = String_SplitPart(token, ".", 1); - let sigB64: String = String_SplitPart(token, ".", 2); - - let headerJson: String = Base64URL_Decode(headerB64); - let payloadJson: String = Base64URL_Decode(payloadB64); - - PrintLine("Decoded (no verification):"); - PrintLine(""); - PrintLine("Header:"); - PrintLine(headerJson); - PrintLine(""); - PrintLine("Payload:"); - PrintLine(payloadJson); - PrintLine(""); - Print("Signature (base64url): "); - PrintLine(sigB64); - - return ExitResult_MakeOk(0); -} - -// ============================================================================= -// Command: keygen -// ============================================================================= -func CmdKeygen(keyType: String) -> ExitResult { - let ktOpt: KeyTypeOption = ParseKeyType(keyType); - if ktOpt.tag != KeyTypeOption_Some { - return ExitResult_MakeErr(f"ERROR: unknown key type '{keyType}'. Use: rsa, ecdsa, ed25519"); - } - let kt: KeyType = ktOpt.data.Some_0; - - if kt.tag == KeyType_Ed25519 { - let pubBuf: *void = bux_alloc(32); - let priv: *void = bux_alloc(32); - if !Ed25519_Keypair(pubBuf, priv) { - return ExitResult_MakeErr("ERROR: Ed25519 key generation failed (OpenSSL 1.1.1+ required)"); + // ============================================================================= + // Extend JwtAlg with parsing / introspection methods + // ============================================================================= + extend JwtAlg { + func Name(self: JwtAlg) -> String { + match self { + JwtAlg::HS256 => "HS256", + JwtAlg::HS384 => "HS384", + JwtAlg::HS512 => "HS512", + JwtAlg::RS256 => "RS256", + JwtAlg::RS384 => "RS384", + JwtAlg::RS512 => "RS512", + JwtAlg::ES256 => "ES256", + JwtAlg::ES384 => "ES384", + JwtAlg::EdDSA => "EdDSA", + _ => "HS256", + } } - let pubB64: String = bux_base64_encode(pubBuf as String, 32); - let privB64: String = bux_base64_encode(priv as String, 32); - PrintLine("Ed25519 keypair (base64):"); - PrintLine(f" Public: {pubB64}"); - PrintLine(f" Private: {privB64}"); - return ExitResult_MakeOk(0); + + func IsHmac(self: JwtAlg) -> bool { + return self.tag == JwtAlg_HS256 || self.tag == JwtAlg_HS384 || self.tag == JwtAlg_HS512; + } + + func NeedsPemFile(self: JwtAlg) -> bool { + return self.tag == JwtAlg_RS256 || self.tag == JwtAlg_RS384 || self.tag == JwtAlg_RS512 || + self.tag == JwtAlg_ES256 || self.tag == JwtAlg_ES384; + } + } - if kt.tag == KeyType_Rsa { - PrintLine("RSA key generation requires OpenSSL CLI:"); - PrintLine(" openssl genpkey -algorithm RSA -out private.pem -pkeyopt rsa_keygen_bits:2048"); - PrintLine(" openssl rsa -in private.pem -pubout -out public.pem"); + + func ParseAlg(name: String) -> AlgOption { + if String_Eq(name, "HS256") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_HS256 }); } + if String_Eq(name, "HS384") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_HS384 }); } + if String_Eq(name, "HS512") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_HS512 }); } + if String_Eq(name, "RS256") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_RS256 }); } + if String_Eq(name, "RS384") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_RS384 }); } + if String_Eq(name, "RS512") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_RS512 }); } + if String_Eq(name, "ES256") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_ES256 }); } + if String_Eq(name, "ES384") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_ES384 }); } + if String_Eq(name, "EdDSA") { return AlgOption_MakeSome(JwtAlg { tag: JwtAlg_EdDSA }); } + return AlgOption_MakeNone(); + } + + // ============================================================================= + // Help / Usage + // ============================================================================= + func PrintUsage() { + PrintLine("╔══════════════════════════════════════════════════════╗"); + PrintLine(f"║ {AppName} — JWT CLI Tool v{Version} ║"); + PrintLine("║ Sign, verify, decode JSON Web Tokens ║"); + PrintLine("╚══════════════════════════════════════════════════════╝"); PrintLine(""); - PrintLine("(Key generation from within Bux requires PEM write support — coming soon)"); - return ExitResult_MakeOk(0); - } - if kt.tag == KeyType_Ecdsa { - PrintLine("ECDSA key generation requires OpenSSL CLI:"); - PrintLine(" openssl ecparam -genkey -name prime256v1 -noout -out ec_private.pem"); - PrintLine(" openssl ec -in ec_private.pem -pubout -out ec_public.pem"); + PrintLine("Usage:"); + PrintLine(f" {AppName} sign "); + PrintLine(f" {AppName} verify "); + PrintLine(f" {AppName} decode "); + PrintLine(f" {AppName} keygen "); PrintLine(""); - PrintLine("(Key generation from within Bux requires PEM write support — coming soon)"); + PrintLine("Commands:"); + PrintLine(" sign Create a signed JWT from claims JSON"); + PrintLine(" verify Verify a JWT signature and print payload"); + PrintLine(" decode Decode a JWT without verification"); + PrintLine(" keygen Generate cryptographic keys"); + PrintLine(""); + PrintLine("Algorithms:"); + PrintLine(" HS256, HS384, HS512 — HMAC (symmetric)"); + PrintLine(" RS256, RS384, RS512 — RSA PKCS#1 v1.5"); + PrintLine(" ES256, ES384 — ECDSA P-256 / P-384"); + PrintLine(" EdDSA — Ed25519"); + PrintLine(""); + PrintLine("Key formats:"); + PrintLine(" HMAC: raw secret string"); + PrintLine(" RSA: path to PEM private/public key file"); + PrintLine(" ECDSA: path to PEM private/public key file"); + PrintLine(" EdDSA: base64-encoded 32-byte raw key"); + PrintLine(""); + PrintLine("Key generation:"); + PrintLine(f" {AppName} keygen rsa # RSA 2048-bit (PEM)"); + PrintLine(f" {AppName} keygen ecdsa # ECDSA P-256 (PEM)"); + PrintLine(f" {AppName} keygen ed25519 # Ed25519 (raw base64)"); + PrintLine(""); + PrintLine("Examples:"); + Print(f" {AppName} sign HS256 'my-secret' "); + PrintLine("'{\"sub\":\"123\"}'"); + PrintLine(f" {AppName} verify eyJh... HS256 'my-secret'"); + PrintLine(f" {AppName} decode eyJh..."); + PrintLine(f" {AppName} keygen ed25519"); + } + + // ============================================================================= + // Key resolution — for RSA/ECDSA, read PEM file; for HMAC/EdDSA, pass through + // ============================================================================= + func ResolveKey(alg: JwtAlg, keyArg: String) -> KeyResult { + if !alg.NeedsPemFile() { + return KeyResult_MakeOk(keyArg); + } + + if bux_file_exists(keyArg) == 0 { + return KeyResult_MakeErr(f"ERROR: PEM file not found: {keyArg}"); + } + + let pem: String = bux_read_file(keyArg); + if String_Len(pem) == 0 { + return KeyResult_MakeErr(f"ERROR: could not read PEM file: {keyArg}"); + } + return KeyResult_MakeOk(pem); + } + + // ============================================================================= + // Command: sign + // ============================================================================= + func CmdSign(algName: String, keyArg: String, claimsJson: String) -> ExitResult { + let algOpt: AlgOption = ParseAlg(algName); + if algOpt.tag != AlgOption_Some { + return ExitResult_MakeErr(f"ERROR: unknown algorithm '{algName}'"); + } + let alg: JwtAlg = algOpt.data.Some_0; + + let keyRes: KeyResult = ResolveKey(alg, keyArg); + if keyRes.tag != KeyResult_Ok { + return ExitResult_MakeErr(keyRes.data.Err_0); + } + let key: String = keyRes.data.Ok_0; + + let header: String = Jwt_MakeHeader(alg); + let token: String = Jwt_Encode(header, claimsJson, alg, key); + + if String_Len(token) == 0 { + return ExitResult_MakeErr("ERROR: signing failed"); + } + + PrintLine(token); return ExitResult_MakeOk(0); } - return ExitResult_MakeErr(f"ERROR: unknown key type '{keyType}'"); -} -// ============================================================================= -// Dispatch a parsed command to its handler -// ============================================================================= -func RunCommand(cmd: Cmd, args: Array) -> ExitResult { - if cmd.tag == Cmd_Help { - PrintUsage(); + // ============================================================================= + // Command: verify + // ============================================================================= + func CmdVerify(token: String, algName: String, keyArg: String) -> ExitResult { + let algOpt: AlgOption = ParseAlg(algName); + if algOpt.tag != AlgOption_Some { + return ExitResult_MakeErr(f"ERROR: unknown algorithm '{algName}'"); + } + let alg: JwtAlg = algOpt.data.Some_0; + + let keyRes: KeyResult = ResolveKey(alg, keyArg); + if keyRes.tag != KeyResult_Ok { + return ExitResult_MakeErr(keyRes.data.Err_0); + } + let key: String = keyRes.data.Ok_0; + + var header: String = ""; + var payload: String = ""; + + if !Jwt_Decode(token, alg, key, &header, &payload) { + return ExitResult_MakeErr("✗ Signature INVALID (or malformed token)"); + } + + PrintLine("✓ Signature valid"); + PrintLine(""); + PrintLine("Header:"); + PrintLine(header); + PrintLine(""); + PrintLine("Payload:"); + PrintLine(payload); return ExitResult_MakeOk(0); } - if cmd.tag == Cmd_Sign { - if args.len < 5 { - return ExitResult_MakeErr("ERROR: 'sign' requires: "); + + // ============================================================================= + // Command: decode (no verification) + // ============================================================================= + func CmdDecode(token: String) -> ExitResult { + let partCount: uint = String_SplitCount(token, "."); + if partCount != 3 { + return ExitResult_MakeErr("ERROR: not a valid JWT (expected 3 parts)"); } - return CmdSign(args[2], args[3], args[4]); + + let headerB64: String = String_SplitPart(token, ".", 0); + let payloadB64: String = String_SplitPart(token, ".", 1); + let sigB64: String = String_SplitPart(token, ".", 2); + + let headerJson: String = Base64URL_Decode(headerB64); + let payloadJson: String = Base64URL_Decode(payloadB64); + + PrintLine("Decoded (no verification):"); + PrintLine(""); + PrintLine("Header:"); + PrintLine(headerJson); + PrintLine(""); + PrintLine("Payload:"); + PrintLine(payloadJson); + PrintLine(""); + Print("Signature (base64url): "); + PrintLine(sigB64); + + return ExitResult_MakeOk(0); } - if cmd.tag == Cmd_Verify { - if args.len < 5 { - return ExitResult_MakeErr("ERROR: 'verify' requires: "); + + // ============================================================================= + // Command: keygen + // ============================================================================= + func CmdKeygen(keyType: String) -> ExitResult { + let ktOpt: KeyTypeOption = ParseKeyType(keyType); + if ktOpt.tag != KeyTypeOption_Some { + return ExitResult_MakeErr(f"ERROR: unknown key type '{keyType}'. Use: rsa, ecdsa, ed25519"); } - return CmdVerify(args[2], args[3], args[4]); - } - if cmd.tag == Cmd_Decode { - if args.len < 3 { - return ExitResult_MakeErr("ERROR: 'decode' requires: "); + let kt: KeyType = ktOpt.data.Some_0; + + if kt.tag == KeyType_Ed25519 { + let pubBuf: *void = bux_alloc(32); + let priv: *void = bux_alloc(32); + if !Ed25519_Keypair(pubBuf, priv) { + return ExitResult_MakeErr("ERROR: Ed25519 key generation failed (OpenSSL 1.1.1+ required)"); + } + let pubB64: String = bux_base64_encode(pubBuf as String, 32); + let privB64: String = bux_base64_encode(priv as String, 32); + PrintLine("Ed25519 keypair (base64):"); + PrintLine(f" Public: {pubB64}"); + PrintLine(f" Private: {privB64}"); + return ExitResult_MakeOk(0); } - return CmdDecode(args[2]); - } - if cmd.tag == Cmd_Keygen { - if args.len < 3 { - return ExitResult_MakeErr("ERROR: 'keygen' requires: "); + if kt.tag == KeyType_Rsa { + PrintLine("RSA key generation requires OpenSSL CLI:"); + PrintLine(" openssl genpkey -algorithm RSA -out private.pem -pkeyopt rsa_keygen_bits:2048"); + PrintLine(" openssl rsa -in private.pem -pubout -out public.pem"); + PrintLine(""); + PrintLine("(Key generation from within Bux requires PEM write support — coming soon)"); + return ExitResult_MakeOk(0); } - return CmdKeygen(args[2]); - } - return ExitResult_MakeErr("ERROR: unhandled command"); -} - -// ============================================================================= -// Main Entry Point -// ============================================================================= -func Main() -> int { - let argc: int = bux_argc(); - - // Collect CLI arguments into a generic Array - let args: Array = Array_New(argc as uint); - for i in 0..argc { - Array_Push(&args, bux_argv(i)); + if kt.tag == KeyType_Ecdsa { + PrintLine("ECDSA key generation requires OpenSSL CLI:"); + PrintLine(" openssl ecparam -genkey -name prime256v1 -noout -out ec_private.pem"); + PrintLine(" openssl ec -in ec_private.pem -pubout -out ec_public.pem"); + PrintLine(""); + PrintLine("(Key generation from within Bux requires PEM write support — coming soon)"); + return ExitResult_MakeOk(0); + } + return ExitResult_MakeErr(f"ERROR: unknown key type '{keyType}'"); } - if args.len < 2 { - PrintUsage(); - return 0; + // ============================================================================= + // Dispatch a parsed command to its handler + // ============================================================================= + func RunCommand(cmd: Cmd, args: Array) -> ExitResult { + if cmd.tag == Cmd_Help { + PrintUsage(); + return ExitResult_MakeOk(0); + } + if cmd.tag == Cmd_Sign { + if args.len < 5 { + return ExitResult_MakeErr("ERROR: 'sign' requires: "); + } + return CmdSign(args[2], args[3], args[4]); + } + if cmd.tag == Cmd_Verify { + if args.len < 5 { + return ExitResult_MakeErr("ERROR: 'verify' requires: "); + } + return CmdVerify(args[2], args[3], args[4]); + } + if cmd.tag == Cmd_Decode { + if args.len < 3 { + return ExitResult_MakeErr("ERROR: 'decode' requires: "); + } + return CmdDecode(args[2]); + } + if cmd.tag == Cmd_Keygen { + if args.len < 3 { + return ExitResult_MakeErr("ERROR: 'keygen' requires: "); + } + return CmdKeygen(args[2]); + } + return ExitResult_MakeErr("ERROR: unhandled command"); } - let command: String = args[1]; - let cmdOpt: CmdOption = ParseCmd(command); - if cmdOpt.tag != CmdOption_Some { - PrintLine(f"ERROR: unknown command '{command}'"); - PrintLine(f"Run '{AppName} help' for usage."); - return 1; - } - let cmd: Cmd = cmdOpt.data.Some_0; + // ============================================================================= + // Main Entry Point + // ============================================================================= + func Main() -> int { + let argc: int = bux_argc(); - let result: ExitResult = RunCommand(cmd, args); - if result.tag == ExitResult_Err { - PrintLine(result.data.Err_0); - return 1; + // Collect CLI arguments into a generic Array + let args: Array = Array_New(argc as uint); + for i in 0..argc { + Array_Push(&args, bux_argv(i)); + } + + if args.len < 2 { + PrintUsage(); + return 0; + } + + let command: String = args[1]; + let cmdOpt: CmdOption = ParseCmd(command); + if cmdOpt.tag != CmdOption_Some { + PrintLine(f"ERROR: unknown command '{command}'"); + PrintLine(f"Run '{AppName} help' for usage."); + return 1; + } + let cmd: Cmd = cmdOpt.data.Some_0; + + let result: ExitResult = RunCommand(cmd, args); + if result.tag == ExitResult_Err { + PrintLine(result.data.Err_0); + return 1; + } + return result.data.Ok_0; } - return result.data.Ok_0; -} } // module Main diff --git a/apps/nexus/src/Config.bux b/apps/nexus/src/Config.bux index 52c19ee..1421cba 100644 --- a/apps/nexus/src/Config.bux +++ b/apps/nexus/src/Config.bux @@ -1,21 +1,21 @@ module Config { -pub struct ServerConfig { - bindAddr: String; - port: int; - workerCount: int; - publicDir: String; - backlog: int; -} + pub struct ServerConfig { + bindAddr: String; + port: int; + workerCount: int; + publicDir: String; + backlog: int; + } -pub const func DefaultConfig() -> ServerConfig { - return ServerConfig { - bindAddr: "0.0.0.0", - port: 8080, - workerCount: 4, - publicDir: "public", - backlog: 128, - }; -} + pub const func DefaultConfig() -> ServerConfig { + return ServerConfig { + bindAddr: "0.0.0.0", + port: 8080, + workerCount: 4, + publicDir: "public", + backlog: 128, + }; + } } diff --git a/apps/nexus/src/Errors.bux b/apps/nexus/src/Errors.bux index 124373d..863f457 100644 --- a/apps/nexus/src/Errors.bux +++ b/apps/nexus/src/Errors.bux @@ -1,65 +1,65 @@ module Errors { -import Http::{HttpRequest}; + import Http::{HttpRequest}; -pub enum HttpError { - BadRequest, - NotFound, - MethodNotAllowed, - InternalError(String), -} + pub enum HttpError { + BadRequest, + NotFound, + MethodNotAllowed, + InternalError(String), + } -pub enum ParseResult { - Ok(HttpRequest), - Err(HttpError), -} + pub enum ParseResult { + Ok(HttpRequest), + Err(HttpError), + } -pub enum FileResult { - Ok(String), - Err(HttpError), -} + pub enum FileResult { + Ok(String), + Err(HttpError), + } -pub func ParseResult_NewOk(req: HttpRequest) -> ParseResult { - let r: ParseResult = ParseResult { tag: ParseResult_Ok }; - r.data.Ok_0 = req; - return r; -} + pub func ParseResult_NewOk(req: HttpRequest) -> ParseResult { + let r: ParseResult = ParseResult { tag: ParseResult_Ok }; + r.data.Ok_0 = req; + return r; + } -pub func ParseResult_NewErr(err: HttpError) -> ParseResult { - let r: ParseResult = ParseResult { tag: ParseResult_Err }; - r.data.Err_0 = err; - return r; -} + pub func ParseResult_NewErr(err: HttpError) -> ParseResult { + let r: ParseResult = ParseResult { tag: ParseResult_Err }; + r.data.Err_0 = err; + return r; + } -pub func FileResult_NewOk(content: String) -> FileResult { - let r: FileResult = FileResult { tag: FileResult_Ok }; - r.data.Ok_0 = content; - return r; -} + pub func FileResult_NewOk(content: String) -> FileResult { + let r: FileResult = FileResult { tag: FileResult_Ok }; + r.data.Ok_0 = content; + return r; + } -pub func FileResult_NewErr(err: HttpError) -> FileResult { - let r: FileResult = FileResult { tag: FileResult_Err }; - r.data.Err_0 = err; - return r; -} + pub func FileResult_NewErr(err: HttpError) -> FileResult { + let r: FileResult = FileResult { tag: FileResult_Err }; + r.data.Err_0 = err; + return r; + } -pub func FileResult_IsOk(r: FileResult) -> bool { - return r.tag == FileResult_Ok; -} + pub func FileResult_IsOk(r: FileResult) -> bool { + return r.tag == FileResult_Ok; + } -pub func FileResult_Unwrap(r: FileResult) -> String { - return r.data.Ok_0; -} + pub func FileResult_Unwrap(r: FileResult) -> String { + return r.data.Ok_0; + } -pub func FileResult_UnwrapErr(r: FileResult) -> HttpError { - return r.data.Err_0; -} + pub func FileResult_UnwrapErr(r: FileResult) -> HttpError { + return r.data.Err_0; + } -pub func HttpError_ToString(err: HttpError) -> String { - if err.tag == HttpError_BadRequest { return "Bad Request"; } - if err.tag == HttpError_NotFound { return "Not Found"; } - if err.tag == HttpError_MethodNotAllowed { return "Method Not Allowed"; } - return err.data.InternalError_0; -} + pub func HttpError_ToString(err: HttpError) -> String { + if err.tag == HttpError_BadRequest { return "Bad Request"; } + if err.tag == HttpError_NotFound { return "Not Found"; } + if err.tag == HttpError_MethodNotAllowed { return "Method Not Allowed"; } + return err.data.InternalError_0; + } } diff --git a/apps/nexus/src/Handlers.bux b/apps/nexus/src/Handlers.bux index ddd3ebd..b7c7c8a 100644 --- a/apps/nexus/src/Handlers.bux +++ b/apps/nexus/src/Handlers.bux @@ -1,94 +1,94 @@ module Handlers { -import Std::String::{String_Eq, String_Contains}; -import Http::{HttpMethod, HttpRequest, HttpResponse, Http_NewResponse, Http_MimeType, RequestHeader_Get}; -import Errors::{HttpError, FileResult, FileResult_NewOk, FileResult_NewErr, FileResult_IsOk, FileResult_Unwrap, FileResult_UnwrapErr, HttpError_ToString}; + import Std::String::{String_Eq, String_Contains}; + import Http::{HttpMethod, HttpRequest, HttpResponse, Http_NewResponse, Http_MimeType, RequestHeader_Get}; + import Errors::{HttpError, FileResult, FileResult_NewOk, FileResult_NewErr, FileResult_IsOk, FileResult_Unwrap, FileResult_UnwrapErr, HttpError_ToString}; -extern func bux_strlen(s: String) -> uint; -extern func bux_file_exists(path: String) -> int; -extern func bux_read_file(path: String) -> String; -extern func bux_path_join(a: String, b: String) -> String; -extern func bux_sb_new(initial_cap: uint) -> *void; -extern func bux_sb_append(sb: *void, s: String); -extern func bux_sb_append_int(sb: *void, n: int64); -extern func bux_sb_build(sb: *void) -> String; -extern func bux_sb_free(sb: *void); + extern func bux_strlen(s: String) -> uint; + extern func bux_file_exists(path: String) -> int; + extern func bux_read_file(path: String) -> String; + extern func bux_path_join(a: String, b: String) -> String; + extern func bux_sb_new(initial_cap: uint) -> *void; + extern func bux_sb_append(sb: *void, s: String); + extern func bux_sb_append_int(sb: *void, n: int64); + extern func bux_sb_build(sb: *void) -> String; + extern func bux_sb_free(sb: *void); -pub func NotFoundResponse() -> HttpResponse { - return Http_NewResponse(404, "application/json; charset=utf-8", "{\"error\":\"not_found\"}"); -} - -pub func MethodNotAllowedResponse() -> HttpResponse { - return Http_NewResponse(405, "text/plain; charset=utf-8", "Method Not Allowed"); -} - -pub func ReadStaticFile(requestPath: String) -> FileResult { - if String_Contains(requestPath, "..") { - return FileResult_NewErr(HttpError { tag: HttpError_NotFound }); + pub func NotFoundResponse() -> HttpResponse { + return Http_NewResponse(404, "application/json; charset=utf-8", "{\"error\":\"not_found\"}"); } - var filePath: String = requestPath; - if String_Eq(filePath, "/") { - filePath = "/index.html"; + pub func MethodNotAllowedResponse() -> HttpResponse { + return Http_NewResponse(405, "text/plain; charset=utf-8", "Method Not Allowed"); } - let fullPath: String = bux_path_join("public", filePath); - if bux_file_exists(fullPath) == 0 { - return FileResult_NewErr(HttpError { tag: HttpError_NotFound }); + pub func ReadStaticFile(requestPath: String) -> FileResult { + if String_Contains(requestPath, "..") { + return FileResult_NewErr(HttpError { tag: HttpError_NotFound }); + } + + var filePath: String = requestPath; + if String_Eq(filePath, "/") { + filePath = "/index.html"; + } + + let fullPath: String = bux_path_join("public", filePath); + if bux_file_exists(fullPath) == 0 { + return FileResult_NewErr(HttpError { tag: HttpError_NotFound }); + } + + let content: String = bux_read_file(fullPath); + return FileResult_NewOk(content); } - let content: String = bux_read_file(fullPath); - return FileResult_NewOk(content); -} - -func FileErrorResponse(err: HttpError) -> HttpResponse { - match err { - HttpError::NotFound => NotFoundResponse(), - _ => Http_NewResponse(500, "text/plain; charset=utf-8", HttpError_ToString(err)), - } -} - -pub func ServeStaticFile(req: HttpRequest) -> HttpResponse { - if req.method != HttpMethod_GET && req.method != HttpMethod_HEAD { - return MethodNotAllowedResponse(); + func FileErrorResponse(err: HttpError) -> HttpResponse { + match err { + HttpError::NotFound => NotFoundResponse(), + _ => Http_NewResponse(500, "text/plain; charset=utf-8", HttpError_ToString(err)), + } } - let result: FileResult = ReadStaticFile(req.path); - if FileResult_IsOk(result) { - let content: String = FileResult_Unwrap(result); - return Http_NewResponse(200, Http_MimeType(req.path), content); - } - return FileErrorResponse(FileResult_UnwrapErr(result)); -} + pub func ServeStaticFile(req: HttpRequest) -> HttpResponse { + if req.method != HttpMethod_GET && req.method != HttpMethod_HEAD { + return MethodNotAllowedResponse(); + } -pub func HandleApiHealth() -> HttpResponse { - return Http_NewResponse(200, "application/json; charset=utf-8", + let result: FileResult = ReadStaticFile(req.path); + if FileResult_IsOk(result) { + let content: String = FileResult_Unwrap(result); + return Http_NewResponse(200, Http_MimeType(req.path), content); + } + return FileErrorResponse(FileResult_UnwrapErr(result)); + } + + pub func HandleApiHealth() -> HttpResponse { + return Http_NewResponse(200, "application/json; charset=utf-8", "{\"status\":\"ok\",\"server\":\"Nexus\",\"version\":\"0.2.0\"}"); -} + } -pub func HandleApiInfo() -> HttpResponse { - return Http_NewResponse(200, "application/json; charset=utf-8", + pub func HandleApiInfo() -> HttpResponse { + return Http_NewResponse(200, "application/json; charset=utf-8", "{\"name\":\"Nexus\",\"language\":\"Bux\",\"features\":[\"HTTP/1.1\",\"thread-pool\",\"algebraic-enums\"]}"); -} + } -pub func HandleWebSocketUpgrade(req: HttpRequest) -> HttpResponse { - let wsKey: String = RequestHeader_Get(req, "Sec-WebSocket-Key"); + pub func HandleWebSocketUpgrade(req: HttpRequest) -> HttpResponse { + let wsKey: String = RequestHeader_Get(req, "Sec-WebSocket-Key"); - var resp: HttpResponse; - resp.statusCode = 101; - resp.contentType = ""; - resp.body = ""; + var resp: HttpResponse; + resp.statusCode = 101; + resp.contentType = ""; + resp.body = ""; - let sb: *void = bux_sb_new(256); - bux_sb_append(sb, "Upgrade: websocket\r\n"); - bux_sb_append(sb, "Connection: Upgrade\r\n"); - bux_sb_append(sb, "Sec-WebSocket-Accept: "); - bux_sb_append(sb, wsKey); - bux_sb_append(sb, "\r\n"); - resp.extraHeaders = bux_sb_build(sb); - bux_sb_free(sb); + let sb: *void = bux_sb_new(256); + bux_sb_append(sb, "Upgrade: websocket\r\n"); + bux_sb_append(sb, "Connection: Upgrade\r\n"); + bux_sb_append(sb, "Sec-WebSocket-Accept: "); + bux_sb_append(sb, wsKey); + bux_sb_append(sb, "\r\n"); + resp.extraHeaders = bux_sb_build(sb); + bux_sb_free(sb); - return resp; -} + return resp; + } } diff --git a/apps/nexus/src/Http.bux b/apps/nexus/src/Http.bux index 2dceb74..3bcfab9 100644 --- a/apps/nexus/src/Http.bux +++ b/apps/nexus/src/Http.bux @@ -1,107 +1,107 @@ module Http { -import Std::Array::{Array}; -import Std::String::{String_Eq, String_EndsWith, String_Contains}; + import Std::Array::{Array}; + import Std::String::{String_Eq, String_EndsWith, String_Contains}; -pub enum HttpMethod { - GET, - POST, - PUT, - DELETE, - PATCH, - HEAD, - OPTIONS, - UNKNOWN, -} - -pub struct HeaderEntry { - key: String; - value: String; -} - -pub struct HttpRequest { - method: HttpMethod; - path: String; - version: String; - body: String; - headers: Array; -} - -pub struct HttpResponse { - statusCode: int; - contentType: String; - body: String; - extraHeaders: String; -} - -pub func Http_StatusText(code: int) -> String { - if code == 200 { return "OK"; } - if code == 201 { return "Created"; } - if code == 204 { return "No Content"; } - if code == 301 { return "Moved Permanently"; } - if code == 302 { return "Found"; } - if code == 304 { return "Not Modified"; } - if code == 400 { return "Bad Request"; } - if code == 401 { return "Unauthorized"; } - if code == 403 { return "Forbidden"; } - if code == 404 { return "Not Found"; } - if code == 405 { return "Method Not Allowed"; } - if code == 413 { return "Payload Too Large"; } - if code == 414 { return "URI Too Long"; } - if code == 500 { return "Internal Server Error"; } - if code == 501 { return "Not Implemented"; } - if code == 503 { return "Service Unavailable"; } - return "Unknown"; -} - -pub func Http_MimeType(path: String) -> String { - if String_EndsWith(path, ".html") || String_EndsWith(path, ".htm") { return "text/html; charset=utf-8"; } - if String_EndsWith(path, ".css") { return "text/css; charset=utf-8"; } - if String_EndsWith(path, ".js") { return "application/javascript; charset=utf-8"; } - if String_EndsWith(path, ".json") { return "application/json; charset=utf-8"; } - if String_EndsWith(path, ".xml") { return "application/xml; charset=utf-8"; } - if String_EndsWith(path, ".txt") { return "text/plain; charset=utf-8"; } - if String_EndsWith(path, ".png") { return "image/png"; } - if String_EndsWith(path, ".jpg") || String_EndsWith(path, ".jpeg") { return "image/jpeg"; } - if String_EndsWith(path, ".gif") { return "image/gif"; } - if String_EndsWith(path, ".svg") { return "image/svg+xml"; } - if String_EndsWith(path, ".ico") { return "image/x-icon"; } - if String_EndsWith(path, ".webp") { return "image/webp"; } - if String_EndsWith(path, ".woff2") { return "font/woff2"; } - if String_EndsWith(path, ".woff") { return "font/woff"; } - if String_EndsWith(path, ".wasm") { return "application/wasm"; } - return "application/octet-stream"; -} - -pub func Http_MethodName(m: HttpMethod) -> String { - match m { - HttpMethod::GET => "GET", - HttpMethod::POST => "POST", - HttpMethod::PUT => "PUT", - HttpMethod::DELETE => "DELETE", - HttpMethod::PATCH => "PATCH", - HttpMethod::HEAD => "HEAD", - HttpMethod::OPTIONS => "OPTIONS", - HttpMethod::UNKNOWN => "UNKNOWN", + pub enum HttpMethod { + GET, + POST, + PUT, + DELETE, + PATCH, + HEAD, + OPTIONS, + UNKNOWN, } -} -pub func Http_NewResponse(code: int, contentType: String, body: String) -> HttpResponse { - var resp: HttpResponse; - resp.statusCode = code; - resp.contentType = contentType; - resp.body = body; - resp.extraHeaders = ""; - return resp; -} + pub struct HeaderEntry { + key: String; + value: String; + } -pub func RequestHeader_Get(req: HttpRequest, key: String) -> String { - for entry in req.headers { - if String_Eq(entry.key, key) { - return entry.value; + pub struct HttpRequest { + method: HttpMethod; + path: String; + version: String; + body: String; + headers: Array; + } + + pub struct HttpResponse { + statusCode: int; + contentType: String; + body: String; + extraHeaders: String; + } + + pub func Http_StatusText(code: int) -> String { + if code == 200 { return "OK"; } + if code == 201 { return "Created"; } + if code == 204 { return "No Content"; } + if code == 301 { return "Moved Permanently"; } + if code == 302 { return "Found"; } + if code == 304 { return "Not Modified"; } + if code == 400 { return "Bad Request"; } + if code == 401 { return "Unauthorized"; } + if code == 403 { return "Forbidden"; } + if code == 404 { return "Not Found"; } + if code == 405 { return "Method Not Allowed"; } + if code == 413 { return "Payload Too Large"; } + if code == 414 { return "URI Too Long"; } + if code == 500 { return "Internal Server Error"; } + if code == 501 { return "Not Implemented"; } + if code == 503 { return "Service Unavailable"; } + return "Unknown"; + } + + pub func Http_MimeType(path: String) -> String { + if String_EndsWith(path, ".html") || String_EndsWith(path, ".htm") { return "text/html; charset=utf-8"; } + if String_EndsWith(path, ".css") { return "text/css; charset=utf-8"; } + if String_EndsWith(path, ".js") { return "application/javascript; charset=utf-8"; } + if String_EndsWith(path, ".json") { return "application/json; charset=utf-8"; } + if String_EndsWith(path, ".xml") { return "application/xml; charset=utf-8"; } + if String_EndsWith(path, ".txt") { return "text/plain; charset=utf-8"; } + if String_EndsWith(path, ".png") { return "image/png"; } + if String_EndsWith(path, ".jpg") || String_EndsWith(path, ".jpeg") { return "image/jpeg"; } + if String_EndsWith(path, ".gif") { return "image/gif"; } + if String_EndsWith(path, ".svg") { return "image/svg+xml"; } + if String_EndsWith(path, ".ico") { return "image/x-icon"; } + if String_EndsWith(path, ".webp") { return "image/webp"; } + if String_EndsWith(path, ".woff2") { return "font/woff2"; } + if String_EndsWith(path, ".woff") { return "font/woff"; } + if String_EndsWith(path, ".wasm") { return "application/wasm"; } + return "application/octet-stream"; + } + + pub func Http_MethodName(m: HttpMethod) -> String { + match m { + HttpMethod::GET => "GET", + HttpMethod::POST => "POST", + HttpMethod::PUT => "PUT", + HttpMethod::DELETE => "DELETE", + HttpMethod::PATCH => "PATCH", + HttpMethod::HEAD => "HEAD", + HttpMethod::OPTIONS => "OPTIONS", + HttpMethod::UNKNOWN => "UNKNOWN", } } - return ""; -} + + pub func Http_NewResponse(code: int, contentType: String, body: String) -> HttpResponse { + var resp: HttpResponse; + resp.statusCode = code; + resp.contentType = contentType; + resp.body = body; + resp.extraHeaders = ""; + return resp; + } + + pub func RequestHeader_Get(req: HttpRequest, key: String) -> String { + for entry in req.headers { + if String_Eq(entry.key, key) { + return entry.value; + } + } + return ""; + } } diff --git a/apps/nexus/src/Main.bux b/apps/nexus/src/Main.bux index adf1072..a59bf0b 100644 --- a/apps/nexus/src/Main.bux +++ b/apps/nexus/src/Main.bux @@ -1,49 +1,49 @@ module Main { -import Config::{ServerConfig, DefaultConfig}; -import Http::{HttpMethod}; -import Router::{Handler, Route, Router}; -import Server::{RunServer}; -import Std::Array::{Array, Array_New, Array_Push}; + import Config::{ServerConfig, DefaultConfig}; + import Http::{HttpMethod}; + import Router::{Handler, Route, Router}; + import Server::{RunServer}; + import Std::Array::{Array, Array_New, Array_Push}; -func BuildRouter() -> Router { - var routes: Array = Array_New(8); + func BuildRouter() -> Router { + var routes: Array = Array_New(8); - Array_Push(&routes, Route { - method: HttpMethod { tag: HttpMethod_GET }, - path: "/api/health", - handler: Handler { tag: Handler_ApiHealth }, - }); + Array_Push(&routes, Route { + method: HttpMethod { tag: HttpMethod_GET }, + path: "/api/health", + handler: Handler { tag: Handler_ApiHealth }, + }); - Array_Push(&routes, Route { - method: HttpMethod { tag: HttpMethod_GET }, - path: "/api/info", - handler: Handler { tag: Handler_ApiInfo }, - }); + Array_Push(&routes, Route { + method: HttpMethod { tag: HttpMethod_GET }, + path: "/api/info", + handler: Handler { tag: Handler_ApiInfo }, + }); - Array_Push(&routes, Route { - method: HttpMethod { tag: HttpMethod_GET }, - path: "/ws", - handler: Handler { tag: Handler_WsUpgrade }, - }); + Array_Push(&routes, Route { + method: HttpMethod { tag: HttpMethod_GET }, + path: "/ws", + handler: Handler { tag: Handler_WsUpgrade }, + }); - Array_Push(&routes, Route { - method: HttpMethod { tag: HttpMethod_GET }, - path: "/", - handler: Handler { tag: Handler_StaticFile }, - }); + Array_Push(&routes, Route { + method: HttpMethod { tag: HttpMethod_GET }, + path: "/", + handler: Handler { tag: Handler_StaticFile }, + }); - return Router { - routes: routes, - notFound: Handler { tag: Handler_NotFound }, - }; -} + return Router { + routes: routes, + notFound: Handler { tag: Handler_NotFound }, + }; + } -func Main() -> int { - let config: ServerConfig = DefaultConfig(); - let router: Router = BuildRouter(); + func Main() -> int { + let config: ServerConfig = DefaultConfig(); + let router: Router = BuildRouter(); - return RunServer(config, router); -} + return RunServer(config, router); + } } diff --git a/apps/nexus/src/Parser.bux b/apps/nexus/src/Parser.bux index 9e8f84b..12b54ea 100644 --- a/apps/nexus/src/Parser.bux +++ b/apps/nexus/src/Parser.bux @@ -1,130 +1,130 @@ module Parser { -import Std::String::{String_Len, String_Eq, String_Trim}; -import Std::Array::{Array, Array_New, Array_Push}; -import Http::{HttpMethod, HttpRequest, HeaderEntry}; -import Errors::{HttpError, ParseResult, ParseResult_NewOk, ParseResult_NewErr}; + import Std::String::{String_Len, String_Eq, String_Trim}; + import Std::Array::{Array, Array_New, Array_Push}; + import Http::{HttpMethod, HttpRequest, HeaderEntry}; + import Errors::{HttpError, ParseResult, ParseResult_NewOk, ParseResult_NewErr}; -extern func bux_strlen(s: String) -> uint; -extern func bux_strstr(haystack: String, needle: String) -> String; -extern func bux_str_slice(s: String, start: uint, len: uint) -> String; -extern func bux_str_offset(pos: String, base: String) -> uint; + extern func bux_strlen(s: String) -> uint; + extern func bux_strstr(haystack: String, needle: String) -> String; + extern func bux_str_slice(s: String, start: uint, len: uint) -> String; + extern func bux_str_offset(pos: String, base: String) -> uint; -pub func ParseMethod(s: String) -> HttpMethod { - if String_Eq(s, "GET") { return HttpMethod { tag: HttpMethod_GET }; } - if String_Eq(s, "POST") { return HttpMethod { tag: HttpMethod_POST }; } - if String_Eq(s, "PUT") { return HttpMethod { tag: HttpMethod_PUT }; } - if String_Eq(s, "DELETE") { return HttpMethod { tag: HttpMethod_DELETE }; } - if String_Eq(s, "PATCH") { return HttpMethod { tag: HttpMethod_PATCH }; } - if String_Eq(s, "HEAD") { return HttpMethod { tag: HttpMethod_HEAD }; } - if String_Eq(s, "OPTIONS") { return HttpMethod { tag: HttpMethod_OPTIONS }; } - return HttpMethod { tag: HttpMethod_UNKNOWN }; -} + pub func ParseMethod(s: String) -> HttpMethod { + if String_Eq(s, "GET") { return HttpMethod { tag: HttpMethod_GET }; } + if String_Eq(s, "POST") { return HttpMethod { tag: HttpMethod_POST }; } + if String_Eq(s, "PUT") { return HttpMethod { tag: HttpMethod_PUT }; } + if String_Eq(s, "DELETE") { return HttpMethod { tag: HttpMethod_DELETE }; } + if String_Eq(s, "PATCH") { return HttpMethod { tag: HttpMethod_PATCH }; } + if String_Eq(s, "HEAD") { return HttpMethod { tag: HttpMethod_HEAD }; } + if String_Eq(s, "OPTIONS") { return HttpMethod { tag: HttpMethod_OPTIONS }; } + return HttpMethod { tag: HttpMethod_UNKNOWN }; + } -func Slice(raw: String, start: int, len: int) -> String { - if start < 0 || len <= 0 { return ""; } - return bux_str_slice(raw, start as uint, len as uint); -} + func Slice(raw: String, start: int, len: int) -> String { + if start < 0 || len <= 0 { return ""; } + return bux_str_slice(raw, start as uint, len as uint); + } -func FindCrlf(raw: String, start: int) -> int { - let rawLen: uint = bux_strlen(raw); - if start as uint >= rawLen { return -1; } - let tail: String = bux_str_slice(raw, start as uint, rawLen - start as uint); - let hit: String = bux_strstr(tail, "\r\n"); - if String_Len(hit) == 0 { return -1; } - let offset: uint = bux_str_offset(hit, tail); - return start + offset as int; -} + func FindCrlf(raw: String, start: int) -> int { + let rawLen: uint = bux_strlen(raw); + if start as uint >= rawLen { return -1; } + let tail: String = bux_str_slice(raw, start as uint, rawLen - start as uint); + let hit: String = bux_strstr(tail, "\r\n"); + if String_Len(hit) == 0 { return -1; } + let offset: uint = bux_str_offset(hit, tail); + return start + offset as int; + } -func ParseHeaders(raw: String, start: int, end: int) -> Array { - var headers: Array = Array_New(16); - var pos: int = start; - while pos < end { - let lineEnd: int = FindCrlf(raw, pos); - if lineEnd < 0 || lineEnd >= end { break; } - let lineLen: int = lineEnd - pos; - if lineLen > 0 { - let line: String = Slice(raw, pos, lineLen); - let colon: String = bux_strstr(line, ":"); - if String_Len(colon) > 0 { - let keyLen: uint = bux_str_offset(colon, line); - let key: String = String_Trim(Slice(line, 0, keyLen as int)); - let valStart: int = keyLen as int + 1; - let val: String = String_Trim(Slice(line, valStart, lineLen - valStart)); - let entry: HeaderEntry = HeaderEntry { key: key, value: val }; - Array_Push(&headers, entry); + func ParseHeaders(raw: String, start: int, end: int) -> Array { + var headers: Array = Array_New(16); + var pos: int = start; + while pos < end { + let lineEnd: int = FindCrlf(raw, pos); + if lineEnd < 0 || lineEnd >= end { break; } + let lineLen: int = lineEnd - pos; + if lineLen > 0 { + let line: String = Slice(raw, pos, lineLen); + let colon: String = bux_strstr(line, ":"); + if String_Len(colon) > 0 { + let keyLen: uint = bux_str_offset(colon, line); + let key: String = String_Trim(Slice(line, 0, keyLen as int)); + let valStart: int = keyLen as int + 1; + let val: String = String_Trim(Slice(line, valStart, lineLen - valStart)); + let entry: HeaderEntry = HeaderEntry { key: key, value: val }; + Array_Push(&headers, entry); + } } + pos = lineEnd + 2; } - pos = lineEnd + 2; - } - return headers; -} - -pub func ParseRequest(raw: String) -> ParseResult { - let rawLen: uint = bux_strlen(raw); - if rawLen == 0 { - return ParseResult_NewErr(HttpError { tag: HttpError_BadRequest }); + return headers; } - // Find end of request line - let lineEnd: int = FindCrlf(raw, 0); - if lineEnd < 0 { - return ParseResult_NewErr(HttpError { tag: HttpError_BadRequest }); - } + pub func ParseRequest(raw: String) -> ParseResult { + let rawLen: uint = bux_strlen(raw); + if rawLen == 0 { + return ParseResult_NewErr(HttpError { tag: HttpError_BadRequest }); + } - // Split request line: METHOD PATH VERSION - var methodEnd: int = -1; - var pathStart: int = -1; - var pathEnd: int = -1; - var i: int = 0; - while i < lineEnd { - if raw[i] as int == 32 { // space - if methodEnd < 0 { - methodEnd = i; - pathStart = i + 1; - } else if pathEnd < 0 { - pathEnd = i; - break; + // Find end of request line + let lineEnd: int = FindCrlf(raw, 0); + if lineEnd < 0 { + return ParseResult_NewErr(HttpError { tag: HttpError_BadRequest }); + } + + // Split request line: METHOD PATH VERSION + var methodEnd: int = -1; + var pathStart: int = -1; + var pathEnd: int = -1; + var i: int = 0; + while i < lineEnd { + if raw[i] as int == 32 { // space + if methodEnd < 0 { + methodEnd = i; + pathStart = i + 1; + } else if pathEnd < 0 { + pathEnd = i; + break; + } } + i = i + 1; } - i = i + 1; - } - if methodEnd < 0 || pathStart < 0 || pathEnd < 0 { - return ParseResult_NewErr(HttpError { tag: HttpError_BadRequest }); - } - - let methodStr: String = Slice(raw, 0, methodEnd); - let path: String = Slice(raw, pathStart, pathEnd - pathStart); - let version: String = Slice(raw, pathEnd + 1, lineEnd - pathEnd - 1); - - // Find header/body boundary - let boundary: String = bux_strstr(raw, "\r\n\r\n"); - var headers: Array = Array_New(16); - var body: String = ""; - if String_Len(boundary) > 0 { - let headerEnd: uint = bux_str_offset(boundary, raw); - headers = ParseHeaders(raw, lineEnd + 2, headerEnd as int); - let bodyStart: uint = headerEnd + 4; - if bodyStart < rawLen { - body = bux_str_slice(raw, bodyStart, rawLen - bodyStart); + if methodEnd < 0 || pathStart < 0 || pathEnd < 0 { + return ParseResult_NewErr(HttpError { tag: HttpError_BadRequest }); } - } else { - headers = ParseHeaders(raw, lineEnd + 2, rawLen as int); - } - if String_Eq(path, "") { - return ParseResult_NewErr(HttpError { tag: HttpError_BadRequest }); - } + let methodStr: String = Slice(raw, 0, methodEnd); + let path: String = Slice(raw, pathStart, pathEnd - pathStart); + let version: String = Slice(raw, pathEnd + 1, lineEnd - pathEnd - 1); - let req: HttpRequest = HttpRequest { - method: ParseMethod(methodStr), - path: path, - version: version, - body: body, - headers: headers, - }; - return ParseResult_NewOk(req); -} + // Find header/body boundary + let boundary: String = bux_strstr(raw, "\r\n\r\n"); + var headers: Array = Array_New(16); + var body: String = ""; + if String_Len(boundary) > 0 { + let headerEnd: uint = bux_str_offset(boundary, raw); + headers = ParseHeaders(raw, lineEnd + 2, headerEnd as int); + let bodyStart: uint = headerEnd + 4; + if bodyStart < rawLen { + body = bux_str_slice(raw, bodyStart, rawLen - bodyStart); + } + } else { + headers = ParseHeaders(raw, lineEnd + 2, rawLen as int); + } + + if String_Eq(path, "") { + return ParseResult_NewErr(HttpError { tag: HttpError_BadRequest }); + } + + let req: HttpRequest = HttpRequest { + method: ParseMethod(methodStr), + path: path, + version: version, + body: body, + headers: headers, + }; + return ParseResult_NewOk(req); + } } diff --git a/apps/nexus/src/Router.bux b/apps/nexus/src/Router.bux index 41b5612..ca96ff1 100644 --- a/apps/nexus/src/Router.bux +++ b/apps/nexus/src/Router.bux @@ -1,46 +1,46 @@ module Router { -import Std::Array::{Array}; -import Std::String::{String_Eq}; -import Http::{HttpMethod, HttpRequest, HttpResponse, Http_NewResponse}; -import Handlers::{ServeStaticFile, HandleApiHealth, HandleApiInfo, HandleWebSocketUpgrade, NotFoundResponse}; + import Std::Array::{Array}; + import Std::String::{String_Eq}; + import Http::{HttpMethod, HttpRequest, HttpResponse, Http_NewResponse}; + import Handlers::{ServeStaticFile, HandleApiHealth, HandleApiInfo, HandleWebSocketUpgrade, NotFoundResponse}; -pub enum Handler { - StaticFile, - ApiHealth, - ApiInfo, - WsUpgrade, - NotFound, -} - -pub struct Route { - method: HttpMethod; - path: String; - handler: Handler; -} - -pub struct Router { - routes: Array; - notFound: Handler; -} - -pub func Handler_Handle(h: Handler, req: HttpRequest) -> HttpResponse { - match h { - Handler::StaticFile => ServeStaticFile(req), - Handler::ApiHealth => HandleApiHealth(), - Handler::ApiInfo => HandleApiInfo(), - Handler::WsUpgrade => HandleWebSocketUpgrade(req), - Handler::NotFound => NotFoundResponse(), + pub enum Handler { + StaticFile, + ApiHealth, + ApiInfo, + WsUpgrade, + NotFound, } -} -pub func Router_Dispatch(r: Router, req: HttpRequest) -> HttpResponse { - for route in r.routes { - if route.method == req.method && String_Eq(route.path, req.path) { - return Handler_Handle(route.handler, req); + pub struct Route { + method: HttpMethod; + path: String; + handler: Handler; + } + + pub struct Router { + routes: Array; + notFound: Handler; + } + + pub func Handler_Handle(h: Handler, req: HttpRequest) -> HttpResponse { + match h { + Handler::StaticFile => ServeStaticFile(req), + Handler::ApiHealth => HandleApiHealth(), + Handler::ApiInfo => HandleApiInfo(), + Handler::WsUpgrade => HandleWebSocketUpgrade(req), + Handler::NotFound => NotFoundResponse(), } } - return Handler_Handle(r.notFound, req); -} + + pub func Router_Dispatch(r: Router, req: HttpRequest) -> HttpResponse { + for route in r.routes { + if route.method == req.method && String_Eq(route.path, req.path) { + return Handler_Handle(route.handler, req); + } + } + return Handler_Handle(r.notFound, req); + } } diff --git a/apps/nexus/src/Server.bux b/apps/nexus/src/Server.bux index 9d03cd1..e327cab 100644 --- a/apps/nexus/src/Server.bux +++ b/apps/nexus/src/Server.bux @@ -1,176 +1,176 @@ module Server { -import Std::Io::{Print, PrintLine, PrintInt}; -import Std::Net::{Net_Create, Net_SetReuse, Net_Bind, Net_Listen, Net_Accept, Net_Send, Net_Recv, Net_Close, Net_LastError}; -import Std::String::{String_Len, String_StartsWith}; -import Std::Channel::{Channel, Channel_New, Channel_Send, Channel_Recv}; -import Config::{ServerConfig}; -import Http::{HttpRequest, HttpResponse, Http_StatusText, Http_NewResponse}; -import Errors::{ParseResult}; -import Parser::{ParseRequest}; -import Router::{Router, Router_Dispatch}; + import Std::Io::{Print, PrintLine, PrintInt}; + import Std::Net::{Net_Create, Net_SetReuse, Net_Bind, Net_Listen, Net_Accept, Net_Send, Net_Recv, Net_Close, Net_LastError}; + import Std::String::{String_Len, String_StartsWith}; + import Std::Channel::{Channel, Channel_New, Channel_Send, Channel_Recv}; + import Config::{ServerConfig}; + import Http::{HttpRequest, HttpResponse, Http_StatusText, Http_NewResponse}; + import Errors::{ParseResult}; + import Parser::{ParseRequest}; + import Router::{Router, Router_Dispatch}; -extern func bux_strlen(s: String) -> uint; -extern func bux_sb_new(initial_cap: uint) -> *void; -extern func bux_sb_append(sb: *void, s: String); -extern func bux_sb_append_int(sb: *void, n: int64); -extern func bux_sb_build(sb: *void) -> String; -extern func bux_sb_free(sb: *void); + extern func bux_strlen(s: String) -> uint; + extern func bux_sb_new(initial_cap: uint) -> *void; + extern func bux_sb_append(sb: *void, s: String); + extern func bux_sb_append_int(sb: *void, n: int64); + extern func bux_sb_build(sb: *void) -> String; + extern func bux_sb_free(sb: *void); -pub struct ConnectionTask { - fd: int; -} - -pub func BuildResponse(resp: HttpResponse) -> String { - let sb: *void = bux_sb_new(4096); - - bux_sb_append(sb, "HTTP/1.1 "); - bux_sb_append_int(sb, resp.statusCode as int64); - bux_sb_append(sb, " "); - bux_sb_append(sb, Http_StatusText(resp.statusCode)); - bux_sb_append(sb, "\r\n"); - - bux_sb_append(sb, "Server: Nexus/0.2.0 (Bux)\r\n"); - - if bux_strlen(resp.extraHeaders) > 0 { - bux_sb_append(sb, resp.extraHeaders); + pub struct ConnectionTask { + fd: int; } - if bux_strlen(resp.contentType) > 0 { - bux_sb_append(sb, "Content-Type: "); - bux_sb_append(sb, resp.contentType); + pub func BuildResponse(resp: HttpResponse) -> String { + let sb: *void = bux_sb_new(4096); + + bux_sb_append(sb, "HTTP/1.1 "); + bux_sb_append_int(sb, resp.statusCode as int64); + bux_sb_append(sb, " "); + bux_sb_append(sb, Http_StatusText(resp.statusCode)); bux_sb_append(sb, "\r\n"); + + bux_sb_append(sb, "Server: Nexus/0.2.0 (Bux)\r\n"); + + if bux_strlen(resp.extraHeaders) > 0 { + bux_sb_append(sb, resp.extraHeaders); + } + + if bux_strlen(resp.contentType) > 0 { + bux_sb_append(sb, "Content-Type: "); + bux_sb_append(sb, resp.contentType); + bux_sb_append(sb, "\r\n"); + } + + let bodyLen: uint = bux_strlen(resp.body); + bux_sb_append(sb, "Content-Length: "); + bux_sb_append_int(sb, bodyLen as int64); + bux_sb_append(sb, "\r\n"); + bux_sb_append(sb, "Connection: close\r\n"); + bux_sb_append(sb, "\r\n"); + + if bodyLen > 0 { + bux_sb_append(sb, resp.body); + } + + let result: String = bux_sb_build(sb); + bux_sb_free(sb); + return result; } - let bodyLen: uint = bux_strlen(resp.body); - bux_sb_append(sb, "Content-Length: "); - bux_sb_append_int(sb, bodyLen as int64); - bux_sb_append(sb, "\r\n"); - bux_sb_append(sb, "Connection: close\r\n"); - bux_sb_append(sb, "\r\n"); + pub func HandleConnection(fd: int, router: Router) { + let raw: String = Net_Recv(fd, 8192); + if String_Len(raw) == 0 { + return; + } - if bodyLen > 0 { - bux_sb_append(sb, resp.body); - } - - let result: String = bux_sb_build(sb); - bux_sb_free(sb); - return result; -} - -pub func HandleConnection(fd: int, router: Router) { - let raw: String = Net_Recv(fd, 8192); - if String_Len(raw) == 0 { - return; - } - - // HTTP/2 preface detection - if String_StartsWith(raw, "PRI * HTTP/2.0") { - let resp: HttpResponse = Http_NewResponse(200, "text/plain; charset=utf-8", + // HTTP/2 preface detection + if String_StartsWith(raw, "PRI * HTTP/2.0") { + let resp: HttpResponse = Http_NewResponse(200, "text/plain; charset=utf-8", "HTTP/2 detected — full support planned for future release.\r\n"); - Net_Send(fd, BuildResponse(resp)); - return; - } + Net_Send(fd, BuildResponse(resp)); + return; + } - let parsed: ParseResult = ParseRequest(raw); - if parsed.tag == ParseResult_Ok { - let req: HttpRequest = parsed.data.Ok_0; - let resp: HttpResponse = Router_Dispatch(router, req); - Net_Send(fd, BuildResponse(resp)); - } else { - let resp: HttpResponse = Http_NewResponse(400, "text/plain; charset=utf-8", "Bad Request"); - Net_Send(fd, BuildResponse(resp)); - } -} - -pub struct WorkerCtx { - taskQueue: *Channel; - router: Router; -} - -pub func Worker(ctx: *WorkerCtx) { - while true { - let task: ConnectionTask = Channel_Recv(ctx.taskQueue); - HandleConnection(task.fd, ctx.router); - Net_Close(task.fd); - } -} - -pub struct AcceptorCtx { - serverFd: int; - taskQueue: *Channel; -} - -pub func Acceptor(ctx: *AcceptorCtx) { - while true { - let fd: int = Net_Accept(ctx.serverFd); - if fd >= 0 { - let task: ConnectionTask = ConnectionTask { fd: fd }; - Channel_Send(ctx.taskQueue, task); + let parsed: ParseResult = ParseRequest(raw); + if parsed.tag == ParseResult_Ok { + let req: HttpRequest = parsed.data.Ok_0; + let resp: HttpResponse = Router_Dispatch(router, req); + Net_Send(fd, BuildResponse(resp)); + } else { + let resp: HttpResponse = Http_NewResponse(400, "text/plain; charset=utf-8", "Bad Request"); + Net_Send(fd, BuildResponse(resp)); } } -} -pub func RunServer(config: ServerConfig, router: Router) -> int { - PrintLine("================================================"); - PrintLine(" Nexus HTTP Server v0.2.0"); - PrintLine(" Production-ready HTTP/1.1 with thread-pool"); - PrintLine(" Built with Bux"); - PrintLine("================================================"); - PrintLine(""); - - let serverFd: int = Net_Create(); - if serverFd < 0 { - PrintLine("FATAL: socket() failed"); - return 1; + pub struct WorkerCtx { + taskQueue: *Channel; + router: Router; } - if !Net_SetReuse(serverFd) { - PrintLine("WARN: SO_REUSEADDR failed"); + pub func Worker(ctx: *WorkerCtx) { + while true { + let task: ConnectionTask = Channel_Recv(ctx.taskQueue); + HandleConnection(task.fd, ctx.router); + Net_Close(task.fd); + } } - if !Net_Bind(serverFd, config.bindAddr, config.port) { - Print("FATAL: bind failed: "); - PrintLine(Net_LastError()); - Net_Close(serverFd); - return 1; + pub struct AcceptorCtx { + serverFd: int; + taskQueue: *Channel; } - if !Net_Listen(serverFd, config.backlog) { - PrintLine("FATAL: listen() failed"); - Net_Close(serverFd); - return 1; + pub func Acceptor(ctx: *AcceptorCtx) { + while true { + let fd: int = Net_Accept(ctx.serverFd); + if fd >= 0 { + let task: ConnectionTask = ConnectionTask { fd: fd }; + Channel_Send(ctx.taskQueue, task); + } + } } - Print("Listening on http://"); - Print(config.bindAddr); - Print(":"); - PrintInt(config.port); - PrintLine(""); - PrintInt(config.workerCount); - PrintLine(" worker threads | static: ./public/"); - PrintLine("Endpoints: / /api/health /api/info /ws"); - PrintLine("Press Ctrl+C to stop."); - PrintLine(""); + pub func RunServer(config: ServerConfig, router: Router) -> int { + PrintLine("================================================"); + PrintLine(" Nexus HTTP Server v0.2.0"); + PrintLine(" Production-ready HTTP/1.1 with thread-pool"); + PrintLine(" Built with Bux"); + PrintLine("================================================"); + PrintLine(""); - let taskQueue: Channel = Channel_New(config.backlog as int64); - let workerCtx: WorkerCtx = WorkerCtx { taskQueue: &taskQueue, router: router }; - let acceptorCtx: AcceptorCtx = AcceptorCtx { serverFd: serverFd, taskQueue: &taskQueue }; + let serverFd: int = Net_Create(); + if serverFd < 0 { + PrintLine("FATAL: socket() failed"); + return 1; + } - // Spawn workers (main thread will also become one) - var i: int = 0; - while i < config.workerCount - 1 { - spawn Worker(&workerCtx); - i = i + 1; + if !Net_SetReuse(serverFd) { + PrintLine("WARN: SO_REUSEADDR failed"); + } + + if !Net_Bind(serverFd, config.bindAddr, config.port) { + Print("FATAL: bind failed: "); + PrintLine(Net_LastError()); + Net_Close(serverFd); + return 1; + } + + if !Net_Listen(serverFd, config.backlog) { + PrintLine("FATAL: listen() failed"); + Net_Close(serverFd); + return 1; + } + + Print("Listening on http://"); + Print(config.bindAddr); + Print(":"); + PrintInt(config.port); + PrintLine(""); + PrintInt(config.workerCount); + PrintLine(" worker threads | static: ./public/"); + PrintLine("Endpoints: / /api/health /api/info /ws"); + PrintLine("Press Ctrl+C to stop."); + PrintLine(""); + + let taskQueue: Channel = Channel_New(config.backlog as int64); + let workerCtx: WorkerCtx = WorkerCtx { taskQueue: &taskQueue, router: router }; + let acceptorCtx: AcceptorCtx = AcceptorCtx { serverFd: serverFd, taskQueue: &taskQueue }; + + // Spawn workers (main thread will also become one) + var i: int = 0; + while i < config.workerCount - 1 { + spawn Worker(&workerCtx); + i = i + 1; + } + + // Spawn acceptor + spawn Acceptor(&acceptorCtx); + + // Main thread works too + Worker(&workerCtx); + + return 0; } - // Spawn acceptor - spawn Acceptor(&acceptorCtx); - - // Main thread works too - Worker(&workerCtx); - - return 0; -} - } diff --git a/apps/simpledb/src/Main.bux b/apps/simpledb/src/Main.bux index 650d851..2b6fd2e 100644 --- a/apps/simpledb/src/Main.bux +++ b/apps/simpledb/src/Main.bux @@ -1,339 +1,339 @@ module Main { -import Std::Io::{PrintLine, Print, PrintInt, ReadFile, WriteFile, FileExists}; -import Std::Os::{Os_ArgsCount, Os_Args}; -import Std::String::{String_Len, String_Eq, String_StartsWith, String_Find, String_Slice, String_Offset}; + import Std::Io::{PrintLine, Print, PrintInt, ReadFile, WriteFile, FileExists}; + import Std::Os::{Os_ArgsCount, Os_Args}; + import Std::String::{String_Len, String_Eq, String_StartsWith, String_Find, String_Slice, String_Offset}; -extern func bux_strlen(s: String) -> uint; -extern func bux_strstr(haystack: String, needle: String) -> String; -extern func bux_str_slice(s: String, start: uint, len: uint) -> String; -extern func bux_str_split_count(s: String, delim: String) -> uint; -extern func bux_str_split_part(s: String, delim: String, index: uint) -> String; -extern func bux_sb_new(initial_cap: uint) -> *void; -extern func bux_sb_append(sb: *void, s: String); -extern func bux_sb_append_char(sb: *void, c: char8); + extern func bux_strlen(s: String) -> uint; + extern func bux_strstr(haystack: String, needle: String) -> String; + extern func bux_str_slice(s: String, start: uint, len: uint) -> String; + extern func bux_str_split_count(s: String, delim: String) -> uint; + extern func bux_str_split_part(s: String, delim: String, index: uint) -> String; + extern func bux_sb_new(initial_cap: uint) -> *void; + extern func bux_sb_append(sb: *void, s: String); + extern func bux_sb_append_char(sb: *void, c: char8); -func SB_AppendChar(sb: *void, c: int) { - bux_sb_append_char(sb, c as char8); -} -extern func bux_sb_build(sb: *void) -> String; -extern func bux_sb_free(sb: *void); -extern func bux_alloc(size: uint) -> *void; -extern func bux_free(ptr: *void); + func SB_AppendChar(sb: *void, c: int) { + bux_sb_append_char(sb, c as char8); + } + extern func bux_sb_build(sb: *void) -> String; + extern func bux_sb_free(sb: *void); + extern func bux_alloc(size: uint) -> *void; + extern func bux_free(ptr: *void); -struct Database { - path: String, - sb: *void, - loaded: bool, - count: uint, -} + struct Database { + path: String, + sb: *void, + loaded: bool, + count: uint, + } -func DB_New(filePath: String) -> Database { - var db: Database; - db.path = filePath; - db.sb = bux_sb_new(4096); - db.loaded = false; - db.count = 0; - return db; -} + func DB_New(filePath: String) -> Database { + var db: Database; + db.path = filePath; + db.sb = bux_sb_new(4096); + db.loaded = false; + db.count = 0; + return db; + } -func DB_Load(self: *Database) -> bool { - if self.loaded { return true; } + func DB_Load(self: *Database) -> bool { + if self.loaded { return true; } - if !FileExists(self.path) { + if !FileExists(self.path) { + self.loaded = true; + return true; + } + + let raw: String = ReadFile(self.path); + if String_Len(raw) == 0 || bux_strlen(raw) == 0 { + self.loaded = true; + return true; + } + + bux_sb_append(self.sb, raw); + + let lineCount: uint = bux_str_split_count(raw, "\n"); + var i: uint = 0; + var n: uint = 0; + while i < lineCount { + let line: String = bux_str_split_part(raw, "\n", i); + if bux_strlen(line) > 0 { + n = n + 1; + } + i = i + 1; + } + self.count = n; self.loaded = true; return true; } - let raw: String = ReadFile(self.path); - if String_Len(raw) == 0 || bux_strlen(raw) == 0 { - self.loaded = true; - return true; - } - - bux_sb_append(self.sb, raw); - - let lineCount: uint = bux_str_split_count(raw, "\n"); - var i: uint = 0; - var n: uint = 0; - while i < lineCount { - let line: String = bux_str_split_part(raw, "\n", i); - if bux_strlen(line) > 0 { - n = n + 1; - } - i = i + 1; - } - self.count = n; - self.loaded = true; - return true; -} - -func DB_Get(self: *Database, key: String) -> String { - let raw: String = bux_sb_build(self.sb); - let lineCount: uint = bux_str_split_count(raw, "\n"); - var i: uint = 0; - while i < lineCount { - let line: String = bux_str_split_part(raw, "\n", i); - if String_StartsWith(line, key) { - let eqPos: String = String_Find(line, "="); - if String_Len(eqPos) > 0 { - let keyLen: uint = bux_strlen(key); - let valStart: uint = keyLen + 1; - let lineLen: uint = bux_strlen(line); - if valStart < lineLen { - return bux_str_slice(line, valStart, lineLen - valStart); - } - } - } - i = i + 1; - } - return ""; -} - -func DB_Set(self: *Database, key: String, value: String) { - let raw: String = bux_sb_build(self.sb); - let lineCount: uint = bux_str_split_count(raw, "\n"); - - var newSb: *void = bux_sb_new(4096); - var found: bool = false; - var i: uint = 0; - while i < lineCount { - let line: String = bux_str_split_part(raw, "\n", i); - if bux_strlen(line) > 0 { + func DB_Get(self: *Database, key: String) -> String { + let raw: String = bux_sb_build(self.sb); + let lineCount: uint = bux_str_split_count(raw, "\n"); + var i: uint = 0; + while i < lineCount { + let line: String = bux_str_split_part(raw, "\n", i); if String_StartsWith(line, key) { let eqPos: String = String_Find(line, "="); if String_Len(eqPos) > 0 { - bux_sb_append(newSb, key); - SB_AppendChar(newSb, 61); - bux_sb_append(newSb, value); - SB_AppendChar(newSb, 10); - found = true; + let keyLen: uint = bux_strlen(key); + let valStart: uint = keyLen + 1; + let lineLen: uint = bux_strlen(line); + if valStart < lineLen { + return bux_str_slice(line, valStart, lineLen - valStart); + } + } + } + i = i + 1; + } + return ""; + } + + func DB_Set(self: *Database, key: String, value: String) { + let raw: String = bux_sb_build(self.sb); + let lineCount: uint = bux_str_split_count(raw, "\n"); + + var newSb: *void = bux_sb_new(4096); + var found: bool = false; + var i: uint = 0; + while i < lineCount { + let line: String = bux_str_split_part(raw, "\n", i); + if bux_strlen(line) > 0 { + if String_StartsWith(line, key) { + let eqPos: String = String_Find(line, "="); + if String_Len(eqPos) > 0 { + bux_sb_append(newSb, key); + SB_AppendChar(newSb, 61); + bux_sb_append(newSb, value); + SB_AppendChar(newSb, 10); + found = true; + } else { + bux_sb_append(newSb, line); + SB_AppendChar(newSb, 10); + } } else { bux_sb_append(newSb, line); SB_AppendChar(newSb, 10); } - } else { - bux_sb_append(newSb, line); - SB_AppendChar(newSb, 10); } + i = i + 1; } - i = i + 1; + + if !found { + bux_sb_append(newSb, key); + SB_AppendChar(newSb, 61); + bux_sb_append(newSb, value); + SB_AppendChar(newSb, 10); + self.count = self.count + 1; + } + + bux_sb_free(self.sb); + self.sb = newSb; } - if !found { - bux_sb_append(newSb, key); - SB_AppendChar(newSb, 61); - bux_sb_append(newSb, value); - SB_AppendChar(newSb, 10); - self.count = self.count + 1; - } + func DB_Del(self: *Database, key: String) { + let raw: String = bux_sb_build(self.sb); + let lineCount: uint = bux_str_split_count(raw, "\n"); - bux_sb_free(self.sb); - self.sb = newSb; -} - -func DB_Del(self: *Database, key: String) { - let raw: String = bux_sb_build(self.sb); - let lineCount: uint = bux_str_split_count(raw, "\n"); - - var newSb: *void = bux_sb_new(4096); - var i: uint = 0; - var delCount: uint = 0; - while i < lineCount { - let line: String = bux_str_split_part(raw, "\n", i); - if bux_strlen(line) > 0 { - if String_StartsWith(line, key) { - let eqPos: String = String_Find(line, "="); - if String_Len(eqPos) > 0 { - delCount = delCount + 1; + var newSb: *void = bux_sb_new(4096); + var i: uint = 0; + var delCount: uint = 0; + while i < lineCount { + let line: String = bux_str_split_part(raw, "\n", i); + if bux_strlen(line) > 0 { + if String_StartsWith(line, key) { + let eqPos: String = String_Find(line, "="); + if String_Len(eqPos) > 0 { + delCount = delCount + 1; + } else { + bux_sb_append(newSb, line); + SB_AppendChar(newSb, 10); + } } else { bux_sb_append(newSb, line); SB_AppendChar(newSb, 10); } + } + i = i + 1; + } + + if delCount > 0 { + self.count = self.count - delCount; + } + + bux_sb_free(self.sb); + self.sb = newSb; + } + + func DB_Has(self: *Database, key: String) -> bool { + let val: String = DB_Get(self, key); + return bux_strlen(val) > 0; + } + + func DB_Count(self: *Database) -> uint { + return self.count; + } + + func DB_Keys(self: *Database) -> *String { + if self.count == 0 { return null as *String; } + + let raw: String = bux_sb_build(self.sb); + let lineCount: uint = bux_str_split_count(raw, "\n"); + let keys: *String = bux_alloc(self.count * sizeof(String)) as *String; + + var found: uint = 0; + var i: uint = 0; + while i < lineCount && found < self.count { + let line: String = bux_str_split_part(raw, "\n", i); + if bux_strlen(line) > 0 { + let eqPos: String = String_Find(line, "="); + if String_Len(eqPos) > 0 { + let keyLen: uint = String_Offset(eqPos, line); + keys[found] = bux_str_slice(line, 0, keyLen); + found = found + 1; + } + } + i = i + 1; + } + + return keys; + } + + func DB_Save(self: *Database) -> bool { + let content: String = bux_sb_build(self.sb); + let ok: bool = WriteFile(self.path, content); + return ok; + } + + func PrintUsage() { + PrintLine("SimpleDB — file-backed key-value database"); + PrintLine("Usage:"); + PrintLine(" simpledb set "); + PrintLine(" simpledb get "); + PrintLine(" simpledb del "); + PrintLine(" simpledb has "); + PrintLine(" simpledb keys"); + PrintLine(" simpledb count"); + } + + func Main() -> int { + let argc: int = Os_ArgsCount(); + + if argc < 3 { + PrintUsage(); + return 1; + } + + let dbFile: String = Os_Args(1); + let cmd: String = Os_Args(2); + + var db: Database = DB_New(dbFile); + + if String_Eq(cmd, "get") { + DB_Load(&db); + if argc < 4 { + PrintLine("get: missing key"); + return 1; + } + let key: String = Os_Args(3); + let val: String = DB_Get(&db, key); + if bux_strlen(val) > 0 { + PrintLine(val); } else { - bux_sb_append(newSb, line); - SB_AppendChar(newSb, 10); + Print("(not found) "); + PrintLine(key); } - } - i = i + 1; - } - - if delCount > 0 { - self.count = self.count - delCount; - } - - bux_sb_free(self.sb); - self.sb = newSb; -} - -func DB_Has(self: *Database, key: String) -> bool { - let val: String = DB_Get(self, key); - return bux_strlen(val) > 0; -} - -func DB_Count(self: *Database) -> uint { - return self.count; -} - -func DB_Keys(self: *Database) -> *String { - if self.count == 0 { return null as *String; } - - let raw: String = bux_sb_build(self.sb); - let lineCount: uint = bux_str_split_count(raw, "\n"); - let keys: *String = bux_alloc(self.count * sizeof(String)) as *String; - - var found: uint = 0; - var i: uint = 0; - while i < lineCount && found < self.count { - let line: String = bux_str_split_part(raw, "\n", i); - if bux_strlen(line) > 0 { - let eqPos: String = String_Find(line, "="); - if String_Len(eqPos) > 0 { - let keyLen: uint = String_Offset(eqPos, line); - keys[found] = bux_str_slice(line, 0, keyLen); - found = found + 1; - } - } - i = i + 1; - } - - return keys; -} - -func DB_Save(self: *Database) -> bool { - let content: String = bux_sb_build(self.sb); - let ok: bool = WriteFile(self.path, content); - return ok; -} - -func PrintUsage() { - PrintLine("SimpleDB — file-backed key-value database"); - PrintLine("Usage:"); - PrintLine(" simpledb set "); - PrintLine(" simpledb get "); - PrintLine(" simpledb del "); - PrintLine(" simpledb has "); - PrintLine(" simpledb keys"); - PrintLine(" simpledb count"); -} - -func Main() -> int { - let argc: int = Os_ArgsCount(); - - if argc < 3 { - PrintUsage(); - return 1; - } - - let dbFile: String = Os_Args(1); - let cmd: String = Os_Args(2); - - var db: Database = DB_New(dbFile); - - if String_Eq(cmd, "get") { - DB_Load(&db); - if argc < 4 { - PrintLine("get: missing key"); - return 1; - } - let key: String = Os_Args(3); - let val: String = DB_Get(&db, key); - if bux_strlen(val) > 0 { - PrintLine(val); - } else { - Print("(not found) "); - PrintLine(key); - } - return 0; - } - - if String_Eq(cmd, "set") { - DB_Load(&db); - if argc < 5 { - PrintLine("set: missing key or value"); - return 1; - } - let key: String = Os_Args(3); - let val: String = Os_Args(4); - DB_Set(&db, key, val); - let saved: bool = DB_Save(&db); - if saved { - Print("OK "); - Print(key); - Print(" = "); - PrintLine(val); - } else { - PrintLine("set: save failed"); - } - return 0; - } - - if String_Eq(cmd, "del") { - DB_Load(&db); - if argc < 4 { - PrintLine("del: missing key"); - return 1; - } - let key: String = Os_Args(3); - DB_Del(&db, key); - DB_Save(&db); - Print("DEL "); - PrintLine(key); - return 0; - } - - if String_Eq(cmd, "has") { - DB_Load(&db); - if argc < 4 { - PrintLine("has: missing key"); - return 1; - } - let key: String = Os_Args(3); - let found: bool = DB_Has(&db, key); - if found { - Print("true "); - PrintLine(key); - } else { - Print("false "); - PrintLine(key); - } - return 0; - } - - if String_Eq(cmd, "keys") { - DB_Load(&db); - let n: uint = DB_Count(&db); - Print("keys: "); - PrintInt(n as int); - PrintLine(""); - - if n == 0 { return 0; } - let list: *String = DB_Keys(&db); - var i: uint = 0; - while i < n { - Print(" "); - PrintLine(list[i]); - i = i + 1; + if String_Eq(cmd, "set") { + DB_Load(&db); + if argc < 5 { + PrintLine("set: missing key or value"); + return 1; + } + let key: String = Os_Args(3); + let val: String = Os_Args(4); + DB_Set(&db, key, val); + let saved: bool = DB_Save(&db); + if saved { + Print("OK "); + Print(key); + Print(" = "); + PrintLine(val); + } else { + PrintLine("set: save failed"); + } + return 0; } - bux_free(list as *void); - return 0; + + if String_Eq(cmd, "del") { + DB_Load(&db); + if argc < 4 { + PrintLine("del: missing key"); + return 1; + } + let key: String = Os_Args(3); + DB_Del(&db, key); + DB_Save(&db); + Print("DEL "); + PrintLine(key); + return 0; + } + + if String_Eq(cmd, "has") { + DB_Load(&db); + if argc < 4 { + PrintLine("has: missing key"); + return 1; + } + let key: String = Os_Args(3); + let found: bool = DB_Has(&db, key); + if found { + Print("true "); + PrintLine(key); + } else { + Print("false "); + PrintLine(key); + } + return 0; + } + + if String_Eq(cmd, "keys") { + DB_Load(&db); + let n: uint = DB_Count(&db); + Print("keys: "); + PrintInt(n as int); + PrintLine(""); + + if n == 0 { + return 0; + } + + let list: *String = DB_Keys(&db); + var i: uint = 0; + while i < n { + Print(" "); + PrintLine(list[i]); + i = i + 1; + } + bux_free(list as *void); + return 0; + } + + if String_Eq(cmd, "count") { + DB_Load(&db); + let n: uint = DB_Count(&db); + Print("count: "); + PrintInt(n as int); + PrintLine(""); + return 0; + } + + Print("unknown command: "); + PrintLine(cmd); + return 1; } - if String_Eq(cmd, "count") { - DB_Load(&db); - let n: uint = DB_Count(&db); - Print("count: "); - PrintInt(n as int); - PrintLine(""); - return 0; - } - - Print("unknown command: "); - PrintLine(cmd); - return 1; -} - } diff --git a/bootstrap/cli.nim b/bootstrap/cli.nim index 6120efd..fec0ff4 100644 --- a/bootstrap/cli.nim +++ b/bootstrap/cli.nim @@ -1,6 +1,9 @@ -import std/[os, strutils, terminal, strformat, osproc, sets] +import std/[os, strutils, terminal, strformat, osproc, sets, algorithm, tables] import lexer, parser, ast, sema, manifest, hir_lower, lir_lower, lir_c_backend import source_location +import fmt +import docgen +import registry type ColorMode* = enum @@ -21,16 +24,25 @@ Usage: bux [options] [command-options] Commands: new Create a new Bux package init Initialize a Bux package in the current directory - add [ver] Add a dependency (--path, --git) + add [ver] Add a dependency (--path, --git, or registry) install Resolve and install dependencies + search [query] Search the package registry build Build the current package run Build and run the current package test Run tests in tests/ directory check Type-check the current package + fmt [path] Format .bux sources (default: .) + doc [path] Generate Markdown API docs from /// comments clean Remove build artifacts help Show this help message version Show version +Command options: + test --filter Only run tests whose name contains + fmt --check Exit 1 if any file would be reformatted (CI) + doc --out Write docs to file (default: stdout) + add --path / --git Explicit source; else resolve via registry + Global options: --color Control colored output (default: auto) -q, --quiet Suppress non-error output @@ -192,6 +204,14 @@ proc hintForMessage(msg: string): string = return "provide the missing argument (positional or named)" if "use of moved value" in m: return "the value was moved; clone it or restructure ownership" + if "cannot return reference to local" in m: + return "return a value, or return a reference borrowed from a function parameter" + if "lifetime elision failed" in m: + return "add an explicit lifetime, e.g. func F<'a>(x: &'a T, y: &'a U) -> &'a T" + if "lifetime mismatch" in m: + return "returned reference must share a lifetime with the return type (annotate with 'a)" + if "no input reference to borrow from" in m: + return "add a '&T' parameter to borrow from, or return an owned value" if "shared reference" in m or "checked function" in m: return "use '&mut T' for mutation, or drop @[Checked] for unchecked code" if "double mutable borrow" in m or "already mutably borrowed" in m: @@ -378,7 +398,11 @@ proc cmdAdd*(args: seq[string], opts: GlobalOptions): int = printError("--git requires a value", useColor) return 1 else: - version = args[i] + if not args[i].startsWith("-"): + version = args[i] + else: + printError(&"unknown add option '{args[i]}'", useColor) + return 1 inc i # Append to bux.toml var depLine = "" @@ -387,7 +411,19 @@ proc cmdAdd*(args: seq[string], opts: GlobalOptions): int = elif gitUrl.len > 0: depLine = &"{depName} = {{ Version = \"{version}\", Source = \"{gitUrl}\" }}" else: - depLine = &"{depName} = \"{version}\"" + # Registry resolve (E.1) + let reg = loadRegistry() + if reg.path.len == 0: + printError("no package registry found (set BUX_REGISTRY or install config/registry.toml)", useColor) + return 1 + let pkg = registryLookup(reg, depName, version) + if pkg.name.len == 0: + printError(&"package '{depName}' not found in registry ({reg.path})", useColor) + printError("hint: bux search | bux add name --git | bux add name --path ", useColor) + return 1 + depLine = formatRegistryDepLine(depName, pkg) + if not opts.quiet: + printInfo(&"Resolved '{depName}' {pkg.version} from registry {reg.path}", useColor) var content = readFile(manifestPath) # Ensure [Dependencies] section exists if content.find("[Dependencies]") < 0: @@ -399,6 +435,34 @@ proc cmdAdd*(args: seq[string], opts: GlobalOptions): int = printInfo(&"Added dependency '{depName}' to bux.toml", useColor) return 0 +proc cmdSearch*(args: seq[string], opts: GlobalOptions): int = + let useColor = shouldUseColor(opts) + let query = if args.len > 0: args[0] else: "" + let reg = loadRegistry() + if reg.path.len == 0: + printError("no package registry found (set BUX_REGISTRY)", useColor) + return 1 + if not opts.quiet: + echo &"Registry: {reg.path}" + let hits = registrySearch(reg, query) + if hits.len == 0: + if not opts.quiet: + echo "No packages matched." + return 1 + # Dedupe by name showing latest version + var seen = initTable[string, RegistryPackage]() + for p in hits: + seen[p.name.toLowerAscii()] = p + var names: seq[string] = @[] + for k in seen.keys: + names.add(k) + names.sort(system.cmp) + for k in names: + let p = seen[k] + let desc = if p.description.len > 0: p.description else: p.source + echo &" {p.name} {p.version} — {desc}" + return 0 + proc cmdInstall*(args: seq[string], opts: GlobalOptions): int = let useColor = shouldUseColor(opts) let root = getCurrentDir() @@ -411,6 +475,7 @@ proc cmdInstall*(args: seq[string], opts: GlobalOptions): int = let cacheDir = getHomeDir() / ".bux" / "packages" if not dirExists(cacheDir): createDir(cacheDir) + let reg = loadRegistry() # Resolve each dependency for dep in man.dependencies: case dep.kind @@ -433,20 +498,43 @@ proc cmdInstall*(args: seq[string], opts: GlobalOptions): int = if not dirExists(depDir): if not opts.quiet: printInfo(&"Cloning '{dep.name}' from {dep.gitUrl}...", useColor) - let (outp, code) = execCmdEx(&"git clone {dep.gitUrl} {depDir} 2>&1") + let (outp, code) = execCmdEx(&"git clone --quiet {quoteShell(dep.gitUrl)} {quoteShell(depDir)} 2>&1") if code != 0: printError(&"failed to clone {dep.gitUrl}: {outp}", useColor) return 1 else: if not opts.quiet: printInfo(&"Using cached '{dep.name}' from {depDir}", useColor) + # Lock stores git URL; build loads from cache by name lock.entries.add(LockEntry(name: dep.name, version: dep.gitVersion, source: dep.gitUrl)) of dkVersion: - # For version-based deps without a registry, we just record them - # TODO: lookup in registry - lock.entries.add(LockEntry(name: dep.name, version: dep.versionReq, source: "registry")) - if not opts.quiet: - printInfo(&"Recorded dependency '{dep.name}' = {dep.versionReq}", useColor) + # Registry lookup (E.1) + if reg.path.len == 0: + printError(&"cannot resolve '{dep.name}': no package registry (set BUX_REGISTRY)", useColor) + return 1 + let pkg = registryLookup(reg, dep.name, dep.versionReq) + if pkg.name.len == 0: + printError(&"package '{dep.name}' not found in registry", useColor) + return 1 + if pkg.resolvedPath.len > 0 and dirExists(pkg.resolvedPath): + lock.entries.add(LockEntry(name: dep.name, version: pkg.version, source: pkg.resolvedPath)) + if not opts.quiet: + printInfo(&"Resolved '{dep.name}' {pkg.version} → {pkg.resolvedPath}", useColor) + elif isGitSource(pkg.source): + let depDir = cacheDir / dep.name + if not dirExists(depDir): + if not opts.quiet: + printInfo(&"Cloning '{dep.name}' from {pkg.source}...", useColor) + let (outp, code) = execCmdEx(&"git clone --quiet {quoteShell(pkg.source)} {quoteShell(depDir)} 2>&1") + if code != 0: + printError(&"failed to clone {pkg.source}: {outp}", useColor) + return 1 + lock.entries.add(LockEntry(name: dep.name, version: pkg.version, source: pkg.source)) + if not opts.quiet: + printInfo(&"Resolved '{dep.name}' {pkg.version} → git {pkg.source}", useColor) + else: + printError(&"registry entry '{dep.name}' has unusable source '{pkg.source}'", useColor) + return 1 # Save lockfile let lockPath = root / "bux.lock" saveLockfile(lockPath, lock) @@ -722,18 +810,93 @@ proc cmdClean*(args: seq[string], opts: GlobalOptions): int = printInfo("clean: build directory removed", useColor) return 0 +proc parseTestArgs(args: seq[string]): tuple[filter: string, paths: seq[string], ok: bool] = + ## Parse `test` args: optional `--filter ` / `--filter=`, rest are ignored paths. + result.filter = "" + result.paths = @[] + result.ok = true + var i = 0 + while i < args.len: + let a = args[i] + if a == "--filter": + if i + 1 >= args.len: + stderr.writeLine("error: --filter requires an argument") + result.ok = false + return + inc i + result.filter = args[i] + elif a.startsWith("--filter="): + result.filter = a["--filter=".len .. ^1] + elif a == "--help" or a == "-h": + echo "Usage: bux test [--filter ] [project-dir]" + echo " --filter Only run tests whose filename contains " + result.ok = false # treat as early exit without error in caller? use special + # Signal help via empty filter and a sentinel path + result.paths = @["__help__"] + return + elif a.startsWith("-"): + stderr.writeLine(&"error: unknown test option '{a}'") + result.ok = false + return + else: + result.paths.add(a) + inc i + +proc parseFmtArgs(args: seq[string]): tuple[checkOnly: bool, paths: seq[string], ok: bool, help: bool] = + result.checkOnly = false + result.paths = @[] + result.ok = true + result.help = false + var i = 0 + while i < args.len: + let a = args[i] + if a == "--check": + result.checkOnly = true + elif a == "--help" or a == "-h": + result.help = true + return + elif a.startsWith("-"): + stderr.writeLine(&"error: unknown fmt option '{a}'") + result.ok = false + return + else: + result.paths.add(a) + inc i + proc cmdTest*(args: seq[string], opts: GlobalOptions): int = let useColor = shouldUseColor(opts) - let root = getCurrentDir() + let (filter, paths, ok) = parseTestArgs(args) + if not ok: + if paths.len == 1 and paths[0] == "__help__": + return 0 + return 1 + let root = if paths.len > 0: absolutePath(paths[0]) else: getCurrentDir() let testsDir = root / "tests" var testFiles: seq[string] = @[] if dirExists(testsDir): for kind, path in walkDir(testsDir): if kind == pcFile and path.endsWith(".bux"): + let testName = splitFile(path).name + if filter.len > 0 and filter notin testName: + continue testFiles.add(path) + testFiles.sort(system.cmp) if testFiles.len == 0: - printError("no tests found in tests/ directory", useColor) + if filter.len > 0: + printError(&"no tests matching filter '{filter}' in tests/", useColor) + else: + printError("no tests found in tests/ directory", useColor) return 1 + + if not opts.quiet: + if filter.len > 0: + echo &"Running tests (filter: {filter}) in {testsDir}" + else: + echo &"Running tests in {testsDir}" + echo "┌──────────────────────────────┬────────┐" + echo "│ Test │ Status │" + echo "├──────────────────────────────┼────────┤" + var passed = 0 var failed = 0 for testFile in testFiles: @@ -742,25 +905,167 @@ proc cmdTest*(args: seq[string], opts: GlobalOptions): int = removeDir(tmpDir) createDir(tmpDir / "src") copyFile(testFile, tmpDir / "src" / "Main.bux") - writeFile(tmpDir / "bux.toml", "[package]\nname = \"" & testName & "\"\nversion = \"0.1.0\"\n") + writeFile(tmpDir / "bux.toml", + "[Package]\nName = \"" & testName & "\"\nVersion = \"0.1.0\"\nType = \"bin\"\n\n[Build]\nOutput = \"Bin\"\n") let buildRes = cmdBuild(@[tmpDir], opts) + var status: string + var statusOk = false if buildRes != 0: - printError(&" FAIL {testName} (build)", useColor) + status = "FAIL" + failed += 1 + else: + var execFile = tmpDir / "build" / testName + if not fileExists(execFile): + execFile = tmpDir / "build" / "bux_out" + let exitCode = execCmd(execFile) + if exitCode == 0: + status = "PASS" + statusOk = true + passed += 1 + else: + status = &"FAIL:{exitCode}" + failed += 1 + removeDir(tmpDir) + + if not opts.quiet: + # Pad name to 28 chars for the table column + var nameCol = testName + if nameCol.len > 28: + nameCol = nameCol[0 .. 24] & "..." + else: + nameCol = nameCol & repeat(' ', 28 - nameCol.len) + var stCol = status + if stCol.len < 6: + stCol = stCol & repeat(' ', 6 - stCol.len) + if useColor: + if statusOk: + stdout.setForegroundColor(fgGreen) + else: + stdout.setForegroundColor(fgRed) + stdout.writeLine(&"│ {nameCol} │ {stCol} │") + stdout.resetAttributes() + else: + echo &"│ {nameCol} │ {stCol} │" + + if not opts.quiet: + echo "└──────────────────────────────┴────────┘" + echo &"\nResults: {passed} passed, {failed} failed, {testFiles.len} total" + # CI-friendly exit codes: 0 = all pass, 1 = some failed + return if failed > 0: 1 else: 0 + +proc cmdFmt*(args: seq[string], opts: GlobalOptions): int = + let useColor = shouldUseColor(opts) + let (checkOnly, paths, ok, help) = parseFmtArgs(args) + if not ok: + return 1 + if help: + echo "Usage: bux fmt [--check] [path...]" + echo " --check Do not write; exit 1 if any file would be reformatted" + echo " path File or directory (default: .)" + return 0 + + let targets = if paths.len > 0: paths else: @["."] + var files: seq[string] = @[] + for t in targets: + let collected = collectBuxFiles(t) + for f in collected: + if f notin files: + files.add(f) + files.sort(system.cmp) + + if files.len == 0: + printError("no .bux files found", useColor) + return 1 + + var changed = 0 + var failed = 0 + var unchanged = 0 + for path in files: + let (okf, didChange, msg) = formatFile(path, checkOnly) + if not okf: + printError(&"{path}: {msg}", useColor) failed += 1 continue - var execFile = tmpDir / "build" / testName - if not fileExists(execFile): - execFile = tmpDir / "build" / "bux_out" - let exitCode = execCmd(execFile) - if exitCode == 0: - printInfo(&" PASS {testName}", useColor) - passed += 1 + if didChange: + changed += 1 + if not opts.quiet: + if checkOnly: + printError(&" would reformat {path}", useColor) + else: + printInfo(&" formatted {path}", useColor) else: - printError(&" FAIL {testName} (exit {exitCode})", useColor) - failed += 1 - removeDir(tmpDir) - echo &"\nResults: {passed} passed, {failed} failed" - return if failed > 0: 1 else: 0 + unchanged += 1 + if opts.verbose and not opts.quiet: + echo &" ok {path}" + + if not opts.quiet: + if checkOnly: + echo &"\nfmt --check: {changed} would reformat, {unchanged} ok, {failed} errors" + else: + echo &"\nFormatted {changed}/{files.len} files ({unchanged} already clean)" + + if failed > 0: + return 1 + if checkOnly and changed > 0: + return 1 + return 0 + +proc cmdDoc*(args: seq[string], opts: GlobalOptions): int = + ## Generate Markdown docs from `///` / adjacent `/* */` comments. + var outPath = "" + var paths: seq[string] = @[] + var i = 0 + while i < args.len: + let a = args[i] + if a == "--out" or a == "-o": + if i + 1 >= args.len: + stderr.writeLine("error: --out requires a path") + return 1 + inc i + outPath = args[i] + elif a.startsWith("--out="): + outPath = a["--out=".len .. ^1] + elif a == "--help" or a == "-h": + echo "Usage: bux doc [--out file.md] [path...]" + echo " Scans .bux files for /// and /* */ docs preceding declarations." + echo " Default path: lib/ (stdlib) when omitted." + return 0 + elif a.startsWith("-"): + stderr.writeLine(&"error: unknown doc option '{a}'") + return 1 + else: + paths.add(a) + inc i + + if paths.len == 0: + # Prefer stdlib if present + if dirExists("lib"): + paths = @["lib"] + else: + paths = @["."] + + let items = generateDocs(paths) + let title = + if paths.len == 1 and paths[0] == "lib": "Bux Standard Library" + else: "API Reference" + let md = renderMarkdown(items, title) + + if outPath.len > 0: + try: + let parent = parentDir(outPath) + if parent.len > 0 and not dirExists(parent): + createDir(parent) + writeFile(outPath, md) + if not opts.quiet: + echo &"Wrote {items.len} documented items → {outPath}" + except CatchableError as e: + stderr.writeLine("error: " & e.msg) + return 1 + else: + stdout.write(md) + if items.len == 0 and not opts.quiet: + stderr.writeLine("warning: no /// or /* */ documented declarations found") + return 0 proc cmdVersion*(args: seq[string], opts: GlobalOptions): int = echo "bux 0.1.0 (bootstrap)" @@ -782,10 +1087,13 @@ proc runCli*(args: seq[string]): int = of "init": return cmdInit(cmdArgs, opts) of "add": return cmdAdd(cmdArgs, opts) of "install": return cmdInstall(cmdArgs, opts) + of "search": return cmdSearch(cmdArgs, opts) of "build": return cmdBuild(cmdArgs, opts) of "run": return cmdRun(cmdArgs, opts) of "check": return cmdCheck(cmdArgs, opts) of "test": return cmdTest(cmdArgs, opts) + of "fmt": return cmdFmt(cmdArgs, opts) + of "doc": return cmdDoc(cmdArgs, opts) of "clean": return cmdClean(cmdArgs, opts) of "version", "--version", "-v": return cmdVersion(cmdArgs, opts) of "help", "--help", "-h": diff --git a/bootstrap/docgen.nim b/bootstrap/docgen.nim new file mode 100644 index 0000000..1f8dd5d --- /dev/null +++ b/bootstrap/docgen.nim @@ -0,0 +1,202 @@ +## docgen.nim — Extract `///` (and adjacent `/* */`) docs into Markdown. +## Used by `bux doc [path...]`. + +import std/[os, strutils, strformat, algorithm] + +type + DocItem* = object + kind*: string ## module | func | struct | enum | interface | extern + name*: string + signature*: string ## first declaration line (trimmed) + docs*: string + file*: string + line*: int + +proc isDeclStart(line: string): bool = + let s = line.strip() + if s.len == 0: return false + # Leading attributes @[Checked] etc. — not a decl by themselves + if s.startsWith("@["): return false + if s.startsWith("func ") or s.startsWith("pub func ") or + s.startsWith("extern func ") or s.startsWith("const func ") or + s.startsWith("async func "): + return true + if s.startsWith("struct ") or s.startsWith("pub struct ") or + s.startsWith("enum ") or s.startsWith("pub enum ") or + s.startsWith("union ") or s.startsWith("interface ") or + s.startsWith("module ") or s.startsWith("type "): + return true + return false + +proc declKindAndName(line: string): tuple[kind, name: string] = + var s = line.strip() + # Strip leading pub/extern/const/async + for prefix in ["pub ", "extern ", "const ", "async "]: + if s.startsWith(prefix): + s = s[prefix.len .. ^1].strip() + var kind = "item" + if s.startsWith("func "): + kind = "func" + s = s["func ".len .. ^1] + elif s.startsWith("struct "): + kind = "struct" + s = s["struct ".len .. ^1] + elif s.startsWith("enum "): + kind = "enum" + s = s["enum ".len .. ^1] + elif s.startsWith("union "): + kind = "union" + s = s["union ".len .. ^1] + elif s.startsWith("interface "): + kind = "interface" + s = s["interface ".len .. ^1] + elif s.startsWith("module "): + kind = "module" + s = s["module ".len .. ^1] + elif s.startsWith("type "): + kind = "type" + s = s["type ".len .. ^1] + # Name: until `<` `(` `{` `:` space + var name = "" + for ch in s: + if ch in {' ', '<', '(', '{', ':', ';'}: + break + name.add(ch) + if name.len == 0: + name = s + # extern funcs already stripped "extern " + if kind == "func" and line.strip().startsWith("extern"): + kind = "extern" + return (kind, name) + +proc extractDocsFromSource*(source, path: string): seq[DocItem] = + result = @[] + var pending: seq[string] = @[] + var inBlockComment = false + var blockDoc: seq[string] = @[] + var lineNo = 0 + for rawLine in source.splitLines(): + inc lineNo + var line = rawLine + let stripped = line.strip() + + # Block comment handling (/* ... */ used in stdlib today) + if inBlockComment: + let endIdx = stripped.find("*/") + if endIdx >= 0: + let before = stripped[0 ..< endIdx].strip() + if before.len > 0: + blockDoc.add(before) + inBlockComment = false + # Treat completed block as pending doc if non-empty + if blockDoc.len > 0: + pending = blockDoc + blockDoc = @[] + continue + else: + blockDoc.add(stripped) + continue + if stripped.startsWith("/*") and not stripped.startsWith("/***"): + let rest = stripped["/*".len .. ^1] + let endIdx = rest.find("*/") + if endIdx >= 0: + let body = rest[0 ..< endIdx].strip() + if body.len > 0: + pending = @[body] + else: + inBlockComment = true + blockDoc = @[] + let body = rest.strip() + if body.len > 0: + blockDoc.add(body) + continue + + # Triple-slash doc comments + if stripped.startsWith("///"): + var body = stripped["///".len .. ^1] + if body.startsWith(" "): + body = body[1 .. ^1] + pending.add(body) + continue + + # Empty line: keep pending docs (allow blank lines inside doc blocks) + if stripped.len == 0: + continue + + # Attributes immediately before decl: keep pending + if stripped.startsWith("@["): + continue + + if isDeclStart(line): + if pending.len > 0: + let (kind, name) = declKindAndName(line) + result.add(DocItem( + kind: kind, + name: name, + signature: stripped, + docs: pending.join("\n"), + file: path, + line: lineNo + )) + pending = @[] + continue + + # Other code clears pending (except plain // comments) + if stripped.startsWith("//"): + continue + pending = @[] + +proc collectBuxFilesForDoc*(root: string): seq[string] = + result = @[] + if fileExists(root) and root.endsWith(".bux"): + result.add(root) + return + if not dirExists(root): + return + for path in walkDirRec(root): + if path.endsWith(".bux"): + result.add(path) + result.sort(system.cmp) + +proc renderMarkdown*(items: seq[DocItem], title: string = "API Reference"): string = + var sb: string + sb.add(&"# {title}\n\n") + sb.add("Generated by `bux doc` from `///` and `/* */` documentation comments.\n\n") + if items.len == 0: + sb.add("_No documented items found._\n") + return sb + + # Group by file + var byFile: seq[string] = @[] + for it in items: + if it.file notin byFile: + byFile.add(it.file) + byFile.sort(system.cmp) + + for f in byFile: + let base = splitFile(f).name + sb.add(&"## `{base}`\n\n") + sb.add(&"_Source: `{f}`_\n\n") + for it in items: + if it.file != f: + continue + sb.add(&"### `{it.name}` _{it.kind}_\n\n") + sb.add("```bux\n") + sb.add(it.signature) + sb.add("\n```\n\n") + if it.docs.len > 0: + sb.add(it.docs) + sb.add("\n\n") + return sb + +proc generateDocs*(paths: seq[string]): seq[DocItem] = + result = @[] + var files: seq[string] = @[] + for p in paths: + for f in collectBuxFilesForDoc(p): + if f notin files: + files.add(f) + files.sort(system.cmp) + for f in files: + let src = readFile(f) + result.add(extractDocsFromSource(src, f)) diff --git a/bootstrap/fmt.nim b/bootstrap/fmt.nim new file mode 100644 index 0000000..9774f7f --- /dev/null +++ b/bootstrap/fmt.nim @@ -0,0 +1,106 @@ +## fmt.nim — Indentation-based Bux source formatter (bootstrap). +## Mirrors selfhost `src/fmt.bux`: re-indent by brace depth, preserve content. + +import std/[strutils, os, algorithm] + +proc isInStringOrComment(line: string, pos: int): bool = + ## Simplified: track `//`, `"..."`, and `'...'` up to `pos`. + var inString = false + var inChar = false + var inComment = false + var i = 0 + while i < pos and i < line.len: + let c = line[i] + let n = if i + 1 < line.len: line[i + 1] else: '\0' + if inComment: + inc i + continue + if c == '/' and n == '/': + inComment = true + inc i + continue + if c == '"' and not inChar: + inString = not inString + if c == '\'' and not inString: + inChar = not inChar + inc i + return inString or inChar or inComment + +proc countBraceDelta(line: string): int = + var delta = 0 + for i in 0 ..< line.len: + if isInStringOrComment(line, i): + continue + let c = line[i] + if c == '{': + inc delta + elif c == '}': + dec delta + return delta + +proc formatSource*(source: string): string = + ## Re-indent each non-empty line to 4 spaces × brace depth. + ## Idempotent: formatting a clean file is a no-op. + var sb: string + var indent = 0 + # Nim's splitLines leaves a trailing "" when the source ends with '\n'. + # Drop that artifact so we don't accumulate blank lines on re-format. + var lines = source.splitLines(keepEol = false) + if source.len > 0 and source.endsWith('\n') and lines.len > 0 and lines[^1].len == 0: + lines.setLen(lines.len - 1) + for line in lines: + let trimmed = line.strip(leading = true, trailing = false) + if trimmed.len == 0: + sb.add('\n') + continue + + let delta = countBraceDelta(trimmed) + let firstChar = trimmed[0] + if firstChar == '}': + dec indent + if indent < 0: + indent = 0 + + for _ in 0 ..< indent: + sb.add(" ") + sb.add(trimmed) + sb.add('\n') + + if firstChar != '}': + indent = indent + delta + else: + # Net delta after the initial decrease for a leading `}` + indent = indent + delta + 1 + if indent < 0: + indent = 0 + + return sb + +proc formatFile*(path: string, checkOnly: bool): tuple[ok: bool, changed: bool, msg: string] = + ## Format `path` in place, or only check if reformatting would change it. + if not fileExists(path): + return (false, false, "file not found: " & path) + let source = readFile(path) + let formatted = formatSource(source) + if formatted == source: + return (true, false, "") + if checkOnly: + return (true, true, "would reformat") + try: + writeFile(path, formatted) + return (true, true, "formatted") + except CatchableError as e: + return (false, false, e.msg) + +proc collectBuxFiles*(root: string): seq[string] = + ## Collect `.bux` files: single file, or recursive directory walk. + result = @[] + if fileExists(root) and root.endsWith(".bux"): + result.add(root) + return + if not dirExists(root): + return + for path in walkDirRec(root): + if path.endsWith(".bux"): + result.add(path) + result.sort(system.cmp) diff --git a/bootstrap/registry.nim b/bootstrap/registry.nim new file mode 100644 index 0000000..7aeb0ea --- /dev/null +++ b/bootstrap/registry.nim @@ -0,0 +1,167 @@ +## registry.nim — Bux package registry index (E.1) +## +## Index format (TOML-ish, one package per [[package]] table): +## +## [[package]] +## name = "greet" +## version = "0.1.0" +## source = "file:packages/greet" # relative to the registry file +## description = "Hello helpers" +## +## [[package]] +## name = "net" +## version = "1.2.0" +## source = "https://github.com/bux-lang/net.git" +## +## Lookup order for the index file: +## 1. $BUX_REGISTRY (file path) +## 2. ~/.bux/registry.toml +## 3. /config/registry.toml next to the compiler / cwd + +import std/[os, strutils, strformat, algorithm] + +type + RegistryPackage* = object + name*: string + version*: string + source*: string ## raw source as written in the index + description*: string + resolvedPath*: string ## absolute path for file: sources (filled on load) + + Registry* = object + path*: string ## index file path + packages*: seq[RegistryPackage] + +proc resolvePackageSource(pkg: var RegistryPackage, indexDir: string) = + if pkg.source.startsWith("file:"): + var p = pkg.source["file:".len .. ^1] + if p.startsWith("//"): + p = p[2 .. ^1] + if not p.isAbsolute: + p = indexDir / p + pkg.resolvedPath = p.absolutePath + elif pkg.source.startsWith("path:"): + var p = pkg.source["path:".len .. ^1] + if not p.isAbsolute: + p = indexDir / p + pkg.resolvedPath = p.absolutePath + pkg.source = "file:" & pkg.resolvedPath + +proc parseRegistryToml(content, indexPath: string): seq[RegistryPackage] = + ## Minimal parser for repeated [[package]] blocks with string keys. + result = @[] + var cur: RegistryPackage + var inPkg = false + let indexDir = indexPath.parentDir + + for raw in content.splitLines(): + let line = raw.strip() + if line.len == 0 or line.startsWith("#"): + continue + if line == "[[package]]" or line == "[[Package]]": + if inPkg and cur.name.len > 0: + resolvePackageSource(cur, indexDir) + result.add(cur) + cur = RegistryPackage() + inPkg = true + continue + if not inPkg: + continue + let eq = line.find('=') + if eq < 0: continue + let key = line[0 ..< eq].strip().toLowerAscii() + var val = line[eq + 1 .. ^1].strip() + if val.len >= 2 and val[0] == '"' and val[^1] == '"': + val = val[1 ..< ^1] + case key + of "name": cur.name = val + of "version": cur.version = val + of "source": cur.source = val + of "description": cur.description = val + else: discard + if inPkg and cur.name.len > 0: + resolvePackageSource(cur, indexDir) + result.add(cur) + +proc findRegistryIndex*(): string = + ## Locate the registry index file. + let env = getEnv("BUX_REGISTRY") + if env.len > 0 and fileExists(env): + return env.absolutePath + let homeIdx = getHomeDir() / ".bux" / "registry.toml" + if fileExists(homeIdx): + return homeIdx + let candidates = @[ + getAppDir() / ".." / "config" / "registry.toml", + getAppDir() / "config" / "registry.toml", + getCurrentDir() / "config" / "registry.toml", + getCurrentDir() / ".." / "config" / "registry.toml", + ] + for c in candidates: + if fileExists(c): + return c.absolutePath + return "" + +proc loadRegistry*(path: string = ""): Registry = + result.path = if path.len > 0: path else: findRegistryIndex() + result.packages = @[] + if result.path.len == 0 or not fileExists(result.path): + return + try: + let content = readFile(result.path) + result.packages = parseRegistryToml(content, result.path) + except CatchableError: + result.packages = @[] + +proc registryLookup*(reg: Registry, name: string, versionReq: string = "*"): RegistryPackage = + ## Find a package by name. versionReq `*` picks the last matching entry + ## (index order; put newest last). Exact version matches preferred. + result = RegistryPackage() + var candidates: seq[RegistryPackage] = @[] + for p in reg.packages: + if p.name.toLowerAscii() == name.toLowerAscii(): + candidates.add(p) + if candidates.len == 0: + return + if versionReq.len == 0 or versionReq == "*": + return candidates[^1] + for p in candidates: + if p.version == versionReq: + return p + # Semver prefix match: "1" matches "1.0.0" + for p in candidates: + if p.version.startsWith(versionReq): + return p + return candidates[^1] + +proc registrySearch*(reg: Registry, query: string): seq[RegistryPackage] = + result = @[] + let q = query.toLowerAscii() + for p in reg.packages: + if q.len == 0 or + q in p.name.toLowerAscii() or + q in p.description.toLowerAscii(): + result.add(p) + result.sort(proc (a, b: RegistryPackage): int = + cmp(a.name.toLowerAscii(), b.name.toLowerAscii())) + +proc isGitSource*(source: string): bool = + source.startsWith("http://") or source.startsWith("https://") or + source.startsWith("git@") or source.startsWith("git://") or + source.startsWith("ssh://") + +proc isFileSource*(source: string): bool = + source.startsWith("file:") or source.startsWith("path:") + +proc formatRegistryDepLine*(name: string, pkg: RegistryPackage): string = + ## Produce a bux.toml Dependencies line for a resolved registry package. + if pkg.resolvedPath.len > 0 and dirExists(pkg.resolvedPath): + return &"{name} = {{ Path = \"{pkg.resolvedPath}\" }}" + if isGitSource(pkg.source): + let ver = if pkg.version.len > 0: pkg.version else: "*" + return &"{name} = {{ Version = \"{ver}\", Source = \"{pkg.source}\" }}" + if isFileSource(pkg.source) and pkg.resolvedPath.len > 0: + return &"{name} = {{ Path = \"{pkg.resolvedPath}\" }}" + # Fallback: version-only (install will re-resolve) + let ver = if pkg.version.len > 0: pkg.version else: "*" + return &"{name} = \"{ver}\"" diff --git a/bootstrap/sema.nim b/bootstrap/sema.nim index 78a76cc..6894504 100644 --- a/bootstrap/sema.nim +++ b/bootstrap/sema.nim @@ -51,6 +51,11 @@ type ## When true, ekIdent skips use-while-borrowed (we're forming `&x` itself) suppressUseWhileBorrow*: bool currentRetType*: Type ## return type of the function being checked + ## Lifetime elision / ref-origin tracking (@[Checked] only) + ## Binding name → lifetime id ("'a", "#elided0", "#local", …) + varRefLifetime*: Table[string, string] + ## Expected lifetime of the function's returned reference ("" if ret is not a ref) + returnLifetime*: string closureDepth*: int ## nesting depth inside closures currentClosureExpr*: Expr ## current closure being analyzed closureScope*: Scope ## scope at which the current closure was entered @@ -164,6 +169,138 @@ proc checkTempMutBorrow(sema: var Sema, varName: string, loc: SourceLocation) = elif sema.activeSharedBorrows.getOrDefault(varName, 0) > 0: sema.emitError(loc, &"cannot mutably borrow '{varName}' while it is shared-borrowed") +# --------------------------------------------------------------------------- +# Lifetime elision (C.1) — Rust-style simple rules for @[Checked] +# --------------------------------------------------------------------------- +# +# Rules (common cases, no annotations required): +# 1. Each elided input reference (&T / &mut T param) gets a distinct lifetime. +# 2. If there is exactly one input lifetime, it is assigned to all elided outputs. +# 3. If the first param is `self` / `Self`, its lifetime is preferred for outputs. +# 4. Multiple input refs + elided return → error (need explicit `'a`). +# 5. Returning a reference derived from a local (or by-value param) is rejected. +# + +const + LifetimeLocal* = "#local" ## ref derived from a local / by-value place + LifetimeOutNone* = "#out" ## return ref with no input to borrow from + LifetimeAmbiguous* = "#ambiguous" + +proc isRefTypeExpr(te: TypeExpr): bool = + te != nil and te.kind in {tekRef, tekMutRef} + +proc applyLifetimeElision*(sema: var Sema, decl: Decl) = + ## Assign elided lifetimes for ref params/return of `decl`. Populates + ## `varRefLifetime` (params) and `returnLifetime`. + sema.varRefLifetime = initTable[string, string]() + sema.returnLifetime = "" + if not sema.checkedFunc: + return + + var inputLts: seq[string] = @[] + var anon = 0 + for p in decl.declFuncParams: + if not isRefTypeExpr(p.ptype): + continue + var lt = p.ptype.refLifetime + if lt.len == 0: + lt = "#elided" & $anon + inc anon + inputLts.add(lt) + sema.varRefLifetime[p.name] = lt + + let ret = decl.declFuncReturnType + if not isRefTypeExpr(ret): + return + + var rlt = ret.refLifetime + if rlt.len == 0: + if inputLts.len == 1: + rlt = inputLts[0] + elif inputLts.len == 0: + rlt = LifetimeOutNone + elif decl.declFuncParams.len > 0 and + decl.declFuncParams[0].name in ["self", "Self"]: + rlt = inputLts[0] + else: + sema.emitError(decl.loc, + "lifetime elision failed: return type needs an explicit lifetime " & + "(multiple input references); e.g. func F<'a>(a: &'a T, b: &'a U) -> &'a T") + rlt = LifetimeAmbiguous + sema.returnLifetime = rlt + +proc exprRefLifetime*(sema: Sema, expr: Expr, scope: Scope): string = + ## Best-effort lifetime of a reference-producing expression. + if expr == nil: + return "" + case expr.kind + of ekIdent: + if sema.varRefLifetime.hasKey(expr.exprIdent): + return sema.varRefLifetime[expr.exprIdent] + return "" + of ekUnary: + if expr.exprUnaryOp == tkAmp: + let name = extractBorrowedIdent(expr) + if name.len == 0: + return LifetimeLocal + # Reborrow of an existing ref binding keeps its lifetime + if sema.varRefLifetime.hasKey(name): + return sema.varRefLifetime[name] + # Address-of a by-value local or by-value parameter → local (dangling if returned) + return LifetimeLocal + # Dereference: *r still carries r's lifetime for field/ref purposes + if expr.exprUnaryOp == tkStar: + return sema.exprRefLifetime(expr.exprUnaryOperand, scope) + return "" + of ekBorrow: + # `borrow &x` / `borrow &mut x` — same origin rules as unary & + if expr.exprBorrowOperand != nil: + return sema.exprRefLifetime(expr.exprBorrowOperand, scope) + return LifetimeLocal + of ekField: + # Field projection through a ref keeps the base lifetime: (*p).x or p.x + if expr.exprFieldObj != nil: + let baseLt = sema.exprRefLifetime(expr.exprFieldObj, scope) + if baseLt.len > 0: + return baseLt + # Base is an ident of a struct local — field address would be local + if expr.exprFieldObj.kind == ekIdent: + if sema.varRefLifetime.hasKey(expr.exprFieldObj.exprIdent): + return sema.varRefLifetime[expr.exprFieldObj.exprIdent] + return LifetimeLocal + return "" + else: + return "" + +proc checkReturnLifetime*(sema: var Sema, retExpr: Expr, scope: Scope, loc: SourceLocation) = + ## Reject dangling returns and explicit lifetime mismatches in @[Checked]. + if not sema.checkedFunc or sema.returnLifetime.len == 0 or retExpr == nil: + return + let got = sema.exprRefLifetime(retExpr, scope) + if sema.returnLifetime == LifetimeOutNone: + sema.emitError(loc, + "cannot return a reference: function has no input reference to borrow from") + return + if got == LifetimeLocal: + sema.emitError(loc, "cannot return reference to local variable") + return + if got.len == 0: + # Non-trivial expression (call, etc.) — leave for later analysis + return + if got == LifetimeAmbiguous or sema.returnLifetime == LifetimeAmbiguous: + return + # Explicit lifetime mismatch (both sides named with ') + if got.startsWith("'") and sema.returnLifetime.startsWith("'") and got != sema.returnLifetime: + sema.emitError(loc, + &"lifetime mismatch: returning '{got}' but function returns '{sema.returnLifetime}'") + return + # Distinct elided inputs returned into another elided input's return slot + if got.startsWith("#elided") and sema.returnLifetime.startsWith("#elided") and + got != sema.returnLifetime: + sema.emitError(loc, + "lifetime mismatch: returned reference does not outlive the return type " & + "(multiple input references; annotate with an explicit lifetime)") + # --------------------------------------------------------------------------- # Generic type inference helpers # --------------------------------------------------------------------------- @@ -472,7 +609,7 @@ proc inferTypeArgs(sema: var Sema, funcDecl: Decl, argTypes: seq[Type], # Type resolution from AST TypeExpr # --------------------------------------------------------------------------- -proc resolveType(sema: var Sema, te: TypeExpr): Type = +proc resolveType*(sema: var Sema, te: TypeExpr): Type = if te == nil: return makeUnknown() case te.kind @@ -918,7 +1055,7 @@ proc collectGlobals*(sema: var Sema) = # Expression type checking # --------------------------------------------------------------------------- -proc checkExpr(sema: var Sema, expr: Expr, scope: Scope): Type +proc checkExpr*(sema: var Sema, expr: Expr, scope: Scope): Type proc checkStmt(sema: var Sema, stmt: Stmt, scope: Scope): Type proc typeImplements(sema: Sema, t: Type, interfaceName: string): bool = @@ -1099,7 +1236,7 @@ proc resolveCallArgs(sema: var Sema, expr: Expr, calleeDecl: Decl, scope: Scope) expr.exprCallArgs = newArgs expr.exprCallArgNames = newNames -proc checkExpr(sema: var Sema, expr: Expr, scope: Scope): Type = +proc checkExpr*(sema: var Sema, expr: Expr, scope: Scope): Type = if expr == nil: return makeUnknown() case expr.kind @@ -1835,6 +1972,11 @@ proc checkStmt(sema: var Sema, stmt: Stmt, scope: Scope): Type = # Untyped let + `&x` is typed as &mut by unary lowering isMut = initType.isMutRef sema.checkCreateBorrow(bname, isMut, stmt.stmtLetInit.loc) + # Propagate ref lifetime to the new binding (for return-site checks) + if declaredType.isRef or declaredType.isMutRef or initType.isRef or initType.isMutRef: + let lt = sema.exprRefLifetime(stmt.stmtLetInit, scope) + if lt.len > 0: + sema.varRefLifetime[stmt.stmtLetName] = lt return makeVoid() of skIf: let condType = sema.checkExpr(stmt.stmtIfCond, scope) @@ -1897,6 +2039,8 @@ proc checkStmt(sema: var Sema, stmt: Stmt, scope: Scope): Type = let retSym = scope.lookup(stmt.stmtReturnValue.exprIdent) if retSym != nil and retSym.isOwn: sema.movedVars.add(stmt.stmtReturnValue.exprIdent) + # Lifetime: reject dangling returns / explicit mismatches + sema.checkReturnLifetime(stmt.stmtReturnValue, scope, stmt.loc) return makeVoid() of skBreak, skContinue: return makeVoid() @@ -1951,9 +2095,15 @@ proc checkStmt(sema: var Sema, stmt: Stmt, scope: Scope): Type = proc checkFunc(sema: var Sema, decl: Decl) = if decl.declFuncBody == nil: return - # Skip body type-checking for generic functions — their bodies contain + # Skip body type-checking for type-generic functions — their bodies contain # type parameters that cannot be fully resolved until monomorphization. - if decl.declFuncTypeParams.len > 0: + # Lifetime-only params (`'a`) are fine: we still check the body for elision. + var hasTypeGeneric = false + for tp in decl.declFuncTypeParams: + if not tp.isLifetime: + hasTypeGeneric = true + break + if hasTypeGeneric: return let wasChecked = sema.checkedFunc let wasAsync = sema.currentFuncIsAsync @@ -1963,10 +2113,18 @@ proc checkFunc(sema: var Sema, decl: Decl) = sema.movedVars = @[] sema.activeMutBorrows = initTable[string, SourceLocation]() sema.activeSharedBorrows = initTable[string, int]() + # C.1: elide lifetimes on params / return before walking the body + sema.applyLifetimeElision(decl) + else: + sema.varRefLifetime = initTable[string, string]() + sema.returnLifetime = "" var funcScope = newScope(sema.globalScope) # Add type parameters to type table for resolution var addedTypeParams: seq[string] = @[] for tp in decl.declFuncTypeParams: + if tp.isLifetime: + # Lifetime params are not types; skip typeTable + continue sema.typeTable[tp.name] = makeTypeParam(tp.name) addedTypeParams.add(tp.name) # Add parameters @@ -1982,6 +2140,8 @@ proc checkFunc(sema: var Sema, decl: Decl) = sema.typeTable.del(tp) sema.checkedFunc = wasChecked sema.currentFuncIsAsync = wasAsync + sema.varRefLifetime = initTable[string, string]() + sema.returnLifetime = "" # --------------------------------------------------------------------------- # Second pass: check all function bodies @@ -2026,3 +2186,16 @@ proc analyzeFull*(modu: Module): tuple[result: SemaResult, sema: Sema] = sema.collectGlobals() sema.checkBodies() result = (SemaResult(diagnostics: sema.diagnostics), sema) + +proc checkExprForLsp*(sema: var Sema, expr: Expr, scope: Scope): Type = + ## Type-check an expression for IDE use (no borrow/move side effects). + let wasChecked = sema.checkedFunc + let savedMoved = sema.movedVars + let savedMut = sema.activeMutBorrows + let savedShared = sema.activeSharedBorrows + sema.checkedFunc = false + result = sema.checkExpr(expr, scope) + sema.checkedFunc = wasChecked + sema.movedVars = savedMoved + sema.activeMutBorrows = savedMut + sema.activeSharedBorrows = savedShared diff --git a/config/registry.toml b/config/registry.toml new file mode 100644 index 0000000..7d1ec2a --- /dev/null +++ b/config/registry.toml @@ -0,0 +1,22 @@ +# Bux package registry index (E.1) +# Used by `bux add ` and `bux install` when no --path/--git is given. +# +# Override with: export BUX_REGISTRY=/path/to/registry.toml +# Or copy to: ~/.bux/registry.toml +# +# source forms: +# file:relative/or/absolute — local package (relative to this file) +# path:relative/or/absolute — same as file: +# https://...git — git clone into ~/.bux/packages/ + +[[package]] +name = "greet" +version = "0.1.0" +source = "file:../registry/packages/greet" +description = "Tiny Hello helper library (demo registry package)" + +[[package]] +name = "greet" +version = "0.1.1" +source = "file:../registry/packages/greet" +description = "Tiny Hello helper library (demo registry package, patch)" diff --git a/docs/BuildAndTest.md b/docs/BuildAndTest.md index be92294..33ad188 100644 --- a/docs/BuildAndTest.md +++ b/docs/BuildAndTest.md @@ -152,15 +152,60 @@ This runs: ### Project Tests (`bux test`) ```bash -./buxc test +./buxc test # run all tests/*.bux in the current package +./buxc test --filter first # only tests whose name contains "first" +./buxc test --filter=first _test_runner ``` -Builds the project and runs the resulting binary. Reports: -- `Tests passed` on exit code 0 -- `Tests failed (exit code N)` on non-zero exit +Discovers `tests/*.bux`, builds each as a temp package, and runs it. Prints a +summary table and exits: +- `0` — all selected tests passed +- `1` — at least one failure, or no tests matched the filter Use `Std::Test` module for assertions inside test code. +### Format (`bux fmt`) +```bash +./buxc fmt examples/hello.bux # reformat one file +./buxc fmt lib/ # reformat a directory tree +make fmt # reformat lib/ examples/ src/ tests/ apps/ +./buxc fmt --check path/ # exit 1 if any file would change +make fmt-check # CI: full-tree clean + dirty smoke +``` + +Indentation is 4 spaces by brace depth. The formatter is idempotent (safe to re-run). +`make fmt-check` enforces a clean tree under `lib/`, `examples/`, `src/`, `tests/`, and `apps/`. + +### Stdlib golden tests +```bash +make test-stdlib +# or: tests/stdlib_golden/run.sh ./buxc +``` + +Behavioral packages under `tests/stdlib_golden/` (`array`, `string`, `collections`) +assert core Array/String/Map/Set/Result/Option APIs and match expected `PASS` lines. + +### API docs (`bux doc`) +```bash +./buxc doc lib/ # Markdown to stdout +./buxc doc --out docs/api/stdlib.md lib/ +make docs # writes docs/api/stdlib.md +``` + +Scans `///` line comments (and bootstrap also accepts adjacent `/* */`) immediately +before `func` / `struct` / `enum` / `interface` / `module` declarations. + +### Language Server (`bux-lsp` 0.4.0) +```bash +make lsp # → tools/bux-lsp +nim r --path:bootstrap tools/test_lsp_locals.nim +./tools/smoke_lsp_hover.sh +``` + +Features: diagnostics (`buxc check`), hover, go-to-def, outline, completion. +**Locals are position-sensitive** (nested scopes / shadowing). **Inferred `let` types** +appear on hover (`let x: int · inferred`). + ### Example Programs ```bash make test-examples diff --git a/docs/LanguageRef.md b/docs/LanguageRef.md index 304b2ef..ec46e8d 100644 --- a/docs/LanguageRef.md +++ b/docs/LanguageRef.md @@ -604,6 +604,44 @@ Moves happen in three contexts: msg = "reassigned"; // OK: reinitialization PrintLine(msg); ``` +- **No dangling returns**: cannot return a reference to a local (or by-value parameter) + ```bux + @[Checked] + func Bad(p: &int) -> &int { + var x: int = 1; + return &x; // ERROR: cannot return reference to local variable + } + ``` + +### Lifetime elision (C.1) + +In `@[Checked]` functions, most reference signatures need **no** lifetime annotations. +Elision applies the usual single-input rules: + +1. Each elided input `&T` / `&mut T` parameter gets a distinct lifetime. +2. If there is **exactly one** input lifetime, it is assigned to all elided outputs. +3. If the first parameter is named `self` / `Self`, that input lifetime is preferred for outputs. +4. Multiple input references + elided return → **error** (write an explicit lifetime). + +```bux +// Elided — one input ref, return shares its lifetime +@[Checked] +func Identity(p: &int) -> &int { + return p; // OK +} + +// Explicit — required when several inputs could be returned +@[Checked] +func Pick<'a>(a: &'a int, b: &'a int) -> &'a int { + return a; +} + +// Syntax: &'a T and &mut / &'a mut T (lifetime before `mut`) +// Type parameters: func F<'a, T>(...) +``` + +Unchecked functions ignore lifetime rules (C-like). Explicit `'a` is optional +documentation when a single input would already elide correctly. --- diff --git a/docs/Packages.md b/docs/Packages.md index 15999dd..463fe1f 100644 --- a/docs/Packages.md +++ b/docs/Packages.md @@ -1,6 +1,8 @@ # Bux Package Manager -> **Status:** Implemented (Phase 9.1) +> **Status:** Path + git + **local/file registry** (E.1). HTTP registry index URL optional later. + +See also: [SEMVER.md](SEMVER.md) for version policy. --- @@ -20,52 +22,97 @@ License = "MIT" Output = "Bin" [Dependencies] -Std = "1.0" -Json = { Version = "2.1", Source = "https://github.com/bux-lang/json" } +greet = { Path = "/abs/path/to/greet" } +Json = { Version = "2.1", Source = "https://github.com/bux-lang/json" } Utils = { Path = "../Utils" } +# Registry name-only (resolved by `bux add` / `bux install`): +# greet = "0.1.1" ``` ### Dependency Forms | Form | Example | Description | |------|---------|-------------| -| Version string | `Std = "1.0"` | Registry dependency | -| Wildcard | `Std = "*"` | Latest version | +| Version string | `greet = "0.1.1"` | Registry dependency | +| Wildcard | `greet = "*"` | Latest registry version | | Inline table (git) | `{ Version = "1.4", Source = "https://..." }` | Git URL + version | | Inline table (path) | `{ Path = "../Lib" }` | Local path dependency | --- +## Package registry (E.1) + +### Index file + +Default locations (first hit wins): + +1. `$BUX_REGISTRY` — path to a `registry.toml` +2. `~/.bux/registry.toml` +3. `config/registry.toml` next to the Bux repo / compiler + +Format: + +```toml +[[package]] +name = "greet" +version = "0.1.1" +source = "file:../registry/packages/greet" # relative to the index file +description = "Hello helpers" + +[[package]] +name = "net" +version = "1.0.0" +source = "https://github.com/example/bux-net.git" +description = "TCP helpers" +``` + +`file:` / `path:` sources are resolved relative to the registry file. +Git URLs are cloned into `~/.bux/packages//` on install. + +### CLI + +```bash +# Search the index +bux search +bux search greet + +# Add by registry name (writes Path or git Source into bux.toml) +bux add greet +bux add greet 0.1.1 + +# Explicit sources still work +bux add utils --path "../utils" +bux add network --git "https://github.com/bux-lang/network" + +# Resolve + write bux.lock +bux install +``` + +Demo package in this monorepo: `registry/packages/greet` (registered in +`config/registry.toml`). Smoke test: `tools/smoke_registry.sh`. + +--- + ## CLI Commands ### `bux add [version]` -Add a dependency to `bux.toml`. +Add a dependency to `bux.toml` (registry / `--path` / `--git`). -```bash -# Add registry dependency -bux add json "2.1" +### `bux search [query]` -# Add path-based dependency -bux add utils --path "../utils" - -# Add git dependency -bux add network --git "https://github.com/bux-lang/network" -``` +List packages in the active registry (filter by name/description). ### `bux install` Resolve dependencies and generate `bux.lock`. -```bash -bux install -``` - What it does: 1. Reads `[Dependencies]` from `bux.toml` 2. Resolves path-based deps (verifies directory exists) -3. Clones/pulls git-based deps to `~/.bux/packages//` -4. Generates `bux.lock` with exact versions and sources +3. Clones git-based deps to `~/.bux/packages//` +4. Resolves bare version names via the registry index +5. Generates `bux.lock` with exact versions and sources ### `bux build` / `bux run` @@ -84,10 +131,9 @@ Auto-generated. **Do not edit manually.** ```toml [[Package]] -Name = "json" -Version = "2.1.3" -Source = "https://github.com/bux-lang/json" -Checksum = "8dcb2a7f..." +Name = "greet" +Version = "0.1.1" +Source = "/home/user/z-git/bux/bux/registry/packages/greet" [[Package]] Name = "utils" @@ -103,7 +149,7 @@ The lockfile ensures **reproducible builds** — every developer gets the exact 1. **Path-based** deps are resolved relative to the manifest directory 2. **Git-based** deps are cloned to `~/.bux/packages//` -3. **Version-based** deps (without Source) require a registry (future feature) +3. **Version-based** deps look up `config/registry.toml` (or `$BUX_REGISTRY`) 4. Dependencies are loaded from `/src/*.bux` at build time 5. Later declarations shadow earlier ones (project > deps > stdlib) @@ -114,8 +160,10 @@ The lockfile ensures **reproducible builds** — every developer gets the exact ```bash bux new mylib cd mylib -# Edit src/Main.bux → module MyLib { pub func Add(...) } -bux build # Builds as library (Type = "lib") +# Edit src/*.bux → module MyLib { func Add(...) } +# Set Type = "lib" in bux.toml +# Register in your registry.toml with source = "file:..." +bux build ``` ## Example: Using a Library diff --git a/docs/QUALITY_PLAN.md b/docs/QUALITY_PLAN.md index d1ac313..811a441 100644 --- a/docs/QUALITY_PLAN.md +++ b/docs/QUALITY_PLAN.md @@ -1,7 +1,7 @@ # Bux — План към „добър“ език (v0.5 → v1.0) > **Дата:** 2026-07-18 -> **Текущо:** v0.5.x — selfhost loop, gradual ownership, green threads, **43+ examples**, match + guards + **generic HOF inference** + pattern bindings + **`f"..."` interp** bootstrap+selfhost ✅ +> **Текущо:** v0.5.x — selfhost, C.1, tooling, LSP 0.4, full-tree fmt, **package registry (E.1)** ✅ > **Цел:** Език, с който се пишат реални проекти комфортно, безопасно (по избор) и с надежден toolchain. --- @@ -14,11 +14,11 @@ | Sema / generics | Monomorphization, trait bounds basic | ★★★★☆ | | HIR → C | Tuples + fat `func` ABI в bootstrap **и** selfhost | ★★★★☆ | | Selfhost (`src/`) | ~12k LOC, binary-identical loop, closures+tuples | ★★★★★ | -| Gradual ownership | `@[Checked]`, `&`/`&mut`, move, Drop | ★★★☆☆ (basic) | +| Gradual ownership | `@[Checked]`, `&`/`&mut`, move, Drop, **lifetime elision** | ★★★★☆ | | Concurrency | M:N tasks + channels + async | ★★★★☆ | | Stdlib | Array/Map/Set/String/Iter HOF разширени | ★★★★☆ | | Tooling | `test-errors`, LSP diagnostics + hover/def/outline | ★★★★☆ | -| Ecosystem / registry | path+git deps; няма централен registry | ★☆☆☆☆ | +| Ecosystem / registry | path+git + **file registry index** (`bux search/add`) | ★★★☆☆ | | Документация | README + QUALITY_PLAN синхронизирани (2026-07-15) | ★★★★☆ | **Силна ниша:** gradual ownership (C-скорост на писане + opt-in Rust-safety). @@ -69,7 +69,7 @@ | # | Задача | Защо | Статус | |---|--------|------|--------| -| C.1 | Lifetime elision за common cases | Без `'a` в 90% от API-тата | ⏳ | +| C.1 | Lifetime elision за common cases | Без `'a` в 90% от API-тата | ✅ bootstrap + selfhost | | C.2 | Exclusive `&mut` vs shared `&` data-flow | По-малко false negatives | ✅ let-bound + use-while + call conflict | | C.3 | Auto-drop edge cases (early return, branches) | RAII да е надежден | ✅ bootstrap + selfhost | | C.4 | `@[Release]` zero-cost path документация + golden tests | Killer story: safe default, free hot path | ✅ partial (unchecked path + goldens) | @@ -78,21 +78,21 @@ | # | Задача | Защо | Статус | |---|--------|------|--------| -| D.1 | LSP: hover, go-to-def, diagnostics | IDE = adoption | ✅ hover/def/outline + **sema types on hover** (v0.3.0) + `buxc` diags | -| D.2 | `bux fmt` стабилен + CI check | Единен style | ⏳ | -| D.3 | `bux test` с `--filter`, exit codes, summary table | CI-friendly | ⏳ partial (`bux test` exists) | -| D.4 | `bux doc` от `///` comments | Самодокументиращ се stdlib | ⏳ | -| D.5 | Golden tests за stdlib modules | Регресии без изненади | ⏳ | +| D.1 | LSP: hover, go-to-def, diagnostics | IDE = adoption | ✅ v0.4.0: **position-sensitive locals** + **inferred `let`** + sema hover | +| D.2 | `bux fmt` стабилен + CI check | Единен style | ✅ full-tree format + `make fmt-check` enforce | +| D.3 | `bux test` с `--filter`, exit codes, summary table | CI-friendly | ✅ `--filter` / summary / exit 0\|1 | +| D.4 | `bux doc` от `///` comments | Самодокументиращ се stdlib | ✅ bootstrap+selfhost + `make docs` | +| D.5 | Golden tests за stdlib modules | Регресии без изненади | ✅ `tests/stdlib_golden/` + `make test-stdlib` | ### E — Ecosystem & v1.0 (P2) -| # | Задача | Защо | -|---|--------|------| -| E.1 | Package registry protocol (git/HTTP) | `bux add foo` без path hacks | -| E.2 | 3–5 production-quality apps в `apps/` | Showcase | -| E.3 | Language freeze + semver policy | Trust | -| E.4 | Debugger/DWARF basics | Systems audience | -| E.5 | Benchmarks vs C/Zig/Nim (micro + nexus) | Marketing + regression | +| # | Задача | Защо | Статус | +|---|--------|------|--------| +| E.1 | Package registry protocol (git/HTTP) | `bux add foo` без path hacks | ✅ local index + file/git sources + `search` | +| E.2 | 3–5 production-quality apps в `apps/` | Showcase | ⏳ partial (`nexus`, `boko`, `simpledb`, `jwt-pitbul`) | +| E.3 | Language freeze + semver policy | Trust | ✅ draft `docs/SEMVER.md` | +| E.4 | Debugger/DWARF basics | Systems audience | ⏳ | +| E.5 | Benchmarks vs C/Zig/Nim (micro + nexus) | Marketing + regression | ⏳ | --- @@ -114,10 +114,10 @@ A (stdlib ergonomics) → B (compiler holes) → C (ownership depth) - [ ] Всички examples + selfhost-loop + 3 apps минават на CI - [ ] Array/Map/String/Test API покрива 90% от ежедневните нужди -- [ ] `@[Checked]` хваща use-after-move + double `&mut` в documented subset -- [ ] `bux test` + `bux fmt` + `bux check` са default developer loop -- [ ] LanguageRef синхронизиран с компилатора -- [ ] Поне един външен проект (не в monorepo) build-ва с git dep +- [x] `@[Checked]` хваща use-after-move + double `&mut` + dangling return / elision fail +- [x] `bux test` + `bux fmt` + `bux check` са default developer loop (`--filter` / `--check` shipped) +- [x] LanguageRef синхронизиран с компилатора (incl. C.1 elision) +- [x] Поне един външен/temp проект build-ва с registry dep (`tools/smoke_registry.sh`) --- @@ -388,8 +388,116 @@ A (stdlib ergonomics) → B (compiler holes) → C (ownership depth) --- +## Сесия 24 (tooling — D.2 fmt --check + D.3 test --filter) + +1. **Bootstrap `bux fmt`** (`bootstrap/fmt.nim`): + - Indent-by-brace-depth formatter (parity with `src/fmt.bux`) + - `bux fmt [path...]` writes; `bux fmt --check` exits 1 if any file would change + - Collects single file or recursive `.bux` under directories +2. **Bootstrap `bux test --filter`**: + - `--filter ` / `--filter=` — only run `tests/*.bux` whose name contains `s` + - Summary table (`PASS` / `FAIL[:code]`) + `Results: N passed, M failed, T total` + - Exit `0` all pass, `1` failures or no match +3. **Selfhost parity** (`src/cli.bux`, `src/fmt.bux`): + - `Fmt_WouldChange` / `Fmt_CheckFile`; `Cli_Fmt(dir, checkOnly)` + - `Cli_Test(dir, filter)` with summary + skip count; filter skips Main package run +4. **CI hooks:** `make fmt-check` smoke (clean→0, dirty→1); full-tree enforce deferred + until a one-shot format pass on `lib/`/`examples/` +5. **Idempotence fix:** drop trailing split-empty so re-format is a no-op +6. Verified: unit suite + `./buxc test --filter first _test_runner` + selfhost `buxc2` + fmt/test parity + +--- + +## Сесия 25 (Ownership 2.0 — C.1 lifetime elision) + +1. **Elision rules** in `@[Checked]` (`bootstrap/sema.nim`): + - Each elided input `&`/`&mut` → distinct `#elidedN` + - One input lifetime → assigned to elided return + - First param `self`/`Self` preferred when multiple inputs + - Multiple inputs + elided return → `lifetime elision failed` (need `'a`) +2. **Return checks:** + - `cannot return reference to local variable` (`return &local` / let-bound local ref) + - `no input reference to borrow from` (return ref with zero input refs) + - Explicit `'a` mismatch between return and value +3. **Body check for lifetime-only generics** (`func F<'a>(...)`) — no longer skipped +4. **Diagnostics hints** for elision / dangling / mismatch +5. **Tests:** 8 new borrow_test cases; goldens `return_local_ref`, `elision_multi_input` +6. **Example:** `examples/lifetime_elision.bux` (Identity / explicit / ViaLet / self) +7. LanguageRef + QUALITY_PLAN updated +8. Verified: borrow_test 24/24, 9 error goldens, example runs + +## Сесия 26 (C.1 selfhost parity) + +1. **Lexer** (`src/lexer.bux` + `tkLifetime=111`): `'a` vs char `'x'` (same heuristic as bootstrap) +2. **Parser:** + - `&'a T` / `&'a mut T` → `TypeExpr.refLifetime` + - `func F<'a, T>(…)` — lifetime params accepted and **skipped** for mono slots +3. **Sema** lifetime elision (fixed 8-slot maps, same rules as bootstrap): + - single-input elision, `self` preference, multi-input fail + - return-local / no-input-ref / explicit mismatch + - let-bound ref lifetime propagation +4. Fixed `checkFunc` else-branch that wiped `checkedFunc` when retType was void +5. Verified: `buxc2 run lifetime_elision` PASS; goldens on buxc2 show same errors; + bootstrap still green; **selfhost-loop** expected IDENTICAL + +--- + +## Сесия 27 (tooling — D.4 bux doc + D.5 stdlib goldens) + +1. **D.5 Stdlib goldens** (`tests/stdlib_golden/`): + - Packages: `array`, `string`, `collections` (Map/Set/Result/Option) + - `run.sh` builds via `buxc run` and matches expected PASS lines + - `make test-stdlib` wired into `make test` +2. **D.4 `bux doc`**: + - Bootstrap: `bootstrap/docgen.nim` — `///` + adjacent `/* */` + - Selfhost: `Cli_Doc` line scanner for `///` + - `bux doc [--out file] [path]` (default path `lib/`) + - `make docs` → `docs/api/stdlib.md` +3. **Stdlib docs:** `///` on Array / String / Test public helpers +4. Verified: `make test-stdlib`, `./buxc doc lib/Array.bux | head`, selfhost build + +--- + +## Сесия 28 (LSP v0.4.0 — position-sensitive locals + inferred lets) + +1. **`LocalBinding`** with scope range (`scopeStartLine`…`scopeEndLine`) per let/param +2. **Sema-backed inference** (`checkExprForLsp` / `resolveType`): + - `let x = 42` → hover `let x: int` · inferred + - `let s: String = "…"` → annotated, not inferred + - params: `param a: int` visible for whole function +3. **Position-sensitive** hover / go-to-def / completion (innermost scope wins on shadowing) +4. Nested scopes: if/while/for/match/block arms +5. Version **bux-lsp 0.4.0**; tests: `tools/test_lsp_locals.nim`, `tools/smoke_lsp_hover.sh` +6. Verified: hover shows `let sum: int · inferred`, `param a: int`, `let n: int · inferred` + +--- + +## Сесия 29 (full-tree `bux fmt` + CI enforce) + +1. **One-shot format** of `lib/` (33), `examples/` (23), `src/` (15), `tests/` (8), `apps/` (12) +2. **Idempotent:** second `--check` → 0 would reformat on all trees +3. **CI:** `make fmt-check` enforces full tree + dirty-path smoke (exit 1) +4. **`make fmt`** helper to reformat the same roots +5. Verified: `test-stdlib`, key examples, **selfhost + selfhost-loop IDENTICAL ✓** + +--- + +## Сесия 30 (E.1 package registry + E.3 semver draft) + +1. **Registry index** (`config/registry.toml`, `$BUX_REGISTRY`, `~/.bux/registry.toml`) + - `[[package]]` with `name` / `version` / `source` / `description` + - `file:` / `path:` (relative to index) or git URL +2. **CLI:** `bux search [q]`, `bux add ` resolves registry, `bux install` locks path/git +3. **Demo package:** `registry/packages/greet` (`Greet_Hello`, `Greet_Version`) +4. **Smoke:** `tools/smoke_registry.sh` / `make test-registry` — temp app outside tree +5. **Semver policy:** `docs/SEMVER.md` (0.x vs 1.0, registry version match) +6. Packages.md updated + +--- + ## Следващи стъпки -1. C.1 Lifetime elision -2. Phase D tooling: `bux fmt` CI, `bux test --filter`, golden stdlib tests -3. LSP: position-sensitive locals; inferred `let` types +1. E.2 polish apps / E.5 benchmarks +2. HTTP-fetchable registry index URL (beyond local file) +3. LSP: workspace rename / references (optional) diff --git a/docs/SEMVER.md b/docs/SEMVER.md new file mode 100644 index 0000000..06a03d8 --- /dev/null +++ b/docs/SEMVER.md @@ -0,0 +1,76 @@ +# Bux Semantic Versioning Policy + +> Status: Draft for v0.x → v1.0 freeze (E.3) + +Bux follows [Semantic Versioning 2.0.0](https://semver.org/) with the +clarifications below. + +--- + +## Version numbers + +``` +MAJOR.MINOR.PATCH[-prerelease] +``` + +| Component | When it increases | +|-----------|-------------------| +| **MAJOR** | Breaking language / stdlib / CLI changes | +| **MINOR** | Backward-compatible features | +| **PATCH** | Backward-compatible bug fixes | + +During **0.x** (pre-1.0): + +- `0.MINOR.PATCH` — MINOR may still introduce breaking changes (documented in + the release notes and `MIGRATION_*.sh` when needed). +- Prefer deprecation warnings for at least one MINOR before removal when + practical. + +After **1.0.0** (language freeze): + +- Breaking changes require a MAJOR bump and a migration guide. +- The Language Reference is the normative spec; compiler bugs that contradict + the ref are fixed without a MAJOR bump. + +--- + +## What counts as “breaking” + +- Removing or renaming a public stdlib symbol +- Changing the type or semantics of a public API +- Changing CLI flags that scripts rely on (`build`, `test`, `fmt --check`, …) +- Changing `bux.toml` / `bux.lock` fields in an incompatible way +- Changing the fat `func` / tuple C ABI in a way that breaks linked code + +**Not breaking:** + +- New keywords that were previously valid identifiers only if reserved carefully + (prefer contextual keywords) +- New diagnostics / stricter `@[Checked]` (document; may be gated) +- Formatter whitespace-only changes + +--- + +## Package versions (registry) + +Registry packages use the same MAJOR.MINOR.PATCH scheme. + +`bux add foo` / `bux add foo 0.1` resolution: + +| Request | Matches | +|---------|---------| +| `*` / omitted | Latest entry for `foo` in the index | +| `0.1.1` | Exact version | +| `0.1` | First version with that prefix (e.g. `0.1.1`) | + +Lockfiles pin the **resolved** version and source path/URL. + +--- + +## Release checklist (maintainers) + +1. Update `docs/LanguageRef.md` if behaviour changed +2. Update `docs/QUALITY_PLAN.md` / changelog notes +3. Run `make test` (includes `fmt-check`, examples, goldens) +4. Run `make selfhost-loop` +5. Tag `vMAJOR.MINOR.PATCH` diff --git a/docs/api/stdlib.md b/docs/api/stdlib.md new file mode 100644 index 0000000..ab4b7f2 --- /dev/null +++ b/docs/api/stdlib.md @@ -0,0 +1,749 @@ +# API Reference + +Generated by `bux doc` from `///` and `/* */` documentation comments. + +## `Array` + +_Source: `lib/Array.bux`_ + +### `Array` _struct_ + +```bux +struct Array { +``` + +Growable contiguous buffer of `T` (len + capacity). + +### `Array_New` _func_ + +```bux +func Array_New(cap: uint) -> Array { +``` + +Create an empty array with the given initial capacity. + +### `Array_Push` _func_ + +```bux +func Array_Push(self: *Array, value: T) { +``` + +Append `value`, growing capacity if needed. + +### `Array_Get` _func_ + +```bux +func Array_Get(self: *Array, index: uint) -> T { +``` + +Element at `index` (bounds-checked unless `@[Release]`). + +### `Array_Set` _func_ + +```bux +func Array_Set(self: *Array, index: uint, value: T) { +``` + +Write `value` at `index` (bounds-checked unless `@[Release]`). + +### `Array_Len` _func_ + +```bux +func Array_Len(self: *Array) -> uint { +``` + +Number of live elements. + +### `Array_Free` _func_ + +```bux +func Array_Free(self: *Array) { +``` + +Free the backing buffer and reset length/capacity to zero. + +### `Array_Drop` _func_ + +```bux +func Array_Drop(self: *Array) { +``` + +Drop trait entry — same as `Array_Free`. + +### `Array_IsEmpty` _func_ + +```bux +func Array_IsEmpty(self: *Array) -> bool { +``` + +True if the array has no elements. + +### `Array_Cap` _func_ + +```bux +func Array_Cap(self: *Array) -> uint { +``` + +Current capacity (not length). + +### `Array_Clear` _func_ + +```bux +func Array_Clear(self: *Array) { +``` + +Drop length to zero; keeps allocated capacity. + +### `Array_Reserve` _func_ + +```bux +func Array_Reserve(self: *Array, minCap: uint) { +``` + +Ensure capacity is at least `minCap` (does not shrink). + +### `Array_First` _func_ + +```bux +func Array_First(self: *Array) -> T { +``` + +First element (bounds-checked if empty). + +### `Array_Last` _func_ + +```bux +func Array_Last(self: *Array) -> T { +``` + +Last element (bounds-checked if empty). + +### `Array_Pop` _func_ + +```bux +func Array_Pop(self: *Array) -> T { +``` + +Remove and return the last element (bounds-checked if empty). + +### `Array_Contains` _func_ + +```bux +func Array_Contains(self: *Array, value: T) -> bool { +``` + +Linear search: true if `value` is present (uses `==`). + +### `Array_IndexOf` _func_ + +```bux +func Array_IndexOf(self: *Array, value: T) -> int { +``` + +Index of first equal element, or `-1` if not found. + +### `Array_Extend` _func_ + +```bux +func Array_Extend(self: *Array, other: *Array) { +``` + +Append all elements of `other` onto `self`. + +## `Channel` + +_Source: `lib/Channel.bux`_ + +### `Channel_SendInt` _func_ + +```bux +func Channel_SendInt(ch: *Channel, value: int) { +``` + +Convenience wrappers for common types + +## `Iter` + +_Source: `lib/Iter.bux`_ + +### `Array_Iter` _func_ + +```bux +func Array_Iter(arr: *Array) -> Iter { +``` + +Create an iterator from an Array + +### `Iter_HasNext` _func_ + +```bux +func Iter_HasNext(it: *Iter) -> bool { +``` + +Check if there are more elements + +### `Iter_Next` _func_ + +```bux +func Iter_Next(it: *Iter) -> T { +``` + +Get the next element and advance (undefined if HasNext is false) + +### `Iter_Peek` _func_ + +```bux +func Iter_Peek(it: *Iter) -> T { +``` + +Peek current element without advancing (undefined if HasNext is false) + +### `Iter_Reset` _func_ + +```bux +func Iter_Reset(it: *Iter) { +``` + +Reset iterator to the beginning + +### `Iter_Pos` _func_ + +```bux +func Iter_Pos(it: *Iter) -> uint { +``` + +Current position + +### `Iter_Len` _func_ + +```bux +func Iter_Len(it: *Iter) -> uint { +``` + +Remaining length + +### `Iter_Count` _func_ + +```bux +func Iter_Count(it: *Iter) -> uint { +``` + +Count remaining elements + +### `Iter_Skip` _func_ + +```bux +func Iter_Skip(it: *Iter, n: uint) { +``` + +Skip N elements + +### `Iter_Take` _func_ + +```bux +func Iter_Take(it: *Iter, n: uint) -> Iter { +``` + +Take first N elements (by limiting len) + +### `Iter_AnyEq` _func_ + +```bux +func Iter_AnyEq(it: *Iter, value: T) -> bool { +``` + +True if any remaining element equals value + +### `Iter_AllEq` _func_ + +```bux +func Iter_AllEq(it: *Iter, value: T) -> bool { +``` + +True if every remaining element equals value (true if empty) + +### `Iter_Collect` _func_ + +```bux +func Iter_Collect(it: *Iter) -> Array { +``` + +Collect remaining elements into a new Array + +### `Iter_Map` _func_ + +```bux +func Iter_Map(it: *Iter, f: func(T) -> U) -> Array { +``` + +Map each remaining element through f: T → U, collect into Array + +### `Iter_Filter` _func_ + +```bux +func Iter_Filter(it: *Iter, pred: func(T) -> bool) -> Array { +``` + +Keep remaining elements for which pred returns true + +### `Iter_Fold` _func_ + +```bux +func Iter_Fold(it: *Iter, init: Acc, f: func(Acc, T) -> Acc) -> Acc { +``` + +Left-fold: f(f(...f(init, x0), x1), ...) + +### `Iter_ForEach` _func_ + +```bux +func Iter_ForEach(it: *Iter, f: func(T) -> int) { +``` + +Call f for each remaining element (return value of f is ignored) + +### `Iter_Any` _func_ + +```bux +func Iter_Any(it: *Iter, pred: func(T) -> bool) -> bool { +``` + +True if any remaining element satisfies pred + +### `Iter_All` _func_ + +```bux +func Iter_All(it: *Iter, pred: func(T) -> bool) -> bool { +``` + +True if all remaining elements satisfy pred (true if empty) + +### `Iter_SumInt` _func_ + +```bux +func Iter_SumInt(it: *Iter) -> int { +``` + +Sum remaining ints (specialized fold) + +## `Json` + +_Source: `lib/Json.bux`_ + +### `JsonValue` _struct_ + +```bux +struct JsonValue { +``` + +=== Core type === + +### `Json_Null` _func_ + +```bux +func Json_Null() -> JsonValue { +``` + +=== Constructors === + +### `Json_ArrayLen` _func_ + +```bux +func Json_ArrayLen(v: JsonValue) -> uint { +``` + +=== Array helpers === + +### `Json_ObjectLen` _func_ + +```bux +func Json_ObjectLen(v: JsonValue) -> uint { +``` + +=== Object helpers === + +### `Json_IsNull` _func_ + +```bux +func Json_IsNull(v: JsonValue) -> bool { +``` + +=== Accessors === + +### `JsonParser` _struct_ + +```bux +struct JsonParser { +``` + +=== Parser === + +### `Json_Parse` _func_ + +```bux +func Json_Parse(s: String) -> JsonValue { +``` + +=== Public parser === + +### `Json_StringifyImpl` _func_ + +```bux +func Json_StringifyImpl(sb: *StringBuilder, v: JsonValue) { +``` + +=== Serializer === + +## `Map` + +_Source: `lib/Map.bux`_ + +### `Map_Remove` _func_ + +```bux +func Map_Remove(m: *Map, key: K) -> bool { +``` + +Remove key if present. Rebuilds the table to keep open-addressing correct. + +## `Net` + +_Source: `lib/Net.bux`_ + +### `Net_Create` _func_ + +```bux +func Net_Create() -> int { +``` + +Create a TCP socket. Returns -1 on error. + +### `Net_SetReuse` _func_ + +```bux +func Net_SetReuse(fd: int) -> bool { +``` + +Enable SO_REUSEADDR on a socket. + +### `Net_Bind` _func_ + +```bux +func Net_Bind(fd: int, addr: String, port: int) -> bool { +``` + +Bind a socket to an address and port. + +### `Net_Listen` _func_ + +```bux +func Net_Listen(fd: int, backlog: int) -> bool { +``` + +Start listening for connections. + +### `Net_Accept` _func_ + +```bux +func Net_Accept(fd: int) -> int { +``` + +Accept a connection. Returns new fd or -1 on error. + +### `Net_Connect` _func_ + +```bux +func Net_Connect(fd: int, addr: String, port: int) -> bool { +``` + +Connect to a remote address and port. + +### `Net_Send` _func_ + +```bux +func Net_Send(fd: int, data: String) -> int { +``` + +Send data. Returns bytes sent or -1 on error. + +### `Net_Recv` _func_ + +```bux +func Net_Recv(fd: int, maxLen: int) -> String { +``` + +Receive up to maxLen bytes. Returns empty string on error/EOF. + +### `Net_Close` _func_ + +```bux +func Net_Close(fd: int) -> bool { +``` + +Close a socket. + +### `Net_LastError` _func_ + +```bux +func Net_LastError() -> String { +``` + +Get last socket error as a string. + +## `Option` + +_Source: `lib/Option.bux`_ + +### `Option_Expect` _func_ + +```bux +func Option_Expect(o: Option, msg: String) -> int { +``` + +Unwrap Some or panic with a custom message + +### `Option_Or` _func_ + +```bux +func Option_Or(o: Option, other: Option) -> Option { +``` + +If o is Some return it, otherwise return other + +## `Os` + +_Source: `lib/Os.bux`_ + +### `Os_Exit` _func_ + +```bux +func Os_Exit(code: int) { +``` + +Terminate the process with the given exit code + +## `Result` + +_Source: `lib/Result.bux`_ + +### `Result_Expect` _func_ + +```bux +func Result_Expect(r: Result, msg: String) -> int { +``` + +Unwrap Ok or panic with a custom message + +### `Result_UnwrapErr` _func_ + +```bux +func Result_UnwrapErr(r: Result) -> String { +``` + +Extract Err payload (panics if Ok) + +### `Result_Or` _func_ + +```bux +func Result_Or(r: Result, other: Result) -> Result { +``` + +If r is Ok return it, otherwise return other + +## `Set` + +_Source: `lib/Set.bux`_ + +### `Set_Remove` _func_ + +```bux +func Set_Remove(s: *Set, value: T) -> bool { +``` + +Remove value if present. Rebuilds the table to keep open-addressing correct. + +## `String` + +_Source: `lib/String.bux`_ + +### `String_Len` _func_ + +```bux +func String_Len(s: String) -> uint { +``` + +Byte length of a C string (`strlen`). + +### `String_IsEmpty` _func_ + +```bux +func String_IsEmpty(s: String) -> bool { +``` + +True if the string has zero length. + +### `String_IsNull` _func_ + +```bux +func String_IsNull(s: String) -> bool { +``` + +True if the pointer is null. + +### `String_Eq` _func_ + +```bux +func String_Eq(a: String, b: String) -> bool { +``` + +Lexicographic equality. + +### `String_Concat` _func_ + +```bux +func String_Concat(a: String, b: String) -> String { +``` + +Allocate and return `a` concatenated with `b`. + +### `String_Copy` _func_ + +```bux +func String_Copy(s: String) -> String { +``` + +Heap-copy of `s`. + +### `String_StartsWith` _func_ + +```bux +func String_StartsWith(s: String, prefix: String) -> bool { +``` + +True if `s` begins with `prefix`. + +### `String_EndsWith` _func_ + +```bux +func String_EndsWith(s: String, suffix: String) -> bool { +``` + +True if `s` ends with `suffix`. + +### `String_Contains` _func_ + +```bux +func String_Contains(s: String, substr: String) -> bool { +``` + +True if `substr` occurs anywhere in `s`. + +### `String_IsBlank` _func_ + +```bux +func String_IsBlank(s: String) -> bool { +``` + +True if empty or only whitespace (space, tab, CR, LF). + +### `String_Repeat` _func_ + +```bux +func String_Repeat(s: String, count: uint) -> String { +``` + +Repeat `s`, `count` times (`count == 0` → empty string). + +### `String_ReplaceAll` _func_ + +```bux +func String_ReplaceAll(s: String, old: String, new: String) -> String { +``` + +Replace every non-overlapping occurrence of `old` with `new`. +Empty `old` is a no-op (returns `s` unchanged). Safe if `new` contains `old`. + +## `Test` + +_Source: `lib/Test.bux`_ + +### `Test_Exit` _func_ + +```bux +func Test_Exit(code: int) { +``` + +Exit the process with `code` (for test runners). + +### `Test_Assert` _func_ + +```bux +func Test_Assert(cond: bool) { +``` + +Assert `cond` is true; abort on failure. + +### `Test_AssertEqInt` _func_ + +```bux +func Test_AssertEqInt(a: int, b: int) { +``` + +Assert two ints are equal; print both values and exit 1 on mismatch. + +### `Test_AssertNeqInt` _func_ + +```bux +func Test_AssertNeqInt(a: int, b: int) { +``` + +Assert two ints differ. + +### `Test_AssertEqString` _func_ + +```bux +func Test_AssertEqString(a: String, b: String) { +``` + +Assert two strings are equal (`String_Eq`). + +### `Test_AssertEqBool` _func_ + +```bux +func Test_AssertEqBool(a: bool, b: bool) { +``` + +Assert two bools are equal. + +### `Test_AssertTrue` _func_ + +```bux +func Test_AssertTrue(cond: bool) { +``` + +Assert `cond` is true. + +### `Test_AssertFalse` _func_ + +```bux +func Test_AssertFalse(cond: bool) { +``` + +Assert `cond` is false. + +### `Test_Fail` _func_ + +```bux +func Test_Fail(msg: String) { +``` + +Fail the test with a message and exit 1. + +### `Test_Pass` _func_ + +```bux +func Test_Pass(msg: String) { +``` + +Print a PASS line (for human-readable runners / goldens). + diff --git a/examples/algebraic_enums.bux b/examples/algebraic_enums.bux index ac0ac74..b86d032 100644 --- a/examples/algebraic_enums.bux +++ b/examples/algebraic_enums.bux @@ -10,20 +10,20 @@ enum Result { func Main() -> int { let r1: Result = Result { tag: Result_Ok }; r1.data.Ok_0 = 42; - + let r2: Result = Result { tag: Result_Err }; r2.data.Err_0 = "error message"; - + if r1.tag == Result_Ok { PrintLine("r1 is Ok:"); PrintInt(r1.data.Ok_0); PrintLine(""); } - + if r2.tag == Result_Err { PrintLine("r2 is Err:"); PrintLine(r2.data.Err_0); } - + return 0; } diff --git a/examples/borrow.bux b/examples/borrow.bux index 2b66204..d05d085 100644 --- a/examples/borrow.bux +++ b/examples/borrow.bux @@ -1,8 +1,8 @@ // borrow.bux — Test explicit borrow expressions struct Point { - x: int; - y: int; + x: int; + y: int; } // NOT @[Checked] — borrow keyword available everywhere diff --git a/examples/enums.bux b/examples/enums.bux index cd94316..86463f7 100644 --- a/examples/enums.bux +++ b/examples/enums.bux @@ -23,12 +23,12 @@ func ColorName(c: Color) -> String { func Main() -> int { let myColor: Color = Color::Green; - + PrintLine("My color is:"); PrintLine(ColorName(myColor)); PrintLine("Color value:"); PrintInt(myColor as int); PrintLine(""); - + return 0; } diff --git a/examples/extend_generic.bux b/examples/extend_generic.bux index 5a636ba..93f5fdc 100644 --- a/examples/extend_generic.bux +++ b/examples/extend_generic.bux @@ -27,4 +27,4 @@ func Main() -> int { PrintLine(""); return 0; -} \ No newline at end of file +} diff --git a/examples/factorial.bux b/examples/factorial.bux index 8da0045..4d19e88 100644 --- a/examples/factorial.bux +++ b/examples/factorial.bux @@ -11,13 +11,13 @@ func Factorial(n: int) -> int { func Main() -> int { PrintLine("Factorials:"); - + var i: int = 1; while i <= 10 { let fact: int = Factorial(i); PrintLine(Fmt_Fmt2("{0}! = {1}", String_FromInt(i), String_FromInt(fact))); i = i + 1; } - + return 0; } diff --git a/examples/fibonacci.bux b/examples/fibonacci.bux index 7b98826..b0677cc 100644 --- a/examples/fibonacci.bux +++ b/examples/fibonacci.bux @@ -11,13 +11,13 @@ func Fibonacci(n: int) -> int { func Main() -> int { PrintLine("Fibonacci sequence:"); - + var i: int = 0; while i < 10 { let fib: int = Fibonacci(i); PrintLine(Fmt_Fmt1("{0}", String_FromInt(fib))); i = i + 1; } - + return 0; } diff --git a/examples/generic_infer.bux b/examples/generic_infer.bux index 3a1dee0..b12b37e 100644 --- a/examples/generic_infer.bux +++ b/examples/generic_infer.bux @@ -13,14 +13,14 @@ func Main() -> int { // Inferred: T = int let m1: int = Max(10, 20); let m2: int = Max(5, 3); - + PrintLine("Max(10, 20) = "); PrintInt(m1); PrintLine(""); - + PrintLine("Max(5, 3) = "); PrintInt(m2); PrintLine(""); - + return 0; -} \ No newline at end of file +} diff --git a/examples/generic_infer2.bux b/examples/generic_infer2.bux index 272ae4c..2a02c14 100644 --- a/examples/generic_infer2.bux +++ b/examples/generic_infer2.bux @@ -20,4 +20,4 @@ func Main() -> int { PrintInt(p.GetFirst()); PrintLine(""); return 0; -} \ No newline at end of file +} diff --git a/examples/generics.bux b/examples/generics.bux index ae27518..5d6ec5c 100644 --- a/examples/generics.bux +++ b/examples/generics.bux @@ -13,14 +13,14 @@ func Max(a: T, b: T) -> T { func Main() -> int { let m1: int = Max(10, 20); let m2: int = Max(5, 3); - + PrintLine("Max(10, 20) = "); PrintInt(m1); PrintLine(""); - + PrintLine("Max(5, 3) = "); PrintInt(m2); PrintLine(""); - + return 0; } diff --git a/examples/generics_struct.bux b/examples/generics_struct.bux index c3bfddd..d982c95 100644 --- a/examples/generics_struct.bux +++ b/examples/generics_struct.bux @@ -31,21 +31,21 @@ func Main() -> int { PrintLine("Box value:"); PrintInt(b.Get()); PrintLine(""); - + b.Set(100); PrintLine("Box after Set(100):"); PrintInt(b.Get()); PrintLine(""); - + let p: Pair = Pair { first: 10, second: "hello" }; PrintLine("Pair first:"); PrintInt(p.GetFirst()); PrintLine(""); - + let bp: *Box = &b; PrintLine("Box via pointer:"); PrintInt(bp.Get()); PrintLine(""); - + return 0; } diff --git a/examples/json.bux b/examples/json.bux index 0f4760d..c791f02 100644 --- a/examples/json.bux +++ b/examples/json.bux @@ -5,20 +5,20 @@ import Std::Fmt::{Fmt_Fmt1, Fmt_FmtInt}; func Main() -> int { PrintLine("=== Json Demo ==="); - + let s: String = "{\"name\":\"Bux\",\"count\":42,\"items\":[\"a\",\"b\",\"c\"]}"; let j: JsonValue = Json_Parse(s); PrintLine("Parsed and stringified:"); PrintLine(Json_Stringify(j)); - + PrintLine("\nAccess fields:"); PrintLine(Fmt_Fmt1("name = {0}", Json_AsString(Json_ObjectGet(j, "name")))); PrintLine(Fmt_FmtInt("count = {0}", Json_AsNumber(Json_ObjectGet(j, "count")) as int64)); - + let items: JsonValue = Json_ObjectGet(j, "items"); PrintLine(Fmt_Fmt1("items[0] = {0}", Json_AsString(Json_ArrayGet(items, 0)))); PrintLine(Fmt_Fmt1("items[1] = {0}", Json_AsString(Json_ArrayGet(items, 1)))); - + PrintLine("\nBuild JSON programmatically:"); var obj: JsonValue = Json_Object(); Json_ObjectSet(&obj, "lang", Json_String("Bux")); @@ -28,6 +28,6 @@ func Main() -> int { Json_ArrayPush(&arr, Json_String("safe")); Json_ObjectSet(&obj, "tags", arr); PrintLine(Json_Stringify(obj)); - + return 0; } diff --git a/examples/jwt.bux b/examples/jwt.bux index a634f3c..d344aa4 100644 --- a/examples/jwt.bux +++ b/examples/jwt.bux @@ -29,30 +29,30 @@ func Jwt_Create(payload: JsonValue, secret: String) -> String { let header: JsonValue = Json_Object(); Json_ObjectSet(&header, "alg", Json_String("HS256")); Json_ObjectSet(&header, "typ", Json_String("JWT")); - + let headerB64: String = Base64UrlEncode(Json_Stringify(header)); let payloadB64: String = Base64UrlEncode(Json_Stringify(payload)); - + let signingInput: String = String_Concat(headerB64, "."); signingInput = String_Concat(signingInput, payloadB64); - + let sigRaw: String = Crypto_HmacSha256Raw(secret, signingInput); let sigB64: String = Base64UrlEncodeSig(sigRaw); - + return String_Concat(String_Concat(signingInput, "."), sigB64); } func Main() -> int { PrintLine("=== JWT Demo ==="); - + let payload: JsonValue = Json_Object(); Json_ObjectSet(&payload, "sub", Json_String("user123")); Json_ObjectSet(&payload, "name", Json_String("Bux Developer")); Json_ObjectSet(&payload, "admin", Json_Bool(true)); - + let token: String = Jwt_Create(payload, "my-secret-key"); PrintLine("Token:"); PrintLine(token); - + return 0; } diff --git a/examples/lifetime_elision.bux b/examples/lifetime_elision.bux new file mode 100644 index 0000000..34b12ab --- /dev/null +++ b/examples/lifetime_elision.bux @@ -0,0 +1,51 @@ +// lifetime_elision.bux — C.1: elided lifetimes for common &[Checked] APIs +// No 'a annotations needed when there is a single input reference. +import Std::Io::{PrintLine, PrintInt}; +import Std::Test::{Test_AssertEqInt, Test_Pass}; + +// Elided: param and return share one lifetime automatically +@[Checked] +func Identity(p: &int) -> &int { + return p; +} + +// Explicit lifetime for documentation / multi-ref (same lifetime both sides) +@[Checked] +func IdentityNamed<'a>(p: &'a int) -> &'a int { +return p; +} + +// Via intermediate let binding — lifetime is propagated +@[Checked] +func ViaLet(p: &int) -> &int { + let r: &int = p; + return r; +} + +// self-style first param: elision prefers the first input for the return +@[Checked] +func FirstOf(self: &int, _other: int) -> &int { + return self; +} + +@[Checked] +func Main() -> int { + var x: int = 10; + var y: int = 20; + + let a: &int = Identity(&x); + Test_AssertEqInt(*a, 10); + + let b: &int = IdentityNamed(&y); + Test_AssertEqInt(*b, 20); + + let c: &int = ViaLet(&x); + Test_AssertEqInt(*c, 10); + + let d: &int = FirstOf(&y, 0); + Test_AssertEqInt(*d, 20); + + Test_Pass("lifetime_elision"); + PrintLine("lifetime_elision: ok"); + return 0; +} diff --git a/examples/map.bux b/examples/map.bux index 2e13e9b..c4b499e 100644 --- a/examples/map.bux +++ b/examples/map.bux @@ -5,26 +5,26 @@ import Std::Map::{Map, Map_New, Map_Set, Map_Get, Map_Has, Map_Free}; func Main() -> int { PrintLine("=== Map ==="); let m: Map = Map_New(16); - + Map_Set(&m, 1, "one"); Map_Set(&m, 2, "two"); Map_Set(&m, 3, "three"); - + PrintLine("Get 1:"); PrintLine(Map_Get(&m, 1)); - + PrintLine("Get 2:"); PrintLine(Map_Get(&m, 2)); - + if Map_Has(&m, 1) { PrintLine("Has 1: yes"); } - + // Test update Map_Set(&m, 2, "updated"); PrintLine("Updated 2:"); PrintLine(Map_Get(&m, 2)); - + Map_Free(&m); return 0; -} \ No newline at end of file +} diff --git a/examples/methods.bux b/examples/methods.bux index 7efa8ca..fec084b 100644 --- a/examples/methods.bux +++ b/examples/methods.bux @@ -11,7 +11,7 @@ extend Rectangle { func Area(self: Rectangle) -> int { return self.width * self.height; } - + func Perimeter(self: Rectangle) -> int { return 2 * (self.width + self.height); } @@ -19,7 +19,7 @@ extend Rectangle { func Main() -> int { let rect: Rectangle = Rectangle { width: 10, height: 5 }; - + PrintLine("Rectangle:"); PrintLine("Width = "); PrintInt(rect.width); @@ -33,6 +33,6 @@ func Main() -> int { PrintLine("Perimeter = "); PrintInt(rect.Perimeter()); PrintLine(""); - + return 0; } diff --git a/examples/os_time.bux b/examples/os_time.bux index 4f08d78..d137d39 100644 --- a/examples/os_time.bux +++ b/examples/os_time.bux @@ -9,16 +9,16 @@ func Main() -> int { PrintLine(Fmt_Fmt1("Current directory: {0}", Os_GetCwd())); PrintLine(Fmt_FmtInt("Command-line args: {0}", Os_ArgsCount() as int64)); PrintLine(Fmt_Fmt1("HOME env: {0}", Os_GetEnv("HOME"))); - + PrintLine("\n=== Time Demo ==="); let start: int64 = Time_NowMs(); PrintLine(Fmt_FmtInt("Start: {0} ms", start)); PrintLine("Sleeping 150ms..."); Time_SleepMs(150); - + let end: int64 = Time_NowMs(); PrintLine(Fmt_FmtInt("End: {0} ms", end)); PrintLine(Fmt_FmtInt("Elapsed: {0} ms", end - start)); - + return 0; } diff --git a/examples/ownership.bux b/examples/ownership.bux index 050c13a..dc79376 100644 --- a/examples/ownership.bux +++ b/examples/ownership.bux @@ -23,17 +23,17 @@ func UncheckedSwap(a: *int, b: *int) { func Main() -> int { var x: int = 10; - + // &mut allows mutation ScaleInPlace(&x, 3); PrintInt(x); // 30 PrintLine(""); - + // & allows reading let y: int = GetValue(&x); PrintInt(y); // 30 PrintLine(""); - + // Unchecked: raw pointers work like C var a: int = 5; var b: int = 7; @@ -42,6 +42,6 @@ func Main() -> int { PrintLine(""); PrintInt(b); // 5 PrintLine(""); - + return 0; } diff --git a/examples/process.bux b/examples/process.bux index 5c655a3..1de61f1 100644 --- a/examples/process.bux +++ b/examples/process.bux @@ -5,12 +5,12 @@ import Std::Fmt::{Fmt_Fmt1, Fmt_FmtInt}; func Main() -> int { PrintLine("Process demo:"); - + let output: String = Process_Output("echo Hello from subprocess"); PrintLine(Fmt_Fmt1("Captured: {0}", output)); - + let rc: int = Process_Run("true"); PrintLine(Fmt_FmtInt("Exit code: {0}", rc)); - + return 0; } diff --git a/examples/result_option.bux b/examples/result_option.bux index 669fb96..c58108f 100644 --- a/examples/result_option.bux +++ b/examples/result_option.bux @@ -82,14 +82,14 @@ func SafeDivide(a: int, b: int) -> Option { func Main() -> int { PrintLine("Result demo:"); - + let r1: Result = Divide(10, 2); if Result_IsOk(r1) { PrintLine("10 / 2 = "); PrintInt(Result_Unwrap(r1)); PrintLine(""); } - + let r2: Result = Divide(10, 0); if Result_IsErr(r2) { PrintLine("10 / 0 failed"); @@ -97,20 +97,20 @@ func Main() -> int { PrintLine("unwrap_or = "); PrintInt(Result_UnwrapOr(r2, -1)); PrintLine(""); - + PrintLine("Option demo:"); - + let o1: Option = SafeDivide(20, 4); if Option_IsSome(o1) { PrintLine("20 / 4 = "); PrintInt(Option_UnwrapOr(o1, 0)); PrintLine(""); } - + let o2: Option = SafeDivide(20, 0); PrintLine("20 / 0 fallback = "); PrintInt(Option_UnwrapOr(o2, -1)); PrintLine(""); - + return 0; } diff --git a/examples/strings.bux b/examples/strings.bux index ccf85e9..e828751 100644 --- a/examples/strings.bux +++ b/examples/strings.bux @@ -5,30 +5,30 @@ import Std::String::{String_Len, String_Eq, String_Concat}; func Main() -> int { let hello: String = "Hello"; let world: String = "World"; - + PrintLine("String operations:"); - + // Length PrintLine("Length of 'Hello':"); PrintInt(String_Len(hello)); PrintLine(""); - + // Concatenation let greeting: String = String_Concat(hello, ", "); let greeting2: String = String_Concat(greeting, world); let full: String = String_Concat(greeting2, "!"); - + PrintLine("Concatenated:"); PrintLine(full); - + // Equality if String_Eq(hello, "Hello") { PrintLine("'Hello' equals 'Hello'"); } - + if !String_Eq(hello, world) { PrintLine("'Hello' does not equal 'World'"); } - + return 0; } diff --git a/examples/strings2.bux b/examples/strings2.bux index 2e1ea37..16c4e9b 100644 --- a/examples/strings2.bux +++ b/examples/strings2.bux @@ -65,10 +65,10 @@ func Main() -> int { StringBuilder_Append(&sb, "World"); StringBuilder_Append(&sb, "! #"); StringBuilder_AppendInt(&sb, 42); - + Print("StringBuilder: "); PrintLine(StringBuilder_Build(&sb)); StringBuilder_Free(&sb); return 0; -} \ No newline at end of file +} diff --git a/examples/structs.bux b/examples/structs.bux index d4da35b..20c69bd 100644 --- a/examples/structs.bux +++ b/examples/structs.bux @@ -16,7 +16,7 @@ func Main() -> int { let p1: Point = Point { x: 10, y: 20 }; let p2: Point = Point { x: 5, y: 15 }; let sum: Point = AddPoints(p1, p2); - + PrintLine("Point sum:"); PrintLine("x = "); PrintInt(sum.x); @@ -24,6 +24,6 @@ func Main() -> int { PrintLine("y = "); PrintInt(sum.y); PrintLine(""); - + return 0; } diff --git a/examples/try_operator.bux b/examples/try_operator.bux index c0eb968..968f9ea 100644 --- a/examples/try_operator.bux +++ b/examples/try_operator.bux @@ -39,7 +39,7 @@ func ComputeWithError() -> Result { func Main() -> int { PrintLine("Try operator demo:"); - + let r1: Result = Compute(); if r1.tag == Result_Ok { PrintLine("Compute() = "); @@ -48,11 +48,11 @@ func Main() -> int { } else { PrintLine("Compute() failed"); } - + let r2: Result = ComputeWithError(); if r2.tag == Result_Err { PrintLine("ComputeWithError() failed as expected"); } - + return 0; } diff --git a/lib/Array.bux b/lib/Array.bux index fd55ab1..f4cd117 100644 --- a/lib/Array.bux +++ b/lib/Array.bux @@ -1,135 +1,143 @@ module Std::Array { -extern func bux_alloc(size: uint) -> *void; -extern func bux_realloc(ptr: *void, size: uint) -> *void; -extern func bux_free(ptr: *void); -extern func bux_bounds_check(index: uint, len: uint); + extern func bux_alloc(size: uint) -> *void; + extern func bux_realloc(ptr: *void, size: uint) -> *void; + extern func bux_free(ptr: *void); + extern func bux_bounds_check(index: uint, len: uint); -struct Array { - data: *T, - len: uint, - cap: uint, -} + /// Growable contiguous buffer of `T` (len + capacity). + struct Array { + data: *T, + len: uint, + cap: uint, + } -func Array_New(cap: uint) -> Array { - let data = bux_alloc(cap * sizeof(T)) as *T; - return Array { data: data, len: 0, cap: cap }; -} + /// Create an empty array with the given initial capacity. + func Array_New(cap: uint) -> Array { + let data = bux_alloc(cap * sizeof(T)) as *T; + return Array { data: data, len: 0, cap: cap }; + } -func Array_Push(self: *Array, value: T) { - if self.len >= self.cap { - self.cap = self.cap * 2; + /// Append `value`, growing capacity if needed. + func Array_Push(self: *Array, value: T) { + if self.len >= self.cap { + self.cap = self.cap * 2; + self.data = bux_realloc(self.data as *void, self.cap * sizeof(T)) as *T; + } + self.data[self.len] = value; + self.len = self.len + 1; + } + + /// Element at `index` (bounds-checked unless `@[Release]`). + func Array_Get(self: *Array, index: uint) -> T { + bux_bounds_check(index, self.len); + return self.data[index]; + } + + /// Write `value` at `index` (bounds-checked unless `@[Release]`). + func Array_Set(self: *Array, index: uint, value: T) { + bux_bounds_check(index, self.len); + self.data[index] = value; + } + + /// Number of live elements. + func Array_Len(self: *Array) -> uint { + return self.len; + } + + /// Free the backing buffer and reset length/capacity to zero. + func Array_Free(self: *Array) { + bux_free(self.data as *void); + self.data = null as *T; + self.len = 0; + self.cap = 0; + } + + /// Drop trait entry — same as `Array_Free`. + func Array_Drop(self: *Array) { + Array_Free(self); + } + + func Array_operator_index_get(self: *Array, idx: uint) -> T { + return Array_Get(self, idx); + } + + func Array_operator_index_set(self: *Array, idx: uint, value: T) { + Array_Set(self, idx, value); + } + + /// True if the array has no elements. + func Array_IsEmpty(self: *Array) -> bool { + return self.len == 0; + } + + /// Current capacity (not length). + func Array_Cap(self: *Array) -> uint { + return self.cap; + } + + /// Drop length to zero; keeps allocated capacity. + func Array_Clear(self: *Array) { + self.len = 0; + } + + /// Ensure capacity is at least `minCap` (does not shrink). + func Array_Reserve(self: *Array, minCap: uint) { + if minCap <= self.cap { + return; + } + self.cap = minCap; self.data = bux_realloc(self.data as *void, self.cap * sizeof(T)) as *T; } - self.data[self.len] = value; - self.len = self.len + 1; -} -func Array_Get(self: *Array, index: uint) -> T { - bux_bounds_check(index, self.len); - return self.data[index]; -} - -func Array_Set(self: *Array, index: uint, value: T) { - bux_bounds_check(index, self.len); - self.data[index] = value; -} - -func Array_Len(self: *Array) -> uint { - return self.len; -} - -func Array_Free(self: *Array) { - bux_free(self.data as *void); - self.data = null as *T; - self.len = 0; - self.cap = 0; -} - -func Array_Drop(self: *Array) { - Array_Free(self); -} - -func Array_operator_index_get(self: *Array, idx: uint) -> T { - return Array_Get(self, idx); -} - -func Array_operator_index_set(self: *Array, idx: uint, value: T) { - Array_Set(self, idx, value); -} - -/* True if the array has no elements */ -func Array_IsEmpty(self: *Array) -> bool { - return self.len == 0; -} - -/* Current capacity (not length) */ -func Array_Cap(self: *Array) -> uint { - return self.cap; -} - -/* Drop length to zero; keeps allocated capacity */ -func Array_Clear(self: *Array) { - self.len = 0; -} - -/* Ensure capacity is at least minCap (does not shrink) */ -func Array_Reserve(self: *Array, minCap: uint) { - if minCap <= self.cap { - return; + /// First element (bounds-checked if empty). + func Array_First(self: *Array) -> T { + return Array_Get(self, 0); } - self.cap = minCap; - self.data = bux_realloc(self.data as *void, self.cap * sizeof(T)) as *T; -} -/* First element (panics if empty via bounds check) */ -func Array_First(self: *Array) -> T { - return Array_Get(self, 0); -} + /// Last element (bounds-checked if empty). + func Array_Last(self: *Array) -> T { + return Array_Get(self, self.len - 1); + } -/* Last element (panics if empty via bounds check) */ -func Array_Last(self: *Array) -> T { - return Array_Get(self, self.len - 1); -} + /// Remove and return the last element (bounds-checked if empty). + func Array_Pop(self: *Array) -> T { + bux_bounds_check(0, self.len); + self.len = self.len - 1; + return self.data[self.len]; + } -/* Remove and return the last element (panics if empty) */ -func Array_Pop(self: *Array) -> T { - bux_bounds_check(0, self.len); - self.len = self.len - 1; - return self.data[self.len]; -} - -/* Linear search: true if value is present (uses ==) */ -func Array_Contains(self: *Array, value: T) -> bool { - var i: uint = 0; - while i < self.len { - if self.data[i] == value { - return true; + /// Linear search: true if `value` is present (uses `==`). + func Array_Contains(self: *Array, value: T) -> bool { + var i: uint = 0; + while i < self.len { + if self.data[i] == value { + return true; + } + i = i + 1; } - i = i + 1; + return false; } - return false; -} -/* Index of first equal element, or -1 if not found */ -func Array_IndexOf(self: *Array, value: T) -> int { - var i: uint = 0; - while i < self.len { - if self.data[i] == value { - return i as int; + /// Index of first equal element, or `-1` if not found. + func Array_IndexOf(self: *Array, value: T) -> int { + var i: uint = 0; + while i < self.len { + if self.data[i] == value { + return i as int; + } + i = i + 1; } - i = i + 1; + return -1; } - return -1; -} -/* Append all elements of other onto self */ -func Array_Extend(self: *Array, other: *Array) { - var i: uint = 0; - while i < other.len { - Array_Push(self, other.data[i]); - i = i + 1; + /// Append all elements of `other` onto `self`. + func Array_Extend(self: *Array, other: *Array) { + var i: uint = 0; + while i < other.len { + Array_Push(self, other.data[i]); + i = i + 1; + } } -} } diff --git a/lib/Channel.bux b/lib/Channel.bux index 1ccbd3f..85fa352 100644 --- a/lib/Channel.bux +++ b/lib/Channel.bux @@ -1,64 +1,64 @@ module Std::Channel { -extern func bux_channel_new(capacity: int64, elem_size: int64) -> *void; -extern func bux_channel_send(handle: *void, elem: *void); -extern func bux_channel_recv(handle: *void, out: *void) -> int; -extern func bux_channel_close(handle: *void); -extern func bux_channel_free(handle: *void); + extern func bux_channel_new(capacity: int64, elem_size: int64) -> *void; + extern func bux_channel_send(handle: *void, elem: *void); + extern func bux_channel_recv(handle: *void, out: *void) -> int; + extern func bux_channel_close(handle: *void); + extern func bux_channel_free(handle: *void); -struct Channel { - handle: *void; -} + struct Channel { + handle: *void; + } -func Channel_New(capacity: int64) -> Channel { - return Channel { handle: bux_channel_new(capacity, sizeof(T)) }; -} + func Channel_New(capacity: int64) -> Channel { + return Channel { handle: bux_channel_new(capacity, sizeof(T)) }; + } -func Channel_Send(ch: *Channel, value: T) { - bux_channel_send(ch.handle, (&value) as *void); -} + func Channel_Send(ch: *Channel, value: T) { + bux_channel_send(ch.handle, (&value) as *void); + } -func Channel_Recv(ch: *Channel) -> T { - var result: T; - bux_channel_recv(ch.handle, (&result) as *void); - return result; -} + func Channel_Recv(ch: *Channel) -> T { + var result: T; + bux_channel_recv(ch.handle, (&result) as *void); + return result; + } -func Channel_Recv_Ok(ch: *Channel, out: *T) -> bool { - return bux_channel_recv(ch.handle, out as *void) != 0; -} + func Channel_Recv_Ok(ch: *Channel, out: *T) -> bool { + return bux_channel_recv(ch.handle, out as *void) != 0; + } -func Channel_Close(ch: *Channel) { - bux_channel_close(ch.handle); -} + func Channel_Close(ch: *Channel) { + bux_channel_close(ch.handle); + } -func Channel_Free(ch: *Channel) { - bux_channel_free(ch.handle); -} + func Channel_Free(ch: *Channel) { + bux_channel_free(ch.handle); + } -func Channel_Drop(ch: *Channel) { - Channel_Free(ch); -} + func Channel_Drop(ch: *Channel) { + Channel_Free(ch); + } -/* Convenience wrappers for common types */ -func Channel_SendInt(ch: *Channel, value: int) { - bux_channel_send(ch.handle, (&value) as *void); -} + /* Convenience wrappers for common types */ + func Channel_SendInt(ch: *Channel, value: int) { + bux_channel_send(ch.handle, (&value) as *void); + } -func Channel_RecvInt(ch: *Channel) -> int { - var result: int = 0; - bux_channel_recv(ch.handle, (&result) as *void); - return result; -} + func Channel_RecvInt(ch: *Channel) -> int { + var result: int = 0; + bux_channel_recv(ch.handle, (&result) as *void); + return result; + } -func Channel_SendFloat64(ch: *Channel, value: float64) { - bux_channel_send(ch.handle, (&value) as *void); -} + func Channel_SendFloat64(ch: *Channel, value: float64) { + bux_channel_send(ch.handle, (&value) as *void); + } -func Channel_RecvFloat64(ch: *Channel) -> float64 { - var result: float64 = 0.0; - bux_channel_recv(ch.handle, (&result) as *void); - return result; -} + func Channel_RecvFloat64(ch: *Channel) -> float64 { + var result: float64 = 0.0; + bux_channel_recv(ch.handle, (&result) as *void); + return result; + } } diff --git a/lib/Crypto.bux b/lib/Crypto.bux index f3235be..1590313 100644 --- a/lib/Crypto.bux +++ b/lib/Crypto.bux @@ -10,72 +10,72 @@ // ============================================================================= module Std::Crypto { -import Std::Mem::{Alloc, Free}; -import Std::String::{String_Len}; + import Std::Mem::{Alloc, Free}; + import Std::String::{String_Len}; -// Re-use the same externs from submodules (merged by compiler) -extern func bux_sha256(data: String, len: int, out: *void); -extern func bux_hmac_sha256(key: String, keylen: int, msg: String, msglen: int, out: *void); -extern func bux_random_bytes(buf: *void, len: int) -> int; -extern func bux_base64_encode(data: String, len: int) -> String; -extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; -extern func bux_bytes_to_hex(data: *void, len: int) -> String; + // Re-use the same externs from submodules (merged by compiler) + extern func bux_sha256(data: String, len: int, out: *void); + extern func bux_hmac_sha256(key: String, keylen: int, msg: String, msglen: int, out: *void); + extern func bux_random_bytes(buf: *void, len: int) -> int; + extern func bux_base64_encode(data: String, len: int) -> String; + extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; + extern func bux_bytes_to_hex(data: *void, len: int) -> String; -// --- Legacy function names (delegate to new submodule functions) --- + // --- Legacy function names (delegate to new submodule functions) --- -// SHA-256 → hex -func Crypto_Sha256(data: String) -> String { - let len: int = String_Len(data) as int; - let hashBuf: *void = Alloc(32); - bux_sha256(data, len, hashBuf); - let result: String = bux_bytes_to_hex(hashBuf as *void, 32); - Free(hashBuf); - return result; -} - -// HMAC-SHA256 → hex -func Crypto_HmacSha256(key: String, message: String) -> String { - let keylen: int = String_Len(key) as int; - let msglen: int = String_Len(message) as int; - let hmacBuf: *void = Alloc(32); - bux_hmac_sha256(key, keylen, message, msglen, hmacBuf); - let result: String = bux_bytes_to_hex(hmacBuf as *void, 32); - Free(hmacBuf); - return result; -} - -// Random bytes → base64 -func Crypto_RandomBytes(n: int) -> String { - if n <= 0 { return ""; } - let buf: *void = Alloc(n as uint); - if bux_random_bytes(buf, n) != 1 { - Free(buf); - return ""; + // SHA-256 → hex + func Crypto_Sha256(data: String) -> String { + let len: int = String_Len(data) as int; + let hashBuf: *void = Alloc(32); + bux_sha256(data, len, hashBuf); + let result: String = bux_bytes_to_hex(hashBuf as *void, 32); + Free(hashBuf); + return result; } - let result: String = bux_base64_encode(buf as String, n); - Free(buf); - return result; -} -// Base64 encode -func Crypto_Base64Encode(s: String) -> String { - return bux_base64_encode(s, String_Len(s) as int); -} + // HMAC-SHA256 → hex + func Crypto_HmacSha256(key: String, message: String) -> String { + let keylen: int = String_Len(key) as int; + let msglen: int = String_Len(message) as int; + let hmacBuf: *void = Alloc(32); + bux_hmac_sha256(key, keylen, message, msglen, hmacBuf); + let result: String = bux_bytes_to_hex(hmacBuf as *void, 32); + Free(hmacBuf); + return result; + } -// HMAC-SHA256 raw → base64 -func Crypto_HmacSha256Raw(key: String, message: String) -> String { - let keylen: int = String_Len(key) as int; - let msglen: int = String_Len(message) as int; - let hmacBuf: *void = Alloc(32); - bux_hmac_sha256(key, keylen, message, msglen, hmacBuf); - let result: String = bux_base64_encode(hmacBuf as String, 32); - Free(hmacBuf); - return result; -} + // Random bytes → base64 + func Crypto_RandomBytes(n: int) -> String { + if n <= 0 { return ""; } + let buf: *void = Alloc(n as uint); + if bux_random_bytes(buf, n) != 1 { + Free(buf); + return ""; + } + let result: String = bux_base64_encode(buf as String, n); + Free(buf); + return result; + } -// Base64 decode -func Crypto_Base64Decode(s: String) -> String { - let outlen: int = 0; - return bux_base64_decode(s, String_Len(s) as int, &outlen); -} + // Base64 encode + func Crypto_Base64Encode(s: String) -> String { + return bux_base64_encode(s, String_Len(s) as int); + } + + // HMAC-SHA256 raw → base64 + func Crypto_HmacSha256Raw(key: String, message: String) -> String { + let keylen: int = String_Len(key) as int; + let msglen: int = String_Len(message) as int; + let hmacBuf: *void = Alloc(32); + bux_hmac_sha256(key, keylen, message, msglen, hmacBuf); + let result: String = bux_base64_encode(hmacBuf as String, 32); + Free(hmacBuf); + return result; + } + + // Base64 decode + func Crypto_Base64Decode(s: String) -> String { + let outlen: int = 0; + return bux_base64_decode(s, String_Len(s) as int, &outlen); + } } diff --git a/lib/Fmt.bux b/lib/Fmt.bux index aec3e49..3eb144f 100644 --- a/lib/Fmt.bux +++ b/lib/Fmt.bux @@ -8,93 +8,93 @@ module Std::Fmt { -import Std::String::{ - String_Eq, - String_FromInt, - String_FromFloat, - String_FromBool, - StringBuilder, - StringBuilder_New, - StringBuilder_Append, - StringBuilder_Build, - String_Chars -}; + import Std::String::{ + String_Eq, + String_FromInt, + String_FromFloat, + String_FromBool, + StringBuilder, + StringBuilder_New, + StringBuilder_Append, + StringBuilder_Build, + String_Chars + }; -extern func bux_strlen(s: String) -> uint; -extern func bux_str_to_int(s: String) -> int64; -extern func bux_alloc(size: uint) -> *void; + extern func bux_strlen(s: String) -> uint; + extern func bux_str_to_int(s: String) -> int64; + extern func bux_alloc(size: uint) -> *void; -// Core formatting engine: replace {0}..{9} in template with args -func Fmt_Format(tmpl: String, argStrs: *String, argCount: int) -> String { - let sb: StringBuilder = StringBuilder_New(); - var i: uint = 0; - let tmplLen: uint = bux_strlen(tmpl); - while i < tmplLen { - // Check for { - let ch: String = String_Chars(tmpl, i); - if String_Eq(ch, "{") { - let digitIdx: uint = i + 1; - if digitIdx < tmplLen { - let digitCh: String = String_Chars(tmpl, digitIdx); - let d: int64 = bux_str_to_int(digitCh); - if d >= 0 && d < argCount as int64 { - // Consume {d} - i = i + 2; // skip past digit - // Check for closing } - if i < tmplLen { - let closeCh: String = String_Chars(tmpl, i); - if String_Eq(closeCh, "}") { - i = i + 1; // skip } - let argStr: String = argStrs[d as uint]; - StringBuilder_Append(&sb, argStr); - continue; + // Core formatting engine: replace {0}..{9} in template with args + func Fmt_Format(tmpl: String, argStrs: *String, argCount: int) -> String { + let sb: StringBuilder = StringBuilder_New(); + var i: uint = 0; + let tmplLen: uint = bux_strlen(tmpl); + while i < tmplLen { + // Check for { + let ch: String = String_Chars(tmpl, i); + if String_Eq(ch, "{") { + let digitIdx: uint = i + 1; + if digitIdx < tmplLen { + let digitCh: String = String_Chars(tmpl, digitIdx); + let d: int64 = bux_str_to_int(digitCh); + if d >= 0 && d < argCount as int64 { + // Consume {d} + i = i + 2; // skip past digit + // Check for closing } + if i < tmplLen { + let closeCh: String = String_Chars(tmpl, i); + if String_Eq(closeCh, "}") { + i = i + 1; // skip } + let argStr: String = argStrs[d as uint]; + StringBuilder_Append(&sb, argStr); + continue; + } } } } } + // Normal character: append it + StringBuilder_Append(&sb, ch); + i = i + 1; } - // Normal character: append it - StringBuilder_Append(&sb, ch); - i = i + 1; + return StringBuilder_Build(&sb); } - return StringBuilder_Build(&sb); -} -// Convenience wrappers -func Fmt_Fmt1(tmpl: String, a1: String) -> String { - var args: *String = bux_alloc(sizeof(String)) as *String; - args[0] = a1; - return Fmt_Format(tmpl, args, 1); -} + // Convenience wrappers + func Fmt_Fmt1(tmpl: String, a1: String) -> String { + var args: *String = bux_alloc(sizeof(String)) as *String; + args[0] = a1; + return Fmt_Format(tmpl, args, 1); + } -func Fmt_FmtInt(tmpl: String, val: int64) -> String { - let s: String = String_FromInt(val); - return Fmt_Fmt1(tmpl, s); -} + func Fmt_FmtInt(tmpl: String, val: int64) -> String { + let s: String = String_FromInt(val); + return Fmt_Fmt1(tmpl, s); + } -func Fmt_FmtBool(tmpl: String, val: bool) -> String { - let s: String = String_FromBool(val); - return Fmt_Fmt1(tmpl, s); -} + func Fmt_FmtBool(tmpl: String, val: bool) -> String { + let s: String = String_FromBool(val); + return Fmt_Fmt1(tmpl, s); + } -func Fmt_FmtFloat(tmpl: String, val: float64) -> String { - let s: String = String_FromFloat(val); - return Fmt_Fmt1(tmpl, s); -} + func Fmt_FmtFloat(tmpl: String, val: float64) -> String { + let s: String = String_FromFloat(val); + return Fmt_Fmt1(tmpl, s); + } -func Fmt_Fmt2(tmpl: String, a1: String, a2: String) -> String { - var args: *String = bux_alloc(2 * sizeof(String)) as *String; - args[0] = a1; - args[1] = a2; - return Fmt_Format(tmpl, args, 2); -} + func Fmt_Fmt2(tmpl: String, a1: String, a2: String) -> String { + var args: *String = bux_alloc(2 * sizeof(String)) as *String; + args[0] = a1; + args[1] = a2; + return Fmt_Format(tmpl, args, 2); + } -func Fmt_Fmt3(tmpl: String, a1: String, a2: String, a3: String) -> String { - var args: *String = bux_alloc(3 * sizeof(String)) as *String; - args[0] = a1; - args[1] = a2; - args[2] = a3; - return Fmt_Format(tmpl, args, 3); -} + func Fmt_Fmt3(tmpl: String, a1: String, a2: String, a3: String) -> String { + var args: *String = bux_alloc(3 * sizeof(String)) as *String; + args[0] = a1; + args[1] = a2; + args[2] = a3; + return Fmt_Format(tmpl, args, 3); + } } diff --git a/lib/Fs.bux b/lib/Fs.bux index 75e25c4..68caf33 100644 --- a/lib/Fs.bux +++ b/lib/Fs.bux @@ -1,19 +1,19 @@ module Std::Fs { -extern func bux_dir_exists(path: String) -> int; -extern func bux_mkdir_if_needed(path: String) -> int; -extern func bux_list_dir(dir: String, ext: String, out_count: *int) -> *String; + extern func bux_dir_exists(path: String) -> int; + extern func bux_mkdir_if_needed(path: String) -> int; + extern func bux_list_dir(dir: String, ext: String, out_count: *int) -> *String; -func DirExists(path: String) -> bool { - return bux_dir_exists(path) != 0; -} + func DirExists(path: String) -> bool { + return bux_dir_exists(path) != 0; + } -func Mkdir(path: String) -> bool { - return bux_mkdir_if_needed(path) != 0; -} + func Mkdir(path: String) -> bool { + return bux_mkdir_if_needed(path) != 0; + } -func ListDir(dir: String, ext: String, count: *int) -> *String { - return bux_list_dir(dir, ext, count); -} + func ListDir(dir: String, ext: String, count: *int) -> *String { + return bux_list_dir(dir, ext, count); + } } diff --git a/lib/Io.bux b/lib/Io.bux index 58a38a9..dfb3e52 100644 --- a/lib/Io.bux +++ b/lib/Io.bux @@ -1,28 +1,28 @@ module Std::Io { -extern func PrintLine(s: String); -extern func Print(s: String); -extern func PrintInt(n: int); -extern func PrintInt64(n: int64); -extern func PrintFloat(f: float64); -extern func PrintBool(b: bool); -extern func ReadLine() -> String; -extern func bux_read_file(path: String) -> String; -extern func bux_write_file(path: String, content: String) -> int; -extern func bux_file_exists(path: String) -> int; + extern func PrintLine(s: String); + extern func Print(s: String); + extern func PrintInt(n: int); + extern func PrintInt64(n: int64); + extern func PrintFloat(f: float64); + extern func PrintBool(b: bool); + extern func ReadLine() -> String; + extern func bux_read_file(path: String) -> String; + extern func bux_write_file(path: String, content: String) -> int; + extern func bux_file_exists(path: String) -> int; -func ReadFile(path: String) -> String { - return bux_read_file(path); -} + func ReadFile(path: String) -> String { + return bux_read_file(path); + } -func WriteFile(path: String, content: String) -> bool { - let r: int = bux_write_file(path, content); - return r != 0; -} + func WriteFile(path: String, content: String) -> bool { + let r: int = bux_write_file(path, content); + return r != 0; + } -func FileExists(path: String) -> bool { - let r: int = bux_file_exists(path); - return r != 0; -} + func FileExists(path: String) -> bool { + let r: int = bux_file_exists(path); + return r != 0; + } } diff --git a/lib/Iter.bux b/lib/Iter.bux index 6e2b3fd..6537b22 100644 --- a/lib/Iter.bux +++ b/lib/Iter.bux @@ -1,233 +1,233 @@ module Std::Iter { -import Std::Array::*; + import Std::Array::*; -struct Iter { - data: *T, - len: uint, - pos: uint, -} - -/* Create an iterator from an Array */ -func Array_Iter(arr: *Array) -> Iter { - return Iter { data: arr.data, len: arr.len, pos: 0 }; -} - -/* Check if there are more elements */ -func Iter_HasNext(it: *Iter) -> bool { - return it.pos < it.len; -} - -/* Get the next element and advance (undefined if HasNext is false) */ -func Iter_Next(it: *Iter) -> T { - let val: T = it.data[it.pos]; - it.pos = it.pos + 1; - return val; -} - -/* Peek current element without advancing (undefined if HasNext is false) */ -func Iter_Peek(it: *Iter) -> T { - return it.data[it.pos]; -} - -/* Reset iterator to the beginning */ -func Iter_Reset(it: *Iter) { - it.pos = 0; -} - -/* Current position */ -func Iter_Pos(it: *Iter) -> uint { - return it.pos; -} - -/* Remaining length */ -func Iter_Len(it: *Iter) -> uint { - return it.len; -} - -/* Count remaining elements */ -func Iter_Count(it: *Iter) -> uint { - return it.len - it.pos; -} - -/* Skip N elements */ -func Iter_Skip(it: *Iter, n: uint) { - it.pos = it.pos + n; - if it.pos > it.len { - it.pos = it.len; + struct Iter { + data: *T, + len: uint, + pos: uint, } -} -/* Take first N elements (by limiting len) */ -func Iter_Take(it: *Iter, n: uint) -> Iter { - var endPos: uint = it.pos + n; - if endPos > it.len { - endPos = it.len; + /* Create an iterator from an Array */ + func Array_Iter(arr: *Array) -> Iter { + return Iter { data: arr.data, len: arr.len, pos: 0 }; } - return Iter { data: it.data, len: endPos, pos: it.pos }; -} -/* True if any remaining element equals value */ -func Iter_AnyEq(it: *Iter, value: T) -> bool { - var i: uint = it.pos; - while i < it.len { - if it.data[i] == value { - return true; + /* Check if there are more elements */ + func Iter_HasNext(it: *Iter) -> bool { + return it.pos < it.len; + } + + /* Get the next element and advance (undefined if HasNext is false) */ + func Iter_Next(it: *Iter) -> T { + let val: T = it.data[it.pos]; + it.pos = it.pos + 1; + return val; + } + + /* Peek current element without advancing (undefined if HasNext is false) */ + func Iter_Peek(it: *Iter) -> T { + return it.data[it.pos]; + } + + /* Reset iterator to the beginning */ + func Iter_Reset(it: *Iter) { + it.pos = 0; + } + + /* Current position */ + func Iter_Pos(it: *Iter) -> uint { + return it.pos; + } + + /* Remaining length */ + func Iter_Len(it: *Iter) -> uint { + return it.len; + } + + /* Count remaining elements */ + func Iter_Count(it: *Iter) -> uint { + return it.len - it.pos; + } + + /* Skip N elements */ + func Iter_Skip(it: *Iter, n: uint) { + it.pos = it.pos + n; + if it.pos > it.len { + it.pos = it.len; } - i = i + 1; } - return false; -} -/* True if every remaining element equals value (true if empty) */ -func Iter_AllEq(it: *Iter, value: T) -> bool { - var i: uint = it.pos; - while i < it.len { - if it.data[i] != value { - return false; + /* Take first N elements (by limiting len) */ + func Iter_Take(it: *Iter, n: uint) -> Iter { + var endPos: uint = it.pos + n; + if endPos > it.len { + endPos = it.len; } - i = i + 1; + return Iter { data: it.data, len: endPos, pos: it.pos }; } - return true; -} -/* Collect remaining elements into a new Array */ -func Iter_Collect(it: *Iter) -> Array { - let remaining: uint = it.len - it.pos; - var cap: uint = remaining; - if cap == 0 { - cap = 1; - } - var arr: Array = Array_New(cap); - var i: uint = it.pos; - while i < it.len { - Array_Push(&arr, it.data[i]); - i = i + 1; - } - return arr; -} - -// --------------------------------------------------------------------------- -// Higher-order helpers (generic; fat func pointers / closures) -// --------------------------------------------------------------------------- - -/* Map each remaining element through f: T → U, collect into Array */ -func Iter_Map(it: *Iter, f: func(T) -> U) -> Array { - let remaining: uint = it.len - it.pos; - var cap: uint = remaining; - if cap == 0 { - cap = 1; - } - var out: Array = Array_New(cap); - var i: uint = it.pos; - while i < it.len { - let mapped: U = f(it.data[i]); - Array_Push(&out, mapped); - i = i + 1; - } - return out; -} - -/* Keep remaining elements for which pred returns true */ -func Iter_Filter(it: *Iter, pred: func(T) -> bool) -> Array { - let remaining: uint = it.len - it.pos; - var cap: uint = remaining; - if cap == 0 { - cap = 1; - } - var out: Array = Array_New(cap); - var i: uint = it.pos; - while i < it.len { - let v: T = it.data[i]; - if pred(v) { - Array_Push(&out, v); + /* True if any remaining element equals value */ + func Iter_AnyEq(it: *Iter, value: T) -> bool { + var i: uint = it.pos; + while i < it.len { + if it.data[i] == value { + return true; + } + i = i + 1; } - i = i + 1; + return false; } - return out; -} -/* Left-fold: f(f(...f(init, x0), x1), ...) */ -func Iter_Fold(it: *Iter, init: Acc, f: func(Acc, T) -> Acc) -> Acc { - var acc: Acc = init; - var i: uint = it.pos; - while i < it.len { - acc = f(acc, it.data[i]); - i = i + 1; - } - return acc; -} - -/* Call f for each remaining element (return value of f is ignored) */ -func Iter_ForEach(it: *Iter, f: func(T) -> int) { - var i: uint = it.pos; - while i < it.len { - let _ignored: int = f(it.data[i]); - i = i + 1; - } -} - -/* True if any remaining element satisfies pred */ -func Iter_Any(it: *Iter, pred: func(T) -> bool) -> bool { - var i: uint = it.pos; - while i < it.len { - if pred(it.data[i]) { - return true; + /* True if every remaining element equals value (true if empty) */ + func Iter_AllEq(it: *Iter, value: T) -> bool { + var i: uint = it.pos; + while i < it.len { + if it.data[i] != value { + return false; + } + i = i + 1; } - i = i + 1; + return true; } - return false; -} -/* True if all remaining elements satisfy pred (true if empty) */ -func Iter_All(it: *Iter, pred: func(T) -> bool) -> bool { - var i: uint = it.pos; - while i < it.len { - if !pred(it.data[i]) { - return false; + /* Collect remaining elements into a new Array */ + func Iter_Collect(it: *Iter) -> Array { + let remaining: uint = it.len - it.pos; + var cap: uint = remaining; + if cap == 0 { + cap = 1; } - i = i + 1; + var arr: Array = Array_New(cap); + var i: uint = it.pos; + while i < it.len { + Array_Push(&arr, it.data[i]); + i = i + 1; + } + return arr; } - return true; -} -/* Sum remaining ints (specialized fold) */ -func Iter_SumInt(it: *Iter) -> int { - var total: int = 0; - var i: uint = it.pos; - while i < it.len { - total = total + it.data[i]; - i = i + 1; + // --------------------------------------------------------------------------- + // Higher-order helpers (generic; fat func pointers / closures) + // --------------------------------------------------------------------------- + + /* Map each remaining element through f: T → U, collect into Array */ + func Iter_Map(it: *Iter, f: func(T) -> U) -> Array { + let remaining: uint = it.len - it.pos; + var cap: uint = remaining; + if cap == 0 { + cap = 1; + } + var out: Array = Array_New(cap); + var i: uint = it.pos; + while i < it.len { + let mapped: U = f(it.data[i]); + Array_Push(&out, mapped); + i = i + 1; + } + return out; } - return total; -} -// --------------------------------------------------------------------------- -// Int-specialized aliases (backward compatible with earlier examples) -// --------------------------------------------------------------------------- + /* Keep remaining elements for which pred returns true */ + func Iter_Filter(it: *Iter, pred: func(T) -> bool) -> Array { + let remaining: uint = it.len - it.pos; + var cap: uint = remaining; + if cap == 0 { + cap = 1; + } + var out: Array = Array_New(cap); + var i: uint = it.pos; + while i < it.len { + let v: T = it.data[i]; + if pred(v) { + Array_Push(&out, v); + } + i = i + 1; + } + return out; + } -func Iter_MapInt(it: *Iter, f: func(int) -> int) -> Array { - return Iter_Map(it, f); -} + /* Left-fold: f(f(...f(init, x0), x1), ...) */ + func Iter_Fold(it: *Iter, init: Acc, f: func(Acc, T) -> Acc) -> Acc { + var acc: Acc = init; + var i: uint = it.pos; + while i < it.len { + acc = f(acc, it.data[i]); + i = i + 1; + } + return acc; + } -func Iter_FilterInt(it: *Iter, pred: func(int) -> bool) -> Array { - return Iter_Filter(it, pred); -} + /* Call f for each remaining element (return value of f is ignored) */ + func Iter_ForEach(it: *Iter, f: func(T) -> int) { + var i: uint = it.pos; + while i < it.len { + let _ignored: int = f(it.data[i]); + i = i + 1; + } + } -func Iter_FoldInt(it: *Iter, init: int, f: func(int, int) -> int) -> int { - return Iter_Fold(it, init, f); -} + /* True if any remaining element satisfies pred */ + func Iter_Any(it: *Iter, pred: func(T) -> bool) -> bool { + var i: uint = it.pos; + while i < it.len { + if pred(it.data[i]) { + return true; + } + i = i + 1; + } + return false; + } -func Iter_ForEachInt(it: *Iter, f: func(int) -> int) { - Iter_ForEach(it, f); -} + /* True if all remaining elements satisfy pred (true if empty) */ + func Iter_All(it: *Iter, pred: func(T) -> bool) -> bool { + var i: uint = it.pos; + while i < it.len { + if !pred(it.data[i]) { + return false; + } + i = i + 1; + } + return true; + } -func Iter_AnyInt(it: *Iter, pred: func(int) -> bool) -> bool { - return Iter_Any(it, pred); -} + /* Sum remaining ints (specialized fold) */ + func Iter_SumInt(it: *Iter) -> int { + var total: int = 0; + var i: uint = it.pos; + while i < it.len { + total = total + it.data[i]; + i = i + 1; + } + return total; + } -func Iter_AllInt(it: *Iter, pred: func(int) -> bool) -> bool { - return Iter_All(it, pred); -} + // --------------------------------------------------------------------------- + // Int-specialized aliases (backward compatible with earlier examples) + // --------------------------------------------------------------------------- + + func Iter_MapInt(it: *Iter, f: func(int) -> int) -> Array { + return Iter_Map(it, f); + } + + func Iter_FilterInt(it: *Iter, pred: func(int) -> bool) -> Array { + return Iter_Filter(it, pred); + } + + func Iter_FoldInt(it: *Iter, init: int, f: func(int, int) -> int) -> int { + return Iter_Fold(it, init, f); + } + + func Iter_ForEachInt(it: *Iter, f: func(int) -> int) { + Iter_ForEach(it, f); + } + + func Iter_AnyInt(it: *Iter, pred: func(int) -> bool) -> bool { + return Iter_Any(it, pred); + } + + func Iter_AllInt(it: *Iter, pred: func(int) -> bool) -> bool { + return Iter_All(it, pred); + } } diff --git a/lib/Json.bux b/lib/Json.bux index e0ecd68..24b870f 100644 --- a/lib/Json.bux +++ b/lib/Json.bux @@ -1,297 +1,287 @@ module Std::Json { -import Std::Mem::{Alloc, Realloc, Free}; -import Std::String; + import Std::Mem::{Alloc, Realloc, Free}; + import Std::String; -/* === Tags === */ -const JsonTagNull: int = 0; -const JsonTagBool: int = 1; -const JsonTagNumber: int = 2; -const JsonTagString: int = 3; -const JsonTagArray: int = 4; -const JsonTagObject: int = 5; + /* === Tags === */ + const JsonTagNull: int = 0; + const JsonTagBool: int = 1; + const JsonTagNumber: int = 2; + const JsonTagString: int = 3; + const JsonTagArray: int = 4; + const JsonTagObject: int = 5; -/* === Core type === */ -struct JsonValue { - tag: int, - boolVal: bool, - numVal: float64, - strVal: String, - arrData: *JsonValue, - arrLen: uint, - arrCap: uint, - objKeys: *String, - objValues: *JsonValue, - objLen: uint, - objCap: uint -} + /* === Core type === */ + struct JsonValue { + tag: int, + boolVal: bool, + numVal: float64, + strVal: String, + arrData: *JsonValue, + arrLen: uint, + arrCap: uint, + objKeys: *String, + objValues: *JsonValue, + objLen: uint, + objCap: uint + } -/* === Constructors === */ -func Json_Null() -> JsonValue { - return JsonValue { - tag: JsonTagNull, boolVal: false, numVal: 0.0, strVal: "", - arrData: null, arrLen: 0, arrCap: 0, - objKeys: null, objValues: null, objLen: 0, objCap: 0 - }; -} + /* === Constructors === */ + func Json_Null() -> JsonValue { + return JsonValue { + tag: JsonTagNull, boolVal: false, numVal: 0.0, strVal: "", + arrData: null, arrLen: 0, arrCap: 0, + objKeys: null, objValues: null, objLen: 0, objCap: 0 + }; + } -func Json_Bool(b: bool) -> JsonValue { - return JsonValue { - tag: JsonTagBool, boolVal: b, numVal: 0.0, strVal: "", - arrData: null, arrLen: 0, arrCap: 0, - objKeys: null, objValues: null, objLen: 0, objCap: 0 - }; -} + func Json_Bool(b: bool) -> JsonValue { + return JsonValue { + tag: JsonTagBool, boolVal: b, numVal: 0.0, strVal: "", + arrData: null, arrLen: 0, arrCap: 0, + objKeys: null, objValues: null, objLen: 0, objCap: 0 + }; + } -func Json_Number(n: float64) -> JsonValue { - return JsonValue { - tag: JsonTagNumber, boolVal: false, numVal: n, strVal: "", - arrData: null, arrLen: 0, arrCap: 0, - objKeys: null, objValues: null, objLen: 0, objCap: 0 - }; -} + func Json_Number(n: float64) -> JsonValue { + return JsonValue { + tag: JsonTagNumber, boolVal: false, numVal: n, strVal: "", + arrData: null, arrLen: 0, arrCap: 0, + objKeys: null, objValues: null, objLen: 0, objCap: 0 + }; + } -func Json_String(s: String) -> JsonValue { - return JsonValue { - tag: JsonTagString, boolVal: false, numVal: 0.0, strVal: s, - arrData: null, arrLen: 0, arrCap: 0, - objKeys: null, objValues: null, objLen: 0, objCap: 0 - }; -} + func Json_String(s: String) -> JsonValue { + return JsonValue { + tag: JsonTagString, boolVal: false, numVal: 0.0, strVal: s, + arrData: null, arrLen: 0, arrCap: 0, + objKeys: null, objValues: null, objLen: 0, objCap: 0 + }; + } -func Json_Array() -> JsonValue { - return JsonValue { - tag: JsonTagArray, boolVal: false, numVal: 0.0, strVal: "", - arrData: null, arrLen: 0, arrCap: 0, - objKeys: null, objValues: null, objLen: 0, objCap: 0 - }; -} + func Json_Array() -> JsonValue { + return JsonValue { + tag: JsonTagArray, boolVal: false, numVal: 0.0, strVal: "", + arrData: null, arrLen: 0, arrCap: 0, + objKeys: null, objValues: null, objLen: 0, objCap: 0 + }; + } -func Json_Object() -> JsonValue { - return JsonValue { - tag: JsonTagObject, boolVal: false, numVal: 0.0, strVal: "", - arrData: null, arrLen: 0, arrCap: 0, - objKeys: null, objValues: null, objLen: 0, objCap: 0 - }; -} + func Json_Object() -> JsonValue { + return JsonValue { + tag: JsonTagObject, boolVal: false, numVal: 0.0, strVal: "", + arrData: null, arrLen: 0, arrCap: 0, + objKeys: null, objValues: null, objLen: 0, objCap: 0 + }; + } -/* === Array helpers === */ -func Json_ArrayLen(v: JsonValue) -> uint { - if v.tag != JsonTagArray { return 0; } - return v.arrLen; -} + /* === Array helpers === */ + func Json_ArrayLen(v: JsonValue) -> uint { + if v.tag != JsonTagArray { return 0; } + return v.arrLen; + } -func Json_ArrayGet(v: JsonValue, index: uint) -> JsonValue { - if v.tag != JsonTagArray { return Json_Null(); } - if index >= v.arrLen { return Json_Null(); } - return v.arrData[index]; -} + func Json_ArrayGet(v: JsonValue, index: uint) -> JsonValue { + if v.tag != JsonTagArray { return Json_Null(); } + if index >= v.arrLen { return Json_Null(); } + return v.arrData[index]; + } -func Json_ArrayPush(self: *JsonValue, val: JsonValue) { - if self.tag != JsonTagArray { return; } - if self.arrLen >= self.arrCap { - let arrNewCap: uint = self.arrCap; - if arrNewCap == 0 { - self.arrCap = 4; - self.arrData = Alloc(4 * sizeof(JsonValue)) as *JsonValue; - } else { - let doubleCap: uint = arrNewCap * 2; - self.arrCap = doubleCap; - self.arrData = Realloc(self.arrData as *void, doubleCap * sizeof(JsonValue)) as *JsonValue; + func Json_ArrayPush(self: *JsonValue, val: JsonValue) { + if self.tag != JsonTagArray { return; } + if self.arrLen >= self.arrCap { + let arrNewCap: uint = self.arrCap; + if arrNewCap == 0 { + self.arrCap = 4; + self.arrData = Alloc(4 * sizeof(JsonValue)) as *JsonValue; + } else { + let doubleCap: uint = arrNewCap * 2; + self.arrCap = doubleCap; + self.arrData = Realloc(self.arrData as *void, doubleCap * sizeof(JsonValue)) as *JsonValue; + } } + self.arrData[self.arrLen] = val; + self.arrLen = self.arrLen + 1; } - self.arrData[self.arrLen] = val; - self.arrLen = self.arrLen + 1; -} -/* === Object helpers === */ -func Json_ObjectLen(v: JsonValue) -> uint { - if v.tag != JsonTagObject { return 0; } - return v.objLen; -} + /* === Object helpers === */ + func Json_ObjectLen(v: JsonValue) -> uint { + if v.tag != JsonTagObject { return 0; } + return v.objLen; + } -func Json_ObjectGet(v: JsonValue, key: String) -> JsonValue { - if v.tag != JsonTagObject { return Json_Null(); } - var i: uint = 0; - while i < v.objLen { - if String_Eq(v.objKeys[i], key) { - return v.objValues[i]; + func Json_ObjectGet(v: JsonValue, key: String) -> JsonValue { + if v.tag != JsonTagObject { return Json_Null(); } + var i: uint = 0; + while i < v.objLen { + if String_Eq(v.objKeys[i], key) { + return v.objValues[i]; + } + i = i + 1; } - i = i + 1; + return Json_Null(); } - return Json_Null(); -} -func Json_ObjectHas(v: JsonValue, key: String) -> bool { - if v.tag != JsonTagObject { return false; } - var i: uint = 0; - while i < v.objLen { - if String_Eq(v.objKeys[i], key) { - return true; + func Json_ObjectHas(v: JsonValue, key: String) -> bool { + if v.tag != JsonTagObject { return false; } + var i: uint = 0; + while i < v.objLen { + if String_Eq(v.objKeys[i], key) { + return true; + } + i = i + 1; } - i = i + 1; + return false; } - return false; -} -func Json_ObjectSet(self: *JsonValue, key: String, val: JsonValue) { - if self.tag != JsonTagObject { return; } - var i: uint = 0; - while i < self.objLen { - if String_Eq(self.objKeys[i], key) { - self.objValues[i] = val; - return; + func Json_ObjectSet(self: *JsonValue, key: String, val: JsonValue) { + if self.tag != JsonTagObject { return; } + var i: uint = 0; + while i < self.objLen { + if String_Eq(self.objKeys[i], key) { + self.objValues[i] = val; + return; + } + i = i + 1; } - i = i + 1; - } - if self.objLen >= self.objCap { - let objNewCap: uint = self.objCap; - if objNewCap == 0 { - self.objCap = 4; - self.objKeys = Alloc(4 * sizeof(String)) as *String; - self.objValues = Alloc(4 * sizeof(JsonValue)) as *JsonValue; - } else { - let doubleCap: uint = objNewCap * 2; - self.objCap = doubleCap; - self.objKeys = Realloc(self.objKeys as *void, doubleCap * sizeof(String)) as *String; - self.objValues = Realloc(self.objValues as *void, doubleCap * sizeof(JsonValue)) as *JsonValue; + if self.objLen >= self.objCap { + let objNewCap: uint = self.objCap; + if objNewCap == 0 { + self.objCap = 4; + self.objKeys = Alloc(4 * sizeof(String)) as *String; + self.objValues = Alloc(4 * sizeof(JsonValue)) as *JsonValue; + } else { + let doubleCap: uint = objNewCap * 2; + self.objCap = doubleCap; + self.objKeys = Realloc(self.objKeys as *void, doubleCap * sizeof(String)) as *String; + self.objValues = Realloc(self.objValues as *void, doubleCap * sizeof(JsonValue)) as *JsonValue; + } } + self.objKeys[self.objLen] = key; + self.objValues[self.objLen] = val; + self.objLen = self.objLen + 1; } - self.objKeys[self.objLen] = key; - self.objValues[self.objLen] = val; - self.objLen = self.objLen + 1; -} -/* === Accessors === */ -func Json_IsNull(v: JsonValue) -> bool { - return v.tag == JsonTagNull; -} - -func Json_AsBool(v: JsonValue) -> bool { - if v.tag == JsonTagBool { return v.boolVal; } - return false; -} - -func Json_AsNumber(v: JsonValue) -> float64 { - if v.tag == JsonTagNumber { return v.numVal; } - return 0.0; -} - -func Json_AsString(v: JsonValue) -> String { - if v.tag == JsonTagString { return v.strVal; } - return ""; -} - -/* === Parser === */ -struct JsonParser { - src: String, - pos: uint, - len: uint, - error: String -} - -func JsonParser_Peek(p: *JsonParser) -> int { - if p.pos >= p.len { return 0; } - return p.src[p.pos] as int; -} - -func JsonParser_Advance(p: *JsonParser) { - if p.pos < p.len { - p.pos = p.pos + 1; + /* === Accessors === */ + func Json_IsNull(v: JsonValue) -> bool { + return v.tag == JsonTagNull; } -} -func JsonParser_SkipWhitespace(p: *JsonParser) { - while true { - let c: int = JsonParser_Peek(p); - if c == 32 || c == 9 || c == 10 || c == 13 { - JsonParser_Advance(p); - } else { - return; - } + func Json_AsBool(v: JsonValue) -> bool { + if v.tag == JsonTagBool { return v.boolVal; } + return false; } -} -func JsonParser_Match(p: *JsonParser, expected: String) -> bool { - let elen: uint = String_Len(expected); - if p.pos + elen > p.len { return false; } - var i: uint = 0; - while i < elen { - if p.src[p.pos + i] != expected[i] { - return false; - } - i = i + 1; + func Json_AsNumber(v: JsonValue) -> float64 { + if v.tag == JsonTagNumber { return v.numVal; } + return 0.0; } - p.pos = p.pos + elen; - return true; -} -func JsonParser_ParseValue(p: *JsonParser) -> JsonValue; - -func JsonParser_ParseString(p: *JsonParser) -> String { - if JsonParser_Peek(p) != 34 { - p.error = "Expected string"; + func Json_AsString(v: JsonValue) -> String { + if v.tag == JsonTagString { return v.strVal; } return ""; } - JsonParser_Advance(p); - let sb: StringBuilder = StringBuilder_New(); - while true { - let c: int = JsonParser_Peek(p); - if c == 0 || c == 34 { - break; - } - if c == 92 { - JsonParser_Advance(p); - let esc: int = JsonParser_Peek(p); - if esc == 0 { - p.error = "Unterminated string escape"; - StringBuilder_Free(&sb); - return ""; - } - if esc == 110 { StringBuilder_AppendChar(&sb, 10 as char8); } // \n - else if esc == 116 { StringBuilder_AppendChar(&sb, 9 as char8); } // \t - else if esc == 114 { StringBuilder_AppendChar(&sb, 13 as char8); } // \r - else if esc == 98 { StringBuilder_AppendChar(&sb, 8 as char8); } // \b - else if esc == 102 { StringBuilder_AppendChar(&sb, 12 as char8); } // \f - else if esc == 34 { StringBuilder_AppendChar(&sb, 34 as char8); } // \" - else if esc == 92 { StringBuilder_AppendChar(&sb, 92 as char8); } // \\ - else { - // Unknown escape — keep literal - StringBuilder_AppendChar(&sb, 92 as char8); - StringBuilder_AppendChar(&sb, esc as char8); - } - JsonParser_Advance(p); - } else { - StringBuilder_AppendChar(&sb, c as char8); - JsonParser_Advance(p); + + /* === Parser === */ + struct JsonParser { + src: String, + pos: uint, + len: uint, + error: String + } + + func JsonParser_Peek(p: *JsonParser) -> int { + if p.pos >= p.len { return 0; } + return p.src[p.pos] as int; + } + + func JsonParser_Advance(p: *JsonParser) { + if p.pos < p.len { + p.pos = p.pos + 1; } } - if JsonParser_Peek(p) != 34 { - p.error = "Unterminated string"; + + func JsonParser_SkipWhitespace(p: *JsonParser) { + while true { + let c: int = JsonParser_Peek(p); + if c == 32 || c == 9 || c == 10 || c == 13 { + JsonParser_Advance(p); + } else { + return; + } + } + } + + func JsonParser_Match(p: *JsonParser, expected: String) -> bool { + let elen: uint = String_Len(expected); + if p.pos + elen > p.len { return false; } + var i: uint = 0; + while i < elen { + if p.src[p.pos + i] != expected[i] { + return false; + } + i = i + 1; + } + p.pos = p.pos + elen; + return true; + } + + func JsonParser_ParseValue(p: *JsonParser) -> JsonValue; + + func JsonParser_ParseString(p: *JsonParser) -> String { + if JsonParser_Peek(p) != 34 { + p.error = "Expected string"; + return ""; + } + JsonParser_Advance(p); + let sb: StringBuilder = StringBuilder_New(); + while true { + let c: int = JsonParser_Peek(p); + if c == 0 || c == 34 { + break; + } + if c == 92 { + JsonParser_Advance(p); + let esc: int = JsonParser_Peek(p); + if esc == 0 { + p.error = "Unterminated string escape"; + StringBuilder_Free(&sb); + return ""; + } + if esc == 110 { StringBuilder_AppendChar(&sb, 10 as char8); } // \n + else if esc == 116 { StringBuilder_AppendChar(&sb, 9 as char8); } // \t + else if esc == 114 { StringBuilder_AppendChar(&sb, 13 as char8); } // \r + else if esc == 98 { StringBuilder_AppendChar(&sb, 8 as char8); } // \b + else if esc == 102 { StringBuilder_AppendChar(&sb, 12 as char8); } // \f + else if esc == 34 { StringBuilder_AppendChar(&sb, 34 as char8); } // \" + else if esc == 92 { StringBuilder_AppendChar(&sb, 92 as char8); } // \\ + else { + // Unknown escape — keep literal + StringBuilder_AppendChar(&sb, 92 as char8); + StringBuilder_AppendChar(&sb, esc as char8); + } + JsonParser_Advance(p); + } else { + StringBuilder_AppendChar(&sb, c as char8); + JsonParser_Advance(p); + } + } + if JsonParser_Peek(p) != 34 { + p.error = "Unterminated string"; + StringBuilder_Free(&sb); + return ""; + } + JsonParser_Advance(p); + let result: String = StringBuilder_Build(&sb); StringBuilder_Free(&sb); - return ""; + return result; } - JsonParser_Advance(p); - let result: String = StringBuilder_Build(&sb); - StringBuilder_Free(&sb); - return result; -} -func JsonParser_ParseNumber(p: *JsonParser) -> JsonValue { - let start: uint = p.pos; - let c0: int = JsonParser_Peek(p); - if c0 == 45 { - JsonParser_Advance(p); - } - while true { - let c: int = JsonParser_Peek(p); - if c >= 48 && c <= 57 { + func JsonParser_ParseNumber(p: *JsonParser) -> JsonValue { + let start: uint = p.pos; + let c0: int = JsonParser_Peek(p); + if c0 == 45 { JsonParser_Advance(p); - } else { - break; } - } - if JsonParser_Peek(p) == 46 { - JsonParser_Advance(p); while true { let c: int = JsonParser_Peek(p); if c >= 48 && c <= 57 { @@ -300,193 +290,203 @@ func JsonParser_ParseNumber(p: *JsonParser) -> JsonValue { break; } } + if JsonParser_Peek(p) == 46 { + JsonParser_Advance(p); + while true { + let c: int = JsonParser_Peek(p); + if c >= 48 && c <= 57 { + JsonParser_Advance(p); + } else { + break; + } + } + } + let numStr: String = String_Slice(p.src, start, p.pos - start); + let n: float64 = String_ToFloat(numStr); + return Json_Number(n); } - let numStr: String = String_Slice(p.src, start, p.pos - start); - let n: float64 = String_ToFloat(numStr); - return Json_Number(n); -} -func JsonParser_ParseArray(p: *JsonParser) -> JsonValue { - JsonParser_Advance(p); - var arr: JsonValue = Json_Array(); - JsonParser_SkipWhitespace(p); - if JsonParser_Peek(p) == 93 { + func JsonParser_ParseArray(p: *JsonParser) -> JsonValue { JsonParser_Advance(p); - return arr; - } - while true { + var arr: JsonValue = Json_Array(); JsonParser_SkipWhitespace(p); - let val: JsonValue = JsonParser_ParseValue(p); - if p.error != "" { return Json_Null(); } - Json_ArrayPush(&arr, val); - JsonParser_SkipWhitespace(p); - let c: int = JsonParser_Peek(p); - if c == 93 { + if JsonParser_Peek(p) == 93 { JsonParser_Advance(p); return arr; } - if c == 44 { - JsonParser_Advance(p); - } else { - p.error = "Expected ',' or ']' in array"; - return Json_Null(); + while true { + JsonParser_SkipWhitespace(p); + let val: JsonValue = JsonParser_ParseValue(p); + if p.error != "" { return Json_Null(); } + Json_ArrayPush(&arr, val); + JsonParser_SkipWhitespace(p); + let c: int = JsonParser_Peek(p); + if c == 93 { + JsonParser_Advance(p); + return arr; + } + if c == 44 { + JsonParser_Advance(p); + } else { + p.error = "Expected ',' or ']' in array"; + return Json_Null(); + } } } -} -func JsonParser_ParseObject(p: *JsonParser) -> JsonValue { - JsonParser_Advance(p); - var obj: JsonValue = Json_Object(); - JsonParser_SkipWhitespace(p); - if JsonParser_Peek(p) == 125 { + func JsonParser_ParseObject(p: *JsonParser) -> JsonValue { JsonParser_Advance(p); - return obj; - } - while true { + var obj: JsonValue = Json_Object(); JsonParser_SkipWhitespace(p); - let key: String = JsonParser_ParseString(p); - if p.error != "" { return Json_Null(); } - JsonParser_SkipWhitespace(p); - if JsonParser_Peek(p) != 58 { - p.error = "Expected ':' after object key"; - return Json_Null(); - } - JsonParser_Advance(p); - JsonParser_SkipWhitespace(p); - let val: JsonValue = JsonParser_ParseValue(p); - if p.error != "" { return Json_Null(); } - Json_ObjectSet(&obj, key, val); - JsonParser_SkipWhitespace(p); - let c: int = JsonParser_Peek(p); - if c == 125 { + if JsonParser_Peek(p) == 125 { JsonParser_Advance(p); return obj; } - if c == 44 { + while true { + JsonParser_SkipWhitespace(p); + let key: String = JsonParser_ParseString(p); + if p.error != "" { return Json_Null(); } + JsonParser_SkipWhitespace(p); + if JsonParser_Peek(p) != 58 { + p.error = "Expected ':' after object key"; + return Json_Null(); + } JsonParser_Advance(p); - } else { - p.error = "Expected ',' or '}' in object"; + JsonParser_SkipWhitespace(p); + let val: JsonValue = JsonParser_ParseValue(p); + if p.error != "" { return Json_Null(); } + Json_ObjectSet(&obj, key, val); + JsonParser_SkipWhitespace(p); + let c: int = JsonParser_Peek(p); + if c == 125 { + JsonParser_Advance(p); + return obj; + } + if c == 44 { + JsonParser_Advance(p); + } else { + p.error = "Expected ',' or '}' in object"; + return Json_Null(); + } + } + } + + func JsonParser_ParseValue(p: *JsonParser) -> JsonValue { + JsonParser_SkipWhitespace(p); + let c: int = JsonParser_Peek(p); + if c == 0 { + p.error = "Unexpected end of input"; return Json_Null(); } - } -} - -func JsonParser_ParseValue(p: *JsonParser) -> JsonValue { - JsonParser_SkipWhitespace(p); - let c: int = JsonParser_Peek(p); - if c == 0 { - p.error = "Unexpected end of input"; - return Json_Null(); - } - if c == 34 { - return Json_String(JsonParser_ParseString(p)); - } - if c == 123 { - return JsonParser_ParseObject(p); - } - if c == 91 { - return JsonParser_ParseArray(p); - } - if c == 116 { - if JsonParser_Match(p, "true") { - return Json_Bool(true); + if c == 34 { + return Json_String(JsonParser_ParseString(p)); } - p.error = "Expected 'true'"; - return Json_Null(); - } - if c == 102 { - if JsonParser_Match(p, "false") { - return Json_Bool(false); + if c == 123 { + return JsonParser_ParseObject(p); } - p.error = "Expected 'false'"; - return Json_Null(); - } - if c == 110 { - if JsonParser_Match(p, "null") { + if c == 91 { + return JsonParser_ParseArray(p); + } + if c == 116 { + if JsonParser_Match(p, "true") { + return Json_Bool(true); + } + p.error = "Expected 'true'"; return Json_Null(); } - p.error = "Expected 'null'"; + if c == 102 { + if JsonParser_Match(p, "false") { + return Json_Bool(false); + } + p.error = "Expected 'false'"; + return Json_Null(); + } + if c == 110 { + if JsonParser_Match(p, "null") { + return Json_Null(); + } + p.error = "Expected 'null'"; + return Json_Null(); + } + if (c >= 48 && c <= 57) || c == 45 { + return JsonParser_ParseNumber(p); + } + p.error = "Unexpected character"; return Json_Null(); } - if (c >= 48 && c <= 57) || c == 45 { - return JsonParser_ParseNumber(p); - } - p.error = "Unexpected character"; - return Json_Null(); -} -/* === Public parser === */ -func Json_Parse(s: String) -> JsonValue { - var p: JsonParser = JsonParser { src: s, pos: 0, len: String_Len(s), error: "" }; - let result: JsonValue = JsonParser_ParseValue(&p); - JsonParser_SkipWhitespace(&p); - if p.error == "" && p.pos != p.len { - p.error = "Trailing data after JSON value"; - return Json_Null(); - } - return result; -} - -/* === Serializer === */ -func Json_StringifyImpl(sb: *StringBuilder, v: JsonValue) { - if v.tag == JsonTagNull { - StringBuilder_Append(sb, "null"); - return; - } - if v.tag == JsonTagBool { - if v.boolVal { - StringBuilder_Append(sb, "true"); - } else { - StringBuilder_Append(sb, "false"); + /* === Public parser === */ + func Json_Parse(s: String) -> JsonValue { + var p: JsonParser = JsonParser { src: s, pos: 0, len: String_Len(s), error: "" }; + let result: JsonValue = JsonParser_ParseValue(&p); + JsonParser_SkipWhitespace(&p); + if p.error == "" && p.pos != p.len { + p.error = "Trailing data after JSON value"; + return Json_Null(); } - return; + return result; } - if v.tag == JsonTagNumber { - StringBuilder_AppendFloat(sb, v.numVal); - return; - } - if v.tag == JsonTagString { - StringBuilder_AppendChar(sb, 34 as char8); - StringBuilder_Append(sb, v.strVal); - StringBuilder_AppendChar(sb, 34 as char8); - return; - } - if v.tag == JsonTagArray { - StringBuilder_AppendChar(sb, 91 as char8); - var i: uint = 0; - while i < v.arrLen { - if i > 0 { - StringBuilder_AppendChar(sb, 44 as char8); + + /* === Serializer === */ + func Json_StringifyImpl(sb: *StringBuilder, v: JsonValue) { + if v.tag == JsonTagNull { + StringBuilder_Append(sb, "null"); + return; + } + if v.tag == JsonTagBool { + if v.boolVal { + StringBuilder_Append(sb, "true"); + } else { + StringBuilder_Append(sb, "false"); } - Json_StringifyImpl(sb, v.arrData[i]); - i = i + 1; + return; } - StringBuilder_AppendChar(sb, 93 as char8); - return; - } - if v.tag == JsonTagObject { - StringBuilder_AppendChar(sb, 123 as char8); - var i: uint = 0; - while i < v.objLen { - if i > 0 { - StringBuilder_AppendChar(sb, 44 as char8); + if v.tag == JsonTagNumber { + StringBuilder_AppendFloat(sb, v.numVal); + return; + } + if v.tag == JsonTagString { + StringBuilder_AppendChar(sb, 34 as char8); + StringBuilder_Append(sb, v.strVal); + StringBuilder_AppendChar(sb, 34 as char8); + return; + } + if v.tag == JsonTagArray { + StringBuilder_AppendChar(sb, 91 as char8); + var i: uint = 0; + while i < v.arrLen { + if i > 0 { + StringBuilder_AppendChar(sb, 44 as char8); + } + Json_StringifyImpl(sb, v.arrData[i]); + i = i + 1; } - StringBuilder_AppendChar(sb, 34 as char8); - StringBuilder_Append(sb, v.objKeys[i]); - StringBuilder_AppendChar(sb, 34 as char8); - StringBuilder_AppendChar(sb, 58 as char8); - Json_StringifyImpl(sb, v.objValues[i]); - i = i + 1; + StringBuilder_AppendChar(sb, 93 as char8); + return; + } + if v.tag == JsonTagObject { + StringBuilder_AppendChar(sb, 123 as char8); + var i: uint = 0; + while i < v.objLen { + if i > 0 { + StringBuilder_AppendChar(sb, 44 as char8); + } + StringBuilder_AppendChar(sb, 34 as char8); + StringBuilder_Append(sb, v.objKeys[i]); + StringBuilder_AppendChar(sb, 34 as char8); + StringBuilder_AppendChar(sb, 58 as char8); + Json_StringifyImpl(sb, v.objValues[i]); + i = i + 1; + } + StringBuilder_AppendChar(sb, 125 as char8); + return; } - StringBuilder_AppendChar(sb, 125 as char8); - return; } -} -func Json_Stringify(v: JsonValue) -> String { - let sb: StringBuilder = StringBuilder_New(); - Json_StringifyImpl(&sb, v); - return StringBuilder_Build(&sb); -} + func Json_Stringify(v: JsonValue) -> String { + let sb: StringBuilder = StringBuilder_New(); + Json_StringifyImpl(&sb, v); + return StringBuilder_Build(&sb); + } } diff --git a/lib/Map.bux b/lib/Map.bux index 9d3d558..c451580 100644 --- a/lib/Map.bux +++ b/lib/Map.bux @@ -1,242 +1,250 @@ module Std::Map { -extern func bux_hash_bytes(ptr: *void, size: uint) -> uint; -extern func bux_hash_string(s: String) -> uint; + extern func bux_hash_bytes(ptr: *void, size: uint) -> uint; + extern func bux_hash_string(s: String) -> uint; -// --------------------------------------------------------------------------- -// Generic Map — works with value-type keys (int, float, etc.) -// For String keys, use StringMap below. -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Generic Map — works with value-type keys (int, float, etc.) + // For String keys, use StringMap below. + // --------------------------------------------------------------------------- -struct MapEntry { - key: K, - value: V, - occupied: bool, -} - -struct Map { - entries: *MapEntry, - cap: uint, - len: uint, -} - -func Map_New(cap: uint) -> Map { - let total: uint = cap * sizeof(MapEntry); - let data: *MapEntry = bux_alloc(total) as *MapEntry; - var i: uint = 0; - while i < cap { - data[i].occupied = false; - i = i + 1; + struct MapEntry { + key: K, + value: V, + occupied: bool, } - return Map { entries: data, cap: cap, len: 0 }; -} -func Map_Set(m: *Map, key: K, value: V) { - var keyPtr: *K = &key; - let hash: uint = bux_hash_bytes(keyPtr as *void, sizeof(K)); - var idx: uint = hash % m.cap; - while m.entries[idx].occupied { - if m.entries[idx].key == key { - m.entries[idx].value = value; - return; + struct Map { + entries: *MapEntry, + cap: uint, + len: uint, + } + + func Map_New(cap: uint) -> Map { + let total: uint = cap * sizeof(MapEntry); + let data: *MapEntry = bux_alloc(total) as *MapEntry; + var i: uint = 0; + while i < cap { + data[i].occupied = false; + i = i + 1; } - idx = (idx + 1) % m.cap; + return Map { entries: data, cap: cap, len: 0 }; } - m.entries[idx].key = key; - m.entries[idx].value = value; - m.entries[idx].occupied = true; - m.len = m.len + 1; -} -func Map_Get(m: *Map, key: K) -> V { - var keyPtr: *K = &key; - let hash: uint = bux_hash_bytes(keyPtr as *void, sizeof(K)); - var idx: uint = hash % m.cap; - while m.entries[idx].occupied { - if m.entries[idx].key == key { - return m.entries[idx].value; + func Map_Set(m: *Map, key: K, value: V) { + var keyPtr: *K = &key; + let hash: uint = bux_hash_bytes(keyPtr as *void, sizeof(K)); + var idx: uint = hash % m.cap; + while m.entries[idx].occupied { + if m.entries[idx].key == key { + m.entries[idx].value = value; + return; + } + idx = (idx + 1) % m.cap; } - idx = (idx + 1) % m.cap; + m.entries[idx].key = key; + m.entries[idx].value = value; + m.entries[idx].occupied = true; + m.len = m.len + 1; } - // Return zero value for missing key - var zero: V = 0 as V; - return zero; -} -func Map_Has(m: *Map, key: K) -> bool { - var keyPtr: *K = &key; - let hash: uint = bux_hash_bytes(keyPtr as *void, sizeof(K)); - var idx: uint = hash % m.cap; - while m.entries[idx].occupied { - if m.entries[idx].key == key { - return true; + func Map_Get(m: *Map, key: K) -> V { + var keyPtr: *K = &key; + let hash: uint = bux_hash_bytes(keyPtr as *void, sizeof(K)); + var idx: uint = hash % m.cap; + while m.entries[idx].occupied { + if m.entries[idx].key == key { + return m.entries[idx].value; + } + idx = (idx + 1) % m.cap; } - idx = (idx + 1) % m.cap; + // Return zero value for missing key + var zero: V = 0 as V; + return zero; } - return false; -} -func Map_Len(m: *Map) -> uint { - return m.len; -} - -func Map_IsEmpty(m: *Map) -> bool { - return m.len == 0; -} - -/* Remove key if present. Rebuilds the table to keep open-addressing correct. */ -func Map_Remove(m: *Map, key: K) -> bool { - if !Map_Has(m, key) { + func Map_Has(m: *Map, key: K) -> bool { + var keyPtr: *K = &key; + let hash: uint = bux_hash_bytes(keyPtr as *void, sizeof(K)); + var idx: uint = hash % m.cap; + while m.entries[idx].occupied { + if m.entries[idx].key == key { + return true; + } + idx = (idx + 1) % m.cap; + } return false; } - var fresh: Map = Map_New(m.cap); - var i: uint = 0; - while i < m.cap { - if m.entries[i].occupied { - if m.entries[i].key != key { - Map_Set(&fresh, m.entries[i].key, m.entries[i].value); + + func Map_Len(m: *Map) -> uint { + return m.len; + } + + func Map_IsEmpty(m: *Map) -> bool { + return m.len == 0; + } + + /* Remove key if present. Rebuilds the table to keep open-addressing correct. */ + func Map_Remove(m: *Map, key: K) -> bool { + if !Map_Has(m, key) { + return false; + } + var fresh: Map = Map_New(m.cap); + var i: uint = 0; + while i < m.cap { + if m.entries[i].occupied { + if m.entries[i].key != key { + Map_Set(&fresh, m.entries[i].key, m.entries[i].value); + } } + i = i + 1; } - i = i + 1; + bux_free(m.entries as *void); + m.entries = fresh.entries; + m.cap = fresh.cap; + m.len = fresh.len; + // Ownership transferred to `m` — clear `fresh` so auto-Drop does not free twice + fresh.entries = null as *MapEntry; + fresh.cap = 0; + fresh.len = 0; + return true; } - bux_free(m.entries as *void); - m.entries = fresh.entries; - m.cap = fresh.cap; - m.len = fresh.len; - return true; -} -func Map_Clear(m: *Map) { - var i: uint = 0; - while i < m.cap { - m.entries[i].occupied = false; - i = i + 1; - } - m.len = 0; -} - -func Map_Free(m: *Map) { - bux_free(m.entries as *void); - m.entries = null as *MapEntry; - m.cap = 0; - m.len = 0; -} - -func Map_Drop(m: *Map) { - Map_Free(m); -} - -// --------------------------------------------------------------------------- -// StringMap — specialized Map for String keys, using strcmp -// --------------------------------------------------------------------------- - -struct StringMapEntry { - key: String, - value: V, - occupied: bool, -} - -struct StringMap { - entries: *StringMapEntry, - cap: uint, - len: uint, -} - -func StringMap_New(cap: uint) -> StringMap { - let total: uint = cap * sizeof(StringMapEntry); - let data: *StringMapEntry = bux_alloc(total) as *StringMapEntry; - var i: uint = 0; - while i < cap { - data[i].occupied = false; - i = i + 1; - } - return StringMap { entries: data, cap: cap, len: 0 }; -} - -func StringMap_Set(m: *StringMap, key: String, value: V) { - let hash: uint = bux_hash_string(key); - var idx: uint = hash % m.cap; - while m.entries[idx].occupied { - if String_Eq(m.entries[idx].key, key) { - m.entries[idx].value = value; - return; + func Map_Clear(m: *Map) { + var i: uint = 0; + while i < m.cap { + m.entries[i].occupied = false; + i = i + 1; } - idx = (idx + 1) % m.cap; + m.len = 0; } - m.entries[idx].key = key; - m.entries[idx].value = value; - m.entries[idx].occupied = true; - m.len = m.len + 1; -} -func StringMap_Get(m: *StringMap, key: String) -> V { - let hash: uint = bux_hash_string(key); - var idx: uint = hash % m.cap; - while m.entries[idx].occupied { - if String_Eq(m.entries[idx].key, key) { - return m.entries[idx].value; + func Map_Free(m: *Map) { + bux_free(m.entries as *void); + m.entries = null as *MapEntry; + m.cap = 0; + m.len = 0; + } + + func Map_Drop(m: *Map) { + Map_Free(m); + } + + // --------------------------------------------------------------------------- + // StringMap — specialized Map for String keys, using strcmp + // --------------------------------------------------------------------------- + + struct StringMapEntry { + key: String, + value: V, + occupied: bool, + } + + struct StringMap { + entries: *StringMapEntry, + cap: uint, + len: uint, + } + + func StringMap_New(cap: uint) -> StringMap { + let total: uint = cap * sizeof(StringMapEntry); + let data: *StringMapEntry = bux_alloc(total) as *StringMapEntry; + var i: uint = 0; + while i < cap { + data[i].occupied = false; + i = i + 1; } - idx = (idx + 1) % m.cap; + return StringMap { entries: data, cap: cap, len: 0 }; } - var zero: V = 0 as V; - return zero; -} -func StringMap_Has(m: *StringMap, key: String) -> bool { - let hash: uint = bux_hash_string(key); - var idx: uint = hash % m.cap; - while m.entries[idx].occupied { - if String_Eq(m.entries[idx].key, key) { - return true; + func StringMap_Set(m: *StringMap, key: String, value: V) { + let hash: uint = bux_hash_string(key); + var idx: uint = hash % m.cap; + while m.entries[idx].occupied { + if String_Eq(m.entries[idx].key, key) { + m.entries[idx].value = value; + return; + } + idx = (idx + 1) % m.cap; } - idx = (idx + 1) % m.cap; + m.entries[idx].key = key; + m.entries[idx].value = value; + m.entries[idx].occupied = true; + m.len = m.len + 1; } - return false; -} -func StringMap_Len(m: *StringMap) -> uint { - return m.len; -} + func StringMap_Get(m: *StringMap, key: String) -> V { + let hash: uint = bux_hash_string(key); + var idx: uint = hash % m.cap; + while m.entries[idx].occupied { + if String_Eq(m.entries[idx].key, key) { + return m.entries[idx].value; + } + idx = (idx + 1) % m.cap; + } + var zero: V = 0 as V; + return zero; + } -func StringMap_IsEmpty(m: *StringMap) -> bool { - return m.len == 0; -} - -func StringMap_Remove(m: *StringMap, key: String) -> bool { - if !StringMap_Has(m, key) { + func StringMap_Has(m: *StringMap, key: String) -> bool { + let hash: uint = bux_hash_string(key); + var idx: uint = hash % m.cap; + while m.entries[idx].occupied { + if String_Eq(m.entries[idx].key, key) { + return true; + } + idx = (idx + 1) % m.cap; + } return false; } - var fresh: StringMap = StringMap_New(m.cap); - var i: uint = 0; - while i < m.cap { - if m.entries[i].occupied { - if !String_Eq(m.entries[i].key, key) { - StringMap_Set(&fresh, m.entries[i].key, m.entries[i].value); - } + + func StringMap_Len(m: *StringMap) -> uint { + return m.len; + } + + func StringMap_IsEmpty(m: *StringMap) -> bool { + return m.len == 0; + } + + func StringMap_Remove(m: *StringMap, key: String) -> bool { + if !StringMap_Has(m, key) { + return false; } - i = i + 1; + var fresh: StringMap = StringMap_New(m.cap); + var i: uint = 0; + while i < m.cap { + if m.entries[i].occupied { + if !String_Eq(m.entries[i].key, key) { + StringMap_Set(&fresh, m.entries[i].key, m.entries[i].value); + } + } + i = i + 1; + } + bux_free(m.entries as *void); + m.entries = fresh.entries; + m.cap = fresh.cap; + m.len = fresh.len; + // Ownership transferred to `m` — clear `fresh` so auto-Drop does not free twice + fresh.entries = null as *StringMapEntry; + fresh.cap = 0; + fresh.len = 0; + return true; } - bux_free(m.entries as *void); - m.entries = fresh.entries; - m.cap = fresh.cap; - m.len = fresh.len; - return true; -} -func StringMap_Clear(m: *StringMap) { - var i: uint = 0; - while i < m.cap { - m.entries[i].occupied = false; - i = i + 1; + func StringMap_Clear(m: *StringMap) { + var i: uint = 0; + while i < m.cap { + m.entries[i].occupied = false; + i = i + 1; + } + m.len = 0; } - m.len = 0; -} -func StringMap_Free(m: *StringMap) { - bux_free(m.entries as *void); - m.entries = null as *StringMapEntry; - m.cap = 0; - m.len = 0; -} + func StringMap_Free(m: *StringMap) { + bux_free(m.entries as *void); + m.entries = null as *StringMapEntry; + m.cap = 0; + m.len = 0; + } -} \ No newline at end of file +} diff --git a/lib/Math.bux b/lib/Math.bux index ed0df8c..dc15e52 100644 --- a/lib/Math.bux +++ b/lib/Math.bux @@ -1,44 +1,44 @@ module Std::Math { -extern func bux_sqrt(x: float64) -> float64; -extern func bux_pow(x: float64, y: float64) -> float64; -extern func bux_abs_i64(x: int64) -> int64; -extern func bux_abs_f64(x: float64) -> float64; -extern func bux_min_i64(a: int64, b: int64) -> int64; -extern func bux_max_i64(a: int64, b: int64) -> int64; -extern func bux_min_f64(a: float64, b: float64) -> float64; -extern func bux_max_f64(a: float64, b: float64) -> float64; + extern func bux_sqrt(x: float64) -> float64; + extern func bux_pow(x: float64, y: float64) -> float64; + extern func bux_abs_i64(x: int64) -> int64; + extern func bux_abs_f64(x: float64) -> float64; + extern func bux_min_i64(a: int64, b: int64) -> int64; + extern func bux_max_i64(a: int64, b: int64) -> int64; + extern func bux_min_f64(a: float64, b: float64) -> float64; + extern func bux_max_f64(a: float64, b: float64) -> float64; + + func Sqrt(x: float64) -> float64 { + return bux_sqrt(x); + } + + func Pow(x: float64, y: float64) -> float64 { + return bux_pow(x, y); + } + + func Abs(n: int64) -> int64 { + return bux_abs_i64(n); + } + + func AbsF(f: float64) -> float64 { + return bux_abs_f64(f); + } + + func Min(a: int64, b: int64) -> int64 { + return bux_min_i64(a, b); + } + + func Max(a: int64, b: int64) -> int64 { + return bux_max_i64(a, b); + } + + func MinF(a: float64, b: float64) -> float64 { + return bux_min_f64(a, b); + } + + func MaxF(a: float64, b: float64) -> float64 { + return bux_max_f64(a, b); + } -func Sqrt(x: float64) -> float64 { - return bux_sqrt(x); } - -func Pow(x: float64, y: float64) -> float64 { - return bux_pow(x, y); -} - -func Abs(n: int64) -> int64 { - return bux_abs_i64(n); -} - -func AbsF(f: float64) -> float64 { - return bux_abs_f64(f); -} - -func Min(a: int64, b: int64) -> int64 { - return bux_min_i64(a, b); -} - -func Max(a: int64, b: int64) -> int64 { - return bux_max_i64(a, b); -} - -func MinF(a: float64, b: float64) -> float64 { - return bux_min_f64(a, b); -} - -func MaxF(a: float64, b: float64) -> float64 { - return bux_max_f64(a, b); -} - -} \ No newline at end of file diff --git a/lib/Mem.bux b/lib/Mem.bux index 85ee4d1..3672b5f 100644 --- a/lib/Mem.bux +++ b/lib/Mem.bux @@ -1,29 +1,29 @@ module Std::Mem { -extern func bux_alloc(size: uint) -> *void; -extern func bux_realloc(ptr: *void, size: uint) -> *void; -extern func bux_free(ptr: *void); -extern func bux_mem_eq(a: *void, b: *void, size: uint) -> int; + extern func bux_alloc(size: uint) -> *void; + extern func bux_realloc(ptr: *void, size: uint) -> *void; + extern func bux_free(ptr: *void); + extern func bux_mem_eq(a: *void, b: *void, size: uint) -> int; -func Alloc(size: uint) -> *void { - return bux_alloc(size); -} + func Alloc(size: uint) -> *void { + return bux_alloc(size); + } -func Realloc(ptr: *void, size: uint) -> *void { - return bux_realloc(ptr, size); -} + func Realloc(ptr: *void, size: uint) -> *void { + return bux_realloc(ptr, size); + } -func Free(ptr: *void) { - bux_free(ptr); -} + func Free(ptr: *void) { + bux_free(ptr); + } -func MemEq(a: *void, b: *void, size: uint) -> bool { - return bux_mem_eq(a, b, size) != 0; -} + func MemEq(a: *void, b: *void, size: uint) -> bool { + return bux_mem_eq(a, b, size) != 0; + } -func New() -> *T { - let sz: uint = sizeof(T); - return bux_alloc(sz) as *T; -} + func New() -> *T { + let sz: uint = sizeof(T); + return bux_alloc(sz) as *T; + } } diff --git a/lib/Net.bux b/lib/Net.bux index f1a0d98..faa3ed2 100644 --- a/lib/Net.bux +++ b/lib/Net.bux @@ -1,62 +1,62 @@ module Std::Net { -extern func bux_socket_create() -> int; -extern func bux_socket_reuse(fd: int) -> int; -extern func bux_socket_bind(fd: int, addr: String, port: int) -> int; -extern func bux_socket_listen(fd: int, backlog: int) -> int; -extern func bux_socket_accept(fd: int) -> int; -extern func bux_socket_connect(fd: int, addr: String, port: int) -> int; -extern func bux_socket_send(fd: int, data: String, len: int) -> int; -extern func bux_socket_recv(fd: int, maxLen: int) -> String; -extern func bux_socket_close(fd: int) -> int; -extern func bux_socket_error() -> String; + extern func bux_socket_create() -> int; + extern func bux_socket_reuse(fd: int) -> int; + extern func bux_socket_bind(fd: int, addr: String, port: int) -> int; + extern func bux_socket_listen(fd: int, backlog: int) -> int; + extern func bux_socket_accept(fd: int) -> int; + extern func bux_socket_connect(fd: int, addr: String, port: int) -> int; + extern func bux_socket_send(fd: int, data: String, len: int) -> int; + extern func bux_socket_recv(fd: int, maxLen: int) -> String; + extern func bux_socket_close(fd: int) -> int; + extern func bux_socket_error() -> String; -/* Create a TCP socket. Returns -1 on error. */ -func Net_Create() -> int { - return bux_socket_create(); -} + /* Create a TCP socket. Returns -1 on error. */ + func Net_Create() -> int { + return bux_socket_create(); + } -/* Enable SO_REUSEADDR on a socket. */ -func Net_SetReuse(fd: int) -> bool { - return bux_socket_reuse(fd) == 0; -} + /* Enable SO_REUSEADDR on a socket. */ + func Net_SetReuse(fd: int) -> bool { + return bux_socket_reuse(fd) == 0; + } -/* Bind a socket to an address and port. */ -func Net_Bind(fd: int, addr: String, port: int) -> bool { - return bux_socket_bind(fd, addr, port) == 0; -} + /* Bind a socket to an address and port. */ + func Net_Bind(fd: int, addr: String, port: int) -> bool { + return bux_socket_bind(fd, addr, port) == 0; + } -/* Start listening for connections. */ -func Net_Listen(fd: int, backlog: int) -> bool { - return bux_socket_listen(fd, backlog) == 0; -} + /* Start listening for connections. */ + func Net_Listen(fd: int, backlog: int) -> bool { + return bux_socket_listen(fd, backlog) == 0; + } -/* Accept a connection. Returns new fd or -1 on error. */ -func Net_Accept(fd: int) -> int { - return bux_socket_accept(fd); -} + /* Accept a connection. Returns new fd or -1 on error. */ + func Net_Accept(fd: int) -> int { + return bux_socket_accept(fd); + } -/* Connect to a remote address and port. */ -func Net_Connect(fd: int, addr: String, port: int) -> bool { - return bux_socket_connect(fd, addr, port) == 0; -} + /* Connect to a remote address and port. */ + func Net_Connect(fd: int, addr: String, port: int) -> bool { + return bux_socket_connect(fd, addr, port) == 0; + } -/* Send data. Returns bytes sent or -1 on error. */ -func Net_Send(fd: int, data: String) -> int { - return bux_socket_send(fd, data, bux_strlen(data) as int); -} + /* Send data. Returns bytes sent or -1 on error. */ + func Net_Send(fd: int, data: String) -> int { + return bux_socket_send(fd, data, bux_strlen(data) as int); + } -/* Receive up to maxLen bytes. Returns empty string on error/EOF. */ -func Net_Recv(fd: int, maxLen: int) -> String { - return bux_socket_recv(fd, maxLen); -} + /* Receive up to maxLen bytes. Returns empty string on error/EOF. */ + func Net_Recv(fd: int, maxLen: int) -> String { + return bux_socket_recv(fd, maxLen); + } -/* Close a socket. */ -func Net_Close(fd: int) -> bool { - return bux_socket_close(fd) == 0; -} + /* Close a socket. */ + func Net_Close(fd: int) -> bool { + return bux_socket_close(fd) == 0; + } -/* Get last socket error as a string. */ -func Net_LastError() -> String { - return bux_socket_error(); -} + /* Get last socket error as a string. */ + func Net_LastError() -> String { + return bux_socket_error(); + } } diff --git a/lib/Option.bux b/lib/Option.bux index b2a7a99..04e7b1f 100644 --- a/lib/Option.bux +++ b/lib/Option.bux @@ -1,61 +1,61 @@ module Std::Option { -import Std::Io::{PrintLine}; + import Std::Io::{PrintLine}; -extern func bux_exit(code: int); + extern func bux_exit(code: int); -enum Option { - Some(int), - None, -} - -func Option_NewSome(value: int) -> Option { - let o: Option = Option { tag: Option_Some }; - o.data.Some_0 = value; - return o; -} - -func Option_NewNone() -> Option { - return Option { tag: Option_None }; -} - -func Option_IsSome(o: Option) -> bool { - return o.tag == Option_Some; -} - -func Option_IsNone(o: Option) -> bool { - return o.tag == Option_None; -} - -func Option_Unwrap(o: Option) -> int { - if o.tag != Option_Some { - PrintLine("panic: unwrap on None"); - return 0; + enum Option { + Some(int), + None, } - return o.data.Some_0; -} -func Option_UnwrapOr(o: Option, fallback: int) -> int { - if o.tag == Option_Some { - return o.data.Some_0; - } - return fallback; -} - -/* Unwrap Some or panic with a custom message */ -func Option_Expect(o: Option, msg: String) -> int { - if o.tag != Option_Some { - PrintLine(msg); - bux_exit(1); - } - return o.data.Some_0; -} - -/* If o is Some return it, otherwise return other */ -func Option_Or(o: Option, other: Option) -> Option { - if o.tag == Option_Some { + func Option_NewSome(value: int) -> Option { + let o: Option = Option { tag: Option_Some }; + o.data.Some_0 = value; return o; } - return other; -} + + func Option_NewNone() -> Option { + return Option { tag: Option_None }; + } + + func Option_IsSome(o: Option) -> bool { + return o.tag == Option_Some; + } + + func Option_IsNone(o: Option) -> bool { + return o.tag == Option_None; + } + + func Option_Unwrap(o: Option) -> int { + if o.tag != Option_Some { + PrintLine("panic: unwrap on None"); + return 0; + } + return o.data.Some_0; + } + + func Option_UnwrapOr(o: Option, fallback: int) -> int { + if o.tag == Option_Some { + return o.data.Some_0; + } + return fallback; + } + + /* Unwrap Some or panic with a custom message */ + func Option_Expect(o: Option, msg: String) -> int { + if o.tag != Option_Some { + PrintLine(msg); + bux_exit(1); + } + return o.data.Some_0; + } + + /* If o is Some return it, otherwise return other */ + func Option_Or(o: Option, other: Option) -> Option { + if o.tag == Option_Some { + return o; + } + return other; + } } diff --git a/lib/Os.bux b/lib/Os.bux index 540c7fc..1a3e364 100644 --- a/lib/Os.bux +++ b/lib/Os.bux @@ -1,40 +1,40 @@ module Std::Os { -extern func bux_argc() -> int; -extern func bux_argv(index: int) -> String; -extern func bux_getenv(name: String) -> String; -extern func bux_setenv(name: String, value: String) -> int; -extern func bux_getcwd() -> String; -extern func bux_chdir(path: String) -> int; -extern func bux_exit(code: int); + extern func bux_argc() -> int; + extern func bux_argv(index: int) -> String; + extern func bux_getenv(name: String) -> String; + extern func bux_setenv(name: String, value: String) -> int; + extern func bux_getcwd() -> String; + extern func bux_chdir(path: String) -> int; + extern func bux_exit(code: int); -func Os_ArgsCount() -> int { - return bux_argc(); -} + func Os_ArgsCount() -> int { + return bux_argc(); + } -func Os_Args(index: int) -> String { - return bux_argv(index); -} + func Os_Args(index: int) -> String { + return bux_argv(index); + } -func Os_GetEnv(name: String) -> String { - return bux_getenv(name); -} + func Os_GetEnv(name: String) -> String { + return bux_getenv(name); + } -func Os_SetEnv(name: String, value: String) -> bool { - return bux_setenv(name, value) == 0; -} + func Os_SetEnv(name: String, value: String) -> bool { + return bux_setenv(name, value) == 0; + } -func Os_GetCwd() -> String { - return bux_getcwd(); -} + func Os_GetCwd() -> String { + return bux_getcwd(); + } -func Os_Chdir(path: String) -> bool { - return bux_chdir(path) == 0; -} + func Os_Chdir(path: String) -> bool { + return bux_chdir(path) == 0; + } -/* Terminate the process with the given exit code */ -func Os_Exit(code: int) { - bux_exit(code); -} + /* Terminate the process with the given exit code */ + func Os_Exit(code: int) { + bux_exit(code); + } } diff --git a/lib/Path.bux b/lib/Path.bux index b559c30..db0acd7 100644 --- a/lib/Path.bux +++ b/lib/Path.bux @@ -1,19 +1,19 @@ module Std::Path { -extern func bux_path_join(a: String, b: String) -> String; -extern func bux_path_parent(path: String) -> String; -extern func bux_path_ext(path: String) -> String; + extern func bux_path_join(a: String, b: String) -> String; + extern func bux_path_parent(path: String) -> String; + extern func bux_path_ext(path: String) -> String; + + func Path_Join(a: String, b: String) -> String { + return bux_path_join(a, b); + } + + func Path_Parent(path: String) -> String { + return bux_path_parent(path); + } + + func Path_Ext(path: String) -> String { + return bux_path_ext(path); + } -func Path_Join(a: String, b: String) -> String { - return bux_path_join(a, b); } - -func Path_Parent(path: String) -> String { - return bux_path_parent(path); -} - -func Path_Ext(path: String) -> String { - return bux_path_ext(path); -} - -} \ No newline at end of file diff --git a/lib/Process.bux b/lib/Process.bux index 1a8c667..fec14cc 100644 --- a/lib/Process.bux +++ b/lib/Process.bux @@ -1,14 +1,14 @@ module Std::Process { -extern func bux_process_run(cmd: String) -> int; -extern func bux_process_output(cmd: String) -> String; + extern func bux_process_run(cmd: String) -> int; + extern func bux_process_output(cmd: String) -> String; -func Process_Run(cmd: String) -> int { - return bux_process_run(cmd); -} + func Process_Run(cmd: String) -> int { + return bux_process_run(cmd); + } -func Process_Output(cmd: String) -> String { - return bux_process_output(cmd); -} + func Process_Output(cmd: String) -> String { + return bux_process_output(cmd); + } } diff --git a/lib/Result.bux b/lib/Result.bux index fefe0db..1a5ba2c 100644 --- a/lib/Result.bux +++ b/lib/Result.bux @@ -1,72 +1,72 @@ module Std::Result { -import Std::Io::{PrintLine}; + import Std::Io::{PrintLine}; -extern func bux_exit(code: int); + extern func bux_exit(code: int); -enum Result { - Ok(int), - Err(String), -} - -func Result_NewOk(value: int) -> Result { - let r: Result = Result { tag: Result_Ok }; - r.data.Ok_0 = value; - return r; -} - -func Result_NewErr(msg: String) -> Result { - let r: Result = Result { tag: Result_Err }; - r.data.Err_0 = msg; - return r; -} - -func Result_IsOk(r: Result) -> bool { - return r.tag == Result_Ok; -} - -func Result_IsErr(r: Result) -> bool { - return r.tag == Result_Err; -} - -func Result_Unwrap(r: Result) -> int { - if r.tag != Result_Ok { - PrintLine("panic: unwrap on Err"); - return 0; + enum Result { + Ok(int), + Err(String), } - return r.data.Ok_0; -} -func Result_UnwrapOr(r: Result, fallback: int) -> int { - if r.tag == Result_Ok { - return r.data.Ok_0; - } - return fallback; -} - -/* Unwrap Ok or panic with a custom message */ -func Result_Expect(r: Result, msg: String) -> int { - if r.tag != Result_Ok { - PrintLine(msg); - bux_exit(1); - } - return r.data.Ok_0; -} - -/* Extract Err payload (panics if Ok) */ -func Result_UnwrapErr(r: Result) -> String { - if r.tag != Result_Err { - PrintLine("panic: unwrap_err on Ok"); - return ""; - } - return r.data.Err_0; -} - -/* If r is Ok return it, otherwise return other */ -func Result_Or(r: Result, other: Result) -> Result { - if r.tag == Result_Ok { + func Result_NewOk(value: int) -> Result { + let r: Result = Result { tag: Result_Ok }; + r.data.Ok_0 = value; return r; } - return other; -} + + func Result_NewErr(msg: String) -> Result { + let r: Result = Result { tag: Result_Err }; + r.data.Err_0 = msg; + return r; + } + + func Result_IsOk(r: Result) -> bool { + return r.tag == Result_Ok; + } + + func Result_IsErr(r: Result) -> bool { + return r.tag == Result_Err; + } + + func Result_Unwrap(r: Result) -> int { + if r.tag != Result_Ok { + PrintLine("panic: unwrap on Err"); + return 0; + } + return r.data.Ok_0; + } + + func Result_UnwrapOr(r: Result, fallback: int) -> int { + if r.tag == Result_Ok { + return r.data.Ok_0; + } + return fallback; + } + + /* Unwrap Ok or panic with a custom message */ + func Result_Expect(r: Result, msg: String) -> int { + if r.tag != Result_Ok { + PrintLine(msg); + bux_exit(1); + } + return r.data.Ok_0; + } + + /* Extract Err payload (panics if Ok) */ + func Result_UnwrapErr(r: Result) -> String { + if r.tag != Result_Err { + PrintLine("panic: unwrap_err on Ok"); + return ""; + } + return r.data.Err_0; + } + + /* If r is Ok return it, otherwise return other */ + func Result_Or(r: Result, other: Result) -> Result { + if r.tag == Result_Ok { + return r; + } + return other; + } } diff --git a/lib/Set.bux b/lib/Set.bux index 644f299..960a757 100644 --- a/lib/Set.bux +++ b/lib/Set.bux @@ -1,112 +1,116 @@ module Std::Set { -extern func bux_hash_bytes(ptr: *void, size: uint) -> uint; -extern func bux_mem_eq(a: *void, b: *void, size: uint) -> int; -extern func bux_alloc(size: uint) -> *void; -extern func bux_free(ptr: *void); + extern func bux_hash_bytes(ptr: *void, size: uint) -> uint; + extern func bux_mem_eq(a: *void, b: *void, size: uint) -> int; + extern func bux_alloc(size: uint) -> *void; + extern func bux_free(ptr: *void); -struct SetEntry { - value: T, - occupied: bool, -} - -struct Set { - entries: *SetEntry, - cap: uint, - len: uint, -} - -func Set_New(cap: uint) -> Set { - let total: uint = cap * sizeof(SetEntry); - let data: *SetEntry = bux_alloc(total) as *SetEntry; - var i: uint = 0; - while i < cap { - data[i].occupied = false; - i = i + 1; + struct SetEntry { + value: T, + occupied: bool, } - return Set { entries: data, cap: cap, len: 0 }; -} -func Set_Add(s: *Set, value: T) { - var valuePtr: *T = &value; - let hash: uint = bux_hash_bytes(valuePtr as *void, sizeof(T)); - var idx: uint = hash % s.cap; - while s.entries[idx].occupied { - var entryPtr: *T = &s.entries[idx].value; - if bux_mem_eq(entryPtr as *void, valuePtr as *void, sizeof(T)) != 0 { - return; + struct Set { + entries: *SetEntry, + cap: uint, + len: uint, + } + + func Set_New(cap: uint) -> Set { + let total: uint = cap * sizeof(SetEntry); + let data: *SetEntry = bux_alloc(total) as *SetEntry; + var i: uint = 0; + while i < cap { + data[i].occupied = false; + i = i + 1; } - idx = (idx + 1) % s.cap; + return Set { entries: data, cap: cap, len: 0 }; } - s.entries[idx].value = value; - s.entries[idx].occupied = true; - s.len = s.len + 1; -} -func Set_Has(s: *Set, value: T) -> bool { - var valuePtr: *T = &value; - let hash: uint = bux_hash_bytes(valuePtr as *void, sizeof(T)); - var idx: uint = hash % s.cap; - while s.entries[idx].occupied { - var entryPtr: *T = &s.entries[idx].value; - if bux_mem_eq(entryPtr as *void, valuePtr as *void, sizeof(T)) != 0 { - return true; + func Set_Add(s: *Set, value: T) { + var valuePtr: *T = &value; + let hash: uint = bux_hash_bytes(valuePtr as *void, sizeof(T)); + var idx: uint = hash % s.cap; + while s.entries[idx].occupied { + var entryPtr: *T = &s.entries[idx].value; + if bux_mem_eq(entryPtr as *void, valuePtr as *void, sizeof(T)) != 0 { + return; + } + idx = (idx + 1) % s.cap; } - idx = (idx + 1) % s.cap; + s.entries[idx].value = value; + s.entries[idx].occupied = true; + s.len = s.len + 1; } - return false; -} -func Set_Len(s: *Set) -> uint { - return s.len; -} - -func Set_IsEmpty(s: *Set) -> bool { - return s.len == 0; -} - -/* Remove value if present. Rebuilds the table to keep open-addressing correct. */ -func Set_Remove(s: *Set, value: T) -> bool { - if !Set_Has(s, value) { + func Set_Has(s: *Set, value: T) -> bool { + var valuePtr: *T = &value; + let hash: uint = bux_hash_bytes(valuePtr as *void, sizeof(T)); + var idx: uint = hash % s.cap; + while s.entries[idx].occupied { + var entryPtr: *T = &s.entries[idx].value; + if bux_mem_eq(entryPtr as *void, valuePtr as *void, sizeof(T)) != 0 { + return true; + } + idx = (idx + 1) % s.cap; + } return false; } - var fresh: Set = Set_New(s.cap); - var i: uint = 0; - while i < s.cap { - if s.entries[i].occupied { - var entryPtr: *T = &s.entries[i].value; - var valuePtr: *T = &value; - if bux_mem_eq(entryPtr as *void, valuePtr as *void, sizeof(T)) == 0 { - Set_Add(&fresh, s.entries[i].value); - } + + func Set_Len(s: *Set) -> uint { + return s.len; + } + + func Set_IsEmpty(s: *Set) -> bool { + return s.len == 0; + } + + /* Remove value if present. Rebuilds the table to keep open-addressing correct. */ + func Set_Remove(s: *Set, value: T) -> bool { + if !Set_Has(s, value) { + return false; } - i = i + 1; + var fresh: Set = Set_New(s.cap); + var i: uint = 0; + while i < s.cap { + if s.entries[i].occupied { + var entryPtr: *T = &s.entries[i].value; + var valuePtr: *T = &value; + if bux_mem_eq(entryPtr as *void, valuePtr as *void, sizeof(T)) == 0 { + Set_Add(&fresh, s.entries[i].value); + } + } + i = i + 1; + } + bux_free(s.entries as *void); + s.entries = fresh.entries; + s.cap = fresh.cap; + s.len = fresh.len; + // Ownership transferred to `s` — clear `fresh` so auto-Drop does not free twice + fresh.entries = null as *SetEntry; + fresh.cap = 0; + fresh.len = 0; + return true; } - bux_free(s.entries as *void); - s.entries = fresh.entries; - s.cap = fresh.cap; - s.len = fresh.len; - return true; -} -func Set_Clear(s: *Set) { - var i: uint = 0; - while i < s.cap { - s.entries[i].occupied = false; - i = i + 1; + func Set_Clear(s: *Set) { + var i: uint = 0; + while i < s.cap { + s.entries[i].occupied = false; + i = i + 1; + } + s.len = 0; } - s.len = 0; -} -func Set_Free(s: *Set) { - bux_free(s.entries as *void); - s.entries = null as *SetEntry; - s.cap = 0; - s.len = 0; -} + func Set_Free(s: *Set) { + bux_free(s.entries as *void); + s.entries = null as *SetEntry; + s.cap = 0; + s.len = 0; + } -func Set_Drop(s: *Set) { - Set_Free(s); -} + func Set_Drop(s: *Set) { + Set_Free(s); + } } diff --git a/lib/Slice.bux b/lib/Slice.bux index b6fb2b3..8841595 100644 --- a/lib/Slice.bux +++ b/lib/Slice.bux @@ -1,39 +1,39 @@ module Std::Slice { -extern func bux_bounds_check(index: uint, len: uint); + extern func bux_bounds_check(index: uint, len: uint); -struct Slice { - data: *T, - len: uint, -} + struct Slice { + data: *T, + len: uint, + } -func Slice_FromArray(arr: *Array) -> Slice { - var s: Slice; - s.data = arr.data; - s.len = arr.len; - return s; -} + func Slice_FromArray(arr: *Array) -> Slice { + var s: Slice; + s.data = arr.data; + s.len = arr.len; + return s; + } -func Slice_Get(self: *Slice, idx: uint) -> T { - bux_bounds_check(idx, self.len); - return self.data[idx]; -} + func Slice_Get(self: *Slice, idx: uint) -> T { + bux_bounds_check(idx, self.len); + return self.data[idx]; + } -func Slice_Set(self: *Slice, idx: uint, value: T) { - bux_bounds_check(idx, self.len); - self.data[idx] = value; -} + func Slice_Set(self: *Slice, idx: uint, value: T) { + bux_bounds_check(idx, self.len); + self.data[idx] = value; + } -func Slice_Len(self: *Slice) -> uint { - return self.len; -} + func Slice_Len(self: *Slice) -> uint { + return self.len; + } -func Slice_operator_index_get(self: *Slice, idx: uint) -> T { - return Slice_Get(self, idx); -} + func Slice_operator_index_get(self: *Slice, idx: uint) -> T { + return Slice_Get(self, idx); + } -func Slice_operator_index_set(self: *Slice, idx: uint, value: T) { - Slice_Set(self, idx, value); -} + func Slice_operator_index_set(self: *Slice, idx: uint, value: T) { + Slice_Set(self, idx, value); + } } diff --git a/lib/String.bux b/lib/String.bux index 2a69af7..afa158d 100644 --- a/lib/String.bux +++ b/lib/String.bux @@ -1,288 +1,297 @@ module Std::String { -extern func bux_strlen(s: String) -> uint; -extern func bux_strcmp(a: String, b: String) -> int; -extern func bux_strncmp(a: String, b: String, n: uint) -> int; -extern func bux_strcpy(dest: *char8, src: String) -> *char8; -extern func bux_strcat(dest: *char8, src: String) -> *char8; -extern func bux_strncpy(dest: *char8, src: String, n: uint) -> *char8; -extern func bux_strstr(haystack: String, needle: String) -> String; -extern func bux_str_contains(haystack: String, needle: String) -> int; -extern func bux_str_offset(pos: String, base: String) -> uint; -extern func bux_str_is_null(s: String) -> int; -extern func bux_str_slice(s: String, start: uint, len: uint) -> String; -extern func bux_str_trim_left(s: String) -> String; -extern func bux_str_trim_right(s: String) -> String; -extern func bux_str_trim(s: String) -> String; -extern func bux_int_to_str(n: int64) -> String; -extern func bux_str_to_int(s: String) -> int64; -extern func bux_sb_new(initial_cap: uint) -> *void; -extern func bux_sb_append(sb: *void, s: String); -extern func bux_sb_append_int(sb: *void, n: int64); -extern func bux_sb_append_float(sb: *void, f: float64); -extern func bux_sb_append_char(sb: *void, c: char8); -extern func bux_sb_build(sb: *void) -> String; -extern func bux_sb_free(sb: *void); -extern func bux_str_split_count(s: String, delim: String) -> uint; -extern func bux_str_split_part(s: String, delim: String, index: uint) -> String; -extern func bux_str_join2(a: String, b: String, sep: String) -> String; -extern func bux_float_to_string(f: float64) -> String; -extern func bux_str_format(pattern: String, a0: String, a1: String, a2: String, a3: String, a4: String, a5: String, a6: String, a7: String) -> String; + extern func bux_strlen(s: String) -> uint; + extern func bux_strcmp(a: String, b: String) -> int; + extern func bux_strncmp(a: String, b: String, n: uint) -> int; + extern func bux_strcpy(dest: *char8, src: String) -> *char8; + extern func bux_strcat(dest: *char8, src: String) -> *char8; + extern func bux_strncpy(dest: *char8, src: String, n: uint) -> *char8; + extern func bux_strstr(haystack: String, needle: String) -> String; + extern func bux_str_contains(haystack: String, needle: String) -> int; + extern func bux_str_offset(pos: String, base: String) -> uint; + extern func bux_str_is_null(s: String) -> int; + extern func bux_str_slice(s: String, start: uint, len: uint) -> String; + extern func bux_str_trim_left(s: String) -> String; + extern func bux_str_trim_right(s: String) -> String; + extern func bux_str_trim(s: String) -> String; + extern func bux_int_to_str(n: int64) -> String; + extern func bux_str_to_int(s: String) -> int64; + extern func bux_sb_new(initial_cap: uint) -> *void; + extern func bux_sb_append(sb: *void, s: String); + extern func bux_sb_append_int(sb: *void, n: int64); + extern func bux_sb_append_float(sb: *void, f: float64); + extern func bux_sb_append_char(sb: *void, c: char8); + extern func bux_sb_build(sb: *void) -> String; + extern func bux_sb_free(sb: *void); + extern func bux_str_split_count(s: String, delim: String) -> uint; + extern func bux_str_split_part(s: String, delim: String, index: uint) -> String; + extern func bux_str_join2(a: String, b: String, sep: String) -> String; + extern func bux_float_to_string(f: float64) -> String; + extern func bux_str_format(pattern: String, a0: String, a1: String, a2: String, a3: String, a4: String, a5: String, a6: String, a7: String) -> String; -func String_Len(s: String) -> uint { - return bux_strlen(s); -} - -func String_IsEmpty(s: String) -> bool { - return bux_strlen(s) == 0; -} - -func String_IsNull(s: String) -> bool { - return bux_str_is_null(s) != 0; -} - -func String_Eq(a: String, b: String) -> bool { - return bux_strcmp(a, b) == 0; -} - -func String_Concat(a: String, b: String) -> String { - let len_a: uint = bux_strlen(a); - let len_b: uint = bux_strlen(b); - let total: uint = len_a + len_b + 1; - let buf: *char8 = bux_alloc(total) as *char8; - bux_strcpy(buf, a); - bux_strcat(buf, b); - return buf; -} - -func String_Copy(s: String) -> String { - let len: uint = bux_strlen(s); - let buf: *char8 = bux_alloc(len + 1) as *char8; - bux_strcpy(buf, s); - return buf; -} - -func String_StartsWith(s: String, prefix: String) -> bool { - let s_len: uint = bux_strlen(s); - let p_len: uint = bux_strlen(prefix); - if p_len > s_len { - return false; + /// Byte length of a C string (`strlen`). + func String_Len(s: String) -> uint { + return bux_strlen(s); } - let r: int = bux_strncmp(s, prefix, p_len); - return r == 0; -} -func String_EndsWith(s: String, suffix: String) -> bool { - let s_len: uint = bux_strlen(s); - let suf_len: uint = bux_strlen(suffix); - if suf_len > s_len { - return false; + /// True if the string has zero length. + func String_IsEmpty(s: String) -> bool { + return bux_strlen(s) == 0; } - let start: uint = s_len - suf_len; - let tail: String = bux_str_slice(s, start, suf_len); - let eq: bool = bux_strcmp(tail, suffix) == 0; - return eq; -} -func String_Contains(s: String, substr: String) -> bool { - let r: int = bux_str_contains(s, substr); - return r != 0; -} + /// True if the pointer is null. + func String_IsNull(s: String) -> bool { + return bux_str_is_null(s) != 0; + } -func String_Slice(s: String, start: uint, len: uint) -> String { - return bux_str_slice(s, start, len); -} + /// Lexicographic equality. + func String_Eq(a: String, b: String) -> bool { + return bux_strcmp(a, b) == 0; + } -func String_Trim(s: String) -> String { - return bux_str_trim(s); -} + /// Allocate and return `a` concatenated with `b`. + func String_Concat(a: String, b: String) -> String { + let len_a: uint = bux_strlen(a); + let len_b: uint = bux_strlen(b); + let total: uint = len_a + len_b + 1; + let buf: *char8 = bux_alloc(total) as *char8; + bux_strcpy(buf, a); + bux_strcat(buf, b); + return buf; + } -func String_TrimLeft(s: String) -> String { - return bux_str_trim_left(s); -} + /// Heap-copy of `s`. + func String_Copy(s: String) -> String { + let len: uint = bux_strlen(s); + let buf: *char8 = bux_alloc(len + 1) as *char8; + bux_strcpy(buf, s); + return buf; + } -func String_TrimRight(s: String) -> String { - return bux_str_trim_right(s); -} - -func String_FromInt(n: int64) -> String { - return bux_int_to_str(n); -} - -func String_ToInt(s: String) -> int64 { - return bux_str_to_int(s); -} - -// String Builder — efficient string construction -struct StringBuilder { - handle: *void, -} - -func StringBuilder_New() -> StringBuilder { - return StringBuilder { handle: bux_sb_new(64) }; -} - -func StringBuilder_NewCap(cap: uint) -> StringBuilder { - return StringBuilder { handle: bux_sb_new(cap) }; -} - -func StringBuilder_Append(sb: *StringBuilder, s: String) { - bux_sb_append(sb.handle, s); -} - -func StringBuilder_AppendInt(sb: *StringBuilder, n: int64) { - bux_sb_append_int(sb.handle, n); -} - -func StringBuilder_AppendFloat(sb: *StringBuilder, f: float64) { - bux_sb_append_float(sb.handle, f); -} - -func StringBuilder_AppendChar(sb: *StringBuilder, c: char8) { - bux_sb_append_char(sb.handle, c); -} - -func StringBuilder_Build(sb: *StringBuilder) -> String { - return bux_sb_build(sb.handle); -} - -func StringBuilder_Free(sb: *StringBuilder) { - bux_sb_free(sb.handle); -} - -/* True if empty or only whitespace (space, tab, CR, LF) */ -func String_IsBlank(s: String) -> bool { - let n: uint = bux_strlen(s); - var i: uint = 0; - while i < n { - let ch: String = bux_str_slice(s, i, 1); - if !(String_Eq(ch, " ") || String_Eq(ch, "\t") || String_Eq(ch, "\n") || String_Eq(ch, "\r")) { + /// True if `s` begins with `prefix`. + func String_StartsWith(s: String, prefix: String) -> bool { + let s_len: uint = bux_strlen(s); + let p_len: uint = bux_strlen(prefix); + if p_len > s_len { return false; } - i = i + 1; + let r: int = bux_strncmp(s, prefix, p_len); + return r == 0; } - return true; -} -/* Repeat s, count times (count==0 → empty string) */ -func String_Repeat(s: String, count: uint) -> String { - if count == 0 { - return ""; - } - if count == 1 { - return s; - } - var sb: StringBuilder = StringBuilder_New(); - var i: uint = 0; - while i < count { - StringBuilder_Append(&sb, s); - i = i + 1; - } - let result: String = StringBuilder_Build(&sb); - StringBuilder_Free(&sb); - return result; -} - -// --------------------------------------------------------------------------- -// String split/join -// --------------------------------------------------------------------------- - -func String_SplitCount(s: String, delim: String) -> uint { - return bux_str_split_count(s, delim); -} - -func String_SplitPart(s: String, delim: String, index: uint) -> String { - return bux_str_split_part(s, delim, index); -} - -func String_Join2(a: String, b: String, sep: String) -> String { - return bux_str_join2(a, b, sep); -} - -// --------------------------------------------------------------------------- -// String find/replace/format -// --------------------------------------------------------------------------- - -// String_Chars — return single-character string at index (for iteration) -func String_Chars(s: String, index: uint) -> String { - return bux_str_slice(s, index, 1); -} - -func String_Find(haystack: String, needle: String) -> String { - return bux_strstr(haystack, needle); -} - -func String_Offset(pos: String, base: String) -> uint { - return bux_str_offset(pos, base); -} - -func String_Replace(s: String, old: String, new: String) -> String { - let pos: String = bux_strstr(s, old); - if String_IsNull(pos) { - return s; - } - let oldLen: uint = bux_strlen(old); - let prefixLen: uint = String_Offset(pos, s); - let prefix: String = bux_str_slice(s, 0, prefixLen); - let suffix: String = bux_str_slice(s, prefixLen + oldLen, bux_strlen(s) - prefixLen - oldLen); - let temp: String = String_Concat(prefix, new); - let result: String = String_Concat(temp, suffix); - return result; -} - -/* Replace every non-overlapping occurrence of old with new. - Empty old is a no-op (returns s unchanged). Safe if new contains old. */ -func String_ReplaceAll(s: String, old: String, new: String) -> String { - let oldLen: uint = bux_strlen(old); - if oldLen == 0 { - return s; - } - var sb: StringBuilder = StringBuilder_New(); - var remaining: String = s; - while true { - let pos: String = bux_strstr(remaining, old); - if String_IsNull(pos) { - StringBuilder_Append(&sb, remaining); - break; + /// True if `s` ends with `suffix`. + func String_EndsWith(s: String, suffix: String) -> bool { + let s_len: uint = bux_strlen(s); + let suf_len: uint = bux_strlen(suffix); + if suf_len > s_len { + return false; } - let prefixLen: uint = String_Offset(pos, remaining); - let prefix: String = bux_str_slice(remaining, 0, prefixLen); - StringBuilder_Append(&sb, prefix); - StringBuilder_Append(&sb, new); - let remLen: uint = bux_strlen(remaining); - remaining = bux_str_slice(remaining, prefixLen + oldLen, remLen - prefixLen - oldLen); + let start: uint = s_len - suf_len; + let tail: String = bux_str_slice(s, start, suf_len); + let eq: bool = bux_strcmp(tail, suffix) == 0; + return eq; } - let result: String = StringBuilder_Build(&sb); - StringBuilder_Free(&sb); - return result; -} -extern func bux_str_to_float(s: String) -> float64; + /// True if `substr` occurs anywhere in `s`. + func String_Contains(s: String, substr: String) -> bool { + let r: int = bux_str_contains(s, substr); + return r != 0; + } -func String_ToFloat(s: String) -> float64 { - return bux_str_to_float(s); -} + func String_Slice(s: String, start: uint, len: uint) -> String { + return bux_str_slice(s, start, len); + } -func String_FromBool(b: bool) -> String { - if b { return "true"; } - return "false"; -} + func String_Trim(s: String) -> String { + return bux_str_trim(s); + } -func String_FromFloat(f: float64) -> String { - return bux_float_to_string(f); -} + func String_TrimLeft(s: String) -> String { + return bux_str_trim_left(s); + } -func String_Format1(pattern: String, a0: String) -> String { - return bux_str_format(pattern, a0, "", "", "", "", "", "", ""); -} + func String_TrimRight(s: String) -> String { + return bux_str_trim_right(s); + } -func String_Format2(pattern: String, a0: String, a1: String) -> String { - return bux_str_format(pattern, a0, a1, "", "", "", "", "", ""); -} + func String_FromInt(n: int64) -> String { + return bux_int_to_str(n); + } -func String_Format3(pattern: String, a0: String, a1: String, a2: String) -> String { - return bux_str_format(pattern, a0, a1, a2, "", "", "", "", ""); -} + func String_ToInt(s: String) -> int64 { + return bux_str_to_int(s); + } + + // String Builder — efficient string construction + struct StringBuilder { + handle: *void, + } + + func StringBuilder_New() -> StringBuilder { + return StringBuilder { handle: bux_sb_new(64) }; + } + + func StringBuilder_NewCap(cap: uint) -> StringBuilder { + return StringBuilder { handle: bux_sb_new(cap) }; + } + + func StringBuilder_Append(sb: *StringBuilder, s: String) { + bux_sb_append(sb.handle, s); + } + + func StringBuilder_AppendInt(sb: *StringBuilder, n: int64) { + bux_sb_append_int(sb.handle, n); + } + + func StringBuilder_AppendFloat(sb: *StringBuilder, f: float64) { + bux_sb_append_float(sb.handle, f); + } + + func StringBuilder_AppendChar(sb: *StringBuilder, c: char8) { + bux_sb_append_char(sb.handle, c); + } + + func StringBuilder_Build(sb: *StringBuilder) -> String { + return bux_sb_build(sb.handle); + } + + func StringBuilder_Free(sb: *StringBuilder) { + bux_sb_free(sb.handle); + } + + /// True if empty or only whitespace (space, tab, CR, LF). + func String_IsBlank(s: String) -> bool { + let n: uint = bux_strlen(s); + var i: uint = 0; + while i < n { + let ch: String = bux_str_slice(s, i, 1); + if !(String_Eq(ch, " ") || String_Eq(ch, "\t") || String_Eq(ch, "\n") || String_Eq(ch, "\r")) { + return false; + } + i = i + 1; + } + return true; + } + + /// Repeat `s`, `count` times (`count == 0` → empty string). + func String_Repeat(s: String, count: uint) -> String { + if count == 0 { + return ""; + } + if count == 1 { + return s; + } + var sb: StringBuilder = StringBuilder_New(); + var i: uint = 0; + while i < count { + StringBuilder_Append(&sb, s); + i = i + 1; + } + let result: String = StringBuilder_Build(&sb); + StringBuilder_Free(&sb); + return result; + } + + // --------------------------------------------------------------------------- + // String split/join + // --------------------------------------------------------------------------- + + func String_SplitCount(s: String, delim: String) -> uint { + return bux_str_split_count(s, delim); + } + + func String_SplitPart(s: String, delim: String, index: uint) -> String { + return bux_str_split_part(s, delim, index); + } + + func String_Join2(a: String, b: String, sep: String) -> String { + return bux_str_join2(a, b, sep); + } + + // --------------------------------------------------------------------------- + // String find/replace/format + // --------------------------------------------------------------------------- + + // String_Chars — return single-character string at index (for iteration) + func String_Chars(s: String, index: uint) -> String { + return bux_str_slice(s, index, 1); + } + + func String_Find(haystack: String, needle: String) -> String { + return bux_strstr(haystack, needle); + } + + func String_Offset(pos: String, base: String) -> uint { + return bux_str_offset(pos, base); + } + + func String_Replace(s: String, old: String, new: String) -> String { + let pos: String = bux_strstr(s, old); + if String_IsNull(pos) { + return s; + } + let oldLen: uint = bux_strlen(old); + let prefixLen: uint = String_Offset(pos, s); + let prefix: String = bux_str_slice(s, 0, prefixLen); + let suffix: String = bux_str_slice(s, prefixLen + oldLen, bux_strlen(s) - prefixLen - oldLen); + let temp: String = String_Concat(prefix, new); + let result: String = String_Concat(temp, suffix); + return result; + } + + /// Replace every non-overlapping occurrence of `old` with `new`. + /// Empty `old` is a no-op (returns `s` unchanged). Safe if `new` contains `old`. + func String_ReplaceAll(s: String, old: String, new: String) -> String { + let oldLen: uint = bux_strlen(old); + if oldLen == 0 { + return s; + } + var sb: StringBuilder = StringBuilder_New(); + var remaining: String = s; + while true { + let pos: String = bux_strstr(remaining, old); + if String_IsNull(pos) { + StringBuilder_Append(&sb, remaining); + break; + } + let prefixLen: uint = String_Offset(pos, remaining); + let prefix: String = bux_str_slice(remaining, 0, prefixLen); + StringBuilder_Append(&sb, prefix); + StringBuilder_Append(&sb, new); + let remLen: uint = bux_strlen(remaining); + remaining = bux_str_slice(remaining, prefixLen + oldLen, remLen - prefixLen - oldLen); + } + let result: String = StringBuilder_Build(&sb); + StringBuilder_Free(&sb); + return result; + } + + extern func bux_str_to_float(s: String) -> float64; + + func String_ToFloat(s: String) -> float64 { + return bux_str_to_float(s); + } + + func String_FromBool(b: bool) -> String { + if b { return "true"; } + return "false"; + } + + func String_FromFloat(f: float64) -> String { + return bux_float_to_string(f); + } + + func String_Format1(pattern: String, a0: String) -> String { + return bux_str_format(pattern, a0, "", "", "", "", "", "", ""); + } + + func String_Format2(pattern: String, a0: String, a1: String) -> String { + return bux_str_format(pattern, a0, a1, "", "", "", "", "", ""); + } + + func String_Format3(pattern: String, a0: String, a1: String, a2: String) -> String { + return bux_str_format(pattern, a0, a1, a2, "", "", "", "", ""); + } } diff --git a/lib/Sync.bux b/lib/Sync.bux index 22c935c..06fbba6 100644 --- a/lib/Sync.bux +++ b/lib/Sync.bux @@ -1,58 +1,58 @@ module Std::Sync { -extern func bux_mutex_new() -> *void; -extern func bux_mutex_lock(handle: *void); -extern func bux_mutex_unlock(handle: *void); -extern func bux_mutex_free(handle: *void); + extern func bux_mutex_new() -> *void; + extern func bux_mutex_lock(handle: *void); + extern func bux_mutex_unlock(handle: *void); + extern func bux_mutex_free(handle: *void); -extern func bux_rwlock_new() -> *void; -extern func bux_rwlock_rdlock(handle: *void); -extern func bux_rwlock_wrlock(handle: *void); -extern func bux_rwlock_unlock(handle: *void); -extern func bux_rwlock_free(handle: *void); + extern func bux_rwlock_new() -> *void; + extern func bux_rwlock_rdlock(handle: *void); + extern func bux_rwlock_wrlock(handle: *void); + extern func bux_rwlock_unlock(handle: *void); + extern func bux_rwlock_free(handle: *void); -struct Mutex { - handle: *void; -} + struct Mutex { + handle: *void; + } -struct RwLock { - handle: *void; -} + struct RwLock { + handle: *void; + } -func Mutex_New() -> Mutex { - return Mutex { handle: bux_mutex_new() }; -} + func Mutex_New() -> Mutex { + return Mutex { handle: bux_mutex_new() }; + } -func Mutex_Lock(m: *Mutex) { - bux_mutex_lock(m.handle); -} + func Mutex_Lock(m: *Mutex) { + bux_mutex_lock(m.handle); + } -func Mutex_Unlock(m: *Mutex) { - bux_mutex_unlock(m.handle); -} + func Mutex_Unlock(m: *Mutex) { + bux_mutex_unlock(m.handle); + } -func Mutex_Free(m: *Mutex) { - bux_mutex_free(m.handle); -} + func Mutex_Free(m: *Mutex) { + bux_mutex_free(m.handle); + } -func RwLock_New() -> RwLock { - return RwLock { handle: bux_rwlock_new() }; -} + func RwLock_New() -> RwLock { + return RwLock { handle: bux_rwlock_new() }; + } -func RwLock_ReadLock(rw: *RwLock) { - bux_rwlock_rdlock(rw.handle); -} + func RwLock_ReadLock(rw: *RwLock) { + bux_rwlock_rdlock(rw.handle); + } -func RwLock_WriteLock(rw: *RwLock) { - bux_rwlock_wrlock(rw.handle); -} + func RwLock_WriteLock(rw: *RwLock) { + bux_rwlock_wrlock(rw.handle); + } -func RwLock_Unlock(rw: *RwLock) { - bux_rwlock_unlock(rw.handle); -} + func RwLock_Unlock(rw: *RwLock) { + bux_rwlock_unlock(rw.handle); + } -func RwLock_Free(rw: *RwLock) { - bux_rwlock_free(rw.handle); -} + func RwLock_Free(rw: *RwLock) { + bux_rwlock_free(rw.handle); + } } diff --git a/lib/Task.bux b/lib/Task.bux index 70e159b..0292a47 100644 --- a/lib/Task.bux +++ b/lib/Task.bux @@ -1,43 +1,43 @@ module Std::Task { -extern func bux_task_init(num_workers: int); -extern func bux_task_spawn(fn: *void, arg: *void) -> *void; -extern func bux_task_join(handle: *void); -extern func bux_task_sleep(ms: int64); -extern func bux_task_yield(); -extern func bux_task_current_id() -> int; -extern func bux_task_shutdown(); + extern func bux_task_init(num_workers: int); + extern func bux_task_spawn(fn: *void, arg: *void) -> *void; + extern func bux_task_join(handle: *void); + extern func bux_task_sleep(ms: int64); + extern func bux_task_yield(); + extern func bux_task_current_id() -> int; + extern func bux_task_shutdown(); -struct TaskHandle { - handle: *void; -} + struct TaskHandle { + handle: *void; + } -func Task_Init(num_workers: int) { - bux_task_init(num_workers); -} + func Task_Init(num_workers: int) { + bux_task_init(num_workers); + } -func Task_Spawn(fn: *void, arg: *void) -> TaskHandle { - return TaskHandle { handle: bux_task_spawn(fn, arg) }; -} + func Task_Spawn(fn: *void, arg: *void) -> TaskHandle { + return TaskHandle { handle: bux_task_spawn(fn, arg) }; + } -func Task_Wait(t: TaskHandle) { - bux_task_join(t.handle); -} + func Task_Wait(t: TaskHandle) { + bux_task_join(t.handle); + } -func Task_Sleep(ms: int64) { - bux_task_sleep(ms); -} + func Task_Sleep(ms: int64) { + bux_task_sleep(ms); + } -func Task_Yield() { - bux_task_yield(); -} + func Task_Yield() { + bux_task_yield(); + } -func Task_CurrentId() -> int { - return bux_task_current_id(); -} + func Task_CurrentId() -> int { + return bux_task_current_id(); + } -func Task_Shutdown() { - bux_task_shutdown(); -} + func Task_Shutdown() { + bux_task_shutdown(); + } } diff --git a/lib/Test.bux b/lib/Test.bux index 9c23fdc..2641692 100644 --- a/lib/Test.bux +++ b/lib/Test.bux @@ -1,76 +1,86 @@ module Std::Test { -import Std::Io::{PrintLine, PrintInt}; -import Std::String::{String_Eq}; + import Std::Io::{PrintLine, PrintInt}; + import Std::String::{String_Eq}; -extern func bux_exit(code: int); -extern func bux_assert(cond: int, file: String, line: int, expr: String); + extern func bux_exit(code: int); + extern func bux_assert(cond: int, file: String, line: int, expr: String); -func Test_Exit(code: int) { - bux_exit(code); -} + /// Exit the process with `code` (for test runners). + func Test_Exit(code: int) { + bux_exit(code); + } -func Test_Assert(cond: bool) { - bux_assert(cond as int, "", 0, ""); -} + /// Assert `cond` is true; abort on failure. + func Test_Assert(cond: bool) { + bux_assert(cond as int, "", 0, ""); + } -func Test_AssertEqInt(a: int, b: int) { - if a != b { - PrintLine("ASSERT_EQ_INT FAILED:"); - PrintInt(a); - PrintLine(" != "); - PrintInt(b); + /// Assert two ints are equal; print both values and exit 1 on mismatch. + func Test_AssertEqInt(a: int, b: int) { + if a != b { + PrintLine("ASSERT_EQ_INT FAILED:"); + PrintInt(a); + PrintLine(" != "); + PrintInt(b); + bux_exit(1); + } + } + + /// Assert two ints differ. + func Test_AssertNeqInt(a: int, b: int) { + if a == b { + PrintLine("ASSERT_NEQ_INT FAILED: both are"); + PrintInt(a); + bux_exit(1); + } + } + + /// Assert two strings are equal (`String_Eq`). + func Test_AssertEqString(a: String, b: String) { + if !String_Eq(a, b) { + PrintLine("ASSERT_EQ_STRING FAILED:"); + PrintLine(a); + PrintLine(" != "); + PrintLine(b); + bux_exit(1); + } + } + + /// Assert two bools are equal. + func Test_AssertEqBool(a: bool, b: bool) { + if a != b { + PrintLine("ASSERT_EQ_BOOL FAILED"); + bux_exit(1); + } + } + + /// Assert `cond` is true. + func Test_AssertTrue(cond: bool) { + if !cond { + PrintLine("ASSERT_TRUE FAILED"); + bux_exit(1); + } + } + + /// Assert `cond` is false. + func Test_AssertFalse(cond: bool) { + if cond { + PrintLine("ASSERT_FALSE FAILED"); + bux_exit(1); + } + } + + /// Fail the test with a message and exit 1. + func Test_Fail(msg: String) { + PrintLine("FAIL:"); + PrintLine(msg); bux_exit(1); } -} -func Test_AssertNeqInt(a: int, b: int) { - if a == b { - PrintLine("ASSERT_NEQ_INT FAILED: both are"); - PrintInt(a); - bux_exit(1); + /// Print a PASS line (for human-readable runners / goldens). + func Test_Pass(msg: String) { + PrintLine("PASS:"); + PrintLine(msg); } -} - -func Test_AssertEqString(a: String, b: String) { - if !String_Eq(a, b) { - PrintLine("ASSERT_EQ_STRING FAILED:"); - PrintLine(a); - PrintLine(" != "); - PrintLine(b); - bux_exit(1); - } -} - -func Test_AssertEqBool(a: bool, b: bool) { - if a != b { - PrintLine("ASSERT_EQ_BOOL FAILED"); - bux_exit(1); - } -} - -func Test_AssertTrue(cond: bool) { - if !cond { - PrintLine("ASSERT_TRUE FAILED"); - bux_exit(1); - } -} - -func Test_AssertFalse(cond: bool) { - if cond { - PrintLine("ASSERT_FALSE FAILED"); - bux_exit(1); - } -} - -func Test_Fail(msg: String) { - PrintLine("FAIL:"); - PrintLine(msg); - bux_exit(1); -} - -func Test_Pass(msg: String) { - PrintLine("PASS:"); - PrintLine(msg); -} } diff --git a/lib/Time.bux b/lib/Time.bux index a7d4fc2..d528a7f 100644 --- a/lib/Time.bux +++ b/lib/Time.bux @@ -1,19 +1,19 @@ module Std::Time { -extern func bux_time_ms() -> int64; -extern func bux_time_us() -> int64; -extern func bux_sleep_ms(ms: int64); + extern func bux_time_ms() -> int64; + extern func bux_time_us() -> int64; + extern func bux_sleep_ms(ms: int64); -func Time_NowMs() -> int64 { - return bux_time_ms(); -} + func Time_NowMs() -> int64 { + return bux_time_ms(); + } -func Time_NowUs() -> int64 { - return bux_time_us(); -} + func Time_NowUs() -> int64 { + return bux_time_us(); + } -func Time_SleepMs(ms: int64) { - bux_sleep_ms(ms); -} + func Time_SleepMs(ms: int64) { + bux_sleep_ms(ms); + } } diff --git a/lib/crypto/aes.bux b/lib/crypto/aes.bux index 55f963d..1b3668b 100644 --- a/lib/crypto/aes.bux +++ b/lib/crypto/aes.bux @@ -3,65 +3,65 @@ // ============================================================================= module Std::Crypto::Aes { -import Std::Mem::{Alloc, Free}; -import Std::String::{String_Len}; + import Std::Mem::{Alloc, Free}; + import Std::String::{String_Len}; -extern func bux_random_bytes(buf: *void, len: int) -> int; -extern func bux_aes_256_cbc_encrypt(plain: String, plainlen: int, key: String, iv: String, outlen: *int) -> String; -extern func bux_aes_256_cbc_decrypt(cipher: String, cipherlen: int, key: String, iv: String, outlen: *int) -> String; -extern func bux_aes_256_gcm_encrypt(plain: String, plainlen: int, key: String, iv: String, tag: *void, outlen: *int) -> String; -extern func bux_aes_256_gcm_decrypt(cipher: String, cipherlen: int, key: String, iv: String, tag: String, outlen: *int) -> String; + extern func bux_random_bytes(buf: *void, len: int) -> int; + extern func bux_aes_256_cbc_encrypt(plain: String, plainlen: int, key: String, iv: String, outlen: *int) -> String; + extern func bux_aes_256_cbc_decrypt(cipher: String, cipherlen: int, key: String, iv: String, outlen: *int) -> String; + extern func bux_aes_256_gcm_encrypt(plain: String, plainlen: int, key: String, iv: String, tag: *void, outlen: *int) -> String; + extern func bux_aes_256_gcm_decrypt(cipher: String, cipherlen: int, key: String, iv: String, tag: String, outlen: *int) -> String; -// --- AES-256-CBC --- + // --- AES-256-CBC --- -const AES_KEY_SIZE: int = 32; // 256 bits -const AES_IV_SIZE: int = 16; // 128 bits -const AES_GCM_TAG_SIZE: int = 16; + const AES_KEY_SIZE: int = 32; // 256 bits + const AES_IV_SIZE: int = 16; // 128 bits + const AES_GCM_TAG_SIZE: int = 16; -// Generate a random 256-bit AES key (returns raw 32 bytes) -func Aes_GenerateKey() -> String { - let buf: *void = Alloc(AES_KEY_SIZE as uint); - if bux_random_bytes(buf, AES_KEY_SIZE) != 1 { - Free(buf); - return ""; + // Generate a random 256-bit AES key (returns raw 32 bytes) + func Aes_GenerateKey() -> String { + let buf: *void = Alloc(AES_KEY_SIZE as uint); + if bux_random_bytes(buf, AES_KEY_SIZE) != 1 { + Free(buf); + return ""; + } + return buf as String; } - return buf as String; -} -// Generate a random 128-bit IV (returns raw 16 bytes) -func Aes_GenerateIV() -> String { - let buf: *void = Alloc(AES_IV_SIZE as uint); - if bux_random_bytes(buf, AES_IV_SIZE) != 1 { - Free(buf); - return ""; + // Generate a random 128-bit IV (returns raw 16 bytes) + func Aes_GenerateIV() -> String { + let buf: *void = Alloc(AES_IV_SIZE as uint); + if bux_random_bytes(buf, AES_IV_SIZE) != 1 { + Free(buf); + return ""; + } + return buf as String; } - return buf as String; -} -// AES-256-CBC encrypt. plain and key are binary strings, iv is 16 bytes. -// Returns ciphertext (may be longer than plain due to PKCS#7 padding). -func Aes_CbcEncrypt(plain: String, key: String, iv: String) -> String { - let outlen: int = 0; - return bux_aes_256_cbc_encrypt(plain, String_Len(plain) as int, key, iv, &outlen); -} + // AES-256-CBC encrypt. plain and key are binary strings, iv is 16 bytes. + // Returns ciphertext (may be longer than plain due to PKCS#7 padding). + func Aes_CbcEncrypt(plain: String, key: String, iv: String) -> String { + let outlen: int = 0; + return bux_aes_256_cbc_encrypt(plain, String_Len(plain) as int, key, iv, &outlen); + } -// AES-256-CBC decrypt. Returns plaintext. -func Aes_CbcDecrypt(cipher: String, key: String, iv: String) -> String { - let outlen: int = 0; - return bux_aes_256_cbc_decrypt(cipher, String_Len(cipher) as int, key, iv, &outlen); -} + // AES-256-CBC decrypt. Returns plaintext. + func Aes_CbcDecrypt(cipher: String, key: String, iv: String) -> String { + let outlen: int = 0; + return bux_aes_256_cbc_decrypt(cipher, String_Len(cipher) as int, key, iv, &outlen); + } -// --- AES-256-GCM (Authenticated Encryption) --- + // --- AES-256-GCM (Authenticated Encryption) --- -// AES-256-GCM encrypt. Returns ciphertext. tag receives 16-byte authentication tag. -func Aes_GcmEncrypt(plain: String, key: String, iv: String, tag: *void) -> String { - let outlen: int = 0; - return bux_aes_256_gcm_encrypt(plain, String_Len(plain) as int, key, iv, tag, &outlen); -} + // AES-256-GCM encrypt. Returns ciphertext. tag receives 16-byte authentication tag. + func Aes_GcmEncrypt(plain: String, key: String, iv: String, tag: *void) -> String { + let outlen: int = 0; + return bux_aes_256_gcm_encrypt(plain, String_Len(plain) as int, key, iv, tag, &outlen); + } -// AES-256-GCM decrypt. Returns plaintext. tag must be the 16-byte auth tag from encryption. -func Aes_GcmDecrypt(cipher: String, key: String, iv: String, tag: String) -> String { - let outlen: int = 0; - return bux_aes_256_gcm_decrypt(cipher, String_Len(cipher) as int, key, iv, tag, &outlen); -} + // AES-256-GCM decrypt. Returns plaintext. tag must be the 16-byte auth tag from encryption. + func Aes_GcmDecrypt(cipher: String, key: String, iv: String, tag: String) -> String { + let outlen: int = 0; + return bux_aes_256_gcm_decrypt(cipher, String_Len(cipher) as int, key, iv, tag, &outlen); + } } diff --git a/lib/crypto/base64.bux b/lib/crypto/base64.bux index 3897556..d7ffa96 100644 --- a/lib/crypto/base64.bux +++ b/lib/crypto/base64.bux @@ -3,32 +3,32 @@ // ============================================================================= module Std::Crypto::Base64 { -import Std::String::{String_Len}; + import Std::String::{String_Len}; -extern func bux_base64_encode(data: String, len: int) -> String; -extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; -extern func bux_base64url_encode(data: String, len: int) -> String; -extern func bux_base64url_decode(data: String, len: int, outlen: *int) -> String; + extern func bux_base64_encode(data: String, len: int) -> String; + extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; + extern func bux_base64url_encode(data: String, len: int) -> String; + extern func bux_base64url_decode(data: String, len: int, outlen: *int) -> String; -// --- Standard Base64 --- + // --- Standard Base64 --- -func Base64_Encode(s: String) -> String { - return bux_base64_encode(s, String_Len(s) as int); -} - -func Base64_Decode(s: String) -> String { - let outlen: int = 0; - return bux_base64_decode(s, String_Len(s) as int, &outlen); -} - -// --- Base64URL (RFC 4648 §5, uses - and _ instead of + and /, no padding) --- - -func Base64URL_Encode(s: String) -> String { - return bux_base64url_encode(s, String_Len(s) as int); -} - -func Base64URL_Decode(s: String) -> String { - let outlen: int = 0; - return bux_base64url_decode(s, String_Len(s) as int, &outlen); -} + func Base64_Encode(s: String) -> String { + return bux_base64_encode(s, String_Len(s) as int); + } + + func Base64_Decode(s: String) -> String { + let outlen: int = 0; + return bux_base64_decode(s, String_Len(s) as int, &outlen); + } + + // --- Base64URL (RFC 4648 §5, uses - and _ instead of + and /, no padding) --- + + func Base64URL_Encode(s: String) -> String { + return bux_base64url_encode(s, String_Len(s) as int); + } + + func Base64URL_Decode(s: String) -> String { + let outlen: int = 0; + return bux_base64url_decode(s, String_Len(s) as int, &outlen); + } } diff --git a/lib/crypto/ecdsa.bux b/lib/crypto/ecdsa.bux index 1834019..564b016 100644 --- a/lib/crypto/ecdsa.bux +++ b/lib/crypto/ecdsa.bux @@ -3,56 +3,56 @@ // ============================================================================= module Std::Crypto::Ecdsa { -import Std::Mem::{Alloc, Free}; -import Std::String::{String_Len}; + import Std::Mem::{Alloc, Free}; + import Std::String::{String_Len}; -// Extern declarations for the runtime C implementations -extern func bux_ecdsa_sign_p256(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; -extern func bux_ecdsa_verify_p256(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; -extern func bux_ecdsa_sign_p384(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; -extern func bux_ecdsa_verify_p384(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; -extern func bux_base64_encode(data: String, len: int) -> String; -extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; + // Extern declarations for the runtime C implementations + extern func bux_ecdsa_sign_p256(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; + extern func bux_ecdsa_verify_p256(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; + extern func bux_ecdsa_sign_p384(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; + extern func bux_ecdsa_verify_p384(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; + extern func bux_base64_encode(data: String, len: int) -> String; + extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; -func Ecdsa_SignP256(pemPrivateKey: String, data: String) -> String { - let siglen: int = 0; - return bux_ecdsa_sign_p256(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); -} + func Ecdsa_SignP256(pemPrivateKey: String, data: String) -> String { + let siglen: int = 0; + return bux_ecdsa_sign_p256(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); + } -func Ecdsa_SignP256Base64(pemPrivateKey: String, data: String) -> String { - let raw: String = Ecdsa_SignP256(pemPrivateKey, data); - return bux_base64_encode(raw, String_Len(raw) as int); -} + func Ecdsa_SignP256Base64(pemPrivateKey: String, data: String) -> String { + let raw: String = Ecdsa_SignP256(pemPrivateKey, data); + return bux_base64_encode(raw, String_Len(raw) as int); + } -func Ecdsa_VerifyP256(pemPublicKey: String, data: String, signature: String) -> bool { - let r: int = bux_ecdsa_verify_p256(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); - return r == 1; -} + func Ecdsa_VerifyP256(pemPublicKey: String, data: String, signature: String) -> bool { + let r: int = bux_ecdsa_verify_p256(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); + return r == 1; + } -func Ecdsa_VerifyP256Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { - let outlen: int = 0; - let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); - return Ecdsa_VerifyP256(pemPublicKey, data, sig); -} + func Ecdsa_VerifyP256Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { + let outlen: int = 0; + let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); + return Ecdsa_VerifyP256(pemPublicKey, data, sig); + } -func Ecdsa_SignP384(pemPrivateKey: String, data: String) -> String { - let siglen: int = 0; - return bux_ecdsa_sign_p384(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); -} + func Ecdsa_SignP384(pemPrivateKey: String, data: String) -> String { + let siglen: int = 0; + return bux_ecdsa_sign_p384(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); + } -func Ecdsa_SignP384Base64(pemPrivateKey: String, data: String) -> String { - let raw: String = Ecdsa_SignP384(pemPrivateKey, data); - return bux_base64_encode(raw, String_Len(raw) as int); -} + func Ecdsa_SignP384Base64(pemPrivateKey: String, data: String) -> String { + let raw: String = Ecdsa_SignP384(pemPrivateKey, data); + return bux_base64_encode(raw, String_Len(raw) as int); + } -func Ecdsa_VerifyP384(pemPublicKey: String, data: String, signature: String) -> bool { - let r: int = bux_ecdsa_verify_p384(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); - return r == 1; -} + func Ecdsa_VerifyP384(pemPublicKey: String, data: String, signature: String) -> bool { + let r: int = bux_ecdsa_verify_p384(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); + return r == 1; + } -func Ecdsa_VerifyP384Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { - let outlen: int = 0; - let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); - return Ecdsa_VerifyP384(pemPublicKey, data, sig); -} + func Ecdsa_VerifyP384Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { + let outlen: int = 0; + let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); + return Ecdsa_VerifyP384(pemPublicKey, data, sig); + } } diff --git a/lib/crypto/ed25519.bux b/lib/crypto/ed25519.bux index 8e8eba5..b66329b 100644 --- a/lib/crypto/ed25519.bux +++ b/lib/crypto/ed25519.bux @@ -3,78 +3,78 @@ // ============================================================================= module Std::Crypto::Ed25519 { -import Std::Mem::{Alloc, Free}; -import Std::String::{String_Len, String_Concat}; + import Std::Mem::{Alloc, Free}; + import Std::String::{String_Len, String_Concat}; -extern func bux_ed25519_keypair(pubKey: *void, privKey: *void) -> int; -extern func bux_ed25519_sign(privKey: String, data: String, datalen: int, sig: *void) -> int; -extern func bux_ed25519_verify(pubKey: String, sig: String, data: String, datalen: int) -> int; -extern func bux_base64_encode(data: String, len: int) -> String; -extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; + extern func bux_ed25519_keypair(pubKey: *void, privKey: *void) -> int; + extern func bux_ed25519_sign(privKey: String, data: String, datalen: int, sig: *void) -> int; + extern func bux_ed25519_verify(pubKey: String, sig: String, data: String, datalen: int) -> int; + extern func bux_base64_encode(data: String, len: int) -> String; + extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; -const ED25519_PUBKEY_SIZE: int = 32; -const ED25519_PRIVKEY_SIZE: int = 32; -const ED25519_SIG_SIZE: int = 64; + const ED25519_PUBKEY_SIZE: int = 32; + const ED25519_PRIVKEY_SIZE: int = 32; + const ED25519_SIG_SIZE: int = 64; -// --- Key Generation --- + // --- Key Generation --- -// Ed25519_Keypair: generates a new keypair. -// Returns true on success. pubKey and privKey receive 32-byte raw keys. -func Ed25519_Keypair(pubKey: *void, privKey: *void) -> bool { - let r: int = bux_ed25519_keypair(pubKey, privKey); - return r == 1; -} + // Ed25519_Keypair: generates a new keypair. + // Returns true on success. pubKey and privKey receive 32-byte raw keys. + func Ed25519_Keypair(pubKey: *void, privKey: *void) -> bool { + let r: int = bux_ed25519_keypair(pubKey, privKey); + return r == 1; + } -// Convenience: generate and return base64-encoded keypair -func Ed25519_KeypairBase64() -> String { - let pubBuf: *void = Alloc(ED25519_PUBKEY_SIZE as uint); - let priv: *void = Alloc(ED25519_PRIVKEY_SIZE as uint); - if bux_ed25519_keypair(pubBuf, priv) != 1 { + // Convenience: generate and return base64-encoded keypair + func Ed25519_KeypairBase64() -> String { + let pubBuf: *void = Alloc(ED25519_PUBKEY_SIZE as uint); + let priv: *void = Alloc(ED25519_PRIVKEY_SIZE as uint); + if bux_ed25519_keypair(pubBuf, priv) != 1 { + Free(pubBuf); + Free(priv); + return ""; + } + // Return "pub_b64:priv_b64" + let pubB64: String = bux_base64_encode(pubBuf as String, ED25519_PUBKEY_SIZE); + let privB64: String = bux_base64_encode(priv as String, ED25519_PRIVKEY_SIZE); Free(pubBuf); Free(priv); - return ""; + let pair: String = String_Concat(pubB64, ":"); + return String_Concat(pair, privB64); } - // Return "pub_b64:priv_b64" - let pubB64: String = bux_base64_encode(pubBuf as String, ED25519_PUBKEY_SIZE); - let privB64: String = bux_base64_encode(priv as String, ED25519_PRIVKEY_SIZE); - Free(pubBuf); - Free(priv); - let pair: String = String_Concat(pubB64, ":"); - return String_Concat(pair, privB64); -} -// --- Sign --- + // --- Sign --- -// Ed25519_Sign: sign data with 32-byte raw private key. Returns 64-byte raw signature. -func Ed25519_Sign(privKey: String, data: String) -> String { - let sig: *void = Alloc(ED25519_SIG_SIZE as uint); - if bux_ed25519_sign(privKey, data, String_Len(data) as int, sig) != 1 { - Free(sig); - return ""; + // Ed25519_Sign: sign data with 32-byte raw private key. Returns 64-byte raw signature. + func Ed25519_Sign(privKey: String, data: String) -> String { + let sig: *void = Alloc(ED25519_SIG_SIZE as uint); + if bux_ed25519_sign(privKey, data, String_Len(data) as int, sig) != 1 { + Free(sig); + return ""; + } + return sig as String; } - return sig as String; -} -// Convenience: sign and return base64-encoded signature -func Ed25519_SignBase64(privKey: String, data: String) -> String { - let sig: String = Ed25519_Sign(privKey, data); - if String_Len(sig) == 0 { return ""; } - return bux_base64_encode(sig, ED25519_SIG_SIZE); -} + // Convenience: sign and return base64-encoded signature + func Ed25519_SignBase64(privKey: String, data: String) -> String { + let sig: String = Ed25519_Sign(privKey, data); + if String_Len(sig) == 0 { return ""; } + return bux_base64_encode(sig, ED25519_SIG_SIZE); + } -// --- Verify --- + // --- Verify --- -// Ed25519_Verify: verify a 64-byte raw signature against data with 32-byte public key. -func Ed25519_Verify(pubKey: String, signature: String, data: String) -> bool { - let r: int = bux_ed25519_verify(pubKey, signature, data, String_Len(data) as int); - return r == 1; -} + // Ed25519_Verify: verify a 64-byte raw signature against data with 32-byte public key. + func Ed25519_Verify(pubKey: String, signature: String, data: String) -> bool { + let r: int = bux_ed25519_verify(pubKey, signature, data, String_Len(data) as int); + return r == 1; + } -// Convenience: verify a base64-encoded signature -func Ed25519_VerifyBase64(pubKey: String, signatureB64: String, data: String) -> bool { - let outlen: int = 0; - let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); - if outlen != ED25519_SIG_SIZE { return false; } - return Ed25519_Verify(pubKey, sig, data); -} + // Convenience: verify a base64-encoded signature + func Ed25519_VerifyBase64(pubKey: String, signatureB64: String, data: String) -> bool { + let outlen: int = 0; + let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); + if outlen != ED25519_SIG_SIZE { return false; } + return Ed25519_Verify(pubKey, sig, data); + } } diff --git a/lib/crypto/hash.bux b/lib/crypto/hash.bux index 3ed5b55..374a1a7 100644 --- a/lib/crypto/hash.bux +++ b/lib/crypto/hash.bux @@ -3,71 +3,71 @@ // ============================================================================= module Std::Crypto::Hash { -import Std::Mem::{Alloc, Free}; -import Std::String::{String_Len}; + import Std::Mem::{Alloc, Free}; + import Std::String::{String_Len}; -extern func bux_sha1(data: String, len: int, out: *void); -extern func bux_sha256(data: String, len: int, out: *void); -extern func bux_sha384(data: String, len: int, out: *void); -extern func bux_sha512(data: String, len: int, out: *void); -extern func bux_bytes_to_hex(data: *void, len: int) -> String; + extern func bux_sha1(data: String, len: int, out: *void); + extern func bux_sha256(data: String, len: int, out: *void); + extern func bux_sha384(data: String, len: int, out: *void); + extern func bux_sha512(data: String, len: int, out: *void); + extern func bux_bytes_to_hex(data: *void, len: int) -> String; -// --- Convenience wrappers: hex output --- + // --- Convenience wrappers: hex output --- -func Hash_Sha1(data: String) -> String { - let len: int = String_Len(data) as int; - let buf: *void = Alloc(20); - bux_sha1(data, len, buf); - let result: String = bux_bytes_to_hex(buf, 20); - Free(buf); - return result; -} - -func Hash_Sha256(data: String) -> String { - let len: int = String_Len(data) as int; - let buf: *void = Alloc(32); - bux_sha256(data, len, buf); - let result: String = bux_bytes_to_hex(buf, 32); - Free(buf); - return result; -} - -func Hash_Sha384(data: String) -> String { - let len: int = String_Len(data) as int; - let buf: *void = Alloc(48); - bux_sha384(data, len, buf); - let result: String = bux_bytes_to_hex(buf, 48); - Free(buf); - return result; -} - -func Hash_Sha512(data: String) -> String { - let len: int = String_Len(data) as int; - let buf: *void = Alloc(64); - bux_sha512(data, len, buf); - let result: String = bux_bytes_to_hex(buf, 64); - Free(buf); - return result; -} - -// --- Raw binary output (caller must Alloc/Free) --- - -func Hash_Sha256Raw(data: String, out: *void) { - bux_sha256(data, String_Len(data) as int, out); -} - -func Hash_Sha384Raw(data: String, out: *void) { - bux_sha384(data, String_Len(data) as int, out); -} - -func Hash_Sha512Raw(data: String, out: *void) { - bux_sha512(data, String_Len(data) as int, out); -} - -// --- Digest sizes --- - -func Hash_Sha1Size() -> int { return 20; } -func Hash_Sha256Size() -> int { return 32; } -func Hash_Sha384Size() -> int { return 48; } -func Hash_Sha512Size() -> int { return 64; } + func Hash_Sha1(data: String) -> String { + let len: int = String_Len(data) as int; + let buf: *void = Alloc(20); + bux_sha1(data, len, buf); + let result: String = bux_bytes_to_hex(buf, 20); + Free(buf); + return result; + } + + func Hash_Sha256(data: String) -> String { + let len: int = String_Len(data) as int; + let buf: *void = Alloc(32); + bux_sha256(data, len, buf); + let result: String = bux_bytes_to_hex(buf, 32); + Free(buf); + return result; + } + + func Hash_Sha384(data: String) -> String { + let len: int = String_Len(data) as int; + let buf: *void = Alloc(48); + bux_sha384(data, len, buf); + let result: String = bux_bytes_to_hex(buf, 48); + Free(buf); + return result; + } + + func Hash_Sha512(data: String) -> String { + let len: int = String_Len(data) as int; + let buf: *void = Alloc(64); + bux_sha512(data, len, buf); + let result: String = bux_bytes_to_hex(buf, 64); + Free(buf); + return result; + } + + // --- Raw binary output (caller must Alloc/Free) --- + + func Hash_Sha256Raw(data: String, out: *void) { + bux_sha256(data, String_Len(data) as int, out); + } + + func Hash_Sha384Raw(data: String, out: *void) { + bux_sha384(data, String_Len(data) as int, out); + } + + func Hash_Sha512Raw(data: String, out: *void) { + bux_sha512(data, String_Len(data) as int, out); + } + + // --- Digest sizes --- + + func Hash_Sha1Size() -> int { return 20; } + func Hash_Sha256Size() -> int { return 32; } + func Hash_Sha384Size() -> int { return 48; } + func Hash_Sha512Size() -> int { return 64; } } diff --git a/lib/crypto/hmac.bux b/lib/crypto/hmac.bux index 5768c8e..4587996 100644 --- a/lib/crypto/hmac.bux +++ b/lib/crypto/hmac.bux @@ -3,90 +3,90 @@ // ============================================================================= module Std::Crypto::Hmac { -import Std::Mem::{Alloc, Free}; -import Std::String::{String_Len}; + import Std::Mem::{Alloc, Free}; + import Std::String::{String_Len}; -extern func bux_hmac_sha256(key: String, keylen: int, msg: String, msglen: int, out: *void); -extern func bux_hmac_sha384(key: String, keylen: int, msg: String, msglen: int, out: *void); -extern func bux_hmac_sha512(key: String, keylen: int, msg: String, msglen: int, out: *void); -extern func bux_bytes_to_hex(data: *void, len: int) -> String; -extern func bux_base64_encode(data: String, len: int) -> String; + extern func bux_hmac_sha256(key: String, keylen: int, msg: String, msglen: int, out: *void); + extern func bux_hmac_sha384(key: String, keylen: int, msg: String, msglen: int, out: *void); + extern func bux_hmac_sha512(key: String, keylen: int, msg: String, msglen: int, out: *void); + extern func bux_bytes_to_hex(data: *void, len: int) -> String; + extern func bux_base64_encode(data: String, len: int) -> String; -// --- HMAC-SHA256 --- + // --- HMAC-SHA256 --- -func Hmac_Sha256(key: String, message: String) -> String { - let kl: int = String_Len(key) as int; - let ml: int = String_Len(message) as int; - let buf: *void = Alloc(32); - bux_hmac_sha256(key, kl, message, ml, buf); - let result: String = bux_bytes_to_hex(buf, 32); - Free(buf); - return result; -} - -func Hmac_Sha256Raw(key: String, message: String, out: *void) { - bux_hmac_sha256(key, String_Len(key) as int, message, String_Len(message) as int, out); -} - -func Hmac_Sha256Base64(key: String, message: String) -> String { - let kl: int = String_Len(key) as int; - let ml: int = String_Len(message) as int; - let buf: *void = Alloc(32); - bux_hmac_sha256(key, kl, message, ml, buf); - let result: String = bux_base64_encode(buf as String, 32); - Free(buf); - return result; -} - -// --- HMAC-SHA384 --- - -func Hmac_Sha384(key: String, message: String) -> String { - let kl: int = String_Len(key) as int; - let ml: int = String_Len(message) as int; - let buf: *void = Alloc(48); - bux_hmac_sha384(key, kl, message, ml, buf); - let result: String = bux_bytes_to_hex(buf, 48); - Free(buf); - return result; -} - -func Hmac_Sha384Raw(key: String, message: String, out: *void) { - bux_hmac_sha384(key, String_Len(key) as int, message, String_Len(message) as int, out); -} - -func Hmac_Sha384Base64(key: String, message: String) -> String { - let kl: int = String_Len(key) as int; - let ml: int = String_Len(message) as int; - let buf: *void = Alloc(48); - bux_hmac_sha384(key, kl, message, ml, buf); - let result: String = bux_base64_encode(buf as String, 48); - Free(buf); - return result; -} - -// --- HMAC-SHA512 --- - -func Hmac_Sha512(key: String, message: String) -> String { - let kl: int = String_Len(key) as int; - let ml: int = String_Len(message) as int; - let buf: *void = Alloc(64); - bux_hmac_sha512(key, kl, message, ml, buf); - let result: String = bux_bytes_to_hex(buf, 64); - Free(buf); - return result; -} - -func Hmac_Sha512Raw(key: String, message: String, out: *void) { - bux_hmac_sha512(key, String_Len(key) as int, message, String_Len(message) as int, out); -} - -func Hmac_Sha512Base64(key: String, message: String) -> String { - let kl: int = String_Len(key) as int; - let ml: int = String_Len(message) as int; - let buf: *void = Alloc(64); - bux_hmac_sha512(key, kl, message, ml, buf); - let result: String = bux_base64_encode(buf as String, 64); - Free(buf); - return result; -} + func Hmac_Sha256(key: String, message: String) -> String { + let kl: int = String_Len(key) as int; + let ml: int = String_Len(message) as int; + let buf: *void = Alloc(32); + bux_hmac_sha256(key, kl, message, ml, buf); + let result: String = bux_bytes_to_hex(buf, 32); + Free(buf); + return result; + } + + func Hmac_Sha256Raw(key: String, message: String, out: *void) { + bux_hmac_sha256(key, String_Len(key) as int, message, String_Len(message) as int, out); + } + + func Hmac_Sha256Base64(key: String, message: String) -> String { + let kl: int = String_Len(key) as int; + let ml: int = String_Len(message) as int; + let buf: *void = Alloc(32); + bux_hmac_sha256(key, kl, message, ml, buf); + let result: String = bux_base64_encode(buf as String, 32); + Free(buf); + return result; + } + + // --- HMAC-SHA384 --- + + func Hmac_Sha384(key: String, message: String) -> String { + let kl: int = String_Len(key) as int; + let ml: int = String_Len(message) as int; + let buf: *void = Alloc(48); + bux_hmac_sha384(key, kl, message, ml, buf); + let result: String = bux_bytes_to_hex(buf, 48); + Free(buf); + return result; + } + + func Hmac_Sha384Raw(key: String, message: String, out: *void) { + bux_hmac_sha384(key, String_Len(key) as int, message, String_Len(message) as int, out); + } + + func Hmac_Sha384Base64(key: String, message: String) -> String { + let kl: int = String_Len(key) as int; + let ml: int = String_Len(message) as int; + let buf: *void = Alloc(48); + bux_hmac_sha384(key, kl, message, ml, buf); + let result: String = bux_base64_encode(buf as String, 48); + Free(buf); + return result; + } + + // --- HMAC-SHA512 --- + + func Hmac_Sha512(key: String, message: String) -> String { + let kl: int = String_Len(key) as int; + let ml: int = String_Len(message) as int; + let buf: *void = Alloc(64); + bux_hmac_sha512(key, kl, message, ml, buf); + let result: String = bux_bytes_to_hex(buf, 64); + Free(buf); + return result; + } + + func Hmac_Sha512Raw(key: String, message: String, out: *void) { + bux_hmac_sha512(key, String_Len(key) as int, message, String_Len(message) as int, out); + } + + func Hmac_Sha512Base64(key: String, message: String) -> String { + let kl: int = String_Len(key) as int; + let ml: int = String_Len(message) as int; + let buf: *void = Alloc(64); + bux_hmac_sha512(key, kl, message, ml, buf); + let result: String = bux_base64_encode(buf as String, 64); + Free(buf); + return result; + } } diff --git a/lib/crypto/jwt.bux b/lib/crypto/jwt.bux index 28f7689..4319e46 100644 --- a/lib/crypto/jwt.bux +++ b/lib/crypto/jwt.bux @@ -4,233 +4,233 @@ // ============================================================================= module Std::Crypto::Jwt { -import Std::Mem::{Alloc, Free}; -import Std::String::{String_Len, String_Eq, String_StartsWith, String_Concat}; -import Std::Crypto::Base64::{Base64URL_Encode, Base64URL_Decode}; -import Std::Crypto::Hash::{Hash_Sha256Raw, Hash_Sha384Raw, Hash_Sha512Raw}; -import Std::Crypto::Hmac::{Hmac_Sha256Raw, Hmac_Sha384Raw, Hmac_Sha512Raw}; -import Std::Crypto::Rsa::{Rsa_SignSha256, Rsa_SignSha384, Rsa_SignSha512, - Rsa_VerifySha256, Rsa_VerifySha384, Rsa_VerifySha512}; -import Std::Crypto::Ecdsa::{Ecdsa_SignP256, Ecdsa_SignP384, Ecdsa_VerifyP256, Ecdsa_VerifyP384}; -import Std::Crypto::Ed25519::{Ed25519_Sign, Ed25519_Verify}; + import Std::Mem::{Alloc, Free}; + import Std::String::{String_Len, String_Eq, String_StartsWith, String_Concat}; + import Std::Crypto::Base64::{Base64URL_Encode, Base64URL_Decode}; + import Std::Crypto::Hash::{Hash_Sha256Raw, Hash_Sha384Raw, Hash_Sha512Raw}; + import Std::Crypto::Hmac::{Hmac_Sha256Raw, Hmac_Sha384Raw, Hmac_Sha512Raw}; + import Std::Crypto::Rsa::{Rsa_SignSha256, Rsa_SignSha384, Rsa_SignSha512, + Rsa_VerifySha256, Rsa_VerifySha384, Rsa_VerifySha512}; + import Std::Crypto::Ecdsa::{Ecdsa_SignP256, Ecdsa_SignP384, Ecdsa_VerifyP256, Ecdsa_VerifyP384}; + import Std::Crypto::Ed25519::{Ed25519_Sign, Ed25519_Verify}; -extern func bux_base64_encode(data: String, len: int) -> String; -extern func bux_str_split_count(s: String, delim: String) -> uint; -extern func bux_str_split_part(s: String, delim: String, index: uint) -> String; + extern func bux_base64_encode(data: String, len: int) -> String; + extern func bux_str_split_count(s: String, delim: String) -> uint; + extern func bux_str_split_part(s: String, delim: String, index: uint) -> String; -// --- JWT Algorithm enum --- -enum JwtAlg { - HS256, - HS384, - HS512, - RS256, - RS384, - RS512, - ES256, - ES384, - EdDSA, -} - -// --- Header --- - -// Jwt_MakeHeader: build the JWT header JSON string for the given algorithm -func Jwt_MakeHeader(alg: JwtAlg) -> String { - if alg.tag == JwtAlg_HS256 { return "{\"alg\":\"HS256\",\"typ\":\"JWT\"}"; } - if alg.tag == JwtAlg_HS384 { return "{\"alg\":\"HS384\",\"typ\":\"JWT\"}"; } - if alg.tag == JwtAlg_HS512 { return "{\"alg\":\"HS512\",\"typ\":\"JWT\"}"; } - if alg.tag == JwtAlg_RS256 { return "{\"alg\":\"RS256\",\"typ\":\"JWT\"}"; } - if alg.tag == JwtAlg_RS384 { return "{\"alg\":\"RS384\",\"typ\":\"JWT\"}"; } - if alg.tag == JwtAlg_RS512 { return "{\"alg\":\"RS512\",\"typ\":\"JWT\"}"; } - if alg.tag == JwtAlg_ES256 { return "{\"alg\":\"ES256\",\"typ\":\"JWT\"}"; } - if alg.tag == JwtAlg_ES384 { return "{\"alg\":\"ES384\",\"typ\":\"JWT\"}"; } - if alg.tag == JwtAlg_EdDSA { return "{\"alg\":\"EdDSA\",\"typ\":\"JWT\"}"; } - return "{\"alg\":\"none\",\"typ\":\"JWT\"}"; -} - -// --- Signing --- - -// Sign the JWT signing input with the given algorithm -func Jwt_Sign(alg: JwtAlg, signingInput: String, key: String) -> String { - // --- HMAC algorithms --- - if alg.tag == JwtAlg_HS256 { - let buf: *void = Alloc(32); - Hmac_Sha256Raw(key, signingInput, buf); - let result: String = bux_base64_encode(buf as String, 32); - Free(buf); - return result; - } - if alg.tag == JwtAlg_HS384 { - let buf: *void = Alloc(48); - Hmac_Sha384Raw(key, signingInput, buf); - let result: String = bux_base64_encode(buf as String, 48); - Free(buf); - return result; - } - if alg.tag == JwtAlg_HS512 { - let buf: *void = Alloc(64); - Hmac_Sha512Raw(key, signingInput, buf); - let result: String = bux_base64_encode(buf as String, 64); - Free(buf); - return result; + // --- JWT Algorithm enum --- + enum JwtAlg { + HS256, + HS384, + HS512, + RS256, + RS384, + RS512, + ES256, + ES384, + EdDSA, } - // --- RSA algorithms (key is PEM private key) --- - if alg.tag == JwtAlg_RS256 { - let raw: String = Rsa_SignSha256(key, signingInput); - return bux_base64_encode(raw, String_Len(raw) as int); - } - if alg.tag == JwtAlg_RS384 { - let raw: String = Rsa_SignSha384(key, signingInput); - return bux_base64_encode(raw, String_Len(raw) as int); - } - if alg.tag == JwtAlg_RS512 { - let raw: String = Rsa_SignSha512(key, signingInput); - return bux_base64_encode(raw, String_Len(raw) as int); + // --- Header --- + + // Jwt_MakeHeader: build the JWT header JSON string for the given algorithm + func Jwt_MakeHeader(alg: JwtAlg) -> String { + if alg.tag == JwtAlg_HS256 { return "{\"alg\":\"HS256\",\"typ\":\"JWT\"}"; } + if alg.tag == JwtAlg_HS384 { return "{\"alg\":\"HS384\",\"typ\":\"JWT\"}"; } + if alg.tag == JwtAlg_HS512 { return "{\"alg\":\"HS512\",\"typ\":\"JWT\"}"; } + if alg.tag == JwtAlg_RS256 { return "{\"alg\":\"RS256\",\"typ\":\"JWT\"}"; } + if alg.tag == JwtAlg_RS384 { return "{\"alg\":\"RS384\",\"typ\":\"JWT\"}"; } + if alg.tag == JwtAlg_RS512 { return "{\"alg\":\"RS512\",\"typ\":\"JWT\"}"; } + if alg.tag == JwtAlg_ES256 { return "{\"alg\":\"ES256\",\"typ\":\"JWT\"}"; } + if alg.tag == JwtAlg_ES384 { return "{\"alg\":\"ES384\",\"typ\":\"JWT\"}"; } + if alg.tag == JwtAlg_EdDSA { return "{\"alg\":\"EdDSA\",\"typ\":\"JWT\"}"; } + return "{\"alg\":\"none\",\"typ\":\"JWT\"}"; } - // --- ECDSA algorithms (key is PEM private key) --- - if alg.tag == JwtAlg_ES256 { - let raw: String = Ecdsa_SignP256(key, signingInput); - return bux_base64_encode(raw, String_Len(raw) as int); - } - if alg.tag == JwtAlg_ES384 { - let raw: String = Ecdsa_SignP384(key, signingInput); - return bux_base64_encode(raw, String_Len(raw) as int); + // --- Signing --- + + // Sign the JWT signing input with the given algorithm + func Jwt_Sign(alg: JwtAlg, signingInput: String, key: String) -> String { + // --- HMAC algorithms --- + if alg.tag == JwtAlg_HS256 { + let buf: *void = Alloc(32); + Hmac_Sha256Raw(key, signingInput, buf); + let result: String = bux_base64_encode(buf as String, 32); + Free(buf); + return result; + } + if alg.tag == JwtAlg_HS384 { + let buf: *void = Alloc(48); + Hmac_Sha384Raw(key, signingInput, buf); + let result: String = bux_base64_encode(buf as String, 48); + Free(buf); + return result; + } + if alg.tag == JwtAlg_HS512 { + let buf: *void = Alloc(64); + Hmac_Sha512Raw(key, signingInput, buf); + let result: String = bux_base64_encode(buf as String, 64); + Free(buf); + return result; + } + + // --- RSA algorithms (key is PEM private key) --- + if alg.tag == JwtAlg_RS256 { + let raw: String = Rsa_SignSha256(key, signingInput); + return bux_base64_encode(raw, String_Len(raw) as int); + } + if alg.tag == JwtAlg_RS384 { + let raw: String = Rsa_SignSha384(key, signingInput); + return bux_base64_encode(raw, String_Len(raw) as int); + } + if alg.tag == JwtAlg_RS512 { + let raw: String = Rsa_SignSha512(key, signingInput); + return bux_base64_encode(raw, String_Len(raw) as int); + } + + // --- ECDSA algorithms (key is PEM private key) --- + if alg.tag == JwtAlg_ES256 { + let raw: String = Ecdsa_SignP256(key, signingInput); + return bux_base64_encode(raw, String_Len(raw) as int); + } + if alg.tag == JwtAlg_ES384 { + let raw: String = Ecdsa_SignP384(key, signingInput); + return bux_base64_encode(raw, String_Len(raw) as int); + } + + // --- EdDSA (key is 32-byte raw private key) --- + if alg.tag == JwtAlg_EdDSA { + return Ed25519_Sign(key, signingInput); + } + + return ""; } - // --- EdDSA (key is 32-byte raw private key) --- - if alg.tag == JwtAlg_EdDSA { - return Ed25519_Sign(key, signingInput); - } + // --- Verify --- - return ""; -} + // Verify a JWT signature + func Jwt_Verify(alg: JwtAlg, signingInput: String, signatureB64: String, key: String) -> bool { + // --- HMAC algorithms --- + if alg.tag == JwtAlg_HS256 { + let expectBuf: *void = Alloc(32); + Hmac_Sha256Raw(key, signingInput, expectBuf); + let expectB64: String = bux_base64_encode(expectBuf as String, 32); + Free(expectBuf); + return String_Eq(expectB64, signatureB64); + } + if alg.tag == JwtAlg_HS384 { + let expectBuf: *void = Alloc(48); + Hmac_Sha384Raw(key, signingInput, expectBuf); + let expectB64: String = bux_base64_encode(expectBuf as String, 48); + Free(expectBuf); + return String_Eq(expectB64, signatureB64); + } + if alg.tag == JwtAlg_HS512 { + let expectBuf: *void = Alloc(64); + Hmac_Sha512Raw(key, signingInput, expectBuf); + let expectB64: String = bux_base64_encode(expectBuf as String, 64); + Free(expectBuf); + return String_Eq(expectB64, signatureB64); + } -// --- Verify --- + // --- RSA algorithms --- + if alg.tag == JwtAlg_RS256 { return Rsa_VerifySha256(key, signingInput, signatureB64); } + if alg.tag == JwtAlg_RS384 { return Rsa_VerifySha384(key, signingInput, signatureB64); } + if alg.tag == JwtAlg_RS512 { return Rsa_VerifySha512(key, signingInput, signatureB64); } -// Verify a JWT signature -func Jwt_Verify(alg: JwtAlg, signingInput: String, signatureB64: String, key: String) -> bool { - // --- HMAC algorithms --- - if alg.tag == JwtAlg_HS256 { - let expectBuf: *void = Alloc(32); - Hmac_Sha256Raw(key, signingInput, expectBuf); - let expectB64: String = bux_base64_encode(expectBuf as String, 32); - Free(expectBuf); - return String_Eq(expectB64, signatureB64); - } - if alg.tag == JwtAlg_HS384 { - let expectBuf: *void = Alloc(48); - Hmac_Sha384Raw(key, signingInput, expectBuf); - let expectB64: String = bux_base64_encode(expectBuf as String, 48); - Free(expectBuf); - return String_Eq(expectB64, signatureB64); - } - if alg.tag == JwtAlg_HS512 { - let expectBuf: *void = Alloc(64); - Hmac_Sha512Raw(key, signingInput, expectBuf); - let expectB64: String = bux_base64_encode(expectBuf as String, 64); - Free(expectBuf); - return String_Eq(expectB64, signatureB64); - } + // --- ECDSA algorithms --- + if alg.tag == JwtAlg_ES256 { return Ecdsa_VerifyP256(key, signingInput, signatureB64); } + if alg.tag == JwtAlg_ES384 { return Ecdsa_VerifyP384(key, signingInput, signatureB64); } - // --- RSA algorithms --- - if alg.tag == JwtAlg_RS256 { return Rsa_VerifySha256(key, signingInput, signatureB64); } - if alg.tag == JwtAlg_RS384 { return Rsa_VerifySha384(key, signingInput, signatureB64); } - if alg.tag == JwtAlg_RS512 { return Rsa_VerifySha512(key, signingInput, signatureB64); } + // --- EdDSA --- + if alg.tag == JwtAlg_EdDSA { return Ed25519_Verify(key, signatureB64, signingInput); } - // --- ECDSA algorithms --- - if alg.tag == JwtAlg_ES256 { return Ecdsa_VerifyP256(key, signingInput, signatureB64); } - if alg.tag == JwtAlg_ES384 { return Ecdsa_VerifyP384(key, signingInput, signatureB64); } - - // --- EdDSA --- - if alg.tag == JwtAlg_EdDSA { return Ed25519_Verify(key, signatureB64, signingInput); } - - return false; -} - -// --- Encode --- - -// Jwt_Encode: create a signed JWT -// headerJson — JSON header string (use Jwt_MakeHeader or custom) -// payloadJson — JSON payload/claims string -// alg — signing algorithm -// key — signing key (HMAC secret, RSA PEM, ECDSA PEM, or Ed25519 raw privkey) -// Returns the complete "header.payload.signature" JWT string -func Jwt_Encode(headerJson: String, payloadJson: String, alg: JwtAlg, key: String) -> String { - let headerB64: String = Base64URL_Encode(headerJson); - let payloadB64: String = Base64URL_Encode(payloadJson); - let signingInput: String = String_Concat(headerB64, "."); - let signingInputFull: String = String_Concat(signingInput, payloadB64); - - let sigB64: String = Jwt_Sign(alg, signingInputFull, key); - - let part1: String = String_Concat(signingInputFull, "."); - return String_Concat(part1, sigB64); -} - -// --- Decode --- - -// Jwt_Decode: decode and verify a JWT. -// token — the full "header.payload.signature" string -// alg — expected algorithm -// key — verification key -// headerOut — receives decoded header JSON -// payloadOut — receives decoded payload JSON -// Returns true if signature is valid. -func Jwt_Decode(token: String, alg: JwtAlg, key: String, - headerOut: *String, payloadOut: *String) -> bool { - // Split by "." - let partCount: uint = bux_str_split_count(token, "."); - if partCount != 3 { return false; } - - let headerB64: String = bux_str_split_part(token, ".", 0); - let payloadB64: String = bux_str_split_part(token, ".", 1); - let sigB64: String = bux_str_split_part(token, ".", 2); - - // Build signing input - let input: String = String_Concat(headerB64, "."); - let signingInput: String = String_Concat(input, payloadB64); - - // Verify signature - if !Jwt_Verify(alg, signingInput, sigB64, key) { return false; } - // Decode - headerOut[0] = Base64URL_Decode(headerB64); - payloadOut[0] = Base64URL_Decode(payloadB64); - return true; -} + // --- Encode --- -// --- Convenience: Encode with standard header --- + // Jwt_Encode: create a signed JWT + // headerJson — JSON header string (use Jwt_MakeHeader or custom) + // payloadJson — JSON payload/claims string + // alg — signing algorithm + // key — signing key (HMAC secret, RSA PEM, ECDSA PEM, or Ed25519 raw privkey) + // Returns the complete "header.payload.signature" JWT string + func Jwt_Encode(headerJson: String, payloadJson: String, alg: JwtAlg, key: String) -> String { + let headerB64: String = Base64URL_Encode(headerJson); + let payloadB64: String = Base64URL_Encode(payloadJson); + let signingInput: String = String_Concat(headerB64, "."); + let signingInputFull: String = String_Concat(signingInput, payloadB64); -func Jwt_EncodeHS256(payloadJson: String, secret: String) -> String { - let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_HS256 }); - return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_HS256 }, secret); -} + let sigB64: String = Jwt_Sign(alg, signingInputFull, key); -func Jwt_EncodeHS384(payloadJson: String, secret: String) -> String { - let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_HS384 }); - return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_HS384 }, secret); -} + let part1: String = String_Concat(signingInputFull, "."); + return String_Concat(part1, sigB64); + } -func Jwt_EncodeHS512(payloadJson: String, secret: String) -> String { - let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_HS512 }); - return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_HS512 }, secret); -} + // --- Decode --- -func Jwt_EncodeRS256(payloadJson: String, pemPrivateKey: String) -> String { - let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_RS256 }); - return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_RS256 }, pemPrivateKey); -} + // Jwt_Decode: decode and verify a JWT. + // token — the full "header.payload.signature" string + // alg — expected algorithm + // key — verification key + // headerOut — receives decoded header JSON + // payloadOut — receives decoded payload JSON + // Returns true if signature is valid. + func Jwt_Decode(token: String, alg: JwtAlg, key: String, + headerOut: *String, payloadOut: *String) -> bool { + // Split by "." + let partCount: uint = bux_str_split_count(token, "."); + if partCount != 3 { return false; } -func Jwt_EncodeES256(payloadJson: String, pemPrivateKey: String) -> String { - let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_ES256 }); - return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_ES256 }, pemPrivateKey); -} + let headerB64: String = bux_str_split_part(token, ".", 0); + let payloadB64: String = bux_str_split_part(token, ".", 1); + let sigB64: String = bux_str_split_part(token, ".", 2); -func Jwt_EncodeEdDSA(payloadJson: String, rawPrivKey: String) -> String { - let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_EdDSA }); - return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_EdDSA }, rawPrivKey); -} + // Build signing input + let input: String = String_Concat(headerB64, "."); + let signingInput: String = String_Concat(input, payloadB64); + + // Verify signature + if !Jwt_Verify(alg, signingInput, sigB64, key) { + return false; + } + + // Decode + headerOut[0] = Base64URL_Decode(headerB64); + payloadOut[0] = Base64URL_Decode(payloadB64); + return true; + } + + // --- Convenience: Encode with standard header --- + + func Jwt_EncodeHS256(payloadJson: String, secret: String) -> String { + let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_HS256 }); + return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_HS256 }, secret); + } + + func Jwt_EncodeHS384(payloadJson: String, secret: String) -> String { + let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_HS384 }); + return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_HS384 }, secret); + } + + func Jwt_EncodeHS512(payloadJson: String, secret: String) -> String { + let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_HS512 }); + return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_HS512 }, secret); + } + + func Jwt_EncodeRS256(payloadJson: String, pemPrivateKey: String) -> String { + let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_RS256 }); + return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_RS256 }, pemPrivateKey); + } + + func Jwt_EncodeES256(payloadJson: String, pemPrivateKey: String) -> String { + let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_ES256 }); + return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_ES256 }, pemPrivateKey); + } + + func Jwt_EncodeEdDSA(payloadJson: String, rawPrivKey: String) -> String { + let header: String = Jwt_MakeHeader(JwtAlg { tag: JwtAlg_EdDSA }); + return Jwt_Encode(header, payloadJson, JwtAlg { tag: JwtAlg_EdDSA }, rawPrivKey); + } } diff --git a/lib/crypto/random.bux b/lib/crypto/random.bux index 05fa5df..3ed9fa8 100644 --- a/lib/crypto/random.bux +++ b/lib/crypto/random.bux @@ -3,61 +3,61 @@ // ============================================================================= module Std::Crypto::Random { -import Std::Mem::{Alloc, Free}; + import Std::Mem::{Alloc, Free}; -extern func bux_random_bytes(buf: *void, len: int) -> int; -extern func bux_base64_encode(data: String, len: int) -> String; -extern func bux_bytes_to_hex(data: *void, len: int) -> String; + extern func bux_random_bytes(buf: *void, len: int) -> int; + extern func bux_base64_encode(data: String, len: int) -> String; + extern func bux_bytes_to_hex(data: *void, len: int) -> String; -// RandomBytes: returns n cryptographically secure random bytes as a raw string -func Random_Bytes(n: int) -> String { - if n <= 0 { return ""; } - let buf: *void = Alloc(n as uint); - if bux_random_bytes(buf, n) != 1 { - Free(buf); - return ""; + // RandomBytes: returns n cryptographically secure random bytes as a raw string + func Random_Bytes(n: int) -> String { + if n <= 0 { return ""; } + let buf: *void = Alloc(n as uint); + if bux_random_bytes(buf, n) != 1 { + Free(buf); + return ""; + } + // Return raw buffer as string (binary-safe) + return buf as String; } - // Return raw buffer as string (binary-safe) - return buf as String; -} -// RandomHex: returns n random bytes as lowercase hex -func Random_Hex(n: int) -> String { - if n <= 0 { return ""; } - let buf: *void = Alloc(n as uint); - if bux_random_bytes(buf, n) != 1 { + // RandomHex: returns n random bytes as lowercase hex + func Random_Hex(n: int) -> String { + if n <= 0 { return ""; } + let buf: *void = Alloc(n as uint); + if bux_random_bytes(buf, n) != 1 { + Free(buf); + return ""; + } + let result: String = bux_bytes_to_hex(buf, n); Free(buf); - return ""; + return result; } - let result: String = bux_bytes_to_hex(buf, n); - Free(buf); - return result; -} -// RandomBase64: returns n random bytes as base64-encoded string -func Random_Base64(n: int) -> String { - if n <= 0 { return ""; } - let buf: *void = Alloc(n as uint); - if bux_random_bytes(buf, n) != 1 { + // RandomBase64: returns n random bytes as base64-encoded string + func Random_Base64(n: int) -> String { + if n <= 0 { return ""; } + let buf: *void = Alloc(n as uint); + if bux_random_bytes(buf, n) != 1 { + Free(buf); + return ""; + } + let result: String = bux_base64_encode(buf as String, n); Free(buf); - return ""; + return result; } - let result: String = bux_base64_encode(buf as String, n); - Free(buf); - return result; -} -// RandomUint32: returns a random 32-bit unsigned integer -func Random_Uint32() -> uint { - let buf: *void = Alloc(4); - if bux_random_bytes(buf, 4) != 1 { + // RandomUint32: returns a random 32-bit unsigned integer + func Random_Uint32() -> uint { + let buf: *void = Alloc(4); + if bux_random_bytes(buf, 4) != 1 { + Free(buf); + return 0; + } + // Interpret first 4 bytes as uint (native endian) + let ptr: *uint = buf as *uint; + let val: uint = *ptr; Free(buf); - return 0; + return val; } - // Interpret first 4 bytes as uint (native endian) - let ptr: *uint = buf as *uint; - let val: uint = *ptr; - Free(buf); - return val; -} } diff --git a/lib/crypto/rsa.bux b/lib/crypto/rsa.bux index b177cfd..39a849e 100644 --- a/lib/crypto/rsa.bux +++ b/lib/crypto/rsa.bux @@ -3,88 +3,88 @@ // ============================================================================= module Std::Crypto::Rsa { -import Std::Mem::{Alloc, Free}; -import Std::String::{String_Len}; + import Std::Mem::{Alloc, Free}; + import Std::String::{String_Len}; -// Extern declarations for the runtime C implementations -extern func bux_rsa_sign_sha256(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; -extern func bux_rsa_sign_sha384(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; -extern func bux_rsa_sign_sha512(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; -extern func bux_rsa_verify_sha256(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; -extern func bux_rsa_verify_sha384(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; -extern func bux_rsa_verify_sha512(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; -extern func bux_base64_encode(data: String, len: int) -> String; -extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; + // Extern declarations for the runtime C implementations + extern func bux_rsa_sign_sha256(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; + extern func bux_rsa_sign_sha384(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; + extern func bux_rsa_sign_sha512(key: String, keylen: int, data: String, datalen: int, outlen: *int) -> String; + extern func bux_rsa_verify_sha256(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; + extern func bux_rsa_verify_sha384(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; + extern func bux_rsa_verify_sha512(key: String, keylen: int, data: String, datalen: int, sig: String, siglen: int) -> int; + extern func bux_base64_encode(data: String, len: int) -> String; + extern func bux_base64_decode(data: String, len: int, outlen: *int) -> String; -// --- RSA Sign --- + // --- RSA Sign --- -// Rsa_SignSha256: sign data with RSA private key (PEM format), returns raw signature -func Rsa_SignSha256(pemPrivateKey: String, data: String) -> String { - let siglen: int = 0; - return bux_rsa_sign_sha256(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); -} - -func Rsa_SignSha384(pemPrivateKey: String, data: String) -> String { - let siglen: int = 0; - return bux_rsa_sign_sha384(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); -} - -func Rsa_SignSha512(pemPrivateKey: String, data: String) -> String { - let siglen: int = 0; - return bux_rsa_sign_sha512(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); -} - -// Convenience: sign and return base64-encoded signature -func Rsa_SignSha256Base64(pemPrivateKey: String, data: String) -> String { - let raw: String = Rsa_SignSha256(pemPrivateKey, data); - return bux_base64_encode(raw, String_Len(raw) as int); -} - -func Rsa_SignSha384Base64(pemPrivateKey: String, data: String) -> String { - let raw: String = Rsa_SignSha384(pemPrivateKey, data); - return bux_base64_encode(raw, String_Len(raw) as int); -} - -func Rsa_SignSha512Base64(pemPrivateKey: String, data: String) -> String { - let raw: String = Rsa_SignSha512(pemPrivateKey, data); - return bux_base64_encode(raw, String_Len(raw) as int); -} - -// --- RSA Verify --- - -// Rsa_VerifySha256: verify raw signature against data with RSA public key (PEM) -// Returns true if signature is valid. -func Rsa_VerifySha256(pemPublicKey: String, data: String, signature: String) -> bool { - let r: int = bux_rsa_verify_sha256(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); - return r == 1; -} - -func Rsa_VerifySha384(pemPublicKey: String, data: String, signature: String) -> bool { - let r: int = bux_rsa_verify_sha384(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); - return r == 1; -} - -func Rsa_VerifySha512(pemPublicKey: String, data: String, signature: String) -> bool { - let r: int = bux_rsa_verify_sha512(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); - return r == 1; -} - -// Convenience: verify base64-encoded signature -func Rsa_VerifySha256Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { - let outlen: int = 0; - let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); - return Rsa_VerifySha256(pemPublicKey, data, sig); -} - -func Rsa_VerifySha384Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { - let outlen: int = 0; - let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); - return Rsa_VerifySha384(pemPublicKey, data, sig); -} - -func Rsa_VerifySha512Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { - let outlen: int = 0; - let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); - return Rsa_VerifySha512(pemPublicKey, data, sig); -} + // Rsa_SignSha256: sign data with RSA private key (PEM format), returns raw signature + func Rsa_SignSha256(pemPrivateKey: String, data: String) -> String { + let siglen: int = 0; + return bux_rsa_sign_sha256(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); + } + + func Rsa_SignSha384(pemPrivateKey: String, data: String) -> String { + let siglen: int = 0; + return bux_rsa_sign_sha384(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); + } + + func Rsa_SignSha512(pemPrivateKey: String, data: String) -> String { + let siglen: int = 0; + return bux_rsa_sign_sha512(pemPrivateKey, String_Len(pemPrivateKey) as int, data, String_Len(data) as int, &siglen); + } + + // Convenience: sign and return base64-encoded signature + func Rsa_SignSha256Base64(pemPrivateKey: String, data: String) -> String { + let raw: String = Rsa_SignSha256(pemPrivateKey, data); + return bux_base64_encode(raw, String_Len(raw) as int); + } + + func Rsa_SignSha384Base64(pemPrivateKey: String, data: String) -> String { + let raw: String = Rsa_SignSha384(pemPrivateKey, data); + return bux_base64_encode(raw, String_Len(raw) as int); + } + + func Rsa_SignSha512Base64(pemPrivateKey: String, data: String) -> String { + let raw: String = Rsa_SignSha512(pemPrivateKey, data); + return bux_base64_encode(raw, String_Len(raw) as int); + } + + // --- RSA Verify --- + + // Rsa_VerifySha256: verify raw signature against data with RSA public key (PEM) + // Returns true if signature is valid. + func Rsa_VerifySha256(pemPublicKey: String, data: String, signature: String) -> bool { + let r: int = bux_rsa_verify_sha256(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); + return r == 1; + } + + func Rsa_VerifySha384(pemPublicKey: String, data: String, signature: String) -> bool { + let r: int = bux_rsa_verify_sha384(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); + return r == 1; + } + + func Rsa_VerifySha512(pemPublicKey: String, data: String, signature: String) -> bool { + let r: int = bux_rsa_verify_sha512(pemPublicKey, String_Len(pemPublicKey) as int, data, String_Len(data) as int, signature, String_Len(signature) as int); + return r == 1; + } + + // Convenience: verify base64-encoded signature + func Rsa_VerifySha256Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { + let outlen: int = 0; + let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); + return Rsa_VerifySha256(pemPublicKey, data, sig); + } + + func Rsa_VerifySha384Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { + let outlen: int = 0; + let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); + return Rsa_VerifySha384(pemPublicKey, data, sig); + } + + func Rsa_VerifySha512Base64(pemPublicKey: String, data: String, signatureB64: String) -> bool { + let outlen: int = 0; + let sig: String = bux_base64_decode(signatureB64, String_Len(signatureB64) as int, &outlen); + return Rsa_VerifySha512(pemPublicKey, data, sig); + } } diff --git a/registry/packages/greet/README.md b/registry/packages/greet/README.md new file mode 100644 index 0000000..173bdc4 --- /dev/null +++ b/registry/packages/greet/README.md @@ -0,0 +1,15 @@ +# greet + +Demo package for the Bux registry (`config/registry.toml`). + +```bash +bux add greet +bux install +``` + +```bux +func Main() -> int { + PrintLine(Greet_Hello("Bux")); + return 0; +} +``` diff --git a/registry/packages/greet/bux.toml b/registry/packages/greet/bux.toml new file mode 100644 index 0000000..e1c91eb --- /dev/null +++ b/registry/packages/greet/bux.toml @@ -0,0 +1,9 @@ +[Package] +Name = "greet" +Version = "0.1.1" +Type = "lib" +Authors = ["Bux Core"] +License = "MIT" + +[Build] +Output = "Lib" diff --git a/registry/packages/greet/src/Greet.bux b/registry/packages/greet/src/Greet.bux new file mode 100644 index 0000000..986f08e --- /dev/null +++ b/registry/packages/greet/src/Greet.bux @@ -0,0 +1,14 @@ +// greet — demo registry package (E.1) +module Greet { + + /// Return a greeting for `name`. + func Greet_Hello(name: String) -> String { + return String_Concat("Hello, ", String_Concat(name, "!")); + } + + /// Return the package version string. + func Greet_Version() -> String { + return "0.1.1"; + } + +} diff --git a/src/Main.bux b/src/Main.bux index 88940f3..8ac5632 100644 --- a/src/Main.bux +++ b/src/Main.bux @@ -1,23 +1,23 @@ // main.bux — Entry point for the Bux self-hosting compiler module Main { -// C runtime for command-line args -extern func bux_argc() -> int; -extern func bux_argv(index: int) -> String; -extern func bux_alloc(size: uint) -> *void; + // C runtime for command-line args + extern func bux_argc() -> int; + extern func bux_argv(index: int) -> String; + extern func bux_alloc(size: uint) -> *void; -// Forward declaration from Cli module -func Cli_Run(args: *String, argCount: int) -> int; + // Forward declaration from Cli module + func Cli_Run(args: *String, argCount: int) -> int; -func Main() -> int { - let count: int = bux_argc(); - // Allocate array of String pointers - let args: *String = bux_alloc(count as uint * 8) as *String; - var i: int = 0; - while i < count { - args[i] = bux_argv(i); - i = i + 1; + func Main() -> int { + let count: int = bux_argc(); + // Allocate array of String pointers + let args: *String = bux_alloc(count as uint * 8) as *String; + var i: int = 0; + while i < count { + args[i] = bux_argv(i); + i = i + 1; + } + return Cli_Run(args, count); } - return Cli_Run(args, count); -} } diff --git a/src/ast.bux b/src/ast.bux index 96a6b12..12005df 100644 --- a/src/ast.bux +++ b/src/ast.bux @@ -1,437 +1,438 @@ // ast.bux — AST node types (Expr, Stmt, Decl, Pattern, TypeExpr) module Ast { -// --------------------------------------------------------------------------- -// SourceLocation (inline for convenience) -// --------------------------------------------------------------------------- -struct SourceLoc { - line: uint32, - column: uint32, -} - -// --------------------------------------------------------------------------- -// Token (lightweight inline) -// --------------------------------------------------------------------------- -struct AstToken { - kind: int, - text: String, - line: uint32, - column: uint32, -} - -// --------------------------------------------------------------------------- -// TypeExpr — type expressions -// --------------------------------------------------------------------------- -const tekNamed: int = 0; -const tekPath: int = 1; -const tekSlice: int = 2; -const tekPointer: int = 3; -const tekRef: int = 7; // &T — shared reference -const tekMutRef: int = 8; // &mut T — mutable reference -const tekTuple: int = 4; -const tekSelf: int = 5; -const tekFunc: int = 6; - -struct TypeExprList { - te: *TypeExpr, - next: *TypeExprList, -} - -struct TypeExpr { - kind: int, - line: uint32, - column: uint32, - typeName: String, // for tekNamed / diagnostic name for tekFunc - pathStr: String, // for tekPath (segments joined with ::) - pathCount: int, // number of path segments - typeArgName0: String, // up to 2 type args - typeArgName1: String, - typeArgCount: int, - sliceElement: *TypeExpr, // for tekSlice - pointerPointee: *TypeExpr, // for tekPointer - funcParams: *TypeExprList, // for tekFunc - funcRet: *TypeExpr, // for tekFunc - funcParamCount: int, // for tekFunc - tupleElems: *TypeExprList, // for tekTuple - tupleCount: int, // for tekTuple -} - -// --------------------------------------------------------------------------- -// Pattern — match patterns -// --------------------------------------------------------------------------- -const pkWildcard: int = 0; -const pkLiteral: int = 1; -const pkIdent: int = 2; -const pkRange: int = 3; -const pkEnum: int = 4; -const pkStruct: int = 5; -const pkTuple: int = 6; -const pkGuarded: int = 7; // `p if cond` — patChild1 = inner, patGuardExpr = condition - -struct Pattern { - kind: int, - line: uint32, - column: uint32, - patIdent: String, // for pkIdent - patLitKind: int, // for pkLiteral (token kind) - patLitText: String, // for pkLiteral (token text) - patRangeInclusive: bool, // for pkRange - patEnumPath: String, // for pkEnum: "Enum::Variant" - patStructName: String, // for pkStruct (type name) - patFieldName: String, // for struct field entry: field name in Point { x: a } - patChild1: *Pattern, // range lo / nested / guarded inner - patChild2: *Pattern, // range hi / nested - patArgs: *Pattern, // pkEnum/pkTuple/pkStruct field list (head) - patNext: *Pattern, // next sibling in patArgs list - patGuardExpr: *Expr, // for pkGuarded: the `if` condition -} - -// Match arm: pattern => body -struct MatchArm { - line: uint32, - column: uint32, - pattern: *Pattern, - body: *Expr, - next: *MatchArm, -} - -// --------------------------------------------------------------------------- -// Expr — expressions (tagged union) -// --------------------------------------------------------------------------- -const ekLiteral: int = 0; -const ekIdent: int = 1; -const ekSelf: int = 2; -const ekPath: int = 3; -const ekSizeOf: int = 4; -const ekUnary: int = 5; -const ekPostfix: int = 6; -const ekBinary: int = 7; -const ekAssign: int = 8; -const ekTernary: int = 9; -const ekRange: int = 10; -const ekCall: int = 11; -const ekGenericCall: int = 12; -const ekIndex: int = 13; -const ekField: int = 14; -const ekStructInit: int = 15; -const ekSlice: int = 16; -const ekTuple: int = 17; -const ekCast: int = 18; -const ekIs: int = 19; -const ekTry: int = 20; -const ekUnwrap: int = 23; -const ekBlock: int = 21; -const ekMatch: int = 22; -const ekSpawn: int = 24; -const ekAwait: int = 25; -const ekStringInterp: int = 26; -const ekClosure: int = 27; - -struct ExprList { - expr: *Expr, - next: *ExprList, - argName: String, -} - -struct Expr { - kind: int, - line: uint32, - column: uint32, - // Common fields - strValue: String, // ident name, path segments, field name, callee - intValue: int, // operator kind, intrinsic kind - boolValue: bool, // range inclusive - tokKind: int, // literal token kind - tokText: String, // literal token text - // Children (up to 3 sub-expressions) - child1: *Expr, // left, operand, callee, cond, subject - child2: *Expr, // right, index, then, value - child3: *Expr, // else, third - // Extra references - refType: *TypeExpr, // cast type, is type, sizeof type - refBlock: *Block, // for ekBlock - // Generic call - genericCallee: String, - genericTypeArg0: String, - genericTypeArg1: String, - genericTypeArgCount: int, - // Struct init fields - structName: String, - structFieldCount: int, - // Closure params (for ekClosure) - closureParams: *Decl, - // Captures (for ekClosure) - captureCount: int, - captureName0: String, - captureName1: String, - captureName2: String, - captureName3: String, - captureName4: String, - captureName5: String, - captureName6: String, - captureName7: String, - captureType0: int, - captureType1: int, - captureType2: int, - captureType3: int, - captureType4: int, - captureType5: int, - captureType6: int, - captureType7: int, - // Call arguments (linked list for multi-arg support) - callArgs: *ExprList, - callArgCount: int, - // Match arms (for ekMatch) - matchArms: *MatchArm, - matchArmCount: int, -} - -// --------------------------------------------------------------------------- -// Block — sequence of statements -// --------------------------------------------------------------------------- -struct Block { - line: uint32, - column: uint32, - stmtCount: int, - firstStmt: *Stmt, - lastStmt: *Stmt, -} - -// --------------------------------------------------------------------------- -// Stmt — statements -// --------------------------------------------------------------------------- -const skExpr: int = 0; -const skLet: int = 1; -const skIf: int = 2; -const skWhile: int = 3; -const skDoWhile: int = 4; -const skLoop: int = 5; -const skFor: int = 6; -const skMatch: int = 7; -const skReturn: int = 8; -const skBreak: int = 9; -const skContinue: int = 10; -const skDecl: int = 11; -const skDefer: int = 12; -const skSwitch: int = 13; - -struct ElseIf { - line: uint32; - column: uint32; - cond: *Expr; - block: *Block; -} - -struct Stmt { - kind: int, - line: uint32, - column: uint32, - // Common fields - strValue: String, // let name, pattern ident, label, for var - boolValue: bool, // let mutable - // Children - child1: *Expr, // init expr, condition, iter expr, return value - child2: *Expr, // match subject - child3: *Expr, // extra - refStmtType: *TypeExpr, // let type annotation - refStmtPattern: *Pattern,// let pattern - refStmtDecl: *Decl, // for skDecl - refStmtBlock: *Block, // then/body block - refStmtElse: *Block, // else block - // Else-if chain - elseIfCount: int, - // Linked list - nextStmt: *Stmt, -} - -// --------------------------------------------------------------------------- -// Decl — declarations -// --------------------------------------------------------------------------- -const dkFunc: int = 0; -const dkStruct: int = 1; -const dkEnum: int = 2; -const dkUnion: int = 3; -const dkInterface: int = 4; -const dkImpl: int = 5; -const dkModule: int = 6; -const dkUse: int = 7; -const dkConst: int = 8; -const dkTypeAlias: int = 9; -const dkExternFunc: int = 10; -const dkExternVar: int = 11; - -struct Param { - line: uint32; - column: uint32; - name: String; - refParamType: *TypeExpr; - isVariadic: bool; - defaultExpr: *Expr; -} - -struct StructField { - line: uint32; - column: uint32; - isPublic: bool; - name: String; - refFieldType: *TypeExpr; -} - -struct EnumVariant { - line: uint32; - column: uint32; - name: String; - fieldCount: int; - fieldTypeName0: String; - fieldTypeName1: String; -} - -struct Decl { - fieldCount: int, - fields: *StructField, - kind: int, - line: uint32, - column: uint32, - isPublic: bool, - isAsync: bool, - isChecked: int, // @[Checked] attribute (0/1) - isDrop: int, // @[Drop] attribute (0/1) - isRelease: int, // @[Release] attribute (0/1) - isConst: int, // const func (0/1) - // Names - strValue: String, // decl name - strValue2: String, // interface name, dll name, module path - // Type params (up to 2) - typeParam0: String, - typeParam1: String, - typeParamCount: int, - // Trait bounds for type params (e.g. ) - typeParam0Bound: String, - typeParam1Bound: String, - // Params (for functions) - paramCount: int, - param0: Param, - param1: Param, - param2: Param, - param3: Param, - param4: Param, - param5: Param, - param6: Param, - param7: Param, - param8: Param, - retType: *TypeExpr, - // Body - refBody: *Block, - // Enum variants (up to 8) - variantCount: int, - variant0: EnumVariant, - variant1: EnumVariant, - variant2: EnumVariant, - variant3: EnumVariant, - variant4: EnumVariant, - variant5: EnumVariant, - variant6: EnumVariant, - variant7: EnumVariant, - variant8: EnumVariant, - // Impl methods (up to 4) - methodCount: int, - // Use/import - useKind: int, - usePath: String, - useNames: String, // joined names for multi-import - // Const - constType: *TypeExpr, - constValue: *Expr, - // Type alias - aliasType: *TypeExpr, - // Extern func - extFuncDll: String, - extFuncVariadic: bool, - extFuncRetType: *TypeExpr, - // Children - childDecl1: *Decl, // linked list of decls (for module items, impl methods) - childDecl2: *Decl, - // Struct fields (up to 256) -} - -// --------------------------------------------------------------------------- -// Module — AST root -// --------------------------------------------------------------------------- -struct Module { - name: String, - path: String, // path segments joined - itemCount: int, - firstItem: *Decl, -} - -// --------------------------------------------------------------------------- -// Constructor helpers -// --------------------------------------------------------------------------- - -func Ast_MakeExpr(kind: int, line: uint32, col: uint32) -> Expr { - return Expr { kind: kind, line: line, column: col, - strValue: "", intValue: 0, boolValue: false, - tokKind: 0, tokText: "", - child1: null as *Expr, child2: null as *Expr, child3: null as *Expr, - refType: null as *TypeExpr, refBlock: null as *Block, - genericCallee: "", genericTypeArg0: "", genericTypeArg1: "", genericTypeArgCount: 0, - structName: "", structFieldCount: 0, - callArgs: null as *ExprList, callArgCount: 0 }; -} - -func Ast_MakeIdent(name: String, line: uint32, col: uint32) -> Expr { - var e: Expr = Ast_MakeExpr(ekIdent, line, col); - e.strValue = name; - return e; -} - -func Ast_MakeLiteral(tokKind: int, text: String, line: uint32, col: uint32) -> Expr { - var e: Expr = Ast_MakeExpr(ekLiteral, line, col); - e.tokKind = tokKind; - e.tokText = text; - return e; -} - -func Ast_MakeBinary(op: int, left: *Expr, right: *Expr, line: uint32, col: uint32) -> Expr { - var e: Expr = Ast_MakeExpr(ekBinary, line, col); - e.intValue = op; - e.child1 = left; - e.child2 = right; - return e; -} - -func Ast_MakeCall(callee: *Expr, line: uint32, col: uint32) -> Expr { - var e: Expr = Ast_MakeExpr(ekCall, line, col); - e.child1 = callee; - return e; -} - -func Ast_MakeStmt(kind: int, line: uint32, col: uint32) -> Stmt { - return Stmt { kind: kind, line: line, column: col, - strValue: "", boolValue: false, - child1: null as *Expr, child2: null as *Expr, child3: null as *Expr, - refStmtType: null as *TypeExpr, refStmtPattern: null as *Pattern, - refStmtDecl: null as *Decl, refStmtBlock: null as *Block, refStmtElse: null as *Block, - elseIfCount: 0 }; -} - -func Ast_MakeDecl(kind: int, line: uint32, col: uint32) -> Decl { - return Decl { kind: kind, line: line, column: col, isPublic: false, - isAsync: false, isChecked: 0, isDrop: 0, isRelease: 0, isConst: 0, - strValue: "", strValue2: "", - typeParam0: "", typeParam1: "", typeParamCount: 0, - typeParam0Bound: "", typeParam1Bound: "" - , - paramCount: 0, - retType: null as *TypeExpr, - refBody: null as *Block, - fieldCount: 0, - variantCount: 0, - methodCount: 0, - useKind: 0, usePath: "", useNames: "", - constType: null as *TypeExpr, constValue: null as *Expr, - aliasType: null as *TypeExpr, - extFuncDll: "", extFuncVariadic: false, extFuncRetType: null as *TypeExpr, - childDecl1: null as *Decl, childDecl2: null as *Decl }; -} + // --------------------------------------------------------------------------- + // SourceLocation (inline for convenience) + // --------------------------------------------------------------------------- + struct SourceLoc { + line: uint32, + column: uint32, + } + + // --------------------------------------------------------------------------- + // Token (lightweight inline) + // --------------------------------------------------------------------------- + struct AstToken { + kind: int, + text: String, + line: uint32, + column: uint32, + } + + // --------------------------------------------------------------------------- + // TypeExpr — type expressions + // --------------------------------------------------------------------------- + const tekNamed: int = 0; + const tekPath: int = 1; + const tekSlice: int = 2; + const tekPointer: int = 3; + const tekRef: int = 7; // &T — shared reference + const tekMutRef: int = 8; // &mut T — mutable reference + const tekTuple: int = 4; + const tekSelf: int = 5; + const tekFunc: int = 6; + + struct TypeExprList { + te: *TypeExpr, + next: *TypeExprList, + } + + struct TypeExpr { + kind: int, + line: uint32, + column: uint32, + typeName: String, // for tekNamed / diagnostic name for tekFunc + pathStr: String, // for tekPath (segments joined with ::) + pathCount: int, // number of path segments + typeArgName0: String, // up to 2 type args + typeArgName1: String, + typeArgCount: int, + sliceElement: *TypeExpr, // for tekSlice + pointerPointee: *TypeExpr, // for tekPointer / tekRef / tekMutRef + refLifetime: String, // for tekRef / tekMutRef: "'a" or "" (elided) + funcParams: *TypeExprList, // for tekFunc + funcRet: *TypeExpr, // for tekFunc + funcParamCount: int, // for tekFunc + tupleElems: *TypeExprList, // for tekTuple + tupleCount: int, // for tekTuple + } + + // --------------------------------------------------------------------------- + // Pattern — match patterns + // --------------------------------------------------------------------------- + const pkWildcard: int = 0; + const pkLiteral: int = 1; + const pkIdent: int = 2; + const pkRange: int = 3; + const pkEnum: int = 4; + const pkStruct: int = 5; + const pkTuple: int = 6; + const pkGuarded: int = 7; // `p if cond` — patChild1 = inner, patGuardExpr = condition + + struct Pattern { + kind: int, + line: uint32, + column: uint32, + patIdent: String, // for pkIdent + patLitKind: int, // for pkLiteral (token kind) + patLitText: String, // for pkLiteral (token text) + patRangeInclusive: bool, // for pkRange + patEnumPath: String, // for pkEnum: "Enum::Variant" + patStructName: String, // for pkStruct (type name) + patFieldName: String, // for struct field entry: field name in Point { x: a } + patChild1: *Pattern, // range lo / nested / guarded inner + patChild2: *Pattern, // range hi / nested + patArgs: *Pattern, // pkEnum/pkTuple/pkStruct field list (head) + patNext: *Pattern, // next sibling in patArgs list + patGuardExpr: *Expr, // for pkGuarded: the `if` condition + } + + // Match arm: pattern => body + struct MatchArm { + line: uint32, + column: uint32, + pattern: *Pattern, + body: *Expr, + next: *MatchArm, + } + + // --------------------------------------------------------------------------- + // Expr — expressions (tagged union) + // --------------------------------------------------------------------------- + const ekLiteral: int = 0; + const ekIdent: int = 1; + const ekSelf: int = 2; + const ekPath: int = 3; + const ekSizeOf: int = 4; + const ekUnary: int = 5; + const ekPostfix: int = 6; + const ekBinary: int = 7; + const ekAssign: int = 8; + const ekTernary: int = 9; + const ekRange: int = 10; + const ekCall: int = 11; + const ekGenericCall: int = 12; + const ekIndex: int = 13; + const ekField: int = 14; + const ekStructInit: int = 15; + const ekSlice: int = 16; + const ekTuple: int = 17; + const ekCast: int = 18; + const ekIs: int = 19; + const ekTry: int = 20; + const ekUnwrap: int = 23; + const ekBlock: int = 21; + const ekMatch: int = 22; + const ekSpawn: int = 24; + const ekAwait: int = 25; + const ekStringInterp: int = 26; + const ekClosure: int = 27; + + struct ExprList { + expr: *Expr, + next: *ExprList, + argName: String, + } + + struct Expr { + kind: int, + line: uint32, + column: uint32, + // Common fields + strValue: String, // ident name, path segments, field name, callee + intValue: int, // operator kind, intrinsic kind + boolValue: bool, // range inclusive + tokKind: int, // literal token kind + tokText: String, // literal token text + // Children (up to 3 sub-expressions) + child1: *Expr, // left, operand, callee, cond, subject + child2: *Expr, // right, index, then, value + child3: *Expr, // else, third + // Extra references + refType: *TypeExpr, // cast type, is type, sizeof type + refBlock: *Block, // for ekBlock + // Generic call + genericCallee: String, + genericTypeArg0: String, + genericTypeArg1: String, + genericTypeArgCount: int, + // Struct init fields + structName: String, + structFieldCount: int, + // Closure params (for ekClosure) + closureParams: *Decl, + // Captures (for ekClosure) + captureCount: int, + captureName0: String, + captureName1: String, + captureName2: String, + captureName3: String, + captureName4: String, + captureName5: String, + captureName6: String, + captureName7: String, + captureType0: int, + captureType1: int, + captureType2: int, + captureType3: int, + captureType4: int, + captureType5: int, + captureType6: int, + captureType7: int, + // Call arguments (linked list for multi-arg support) + callArgs: *ExprList, + callArgCount: int, + // Match arms (for ekMatch) + matchArms: *MatchArm, + matchArmCount: int, + } + + // --------------------------------------------------------------------------- + // Block — sequence of statements + // --------------------------------------------------------------------------- + struct Block { + line: uint32, + column: uint32, + stmtCount: int, + firstStmt: *Stmt, + lastStmt: *Stmt, + } + + // --------------------------------------------------------------------------- + // Stmt — statements + // --------------------------------------------------------------------------- + const skExpr: int = 0; + const skLet: int = 1; + const skIf: int = 2; + const skWhile: int = 3; + const skDoWhile: int = 4; + const skLoop: int = 5; + const skFor: int = 6; + const skMatch: int = 7; + const skReturn: int = 8; + const skBreak: int = 9; + const skContinue: int = 10; + const skDecl: int = 11; + const skDefer: int = 12; + const skSwitch: int = 13; + + struct ElseIf { + line: uint32; + column: uint32; + cond: *Expr; + block: *Block; + } + + struct Stmt { + kind: int, + line: uint32, + column: uint32, + // Common fields + strValue: String, // let name, pattern ident, label, for var + boolValue: bool, // let mutable + // Children + child1: *Expr, // init expr, condition, iter expr, return value + child2: *Expr, // match subject + child3: *Expr, // extra + refStmtType: *TypeExpr, // let type annotation + refStmtPattern: *Pattern,// let pattern + refStmtDecl: *Decl, // for skDecl + refStmtBlock: *Block, // then/body block + refStmtElse: *Block, // else block + // Else-if chain + elseIfCount: int, + // Linked list + nextStmt: *Stmt, + } + + // --------------------------------------------------------------------------- + // Decl — declarations + // --------------------------------------------------------------------------- + const dkFunc: int = 0; + const dkStruct: int = 1; + const dkEnum: int = 2; + const dkUnion: int = 3; + const dkInterface: int = 4; + const dkImpl: int = 5; + const dkModule: int = 6; + const dkUse: int = 7; + const dkConst: int = 8; + const dkTypeAlias: int = 9; + const dkExternFunc: int = 10; + const dkExternVar: int = 11; + + struct Param { + line: uint32; + column: uint32; + name: String; + refParamType: *TypeExpr; + isVariadic: bool; + defaultExpr: *Expr; + } + + struct StructField { + line: uint32; + column: uint32; + isPublic: bool; + name: String; + refFieldType: *TypeExpr; + } + + struct EnumVariant { + line: uint32; + column: uint32; + name: String; + fieldCount: int; + fieldTypeName0: String; + fieldTypeName1: String; + } + + struct Decl { + fieldCount: int, + fields: *StructField, + kind: int, + line: uint32, + column: uint32, + isPublic: bool, + isAsync: bool, + isChecked: int, // @[Checked] attribute (0/1) + isDrop: int, // @[Drop] attribute (0/1) + isRelease: int, // @[Release] attribute (0/1) + isConst: int, // const func (0/1) + // Names + strValue: String, // decl name + strValue2: String, // interface name, dll name, module path + // Type params (up to 2) + typeParam0: String, + typeParam1: String, + typeParamCount: int, + // Trait bounds for type params (e.g. ) + typeParam0Bound: String, + typeParam1Bound: String, + // Params (for functions) + paramCount: int, + param0: Param, + param1: Param, + param2: Param, + param3: Param, + param4: Param, + param5: Param, + param6: Param, + param7: Param, + param8: Param, + retType: *TypeExpr, + // Body + refBody: *Block, + // Enum variants (up to 8) + variantCount: int, + variant0: EnumVariant, + variant1: EnumVariant, + variant2: EnumVariant, + variant3: EnumVariant, + variant4: EnumVariant, + variant5: EnumVariant, + variant6: EnumVariant, + variant7: EnumVariant, + variant8: EnumVariant, + // Impl methods (up to 4) + methodCount: int, + // Use/import + useKind: int, + usePath: String, + useNames: String, // joined names for multi-import + // Const + constType: *TypeExpr, + constValue: *Expr, + // Type alias + aliasType: *TypeExpr, + // Extern func + extFuncDll: String, + extFuncVariadic: bool, + extFuncRetType: *TypeExpr, + // Children + childDecl1: *Decl, // linked list of decls (for module items, impl methods) + childDecl2: *Decl, + // Struct fields (up to 256) + } + + // --------------------------------------------------------------------------- + // Module — AST root + // --------------------------------------------------------------------------- + struct Module { + name: String, + path: String, // path segments joined + itemCount: int, + firstItem: *Decl, + } + + // --------------------------------------------------------------------------- + // Constructor helpers + // --------------------------------------------------------------------------- + + func Ast_MakeExpr(kind: int, line: uint32, col: uint32) -> Expr { + return Expr { kind: kind, line: line, column: col, + strValue: "", intValue: 0, boolValue: false, + tokKind: 0, tokText: "", + child1: null as *Expr, child2: null as *Expr, child3: null as *Expr, + refType: null as *TypeExpr, refBlock: null as *Block, + genericCallee: "", genericTypeArg0: "", genericTypeArg1: "", genericTypeArgCount: 0, + structName: "", structFieldCount: 0, + callArgs: null as *ExprList, callArgCount: 0 }; + } + + func Ast_MakeIdent(name: String, line: uint32, col: uint32) -> Expr { + var e: Expr = Ast_MakeExpr(ekIdent, line, col); + e.strValue = name; + return e; + } + + func Ast_MakeLiteral(tokKind: int, text: String, line: uint32, col: uint32) -> Expr { + var e: Expr = Ast_MakeExpr(ekLiteral, line, col); + e.tokKind = tokKind; + e.tokText = text; + return e; + } + + func Ast_MakeBinary(op: int, left: *Expr, right: *Expr, line: uint32, col: uint32) -> Expr { + var e: Expr = Ast_MakeExpr(ekBinary, line, col); + e.intValue = op; + e.child1 = left; + e.child2 = right; + return e; + } + + func Ast_MakeCall(callee: *Expr, line: uint32, col: uint32) -> Expr { + var e: Expr = Ast_MakeExpr(ekCall, line, col); + e.child1 = callee; + return e; + } + + func Ast_MakeStmt(kind: int, line: uint32, col: uint32) -> Stmt { + return Stmt { kind: kind, line: line, column: col, + strValue: "", boolValue: false, + child1: null as *Expr, child2: null as *Expr, child3: null as *Expr, + refStmtType: null as *TypeExpr, refStmtPattern: null as *Pattern, + refStmtDecl: null as *Decl, refStmtBlock: null as *Block, refStmtElse: null as *Block, + elseIfCount: 0 }; + } + + func Ast_MakeDecl(kind: int, line: uint32, col: uint32) -> Decl { + return Decl { kind: kind, line: line, column: col, isPublic: false, + isAsync: false, isChecked: 0, isDrop: 0, isRelease: 0, isConst: 0, + strValue: "", strValue2: "", + typeParam0: "", typeParam1: "", typeParamCount: 0, + typeParam0Bound: "", typeParam1Bound: "" + , + paramCount: 0, + retType: null as *TypeExpr, + refBody: null as *Block, + fieldCount: 0, + variantCount: 0, + methodCount: 0, + useKind: 0, usePath: "", useNames: "", + constType: null as *TypeExpr, constValue: null as *Expr, + aliasType: null as *TypeExpr, + extFuncDll: "", extFuncVariadic: false, extFuncRetType: null as *TypeExpr, + childDecl1: null as *Decl, childDecl2: null as *Decl }; + } } diff --git a/src/c_backend.bux b/src/c_backend.bux index 51f7bc8..909184a 100644 --- a/src/c_backend.bux +++ b/src/c_backend.bux @@ -3,1665 +3,1665 @@ module CBackend { -// --------------------------------------------------------------------------- -// Type → C type name -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Type → C type name + // --------------------------------------------------------------------------- -func CBackend_TypeToC(kind: int) -> String { - let cName: String = Type_ToCName(kind); - if !String_Eq(cName, "") { return cName; } - if kind == tyNamed { return "int"; } - return "int"; -} - -// Emit a C parameter/variable declaration, embedding the name inside function-pointer syntax. -func CBE_CParamDecl(typeStr: String, name: String) -> String { - if String_Contains(typeStr, "(*)") { - let replacement: String = String_Concat("(*", String_Concat(name, ")")); - return String_Replace(typeStr, "(*)", replacement); + func CBackend_TypeToC(kind: int) -> String { + let cName: String = Type_ToCName(kind); + if !String_Eq(cName, "") { return cName; } + if kind == tyNamed { return "int"; } + return "int"; } - return String_Concat(typeStr, String_Concat(" ", name)); -} -func CBackend_OpToC(op: int) -> String { - if op == tkPlus { return "+"; } - if op == tkMinus { return "-"; } - if op == tkStar { return "*"; } - if op == tkSlash { return "/"; } - if op == tkPercent { return "%"; } - if op == tkEq { return "=="; } - if op == tkNe { return "!="; } - if op == tkLt { return "<"; } - if op == tkLe { return "<="; } - if op == tkGt { return ">"; } - if op == tkGe { return ">="; } - if op == tkAmpAmp { return "&&"; } - if op == tkPipePipe { return "||"; } - if op == tkBang { return "!"; } - if op == tkTilde { return "~"; } - if op == tkAmp { return "&"; } - if op == tkPipe { return "|"; } - if op == tkCaret { return "^"; } - if op == tkShl { return "<<"; } - if op == tkShr { return ">>"; } - if op == tkAssign { return "="; } - return "?"; -} - -// --------------------------------------------------------------------------- -// StringBuilder-based C emitter -// --------------------------------------------------------------------------- - -struct CEmitter { - sb: StringBuilder, - indent: int, - mod: *HirModule, - checkedFunc: bool, - deferCount: int, - defer0: *HirNode, - defer1: *HirNode, - defer2: *HirNode, - defer3: *HirNode, - defer4: *HirNode, - defer5: *HirNode, - defer6: *HirNode, - defer7: *HirNode, - movedCount: int, - movedName0: String, - movedName1: String, - movedName2: String, - movedName3: String, - movedName4: String, - movedName5: String, - movedName6: String, - movedName7: String, - tmpCounter: int, - currentRetType: String, -} - -func CBE_PushDefer(cbe: *CEmitter, node: *HirNode) { - if cbe.deferCount == 0 { cbe.defer0 = node; } - if cbe.deferCount == 1 { cbe.defer1 = node; } - if cbe.deferCount == 2 { cbe.defer2 = node; } - if cbe.deferCount == 3 { cbe.defer3 = node; } - if cbe.deferCount == 4 { cbe.defer4 = node; } - if cbe.deferCount == 5 { cbe.defer5 = node; } - if cbe.deferCount == 6 { cbe.defer6 = node; } - if cbe.deferCount == 7 { cbe.defer7 = node; } - cbe.deferCount = cbe.deferCount + 1; -} - -func CBE_AddMoved(cbe: *CEmitter, name: String) { - if cbe.movedCount >= 8 { return; } - if cbe.movedCount == 0 { cbe.movedName0 = name; } - else if cbe.movedCount == 1 { cbe.movedName1 = name; } - else if cbe.movedCount == 2 { cbe.movedName2 = name; } - else if cbe.movedCount == 3 { cbe.movedName3 = name; } - else if cbe.movedCount == 4 { cbe.movedName4 = name; } - else if cbe.movedCount == 5 { cbe.movedName5 = name; } - else if cbe.movedCount == 6 { cbe.movedName6 = name; } - else if cbe.movedCount == 7 { cbe.movedName7 = name; } - cbe.movedCount = cbe.movedCount + 1; -} - -func CBE_IsMoved(cbe: *CEmitter, name: String) -> bool { - if cbe.movedCount > 0 && String_Eq(cbe.movedName0, name) { return true; } - if cbe.movedCount > 1 && String_Eq(cbe.movedName1, name) { return true; } - if cbe.movedCount > 2 && String_Eq(cbe.movedName2, name) { return true; } - if cbe.movedCount > 3 && String_Eq(cbe.movedName3, name) { return true; } - if cbe.movedCount > 4 && String_Eq(cbe.movedName4, name) { return true; } - if cbe.movedCount > 5 && String_Eq(cbe.movedName5, name) { return true; } - if cbe.movedCount > 6 && String_Eq(cbe.movedName6, name) { return true; } - if cbe.movedCount > 7 && String_Eq(cbe.movedName7, name) { return true; } - return false; -} - -func CBE_RemoveMoved(cbe: *CEmitter, name: String) { - var found: int = -1; - if cbe.movedCount > 0 && String_Eq(cbe.movedName0, name) { found = 0; } - else if cbe.movedCount > 1 && String_Eq(cbe.movedName1, name) { found = 1; } - else if cbe.movedCount > 2 && String_Eq(cbe.movedName2, name) { found = 2; } - else if cbe.movedCount > 3 && String_Eq(cbe.movedName3, name) { found = 3; } - else if cbe.movedCount > 4 && String_Eq(cbe.movedName4, name) { found = 4; } - else if cbe.movedCount > 5 && String_Eq(cbe.movedName5, name) { found = 5; } - else if cbe.movedCount > 6 && String_Eq(cbe.movedName6, name) { found = 6; } - else if cbe.movedCount > 7 && String_Eq(cbe.movedName7, name) { found = 7; } - if found >= 0 { - var i: int = found; - while i < cbe.movedCount - 1 { - if i == 0 { cbe.movedName0 = cbe.movedName1; } - else if i == 1 { cbe.movedName1 = cbe.movedName2; } - else if i == 2 { cbe.movedName2 = cbe.movedName3; } - else if i == 3 { cbe.movedName3 = cbe.movedName4; } - else if i == 4 { cbe.movedName4 = cbe.movedName5; } - else if i == 5 { cbe.movedName5 = cbe.movedName6; } - else if i == 6 { cbe.movedName6 = cbe.movedName7; } - i = i + 1; + // Emit a C parameter/variable declaration, embedding the name inside function-pointer syntax. + func CBE_CParamDecl(typeStr: String, name: String) -> String { + if String_Contains(typeStr, "(*)") { + let replacement: String = String_Concat("(*", String_Concat(name, ")")); + return String_Replace(typeStr, "(*)", replacement); } - cbe.movedCount = cbe.movedCount - 1; + return String_Concat(typeStr, String_Concat(" ", name)); } -} -func CBE_GetAutoDropVarName(node: *HirNode) -> String { - if node == null as *HirNode { return ""; } - // node is the inner expression stored by CBE_PushDefer (hCall for auto-drop) - let callNode: *HirNode = node; - if callNode.kind != hCall { return ""; } - let addrNode: *HirNode = callNode.child1; - if addrNode == null as *HirNode { return ""; } - if addrNode.kind != hUnary { return ""; } - if addrNode.intValue != tkAmp { return ""; } - let varNode: *HirNode = addrNode.child1; - if varNode == null as *HirNode { return ""; } - if varNode.kind != hVar { return ""; } - return varNode.strValue; -} - -// Emit one defer slot (shared by full-stack and scope-pop emitters). -func CBE_EmitOneDefer(cbe: *CEmitter, i: int) { - var dn: *HirNode = null as *HirNode; - if i == 0 { dn = cbe.defer0; } - if i == 1 { dn = cbe.defer1; } - if i == 2 { dn = cbe.defer2; } - if i == 3 { dn = cbe.defer3; } - if i == 4 { dn = cbe.defer4; } - if i == 5 { dn = cbe.defer5; } - if i == 6 { dn = cbe.defer6; } - if i == 7 { dn = cbe.defer7; } - // Skip auto-drop for moved variables - let deferVarName: String = CBE_GetAutoDropVarName(dn); - if !String_Eq(deferVarName, "") && CBE_IsMoved(cbe, deferVarName) { - return; + func CBackend_OpToC(op: int) -> String { + if op == tkPlus { return "+"; } + if op == tkMinus { return "-"; } + if op == tkStar { return "*"; } + if op == tkSlash { return "/"; } + if op == tkPercent { return "%"; } + if op == tkEq { return "=="; } + if op == tkNe { return "!="; } + if op == tkLt { return "<"; } + if op == tkLe { return "<="; } + if op == tkGt { return ">"; } + if op == tkGe { return ">="; } + if op == tkAmpAmp { return "&&"; } + if op == tkPipePipe { return "||"; } + if op == tkBang { return "!"; } + if op == tkTilde { return "~"; } + if op == tkAmp { return "&"; } + if op == tkPipe { return "|"; } + if op == tkCaret { return "^"; } + if op == tkShl { return "<<"; } + if op == tkShr { return ">>"; } + if op == tkAssign { return "="; } + return "?"; } - StringBuilder_Append(&cbe.sb, "\n"); - var sp: int = 0; - while sp < cbe.indent { - StringBuilder_Append(&cbe.sb, " "); - sp = sp + 1; + + // --------------------------------------------------------------------------- + // StringBuilder-based C emitter + // --------------------------------------------------------------------------- + + struct CEmitter { + sb: StringBuilder, + indent: int, + mod: *HirModule, + checkedFunc: bool, + deferCount: int, + defer0: *HirNode, + defer1: *HirNode, + defer2: *HirNode, + defer3: *HirNode, + defer4: *HirNode, + defer5: *HirNode, + defer6: *HirNode, + defer7: *HirNode, + movedCount: int, + movedName0: String, + movedName1: String, + movedName2: String, + movedName3: String, + movedName4: String, + movedName5: String, + movedName6: String, + movedName7: String, + tmpCounter: int, + currentRetType: String, } - CBE_EmitExpr(cbe, dn); - StringBuilder_Append(&cbe.sb, ";"); -} -// Emit all active defers (LIFO) without clearing the stack. -// Must NOT clear: multiple return paths each need the full defer list. -// (Clearing caused Early(flag) { if (0) return; return 1 } to drop only on first exit.) -// Stack is reset at the start of each function emission. -func CBE_EmitDefers(cbe: *CEmitter) -> int { - if cbe.deferCount == 0 { return 0; } - var i: int = cbe.deferCount - 1; - while i >= 0 { - CBE_EmitOneDefer(cbe, i); - i = i - 1; + func CBE_PushDefer(cbe: *CEmitter, node: *HirNode) { + if cbe.deferCount == 0 { cbe.defer0 = node; } + if cbe.deferCount == 1 { cbe.defer1 = node; } + if cbe.deferCount == 2 { cbe.defer2 = node; } + if cbe.deferCount == 3 { cbe.defer3 = node; } + if cbe.deferCount == 4 { cbe.defer4 = node; } + if cbe.deferCount == 5 { cbe.defer5 = node; } + if cbe.deferCount == 6 { cbe.defer6 = node; } + if cbe.deferCount == 7 { cbe.defer7 = node; } + cbe.deferCount = cbe.deferCount + 1; } - return 1; -} -// Emit branch/loop-local defers (indices fromIdx..count-1) then pop them. -// Outer defers stay live so sibling branches and later returns still drop correctly. -func CBE_EmitAndPopDefersFrom(cbe: *CEmitter, fromIdx: int) -> int { - if cbe.deferCount <= fromIdx { return 0; } - var i: int = cbe.deferCount - 1; - while i >= fromIdx { - CBE_EmitOneDefer(cbe, i); - i = i - 1; + func CBE_AddMoved(cbe: *CEmitter, name: String) { + if cbe.movedCount >= 8 { return; } + if cbe.movedCount == 0 { cbe.movedName0 = name; } + else if cbe.movedCount == 1 { cbe.movedName1 = name; } + else if cbe.movedCount == 2 { cbe.movedName2 = name; } + else if cbe.movedCount == 3 { cbe.movedName3 = name; } + else if cbe.movedCount == 4 { cbe.movedName4 = name; } + else if cbe.movedCount == 5 { cbe.movedName5 = name; } + else if cbe.movedCount == 6 { cbe.movedName6 = name; } + else if cbe.movedCount == 7 { cbe.movedName7 = name; } + cbe.movedCount = cbe.movedCount + 1; } - cbe.deferCount = fromIdx; - return 1; -} -func CBE_Emit(cbe: *CEmitter, text: String) { - var i: int = 0; - while i < cbe.indent { - StringBuilder_Append(&cbe.sb, " "); - i = i + 1; + func CBE_IsMoved(cbe: *CEmitter, name: String) -> bool { + if cbe.movedCount > 0 && String_Eq(cbe.movedName0, name) { return true; } + if cbe.movedCount > 1 && String_Eq(cbe.movedName1, name) { return true; } + if cbe.movedCount > 2 && String_Eq(cbe.movedName2, name) { return true; } + if cbe.movedCount > 3 && String_Eq(cbe.movedName3, name) { return true; } + if cbe.movedCount > 4 && String_Eq(cbe.movedName4, name) { return true; } + if cbe.movedCount > 5 && String_Eq(cbe.movedName5, name) { return true; } + if cbe.movedCount > 6 && String_Eq(cbe.movedName6, name) { return true; } + if cbe.movedCount > 7 && String_Eq(cbe.movedName7, name) { return true; } + return false; } - StringBuilder_Append(&cbe.sb, text); -} -// --------------------------------------------------------------------------- -// Emit HIR node -// --------------------------------------------------------------------------- - -func CBE_EmitExpr(cbe: *CEmitter, node: *HirNode) { - if node == null as *HirNode { return; } - let kind: int = node.kind; - - // Literal - if kind == hLit { - if node.intValue == tkNull { - StringBuilder_Append(&cbe.sb, "0"); - } else { - let s: String = node.strValue; - let slen: int = String_Len(s) as int; - var start: int = 0; - var end: int = slen; - var isQuoted: bool = false; - var isBacktick: bool = false; - // If the literal is wrapped in quotes (from lexer), preserve outer quotes - // and only escape the inner content. - if slen >= 2 && s[0] == 34 as char8 && s[slen - 1] == 34 as char8 { - isQuoted = true; - start = 1; - end = slen - 1; - } - // Backtick raw string: strip backticks, escape inner content for C - if slen >= 2 && s[0] == 96 as char8 && s[slen - 1] == 96 as char8 { - isBacktick = true; - start = 1; - end = slen - 1; - } - if isQuoted || isBacktick { - StringBuilder_Append(&cbe.sb, "\""); - } - var i: int = start; - while i < end { - let c: int = s[i] as int; - if c == 34 { - StringBuilder_Append(&cbe.sb, "\\\""); - } else if c == 92 { - StringBuilder_Append(&cbe.sb, "\\\\"); - } else if c == 10 { - StringBuilder_Append(&cbe.sb, "\\n"); - } else if c == 9 { - StringBuilder_Append(&cbe.sb, "\\t"); - } else if c == 13 { - StringBuilder_Append(&cbe.sb, "\\r"); - } else { - StringBuilder_AppendChar(&cbe.sb, c as char8); - } + func CBE_RemoveMoved(cbe: *CEmitter, name: String) { + var found: int = -1; + if cbe.movedCount > 0 && String_Eq(cbe.movedName0, name) { found = 0; } + else if cbe.movedCount > 1 && String_Eq(cbe.movedName1, name) { found = 1; } + else if cbe.movedCount > 2 && String_Eq(cbe.movedName2, name) { found = 2; } + else if cbe.movedCount > 3 && String_Eq(cbe.movedName3, name) { found = 3; } + else if cbe.movedCount > 4 && String_Eq(cbe.movedName4, name) { found = 4; } + else if cbe.movedCount > 5 && String_Eq(cbe.movedName5, name) { found = 5; } + else if cbe.movedCount > 6 && String_Eq(cbe.movedName6, name) { found = 6; } + else if cbe.movedCount > 7 && String_Eq(cbe.movedName7, name) { found = 7; } + if found >= 0 { + var i: int = found; + while i < cbe.movedCount - 1 { + if i == 0 { cbe.movedName0 = cbe.movedName1; } + else if i == 1 { cbe.movedName1 = cbe.movedName2; } + else if i == 2 { cbe.movedName2 = cbe.movedName3; } + else if i == 3 { cbe.movedName3 = cbe.movedName4; } + else if i == 4 { cbe.movedName4 = cbe.movedName5; } + else if i == 5 { cbe.movedName5 = cbe.movedName6; } + else if i == 6 { cbe.movedName6 = cbe.movedName7; } i = i + 1; } - if isQuoted || isBacktick { - StringBuilder_Append(&cbe.sb, "\""); - } + cbe.movedCount = cbe.movedCount - 1; } - return; } - // Variable - if kind == hVar { - if node.intValue != 0 { - StringBuilder_Append(&cbe.sb, "/* hVar tk="); - StringBuilder_AppendInt(&cbe.sb, node.intValue); - StringBuilder_Append(&cbe.sb, " */"); - } - StringBuilder_Append(&cbe.sb, node.strValue); - return; + func CBE_GetAutoDropVarName(node: *HirNode) -> String { + if node == null as *HirNode { return ""; } + // node is the inner expression stored by CBE_PushDefer (hCall for auto-drop) + let callNode: *HirNode = node; + if callNode.kind != hCall { return ""; } + let addrNode: *HirNode = callNode.child1; + if addrNode == null as *HirNode { return ""; } + if addrNode.kind != hUnary { return ""; } + if addrNode.intValue != tkAmp { return ""; } + let varNode: *HirNode = addrNode.child1; + if varNode == null as *HirNode { return ""; } + if varNode.kind != hVar { return ""; } + return varNode.strValue; } - // Binary - if kind == hBinary { - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, CBackend_OpToC(node.intValue)); - StringBuilder_Append(&cbe.sb, " "); - CBE_EmitExpr(cbe, node.child2); - return; + // Emit one defer slot (shared by full-stack and scope-pop emitters). + func CBE_EmitOneDefer(cbe: *CEmitter, i: int) { + var dn: *HirNode = null as *HirNode; + if i == 0 { dn = cbe.defer0; } + if i == 1 { dn = cbe.defer1; } + if i == 2 { dn = cbe.defer2; } + if i == 3 { dn = cbe.defer3; } + if i == 4 { dn = cbe.defer4; } + if i == 5 { dn = cbe.defer5; } + if i == 6 { dn = cbe.defer6; } + if i == 7 { dn = cbe.defer7; } + // Skip auto-drop for moved variables + let deferVarName: String = CBE_GetAutoDropVarName(dn); + if !String_Eq(deferVarName, "") && CBE_IsMoved(cbe, deferVarName) { + return; + } + StringBuilder_Append(&cbe.sb, "\n"); + var sp: int = 0; + while sp < cbe.indent { + StringBuilder_Append(&cbe.sb, " "); + sp = sp + 1; + } + CBE_EmitExpr(cbe, dn); + StringBuilder_Append(&cbe.sb, ";"); } - // Unary - if kind == hUnary { - StringBuilder_Append(&cbe.sb, CBackend_OpToC(node.intValue)); - CBE_EmitExpr(cbe, node.child1); - return; + // Emit all active defers (LIFO) without clearing the stack. + // Must NOT clear: multiple return paths each need the full defer list. + // (Clearing caused Early(flag) { if (0) return; return 1 } to drop only on first exit.) + // Stack is reset at the start of each function emission. + func CBE_EmitDefers(cbe: *CEmitter) -> int { + if cbe.deferCount == 0 { return 0; } + var i: int = cbe.deferCount - 1; + while i >= 0 { + CBE_EmitOneDefer(cbe, i); + i = i - 1; + } + return 1; } - // Call - if kind == hCall { - StringBuilder_Append(&cbe.sb, node.strValue); - StringBuilder_Append(&cbe.sb, "("); - var needsComma: bool = false; - if node.child1 != null as *HirNode { - CBE_EmitExpr(cbe, node.child1); - needsComma = true; + // Emit branch/loop-local defers (indices fromIdx..count-1) then pop them. + // Outer defers stay live so sibling branches and later returns still drop correctly. + func CBE_EmitAndPopDefersFrom(cbe: *CEmitter, fromIdx: int) -> int { + if cbe.deferCount <= fromIdx { return 0; } + var i: int = cbe.deferCount - 1; + while i >= fromIdx { + CBE_EmitOneDefer(cbe, i); + i = i - 1; } - if node.child2 != null as *HirNode { - if needsComma { - StringBuilder_Append(&cbe.sb, ", "); - } - CBE_EmitExpr(cbe, node.child2); - needsComma = true; - } - // Emit extra args from linked list - var ai: int = 0; - var curExtra: *HirArgList = node.extraData as *HirArgList; - while ai < node.extraCount { - if needsComma { - StringBuilder_Append(&cbe.sb, ", "); - } - CBE_EmitExpr(cbe, curExtra.node); - needsComma = true; - curExtra = curExtra.next; - ai = ai + 1; - } - StringBuilder_Append(&cbe.sb, ")"); - return; + cbe.deferCount = fromIdx; + return 1; } - // Indirect call through fat function pointer: f.code(f.env, args...) - if kind == hCallIndirect { - StringBuilder_Append(&cbe.sb, "("); - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, ".code)("); - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, ".env"); - if node.child2 != null as *HirNode { - StringBuilder_Append(&cbe.sb, ", "); - CBE_EmitExpr(cbe, node.child2); + func CBE_Emit(cbe: *CEmitter, text: String) { + var i: int = 0; + while i < cbe.indent { + StringBuilder_Append(&cbe.sb, " "); + i = i + 1; } - if node.child3 != null as *HirNode { - StringBuilder_Append(&cbe.sb, ", "); - CBE_EmitExpr(cbe, node.child3); - } - // Emit extra args from linked list - var ai: int = 0; - var curExtra: *HirArgList = node.extraData as *HirArgList; - while ai < node.extraCount { - StringBuilder_Append(&cbe.sb, ", "); - CBE_EmitExpr(cbe, curExtra.node); - curExtra = curExtra.next; - ai = ai + 1; - } - StringBuilder_Append(&cbe.sb, ")"); - return; + StringBuilder_Append(&cbe.sb, text); } - // spawn Callee(args) - if kind == hSpawn { - if node.boolValue { - // Async spawn: callee is an async function - StringBuilder_Append(&cbe.sb, "bux_async_spawn("); - StringBuilder_Append(&cbe.sb, node.strValue); - StringBuilder_Append(&cbe.sb, ")"); - } else { - // Green-thread spawn: callee is a regular task function - StringBuilder_Append(&cbe.sb, "bux_task_spawn("); - StringBuilder_Append(&cbe.sb, node.strValue); - if node.child1 != null as *HirNode { - StringBuilder_Append(&cbe.sb, ", (void*)"); - CBE_EmitExpr(cbe, node.child1); + // --------------------------------------------------------------------------- + // Emit HIR node + // --------------------------------------------------------------------------- + + func CBE_EmitExpr(cbe: *CEmitter, node: *HirNode) { + if node == null as *HirNode { return; } + let kind: int = node.kind; + + // Literal + if kind == hLit { + if node.intValue == tkNull { + StringBuilder_Append(&cbe.sb, "0"); } else { - StringBuilder_Append(&cbe.sb, ", NULL"); + let s: String = node.strValue; + let slen: int = String_Len(s) as int; + var start: int = 0; + var end: int = slen; + var isQuoted: bool = false; + var isBacktick: bool = false; + // If the literal is wrapped in quotes (from lexer), preserve outer quotes + // and only escape the inner content. + if slen >= 2 && s[0] == 34 as char8 && s[slen - 1] == 34 as char8 { + isQuoted = true; + start = 1; + end = slen - 1; + } + // Backtick raw string: strip backticks, escape inner content for C + if slen >= 2 && s[0] == 96 as char8 && s[slen - 1] == 96 as char8 { + isBacktick = true; + start = 1; + end = slen - 1; + } + if isQuoted || isBacktick { + StringBuilder_Append(&cbe.sb, "\""); + } + var i: int = start; + while i < end { + let c: int = s[i] as int; + if c == 34 { + StringBuilder_Append(&cbe.sb, "\\\""); + } else if c == 92 { + StringBuilder_Append(&cbe.sb, "\\\\"); + } else if c == 10 { + StringBuilder_Append(&cbe.sb, "\\n"); + } else if c == 9 { + StringBuilder_Append(&cbe.sb, "\\t"); + } else if c == 13 { + StringBuilder_Append(&cbe.sb, "\\r"); + } else { + StringBuilder_AppendChar(&cbe.sb, c as char8); + } + i = i + 1; + } + if isQuoted || isBacktick { + StringBuilder_Append(&cbe.sb, "\""); + } + } + return; + } + + // Variable + if kind == hVar { + if node.intValue != 0 { + StringBuilder_Append(&cbe.sb, "/* hVar tk="); + StringBuilder_AppendInt(&cbe.sb, node.intValue); + StringBuilder_Append(&cbe.sb, " */"); + } + StringBuilder_Append(&cbe.sb, node.strValue); + return; + } + + // Binary + if kind == hBinary { + CBE_EmitExpr(cbe, node.child1); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, CBackend_OpToC(node.intValue)); + StringBuilder_Append(&cbe.sb, " "); + CBE_EmitExpr(cbe, node.child2); + return; + } + + // Unary + if kind == hUnary { + StringBuilder_Append(&cbe.sb, CBackend_OpToC(node.intValue)); + CBE_EmitExpr(cbe, node.child1); + return; + } + + // Call + if kind == hCall { + StringBuilder_Append(&cbe.sb, node.strValue); + StringBuilder_Append(&cbe.sb, "("); + var needsComma: bool = false; + if node.child1 != null as *HirNode { + CBE_EmitExpr(cbe, node.child1); + needsComma = true; + } + if node.child2 != null as *HirNode { + if needsComma { + StringBuilder_Append(&cbe.sb, ", "); + } + CBE_EmitExpr(cbe, node.child2); + needsComma = true; + } + // Emit extra args from linked list + var ai: int = 0; + var curExtra: *HirArgList = node.extraData as *HirArgList; + while ai < node.extraCount { + if needsComma { + StringBuilder_Append(&cbe.sb, ", "); + } + CBE_EmitExpr(cbe, curExtra.node); + needsComma = true; + curExtra = curExtra.next; + ai = ai + 1; } StringBuilder_Append(&cbe.sb, ")"); + return; } - return; - } - // await - if kind == hAwait { - StringBuilder_Append(&cbe.sb, "bux_async_await("); - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, ")"); - return; - } - - // Defer - if kind == hDefer { - CBE_PushDefer(cbe, node.child1); - return; - } - - // Return — evaluate value first, then drop live locals, then return. - // (Emitting Drop before the value used to use-after-drop on `return a.id`.) - if kind == hReturn { - // Track moved variables via return (skip auto-drop of moved-out locals) - if node.child1 != null as *HirNode && node.child1.kind == hVar { - CBE_AddMoved(cbe, node.child1.strValue); - } - if node.child1 != null as *HirNode && cbe.deferCount > 0 { - // Materialize into a temp so Drop cannot clobber the returned value. - // Prefer the enclosing function return type (field-access HIR often - // carries the base struct typeName, which is wrong for `return a.id`). - cbe.tmpCounter = cbe.tmpCounter + 1; - let tmpName: String = String_Concat("__retdrop_", String_FromInt(cbe.tmpCounter)); - var retCt: String = "int"; - if cbe.currentRetType != null as String && !String_Eq(cbe.currentRetType, "") && !String_Eq(cbe.currentRetType, "void") { - retCt = cbe.currentRetType; - } else if node.child1.typeKind != 0 { - retCt = CBackend_TypeToC(node.child1.typeKind); - } - StringBuilder_Append(&cbe.sb, CBE_CParamDecl(retCt, tmpName)); - StringBuilder_Append(&cbe.sb, " = "); + // Indirect call through fat function pointer: f.code(f.env, args...) + if kind == hCallIndirect { + StringBuilder_Append(&cbe.sb, "("); CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, ";"); - discard CBE_EmitDefers(cbe); - StringBuilder_Append(&cbe.sb, "\n"); + StringBuilder_Append(&cbe.sb, ".code)("); + CBE_EmitExpr(cbe, node.child1); + StringBuilder_Append(&cbe.sb, ".env"); + if node.child2 != null as *HirNode { + StringBuilder_Append(&cbe.sb, ", "); + CBE_EmitExpr(cbe, node.child2); + } + if node.child3 != null as *HirNode { + StringBuilder_Append(&cbe.sb, ", "); + CBE_EmitExpr(cbe, node.child3); + } + // Emit extra args from linked list + var ai: int = 0; + var curExtra: *HirArgList = node.extraData as *HirArgList; + while ai < node.extraCount { + StringBuilder_Append(&cbe.sb, ", "); + CBE_EmitExpr(cbe, curExtra.node); + curExtra = curExtra.next; + ai = ai + 1; + } + StringBuilder_Append(&cbe.sb, ")"); + return; + } + + // spawn Callee(args) + if kind == hSpawn { + if node.boolValue { + // Async spawn: callee is an async function + StringBuilder_Append(&cbe.sb, "bux_async_spawn("); + StringBuilder_Append(&cbe.sb, node.strValue); + StringBuilder_Append(&cbe.sb, ")"); + } else { + // Green-thread spawn: callee is a regular task function + StringBuilder_Append(&cbe.sb, "bux_task_spawn("); + StringBuilder_Append(&cbe.sb, node.strValue); + if node.child1 != null as *HirNode { + StringBuilder_Append(&cbe.sb, ", (void*)"); + CBE_EmitExpr(cbe, node.child1); + } else { + StringBuilder_Append(&cbe.sb, ", NULL"); + } + StringBuilder_Append(&cbe.sb, ")"); + } + return; + } + + // await + if kind == hAwait { + StringBuilder_Append(&cbe.sb, "bux_async_await("); + CBE_EmitExpr(cbe, node.child1); + StringBuilder_Append(&cbe.sb, ")"); + return; + } + + // Defer + if kind == hDefer { + CBE_PushDefer(cbe, node.child1); + return; + } + + // Return — evaluate value first, then drop live locals, then return. + // (Emitting Drop before the value used to use-after-drop on `return a.id`.) + if kind == hReturn { + // Track moved variables via return (skip auto-drop of moved-out locals) + if node.child1 != null as *HirNode && node.child1.kind == hVar { + CBE_AddMoved(cbe, node.child1.strValue); + } + if node.child1 != null as *HirNode && cbe.deferCount > 0 { + // Materialize into a temp so Drop cannot clobber the returned value. + // Prefer the enclosing function return type (field-access HIR often + // carries the base struct typeName, which is wrong for `return a.id`). + cbe.tmpCounter = cbe.tmpCounter + 1; + let tmpName: String = String_Concat("__retdrop_", String_FromInt(cbe.tmpCounter)); + var retCt: String = "int"; + if cbe.currentRetType != null as String && !String_Eq(cbe.currentRetType, "") && !String_Eq(cbe.currentRetType, "void") { + retCt = cbe.currentRetType; + } else if node.child1.typeKind != 0 { + retCt = CBackend_TypeToC(node.child1.typeKind); + } + StringBuilder_Append(&cbe.sb, CBE_CParamDecl(retCt, tmpName)); + StringBuilder_Append(&cbe.sb, " = "); + CBE_EmitExpr(cbe, node.child1); + StringBuilder_Append(&cbe.sb, ";"); + discard CBE_EmitDefers(cbe); + StringBuilder_Append(&cbe.sb, "\n"); + var sp: int = 0; + while sp < cbe.indent { + StringBuilder_Append(&cbe.sb, " "); + sp = sp + 1; + } + StringBuilder_Append(&cbe.sb, "return "); + StringBuilder_Append(&cbe.sb, tmpName); + return; + } + let hadDefers: int = CBE_EmitDefers(cbe); + if hadDefers != 0 { + StringBuilder_Append(&cbe.sb, "\n"); + var sp2: int = 0; + while sp2 < cbe.indent { + StringBuilder_Append(&cbe.sb, " "); + sp2 = sp2 + 1; + } + } + StringBuilder_Append(&cbe.sb, "return"); + if node.child1 != null as *HirNode { + StringBuilder_Append(&cbe.sb, " "); + CBE_EmitExpr(cbe, node.child1); + } + return; + } + + // Alloca + if kind == hAlloca { + var ct: String = "int"; + if !String_Eq(node.typeName, "") { + ct = node.typeName; + } + StringBuilder_Append(&cbe.sb, CBE_CParamDecl(ct, node.strValue)); + return; + } + + // Store: combine alloca + value into single declaration + if kind == hStore { + // Track moved variables via assignment/let + if node.child2 != null as *HirNode && node.child2.kind == hVar { + CBE_AddMoved(cbe, node.child2.strValue); + } + // Reinitialization removes moved status + if node.child1 != null as *HirNode && node.child1.kind == hVar { + CBE_RemoveMoved(cbe, node.child1.strValue); + } + if node.child1 != null as *HirNode && node.child1.kind == hAlloca { + // Declaration with initializer: Type x = value; + var ct: String = CBackend_TypeToC(node.child1.intValue); + if !String_Eq(node.child1.typeName, "") { + ct = node.child1.typeName; + } + StringBuilder_Append(&cbe.sb, CBE_CParamDecl(ct, node.child1.strValue)); + if node.child2 != null as *HirNode { + StringBuilder_Append(&cbe.sb, " = "); + CBE_EmitExpr(cbe, node.child2); + } + return; + } + // Plain assignment + CBE_EmitExpr(cbe, node.child1); + StringBuilder_Append(&cbe.sb, " = "); + CBE_EmitExpr(cbe, node.child2); + return; + } + + // If — each branch has its own defer scope (locals do not leak) + if kind == hIf { + + StringBuilder_Append(&cbe.sb, "if ("); + CBE_EmitExpr(cbe, node.child1); + StringBuilder_Append(&cbe.sb, ") {\n"); + if node.child2 != null as *HirNode { + let savedThen: int = cbe.deferCount; + cbe.indent = cbe.indent + 1; + CBE_EmitExpr(cbe, node.child2); + discard CBE_EmitAndPopDefersFrom(cbe, savedThen); + cbe.indent = cbe.indent - 1; + } var sp: int = 0; while sp < cbe.indent { StringBuilder_Append(&cbe.sb, " "); sp = sp + 1; } - StringBuilder_Append(&cbe.sb, "return "); - StringBuilder_Append(&cbe.sb, tmpName); + StringBuilder_Append(&cbe.sb, "}"); + let elseBlock: *HirNode = node.extraData as *HirNode; + if elseBlock != null as *HirNode { + StringBuilder_Append(&cbe.sb, " else {\n"); + let savedElse: int = cbe.deferCount; + cbe.indent = cbe.indent + 1; + CBE_EmitExpr(cbe, elseBlock); + discard CBE_EmitAndPopDefersFrom(cbe, savedElse); + cbe.indent = cbe.indent - 1; + sp = 0; + while sp < cbe.indent { + StringBuilder_Append(&cbe.sb, " "); + sp = sp + 1; + } + StringBuilder_Append(&cbe.sb, "}\n"); + } else { + StringBuilder_Append(&cbe.sb, "\n"); + } return; } - let hadDefers: int = CBE_EmitDefers(cbe); - if hadDefers != 0 { - StringBuilder_Append(&cbe.sb, "\n"); - var sp2: int = 0; - while sp2 < cbe.indent { - StringBuilder_Append(&cbe.sb, " "); - sp2 = sp2 + 1; - } - } - StringBuilder_Append(&cbe.sb, "return"); - if node.child1 != null as *HirNode { - StringBuilder_Append(&cbe.sb, " "); + + // While — loop-body locals dropped each iteration + if kind == hWhile { + StringBuilder_Append(&cbe.sb, "while ("); CBE_EmitExpr(cbe, node.child1); - } - return; - } - - // Alloca - if kind == hAlloca { - var ct: String = "int"; - if !String_Eq(node.typeName, "") { - ct = node.typeName; - } - StringBuilder_Append(&cbe.sb, CBE_CParamDecl(ct, node.strValue)); - return; - } - - // Store: combine alloca + value into single declaration - if kind == hStore { - // Track moved variables via assignment/let - if node.child2 != null as *HirNode && node.child2.kind == hVar { - CBE_AddMoved(cbe, node.child2.strValue); - } - // Reinitialization removes moved status - if node.child1 != null as *HirNode && node.child1.kind == hVar { - CBE_RemoveMoved(cbe, node.child1.strValue); - } - if node.child1 != null as *HirNode && node.child1.kind == hAlloca { - // Declaration with initializer: Type x = value; - var ct: String = CBackend_TypeToC(node.child1.intValue); - if !String_Eq(node.child1.typeName, "") { - ct = node.child1.typeName; - } - StringBuilder_Append(&cbe.sb, CBE_CParamDecl(ct, node.child1.strValue)); + StringBuilder_Append(&cbe.sb, ") {\n"); if node.child2 != null as *HirNode { - StringBuilder_Append(&cbe.sb, " = "); + let savedW: int = cbe.deferCount; + cbe.indent = cbe.indent + 1; CBE_EmitExpr(cbe, node.child2); + discard CBE_EmitAndPopDefersFrom(cbe, savedW); + cbe.indent = cbe.indent - 1; } - return; - } - // Plain assignment - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, " = "); - CBE_EmitExpr(cbe, node.child2); - return; - } - - // If — each branch has its own defer scope (locals do not leak) - if kind == hIf { - - StringBuilder_Append(&cbe.sb, "if ("); - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, ") {\n"); - if node.child2 != null as *HirNode { - let savedThen: int = cbe.deferCount; - cbe.indent = cbe.indent + 1; - CBE_EmitExpr(cbe, node.child2); - discard CBE_EmitAndPopDefersFrom(cbe, savedThen); - cbe.indent = cbe.indent - 1; - } - var sp: int = 0; - while sp < cbe.indent { - StringBuilder_Append(&cbe.sb, " "); - sp = sp + 1; - } - StringBuilder_Append(&cbe.sb, "}"); - let elseBlock: *HirNode = node.extraData as *HirNode; - if elseBlock != null as *HirNode { - StringBuilder_Append(&cbe.sb, " else {\n"); - let savedElse: int = cbe.deferCount; - cbe.indent = cbe.indent + 1; - CBE_EmitExpr(cbe, elseBlock); - discard CBE_EmitAndPopDefersFrom(cbe, savedElse); - cbe.indent = cbe.indent - 1; - sp = 0; + var sp: int = 0; while sp < cbe.indent { StringBuilder_Append(&cbe.sb, " "); sp = sp + 1; } - StringBuilder_Append(&cbe.sb, "}\n"); - } else { - StringBuilder_Append(&cbe.sb, "\n"); + StringBuilder_Append(&cbe.sb, "}"); + return; } - return; - } - // While — loop-body locals dropped each iteration - if kind == hWhile { - StringBuilder_Append(&cbe.sb, "while ("); - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, ") {\n"); - if node.child2 != null as *HirNode { - let savedW: int = cbe.deferCount; - cbe.indent = cbe.indent + 1; - CBE_EmitExpr(cbe, node.child2); - discard CBE_EmitAndPopDefersFrom(cbe, savedW); - cbe.indent = cbe.indent - 1; + // Loop (infinite) + if kind == hLoop { + StringBuilder_Append(&cbe.sb, "while (1) {\n"); + if node.child1 != null as *HirNode { + let savedL: int = cbe.deferCount; + cbe.indent = cbe.indent + 1; + CBE_EmitExpr(cbe, node.child1); + discard CBE_EmitAndPopDefersFrom(cbe, savedL); + cbe.indent = cbe.indent - 1; + } + var sp: int = 0; + while sp < cbe.indent { + StringBuilder_Append(&cbe.sb, " "); + sp = sp + 1; + } + StringBuilder_Append(&cbe.sb, "}"); + return; } - var sp: int = 0; - while sp < cbe.indent { - StringBuilder_Append(&cbe.sb, " "); - sp = sp + 1; - } - StringBuilder_Append(&cbe.sb, "}"); - return; - } - // Loop (infinite) - if kind == hLoop { - StringBuilder_Append(&cbe.sb, "while (1) {\n"); - if node.child1 != null as *HirNode { - let savedL: int = cbe.deferCount; - cbe.indent = cbe.indent + 1; + // Break / Continue + if kind == hBreak { + StringBuilder_Append(&cbe.sb, "break;"); + return; + } + if kind == hContinue { + StringBuilder_Append(&cbe.sb, "continue;"); + return; + } + + // Field access: obj.field — use -> if base is a pointer + if kind == hFieldAccess { CBE_EmitExpr(cbe, node.child1); - discard CBE_EmitAndPopDefersFrom(cbe, savedL); - cbe.indent = cbe.indent - 1; - } - var sp: int = 0; - while sp < cbe.indent { - StringBuilder_Append(&cbe.sb, " "); - sp = sp + 1; - } - StringBuilder_Append(&cbe.sb, "}"); - return; - } - - // Break / Continue - if kind == hBreak { - StringBuilder_Append(&cbe.sb, "break;"); - return; - } - if kind == hContinue { - StringBuilder_Append(&cbe.sb, "continue;"); - return; - } - - // Field access: obj.field — use -> if base is a pointer - if kind == hFieldAccess { - CBE_EmitExpr(cbe, node.child1); - var isPtr: bool = false; - if node.child1 != null as *HirNode { - let childType: String = CBE_GetExprTypeName(cbe.mod, node.child1); - if String_EndsWith(childType, "*") { - isPtr = true; - } - if node.child1.kind == hVar && node.child1.typeKind == tyPointer { - isPtr = true; - } - } - if isPtr { - StringBuilder_Append(&cbe.sb, "->"); - } else { - StringBuilder_Append(&cbe.sb, "."); - } - StringBuilder_Append(&cbe.sb, node.strValue); - return; - } - - // Field access: obj.field — use -> if base is pointer, else . - if kind == hFieldPtr { - CBE_EmitExpr(cbe, node.child1); - var isPtr: bool = false; - if node.child1 != null as *HirNode { - let childType: String = CBE_GetExprTypeName(cbe.mod, node.child1); - if String_EndsWith(childType, "*") { - isPtr = true; - } - } - if isPtr { - StringBuilder_Append(&cbe.sb, "->"); - } else { - StringBuilder_Append(&cbe.sb, "."); - } - StringBuilder_Append(&cbe.sb, node.strValue); - return; - } - - // Sizeof: sizeof(Type) — emit as sizeof(Type) - if kind == hSizeOf { - StringBuilder_Append(&cbe.sb, "sizeof("); - if !String_Eq(node.typeName, "") { - StringBuilder_Append(&cbe.sb, node.typeName); - } else { - StringBuilder_Append(&cbe.sb, "int"); - } - StringBuilder_Append(&cbe.sb, ")"); - return; - } - - // Index: arr[idx] — emit as arr[idx] - // For Array/Iter desugar pattern (fieldPtr "data"), emit bounds-checked access - if kind == hIndexPtr { - var isArrayAccess: bool = false; - if node.child1 != null as *HirNode { - if node.child1.kind == hFieldPtr && String_Eq(node.child1.strValue, "data") { - isArrayAccess = true; - } - } - if isArrayAccess { - // self.data[i] is a raw pointer index; Bux source inserts - // bux_bounds_check explicitly where needed (Array_Get). Do NOT - // re-check against .len here — Push writes at index == len. - let base: *HirNode = node.child1.child1; var isPtr: bool = false; - if base != null as *HirNode { - let childType: String = CBE_GetExprTypeName(cbe.mod, base); + if node.child1 != null as *HirNode { + let childType: String = CBE_GetExprTypeName(cbe.mod, node.child1); if String_EndsWith(childType, "*") { isPtr = true; } - if base.kind == hVar && base.typeKind == tyPointer { + if node.child1.kind == hVar && node.child1.typeKind == tyPointer { isPtr = true; } } - let sep: String = "."; - if isPtr { sep = "->"; } - CBE_EmitExpr(cbe, base); - StringBuilder_Append(&cbe.sb, sep); - StringBuilder_Append(&cbe.sb, "data["); - CBE_EmitExpr(cbe, node.child2); - StringBuilder_Append(&cbe.sb, "]"); - } else { - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, "["); - CBE_EmitExpr(cbe, node.child2); - StringBuilder_Append(&cbe.sb, "]"); + if isPtr { + StringBuilder_Append(&cbe.sb, "->"); + } else { + StringBuilder_Append(&cbe.sb, "."); + } + StringBuilder_Append(&cbe.sb, node.strValue); + return; } - return; - } - // Load: *ptr — emit as *ptr (dereference) - // Optimize common patterns to avoid & / * temporaries - if kind == hLoad { - if node.child1 != null as *HirNode { - let ptrNode: *HirNode = node.child1; - let ptrKind: int = ptrNode.kind; - // field access: load(field_ptr(base, field)) → base.field - if ptrKind == hFieldPtr { - CBE_EmitExpr(cbe, ptrNode.child1); + // Field access: obj.field — use -> if base is pointer, else . + if kind == hFieldPtr { + CBE_EmitExpr(cbe, node.child1); + var isPtr: bool = false; + if node.child1 != null as *HirNode { + let childType: String = CBE_GetExprTypeName(cbe.mod, node.child1); + if String_EndsWith(childType, "*") { + isPtr = true; + } + } + if isPtr { + StringBuilder_Append(&cbe.sb, "->"); + } else { + StringBuilder_Append(&cbe.sb, "."); + } + StringBuilder_Append(&cbe.sb, node.strValue); + return; + } + + // Sizeof: sizeof(Type) — emit as sizeof(Type) + if kind == hSizeOf { + StringBuilder_Append(&cbe.sb, "sizeof("); + if !String_Eq(node.typeName, "") { + StringBuilder_Append(&cbe.sb, node.typeName); + } else { + StringBuilder_Append(&cbe.sb, "int"); + } + StringBuilder_Append(&cbe.sb, ")"); + return; + } + + // Index: arr[idx] — emit as arr[idx] + // For Array/Iter desugar pattern (fieldPtr "data"), emit bounds-checked access + if kind == hIndexPtr { + var isArrayAccess: bool = false; + if node.child1 != null as *HirNode { + if node.child1.kind == hFieldPtr && String_Eq(node.child1.strValue, "data") { + isArrayAccess = true; + } + } + if isArrayAccess { + // self.data[i] is a raw pointer index; Bux source inserts + // bux_bounds_check explicitly where needed (Array_Get). Do NOT + // re-check against .len here — Push writes at index == len. + let base: *HirNode = node.child1.child1; var isPtr: bool = false; - if ptrNode.child1 != null as *HirNode { - let childType: String = CBE_GetExprTypeName(cbe.mod, ptrNode.child1); + if base != null as *HirNode { + let childType: String = CBE_GetExprTypeName(cbe.mod, base); if String_EndsWith(childType, "*") { isPtr = true; } - } - if isPtr { - StringBuilder_Append(&cbe.sb, "->"); - } else { - StringBuilder_Append(&cbe.sb, "."); - } - StringBuilder_Append(&cbe.sb, ptrNode.strValue); - return; - } - // arrow field: load(arrow_field(base, field)) → base->field - if ptrKind == hArrowField { - CBE_EmitExpr(cbe, ptrNode.child1); - StringBuilder_Append(&cbe.sb, "->"); - StringBuilder_Append(&cbe.sb, ptrNode.strValue); - return; - } - // index: load(index_ptr(base, idx)) → base[idx] - // For Array desugar pattern, emit bounds-checked access - if ptrKind == hIndexPtr { - var isArrayAccess: bool = false; - if ptrNode.child1 != null as *HirNode { - if ptrNode.child1.kind == hFieldPtr && String_Eq(ptrNode.child1.strValue, "data") { - isArrayAccess = true; + if base.kind == hVar && base.typeKind == tyPointer { + isPtr = true; } } - if isArrayAccess { - CBE_EmitExpr(cbe, ptrNode.child1.child1); - StringBuilder_Append(&cbe.sb, ".data[bux_index_check("); - CBE_EmitExpr(cbe, ptrNode.child2); - StringBuilder_Append(&cbe.sb, ", "); - CBE_EmitExpr(cbe, ptrNode.child1.child1); - StringBuilder_Append(&cbe.sb, ".len)]"); - } else { + let sep: String = "."; + if isPtr { sep = "->"; } + CBE_EmitExpr(cbe, base); + StringBuilder_Append(&cbe.sb, sep); + StringBuilder_Append(&cbe.sb, "data["); + CBE_EmitExpr(cbe, node.child2); + StringBuilder_Append(&cbe.sb, "]"); + } else { + CBE_EmitExpr(cbe, node.child1); + StringBuilder_Append(&cbe.sb, "["); + CBE_EmitExpr(cbe, node.child2); + StringBuilder_Append(&cbe.sb, "]"); + } + return; + } + + // Load: *ptr — emit as *ptr (dereference) + // Optimize common patterns to avoid & / * temporaries + if kind == hLoad { + if node.child1 != null as *HirNode { + let ptrNode: *HirNode = node.child1; + let ptrKind: int = ptrNode.kind; + // field access: load(field_ptr(base, field)) → base.field + if ptrKind == hFieldPtr { CBE_EmitExpr(cbe, ptrNode.child1); - StringBuilder_Append(&cbe.sb, "["); - CBE_EmitExpr(cbe, ptrNode.child2); - StringBuilder_Append(&cbe.sb, "]"); + var isPtr: bool = false; + if ptrNode.child1 != null as *HirNode { + let childType: String = CBE_GetExprTypeName(cbe.mod, ptrNode.child1); + if String_EndsWith(childType, "*") { + isPtr = true; + } + } + if isPtr { + StringBuilder_Append(&cbe.sb, "->"); + } else { + StringBuilder_Append(&cbe.sb, "."); + } + StringBuilder_Append(&cbe.sb, ptrNode.strValue); + return; + } + // arrow field: load(arrow_field(base, field)) → base->field + if ptrKind == hArrowField { + CBE_EmitExpr(cbe, ptrNode.child1); + StringBuilder_Append(&cbe.sb, "->"); + StringBuilder_Append(&cbe.sb, ptrNode.strValue); + return; + } + // index: load(index_ptr(base, idx)) → base[idx] + // For Array desugar pattern, emit bounds-checked access + if ptrKind == hIndexPtr { + var isArrayAccess: bool = false; + if ptrNode.child1 != null as *HirNode { + if ptrNode.child1.kind == hFieldPtr && String_Eq(ptrNode.child1.strValue, "data") { + isArrayAccess = true; + } + } + if isArrayAccess { + CBE_EmitExpr(cbe, ptrNode.child1.child1); + StringBuilder_Append(&cbe.sb, ".data[bux_index_check("); + CBE_EmitExpr(cbe, ptrNode.child2); + StringBuilder_Append(&cbe.sb, ", "); + CBE_EmitExpr(cbe, ptrNode.child1.child1); + StringBuilder_Append(&cbe.sb, ".len)]"); + } else { + CBE_EmitExpr(cbe, ptrNode.child1); + StringBuilder_Append(&cbe.sb, "["); + CBE_EmitExpr(cbe, ptrNode.child2); + StringBuilder_Append(&cbe.sb, "]"); + } + return; } - return; } + StringBuilder_Append(&cbe.sb, "(*"); + CBE_EmitExpr(cbe, node.child1); + StringBuilder_Append(&cbe.sb, ")"); + return; } - StringBuilder_Append(&cbe.sb, "(*"); - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, ")"); - return; - } - // Assign: target = value - if kind == hAssign { - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, " = "); - CBE_EmitExpr(cbe, node.child2); - return; - } - - // Cast - if kind == hCast { - StringBuilder_Append(&cbe.sb, "(("); - if !String_Eq(node.typeName, "") { - StringBuilder_Append(&cbe.sb, node.typeName); - } else { - StringBuilder_Append(&cbe.sb, CBackend_TypeToC(node.typeKind)); - } - StringBuilder_Append(&cbe.sb, ")"); - CBE_EmitExpr(cbe, node.child1); - StringBuilder_Append(&cbe.sb, ")"); - return; - } - - // Struct init: ((TypeName){.field = value, ...}) - if kind == hStructInit { - StringBuilder_Append(&cbe.sb, "(("); - StringBuilder_Append(&cbe.sb, node.strValue); - StringBuilder_Append(&cbe.sb, "){"); - // Emit fields (chained via child3) - var field: *HirNode = node.child1; - var first: bool = true; - while field != null as *HirNode { - if !first { - StringBuilder_Append(&cbe.sb, ", "); - } - StringBuilder_Append(&cbe.sb, "."); - StringBuilder_Append(&cbe.sb, field.strValue); + // Assign: target = value + if kind == hAssign { + CBE_EmitExpr(cbe, node.child1); StringBuilder_Append(&cbe.sb, " = "); - CBE_EmitExpr(cbe, field.child1); - first = false; - field = field.child3; + CBE_EmitExpr(cbe, node.child2); + return; + } + + // Cast + if kind == hCast { + StringBuilder_Append(&cbe.sb, "(("); + if !String_Eq(node.typeName, "") { + StringBuilder_Append(&cbe.sb, node.typeName); + } else { + StringBuilder_Append(&cbe.sb, CBackend_TypeToC(node.typeKind)); + } + StringBuilder_Append(&cbe.sb, ")"); + CBE_EmitExpr(cbe, node.child1); + StringBuilder_Append(&cbe.sb, ")"); + return; + } + + // Struct init: ((TypeName){.field = value, ...}) + if kind == hStructInit { + StringBuilder_Append(&cbe.sb, "(("); + StringBuilder_Append(&cbe.sb, node.strValue); + StringBuilder_Append(&cbe.sb, "){"); + // Emit fields (chained via child3) + var field: *HirNode = node.child1; + var first: bool = true; + while field != null as *HirNode { + if !first { + StringBuilder_Append(&cbe.sb, ", "); + } + StringBuilder_Append(&cbe.sb, "."); + StringBuilder_Append(&cbe.sb, field.strValue); + StringBuilder_Append(&cbe.sb, " = "); + CBE_EmitExpr(cbe, field.child1); + first = false; + field = field.child3; + } + StringBuilder_Append(&cbe.sb, "})"); + return; + } + + // Block — emit each statement via child3 linked list + if kind == hBlock { + var child: *HirNode = node.child1; + while child != null as *HirNode { + if child.kind == hDefer { + CBE_EmitExpr(cbe, child); + child = child.child3; + continue; + } + // Indent + var sp: int = 0; + while sp < cbe.indent { + StringBuilder_Append(&cbe.sb, " "); + sp = sp + 1; + } + CBE_EmitExpr(cbe, child); + // Add semicolon for statements that need it + if child.kind != hBlock && child.kind != hIf && child.kind != hWhile && child.kind != hLoop && child.kind != hBreak && child.kind != hContinue { + StringBuilder_Append(&cbe.sb, ";"); + } + StringBuilder_Append(&cbe.sb, "\n"); + child = child.child3; + } + return; } - StringBuilder_Append(&cbe.sb, "})"); - return; } - // Block — emit each statement via child3 linked list - if kind == hBlock { - var child: *HirNode = node.child1; - while child != null as *HirNode { - if child.kind == hDefer { - CBE_EmitExpr(cbe, child); - child = child.child3; + // --------------------------------------------------------------------------- + // Emit function declaration + // --------------------------------------------------------------------------- + + // Infer C type for a BuxFn mangled part (int, cstr, uint, void, ...) + func CBE_FatPartToC(part: String) -> String { + if String_Eq(part, "cstr") { return "const char*"; } + if String_Eq(part, "void") { return "void"; } + if String_Eq(part, "bool") { return "bool"; } + if String_Eq(part, "uint") { return "unsigned int"; } + if String_Eq(part, "float") { return "float"; } + if String_Eq(part, "double") || String_Eq(part, "float64") { return "double"; } + if String_EndsWith(part, "Ptr") { + let base: String = String_Slice(part, 0, String_Len(part) - 3); + return String_Concat(CBE_FatPartToC(base), "*"); + } + return part; // int, etc. + } + + // Emit typedefs for common BuxFn_* shapes (fat function pointers) + func CBE_EmitFatFuncTypedefs(cbe: *CEmitter, mod: *HirModule) { + StringBuilder_Append(&cbe.sb, "/* Fat function pointer types (code + env) */\n"); + // Always emit core shapes + CBE_EmitOneFatTypedef(cbe, "BuxFn_int_int"); + CBE_EmitOneFatTypedef(cbe, "BuxFn_int_int_int"); + CBE_EmitOneFatTypedef(cbe, "BuxFn_bool_int"); + CBE_EmitOneFatTypedef(cbe, "BuxFn_void_void"); + CBE_EmitOneFatTypedef(cbe, "BuxFn_int_void"); + CBE_EmitOneFatTypedef(cbe, "BuxFn_cstr_int"); + CBE_EmitOneFatTypedef(cbe, "BuxFn_int_cstr"); + CBE_EmitOneFatTypedef(cbe, "BuxFn_bool_cstr"); + CBE_EmitOneFatTypedef(cbe, "BuxFn_int_int_cstr"); + // Scan module for any other BuxFn_* names (deduped via #ifndef in EmitOne) + var i: int = 0; + while i < mod.funcCount { + CBE_MaybeEmitExtraFat(cbe, mod.funcs[i].retTypeName); + var p: int = 0; + while p < mod.funcs[i].paramCount { + var ptype: String = ""; + if p == 0 { ptype = mod.funcs[i].param0.typeName; } + else if p == 1 { ptype = mod.funcs[i].param1.typeName; } + else if p == 2 { ptype = mod.funcs[i].param2.typeName; } + else if p == 3 { ptype = mod.funcs[i].param3.typeName; } + else if p == 4 { ptype = mod.funcs[i].param4.typeName; } + else if p == 5 { ptype = mod.funcs[i].param5.typeName; } + else if p == 6 { ptype = mod.funcs[i].param6.typeName; } + else if p == 7 { ptype = mod.funcs[i].param7.typeName; } + else if p == 8 { ptype = mod.funcs[i].param8.typeName; } + CBE_MaybeEmitExtraFat(cbe, ptype); + p = p + 1; + } + i = i + 1; + } + StringBuilder_Append(&cbe.sb, "\n"); + } + + func CBE_MaybeEmitExtraFat(cbe: *CEmitter, name: String) { + if String_Eq(name, "") { return; } + if !String_StartsWith(name, "BuxFn_") { return; } + CBE_EmitOneFatTypedef(cbe, name); + } + + func CBE_CollectBuxFn(names: *String, count: *int, name: String) { + if String_Eq(name, "") { return; } + if !String_StartsWith(name, "BuxFn_") { return; } + if *count >= 64 { return; } + var i: int = 0; + while i < *count { + if String_Eq(names[i], name) { return; } + i = i + 1; + } + names[*count] = name; + *count = *count + 1; + } + + // BuxFn_ret_p0_p1 → typedef with code pointer + func CBE_EmitOneFatTypedef(cbe: *CEmitter, fatName: String) { + // Split fatName after "BuxFn_" into parts by '_' + let prefixLen: uint = 6; // "BuxFn_" + let rest: String = String_Slice(fatName, prefixLen, String_Len(fatName) - prefixLen); + // Parse parts: first = ret, rest = params (use simple split) + let partCount: uint = String_SplitCount(rest, "_"); + if partCount == 0 { return; } + let retPart: String = String_SplitPart(rest, "_", 0); + let retC: String = CBE_FatPartToC(retPart); + + // Guard against redefinition if the same name is emitted twice + StringBuilder_Append(&cbe.sb, "#ifndef "); + StringBuilder_Append(&cbe.sb, fatName); + StringBuilder_Append(&cbe.sb, "_DEFINED\n#define "); + StringBuilder_Append(&cbe.sb, fatName); + StringBuilder_Append(&cbe.sb, "_DEFINED\n"); + + StringBuilder_Append(&cbe.sb, "typedef struct "); + StringBuilder_Append(&cbe.sb, fatName); + StringBuilder_Append(&cbe.sb, " {\n "); + // code field: ret (*code)(void* env, params...) + StringBuilder_Append(&cbe.sb, retC); + StringBuilder_Append(&cbe.sb, " (*code)(void* env"); + var pi: uint = 1; + while pi < partCount { + let pPart: String = String_SplitPart(rest, "_", pi); + if !(pi == 1 && String_Eq(pPart, "void") && partCount == 2) { + StringBuilder_Append(&cbe.sb, ", "); + StringBuilder_Append(&cbe.sb, CBE_FatPartToC(pPart)); + } + pi = pi + 1; + } + StringBuilder_Append(&cbe.sb, ");\n void* env;\n} "); + StringBuilder_Append(&cbe.sb, fatName); + StringBuilder_Append(&cbe.sb, ";\n#endif\n"); + } + + func CBE_EmitMakerDecl(cbe: *CEmitter, f: *HirFunc) { + // Infer fat type from thunk: skip __env, use user params + ret + var fatName: String = "BuxFn_"; + var retC: String = f.retTypeName; + if String_Eq(retC, "") { retC = "int"; } + fatName = String_Concat(fatName, Lcx_SanitizeFatPart(retC)); + var pi: int = 1; // skip __env + while pi < f.paramCount { + var ptype: String = "int"; + if pi == 1 { ptype = f.param1.typeName; } + else if pi == 2 { ptype = f.param2.typeName; } + else if pi == 3 { ptype = f.param3.typeName; } + else if pi == 4 { ptype = f.param4.typeName; } + else if pi == 5 { ptype = f.param5.typeName; } + else if pi == 6 { ptype = f.param6.typeName; } + else if pi == 7 { ptype = f.param7.typeName; } + else if pi == 8 { ptype = f.param8.typeName; } + if String_Eq(ptype, "") { ptype = "int"; } + fatName = String_Concat(fatName, "_"); + fatName = String_Concat(fatName, Lcx_SanitizeFatPart(ptype)); + pi = pi + 1; + } + if f.paramCount <= 1 { + fatName = String_Concat(fatName, "_void"); + } + StringBuilder_Append(&cbe.sb, fatName); + StringBuilder_Append(&cbe.sb, " __make_"); + StringBuilder_Append(&cbe.sb, f.name); + StringBuilder_Append(&cbe.sb, "("); + var ci: int = 0; + while ci < f.captureCount { + if ci > 0 { StringBuilder_Append(&cbe.sb, ", "); } + var capType: String = "int"; + var capName: String = "c"; + if ci == 0 { capName = f.captureName0; capType = CBackend_TypeToC(f.captureType0); } + else if ci == 1 { capName = f.captureName1; capType = CBackend_TypeToC(f.captureType1); } + else if ci == 2 { capName = f.captureName2; capType = CBackend_TypeToC(f.captureType2); } + else if ci == 3 { capName = f.captureName3; capType = CBackend_TypeToC(f.captureType3); } + else if ci == 4 { capName = f.captureName4; capType = CBackend_TypeToC(f.captureType4); } + else if ci == 5 { capName = f.captureName5; capType = CBackend_TypeToC(f.captureType5); } + else if ci == 6 { capName = f.captureName6; capType = CBackend_TypeToC(f.captureType6); } + else if ci == 7 { capName = f.captureName7; capType = CBackend_TypeToC(f.captureType7); } + StringBuilder_Append(&cbe.sb, capType); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, capName); + ci = ci + 1; + } + StringBuilder_Append(&cbe.sb, ")"); + } + + func CBE_EmitMakerFunc(cbe: *CEmitter, f: *HirFunc) { + CBE_EmitMakerDecl(cbe, f); + StringBuilder_Append(&cbe.sb, " {\n"); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, f.envStructName); + StringBuilder_Append(&cbe.sb, "* __e = ("); + StringBuilder_Append(&cbe.sb, f.envStructName); + StringBuilder_Append(&cbe.sb, "*)bux_alloc(sizeof("); + StringBuilder_Append(&cbe.sb, f.envStructName); + StringBuilder_Append(&cbe.sb, "));\n"); + var ci: int = 0; + while ci < f.captureCount { + var capName: String = ""; + if ci == 0 { capName = f.captureName0; } + else if ci == 1 { capName = f.captureName1; } + else if ci == 2 { capName = f.captureName2; } + else if ci == 3 { capName = f.captureName3; } + else if ci == 4 { capName = f.captureName4; } + else if ci == 5 { capName = f.captureName5; } + else if ci == 6 { capName = f.captureName6; } + else if ci == 7 { capName = f.captureName7; } + StringBuilder_Append(&cbe.sb, " __e->"); + StringBuilder_Append(&cbe.sb, capName); + StringBuilder_Append(&cbe.sb, " = "); + StringBuilder_Append(&cbe.sb, capName); + StringBuilder_Append(&cbe.sb, ";\n"); + ci = ci + 1; + } + // Build fat return type name same as decl + var fatName: String = "BuxFn_"; + var retC: String = f.retTypeName; + if String_Eq(retC, "") { retC = "int"; } + fatName = String_Concat(fatName, Lcx_SanitizeFatPart(retC)); + var pi: int = 1; + while pi < f.paramCount { + var ptype: String = "int"; + if pi == 1 { ptype = f.param1.typeName; } + else if pi == 2 { ptype = f.param2.typeName; } + else if pi == 3 { ptype = f.param3.typeName; } + else if pi == 4 { ptype = f.param4.typeName; } + else if pi == 5 { ptype = f.param5.typeName; } + else if pi == 6 { ptype = f.param6.typeName; } + else if pi == 7 { ptype = f.param7.typeName; } + else if pi == 8 { ptype = f.param8.typeName; } + if String_Eq(ptype, "") { ptype = "int"; } + fatName = String_Concat(fatName, "_"); + fatName = String_Concat(fatName, Lcx_SanitizeFatPart(ptype)); + pi = pi + 1; + } + if f.paramCount <= 1 { + fatName = String_Concat(fatName, "_void"); + } + StringBuilder_Append(&cbe.sb, " return ("); + StringBuilder_Append(&cbe.sb, fatName); + StringBuilder_Append(&cbe.sb, "){ .code = "); + StringBuilder_Append(&cbe.sb, f.name); + StringBuilder_Append(&cbe.sb, ", .env = __e };\n}\n\n"); + } + + // Emit adapters for any non-closure function (used when taken as value) + func CBE_EmitAllAdapters(cbe: *CEmitter, mod: *HirModule) { + StringBuilder_Append(&cbe.sb, "/* Fat-func adapters for named functions */\n"); + var i: int = 0; + while i < mod.funcCount { + let fname: String = mod.funcs[i].name; + // Skip closures, makers, adapters themselves + if String_StartsWith(fname, "__closure_") || String_StartsWith(fname, "__make_") || String_StartsWith(fname, "__adapt_") { + i = i + 1; continue; } - // Indent - var sp: int = 0; - while sp < cbe.indent { + if CBE_FuncHasGeneric(&mod.funcs[i]) { + i = i + 1; + continue; + } + // Only emit adapter if function has body + if mod.funcs[i].body == null as *HirNode { + i = i + 1; + continue; + } + // Adapter signature: ret __adapt_F(void* env, params...) { return F(params); } + var retC: String = mod.funcs[i].retTypeName; + if String_Eq(retC, "") { retC = "void"; } + StringBuilder_Append(&cbe.sb, "static "); + StringBuilder_Append(&cbe.sb, retC); + StringBuilder_Append(&cbe.sb, " __adapt_"); + StringBuilder_Append(&cbe.sb, fname); + StringBuilder_Append(&cbe.sb, "(void* env"); + var p: int = 0; + while p < mod.funcs[i].paramCount { + // Skip if first param is already __env (shouldn't for named funcs) + var pname: String = ""; + var ptype: String = "int"; + if p == 0 { pname = mod.funcs[i].param0.name; ptype = mod.funcs[i].param0.typeName; } + else if p == 1 { pname = mod.funcs[i].param1.name; ptype = mod.funcs[i].param1.typeName; } + else if p == 2 { pname = mod.funcs[i].param2.name; ptype = mod.funcs[i].param2.typeName; } + else if p == 3 { pname = mod.funcs[i].param3.name; ptype = mod.funcs[i].param3.typeName; } + else if p == 4 { pname = mod.funcs[i].param4.name; ptype = mod.funcs[i].param4.typeName; } + else if p == 5 { pname = mod.funcs[i].param5.name; ptype = mod.funcs[i].param5.typeName; } + else if p == 6 { pname = mod.funcs[i].param6.name; ptype = mod.funcs[i].param6.typeName; } + else if p == 7 { pname = mod.funcs[i].param7.name; ptype = mod.funcs[i].param7.typeName; } + else if p == 8 { pname = mod.funcs[i].param8.name; ptype = mod.funcs[i].param8.typeName; } + if String_Eq(ptype, "") { ptype = "int"; } + StringBuilder_Append(&cbe.sb, ", "); + StringBuilder_Append(&cbe.sb, ptype); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, pname); + p = p + 1; + } + StringBuilder_Append(&cbe.sb, ") {\n (void)env;\n"); + if String_Eq(retC, "void") { StringBuilder_Append(&cbe.sb, " "); - sp = sp + 1; + StringBuilder_Append(&cbe.sb, fname); + StringBuilder_Append(&cbe.sb, "("); + } else { + StringBuilder_Append(&cbe.sb, " return "); + StringBuilder_Append(&cbe.sb, fname); + StringBuilder_Append(&cbe.sb, "("); } - CBE_EmitExpr(cbe, child); - // Add semicolon for statements that need it - if child.kind != hBlock && child.kind != hIf && child.kind != hWhile && child.kind != hLoop && child.kind != hBreak && child.kind != hContinue { - StringBuilder_Append(&cbe.sb, ";"); + p = 0; + while p < mod.funcs[i].paramCount { + if p > 0 { StringBuilder_Append(&cbe.sb, ", "); } + var pname: String = ""; + if p == 0 { pname = mod.funcs[i].param0.name; } + else if p == 1 { pname = mod.funcs[i].param1.name; } + else if p == 2 { pname = mod.funcs[i].param2.name; } + else if p == 3 { pname = mod.funcs[i].param3.name; } + else if p == 4 { pname = mod.funcs[i].param4.name; } + else if p == 5 { pname = mod.funcs[i].param5.name; } + else if p == 6 { pname = mod.funcs[i].param6.name; } + else if p == 7 { pname = mod.funcs[i].param7.name; } + else if p == 8 { pname = mod.funcs[i].param8.name; } + StringBuilder_Append(&cbe.sb, pname); + p = p + 1; } - StringBuilder_Append(&cbe.sb, "\n"); - child = child.child3; - } - return; - } -} - -// --------------------------------------------------------------------------- -// Emit function declaration -// --------------------------------------------------------------------------- - -// Infer C type for a BuxFn mangled part (int, cstr, uint, void, ...) -func CBE_FatPartToC(part: String) -> String { - if String_Eq(part, "cstr") { return "const char*"; } - if String_Eq(part, "void") { return "void"; } - if String_Eq(part, "bool") { return "bool"; } - if String_Eq(part, "uint") { return "unsigned int"; } - if String_Eq(part, "float") { return "float"; } - if String_Eq(part, "double") || String_Eq(part, "float64") { return "double"; } - if String_EndsWith(part, "Ptr") { - let base: String = String_Slice(part, 0, String_Len(part) - 3); - return String_Concat(CBE_FatPartToC(base), "*"); - } - return part; // int, etc. -} - -// Emit typedefs for common BuxFn_* shapes (fat function pointers) -func CBE_EmitFatFuncTypedefs(cbe: *CEmitter, mod: *HirModule) { - StringBuilder_Append(&cbe.sb, "/* Fat function pointer types (code + env) */\n"); - // Always emit core shapes - CBE_EmitOneFatTypedef(cbe, "BuxFn_int_int"); - CBE_EmitOneFatTypedef(cbe, "BuxFn_int_int_int"); - CBE_EmitOneFatTypedef(cbe, "BuxFn_bool_int"); - CBE_EmitOneFatTypedef(cbe, "BuxFn_void_void"); - CBE_EmitOneFatTypedef(cbe, "BuxFn_int_void"); - CBE_EmitOneFatTypedef(cbe, "BuxFn_cstr_int"); - CBE_EmitOneFatTypedef(cbe, "BuxFn_int_cstr"); - CBE_EmitOneFatTypedef(cbe, "BuxFn_bool_cstr"); - CBE_EmitOneFatTypedef(cbe, "BuxFn_int_int_cstr"); - // Scan module for any other BuxFn_* names (deduped via #ifndef in EmitOne) - var i: int = 0; - while i < mod.funcCount { - CBE_MaybeEmitExtraFat(cbe, mod.funcs[i].retTypeName); - var p: int = 0; - while p < mod.funcs[i].paramCount { - var ptype: String = ""; - if p == 0 { ptype = mod.funcs[i].param0.typeName; } - else if p == 1 { ptype = mod.funcs[i].param1.typeName; } - else if p == 2 { ptype = mod.funcs[i].param2.typeName; } - else if p == 3 { ptype = mod.funcs[i].param3.typeName; } - else if p == 4 { ptype = mod.funcs[i].param4.typeName; } - else if p == 5 { ptype = mod.funcs[i].param5.typeName; } - else if p == 6 { ptype = mod.funcs[i].param6.typeName; } - else if p == 7 { ptype = mod.funcs[i].param7.typeName; } - else if p == 8 { ptype = mod.funcs[i].param8.typeName; } - CBE_MaybeEmitExtraFat(cbe, ptype); - p = p + 1; - } - i = i + 1; - } - StringBuilder_Append(&cbe.sb, "\n"); -} - -func CBE_MaybeEmitExtraFat(cbe: *CEmitter, name: String) { - if String_Eq(name, "") { return; } - if !String_StartsWith(name, "BuxFn_") { return; } - CBE_EmitOneFatTypedef(cbe, name); -} - -func CBE_CollectBuxFn(names: *String, count: *int, name: String) { - if String_Eq(name, "") { return; } - if !String_StartsWith(name, "BuxFn_") { return; } - if *count >= 64 { return; } - var i: int = 0; - while i < *count { - if String_Eq(names[i], name) { return; } - i = i + 1; - } - names[*count] = name; - *count = *count + 1; -} - -// BuxFn_ret_p0_p1 → typedef with code pointer -func CBE_EmitOneFatTypedef(cbe: *CEmitter, fatName: String) { - // Split fatName after "BuxFn_" into parts by '_' - let prefixLen: uint = 6; // "BuxFn_" - let rest: String = String_Slice(fatName, prefixLen, String_Len(fatName) - prefixLen); - // Parse parts: first = ret, rest = params (use simple split) - let partCount: uint = String_SplitCount(rest, "_"); - if partCount == 0 { return; } - let retPart: String = String_SplitPart(rest, "_", 0); - let retC: String = CBE_FatPartToC(retPart); - - // Guard against redefinition if the same name is emitted twice - StringBuilder_Append(&cbe.sb, "#ifndef "); - StringBuilder_Append(&cbe.sb, fatName); - StringBuilder_Append(&cbe.sb, "_DEFINED\n#define "); - StringBuilder_Append(&cbe.sb, fatName); - StringBuilder_Append(&cbe.sb, "_DEFINED\n"); - - StringBuilder_Append(&cbe.sb, "typedef struct "); - StringBuilder_Append(&cbe.sb, fatName); - StringBuilder_Append(&cbe.sb, " {\n "); - // code field: ret (*code)(void* env, params...) - StringBuilder_Append(&cbe.sb, retC); - StringBuilder_Append(&cbe.sb, " (*code)(void* env"); - var pi: uint = 1; - while pi < partCount { - let pPart: String = String_SplitPart(rest, "_", pi); - if !(pi == 1 && String_Eq(pPart, "void") && partCount == 2) { - StringBuilder_Append(&cbe.sb, ", "); - StringBuilder_Append(&cbe.sb, CBE_FatPartToC(pPart)); - } - pi = pi + 1; - } - StringBuilder_Append(&cbe.sb, ");\n void* env;\n} "); - StringBuilder_Append(&cbe.sb, fatName); - StringBuilder_Append(&cbe.sb, ";\n#endif\n"); -} - -func CBE_EmitMakerDecl(cbe: *CEmitter, f: *HirFunc) { - // Infer fat type from thunk: skip __env, use user params + ret - var fatName: String = "BuxFn_"; - var retC: String = f.retTypeName; - if String_Eq(retC, "") { retC = "int"; } - fatName = String_Concat(fatName, Lcx_SanitizeFatPart(retC)); - var pi: int = 1; // skip __env - while pi < f.paramCount { - var ptype: String = "int"; - if pi == 1 { ptype = f.param1.typeName; } - else if pi == 2 { ptype = f.param2.typeName; } - else if pi == 3 { ptype = f.param3.typeName; } - else if pi == 4 { ptype = f.param4.typeName; } - else if pi == 5 { ptype = f.param5.typeName; } - else if pi == 6 { ptype = f.param6.typeName; } - else if pi == 7 { ptype = f.param7.typeName; } - else if pi == 8 { ptype = f.param8.typeName; } - if String_Eq(ptype, "") { ptype = "int"; } - fatName = String_Concat(fatName, "_"); - fatName = String_Concat(fatName, Lcx_SanitizeFatPart(ptype)); - pi = pi + 1; - } - if f.paramCount <= 1 { - fatName = String_Concat(fatName, "_void"); - } - StringBuilder_Append(&cbe.sb, fatName); - StringBuilder_Append(&cbe.sb, " __make_"); - StringBuilder_Append(&cbe.sb, f.name); - StringBuilder_Append(&cbe.sb, "("); - var ci: int = 0; - while ci < f.captureCount { - if ci > 0 { StringBuilder_Append(&cbe.sb, ", "); } - var capType: String = "int"; - var capName: String = "c"; - if ci == 0 { capName = f.captureName0; capType = CBackend_TypeToC(f.captureType0); } - else if ci == 1 { capName = f.captureName1; capType = CBackend_TypeToC(f.captureType1); } - else if ci == 2 { capName = f.captureName2; capType = CBackend_TypeToC(f.captureType2); } - else if ci == 3 { capName = f.captureName3; capType = CBackend_TypeToC(f.captureType3); } - else if ci == 4 { capName = f.captureName4; capType = CBackend_TypeToC(f.captureType4); } - else if ci == 5 { capName = f.captureName5; capType = CBackend_TypeToC(f.captureType5); } - else if ci == 6 { capName = f.captureName6; capType = CBackend_TypeToC(f.captureType6); } - else if ci == 7 { capName = f.captureName7; capType = CBackend_TypeToC(f.captureType7); } - StringBuilder_Append(&cbe.sb, capType); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, capName); - ci = ci + 1; - } - StringBuilder_Append(&cbe.sb, ")"); -} - -func CBE_EmitMakerFunc(cbe: *CEmitter, f: *HirFunc) { - CBE_EmitMakerDecl(cbe, f); - StringBuilder_Append(&cbe.sb, " {\n"); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, f.envStructName); - StringBuilder_Append(&cbe.sb, "* __e = ("); - StringBuilder_Append(&cbe.sb, f.envStructName); - StringBuilder_Append(&cbe.sb, "*)bux_alloc(sizeof("); - StringBuilder_Append(&cbe.sb, f.envStructName); - StringBuilder_Append(&cbe.sb, "));\n"); - var ci: int = 0; - while ci < f.captureCount { - var capName: String = ""; - if ci == 0 { capName = f.captureName0; } - else if ci == 1 { capName = f.captureName1; } - else if ci == 2 { capName = f.captureName2; } - else if ci == 3 { capName = f.captureName3; } - else if ci == 4 { capName = f.captureName4; } - else if ci == 5 { capName = f.captureName5; } - else if ci == 6 { capName = f.captureName6; } - else if ci == 7 { capName = f.captureName7; } - StringBuilder_Append(&cbe.sb, " __e->"); - StringBuilder_Append(&cbe.sb, capName); - StringBuilder_Append(&cbe.sb, " = "); - StringBuilder_Append(&cbe.sb, capName); - StringBuilder_Append(&cbe.sb, ";\n"); - ci = ci + 1; - } - // Build fat return type name same as decl - var fatName: String = "BuxFn_"; - var retC: String = f.retTypeName; - if String_Eq(retC, "") { retC = "int"; } - fatName = String_Concat(fatName, Lcx_SanitizeFatPart(retC)); - var pi: int = 1; - while pi < f.paramCount { - var ptype: String = "int"; - if pi == 1 { ptype = f.param1.typeName; } - else if pi == 2 { ptype = f.param2.typeName; } - else if pi == 3 { ptype = f.param3.typeName; } - else if pi == 4 { ptype = f.param4.typeName; } - else if pi == 5 { ptype = f.param5.typeName; } - else if pi == 6 { ptype = f.param6.typeName; } - else if pi == 7 { ptype = f.param7.typeName; } - else if pi == 8 { ptype = f.param8.typeName; } - if String_Eq(ptype, "") { ptype = "int"; } - fatName = String_Concat(fatName, "_"); - fatName = String_Concat(fatName, Lcx_SanitizeFatPart(ptype)); - pi = pi + 1; - } - if f.paramCount <= 1 { - fatName = String_Concat(fatName, "_void"); - } - StringBuilder_Append(&cbe.sb, " return ("); - StringBuilder_Append(&cbe.sb, fatName); - StringBuilder_Append(&cbe.sb, "){ .code = "); - StringBuilder_Append(&cbe.sb, f.name); - StringBuilder_Append(&cbe.sb, ", .env = __e };\n}\n\n"); -} - -// Emit adapters for any non-closure function (used when taken as value) -func CBE_EmitAllAdapters(cbe: *CEmitter, mod: *HirModule) { - StringBuilder_Append(&cbe.sb, "/* Fat-func adapters for named functions */\n"); - var i: int = 0; - while i < mod.funcCount { - let fname: String = mod.funcs[i].name; - // Skip closures, makers, adapters themselves - if String_StartsWith(fname, "__closure_") || String_StartsWith(fname, "__make_") || String_StartsWith(fname, "__adapt_") { + StringBuilder_Append(&cbe.sb, ");\n}\n\n"); i = i + 1; - continue; } - if CBE_FuncHasGeneric(&mod.funcs[i]) { - i = i + 1; - continue; - } - // Only emit adapter if function has body - if mod.funcs[i].body == null as *HirNode { - i = i + 1; - continue; - } - // Adapter signature: ret __adapt_F(void* env, params...) { return F(params); } - var retC: String = mod.funcs[i].retTypeName; - if String_Eq(retC, "") { retC = "void"; } - StringBuilder_Append(&cbe.sb, "static "); - StringBuilder_Append(&cbe.sb, retC); - StringBuilder_Append(&cbe.sb, " __adapt_"); - StringBuilder_Append(&cbe.sb, fname); - StringBuilder_Append(&cbe.sb, "(void* env"); - var p: int = 0; - while p < mod.funcs[i].paramCount { - // Skip if first param is already __env (shouldn't for named funcs) - var pname: String = ""; - var ptype: String = "int"; - if p == 0 { pname = mod.funcs[i].param0.name; ptype = mod.funcs[i].param0.typeName; } - else if p == 1 { pname = mod.funcs[i].param1.name; ptype = mod.funcs[i].param1.typeName; } - else if p == 2 { pname = mod.funcs[i].param2.name; ptype = mod.funcs[i].param2.typeName; } - else if p == 3 { pname = mod.funcs[i].param3.name; ptype = mod.funcs[i].param3.typeName; } - else if p == 4 { pname = mod.funcs[i].param4.name; ptype = mod.funcs[i].param4.typeName; } - else if p == 5 { pname = mod.funcs[i].param5.name; ptype = mod.funcs[i].param5.typeName; } - else if p == 6 { pname = mod.funcs[i].param6.name; ptype = mod.funcs[i].param6.typeName; } - else if p == 7 { pname = mod.funcs[i].param7.name; ptype = mod.funcs[i].param7.typeName; } - else if p == 8 { pname = mod.funcs[i].param8.name; ptype = mod.funcs[i].param8.typeName; } - if String_Eq(ptype, "") { ptype = "int"; } - StringBuilder_Append(&cbe.sb, ", "); - StringBuilder_Append(&cbe.sb, ptype); + } + + func CBE_EmitFuncDecl(cbe: *CEmitter, f: *HirFunc) { + // Return type + if String_Eq(f.retTypeName, "") || String_Eq(f.retTypeName, "void") { + StringBuilder_Append(&cbe.sb, "void "); + } else { + StringBuilder_Append(&cbe.sb, f.retTypeName); StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, pname); - p = p + 1; } - StringBuilder_Append(&cbe.sb, ") {\n (void)env;\n"); - if String_Eq(retC, "void") { - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, fname); - StringBuilder_Append(&cbe.sb, "("); - } else { - StringBuilder_Append(&cbe.sb, " return "); - StringBuilder_Append(&cbe.sb, fname); - StringBuilder_Append(&cbe.sb, "("); - } - p = 0; - while p < mod.funcs[i].paramCount { - if p > 0 { StringBuilder_Append(&cbe.sb, ", "); } + + StringBuilder_Append(&cbe.sb, f.name); + StringBuilder_Append(&cbe.sb, "("); + + // Parameters + var i: int = 0; + while i < f.paramCount { + if i > 0 { + StringBuilder_Append(&cbe.sb, ", "); + } + // Use param type info var pname: String = ""; - if p == 0 { pname = mod.funcs[i].param0.name; } - else if p == 1 { pname = mod.funcs[i].param1.name; } - else if p == 2 { pname = mod.funcs[i].param2.name; } - else if p == 3 { pname = mod.funcs[i].param3.name; } - else if p == 4 { pname = mod.funcs[i].param4.name; } - else if p == 5 { pname = mod.funcs[i].param5.name; } - else if p == 6 { pname = mod.funcs[i].param6.name; } - else if p == 7 { pname = mod.funcs[i].param7.name; } - else if p == 8 { pname = mod.funcs[i].param8.name; } - StringBuilder_Append(&cbe.sb, pname); - p = p + 1; + var ptype: String = ""; + if i == 0 { pname = f.param0.name; ptype = f.param0.typeName; } + if i == 1 { pname = f.param1.name; ptype = f.param1.typeName; } + if i == 2 { pname = f.param2.name; ptype = f.param2.typeName; } + if i == 3 { pname = f.param3.name; ptype = f.param3.typeName; } + if i == 4 { pname = f.param4.name; ptype = f.param4.typeName; } + if i == 5 { pname = f.param5.name; ptype = f.param5.typeName; } + if i == 6 { pname = f.param6.name; ptype = f.param6.typeName; } + if i == 7 { pname = f.param7.name; ptype = f.param7.typeName; } + if i == 8 { pname = f.param8.name; ptype = f.param8.typeName; } + // Emit type + name + if String_Eq(ptype, "") { + ptype = "int"; + } + StringBuilder_Append(&cbe.sb, CBE_CParamDecl(ptype, pname)); + i = i + 1; } - StringBuilder_Append(&cbe.sb, ");\n}\n\n"); - i = i + 1; - } -} -func CBE_EmitFuncDecl(cbe: *CEmitter, f: *HirFunc) { - // Return type - if String_Eq(f.retTypeName, "") || String_Eq(f.retTypeName, "void") { - StringBuilder_Append(&cbe.sb, "void "); - } else { - StringBuilder_Append(&cbe.sb, f.retTypeName); - StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, ")"); } - StringBuilder_Append(&cbe.sb, f.name); - StringBuilder_Append(&cbe.sb, "("); + // --------------------------------------------------------------------------- + // Helpers for detecting generic declarations (not yet monomorphized) + // --------------------------------------------------------------------------- - // Parameters - var i: int = 0; - while i < f.paramCount { - if i > 0 { - StringBuilder_Append(&cbe.sb, ", "); + func CBE_IsGenericTypeName(name: String) -> bool { + if String_Eq(name, "T") || String_Eq(name, "K") || String_Eq(name, "V") { return true; } + if String_Eq(name, "T*") || String_Eq(name, "K*") || String_Eq(name, "V*") { return true; } + // Any type name containing '<' is a generic instantiation or parameter + if String_Contains(name, "<") { return true; } + // Generic container structs and their pointer variants + if String_Eq(name, "Array") || String_Eq(name, "Array*") { return true; } + if String_Eq(name, "Channel") || String_Eq(name, "Channel*") { return true; } + if String_Eq(name, "Iter") || String_Eq(name, "Iter*") { return true; } + if String_Eq(name, "Set") || String_Eq(name, "Set*") { return true; } + if String_Eq(name, "SetEntry") || String_Eq(name, "SetEntry*") { return true; } + if String_Eq(name, "Map") || String_Eq(name, "Map*") { return true; } + if String_Eq(name, "MapEntry") || String_Eq(name, "MapEntry*") { return true; } + if String_Eq(name, "StringMap") || String_Eq(name, "StringMap*") { return true; } + if String_Eq(name, "StringMapEntry") || String_Eq(name, "StringMapEntry*") { return true; } + if String_Eq(name, "Slice") || String_Eq(name, "Slice*") { return true; } + return false; + } + + func CBE_StructHasGeneric(st: *HirStruct) -> bool { + var fi: int = 0; + while fi < st.fieldCount { + if CBE_IsGenericTypeName(st.fields[fi].typeName) { return true; } + fi = fi + 1; } - // Use param type info - var pname: String = ""; - var ptype: String = ""; - if i == 0 { pname = f.param0.name; ptype = f.param0.typeName; } - if i == 1 { pname = f.param1.name; ptype = f.param1.typeName; } - if i == 2 { pname = f.param2.name; ptype = f.param2.typeName; } - if i == 3 { pname = f.param3.name; ptype = f.param3.typeName; } - if i == 4 { pname = f.param4.name; ptype = f.param4.typeName; } - if i == 5 { pname = f.param5.name; ptype = f.param5.typeName; } - if i == 6 { pname = f.param6.name; ptype = f.param6.typeName; } - if i == 7 { pname = f.param7.name; ptype = f.param7.typeName; } - if i == 8 { pname = f.param8.name; ptype = f.param8.typeName; } - // Emit type + name - if String_Eq(ptype, "") { - ptype = "int"; + return false; + } + + func CBE_FuncHasGeneric(f: *HirFunc) -> bool { + var pi: int = 0; + while pi < f.paramCount { + var ptype: String = ""; + if pi == 0 { ptype = f.param0.typeName; } + if pi == 1 { ptype = f.param1.typeName; } + if pi == 2 { ptype = f.param2.typeName; } + if pi == 3 { ptype = f.param3.typeName; } + if pi == 4 { ptype = f.param4.typeName; } + if pi == 5 { ptype = f.param5.typeName; } + if pi == 6 { ptype = f.param6.typeName; } + if pi == 7 { ptype = f.param7.typeName; } + if pi == 8 { ptype = f.param8.typeName; } + if CBE_IsGenericTypeName(ptype) { return true; } + pi = pi + 1; } - StringBuilder_Append(&cbe.sb, CBE_CParamDecl(ptype, pname)); - i = i + 1; + if CBE_IsGenericTypeName(f.retTypeName) { return true; } + return false; } - StringBuilder_Append(&cbe.sb, ")"); -} - -// --------------------------------------------------------------------------- -// Helpers for detecting generic declarations (not yet monomorphized) -// --------------------------------------------------------------------------- - -func CBE_IsGenericTypeName(name: String) -> bool { - if String_Eq(name, "T") || String_Eq(name, "K") || String_Eq(name, "V") { return true; } - if String_Eq(name, "T*") || String_Eq(name, "K*") || String_Eq(name, "V*") { return true; } - // Any type name containing '<' is a generic instantiation or parameter - if String_Contains(name, "<") { return true; } - // Generic container structs and their pointer variants - if String_Eq(name, "Array") || String_Eq(name, "Array*") { return true; } - if String_Eq(name, "Channel") || String_Eq(name, "Channel*") { return true; } - if String_Eq(name, "Iter") || String_Eq(name, "Iter*") { return true; } - if String_Eq(name, "Set") || String_Eq(name, "Set*") { return true; } - if String_Eq(name, "SetEntry") || String_Eq(name, "SetEntry*") { return true; } - if String_Eq(name, "Map") || String_Eq(name, "Map*") { return true; } - if String_Eq(name, "MapEntry") || String_Eq(name, "MapEntry*") { return true; } - if String_Eq(name, "StringMap") || String_Eq(name, "StringMap*") { return true; } - if String_Eq(name, "StringMapEntry") || String_Eq(name, "StringMapEntry*") { return true; } - if String_Eq(name, "Slice") || String_Eq(name, "Slice*") { return true; } - return false; -} - -func CBE_StructHasGeneric(st: *HirStruct) -> bool { - var fi: int = 0; - while fi < st.fieldCount { - if CBE_IsGenericTypeName(st.fields[fi].typeName) { return true; } - fi = fi + 1; + func CBE_IsArrayTypeName(name: String) -> bool { + if String_Eq(name, "") { return false; } + if String_StartsWith(name, "Array") { return true; } + return false; } - return false; -} -func CBE_FuncHasGeneric(f: *HirFunc) -> bool { - var pi: int = 0; - while pi < f.paramCount { - var ptype: String = ""; - if pi == 0 { ptype = f.param0.typeName; } - if pi == 1 { ptype = f.param1.typeName; } - if pi == 2 { ptype = f.param2.typeName; } - if pi == 3 { ptype = f.param3.typeName; } - if pi == 4 { ptype = f.param4.typeName; } - if pi == 5 { ptype = f.param5.typeName; } - if pi == 6 { ptype = f.param6.typeName; } - if pi == 7 { ptype = f.param7.typeName; } - if pi == 8 { ptype = f.param8.typeName; } - if CBE_IsGenericTypeName(ptype) { return true; } - pi = pi + 1; + func CBE_IsPrimitiveTypeName(name: String) -> bool { + if String_Eq(name, "int") || String_Eq(name, "") { return true; } + if String_Eq(name, "String") { return true; } + if String_Eq(name, "bool") { return true; } + if String_Eq(name, "uint32") { return true; } + if String_Eq(name, "uint64") { return true; } + if String_Eq(name, "int64") { return true; } + if String_Eq(name, "float32") { return true; } + if String_Eq(name, "float64") { return true; } + if String_Eq(name, "uint8") { return true; } + if String_Eq(name, "uint16") { return true; } + if String_Eq(name, "int8") { return true; } + if String_Eq(name, "int16") { return true; } + if String_Eq(name, "uint") { return true; } + if String_Eq(name, "char8") { return true; } + if String_Eq(name, "void") { return true; } + if String_Eq(name, "size_t") { return true; } + return false; } - if CBE_IsGenericTypeName(f.retTypeName) { return true; } - return false; -} -func CBE_IsArrayTypeName(name: String) -> bool { - if String_Eq(name, "") { return false; } - if String_StartsWith(name, "Array") { return true; } - return false; -} - -func CBE_IsPrimitiveTypeName(name: String) -> bool { - if String_Eq(name, "int") || String_Eq(name, "") { return true; } - if String_Eq(name, "String") { return true; } - if String_Eq(name, "bool") { return true; } - if String_Eq(name, "uint32") { return true; } - if String_Eq(name, "uint64") { return true; } - if String_Eq(name, "int64") { return true; } - if String_Eq(name, "float32") { return true; } - if String_Eq(name, "float64") { return true; } - if String_Eq(name, "uint8") { return true; } - if String_Eq(name, "uint16") { return true; } - if String_Eq(name, "int8") { return true; } - if String_Eq(name, "int16") { return true; } - if String_Eq(name, "uint") { return true; } - if String_Eq(name, "char8") { return true; } - if String_Eq(name, "void") { return true; } - if String_Eq(name, "size_t") { return true; } - return false; -} - -func CBE_StructHasValueStructField(st: *HirStruct) -> bool { - var fi: int = 0; - while fi < st.fieldCount { - let ft: String = st.fields[fi].typeName; - if !CBE_IsPrimitiveTypeName(ft) && !String_EndsWith(ft, "*") { - return true; + func CBE_StructHasValueStructField(st: *HirStruct) -> bool { + var fi: int = 0; + while fi < st.fieldCount { + let ft: String = st.fields[fi].typeName; + if !CBE_IsPrimitiveTypeName(ft) && !String_EndsWith(ft, "*") { + return true; + } + fi = fi + 1; } - fi = fi + 1; + return false; } - return false; -} -func CBE_EmitStructDef(cbe: *CEmitter, st: *HirStruct) { - if String_Eq(st.name, "") { return; } - StringBuilder_Append(&cbe.sb, "struct "); - StringBuilder_Append(&cbe.sb, st.name); - StringBuilder_Append(&cbe.sb, " {\n"); - var fi: int = 0; - while fi < st.fieldCount { - StringBuilder_Append(&cbe.sb, " "); - var ft: String = st.fields[fi].typeName; - if String_Eq(ft, "int") || String_Eq(ft, "") { - StringBuilder_Append(&cbe.sb, "int"); - } else if String_Eq(ft, "String") { - StringBuilder_Append(&cbe.sb, "String"); - } else if String_Eq(ft, "bool") { - StringBuilder_Append(&cbe.sb, "bool"); - } else if String_Eq(ft, "uint32") { - StringBuilder_Append(&cbe.sb, "uint32"); - } else { - StringBuilder_Append(&cbe.sb, ft); + func CBE_EmitStructDef(cbe: *CEmitter, st: *HirStruct) { + if String_Eq(st.name, "") { return; } + StringBuilder_Append(&cbe.sb, "struct "); + StringBuilder_Append(&cbe.sb, st.name); + StringBuilder_Append(&cbe.sb, " {\n"); + var fi: int = 0; + while fi < st.fieldCount { + StringBuilder_Append(&cbe.sb, " "); + var ft: String = st.fields[fi].typeName; + if String_Eq(ft, "int") || String_Eq(ft, "") { + StringBuilder_Append(&cbe.sb, "int"); + } else if String_Eq(ft, "String") { + StringBuilder_Append(&cbe.sb, "String"); + } else if String_Eq(ft, "bool") { + StringBuilder_Append(&cbe.sb, "bool"); + } else if String_Eq(ft, "uint32") { + StringBuilder_Append(&cbe.sb, "uint32"); + } else { + StringBuilder_Append(&cbe.sb, ft); + } + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, st.fields[fi].name); + StringBuilder_Append(&cbe.sb, ";\n"); + fi = fi + 1; } - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, st.fields[fi].name); - StringBuilder_Append(&cbe.sb, ";\n"); - fi = fi + 1; + StringBuilder_Append(&cbe.sb, "};\n\n"); } - StringBuilder_Append(&cbe.sb, "};\n\n"); -} -func CBE_LookupFieldType(mod: *HirModule, structName: String, fieldName: String) -> String { - var si: int = 0; - while si < mod.structCount { - if String_Eq(mod.structs[si].name, structName) { - var fi: int = 0; - while fi < mod.structs[si].fieldCount { - if String_Eq(mod.structs[si].fields[fi].name, fieldName) { - let ft: String = mod.structs[si].fields[fi].typeName; - if ft != null as String { return ft; } - return ""; + func CBE_LookupFieldType(mod: *HirModule, structName: String, fieldName: String) -> String { + var si: int = 0; + while si < mod.structCount { + if String_Eq(mod.structs[si].name, structName) { + var fi: int = 0; + while fi < mod.structs[si].fieldCount { + if String_Eq(mod.structs[si].fields[fi].name, fieldName) { + let ft: String = mod.structs[si].fields[fi].typeName; + if ft != null as String { return ft; } + return ""; + } + fi = fi + 1; } - fi = fi + 1; + } + si = si + 1; + } + return ""; + } + + func CBE_GetExprTypeName(mod: *HirModule, node: *HirNode) -> String { + if node == null as *HirNode { return ""; } + if node.kind == hVar { + if node.typeName != null as String { return node.typeName; } + return ""; + } + if node.kind == hFieldPtr { + let baseType: String = CBE_GetExprTypeName(mod, node.child1); + var structName: String = baseType; + if String_EndsWith(baseType, "*") { + let len: uint = String_Len(baseType); + if len > 1 { + structName = String_Slice(baseType, 0, len - 1); + } + } + if !String_Eq(structName, "") { + return CBE_LookupFieldType(mod, structName, node.strValue); } } - si = si + 1; - } - return ""; -} - -func CBE_GetExprTypeName(mod: *HirModule, node: *HirNode) -> String { - if node == null as *HirNode { return ""; } - if node.kind == hVar { if node.typeName != null as String { return node.typeName; } return ""; } - if node.kind == hFieldPtr { - let baseType: String = CBE_GetExprTypeName(mod, node.child1); - var structName: String = baseType; - if String_EndsWith(baseType, "*") { - let len: uint = String_Len(baseType); - if len > 1 { - structName = String_Slice(baseType, 0, len - 1); - } - } - if !String_Eq(structName, "") { - return CBE_LookupFieldType(mod, structName, node.strValue); - } - } - if node.typeName != null as String { return node.typeName; } - return ""; -} -// --------------------------------------------------------------------------- -// Generate complete C module -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Generate complete C module + // --------------------------------------------------------------------------- -func CBackend_Generate(mod: *HirModule) -> String { - let cbe: *CEmitter = bux_alloc(sizeof(CEmitter)) as *CEmitter; - cbe.sb = StringBuilder_NewCap(8192); - cbe.indent = 0; - cbe.mod = mod; - cbe.deferCount = 0; - cbe.movedCount = 0; - cbe.tmpCounter = 0; - - // Header - StringBuilder_Append(&cbe.sb, "// Generated by Bux C Backend v2\n"); - StringBuilder_Append(&cbe.sb, "#include \n"); - StringBuilder_Append(&cbe.sb, "#include \n"); - StringBuilder_Append(&cbe.sb, "#include \n"); - StringBuilder_Append(&cbe.sb, "#include \n"); - StringBuilder_Append(&cbe.sb, "#include \n\n"); - // Type aliases - StringBuilder_Append(&cbe.sb, "typedef const char* String;\n"); - StringBuilder_Append(&cbe.sb, "typedef unsigned char uint8;\n"); - StringBuilder_Append(&cbe.sb, "typedef unsigned short uint16;\n"); - StringBuilder_Append(&cbe.sb, "typedef unsigned int uint32;\n"); - StringBuilder_Append(&cbe.sb, "typedef unsigned long long uint64;\n"); - StringBuilder_Append(&cbe.sb, "typedef signed char int8;\n"); - StringBuilder_Append(&cbe.sb, "typedef short int16;\n"); - StringBuilder_Append(&cbe.sb, "typedef long long int64;\n"); - StringBuilder_Append(&cbe.sb, "typedef float float32;\n"); - StringBuilder_Append(&cbe.sb, "typedef double float64;\n"); - StringBuilder_Append(&cbe.sb, "typedef char char8;\n\n"); - // Runtime declarations - StringBuilder_Append(&cbe.sb, "void* bux_alloc(unsigned int size);\n"); - StringBuilder_Append(&cbe.sb, "void bux_free(void* ptr);\n"); - StringBuilder_Append(&cbe.sb, "unsigned long long bux_index_check(unsigned long long index, unsigned long long len);\n"); - StringBuilder_Append(&cbe.sb, "int64 bux_add_i64_checked(int64 a, int64 b);\n"); - StringBuilder_Append(&cbe.sb, "int64 bux_sub_i64_checked(int64 a, int64 b);\n"); - StringBuilder_Append(&cbe.sb, "int64 bux_mul_i64_checked(int64 a, int64 b);\n"); - StringBuilder_Append(&cbe.sb, "int64 bux_neg_i64_checked(int64 a);\n\n"); - - // Forward declare all struct types (skip empty names) - var si: int = 0; - while si < mod.structCount { - if !String_Eq(mod.structs[si].name, "") { - StringBuilder_Append(&cbe.sb, "typedef struct "); - StringBuilder_Append(&cbe.sb, mod.structs[si].name); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, mod.structs[si].name); - StringBuilder_Append(&cbe.sb, ";\n"); - } - si = si + 1; - } - StringBuilder_Append(&cbe.sb, "\n"); - - // Tuple typedefs before enums/structs that embed them by value - StringBuilder_Append(&cbe.sb, "/* Tuple types */\n"); - StringBuilder_Append(&cbe.sb, "typedef struct Tuple_int_int {\n int _0;\n int _1;\n} Tuple_int_int;\n"); - StringBuilder_Append(&cbe.sb, "typedef struct Tuple_int_int_int {\n int _0;\n int _1;\n int _2;\n} Tuple_int_int_int;\n"); - StringBuilder_Append(&cbe.sb, "typedef struct Tuple_Empty {\n char _pad;\n} Tuple_Empty;\n\n"); - - // Struct definitions before enums (enums may embed structs by value, e.g. Shape::Dot(Point)) - // Pass 1: emit structs with no value-typed struct fields (leaf structs) - si = 0; - while si < mod.structCount { - if String_Eq(mod.structs[si].name, "") || CBE_StructHasGeneric(&mod.structs[si]) { - si = si + 1; - continue; - } - if CBE_StructHasValueStructField(&mod.structs[si]) { - si = si + 1; - continue; - } - CBE_EmitStructDef(cbe, &mod.structs[si]); - si = si + 1; - } - // Pass 2: emit structs that contain value-typed struct fields - si = 0; - while si < mod.structCount { - if String_Eq(mod.structs[si].name, "") || CBE_StructHasGeneric(&mod.structs[si]) { - si = si + 1; - continue; - } - if !CBE_StructHasValueStructField(&mod.structs[si]) { - si = si + 1; - continue; - } - CBE_EmitStructDef(cbe, &mod.structs[si]); - si = si + 1; - } - - // Enum definitions - var ei: int = 0; - while ei < mod.enumCount { - let en: *HirEnum = &mod.enums[ei]; - var hasData: bool = false; - var vi: int = 0; - while vi < en.variantCount { - if en.variants[vi].fieldCount > 0 { - hasData = true; - } - vi = vi + 1; - } - if !hasData { - // Simple enum: emit as plain C enum (no struct wrapper) - StringBuilder_Append(&cbe.sb, "typedef enum {\n"); - vi = 0; - while vi < en.variantCount { - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, en.name); - StringBuilder_Append(&cbe.sb, "_"); - StringBuilder_Append(&cbe.sb, en.variants[vi].name); - if vi < en.variantCount - 1 { - StringBuilder_Append(&cbe.sb, ","); - } - StringBuilder_Append(&cbe.sb, "\n"); - vi = vi + 1; - } - StringBuilder_Append(&cbe.sb, "} "); - StringBuilder_Append(&cbe.sb, en.name); - StringBuilder_Append(&cbe.sb, ";\n\n"); - } else { - // Algebraic enum: tag enum + data union + struct - // 1. Tag enum - StringBuilder_Append(&cbe.sb, "typedef enum {\n"); - vi = 0; - while vi < en.variantCount { - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, en.name); - StringBuilder_Append(&cbe.sb, "_"); - StringBuilder_Append(&cbe.sb, en.variants[vi].name); - if vi < en.variantCount - 1 { - StringBuilder_Append(&cbe.sb, ","); - } - StringBuilder_Append(&cbe.sb, "\n"); - vi = vi + 1; - } - StringBuilder_Append(&cbe.sb, "} "); - StringBuilder_Append(&cbe.sb, en.name); - StringBuilder_Append(&cbe.sb, "_Tag;\n\n"); - // 2. Data union - StringBuilder_Append(&cbe.sb, "typedef union {\n"); - vi = 0; - while vi < en.variantCount { - let ev: *HirEnumVariant = &en.variants[vi]; - if ev.fieldCount > 0 { - // Prefer stored C type name (handles Tuple_*, named types) - var ft0: String = CBackend_TypeToC(ev.fieldType0); - if !String_Eq(ev.fieldTypeName0, "") { ft0 = ev.fieldTypeName0; } - var ft1: String = CBackend_TypeToC(ev.fieldType1); - if !String_Eq(ev.fieldTypeName1, "") { ft1 = ev.fieldTypeName1; } - if ev.fieldCount == 1 { - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, ft0); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, ev.name); - StringBuilder_Append(&cbe.sb, "_0;\n"); - } else { - // Nested anonymous struct (layout matches bootstrap data.Variant.Variant_i) - StringBuilder_Append(&cbe.sb, " struct {\n"); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, ft0); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, ev.fieldName0); - StringBuilder_Append(&cbe.sb, ";\n"); - if ev.fieldCount > 1 { - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, ft1); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, ev.fieldName1); - StringBuilder_Append(&cbe.sb, ";\n"); - } - StringBuilder_Append(&cbe.sb, " } "); - StringBuilder_Append(&cbe.sb, ev.name); - StringBuilder_Append(&cbe.sb, ";\n"); - } - } - vi = vi + 1; - } - StringBuilder_Append(&cbe.sb, "} "); - StringBuilder_Append(&cbe.sb, en.name); - StringBuilder_Append(&cbe.sb, "_Data;\n\n"); - // 3. Main struct - StringBuilder_Append(&cbe.sb, "typedef struct {\n"); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, en.name); - StringBuilder_Append(&cbe.sb, "_Tag tag;\n"); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, en.name); - StringBuilder_Append(&cbe.sb, "_Data data;\n"); - StringBuilder_Append(&cbe.sb, "} "); - StringBuilder_Append(&cbe.sb, en.name); - StringBuilder_Append(&cbe.sb, ";\n\n"); - } - ei = ei + 1; - } - - // Constant definitions - var ci: int = 0; - while ci < mod.constCount { - StringBuilder_Append(&cbe.sb, "#define "); - StringBuilder_Append(&cbe.sb, mod.consts[ci].name); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, String_FromInt(mod.consts[ci].value as int64)); - StringBuilder_Append(&cbe.sb, "\n"); - ci = ci + 1; - } - if mod.constCount > 0 { - StringBuilder_Append(&cbe.sb, "\n"); - } - - // Fat function-pointer typedefs (BuxFn_*) — before forward decls - CBE_EmitFatFuncTypedefs(cbe, mod); - - // Env structs for capturing closures (no static instance — heap per value) - var ei2: int = 0; - while ei2 < mod.funcCount { - if mod.funcs[ei2].captureCount > 0 && !String_Eq(mod.funcs[ei2].envStructName, "") { - StringBuilder_Append(&cbe.sb, "typedef struct "); - StringBuilder_Append(&cbe.sb, mod.funcs[ei2].envStructName); - StringBuilder_Append(&cbe.sb, " {\n"); - var ci2: int = 0; - while ci2 < mod.funcs[ei2].captureCount { - var capName: String = ""; - var capType: String = "int"; - if ci2 == 0 { capName = mod.funcs[ei2].captureName0; capType = CBackend_TypeToC(mod.funcs[ei2].captureType0); } - else if ci2 == 1 { capName = mod.funcs[ei2].captureName1; capType = CBackend_TypeToC(mod.funcs[ei2].captureType1); } - else if ci2 == 2 { capName = mod.funcs[ei2].captureName2; capType = CBackend_TypeToC(mod.funcs[ei2].captureType2); } - else if ci2 == 3 { capName = mod.funcs[ei2].captureName3; capType = CBackend_TypeToC(mod.funcs[ei2].captureType3); } - else if ci2 == 4 { capName = mod.funcs[ei2].captureName4; capType = CBackend_TypeToC(mod.funcs[ei2].captureType4); } - else if ci2 == 5 { capName = mod.funcs[ei2].captureName5; capType = CBackend_TypeToC(mod.funcs[ei2].captureType5); } - else if ci2 == 6 { capName = mod.funcs[ei2].captureName6; capType = CBackend_TypeToC(mod.funcs[ei2].captureType6); } - else if ci2 == 7 { capName = mod.funcs[ei2].captureName7; capType = CBackend_TypeToC(mod.funcs[ei2].captureType7); } - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, capType); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, capName); - StringBuilder_Append(&cbe.sb, ";\n"); - ci2 = ci2 + 1; - } - StringBuilder_Append(&cbe.sb, "} "); - StringBuilder_Append(&cbe.sb, mod.funcs[ei2].envStructName); - StringBuilder_Append(&cbe.sb, ";\n\n"); - } - ei2 = ei2 + 1; - } - - // Forward declarations for all functions (skip generics) - var i: int = 0; - while i < mod.funcCount { - if !CBE_FuncHasGeneric(&mod.funcs[i]) { - CBE_EmitFuncDecl(cbe, &mod.funcs[i]); - StringBuilder_Append(&cbe.sb, ";\n"); - // Maker for capturing closures - if mod.funcs[i].captureCount > 0 { - CBE_EmitMakerDecl(cbe, &mod.funcs[i]); - StringBuilder_Append(&cbe.sb, ";\n"); - } - } - i = i + 1; - } - StringBuilder_Append(&cbe.sb, "\n"); - - // Extern declarations - i = 0; - while i < mod.externCount { - CBE_EmitFuncDecl(cbe, &mod.externFuncs[i]); - StringBuilder_Append(&cbe.sb, ";\n"); - i = i + 1; - } - StringBuilder_Append(&cbe.sb, "\n"); - - // Adapters before function bodies (bodies may take funcs as values) - CBE_EmitAllAdapters(cbe, mod); - - // Function definitions (skip generics) - var hasMain: bool = false; - i = 0; - while i < mod.funcCount { - if String_Eq(mod.funcs[i].name, "Main") { hasMain = true; } - // Skip generic functions - if CBE_FuncHasGeneric(&mod.funcs[i]) { - i = i + 1; - continue; - } - // Skip forward declarations (functions without body) - let body: *HirNode = mod.funcs[i].body; - if body == null as *HirNode { - i = i + 1; - continue; - } - CBE_EmitFuncDecl(cbe, &mod.funcs[i]); - StringBuilder_Append(&cbe.sb, " {\n"); - // Capturing closure thunk: materialize env from fat-func env pointer - if mod.funcs[i].captureCount > 0 && !String_Eq(mod.funcs[i].envStructName, "") && !String_Eq(mod.funcs[i].envInstanceName, "") { - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, mod.funcs[i].envStructName); - StringBuilder_Append(&cbe.sb, " "); - StringBuilder_Append(&cbe.sb, mod.funcs[i].envInstanceName); - StringBuilder_Append(&cbe.sb, " = *(("); - StringBuilder_Append(&cbe.sb, mod.funcs[i].envStructName); - StringBuilder_Append(&cbe.sb, "*)__env);\n"); - } else if mod.funcs[i].paramCount > 0 { - // Capture-less closure still has __env - if String_Eq(mod.funcs[i].param0.name, "__env") { - StringBuilder_Append(&cbe.sb, " (void)__env;\n"); - } - } - // Body - cbe.checkedFunc = mod.funcs[i].checkedFunc; + func CBackend_Generate(mod: *HirModule) -> String { + let cbe: *CEmitter = bux_alloc(sizeof(CEmitter)) as *CEmitter; + cbe.sb = StringBuilder_NewCap(8192); + cbe.indent = 0; + cbe.mod = mod; cbe.deferCount = 0; cbe.movedCount = 0; cbe.tmpCounter = 0; - cbe.currentRetType = mod.funcs[i].retTypeName; - var hasReturn: bool = false; - cbe.indent = 1; - CBE_EmitExpr(cbe, body); - CBE_EmitDefers(cbe); - cbe.indent = 0; - // Check if body has a return statement - var stmt: *HirNode = body.child1; - while stmt != null as *HirNode { - if stmt.kind == hReturn { hasReturn = true; } - stmt = stmt.child3; + + // Header + StringBuilder_Append(&cbe.sb, "// Generated by Bux C Backend v2\n"); + StringBuilder_Append(&cbe.sb, "#include \n"); + StringBuilder_Append(&cbe.sb, "#include \n"); + StringBuilder_Append(&cbe.sb, "#include \n"); + StringBuilder_Append(&cbe.sb, "#include \n"); + StringBuilder_Append(&cbe.sb, "#include \n\n"); + // Type aliases + StringBuilder_Append(&cbe.sb, "typedef const char* String;\n"); + StringBuilder_Append(&cbe.sb, "typedef unsigned char uint8;\n"); + StringBuilder_Append(&cbe.sb, "typedef unsigned short uint16;\n"); + StringBuilder_Append(&cbe.sb, "typedef unsigned int uint32;\n"); + StringBuilder_Append(&cbe.sb, "typedef unsigned long long uint64;\n"); + StringBuilder_Append(&cbe.sb, "typedef signed char int8;\n"); + StringBuilder_Append(&cbe.sb, "typedef short int16;\n"); + StringBuilder_Append(&cbe.sb, "typedef long long int64;\n"); + StringBuilder_Append(&cbe.sb, "typedef float float32;\n"); + StringBuilder_Append(&cbe.sb, "typedef double float64;\n"); + StringBuilder_Append(&cbe.sb, "typedef char char8;\n\n"); + // Runtime declarations + StringBuilder_Append(&cbe.sb, "void* bux_alloc(unsigned int size);\n"); + StringBuilder_Append(&cbe.sb, "void bux_free(void* ptr);\n"); + StringBuilder_Append(&cbe.sb, "unsigned long long bux_index_check(unsigned long long index, unsigned long long len);\n"); + StringBuilder_Append(&cbe.sb, "int64 bux_add_i64_checked(int64 a, int64 b);\n"); + StringBuilder_Append(&cbe.sb, "int64 bux_sub_i64_checked(int64 a, int64 b);\n"); + StringBuilder_Append(&cbe.sb, "int64 bux_mul_i64_checked(int64 a, int64 b);\n"); + StringBuilder_Append(&cbe.sb, "int64 bux_neg_i64_checked(int64 a);\n\n"); + + // Forward declare all struct types (skip empty names) + var si: int = 0; + while si < mod.structCount { + if !String_Eq(mod.structs[si].name, "") { + StringBuilder_Append(&cbe.sb, "typedef struct "); + StringBuilder_Append(&cbe.sb, mod.structs[si].name); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, mod.structs[si].name); + StringBuilder_Append(&cbe.sb, ";\n"); + } + si = si + 1; } - // Add default return 0 only if function returns int and has no explicit return - if String_Eq(mod.funcs[i].retTypeName, "int") && !hasReturn { - StringBuilder_Append(&cbe.sb, " return 0;\n"); + StringBuilder_Append(&cbe.sb, "\n"); + + // Tuple typedefs before enums/structs that embed them by value + StringBuilder_Append(&cbe.sb, "/* Tuple types */\n"); + StringBuilder_Append(&cbe.sb, "typedef struct Tuple_int_int {\n int _0;\n int _1;\n} Tuple_int_int;\n"); + StringBuilder_Append(&cbe.sb, "typedef struct Tuple_int_int_int {\n int _0;\n int _1;\n int _2;\n} Tuple_int_int_int;\n"); + StringBuilder_Append(&cbe.sb, "typedef struct Tuple_Empty {\n char _pad;\n} Tuple_Empty;\n\n"); + + // Struct definitions before enums (enums may embed structs by value, e.g. Shape::Dot(Point)) + // Pass 1: emit structs with no value-typed struct fields (leaf structs) + si = 0; + while si < mod.structCount { + if String_Eq(mod.structs[si].name, "") || CBE_StructHasGeneric(&mod.structs[si]) { + si = si + 1; + continue; + } + if CBE_StructHasValueStructField(&mod.structs[si]) { + si = si + 1; + continue; + } + CBE_EmitStructDef(cbe, &mod.structs[si]); + si = si + 1; } - StringBuilder_Append(&cbe.sb, "\n}\n\n"); - // After capturing closure thunk, emit heap-env maker - if mod.funcs[i].captureCount > 0 { - CBE_EmitMakerFunc(cbe, &mod.funcs[i]); + // Pass 2: emit structs that contain value-typed struct fields + si = 0; + while si < mod.structCount { + if String_Eq(mod.structs[si].name, "") || CBE_StructHasGeneric(&mod.structs[si]) { + si = si + 1; + continue; + } + if !CBE_StructHasValueStructField(&mod.structs[si]) { + si = si + 1; + continue; + } + CBE_EmitStructDef(cbe, &mod.structs[si]); + si = si + 1; } - i = i + 1; + + // Enum definitions + var ei: int = 0; + while ei < mod.enumCount { + let en: *HirEnum = &mod.enums[ei]; + var hasData: bool = false; + var vi: int = 0; + while vi < en.variantCount { + if en.variants[vi].fieldCount > 0 { + hasData = true; + } + vi = vi + 1; + } + if !hasData { + // Simple enum: emit as plain C enum (no struct wrapper) + StringBuilder_Append(&cbe.sb, "typedef enum {\n"); + vi = 0; + while vi < en.variantCount { + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, en.name); + StringBuilder_Append(&cbe.sb, "_"); + StringBuilder_Append(&cbe.sb, en.variants[vi].name); + if vi < en.variantCount - 1 { + StringBuilder_Append(&cbe.sb, ","); + } + StringBuilder_Append(&cbe.sb, "\n"); + vi = vi + 1; + } + StringBuilder_Append(&cbe.sb, "} "); + StringBuilder_Append(&cbe.sb, en.name); + StringBuilder_Append(&cbe.sb, ";\n\n"); + } else { + // Algebraic enum: tag enum + data union + struct + // 1. Tag enum + StringBuilder_Append(&cbe.sb, "typedef enum {\n"); + vi = 0; + while vi < en.variantCount { + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, en.name); + StringBuilder_Append(&cbe.sb, "_"); + StringBuilder_Append(&cbe.sb, en.variants[vi].name); + if vi < en.variantCount - 1 { + StringBuilder_Append(&cbe.sb, ","); + } + StringBuilder_Append(&cbe.sb, "\n"); + vi = vi + 1; + } + StringBuilder_Append(&cbe.sb, "} "); + StringBuilder_Append(&cbe.sb, en.name); + StringBuilder_Append(&cbe.sb, "_Tag;\n\n"); + // 2. Data union + StringBuilder_Append(&cbe.sb, "typedef union {\n"); + vi = 0; + while vi < en.variantCount { + let ev: *HirEnumVariant = &en.variants[vi]; + if ev.fieldCount > 0 { + // Prefer stored C type name (handles Tuple_*, named types) + var ft0: String = CBackend_TypeToC(ev.fieldType0); + if !String_Eq(ev.fieldTypeName0, "") { ft0 = ev.fieldTypeName0; } + var ft1: String = CBackend_TypeToC(ev.fieldType1); + if !String_Eq(ev.fieldTypeName1, "") { ft1 = ev.fieldTypeName1; } + if ev.fieldCount == 1 { + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, ft0); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, ev.name); + StringBuilder_Append(&cbe.sb, "_0;\n"); + } else { + // Nested anonymous struct (layout matches bootstrap data.Variant.Variant_i) + StringBuilder_Append(&cbe.sb, " struct {\n"); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, ft0); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, ev.fieldName0); + StringBuilder_Append(&cbe.sb, ";\n"); + if ev.fieldCount > 1 { + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, ft1); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, ev.fieldName1); + StringBuilder_Append(&cbe.sb, ";\n"); + } + StringBuilder_Append(&cbe.sb, " } "); + StringBuilder_Append(&cbe.sb, ev.name); + StringBuilder_Append(&cbe.sb, ";\n"); + } + } + vi = vi + 1; + } + StringBuilder_Append(&cbe.sb, "} "); + StringBuilder_Append(&cbe.sb, en.name); + StringBuilder_Append(&cbe.sb, "_Data;\n\n"); + // 3. Main struct + StringBuilder_Append(&cbe.sb, "typedef struct {\n"); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, en.name); + StringBuilder_Append(&cbe.sb, "_Tag tag;\n"); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, en.name); + StringBuilder_Append(&cbe.sb, "_Data data;\n"); + StringBuilder_Append(&cbe.sb, "} "); + StringBuilder_Append(&cbe.sb, en.name); + StringBuilder_Append(&cbe.sb, ";\n\n"); + } + ei = ei + 1; + } + + // Constant definitions + var ci: int = 0; + while ci < mod.constCount { + StringBuilder_Append(&cbe.sb, "#define "); + StringBuilder_Append(&cbe.sb, mod.consts[ci].name); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, String_FromInt(mod.consts[ci].value as int64)); + StringBuilder_Append(&cbe.sb, "\n"); + ci = ci + 1; + } + if mod.constCount > 0 { + StringBuilder_Append(&cbe.sb, "\n"); + } + + // Fat function-pointer typedefs (BuxFn_*) — before forward decls + CBE_EmitFatFuncTypedefs(cbe, mod); + + // Env structs for capturing closures (no static instance — heap per value) + var ei2: int = 0; + while ei2 < mod.funcCount { + if mod.funcs[ei2].captureCount > 0 && !String_Eq(mod.funcs[ei2].envStructName, "") { + StringBuilder_Append(&cbe.sb, "typedef struct "); + StringBuilder_Append(&cbe.sb, mod.funcs[ei2].envStructName); + StringBuilder_Append(&cbe.sb, " {\n"); + var ci2: int = 0; + while ci2 < mod.funcs[ei2].captureCount { + var capName: String = ""; + var capType: String = "int"; + if ci2 == 0 { capName = mod.funcs[ei2].captureName0; capType = CBackend_TypeToC(mod.funcs[ei2].captureType0); } + else if ci2 == 1 { capName = mod.funcs[ei2].captureName1; capType = CBackend_TypeToC(mod.funcs[ei2].captureType1); } + else if ci2 == 2 { capName = mod.funcs[ei2].captureName2; capType = CBackend_TypeToC(mod.funcs[ei2].captureType2); } + else if ci2 == 3 { capName = mod.funcs[ei2].captureName3; capType = CBackend_TypeToC(mod.funcs[ei2].captureType3); } + else if ci2 == 4 { capName = mod.funcs[ei2].captureName4; capType = CBackend_TypeToC(mod.funcs[ei2].captureType4); } + else if ci2 == 5 { capName = mod.funcs[ei2].captureName5; capType = CBackend_TypeToC(mod.funcs[ei2].captureType5); } + else if ci2 == 6 { capName = mod.funcs[ei2].captureName6; capType = CBackend_TypeToC(mod.funcs[ei2].captureType6); } + else if ci2 == 7 { capName = mod.funcs[ei2].captureName7; capType = CBackend_TypeToC(mod.funcs[ei2].captureType7); } + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, capType); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, capName); + StringBuilder_Append(&cbe.sb, ";\n"); + ci2 = ci2 + 1; + } + StringBuilder_Append(&cbe.sb, "} "); + StringBuilder_Append(&cbe.sb, mod.funcs[ei2].envStructName); + StringBuilder_Append(&cbe.sb, ";\n\n"); + } + ei2 = ei2 + 1; + } + + // Forward declarations for all functions (skip generics) + var i: int = 0; + while i < mod.funcCount { + if !CBE_FuncHasGeneric(&mod.funcs[i]) { + CBE_EmitFuncDecl(cbe, &mod.funcs[i]); + StringBuilder_Append(&cbe.sb, ";\n"); + // Maker for capturing closures + if mod.funcs[i].captureCount > 0 { + CBE_EmitMakerDecl(cbe, &mod.funcs[i]); + StringBuilder_Append(&cbe.sb, ";\n"); + } + } + i = i + 1; + } + StringBuilder_Append(&cbe.sb, "\n"); + + // Extern declarations + i = 0; + while i < mod.externCount { + CBE_EmitFuncDecl(cbe, &mod.externFuncs[i]); + StringBuilder_Append(&cbe.sb, ";\n"); + i = i + 1; + } + StringBuilder_Append(&cbe.sb, "\n"); + + // Adapters before function bodies (bodies may take funcs as values) + CBE_EmitAllAdapters(cbe, mod); + + // Function definitions (skip generics) + var hasMain: bool = false; + i = 0; + while i < mod.funcCount { + if String_Eq(mod.funcs[i].name, "Main") { hasMain = true; } + // Skip generic functions + if CBE_FuncHasGeneric(&mod.funcs[i]) { + i = i + 1; + continue; + } + // Skip forward declarations (functions without body) + let body: *HirNode = mod.funcs[i].body; + if body == null as *HirNode { + i = i + 1; + continue; + } + CBE_EmitFuncDecl(cbe, &mod.funcs[i]); + StringBuilder_Append(&cbe.sb, " {\n"); + // Capturing closure thunk: materialize env from fat-func env pointer + if mod.funcs[i].captureCount > 0 && !String_Eq(mod.funcs[i].envStructName, "") && !String_Eq(mod.funcs[i].envInstanceName, "") { + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, mod.funcs[i].envStructName); + StringBuilder_Append(&cbe.sb, " "); + StringBuilder_Append(&cbe.sb, mod.funcs[i].envInstanceName); + StringBuilder_Append(&cbe.sb, " = *(("); + StringBuilder_Append(&cbe.sb, mod.funcs[i].envStructName); + StringBuilder_Append(&cbe.sb, "*)__env);\n"); + } else if mod.funcs[i].paramCount > 0 { + // Capture-less closure still has __env + if String_Eq(mod.funcs[i].param0.name, "__env") { + StringBuilder_Append(&cbe.sb, " (void)__env;\n"); + } + } + // Body + cbe.checkedFunc = mod.funcs[i].checkedFunc; + cbe.deferCount = 0; + cbe.movedCount = 0; + cbe.tmpCounter = 0; + cbe.currentRetType = mod.funcs[i].retTypeName; + var hasReturn: bool = false; + cbe.indent = 1; + CBE_EmitExpr(cbe, body); + CBE_EmitDefers(cbe); + cbe.indent = 0; + // Check if body has a return statement + var stmt: *HirNode = body.child1; + while stmt != null as *HirNode { + if stmt.kind == hReturn { hasReturn = true; } + stmt = stmt.child3; + } + // Add default return 0 only if function returns int and has no explicit return + if String_Eq(mod.funcs[i].retTypeName, "int") && !hasReturn { + StringBuilder_Append(&cbe.sb, " return 0;\n"); + } + StringBuilder_Append(&cbe.sb, "\n}\n\n"); + // After capturing closure thunk, emit heap-env maker + if mod.funcs[i].captureCount > 0 { + CBE_EmitMakerFunc(cbe, &mod.funcs[i]); + } + i = i + 1; + } + + // Generate C main wrapper if Main function exists + if hasMain { + StringBuilder_Append(&cbe.sb, "extern int g_argc;\n"); + StringBuilder_Append(&cbe.sb, "extern char** g_argv;\n"); + StringBuilder_Append(&cbe.sb, "int main(int argc, char** argv) {\n"); + StringBuilder_Append(&cbe.sb, " g_argc = argc;\n"); + StringBuilder_Append(&cbe.sb, " g_argv = argv;\n"); + StringBuilder_Append(&cbe.sb, " return Main();\n"); + StringBuilder_Append(&cbe.sb, "}\n"); + } + + return StringBuilder_Build(&cbe.sb); } - // Generate C main wrapper if Main function exists - if hasMain { - StringBuilder_Append(&cbe.sb, "extern int g_argc;\n"); - StringBuilder_Append(&cbe.sb, "extern char** g_argv;\n"); - StringBuilder_Append(&cbe.sb, "int main(int argc, char** argv) {\n"); - StringBuilder_Append(&cbe.sb, " g_argc = argc;\n"); - StringBuilder_Append(&cbe.sb, " g_argv = argv;\n"); - StringBuilder_Append(&cbe.sb, " return Main();\n"); - StringBuilder_Append(&cbe.sb, "}\n"); - } - - return StringBuilder_Build(&cbe.sb); -} - } diff --git a/src/cli.bux b/src/cli.bux index 452ccf6..f2dea63 100644 --- a/src/cli.bux +++ b/src/cli.bux @@ -2,144 +2,144 @@ // Wires together: Lexer → Parser → Sema → HirLower → CBackend module Cli { -extern func PrintLine(s: String); -extern func Print(s: String); -extern func bux_read_file(path: String) -> String; -extern func bux_write_file(path: String, content: String) -> bool; -extern func bux_file_exists(path: String) -> int; -extern func bux_dir_exists(path: String) -> int; -extern func bux_getcwd() -> String; -extern func bux_path_join(a: String, b: String) -> String; -extern func bux_path_parent(path: String) -> String; -extern func bux_mkdir_if_needed(path: String) -> int; -extern func bux_run_nim(nim_file: String, out_bin: String) -> int; -extern func bux_list_dir(dir: String, ext: String, out_count: *int) -> *String; -extern func bux_system(cmd: String) -> int; -extern func bux_getenv(name: String) -> String; -extern func bux_setenv(name: String, value: String) -> int; -extern func bux_strlen(s: String) -> uint; -extern func bux_str_slice(s: String, start: uint, len: uint) -> String; + extern func PrintLine(s: String); + extern func Print(s: String); + extern func bux_read_file(path: String) -> String; + extern func bux_write_file(path: String, content: String) -> bool; + extern func bux_file_exists(path: String) -> int; + extern func bux_dir_exists(path: String) -> int; + extern func bux_getcwd() -> String; + extern func bux_path_join(a: String, b: String) -> String; + extern func bux_path_parent(path: String) -> String; + extern func bux_mkdir_if_needed(path: String) -> int; + extern func bux_run_nim(nim_file: String, out_bin: String) -> int; + extern func bux_list_dir(dir: String, ext: String, out_count: *int) -> *String; + extern func bux_system(cmd: String) -> int; + extern func bux_getenv(name: String) -> String; + extern func bux_setenv(name: String, value: String) -> int; + extern func bux_strlen(s: String) -> uint; + extern func bux_str_slice(s: String, start: uint, len: uint) -> String; -func ReadFile(path: String) -> String { - return bux_read_file(path); -} - -func WriteFile(path: String, content: String) -> bool { - return bux_write_file(path, content); -} - -func FileExists(path: String) -> bool { - return bux_file_exists(path) != 0; -} - -func DirExists(path: String) -> bool { - return bux_dir_exists(path) != 0; -} - -// --------------------------------------------------------------------------- -// Diagnostic formatting (Rust-style errors with snippets) -// --------------------------------------------------------------------------- - -struct Diagnostic { - message: String; - line: uint32; - column: uint32; - severity: int; -} - -/* Read a single line from a file (1-based). Returns "" on error or EOF. */ -func Diagnostic_GetLine(path: String, lineNum: uint32) -> String { - let content: String = bux_read_file(path); - if String_Eq(content, "") { return ""; } - /* bux_str_split_part uses 0-based index */ - return bux_str_split_part(content, "\n", lineNum - 1); -} - -/* Simple substring check for help hints */ -func Diagnostic_MsgContains(msg: String, needle: String) -> bool { - return bux_str_contains(msg, needle) != 0; -} - -/* Actionable help for common error messages */ -func Diagnostic_Hint(msg: String) -> String { - if Diagnostic_MsgContains(msg, "cannot assign") { - return "ensure the right-hand side type matches the left-hand side"; + func ReadFile(path: String) -> String { + return bux_read_file(path); } - if Diagnostic_MsgContains(msg, "undeclared identifier") { - return "check the spelling, or import the symbol from the right module"; - } - if Diagnostic_MsgContains(msg, "too few arguments") { - return "compare the call with the function's parameter list"; - } - if Diagnostic_MsgContains(msg, "too many arguments") { - return "compare the call with the function's parameter list"; - } - if Diagnostic_MsgContains(msg, "use of moved value") { - return "the value was moved; clone it or restructure ownership"; - } - if Diagnostic_MsgContains(msg, "expected expression") { - return "the previous statement may be incomplete (missing value or ';')"; - } - if Diagnostic_MsgContains(msg, "duplicate symbol") { - return "rename one of the definitions or remove the duplicate"; - } - return ""; -} -/* Print a diagnostic in Rust-style format: - * error: - * --> :: - * | - * 42 | - * | ^ - * = help: - */ -func Diagnostic_Print(diag: *Diagnostic, sourcePath: String) { - /* Severity prefix */ - if diag.severity == 0 { - Print("error: "); - } else if diag.severity == 1 { - Print("warning: "); - } else { - Print("note: "); + func WriteFile(path: String, content: String) -> bool { + return bux_write_file(path, content); } - PrintLine(diag.message); - /* Location header */ - Print(" --> "); - Print(sourcePath); - Print(":"); - PrintInt(diag.line as int64); - Print(":"); - PrintInt(diag.column as int64); - PrintLine(""); + func FileExists(path: String) -> bool { + return bux_file_exists(path) != 0; + } - /* Source snippet */ - let lineText: String = Diagnostic_GetLine(sourcePath, diag.line); - if !String_Eq(lineText, "") { - let lineNumStr: String = String_FromInt(diag.line as int64); + func DirExists(path: String) -> bool { + return bux_dir_exists(path) != 0; + } - Print(" |"); - PrintLine(""); - Print(" "); - Print(lineNumStr); - Print(" | "); - PrintLine(lineText); + // --------------------------------------------------------------------------- + // Diagnostic formatting (Rust-style errors with snippets) + // --------------------------------------------------------------------------- - /* Underline (multi-char for identifiers/string tokens) */ - Print(" | "); - var i: uint32 = 0; - while i < diag.column - 1 && i < 120 { - Print(" "); - i = i + 1; + struct Diagnostic { + message: String; + line: uint32; + column: uint32; + severity: int; + } + + /* Read a single line from a file (1-based). Returns "" on error or EOF. */ + func Diagnostic_GetLine(path: String, lineNum: uint32) -> String { + let content: String = bux_read_file(path); + if String_Eq(content, "") { return ""; } + /* bux_str_split_part uses 0-based index */ + return bux_str_split_part(content, "\n", lineNum - 1); + } + + /* Simple substring check for help hints */ + func Diagnostic_MsgContains(msg: String, needle: String) -> bool { + return bux_str_contains(msg, needle) != 0; + } + + /* Actionable help for common error messages */ + func Diagnostic_Hint(msg: String) -> String { + if Diagnostic_MsgContains(msg, "cannot assign") { + return "ensure the right-hand side type matches the left-hand side"; } - /* Estimate token length from the source line */ - var ulen: uint = 1; - let col0: uint = diag.column - 1; - let lineLen: uint = String_Len(lineText); - if col0 < lineLen { - let first: String = String_Chars(lineText, col0); - if String_Eq(first, "\"") || String_Eq(first, "`") || String_Eq(first, "'") { + if Diagnostic_MsgContains(msg, "undeclared identifier") { + return "check the spelling, or import the symbol from the right module"; + } + if Diagnostic_MsgContains(msg, "too few arguments") { + return "compare the call with the function's parameter list"; + } + if Diagnostic_MsgContains(msg, "too many arguments") { + return "compare the call with the function's parameter list"; + } + if Diagnostic_MsgContains(msg, "use of moved value") { + return "the value was moved; clone it or restructure ownership"; + } + if Diagnostic_MsgContains(msg, "expected expression") { + return "the previous statement may be incomplete (missing value or ';')"; + } + if Diagnostic_MsgContains(msg, "duplicate symbol") { + return "rename one of the definitions or remove the duplicate"; + } + return ""; + } + + /* Print a diagnostic in Rust-style format: + * error: + * --> :: + * | + * 42 | + * | ^ + * = help: + */ + func Diagnostic_Print(diag: *Diagnostic, sourcePath: String) { + /* Severity prefix */ + if diag.severity == 0 { + Print("error: "); + } else if diag.severity == 1 { + Print("warning: "); + } else { + Print("note: "); + } + PrintLine(diag.message); + + /* Location header */ + Print(" --> "); + Print(sourcePath); + Print(":"); + PrintInt(diag.line as int64); + Print(":"); + PrintInt(diag.column as int64); + PrintLine(""); + + /* Source snippet */ + let lineText: String = Diagnostic_GetLine(sourcePath, diag.line); + if !String_Eq(lineText, "") { + let lineNumStr: String = String_FromInt(diag.line as int64); + + Print(" |"); + PrintLine(""); + Print(" "); + Print(lineNumStr); + Print(" | "); + PrintLine(lineText); + + /* Underline (multi-char for identifiers/string tokens) */ + Print(" | "); + var i: uint32 = 0; + while i < diag.column - 1 && i < 120 { + Print(" "); + i = i + 1; + } + /* Estimate token length from the source line */ + var ulen: uint = 1; + let col0: uint = diag.column - 1; + let lineLen: uint = String_Len(lineText); + if col0 < lineLen { + let first: String = String_Chars(lineText, col0); + if String_Eq(first, "\"") || String_Eq(first, "`") || String_Eq(first, "'") { var j: uint = col0 + 1; while j < lineLen { let cj: String = String_Chars(lineText, j); @@ -922,12 +922,184 @@ func Cli_Fetch() -> int { } // --------------------------------------------------------------------------- -// Fmt command — format source files +// Doc command — Markdown from /// comments (D.4) // --------------------------------------------------------------------------- -func Cli_Fmt(dir: String) -> int { - // If dir is a file, format just that file +func Cli_DocIsDeclStart(line: String) -> bool { + if String_StartsWith(line, "func ") { return true; } + if String_StartsWith(line, "pub func ") { return true; } + if String_StartsWith(line, "extern func ") { return true; } + if String_StartsWith(line, "const func ") { return true; } + if String_StartsWith(line, "async func ") { return true; } + if String_StartsWith(line, "struct ") { return true; } + if String_StartsWith(line, "pub struct ") { return true; } + if String_StartsWith(line, "enum ") { return true; } + if String_StartsWith(line, "interface ") { return true; } + if String_StartsWith(line, "module ") { return true; } + if String_StartsWith(line, "type ") { return true; } + return false; +} + +func Cli_DocExtractName(line: String) -> String { + // Skip leading keywords + var s: String = line; + if String_StartsWith(s, "pub ") { s = bux_str_slice(s, 4, bux_strlen(s) - 4); } + if String_StartsWith(s, "extern ") { s = bux_str_slice(s, 7, bux_strlen(s) - 7); } + if String_StartsWith(s, "const ") { s = bux_str_slice(s, 6, bux_strlen(s) - 6); } + if String_StartsWith(s, "async ") { s = bux_str_slice(s, 6, bux_strlen(s) - 6); } + if String_StartsWith(s, "func ") { s = bux_str_slice(s, 5, bux_strlen(s) - 5); } + else if String_StartsWith(s, "struct ") { s = bux_str_slice(s, 7, bux_strlen(s) - 7); } + else if String_StartsWith(s, "enum ") { s = bux_str_slice(s, 5, bux_strlen(s) - 5); } + else if String_StartsWith(s, "interface ") { s = bux_str_slice(s, 10, bux_strlen(s) - 10); } + else if String_StartsWith(s, "module ") { s = bux_str_slice(s, 7, bux_strlen(s) - 7); } + else if String_StartsWith(s, "type ") { s = bux_str_slice(s, 5, bux_strlen(s) - 5); } + // Take until space, <, (, {, :, ; + var i: uint = 0; + let n: uint = bux_strlen(s); + while i < n { + let ch: String = bux_str_slice(s, i, 1); + if String_Eq(ch, " ") || String_Eq(ch, "<") || String_Eq(ch, "(") || + String_Eq(ch, "{") || String_Eq(ch, ":") || String_Eq(ch, ";") { + break; + } + i = i + 1; + } + if i == 0 { return s; } + return bux_str_slice(s, 0, i); +} + +func Cli_DocProcessFile(path: String, outSb: *StringBuilder) -> int { + let source: String = ReadFile(path); + if source == null as String || String_Eq(source, "") { return 0; } + var itemCount: int = 0; + var pending: String = ""; + var hasPending: bool = false; + let lineCount: uint = bux_str_split_count(source, "\n"); + // Drop trailing empty split artifact + var nLines: uint = lineCount; + if nLines > 0 { + let last: String = bux_str_split_part(source, "\n", nLines - 1); + if String_Eq(last, "") { nLines = nLines - 1; } + } + var li: uint = 0; + var wroteHeader: bool = false; + while li < nLines { + let raw: String = bux_str_split_part(source, "\n", li); + let line: String = String_Trim(raw); + if String_StartsWith(line, "///") { + var body: String = bux_str_slice(line, 3, bux_strlen(line) - 3); + if String_StartsWith(body, " ") { + body = bux_str_slice(body, 1, bux_strlen(body) - 1); + } + if hasPending { + pending = String_Concat(pending, String_Concat("\n", body)); + } else { + pending = body; + hasPending = true; + } + li = li + 1; + continue; + } + if String_Eq(line, "") || String_StartsWith(line, "@[") { + li = li + 1; + continue; + } + if hasPending && Cli_DocIsDeclStart(line) { + if !wroteHeader { + StringBuilder_Append(outSb, "## `"); + StringBuilder_Append(outSb, Cli_FileNameFromPath(path)); + StringBuilder_Append(outSb, "`\n\n"); + StringBuilder_Append(outSb, "_Source: `"); + StringBuilder_Append(outSb, path); + StringBuilder_Append(outSb, "`_\n\n"); + wroteHeader = true; + } + let name: String = Cli_DocExtractName(line); + StringBuilder_Append(outSb, "### `"); + StringBuilder_Append(outSb, name); + StringBuilder_Append(outSb, "`\n\n"); + StringBuilder_Append(outSb, "```bux\n"); + StringBuilder_Append(outSb, line); + StringBuilder_Append(outSb, "\n```\n\n"); + StringBuilder_Append(outSb, pending); + StringBuilder_Append(outSb, "\n\n"); + itemCount = itemCount + 1; + hasPending = false; + pending = ""; + li = li + 1; + continue; + } + if String_StartsWith(line, "//") { + li = li + 1; + continue; +} +// Other code clears pending +hasPending = false; +pending = ""; +li = li + 1; +} +return itemCount; +} + +func Cli_Doc(dir: String, outPath: String) -> int { + var sb: StringBuilder = StringBuilder_NewCap(16384); + StringBuilder_Append(&sb, "# API Reference\n\n"); + StringBuilder_Append(&sb, "Generated by `bux doc` from `///` documentation comments.\n\n"); + var total: int = 0; if FileExists(dir) { + total = total + Cli_DocProcessFile(dir, &sb); + } else if DirExists(dir) { + var fileCount: int = 0; + let files: *String = bux_list_dir(dir, ".bux", &fileCount); + var i: int = 0; + while i < fileCount { + total = total + Cli_DocProcessFile(files[i], &sb); + i = i + 1; + } + } else { + Print("Error: path not found: "); + PrintLine(dir); + StringBuilder_Free(&sb); + return 1; + } + let md: String = StringBuilder_Build(&sb); + StringBuilder_Free(&sb); + if String_Eq(outPath, "") { + Print(md); + } else { + if !WriteFile(outPath, md) { + Print("Error: cannot write "); + PrintLine(outPath); + return 1; + } + Print("Wrote "); + PrintInt(total as int64); + Print(" documented items → "); + PrintLine(outPath); + } + if total == 0 { + PrintLine("warning: no /// documented declarations found"); + } + return 0; +} + +// --------------------------------------------------------------------------- +// Fmt command — format source files (write or --check for CI) +// --------------------------------------------------------------------------- + +func Cli_Fmt(dir: String, checkOnly: bool) -> int { + // If dir is a file, format/check just that file + if FileExists(dir) { + if checkOnly { + if Fmt_CheckFile(dir) == 0 { + Print(" ok "); + PrintLine(dir); + return 0; + } + Print(" would reformat "); + PrintLine(dir); + return 1; + } Print("Formatting "); PrintLine(dir); if Fmt_FormatFile(dir) { @@ -936,8 +1108,12 @@ func Cli_Fmt(dir: String) -> int { } return 1; } - // Otherwise format all .bux files in directory - Print("Formatting "); + // Otherwise format/check all .bux files in directory + if checkOnly { + Print("Checking format in "); + } else { + Print("Formatting "); + } PrintLine(dir); var fileCount: int = 0; let files: *String = bux_list_dir(dir, ".bux", &fileCount); @@ -947,14 +1123,34 @@ func Cli_Fmt(dir: String) -> int { } var i: int = 0; var okCount: int = 0; + var changeCount: int = 0; while i < fileCount { - Print(" "); - PrintLine(files[i]); - if Fmt_FormatFile(files[i]) { - okCount = okCount + 1; + if checkOnly { + if Fmt_CheckFile(files[i]) == 0 { + okCount = okCount + 1; + } else { + Print(" would reformat "); + PrintLine(files[i]); + changeCount = changeCount + 1; + } + } else { + Print(" "); + PrintLine(files[i]); + if Fmt_FormatFile(files[i]) { + okCount = okCount + 1; + } } i = i + 1; } + if checkOnly { + Print("fmt --check: "); + PrintInt(changeCount as int64); + Print(" would reformat, "); + PrintInt(okCount as int64); + PrintLine(" ok"); + if changeCount > 0 { return 1; } + return 0; + } Print("Formatted "); PrintInt(okCount as int64); Print("/"); PrintInt(fileCount as int64); PrintLine(" files"); return 0; } @@ -985,32 +1181,40 @@ func Cli_StripExtension(name: String) -> String { return name; } -func Cli_Test(projectDir: String) -> int { +func Cli_Test(projectDir: String, filter: String) -> int { Print("Testing project: "); PrintLine(projectDir); - // Build and run the project's own Main first - let mainRc: int = Cli_BuildProject(projectDir, "", false); - if mainRc != 0 { - PrintLine("Main test build failed"); - return mainRc; + if !String_Eq(filter, "") { + Print("Filter: "); + PrintLine(filter); } - let man: Manifest = Manifest_Load(bux_path_join(projectDir, "bux.toml")); - var mainName: String = man.name; - if String_Eq(mainName, "") { mainName = "bux_out"; } - let mainBin: String = bux_path_join(bux_path_join(projectDir, "build"), mainName); - if !FileExists(mainBin) { - Print("Error: test binary not found: "); - PrintLine(mainBin); - return 1; + + // Without --filter, build and run the project's own Main first. + // With --filter, only run matching tests/*.bux files. + if String_Eq(filter, "") { + let mainRc: int = Cli_BuildProject(projectDir, "", false); + if mainRc != 0 { + PrintLine("Main test build failed"); + return mainRc; + } + let man: Manifest = Manifest_Load(bux_path_join(projectDir, "bux.toml")); + var mainName: String = man.name; + if String_Eq(mainName, "") { mainName = "bux_out"; } + let mainBin: String = bux_path_join(bux_path_join(projectDir, "build"), mainName); + if !FileExists(mainBin) { + Print("Error: test binary not found: "); + PrintLine(mainBin); + return 1; + } + let mainResult: int = bux_system(mainBin); + if mainResult != 0 { + Print("Main tests failed (exit code "); + PrintInt(mainResult as int64); + PrintLine(")"); + return mainResult; + } + PrintLine("Main tests passed"); } - let mainResult: int = bux_system(mainBin); - if mainResult != 0 { - Print("Main tests failed (exit code "); - PrintInt(mainResult as int64); - PrintLine(")"); - return mainResult; - } - PrintLine("Main tests passed"); // Propagate the project's stdlib to temp test packages. let stdlibDir: String = Cli_FindStdlibDir(projectDir); @@ -1031,15 +1235,31 @@ func Cli_Test(projectDir: String) -> int { return 0; } + PrintLine("┌──────────────────────────────┬────────┐"); + PrintLine("│ Test │ Status │"); + PrintLine("├──────────────────────────────┼────────┤"); + var passed: int = 0; var failed: int = 0; + var skipped: int = 0; var i: int = 0; while i < testCount { let testPath: String = testFiles[i]; let fileName: String = Cli_FileNameFromPath(testPath); let testName: String = Cli_StripExtension(fileName); - Print(" Test: "); + + // --filter: only run tests whose name contains the filter substring + if !String_Eq(filter, "") { + if !String_Contains(testName, filter) { + skipped = skipped + 1; + i = i + 1; + continue; + } + } + + Print("│ "); Print(testName); + // Pad status column roughly (name may be long) Print(" ... "); // Create temp package for this test file @@ -1050,14 +1270,14 @@ func Cli_Test(projectDir: String) -> int { let source: String = ReadFile(testPath); if String_Eq(source, "") { - PrintLine("FAIL (cannot read test file)"); + PrintLine("FAIL │"); failed = failed + 1; i = i + 1; continue; } let tmpMain: String = bux_path_join(tmpSrc, "Main.bux"); if !WriteFile(tmpMain, source) { - PrintLine("FAIL (cannot write temp Main.bux)"); + PrintLine("FAIL │"); failed = failed + 1; i = i + 1; continue; @@ -1066,7 +1286,7 @@ func Cli_Test(projectDir: String) -> int { let tmpToml: String = bux_path_join(tmpDir, "bux.toml"); var tomlContent: String = "[Package]\nName = \"_test_tmp\"\nVersion = \"0.1.0\"\nType = \"bin\"\n\n[Build]\nOutput = \"Bin\"\n"; if !WriteFile(tmpToml, tomlContent) { - PrintLine("FAIL (cannot write temp bux.toml)"); + PrintLine("FAIL │"); failed = failed + 1; i = i + 1; continue; @@ -1091,36 +1311,48 @@ func Cli_Test(projectDir: String) -> int { let buildRc: int = Cli_BuildProject(tmpDir, "", false); if buildRc != 0 { - PrintLine("FAIL (build error)"); + PrintLine("FAIL │"); failed = failed + 1; i = i + 1; continue; } let testBin: String = bux_path_join(bux_path_join(tmpDir, "build"), "_test_tmp"); if !FileExists(testBin) { - PrintLine("FAIL (test binary not found)"); + PrintLine("FAIL │"); failed = failed + 1; i = i + 1; continue; } let runRc: int = bux_system(testBin); if runRc == 0 { - PrintLine("PASS"); + PrintLine("PASS │"); passed = passed + 1; } else { - Print("FAIL (exit "); - PrintInt(runRc as int64); - PrintLine(")"); + Print("FAIL │"); + PrintLine(""); failed = failed + 1; } i = i + 1; } - Print("Tests: "); + PrintLine("└──────────────────────────────┴────────┘"); + Print("Results: "); PrintInt(passed as int64); Print(" passed, "); PrintInt(failed as int64); - PrintLine(" failed"); + Print(" failed"); + if skipped > 0 { + Print(", "); + PrintInt(skipped as int64); + Print(" skipped"); + } + PrintLine(""); + if !String_Eq(filter, "") && passed == 0 && failed == 0 { + Print("No tests matching filter '"); + Print(filter); + PrintLine("'"); + return 1; + } if failed > 0 { return 1; } return 0; } @@ -1493,7 +1725,10 @@ func Cli_Run(args: *String, argCount: int) -> int { if argCount < 2 { PrintLine("Bux Self-Hosting Compiler v0.2.0"); PrintLine("Usage: buxc [args]"); - PrintLine("Commands: build, check, new, init, add, remove, fetch, fmt, test, run, project, help, version"); + PrintLine("Commands: build, check, new, init, add, remove, fetch, fmt, doc, test, run, project, help, version"); + PrintLine(" test --filter Only run tests/*.bux whose name contains "); + PrintLine(" fmt --check [path] Exit 1 if any file would be reformatted (CI)"); + PrintLine(" doc --out file.md [path] API docs from /// comments"); return 0; } @@ -1506,14 +1741,16 @@ func Cli_Run(args: *String, argCount: int) -> int { if String_Eq(cmd, "help") || String_Eq(cmd, "--help") || String_Eq(cmd, "-h") { PrintLine("Bux Self-Hosting Compiler v0.2.0"); PrintLine("Usage: buxc [args]"); - PrintLine("Commands: build, check, new, init, add, remove, fetch, fmt, test, run, project, help, version"); + PrintLine("Commands: build, check, new, init, add, remove, fetch, fmt, doc, test, run, project, help, version"); + PrintLine(" test --filter Only run tests/*.bux whose name contains "); + PrintLine(" fmt --check [path] Exit 1 if any file would be reformatted (CI)"); + PrintLine(" doc --out file.md [path] API docs from /// comments"); PrintLine("Pipeline modules:"); - PrintLine(" Lexer ✅ 695 lines"); - PrintLine(" Parser ✅ 1004 lines"); - PrintLine(" Sema ✅ 393 lines"); - PrintLine(" HirLower ✅ 307 lines"); - PrintLine(" CBackend ✅ 585 lines"); - PrintLine(" Total: 3830 lines of Bux"); + PrintLine(" Lexer ✅"); + PrintLine(" Parser ✅"); + PrintLine(" Sema ✅"); + PrintLine(" HirLower ✅"); + PrintLine(" CBackend ✅"); return 0; } @@ -1550,9 +1787,36 @@ func Cli_Run(args: *String, argCount: int) -> int { } if String_Eq(cmd, "fmt") { - let dir: String = "."; - if argCount >= 3 { dir = args[2]; } - return Cli_Fmt(dir); + var dir: String = "."; + var checkOnly: bool = false; + var fi: int = 2; + while fi < argCount { + if String_Eq(args[fi], "--check") { + checkOnly = true; + } else { + dir = args[fi]; + } + fi = fi + 1; + } + return Cli_Fmt(dir, checkOnly); + } + + if String_Eq(cmd, "doc") { + var dir: String = "lib"; + var outPath: String = ""; + var di: int = 2; + while di < argCount { + if String_Eq(args[di], "--out") && di + 1 < argCount { + outPath = args[di + 1]; + di = di + 1; + } else if String_StartsWith(args[di], "--out=") { + outPath = bux_str_slice(args[di], 6, bux_strlen(args[di]) - 6); + } else if !String_StartsWith(args[di], "-") { + dir = args[di]; + } + di = di + 1; + } + return Cli_Doc(dir, outPath); } if String_Eq(cmd, "check") { @@ -1578,9 +1842,22 @@ func Cli_Run(args: *String, argCount: int) -> int { } if String_Eq(cmd, "test") { - let dir: String = "."; - if argCount >= 3 { dir = args[2]; } - return Cli_Test(dir); + var dir: String = "."; + var filter: String = ""; + var ti: int = 2; + while ti < argCount { + if String_Eq(args[ti], "--filter") && ti + 1 < argCount { + filter = args[ti + 1]; + ti = ti + 1; + } else if String_StartsWith(args[ti], "--filter=") { + // --filter=name form + filter = bux_str_slice(args[ti], 9, bux_strlen(args[ti]) - 9); + } else if !String_StartsWith(args[ti], "-") { + dir = args[ti]; + } + ti = ti + 1; + } + return Cli_Test(dir, filter); } if String_Eq(cmd, "run") { diff --git a/src/fmt.bux b/src/fmt.bux index 5f1e1e9..645e9bf 100644 --- a/src/fmt.bux +++ b/src/fmt.bux @@ -1,138 +1,168 @@ // fmt.bux — Bux source code formatter (indentation-based, preserves line structure) module Fmt { -extern func bux_read_file(path: String) -> String; -extern func bux_write_file(path: String, content: String) -> bool; -extern func bux_strlen(s: String) -> uint; + extern func bux_read_file(path: String) -> String; + extern func bux_write_file(path: String, content: String) -> bool; + extern func bux_strlen(s: String) -> uint; -// Count leading spaces on a line -func Fmt_CountLeadingSpaces(line: String) -> int { - var count: int = 0; - while count < 256 { - let c: int = line[count] as int; - if c == 0 { break; } - if c != 32 { break; } // space - count = count + 1; - } - return count; -} - -// Skip whitespace from start of line, return rest -func Fmt_TrimLeft(line: String) -> String { - var i: int = 0; - while i < 256 { - let c: int = line[i] as int; - if c == 0 { break; } - if c != 32 && c != 9 { break; } - i = i + 1; - } - if i == 0 { return line; } - // Extract substring from i - var len: int = 0; - while len < 256 { - let c: int = line[len] as int; - if c == 0 { break; } - len = len + 1; - } - if i >= len { return ""; } - return bux_str_slice(line, i as uint, (len - i) as uint); -} - -// Check if char at position is inside a string or comment (simplified) -func Fmt_IsInStringOrComment(line: String, pos: int) -> bool { - var inString: bool = false; - var inChar: bool = false; - var inComment: bool = false; - var i: int = 0; - while i < pos { - let c: int = line[i] as int; - let n: int = 0; - if i + 1 < 256 { n = line[i + 1] as int; } - if inComment { i = i + 1; continue; } - if c == 47 && n == 47 { inComment = true; i = i + 1; continue; } // // - if c == 34 && !inChar { inString = !inString; } - if c == 39 && !inString { inChar = !inChar; } - i = i + 1; - } - return inString || inChar || inComment; -} - -// Count brace depth change on a line, skipping strings/comments -func Fmt_CountBraceDelta(line: String) -> int { - var delta: int = 0; - var i: int = 0; - while i < 256 { - let c: int = line[i] as int; - if c == 0 { break; } - if !Fmt_IsInStringOrComment(line, i) { - if c == 123 { delta = delta + 1; } // { - if c == 125 { delta = delta - 1; } // } + // Count leading spaces on a line + func Fmt_CountLeadingSpaces(line: String) -> int { + var count: int = 0; + while count < 256 { + let c: int = line[count] as int; + if c == 0 { break; } + if c != 32 { break; } // space + count = count + 1; } - i = i + 1; + return count; } - return delta; -} -func Fmt_FormatSource(source: String) -> String { - let sb: StringBuilder = StringBuilder_NewCap(8192); - var indent: int = 0; - var i: uint = 0; - let lineCount: uint = bux_str_split_count(source, "\n"); - - while i < lineCount { - let line: String = bux_str_split_part(source, "\n", i); - let trimmed: String = Fmt_TrimLeft(line); - - // Skip empty lines - if String_Eq(trimmed, "") { - StringBuilder_Append(&sb, "\n"); + // Skip whitespace from start of line, return rest + func Fmt_TrimLeft(line: String) -> String { + var i: int = 0; + while i < 256 { + let c: int = line[i] as int; + if c == 0 { break; } + if c != 32 && c != 9 { break; } i = i + 1; - continue; } - - // Adjust indent for closing braces on this line - let delta: int = Fmt_CountBraceDelta(trimmed); - // If line starts with }, decrease indent before emitting - let firstChar: int = trimmed[0] as int; - if firstChar == 125 { // } - indent = indent - 1; - if indent < 0 { indent = 0; } + if i == 0 { return line; } + // Extract substring from i + var len: int = 0; + while len < 256 { + let c: int = line[len] as int; + if c == 0 { break; } + len = len + 1; } - - // Emit indentation - var si: int = 0; - while si < indent { - StringBuilder_Append(&sb, " "); - si = si + 1; - } - - // Emit the trimmed line - StringBuilder_Append(&sb, trimmed); - StringBuilder_Append(&sb, "\n"); - - // Adjust indent for opening braces - if firstChar != 125 { - indent = indent + delta; - } else { - // For lines starting with }, apply the net delta after the initial decrease - indent = indent + delta + 1; - if indent < 0 { indent = 0; } - } - - i = i + 1; + if i >= len { return ""; } + return bux_str_slice(line, i as uint, (len - i) as uint); } - let result: String = StringBuilder_Build(&sb); - StringBuilder_Free(&sb); - return result; -} + // Check if char at position is inside a string or comment (simplified) + func Fmt_IsInStringOrComment(line: String, pos: int) -> bool { + var inString: bool = false; + var inChar: bool = false; + var inComment: bool = false; + var i: int = 0; + while i < pos { + let c: int = line[i] as int; + let n: int = 0; + if i + 1 < 256 { n = line[i + 1] as int; } + if inComment { i = i + 1; continue; } + if c == 47 && n == 47 { inComment = true; i = i + 1; continue; } // // + if c == 34 && !inChar { inString = !inString; } + if c == 39 && !inString { inChar = !inChar; } + i = i + 1; + } + return inString || inChar || inComment; + } -func Fmt_FormatFile(path: String) -> bool { - let source: String = bux_read_file(path); - if source == null as String || String_Eq(source, "") { return false; } - let formatted: String = Fmt_FormatSource(source); - if String_Eq(formatted, "") { return false; } - return bux_write_file(path, formatted); -} + // Count brace depth change on a line, skipping strings/comments + func Fmt_CountBraceDelta(line: String) -> int { + var delta: int = 0; + var i: int = 0; + while i < 256 { + let c: int = line[i] as int; + if c == 0 { break; } + if !Fmt_IsInStringOrComment(line, i) { + if c == 123 { delta = delta + 1; } // { + if c == 125 { delta = delta - 1; } // } + } + i = i + 1; + } + return delta; + } + + func Fmt_FormatSource(source: String) -> String { + let sb: StringBuilder = StringBuilder_NewCap(8192); + var indent: int = 0; + var i: uint = 0; + var lineCount: uint = bux_str_split_count(source, "\n"); + + // Trailing "\n" yields a final empty part (split artifact). Drop it so + // re-formatting is idempotent and does not accumulate blank lines. + if lineCount > 0 { + let last: String = bux_str_split_part(source, "\n", lineCount - 1); + if String_Eq(last, "") { + lineCount = lineCount - 1; + } + } + + while i < lineCount { + let line: String = bux_str_split_part(source, "\n", i); + let trimmed: String = Fmt_TrimLeft(line); + + // Empty line (intentional blank) — keep a single newline + if String_Eq(trimmed, "") { + StringBuilder_Append(&sb, "\n"); + i = i + 1; + continue; + } + + // Adjust indent for closing braces on this line + let delta: int = Fmt_CountBraceDelta(trimmed); + // If line starts with }, decrease indent before emitting + let firstChar: int = trimmed[0] as int; + if firstChar == 125 { // } + indent = indent - 1; + if indent < 0 { indent = 0; } + } + + // Emit indentation + var si: int = 0; + while si < indent { + StringBuilder_Append(&sb, " "); + si = si + 1; + } + + // Emit the trimmed line + StringBuilder_Append(&sb, trimmed); + StringBuilder_Append(&sb, "\n"); + + // Adjust indent for opening braces + if firstChar != 125 { + indent = indent + delta; + } else { + // For lines starting with }, apply the net delta after the initial decrease + indent = indent + delta + 1; + if indent < 0 { indent = 0; } + } + + i = i + 1; + } + + let result: String = StringBuilder_Build(&sb); + StringBuilder_Free(&sb); + return result; + } + + func Fmt_FormatFile(path: String) -> bool { + let source: String = bux_read_file(path); + if source == null as String || String_Eq(source, "") { return false; } + let formatted: String = Fmt_FormatSource(source); + if String_Eq(formatted, "") { return false; } + return bux_write_file(path, formatted); + } + + // Returns true if formatting would change the file (CI --check). + func Fmt_WouldChange(path: String) -> bool { + let source: String = bux_read_file(path); + if source == null as String { return false; } + let formatted: String = Fmt_FormatSource(source); + return !String_Eq(formatted, source); + } + + // Check a file without writing. Returns 0 if clean, 1 if would reformat / error. + func Fmt_CheckFile(path: String) -> int { + let source: String = bux_read_file(path); + if source == null as String { + return 1; + } + let formatted: String = Fmt_FormatSource(source); + if String_Eq(formatted, source) { + return 0; + } + return 1; + } } diff --git a/src/hir.bux b/src/hir.bux index aaa87a4..40aa6c4 100644 --- a/src/hir.bux +++ b/src/hir.bux @@ -1,256 +1,256 @@ // hir.bux — HIR (High-level Intermediate Representation) node types module Hir { -// HIR node kinds -const hLit: int = 0; -const hVar: int = 1; -const hSelf: int = 2; -const hUnary: int = 3; -const hBinary: int = 4; -const hAssign: int = 5; -const hIf: int = 6; -const hWhile: int = 7; -const hLoop: int = 8; -const hBreak: int = 9; -const hContinue: int = 10; -const hReturn: int = 11; -const hAlloca: int = 12; -const hLoad: int = 13; -const hStore: int = 14; -const hFieldPtr: int = 15; -const hFieldAccess: int = 16; -const hArrowField: int = 17; -const hIndexPtr: int = 18; -const hCall: int = 32; -const hCallIndirect: int = 33; -const hCast: int = 34; -const hIs: int = 35; -const hSizeOf: int = 36; -const hBlock: int = 37; -const hStructInit: int = 38; -const hSliceInit: int = 39; -const hRange: int = 40; -const hTupleInit: int = 41; -const hMatch: int = 42; -const hSpawn: int = 43; -const hAwait: int = 44; -const hDefer: int = 45; + // HIR node kinds + const hLit: int = 0; + const hVar: int = 1; + const hSelf: int = 2; + const hUnary: int = 3; + const hBinary: int = 4; + const hAssign: int = 5; + const hIf: int = 6; + const hWhile: int = 7; + const hLoop: int = 8; + const hBreak: int = 9; + const hContinue: int = 10; + const hReturn: int = 11; + const hAlloca: int = 12; + const hLoad: int = 13; + const hStore: int = 14; + const hFieldPtr: int = 15; + const hFieldAccess: int = 16; + const hArrowField: int = 17; + const hIndexPtr: int = 18; + const hCall: int = 32; + const hCallIndirect: int = 33; + const hCast: int = 34; + const hIs: int = 35; + const hSizeOf: int = 36; + const hBlock: int = 37; + const hStructInit: int = 38; + const hSliceInit: int = 39; + const hRange: int = 40; + const hTupleInit: int = 41; + const hMatch: int = 42; + const hSpawn: int = 43; + const hAwait: int = 44; + const hDefer: int = 45; -// --------------------------------------------------------------------------- -// HirArgList — linked list for call arguments beyond 2 -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // HirArgList — linked list for call arguments beyond 2 + // --------------------------------------------------------------------------- -struct HirArgList { - node: *HirNode, - next: *HirArgList, -} - -// --------------------------------------------------------------------------- -// HirNode — unified struct with tagged union pattern -// --------------------------------------------------------------------------- - -struct HirNode { - kind: int; - line: uint32; - column: uint32; - typeKind: int; - typeName: String; - // Common fields (used by multiple kinds) - strValue: String; // var name; callee name; field name; label - intValue: int; // token kind (for lit; unary op; binary op) - boolValue: bool; // range inclusive; isScope - // Child nodes (up to 3) - child1: *HirNode; // left/operand/condition/base - child2: *HirNode; // right/value/then/body - child3: *HirNode; // else/third - // Extra data pointer (for children arrays, field lists, etc.) - extraData: *void; - extraCount: int; -} - -// --------------------------------------------------------------------------- -// HirFunc -// --------------------------------------------------------------------------- - -struct HirParam { - name: String; - typeKind: int; - typeName: String; -} - -struct HirFunc { - name: String; - paramCount: int; - param0: *HirParam; - param1: *HirParam; - param2: *HirParam; - param3: *HirParam; - param4: *HirParam; - param5: *HirParam; - param6: *HirParam; - param7: *HirParam; - param8: *HirParam; - retTypeKind: int; - retTypeName: String; - body: *HirNode; - isPublic: bool; - // Closure capture metadata - captureCount: int; - captureName0: String; - captureName1: String; - captureName2: String; - captureName3: String; - captureName4: String; - captureName5: String; - captureName6: String; - captureName7: String; - captureType0: int; - captureType1: int; - captureType2: int; - captureType3: int; - captureType4: int; - captureType5: int; - captureType6: int; - captureType7: int; - envStructName: String; - envInstanceName: String; - checkedFunc: bool; -} - -// --------------------------------------------------------------------------- -// HirEnumVariant -// --------------------------------------------------------------------------- - -struct HirEnumVariant { - name: String; - fieldCount: int; - fieldType0: int; - fieldName0: String; - fieldTypeName0: String; // C type name (e.g. "int", "Tuple_int_int") - fieldType1: int; - fieldName1: String; - fieldTypeName1: String; -} - -// --------------------------------------------------------------------------- -// HirModule -// --------------------------------------------------------------------------- - -struct HirStructField { - name: String; - typeName: String; -} - -struct HirStruct { - name: String; - fieldCount: int; - fields: *HirStructField; -} - -struct HirConst { - name: String; - value: int; -} - -struct HirEnum { - name: String; - variantCount: int; - variants: *HirEnumVariant; -} - -struct HirModule { - funcCount: int; - funcs: *HirFunc; - externCount: int; - externFuncs: *HirFunc; - structCount: int; - structs: *HirStruct; - enumCount: int; - enums: *HirEnum; - constCount: int; - consts: *HirConst; -} - -// --------------------------------------------------------------------------- -// Constructor helpers -// --------------------------------------------------------------------------- - -func Hir_MakeNode(kind: int, line: uint32, column: uint32) -> HirNode { - return HirNode { kind: kind, line: line, column: column, - typeKind: 0, typeName: "", - strValue: "", intValue: 0, boolValue: false, - child1: null as *HirNode, child2: null as *HirNode, child3: null as *HirNode, - extraData: null as *void, extraCount: 0 }; -} - -func Hir_MakeLit(tokKind: int, tokText: String, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hLit, line, col); - n.intValue = tokKind; - n.strValue = tokText; - return n; -} - -func Hir_MakeVar(name: String, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hVar, line, col); - n.strValue = name; - return n; -} - -func Hir_MakeBinary(op: int, left: *HirNode, right: *HirNode, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hBinary, line, col); - n.intValue = op; - n.child1 = left; - n.child2 = right; - return n; -} - -func Hir_MakeCall(callee: String, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hCall, line, col); - n.strValue = callee; - return n; -} - -func Hir_MakeReturn(value: *HirNode, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hReturn, line, col); - n.child1 = value; - return n; -} - -func Hir_MakeBlock(line: uint32, col: uint32) -> HirNode { - return Hir_MakeNode(hBlock, line, col); -} - -func Hir_MakeIf(cond: *HirNode, thenBody: *HirNode, elseBody: *HirNode, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hIf, line, col); - n.child1 = cond; - n.child2 = thenBody; - n.child3 = elseBody; - return n; -} - -func Hir_MakeWhile(cond: *HirNode, body: *HirNode, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hWhile, line, col); - n.child1 = cond; - n.child2 = body; - return n; -} - -func Hir_MakeAlloca(name: String, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hAlloca, line, col); - n.strValue = name; - return n; -} - -func Hir_MakeLoad(ptr: *HirNode, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hLoad, line, col); - n.child1 = ptr; - return n; -} - -func Hir_MakeStore(ptr: *HirNode, value: *HirNode, line: uint32, col: uint32) -> HirNode { - var n: HirNode = Hir_MakeNode(hStore, line, col); - n.child1 = ptr; - n.child2 = value; - return n; -} + struct HirArgList { + node: *HirNode, + next: *HirArgList, + } + + // --------------------------------------------------------------------------- + // HirNode — unified struct with tagged union pattern + // --------------------------------------------------------------------------- + + struct HirNode { + kind: int; + line: uint32; + column: uint32; + typeKind: int; + typeName: String; + // Common fields (used by multiple kinds) + strValue: String; // var name; callee name; field name; label + intValue: int; // token kind (for lit; unary op; binary op) + boolValue: bool; // range inclusive; isScope + // Child nodes (up to 3) + child1: *HirNode; // left/operand/condition/base + child2: *HirNode; // right/value/then/body + child3: *HirNode; // else/third + // Extra data pointer (for children arrays, field lists, etc.) + extraData: *void; + extraCount: int; + } + + // --------------------------------------------------------------------------- + // HirFunc + // --------------------------------------------------------------------------- + + struct HirParam { + name: String; + typeKind: int; + typeName: String; + } + + struct HirFunc { + name: String; + paramCount: int; + param0: *HirParam; + param1: *HirParam; + param2: *HirParam; + param3: *HirParam; + param4: *HirParam; + param5: *HirParam; + param6: *HirParam; + param7: *HirParam; + param8: *HirParam; + retTypeKind: int; + retTypeName: String; + body: *HirNode; + isPublic: bool; + // Closure capture metadata + captureCount: int; + captureName0: String; + captureName1: String; + captureName2: String; + captureName3: String; + captureName4: String; + captureName5: String; + captureName6: String; + captureName7: String; + captureType0: int; + captureType1: int; + captureType2: int; + captureType3: int; + captureType4: int; + captureType5: int; + captureType6: int; + captureType7: int; + envStructName: String; + envInstanceName: String; + checkedFunc: bool; + } + + // --------------------------------------------------------------------------- + // HirEnumVariant + // --------------------------------------------------------------------------- + + struct HirEnumVariant { + name: String; + fieldCount: int; + fieldType0: int; + fieldName0: String; + fieldTypeName0: String; // C type name (e.g. "int", "Tuple_int_int") + fieldType1: int; + fieldName1: String; + fieldTypeName1: String; + } + + // --------------------------------------------------------------------------- + // HirModule + // --------------------------------------------------------------------------- + + struct HirStructField { + name: String; + typeName: String; + } + + struct HirStruct { + name: String; + fieldCount: int; + fields: *HirStructField; + } + + struct HirConst { + name: String; + value: int; + } + + struct HirEnum { + name: String; + variantCount: int; + variants: *HirEnumVariant; + } + + struct HirModule { + funcCount: int; + funcs: *HirFunc; + externCount: int; + externFuncs: *HirFunc; + structCount: int; + structs: *HirStruct; + enumCount: int; + enums: *HirEnum; + constCount: int; + consts: *HirConst; + } + + // --------------------------------------------------------------------------- + // Constructor helpers + // --------------------------------------------------------------------------- + + func Hir_MakeNode(kind: int, line: uint32, column: uint32) -> HirNode { + return HirNode { kind: kind, line: line, column: column, + typeKind: 0, typeName: "", + strValue: "", intValue: 0, boolValue: false, + child1: null as *HirNode, child2: null as *HirNode, child3: null as *HirNode, + extraData: null as *void, extraCount: 0 }; + } + + func Hir_MakeLit(tokKind: int, tokText: String, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hLit, line, col); + n.intValue = tokKind; + n.strValue = tokText; + return n; + } + + func Hir_MakeVar(name: String, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hVar, line, col); + n.strValue = name; + return n; + } + + func Hir_MakeBinary(op: int, left: *HirNode, right: *HirNode, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hBinary, line, col); + n.intValue = op; + n.child1 = left; + n.child2 = right; + return n; + } + + func Hir_MakeCall(callee: String, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hCall, line, col); + n.strValue = callee; + return n; + } + + func Hir_MakeReturn(value: *HirNode, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hReturn, line, col); + n.child1 = value; + return n; + } + + func Hir_MakeBlock(line: uint32, col: uint32) -> HirNode { + return Hir_MakeNode(hBlock, line, col); + } + + func Hir_MakeIf(cond: *HirNode, thenBody: *HirNode, elseBody: *HirNode, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hIf, line, col); + n.child1 = cond; + n.child2 = thenBody; + n.child3 = elseBody; + return n; + } + + func Hir_MakeWhile(cond: *HirNode, body: *HirNode, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hWhile, line, col); + n.child1 = cond; + n.child2 = body; + return n; + } + + func Hir_MakeAlloca(name: String, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hAlloca, line, col); + n.strValue = name; + return n; + } + + func Hir_MakeLoad(ptr: *HirNode, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hLoad, line, col); + n.child1 = ptr; + return n; + } + + func Hir_MakeStore(ptr: *HirNode, value: *HirNode, line: uint32, col: uint32) -> HirNode { + var n: HirNode = Hir_MakeNode(hStore, line, col); + n.child1 = ptr; + n.child2 = value; + return n; + } } diff --git a/src/hir_lower.bux b/src/hir_lower.bux index 7b57008..c78c89c 100644 --- a/src/hir_lower.bux +++ b/src/hir_lower.bux @@ -2,1293 +2,2224 @@ // Transforms the typed AST into a lower-level IR suitable for code generation. module HirLower { -extern func bux_str_slice(s: String, start: uint, len: uint) -> String; -extern func bux_strlen(s: String) -> uint; + extern func bux_str_slice(s: String, start: uint, len: uint) -> String; + extern func bux_strlen(s: String) -> uint; -// --------------------------------------------------------------------------- -// Lowering context -// --------------------------------------------------------------------------- -struct LowerCtx { - module: *Module, - scope: *Scope, - funcs: *HirFunc, - funcCount: int, - externFuncs: *HirFunc, - externCount: int, - varCounter: int, - tryCounter: int, - closureDepth: int, - currentClosureExpr: *Expr, - envInstanceName: String, - hm: *HirModule, - // Generic monomorphization - genFuncCount: int, - genFuncs: *Decl, - genStructCount: int, - genStructs: *Decl, - // Type substitution (active during generic instance lowering) - substParam0: String, - substArg0: String, - substParam1: String, - substArg1: String, - // Borrow checker state - checkedFunc: bool, - releaseFunc: bool, - // Pattern binding renames: source name → unique C local (shadowing-safe) - patMapCount: int, - patMapFrom0: String, - patMapTo0: String, - patMapFrom1: String, - patMapTo1: String, - patMapFrom2: String, - patMapTo2: String, - patMapFrom3: String, - patMapTo3: String, - patMapFrom4: String, - patMapTo4: String, - patMapFrom5: String, - patMapTo5: String, - patMapFrom6: String, - patMapTo6: String, - patMapFrom7: String, - patMapTo7: String, -} - -func Lcx_PatLookup(ctx: *LowerCtx, src: String) -> String { - // Most recent rename wins (scan from end) - var i: int = ctx.patMapCount - 1; - while i >= 0 { - var from: String = ""; - var to: String = ""; - if i == 0 { from = ctx.patMapFrom0; to = ctx.patMapTo0; } - else if i == 1 { from = ctx.patMapFrom1; to = ctx.patMapTo1; } - else if i == 2 { from = ctx.patMapFrom2; to = ctx.patMapTo2; } - else if i == 3 { from = ctx.patMapFrom3; to = ctx.patMapTo3; } - else if i == 4 { from = ctx.patMapFrom4; to = ctx.patMapTo4; } - else if i == 5 { from = ctx.patMapFrom5; to = ctx.patMapTo5; } - else if i == 6 { from = ctx.patMapFrom6; to = ctx.patMapTo6; } - else if i == 7 { from = ctx.patMapFrom7; to = ctx.patMapTo7; } - if String_Eq(from, src) { return to; } - i = i - 1; + // --------------------------------------------------------------------------- + // Lowering context + // --------------------------------------------------------------------------- + struct LowerCtx { + module: *Module, + scope: *Scope, + funcs: *HirFunc, + funcCount: int, + externFuncs: *HirFunc, + externCount: int, + varCounter: int, + tryCounter: int, + closureDepth: int, + currentClosureExpr: *Expr, + envInstanceName: String, + hm: *HirModule, + // Generic monomorphization + genFuncCount: int, + genFuncs: *Decl, + genStructCount: int, + genStructs: *Decl, + // Type substitution (active during generic instance lowering) + substParam0: String, + substArg0: String, + substParam1: String, + substArg1: String, + // Borrow checker state + checkedFunc: bool, + releaseFunc: bool, + // Pattern binding renames: source name → unique C local (shadowing-safe) + patMapCount: int, + patMapFrom0: String, + patMapTo0: String, + patMapFrom1: String, + patMapTo1: String, + patMapFrom2: String, + patMapTo2: String, + patMapFrom3: String, + patMapTo3: String, + patMapFrom4: String, + patMapTo4: String, + patMapFrom5: String, + patMapTo5: String, + patMapFrom6: String, + patMapTo6: String, + patMapFrom7: String, + patMapTo7: String, } - return ""; -} -func Lcx_PatPush(ctx: *LowerCtx, src: String, dst: String) { - if ctx.patMapCount >= 8 { return; } - let i: int = ctx.patMapCount; - if i == 0 { ctx.patMapFrom0 = src; ctx.patMapTo0 = dst; } - else if i == 1 { ctx.patMapFrom1 = src; ctx.patMapTo1 = dst; } - else if i == 2 { ctx.patMapFrom2 = src; ctx.patMapTo2 = dst; } - else if i == 3 { ctx.patMapFrom3 = src; ctx.patMapTo3 = dst; } - else if i == 4 { ctx.patMapFrom4 = src; ctx.patMapTo4 = dst; } - else if i == 5 { ctx.patMapFrom5 = src; ctx.patMapTo5 = dst; } - else if i == 6 { ctx.patMapFrom6 = src; ctx.patMapTo6 = dst; } - else if i == 7 { ctx.patMapFrom7 = src; ctx.patMapTo7 = dst; } - ctx.patMapCount = ctx.patMapCount + 1; -} + func Lcx_PatLookup(ctx: *LowerCtx, src: String) -> String { + // Most recent rename wins (scan from end) + var i: int = ctx.patMapCount - 1; + while i >= 0 { + var from: String = ""; + var to: String = ""; + if i == 0 { from = ctx.patMapFrom0; to = ctx.patMapTo0; } + else if i == 1 { from = ctx.patMapFrom1; to = ctx.patMapTo1; } + else if i == 2 { from = ctx.patMapFrom2; to = ctx.patMapTo2; } + else if i == 3 { from = ctx.patMapFrom3; to = ctx.patMapTo3; } + else if i == 4 { from = ctx.patMapFrom4; to = ctx.patMapTo4; } + else if i == 5 { from = ctx.patMapFrom5; to = ctx.patMapTo5; } + else if i == 6 { from = ctx.patMapFrom6; to = ctx.patMapTo6; } + else if i == 7 { from = ctx.patMapFrom7; to = ctx.patMapTo7; } + if String_Eq(from, src) { return to; } + i = i - 1; + } + return ""; + } -func Lcx_FreshPatName(ctx: *LowerCtx, src: String) -> String { - ctx.varCounter = ctx.varCounter + 1; - var safe: String = src; - if String_Eq(src, "") || String_Eq(src, "_") { safe = "x"; } - return String_Concat(String_Concat("__p", String_FromInt(ctx.varCounter as int64)), + func Lcx_PatPush(ctx: *LowerCtx, src: String, dst: String) { + if ctx.patMapCount >= 8 { return; } + let i: int = ctx.patMapCount; + if i == 0 { ctx.patMapFrom0 = src; ctx.patMapTo0 = dst; } + else if i == 1 { ctx.patMapFrom1 = src; ctx.patMapTo1 = dst; } + else if i == 2 { ctx.patMapFrom2 = src; ctx.patMapTo2 = dst; } + else if i == 3 { ctx.patMapFrom3 = src; ctx.patMapTo3 = dst; } + else if i == 4 { ctx.patMapFrom4 = src; ctx.patMapTo4 = dst; } + else if i == 5 { ctx.patMapFrom5 = src; ctx.patMapTo5 = dst; } + else if i == 6 { ctx.patMapFrom6 = src; ctx.patMapTo6 = dst; } + else if i == 7 { ctx.patMapFrom7 = src; ctx.patMapTo7 = dst; } + ctx.patMapCount = ctx.patMapCount + 1; + } + + func Lcx_FreshPatName(ctx: *LowerCtx, src: String) -> String { + ctx.varCounter = ctx.varCounter + 1; + var safe: String = src; + if String_Eq(src, "") || String_Eq(src, "_") { safe = "x"; } + return String_Concat(String_Concat("__p", String_FromInt(ctx.varCounter as int64)), String_Concat("_", safe)); -} + } -// Alloca unique C local + store + scope define + rename map for pattern binding. -func Lcx_BindPatIdent(ctx: *LowerCtx, src: String, ty: String, value: *HirNode, - line: uint32, col: uint32) -> *HirNode { - if String_Eq(src, "") || String_Eq(src, "_") { return null as *HirNode; } - let cName: String = Lcx_FreshPatName(ctx, src); - Lcx_PatPush(ctx, src, cName); - let alloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - alloca.kind = hAlloca; - alloca.line = line; - alloca.column = col; - alloca.strValue = cName; - alloca.typeName = ty; - let store: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - store.kind = hStore; - store.line = line; - store.column = col; - let v: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - v.kind = hVar; - v.strValue = cName; - store.child1 = v; - store.child2 = value; - alloca.child3 = store; - var bsym: Symbol; - bsym.kind = skVar; - bsym.name = src; - bsym.typeKind = tyInt; - bsym.typeName = ty; - bsym.refType = null as *TypeExpr; - bsym.isMutable = false; - bsym.isPublic = false; - bsym.decl = null as *Decl; - discard Scope_Define(ctx.scope, bsym); - return alloca; -} + // Alloca unique C local + store + scope define + rename map for pattern binding. + func Lcx_BindPatIdent(ctx: *LowerCtx, src: String, ty: String, value: *HirNode, + line: uint32, col: uint32) -> *HirNode { + if String_Eq(src, "") || String_Eq(src, "_") { return null as *HirNode; } + let cName: String = Lcx_FreshPatName(ctx, src); + Lcx_PatPush(ctx, src, cName); + let alloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + alloca.kind = hAlloca; + alloca.line = line; + alloca.column = col; + alloca.strValue = cName; + alloca.typeName = ty; + let store: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + store.kind = hStore; + store.line = line; + store.column = col; + let v: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + v.kind = hVar; + v.strValue = cName; + store.child1 = v; + store.child2 = value; + alloca.child3 = store; + var bsym: Symbol; + bsym.kind = skVar; + bsym.name = src; + bsym.typeKind = tyInt; + bsym.typeName = ty; + bsym.refType = null as *TypeExpr; + bsym.isMutable = false; + bsym.isPublic = false; + bsym.decl = null as *Decl; + discard Scope_Define(ctx.scope, bsym); + return alloca; + } -// --------------------------------------------------------------------------- -// TypeExpr.kind → Type.kind resolver -// TypeExpr.kind values (0-5) overlap with Type.kind values — this -// resolves the correct Type.kind for codegen. -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // TypeExpr.kind → Type.kind resolver + // TypeExpr.kind values (0-5) overlap with Type.kind values — this + // resolves the correct Type.kind for codegen. + // --------------------------------------------------------------------------- -func Lcx_ResolveTypeKindFromName(name: String) -> int { - return Type_FromName(name); -} + func Lcx_ResolveTypeKindFromName(name: String) -> int { + return Type_FromName(name); + } -func Lcx_TypeKindToName(kind: int) -> String { - if kind == tyVoid { return "void"; } - if kind == tyBool || kind == tyBool8 || kind == tyBool16 || kind == tyBool32 { return "bool"; } - if kind == tyChar8 { return "char"; } - if kind == tyChar16 { return "uint16"; } - if kind == tyChar32 { return "uint32"; } - if kind == tyStr { return "String"; } - if kind == tyInt8 { return "int8"; } - if kind == tyInt16 { return "int16"; } - if kind == tyInt32 { return "int32"; } - if kind == tyInt64 { return "int64"; } - if kind == tyInt { return "int"; } - if kind == tyUInt8 { return "uint8"; } - if kind == tyUInt16 { return "uint16"; } - if kind == tyUInt32 { return "uint32"; } - if kind == tyUInt64 { return "uint64"; } - if kind == tyUInt { return "uint"; } - if kind == tyFloat32 { return "float32"; } - if kind == tyFloat64 { return "float64"; } - if kind == tyPointer { return "void*"; } - return "int"; -} + func Lcx_TypeKindToName(kind: int) -> String { + if kind == tyVoid { return "void"; } + if kind == tyBool || kind == tyBool8 || kind == tyBool16 || kind == tyBool32 { return "bool"; } + if kind == tyChar8 { return "char"; } + if kind == tyChar16 { return "uint16"; } + if kind == tyChar32 { return "uint32"; } + if kind == tyStr { return "String"; } + if kind == tyInt8 { return "int8"; } + if kind == tyInt16 { return "int16"; } + if kind == tyInt32 { return "int32"; } + if kind == tyInt64 { return "int64"; } + if kind == tyInt { return "int"; } + if kind == tyUInt8 { return "uint8"; } + if kind == tyUInt16 { return "uint16"; } + if kind == tyUInt32 { return "uint32"; } + if kind == tyUInt64 { return "uint64"; } + if kind == tyUInt { return "uint"; } + if kind == tyFloat32 { return "float32"; } + if kind == tyFloat64 { return "float64"; } + if kind == tyPointer { return "void*"; } + return "int"; + } -func Lcx_ResolveTypeKind(te: *TypeExpr) -> int { - if te == null as *TypeExpr { return tyUnknown; } + func Lcx_ResolveTypeKind(te: *TypeExpr) -> int { + if te == null as *TypeExpr { return tyUnknown; } - if te.kind == tekPointer || te.kind == tekRef || te.kind == tekMutRef { return tyPointer; } - if te.kind == tekSlice { return tySlice; } - if te.kind == tekTuple { return tyNamed; /* Tuple_T_U is a C struct */ } - if te.kind == tekFunc { return tyFunc; } + if te.kind == tekPointer || te.kind == tekRef || te.kind == tekMutRef { return tyPointer; } + if te.kind == tekSlice { return tySlice; } + if te.kind == tekTuple { return tyNamed; /* Tuple_T_U is a C struct */ } + if te.kind == tekFunc { return tyFunc; } - return Lcx_ResolveTypeKindFromName(te.typeName); -} + return Lcx_ResolveTypeKindFromName(te.typeName); + } -// --------------------------------------------------------------------------- -// Type substitution for generic monomorphization -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Type substitution for generic monomorphization + // --------------------------------------------------------------------------- -func Lcx_SubstituteType(ctx: *LowerCtx, te: *TypeExpr) -> *TypeExpr { - if te == null as *TypeExpr { return te; } + func Lcx_SubstituteType(ctx: *LowerCtx, te: *TypeExpr) -> *TypeExpr { + if te == null as *TypeExpr { return te; } - // Generic named type with type args: check if concrete or parametric - if te.kind == tekNamed && te.typeArgCount > 0 { - let genStruct: *Decl = Lcx_FindGenericStruct(ctx, te.typeName); - if genStruct != null as *Decl { - // Check if type args are the struct's own type params (parametric) - var isParametric: bool = false; - if te.typeArgCount > 0 && String_Eq(te.typeArgName0, genStruct.typeParam0) { isParametric = true; } - if te.typeArgCount > 1 && String_Eq(te.typeArgName1, genStruct.typeParam1) { isParametric = true; } + // Generic named type with type args: check if concrete or parametric + if te.kind == tekNamed && te.typeArgCount > 0 { + let genStruct: *Decl = Lcx_FindGenericStruct(ctx, te.typeName); + if genStruct != null as *Decl { + // Check if type args are the struct's own type params (parametric) + var isParametric: bool = false; + if te.typeArgCount > 0 && String_Eq(te.typeArgName0, genStruct.typeParam0) { isParametric = true; } + if te.typeArgCount > 1 && String_Eq(te.typeArgName1, genStruct.typeParam1) { isParametric = true; } - // If parametric and NOT inside a generic instantiation, keep as generic (don't mangle) - if isParametric && String_Eq(ctx.substParam0, "") && String_Eq(ctx.substParam1, "") { - return te; + // If parametric and NOT inside a generic instantiation, keep as generic (don't mangle) + if isParametric && String_Eq(ctx.substParam0, "") && String_Eq(ctx.substParam1, "") { + return te; + } + + // Otherwise: substitute active type params and mangle to concrete name + let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + r.kind = tekNamed; + r.line = te.line; + r.column = te.column; + r.typeArgCount = te.typeArgCount; + r.typeArgName0 = te.typeArgName0; + r.typeArgName1 = te.typeArgName1; + if String_Eq(r.typeArgName0, ctx.substParam0) { r.typeArgName0 = ctx.substArg0; } + if String_Eq(r.typeArgName0, ctx.substParam1) { r.typeArgName0 = ctx.substArg1; } + if String_Eq(r.typeArgName1, ctx.substParam0) { r.typeArgName1 = ctx.substArg0; } + if String_Eq(r.typeArgName1, ctx.substParam1) { r.typeArgName1 = ctx.substArg1; } + r.typeName = Lcx_MangleName(te.typeName, r.typeArgName0, r.typeArgName1, te.typeArgCount); + Lcx_GenerateStructInstance(ctx, genStruct, r.typeArgName0, r.typeArgName1, te.typeArgCount); + return r; } + } - // Otherwise: substitute active type params and mangle to concrete name + // Named type that is a type parameter (only when in instance mode) + if te.kind == tekNamed { + if String_Eq(te.typeName, ctx.substParam0) { + let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + r.kind = tekNamed; + r.typeName = ctx.substArg0; + r.line = te.line; + r.column = te.column; + return r; + } + if String_Eq(te.typeName, ctx.substParam1) { + let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + r.kind = tekNamed; + r.typeName = ctx.substArg1; + r.line = te.line; + r.column = te.column; + return r; + } + } + + // Pointer type: substitute recursively + if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - r.kind = tekNamed; + r.kind = tekPointer; + r.pointerPointee = Lcx_SubstituteType(ctx, te.pointerPointee); + if r.pointerPointee != null as *TypeExpr && !String_Eq(r.pointerPointee.typeName, "") { + r.typeName = String_Concat(r.pointerPointee.typeName, "*"); + } r.line = te.line; r.column = te.column; - r.typeArgCount = te.typeArgCount; - r.typeArgName0 = te.typeArgName0; - r.typeArgName1 = te.typeArgName1; - if String_Eq(r.typeArgName0, ctx.substParam0) { r.typeArgName0 = ctx.substArg0; } - if String_Eq(r.typeArgName0, ctx.substParam1) { r.typeArgName0 = ctx.substArg1; } - if String_Eq(r.typeArgName1, ctx.substParam0) { r.typeArgName1 = ctx.substArg0; } - if String_Eq(r.typeArgName1, ctx.substParam1) { r.typeArgName1 = ctx.substArg1; } - r.typeName = Lcx_MangleName(te.typeName, r.typeArgName0, r.typeArgName1, te.typeArgCount); - Lcx_GenerateStructInstance(ctx, genStruct, r.typeArgName0, r.typeArgName1, te.typeArgCount); return r; } + + // Fat function type: func(T)->U — substitute params and return + if te.kind == tekFunc { + let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + r.kind = tekFunc; + r.line = te.line; + r.column = te.column; + r.funcParamCount = te.funcParamCount; + r.funcRet = Lcx_SubstituteType(ctx, te.funcRet); + var head: *TypeExprList = null as *TypeExprList; + var tail: *TypeExprList = null as *TypeExprList; + var cur: *TypeExprList = te.funcParams; + while cur != null as *TypeExprList { + let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; + node.te = Lcx_SubstituteType(ctx, cur.te); + node.next = null as *TypeExprList; + if head == null as *TypeExprList { + head = node; + tail = node; + } else { + tail.next = node; + tail = node; + } + cur = cur.next; + } + r.funcParams = head; + r.typeName = Lcx_BuildFuncTypeName(r); + return r; + } + + return te; } - // Named type that is a type parameter (only when in instance mode) - if te.kind == tekNamed { - if String_Eq(te.typeName, ctx.substParam0) { - let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - r.kind = tekNamed; - r.typeName = ctx.substArg0; - r.line = te.line; - r.column = te.column; - return r; + // Sanitize a C type fragment for use inside BuxFn_* mangled names + func Lcx_SanitizeFatPart(s: String) -> String { + var r: String = s; + if String_Eq(r, "String") || String_Eq(r, "str") || String_Eq(r, "const char*") { + return "cstr"; } - if String_Eq(te.typeName, ctx.substParam1) { - let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - r.kind = tekNamed; - r.typeName = ctx.substArg1; - r.line = te.line; - r.column = te.column; - return r; - } - } - - // Pointer type: substitute recursively - if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { - let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - r.kind = tekPointer; - r.pointerPointee = Lcx_SubstituteType(ctx, te.pointerPointee); - if r.pointerPointee != null as *TypeExpr && !String_Eq(r.pointerPointee.typeName, "") { - r.typeName = String_Concat(r.pointerPointee.typeName, "*"); - } - r.line = te.line; - r.column = te.column; + if String_Eq(r, "unsigned int") { return "uint"; } + // crude replacements for * and spaces + r = String_ReplaceAll(r, "*", "Ptr"); + r = String_ReplaceAll(r, " ", "_"); + r = String_ReplaceAll(r, "(", ""); + r = String_ReplaceAll(r, ")", ""); + r = String_ReplaceAll(r, ",", "_"); + if String_Eq(r, "") { return "int"; } return r; } - // Fat function type: func(T)->U — substitute params and return - if te.kind == tekFunc { - let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - r.kind = tekFunc; - r.line = te.line; - r.column = te.column; - r.funcParamCount = te.funcParamCount; - r.funcRet = Lcx_SubstituteType(ctx, te.funcRet); - var head: *TypeExprList = null as *TypeExprList; - var tail: *TypeExprList = null as *TypeExprList; + func Lcx_TypeExprFatPart(te: *TypeExpr) -> String { + if te == null as *TypeExpr { return "void"; } + if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { + return Lcx_SanitizeFatPart(String_Concat(te.pointerPointee.typeName, "Ptr")); + } + if te.kind == tekFunc { + return Lcx_SanitizeFatPart(Lcx_BuildFuncTypeName(te)); + } + var n: String = te.typeName; + if String_Eq(n, "") { n = "int"; } + return Lcx_SanitizeFatPart(n); + } + + // Fat function-pointer type name: BuxFn___... + // Enables multi-instance closures (code + env). + func Lcx_BuildFuncTypeName(te: *TypeExpr) -> String { + if te == null as *TypeExpr || te.kind != tekFunc { + return "BuxFn_void_void"; + } + var retPart: String = "void"; + if te.funcRet != null as *TypeExpr { + retPart = Lcx_TypeExprFatPart(te.funcRet); + } + var result: String = String_Concat("BuxFn_", retPart); var cur: *TypeExprList = te.funcParams; + var anyParam: bool = false; while cur != null as *TypeExprList { - let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; - node.te = Lcx_SubstituteType(ctx, cur.te); - node.next = null as *TypeExprList; - if head == null as *TypeExprList { - head = node; - tail = node; - } else { - tail.next = node; - tail = node; - } + result = String_Concat(result, "_"); + result = String_Concat(result, Lcx_TypeExprFatPart(cur.te)); + anyParam = true; cur = cur.next; } - r.funcParams = head; - r.typeName = Lcx_BuildFuncTypeName(r); - return r; - } - - return te; -} - -// Sanitize a C type fragment for use inside BuxFn_* mangled names -func Lcx_SanitizeFatPart(s: String) -> String { - var r: String = s; - if String_Eq(r, "String") || String_Eq(r, "str") || String_Eq(r, "const char*") { - return "cstr"; - } - if String_Eq(r, "unsigned int") { return "uint"; } - // crude replacements for * and spaces - r = String_ReplaceAll(r, "*", "Ptr"); - r = String_ReplaceAll(r, " ", "_"); - r = String_ReplaceAll(r, "(", ""); - r = String_ReplaceAll(r, ")", ""); - r = String_ReplaceAll(r, ",", "_"); - if String_Eq(r, "") { return "int"; } - return r; -} - -func Lcx_TypeExprFatPart(te: *TypeExpr) -> String { - if te == null as *TypeExpr { return "void"; } - if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { - return Lcx_SanitizeFatPart(String_Concat(te.pointerPointee.typeName, "Ptr")); - } - if te.kind == tekFunc { - return Lcx_SanitizeFatPart(Lcx_BuildFuncTypeName(te)); - } - var n: String = te.typeName; - if String_Eq(n, "") { n = "int"; } - return Lcx_SanitizeFatPart(n); -} - -// Fat function-pointer type name: BuxFn___... -// Enables multi-instance closures (code + env). -func Lcx_BuildFuncTypeName(te: *TypeExpr) -> String { - if te == null as *TypeExpr || te.kind != tekFunc { - return "BuxFn_void_void"; - } - var retPart: String = "void"; - if te.funcRet != null as *TypeExpr { - retPart = Lcx_TypeExprFatPart(te.funcRet); - } - var result: String = String_Concat("BuxFn_", retPart); - var cur: *TypeExprList = te.funcParams; - var anyParam: bool = false; - while cur != null as *TypeExprList { - result = String_Concat(result, "_"); - result = String_Concat(result, Lcx_TypeExprFatPart(cur.te)); - anyParam = true; - cur = cur.next; - } - if !anyParam { - result = String_Concat(result, "_void"); - } - return result; -} - -// --------------------------------------------------------------------------- -// Generic monomorphization helpers -// --------------------------------------------------------------------------- - -func Lcx_FindGenericFunc(ctx: *LowerCtx, name: String) -> *Decl { - var i: int = 0; - while i < ctx.genFuncCount { - if String_Eq(ctx.genFuncs[i].strValue, name) { - return &ctx.genFuncs[i]; - } - i = i + 1; - } - return null as *Decl; -} - -func Lcx_FindGenericStruct(ctx: *LowerCtx, name: String) -> *Decl { - var i: int = 0; - while i < ctx.genStructCount { - if String_Eq(ctx.genStructs[i].strValue, name) { - return &ctx.genStructs[i]; - } - i = i + 1; - } - return null as *Decl; -} - -// Extract element type from mangled collection name: Array_int → int, Iter_String → String -func Lcx_ExtractElemFromName(typeName: String) -> String { - if String_Eq(typeName, "") { return ""; } - let len: uint = bux_strlen(typeName); - // "Array_" prefix (6 chars) - if len > 6 { - let p: String = bux_str_slice(typeName, 0, 6); - if String_Eq(p, "Array_") { - return bux_str_slice(typeName, 6, len - 6); - } - } - // "Iter_" prefix (5 chars) - if len > 5 { - let p: String = bux_str_slice(typeName, 0, 5); - if String_Eq(p, "Iter_") { - return bux_str_slice(typeName, 5, len - 5); - } - } - return ""; -} - -func Lcx_MangleName(base: String, typeArg0: String, typeArg1: String, typeArgCount: int) -> String { - let r: String = String_Concat(base, "_"); - r = String_Concat(r, typeArg0); - if typeArgCount > 1 && !String_Eq(typeArg1, "") { - r = String_Concat(r, "_"); - r = String_Concat(r, typeArg1); - } - return r; -} - -func Lcx_GenerateStructInstance(ctx: *LowerCtx, genDecl: *Decl, typeArg0: String, typeArg1: String, typeArgCount: int) -> String { - if String_Eq(genDecl.strValue, "") { return ""; } - let mangled: String = Lcx_MangleName(genDecl.strValue, typeArg0, typeArg1, typeArgCount); - - // Check if already generated (linear search in hm.structs) - var i: int = 0; - while i < ctx.hm.structCount { - if String_Eq(ctx.hm.structs[i].name, mangled) { - return mangled; - } - i = i + 1; - } - - // Save old substitution - let oldParam0: String = ctx.substParam0; - let oldArg0: String = ctx.substArg0; - let oldParam1: String = ctx.substParam1; - let oldArg1: String = ctx.substArg1; - - ctx.substParam0 = genDecl.typeParam0; - ctx.substArg0 = typeArg0; - ctx.substParam1 = genDecl.typeParam1; - ctx.substArg1 = typeArg1; - - // Generate concrete HirStruct with substituted field types - // Reserve the slot BEFORE processing fields so nested generic instantiations - // get their own distinct indices and cannot overwrite our slot. - let si: int = ctx.hm.structCount; - ctx.hm.structCount = ctx.hm.structCount + 1; - ctx.hm.structs[si].name = mangled; - ctx.hm.structs[si].fieldCount = genDecl.fieldCount; - ctx.hm.structs[si].fields = bux_alloc(genDecl.fieldCount as uint * sizeof(HirStructField)) as *HirStructField; - var fi: int = 0; - while fi < genDecl.fieldCount { - let fname: String = genDecl.fields[fi].name; - let ftype: *TypeExpr = genDecl.fields[fi].refFieldType; - ctx.hm.structs[si].fields[fi].name = fname; - if ftype != null as *TypeExpr { - let subTe: *TypeExpr = Lcx_SubstituteType(ctx, ftype); - if subTe.kind == tekPointer && subTe.pointerPointee != null as *TypeExpr { - if !String_Eq(subTe.pointerPointee.typeName, "") { - ctx.hm.structs[si].fields[fi].typeName = String_Concat(subTe.pointerPointee.typeName, "*"); - } - } else if !String_Eq(subTe.typeName, "") { - ctx.hm.structs[si].fields[fi].typeName = subTe.typeName; - } - } - fi = fi + 1; - } - - // Restore old substitution - ctx.substParam0 = oldParam0; - ctx.substArg0 = oldArg0; - ctx.substParam1 = oldParam1; - ctx.substArg1 = oldArg1; - - return mangled; -} - -func Lcx_GenerateFuncInstance(ctx: *LowerCtx, genDecl: *Decl, typeArg0: String, typeArg1: String, typeArgCount: int) -> String { - let mangled: String = Lcx_MangleName(genDecl.strValue, typeArg0, typeArg1, typeArgCount); - - // Check if already generated (linear search in ctx.funcs) - var i: int = 0; - while i < ctx.funcCount { - if String_Eq(ctx.funcs[i].name, mangled) { - return mangled; - } - i = i + 1; - } - - // Save old substitution - let oldParam0: String = ctx.substParam0; - let oldArg0: String = ctx.substArg0; - let oldParam1: String = ctx.substParam1; - let oldArg1: String = ctx.substArg1; - - // Set up substitution - ctx.substParam0 = genDecl.typeParam0; - ctx.substArg0 = typeArg0; - ctx.substParam1 = genDecl.typeParam1; - ctx.substArg1 = typeArg1; - - // Lower the generic function with substitution active - let f: *HirFunc = Lcx_LowerFunc(ctx, genDecl); - f.name = mangled; - - // Add to module - ctx.funcs[ctx.funcCount] = *f; - ctx.funcCount = ctx.funcCount + 1; - - // Restore old substitution - ctx.substParam0 = oldParam0; - ctx.substArg0 = oldArg0; - ctx.substParam1 = oldParam1; - ctx.substArg1 = oldArg1; - - return mangled; -} - -// Strip type-arg suffix from a mangled generic instance name. -// E.g. ("Box_int", "int", "", 1) -> "Box"; ("Pair_int_String", "int", "String", 2) -> "Pair". -func Lcx_StripTypeArgs(typeName: String, typeArg0: String, typeArg1: String, typeArgCount: int) -> String { - var suffix: String = "_"; - suffix = String_Concat(suffix, typeArg0); - if typeArgCount > 1 && !String_Eq(typeArg1, "") { - suffix = String_Concat(suffix, "_"); - suffix = String_Concat(suffix, typeArg1); - } - let fullLen: int = bux_strlen(typeName) as int; - let suffixLen: int = bux_strlen(suffix) as int; - if fullLen > suffixLen { - let endPart: String = bux_str_slice(typeName, (fullLen - suffixLen) as uint, suffixLen as uint); - if String_Eq(endPart, suffix) { - return bux_str_slice(typeName, 0, (fullLen - suffixLen) as uint); - } - } - return typeName; -} - -// --------------------------------------------------------------------------- -// Array type helpers for bounds-checking desugaring -// --------------------------------------------------------------------------- - -func Lcx_IsArrayTypeExpr(te: *TypeExpr) -> bool { - if te == null as *TypeExpr { return false; } - if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { - te = te.pointerPointee; - } - if te.kind == tekNamed { - if String_Eq(te.typeName, "Array") { return true; } - let name: String = te.typeName; - if name[0] as int == 65 && name[1] as int == 114 && name[2] as int == 114 && name[3] as int == 97 && name[4] as int == 121 && name[5] as int == 95 { - return true; - } - } - return false; -} - -func Lcx_GetArrayElemType(te: *TypeExpr) -> String { - if te == null as *TypeExpr { return ""; } - if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { - te = te.pointerPointee; - } - if te.kind == tekNamed { - if String_Eq(te.typeName, "Array") && te.typeArgCount > 0 { - return te.typeArgName0; - } - let name: String = te.typeName; - if name[0] as int == 65 && name[1] as int == 114 && name[2] as int == 114 && name[3] as int == 97 && name[4] as int == 121 && name[5] as int == 95 { - let prefixLen: uint = 6; - let totalLen: uint = bux_strlen(name); - if totalLen > prefixLen { - return bux_str_slice(name, prefixLen, totalLen - prefixLen); - } - } - } - return ""; -} - -// --------------------------------------------------------------------------- -// Match lowering helpers -// --------------------------------------------------------------------------- - -func Lcx_EnumHasData(ctx: *LowerCtx, enumName: String) -> bool { - if String_Eq(enumName, "") { return false; } - let sym: Symbol = Scope_Lookup(ctx.scope, enumName); - if sym.decl == null as *Decl || sym.decl.kind != dkEnum { return false; } - if sym.decl.variantCount > 0 && sym.decl.variant0.fieldCount > 0 { return true; } - if sym.decl.variantCount > 1 && sym.decl.variant1.fieldCount > 0 { return true; } - if sym.decl.variantCount > 2 && sym.decl.variant2.fieldCount > 0 { return true; } - if sym.decl.variantCount > 3 && sym.decl.variant3.fieldCount > 0 { return true; } - if sym.decl.variantCount > 4 && sym.decl.variant4.fieldCount > 0 { return true; } - if sym.decl.variantCount > 5 && sym.decl.variant5.fieldCount > 0 { return true; } - if sym.decl.variantCount > 6 && sym.decl.variant6.fieldCount > 0 { return true; } - if sym.decl.variantCount > 7 && sym.decl.variant7.fieldCount > 0 { return true; } - if sym.decl.variantCount > 8 && sym.decl.variant8.fieldCount > 0 { return true; } - return false; -} - -func Lcx_MakeLitHir(litKind: int, litText: String, line: uint32, col: uint32) -> *HirNode { - let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - n.kind = hLit; - n.line = line; - n.column = col; - n.intValue = litKind; - n.strValue = litText; - return n; -} - -func Lcx_MakeBinHir(op: int, left: *HirNode, right: *HirNode, line: uint32, col: uint32) -> *HirNode { - let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - n.kind = hBinary; - n.line = line; - n.column = col; - n.intValue = op; - n.child1 = left; - n.child2 = right; - return n; -} - -func Lcx_MakeTrueHir(line: uint32, col: uint32) -> *HirNode { - return Lcx_MakeLitHir(tkBoolLiteral, "true", line, col); -} - -// Build condition HirNode for a match pattern. Returns null = always-true. -func Lcx_PatternCond(ctx: *LowerCtx, subject: *HirNode, pat: *Pattern, - subjectEnumName: String, subjectHasData: bool, - line: uint32, col: uint32) -> *HirNode { - if pat == null as *Pattern { return null as *HirNode; } - let kind: int = pat.kind; - - // Guarded: condition is only the inner pattern; guard applied after binds - if kind == pkGuarded { - return Lcx_PatternCond(ctx, subject, pat.patChild1, subjectEnumName, subjectHasData, line, col); - } - - if kind == pkWildcard || kind == pkIdent { - return null as *HirNode; - } - - if kind == pkLiteral { - let lit: *HirNode = Lcx_MakeLitHir(pat.patLitKind, pat.patLitText, line, col); - return Lcx_MakeBinHir(tkEq, subject, lit, line, col); - } - - if kind == pkRange { - let loPat: *Pattern = pat.patChild1; - let hiPat: *Pattern = pat.patChild2; - if loPat == null as *Pattern || hiPat == null as *Pattern { return null as *HirNode; } - if loPat.kind != pkLiteral || hiPat.kind != pkLiteral { return null as *HirNode; } - let lo: *HirNode = Lcx_MakeLitHir(loPat.patLitKind, loPat.patLitText, line, col); - let hi: *HirNode = Lcx_MakeLitHir(hiPat.patLitKind, hiPat.patLitText, line, col); - let loOk: *HirNode = Lcx_MakeBinHir(tkGe, subject, lo, line, col); - var hiOp: int = tkLt; - if pat.patRangeInclusive { hiOp = tkLe; } - let hiOk: *HirNode = Lcx_MakeBinHir(hiOp, subject, hi, line, col); - return Lcx_MakeBinHir(tkAmpAmp, loOk, hiOk, line, col); - } - - if kind == pkEnum { - let path: String = pat.patEnumPath; - // path is "Enum::Variant" or just "Variant" - var enumName: String = ""; - var variantName: String = path; - if String_Contains(path, "::") { - enumName = String_SplitPart(path, "::", 0); - variantName = String_SplitPart(path, "::", 1); - } - let tagName: String = String_Concat(String_Concat(enumName, "_"), variantName); - // Prefer subject enum name when path is full - var useEnum: String = enumName; - if String_Eq(useEnum, "") { useEnum = subjectEnumName; } - let fullTag: String = String_Concat(String_Concat(useEnum, "_"), variantName); - - if subjectHasData && (String_Eq(enumName, subjectEnumName) || String_Eq(enumName, "")) { - // Algebraic: subject.tag == Enum_Variant - let tagPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tagPtr.kind = hFieldPtr; - tagPtr.line = line; - tagPtr.column = col; - tagPtr.strValue = "tag"; - tagPtr.child1 = subject; - let tagLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tagLoad.kind = hLoad; - tagLoad.line = line; - tagLoad.column = col; - tagLoad.child1 = tagPtr; - let tagConst: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tagConst.kind = hVar; - tagConst.line = line; - tagConst.column = col; - tagConst.strValue = fullTag; - return Lcx_MakeBinHir(tkEq, tagLoad, tagConst, line, col); - } else { - // Simple enum: subject == Enum_Variant - let tagConst: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tagConst.kind = hVar; - tagConst.line = line; - tagConst.column = col; - if !String_Eq(enumName, "") { - tagConst.strValue = fullTag; - } else { - tagConst.strValue = tagName; - } - return Lcx_MakeBinHir(tkEq, subject, tagConst, line, col); - } - } - - return null as *HirNode; -} - -// Emit binding stmts for pattern payload: Option::Some(value) → alloca value; value = subject.data.Some_0 -// Returns head of child3-linked list of HirNodes (may be null). -func Lcx_PatternBindings(ctx: *LowerCtx, subject: *HirNode, pat: *Pattern, - subjectEnumName: String, subjectHasData: bool, - line: uint32, col: uint32) -> *HirNode { - if pat == null as *Pattern { return null as *HirNode; } - // Guarded: bind from inner pattern - if pat.kind == pkGuarded { - return Lcx_PatternBindings(ctx, subject, pat.patChild1, subjectEnumName, subjectHasData, line, col); - } - if pat.kind == pkIdent { - let ty: String = "int"; - if subject != null as *HirNode && !String_Eq(subject.typeName, "") { - ty = subject.typeName; - } - return Lcx_BindPatIdent(ctx, pat.patIdent, ty, subject, line, col); - } - - // Tuple: (a, b) → a = subject._0; b = subject._1 - if pat.kind == pkTuple { - var head: *HirNode = null as *HirNode; - var tail: *HirNode = null as *HirNode; - var ei: int = 0; - var elem: *Pattern = pat.patArgs; - while elem != null as *Pattern { - if elem.kind == pkIdent && !String_Eq(elem.patIdent, "_") { - var fieldName: String = "_0"; - if ei == 1 { fieldName = "_1"; } - else if ei == 2 { fieldName = "_2"; } - else if ei == 3 { fieldName = "_3"; } - else if ei > 3 { fieldName = String_Concat("_", String_FromInt(ei as int64)); } - let fPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - fPtr.kind = hFieldPtr; - fPtr.line = line; - fPtr.column = col; - fPtr.strValue = fieldName; - fPtr.child1 = subject; - let fLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - fLoad.kind = hLoad; - fLoad.line = line; - fLoad.column = col; - fLoad.child1 = fPtr; - fLoad.typeName = "int"; - let bound: *HirNode = Lcx_BindPatIdent(ctx, elem.patIdent, "int", fLoad, line, col); - if bound != null as *HirNode { - if head == null as *HirNode { - head = bound; - tail = bound; - while tail.child3 != null as *HirNode { tail = tail.child3; } - } else { - tail.child3 = bound; - while tail.child3 != null as *HirNode { tail = tail.child3; } - } - } - } - elem = elem.patNext; - ei = ei + 1; - } - return head; - } - - // Struct: Point { x: a } → a = subject.x - if pat.kind == pkStruct { - var head: *HirNode = null as *HirNode; - var tail: *HirNode = null as *HirNode; - var field: *Pattern = pat.patArgs; - while field != null as *Pattern { - if field.kind == pkIdent && !String_Eq(field.patIdent, "_") { - var fname: String = field.patFieldName; - if String_Eq(fname, "") { fname = field.patIdent; } - let fPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - fPtr.kind = hFieldPtr; - fPtr.line = line; - fPtr.column = col; - fPtr.strValue = fname; - fPtr.child1 = subject; - let fLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - fLoad.kind = hLoad; - fLoad.line = line; - fLoad.column = col; - fLoad.child1 = fPtr; - fLoad.typeName = "int"; - let bound: *HirNode = Lcx_BindPatIdent(ctx, field.patIdent, "int", fLoad, line, col); - if bound != null as *HirNode { - if head == null as *HirNode { - head = bound; - tail = bound; - while tail.child3 != null as *HirNode { tail = tail.child3; } - } else { - tail.child3 = bound; - while tail.child3 != null as *HirNode { tail = tail.child3; } - } - } - } - field = field.patNext; - } - return head; - } - - if pat.kind != pkEnum || !subjectHasData { return null as *HirNode; } - - var enumName: String = ""; - var variantName: String = pat.patEnumPath; - if String_Contains(pat.patEnumPath, "::") { - enumName = String_SplitPart(pat.patEnumPath, "::", 0); - variantName = String_SplitPart(pat.patEnumPath, "::", 1); - } else { - enumName = subjectEnumName; - } - if String_Eq(enumName, "") || String_Eq(variantName, "") { return null as *HirNode; } - - // Look up field type names from enum decl - var fieldType0: String = "int"; - var fieldType1: String = "int"; - var fieldCount: int = 0; - let enumSym: Symbol = Scope_Lookup(ctx.scope, enumName); - if enumSym.decl != null as *Decl && enumSym.decl.kind == dkEnum { - var vi: int = 0; - while vi < enumSym.decl.variantCount { - var vv: *EnumVariant = null as *EnumVariant; - if vi == 0 { vv = &enumSym.decl.variant0; } - else if vi == 1 { vv = &enumSym.decl.variant1; } - else if vi == 2 { vv = &enumSym.decl.variant2; } - else if vi == 3 { vv = &enumSym.decl.variant3; } - else if vi == 4 { vv = &enumSym.decl.variant4; } - else if vi == 5 { vv = &enumSym.decl.variant5; } - else if vi == 6 { vv = &enumSym.decl.variant6; } - else if vi == 7 { vv = &enumSym.decl.variant7; } - else if vi == 8 { vv = &enumSym.decl.variant8; } - if vv != null as *EnumVariant && String_Eq(vv.name, variantName) { - fieldCount = vv.fieldCount; - if !String_Eq(vv.fieldTypeName0, "") { fieldType0 = vv.fieldTypeName0; } - if !String_Eq(vv.fieldTypeName1, "") { fieldType1 = vv.fieldTypeName1; } - } - vi = vi + 1; - } - } - - // dataLoad = subject.data - let dataPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - dataPtr.kind = hFieldPtr; - dataPtr.line = line; - dataPtr.column = col; - dataPtr.strValue = "data"; - dataPtr.child1 = subject; - let dataLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - dataLoad.kind = hLoad; - dataLoad.line = line; - dataLoad.column = col; - dataLoad.child1 = dataPtr; - dataLoad.typeName = String_Concat(enumName, "_Data"); - - // Multi-field: nested struct data.Variant (anonymous or Enum_Variant_Payload); - // single-field: flat data.Variant_0 - var payloadBase: *HirNode = dataLoad; - if fieldCount > 1 { - let nestedName: String = String_Concat(String_Concat(enumName, "_"), - String_Concat(variantName, "_Payload")); - let vPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - vPtr.kind = hFieldPtr; - vPtr.line = line; - vPtr.column = col; - vPtr.strValue = variantName; - vPtr.child1 = dataLoad; - let vLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - vLoad.kind = hLoad; - vLoad.line = line; - vLoad.column = col; - vLoad.child1 = vPtr; - vLoad.typeName = nestedName; - payloadBase = vLoad; - } - - var head: *HirNode = null as *HirNode; - var tail: *HirNode = null as *HirNode; - var arg: *Pattern = pat.patArgs; - var ai: int = 0; - while arg != null as *Pattern { - var ftype: String = "int"; - if ai == 0 { ftype = fieldType0; } - else if ai == 1 { ftype = fieldType1; } - let fieldName: String = String_Concat(String_Concat(variantName, "_"), String_FromInt(ai as int64)); - - let fPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - fPtr.kind = hFieldPtr; - fPtr.line = line; - fPtr.column = col; - fPtr.strValue = fieldName; - fPtr.child1 = payloadBase; - let fLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - fLoad.kind = hLoad; - fLoad.line = line; - fLoad.column = col; - fLoad.child1 = fPtr; - fLoad.typeName = ftype; - - if arg.kind == pkIdent && !String_Eq(arg.patIdent, "_") { - let bound: *HirNode = Lcx_BindPatIdent(ctx, arg.patIdent, ftype, fLoad, line, col); - if bound != null as *HirNode { - if head == null as *HirNode { - head = bound; - tail = bound; - while tail.child3 != null as *HirNode { tail = tail.child3; } - } else { - tail.child3 = bound; - while tail.child3 != null as *HirNode { tail = tail.child3; } - } - } - } else if arg.kind == pkTuple || arg.kind == pkStruct || arg.kind == pkEnum { - // Nested pattern on payload field - let nested: *HirNode = Lcx_PatternBindings(ctx, fLoad, arg, subjectEnumName, subjectHasData, line, col); - if nested != null as *HirNode { - if head == null as *HirNode { - head = nested; - tail = nested; - while tail.child3 != null as *HirNode { tail = tail.child3; } - } else { - tail.child3 = nested; - while tail.child3 != null as *HirNode { tail = tail.child3; } - } - } - } - arg = arg.patNext; - ai = ai + 1; - } - return head; -} - -// True when n is a multi-stmt yield block (match result, etc.) -func Lcx_IsMatchYield(n: *HirNode) -> bool { - if n == null as *HirNode { return false; } - if n.kind != hBlock { return false; } - // strValue must be a real temp name — null/"" is a plain statement block - if n.strValue == null as String { return false; } - return !String_Eq(n.strValue, ""); -} - -func Lcx_YieldVarOf(n: *HirNode) -> *HirNode { - let v: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - v.kind = hVar; - v.strValue = n.strValue; - v.typeName = n.typeName; - return v; -} - -// Append `node` at the end of a child3-linked chain starting at `head` (or its child1 if head is hBlock). -func Lcx_AppendToChain(head: *HirNode, node: *HirNode) { - if head == null as *HirNode || node == null as *HirNode { return; } - var cur: *HirNode = head; - if head.kind == hBlock && head.child1 != null as *HirNode { - cur = head.child1; - } - while cur.child3 != null as *HirNode { - cur = cur.child3; - } - cur.child3 = node; -} - -// Lower match expr → sequential ifs with a found flag (no shared HIR DAG). -// Each arm: if (!found) { if (cond) { binds; if (guard) { result=body; found=true; } } } -// Guards see pattern bindings. Supports pkGuarded (`p if cond`). -func Lcx_LowerMatch(ctx: *LowerCtx, expr: *Expr) -> *HirNode { - let line: uint32 = expr.line; - let col: uint32 = expr.column; - let subject: *HirNode = Lcx_LowerExpr(ctx, expr.child1); - - ctx.varCounter = ctx.varCounter + 1; - let resultName: String = String_Concat("__match_", String_FromInt(ctx.varCounter as int64)); - ctx.varCounter = ctx.varCounter + 1; - let foundName: String = String_Concat("__found_", String_FromInt(ctx.varCounter as int64)); - - // Result type from sema refType, default int - var typeName: String = "int"; - if expr.refType != null as *TypeExpr && !String_Eq(expr.refType.typeName, "") { - typeName = expr.refType.typeName; - } - - // Subject enum info - var subjectEnumName: String = ""; - var subjectHasData: bool = false; - if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { - if expr.child1.refType.kind == tekNamed { - subjectEnumName = expr.child1.refType.typeName; - subjectHasData = Lcx_EnumHasData(ctx, subjectEnumName); - } - } - - // Alloca result + found flag - let allocaNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - allocaNode.kind = hAlloca; - allocaNode.line = line; - allocaNode.column = col; - allocaNode.strValue = resultName; - allocaNode.typeName = typeName; - - let foundAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - foundAlloca.kind = hAlloca; - foundAlloca.line = line; - foundAlloca.column = col; - foundAlloca.strValue = foundName; - foundAlloca.typeName = "bool"; - allocaNode.child3 = foundAlloca; - - let foundInit: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - foundInit.kind = hStore; - foundInit.line = line; - foundInit.column = col; - let foundVar0: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - foundVar0.kind = hVar; - foundVar0.strValue = foundName; - foundInit.child1 = foundVar0; - foundInit.child2 = Lcx_MakeLitHir(tkBoolLiteral, "false", line, col); - foundAlloca.child3 = foundInit; - - // Chain of arm ifs (forward order), linked via child3 - var tail: *HirNode = foundInit; - var cur: *MatchArm = expr.matchArms; - while cur != null as *MatchArm { - // Snapshot rename map so this arm's bindings don't leak to later arms - let savedMapCount: int = ctx.patMapCount; - var bindPat: *Pattern = cur.pattern; - var guardExpr: *Expr = null as *Expr; - if cur.pattern != null as *Pattern && cur.pattern.kind == pkGuarded { - bindPat = cur.pattern.patChild1; - guardExpr = cur.pattern.patGuardExpr; - } - // Bindings before guard/body so renames are active and allocas precede uses - let bindHead: *HirNode = Lcx_PatternBindings(ctx, subject, bindPat, subjectEnumName, subjectHasData, line, col); - var guardHirEarly: *HirNode = null as *HirNode; - if guardExpr != null as *Expr { - guardHirEarly = Lcx_LowerExpr(ctx, guardExpr); - } - let bodyHir: *HirNode = Lcx_LowerExpr(ctx, cur.body); - // Pop this arm's renames (nested matches already restored themselves) - ctx.patMapCount = savedMapCount; - - // store result = body - let storeNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - storeNode.kind = hStore; - storeNode.line = line; - storeNode.column = col; - let resVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - resVar.kind = hVar; - resVar.strValue = resultName; - storeNode.child1 = resVar; - var bodyPrefix: *HirNode = null as *HirNode; - if Lcx_IsMatchYield(bodyHir) { - storeNode.child2 = Lcx_YieldVarOf(bodyHir); - bodyHir.strValue = ""; - bodyPrefix = bodyHir.child1; - } else { - storeNode.child2 = bodyHir; - } - - // found = true - let foundSet: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - foundSet.kind = hStore; - foundSet.line = line; - foundSet.column = col; - let foundVar1: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - foundVar1.kind = hVar; - foundVar1.strValue = foundName; - foundSet.child1 = foundVar1; - foundSet.child2 = Lcx_MakeLitHir(tkBoolLiteral, "true", line, col); - storeNode.child3 = foundSet; - - // success block: bodyPrefix → store → found=true - let successBlock: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - successBlock.kind = hBlock; - successBlock.line = line; - successBlock.column = col; - if bodyPrefix != null as *HirNode { - successBlock.child1 = bodyPrefix; - var sbt: *HirNode = bodyPrefix; - while sbt.child3 != null as *HirNode { sbt = sbt.child3; } - sbt.child3 = storeNode; - } else { - successBlock.child1 = storeNode; - } - - // Optional guard wraps success (already lowered with renames active) - var afterBinds: *HirNode = successBlock; - if guardHirEarly != null as *HirNode { - let guardIf: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - guardIf.kind = hIf; - guardIf.line = line; - guardIf.column = col; - guardIf.child1 = guardHirEarly; - guardIf.child2 = successBlock; - afterBinds = guardIf; - } - - // armInner: binds → afterBinds - let armInner: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - armInner.kind = hBlock; - armInner.line = line; - armInner.column = col; - if bindHead != null as *HirNode { - armInner.child1 = bindHead; - var ibt: *HirNode = bindHead; - while ibt.child3 != null as *HirNode { ibt = ibt.child3; } - ibt.child3 = afterBinds; - } else { - armInner.child1 = afterBinds; - } - - // Optional pattern condition - let cond: *HirNode = Lcx_PatternCond(ctx, subject, bindPat, subjectEnumName, subjectHasData, line, col); - var armBody: *HirNode = armInner; - if cond != null as *HirNode { - let condIf: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - condIf.kind = hIf; - condIf.line = line; - condIf.column = col; - condIf.child1 = cond; - condIf.child2 = armInner; - armBody = condIf; - } - - // if (!found) armBody - let foundLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - foundLoad.kind = hVar; - foundLoad.strValue = foundName; - foundLoad.typeName = "bool"; - let notFound: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - notFound.kind = hUnary; - notFound.line = line; - notFound.column = col; - notFound.intValue = tkBang; - notFound.child1 = foundLoad; - - let tryIf: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tryIf.kind = hIf; - tryIf.line = line; - tryIf.column = col; - tryIf.child1 = notFound; - tryIf.child2 = armBody; - - tail.child3 = tryIf; - tail = tryIf; - cur = cur.next; - } - - let block: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - block.kind = hBlock; - block.line = line; - block.column = col; - block.child1 = allocaNode; - // Yield marker: strValue = result var name for last-expr return / let init - block.strValue = resultName; - block.typeName = typeName; - return block; -} - -// --------------------------------------------------------------------------- -// Expression lowering -// --------------------------------------------------------------------------- - -func Lcx_LowerExpr(ctx: *LowerCtx, expr: *Expr) -> *HirNode { - if expr == null as *Expr { return null as *HirNode; } - - let line: uint32 = expr.line; - let col: uint32 = expr.column; - let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - n.kind = hBlock; - n.line = line; - n.column = col; - - let kind: int = expr.kind; - - // Match expression - if kind == ekMatch { - return Lcx_LowerMatch(ctx, expr); - } - - // String interpolation: desugar to String_Concat + String_FromInt/Bool/Float - // Parts in callArgs are interleaved text lits and expressions. - if kind == ekStringInterp { - var result: *HirNode = null as *HirNode; - var part: *ExprList = expr.callArgs; - while part != null as *ExprList { - let pe: *Expr = part.expr; - var piece: *HirNode = null as *HirNode; - if pe != null as *Expr && pe.kind == ekLiteral && pe.tokKind == tkStringLiteral { - piece = Lcx_LowerExpr(ctx, pe); - } else { - let lowered: *HirNode = Lcx_LowerExpr(ctx, pe); - // Convert non-string to String - var needConv: bool = true; - var convName: String = "String_FromInt"; - if pe != null as *Expr && pe.refType != null as *TypeExpr { - let tn: String = pe.refType.typeName; - if String_Eq(tn, "String") || String_Eq(tn, "str") { - needConv = false; - } else if String_Eq(tn, "bool") { - convName = "String_FromBool"; - } else if String_Eq(tn, "float64") || String_Eq(tn, "float") || String_Eq(tn, "float32") { - convName = "String_FromFloat"; - } else { - convName = "String_FromInt"; - } - } - if needConv { - let callN: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - callN.kind = hCall; - callN.line = line; - callN.column = col; - callN.strValue = convName; - callN.child1 = lowered; - piece = callN; - } else { - piece = lowered; - } - } - if result == null as *HirNode { - result = piece; - } else { - let cat: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - cat.kind = hCall; - cat.line = line; - cat.column = col; - cat.strValue = "String_Concat"; - cat.child1 = result; - cat.child2 = piece; - result = cat; - } - part = part.next; - } - if result == null as *HirNode { - // empty f"" - let empty: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - empty.kind = hLit; - empty.line = line; - empty.column = col; - empty.intValue = tkStringLiteral; - empty.strValue = "\"\""; - return empty; + if !anyParam { + result = String_Concat(result, "_void"); } return result; } - // Literal - if kind == ekLiteral { + // --------------------------------------------------------------------------- + // Generic monomorphization helpers + // --------------------------------------------------------------------------- + + func Lcx_FindGenericFunc(ctx: *LowerCtx, name: String) -> *Decl { + var i: int = 0; + while i < ctx.genFuncCount { + if String_Eq(ctx.genFuncs[i].strValue, name) { + return &ctx.genFuncs[i]; + } + i = i + 1; + } + return null as *Decl; + } + + func Lcx_FindGenericStruct(ctx: *LowerCtx, name: String) -> *Decl { + var i: int = 0; + while i < ctx.genStructCount { + if String_Eq(ctx.genStructs[i].strValue, name) { + return &ctx.genStructs[i]; + } + i = i + 1; + } + return null as *Decl; + } + + // Extract element type from mangled collection name: Array_int → int, Iter_String → String + func Lcx_ExtractElemFromName(typeName: String) -> String { + if String_Eq(typeName, "") { return ""; } + let len: uint = bux_strlen(typeName); + // "Array_" prefix (6 chars) + if len > 6 { + let p: String = bux_str_slice(typeName, 0, 6); + if String_Eq(p, "Array_") { + return bux_str_slice(typeName, 6, len - 6); + } + } + // "Iter_" prefix (5 chars) + if len > 5 { + let p: String = bux_str_slice(typeName, 0, 5); + if String_Eq(p, "Iter_") { + return bux_str_slice(typeName, 5, len - 5); + } + } + return ""; + } + + func Lcx_MangleName(base: String, typeArg0: String, typeArg1: String, typeArgCount: int) -> String { + let r: String = String_Concat(base, "_"); + r = String_Concat(r, typeArg0); + if typeArgCount > 1 && !String_Eq(typeArg1, "") { + r = String_Concat(r, "_"); + r = String_Concat(r, typeArg1); + } + return r; + } + + func Lcx_GenerateStructInstance(ctx: *LowerCtx, genDecl: *Decl, typeArg0: String, typeArg1: String, typeArgCount: int) -> String { + if String_Eq(genDecl.strValue, "") { return ""; } + let mangled: String = Lcx_MangleName(genDecl.strValue, typeArg0, typeArg1, typeArgCount); + + // Check if already generated (linear search in hm.structs) + var i: int = 0; + while i < ctx.hm.structCount { + if String_Eq(ctx.hm.structs[i].name, mangled) { + return mangled; + } + i = i + 1; + } + + // Save old substitution + let oldParam0: String = ctx.substParam0; + let oldArg0: String = ctx.substArg0; + let oldParam1: String = ctx.substParam1; + let oldArg1: String = ctx.substArg1; + + ctx.substParam0 = genDecl.typeParam0; + ctx.substArg0 = typeArg0; + ctx.substParam1 = genDecl.typeParam1; + ctx.substArg1 = typeArg1; + + // Generate concrete HirStruct with substituted field types + // Reserve the slot BEFORE processing fields so nested generic instantiations + // get their own distinct indices and cannot overwrite our slot. + let si: int = ctx.hm.structCount; + ctx.hm.structCount = ctx.hm.structCount + 1; + ctx.hm.structs[si].name = mangled; + ctx.hm.structs[si].fieldCount = genDecl.fieldCount; + ctx.hm.structs[si].fields = bux_alloc(genDecl.fieldCount as uint * sizeof(HirStructField)) as *HirStructField; + var fi: int = 0; + while fi < genDecl.fieldCount { + let fname: String = genDecl.fields[fi].name; + let ftype: *TypeExpr = genDecl.fields[fi].refFieldType; + ctx.hm.structs[si].fields[fi].name = fname; + if ftype != null as *TypeExpr { + let subTe: *TypeExpr = Lcx_SubstituteType(ctx, ftype); + if subTe.kind == tekPointer && subTe.pointerPointee != null as *TypeExpr { + if !String_Eq(subTe.pointerPointee.typeName, "") { + ctx.hm.structs[si].fields[fi].typeName = String_Concat(subTe.pointerPointee.typeName, "*"); + } + } else if !String_Eq(subTe.typeName, "") { + ctx.hm.structs[si].fields[fi].typeName = subTe.typeName; + } + } + fi = fi + 1; + } + + // Restore old substitution + ctx.substParam0 = oldParam0; + ctx.substArg0 = oldArg0; + ctx.substParam1 = oldParam1; + ctx.substArg1 = oldArg1; + + return mangled; + } + + func Lcx_GenerateFuncInstance(ctx: *LowerCtx, genDecl: *Decl, typeArg0: String, typeArg1: String, typeArgCount: int) -> String { + let mangled: String = Lcx_MangleName(genDecl.strValue, typeArg0, typeArg1, typeArgCount); + + // Check if already generated (linear search in ctx.funcs) + var i: int = 0; + while i < ctx.funcCount { + if String_Eq(ctx.funcs[i].name, mangled) { + return mangled; + } + i = i + 1; + } + + // Save old substitution + let oldParam0: String = ctx.substParam0; + let oldArg0: String = ctx.substArg0; + let oldParam1: String = ctx.substParam1; + let oldArg1: String = ctx.substArg1; + + // Set up substitution + ctx.substParam0 = genDecl.typeParam0; + ctx.substArg0 = typeArg0; + ctx.substParam1 = genDecl.typeParam1; + ctx.substArg1 = typeArg1; + + // Lower the generic function with substitution active + let f: *HirFunc = Lcx_LowerFunc(ctx, genDecl); + f.name = mangled; + + // Add to module + ctx.funcs[ctx.funcCount] = *f; + ctx.funcCount = ctx.funcCount + 1; + + // Restore old substitution + ctx.substParam0 = oldParam0; + ctx.substArg0 = oldArg0; + ctx.substParam1 = oldParam1; + ctx.substArg1 = oldArg1; + + return mangled; + } + + // Strip type-arg suffix from a mangled generic instance name. + // E.g. ("Box_int", "int", "", 1) -> "Box"; ("Pair_int_String", "int", "String", 2) -> "Pair". + func Lcx_StripTypeArgs(typeName: String, typeArg0: String, typeArg1: String, typeArgCount: int) -> String { + var suffix: String = "_"; + suffix = String_Concat(suffix, typeArg0); + if typeArgCount > 1 && !String_Eq(typeArg1, "") { + suffix = String_Concat(suffix, "_"); + suffix = String_Concat(suffix, typeArg1); + } + let fullLen: int = bux_strlen(typeName) as int; + let suffixLen: int = bux_strlen(suffix) as int; + if fullLen > suffixLen { + let endPart: String = bux_str_slice(typeName, (fullLen - suffixLen) as uint, suffixLen as uint); + if String_Eq(endPart, suffix) { + return bux_str_slice(typeName, 0, (fullLen - suffixLen) as uint); + } + } + return typeName; + } + + // --------------------------------------------------------------------------- + // Array type helpers for bounds-checking desugaring + // --------------------------------------------------------------------------- + + func Lcx_IsArrayTypeExpr(te: *TypeExpr) -> bool { + if te == null as *TypeExpr { return false; } + if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { + te = te.pointerPointee; + } + if te.kind == tekNamed { + if String_Eq(te.typeName, "Array") { return true; } + let name: String = te.typeName; + if name[0] as int == 65 && name[1] as int == 114 && name[2] as int == 114 && name[3] as int == 97 && name[4] as int == 121 && name[5] as int == 95 { + return true; + } + } + return false; + } + + func Lcx_GetArrayElemType(te: *TypeExpr) -> String { + if te == null as *TypeExpr { return ""; } + if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { + te = te.pointerPointee; + } + if te.kind == tekNamed { + if String_Eq(te.typeName, "Array") && te.typeArgCount > 0 { + return te.typeArgName0; + } + let name: String = te.typeName; + if name[0] as int == 65 && name[1] as int == 114 && name[2] as int == 114 && name[3] as int == 97 && name[4] as int == 121 && name[5] as int == 95 { + let prefixLen: uint = 6; + let totalLen: uint = bux_strlen(name); + if totalLen > prefixLen { + return bux_str_slice(name, prefixLen, totalLen - prefixLen); + } + } + } + return ""; + } + + // --------------------------------------------------------------------------- + // Match lowering helpers + // --------------------------------------------------------------------------- + + func Lcx_EnumHasData(ctx: *LowerCtx, enumName: String) -> bool { + if String_Eq(enumName, "") { return false; } + let sym: Symbol = Scope_Lookup(ctx.scope, enumName); + if sym.decl == null as *Decl || sym.decl.kind != dkEnum { return false; } + if sym.decl.variantCount > 0 && sym.decl.variant0.fieldCount > 0 { return true; } + if sym.decl.variantCount > 1 && sym.decl.variant1.fieldCount > 0 { return true; } + if sym.decl.variantCount > 2 && sym.decl.variant2.fieldCount > 0 { return true; } + if sym.decl.variantCount > 3 && sym.decl.variant3.fieldCount > 0 { return true; } + if sym.decl.variantCount > 4 && sym.decl.variant4.fieldCount > 0 { return true; } + if sym.decl.variantCount > 5 && sym.decl.variant5.fieldCount > 0 { return true; } + if sym.decl.variantCount > 6 && sym.decl.variant6.fieldCount > 0 { return true; } + if sym.decl.variantCount > 7 && sym.decl.variant7.fieldCount > 0 { return true; } + if sym.decl.variantCount > 8 && sym.decl.variant8.fieldCount > 0 { return true; } + return false; + } + + func Lcx_MakeLitHir(litKind: int, litText: String, line: uint32, col: uint32) -> *HirNode { + let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; n.kind = hLit; - n.intValue = expr.tokKind; - n.strValue = expr.tokText; + n.line = line; + n.column = col; + n.intValue = litKind; + n.strValue = litText; return n; } - // Identifier → variable reference - if kind == ekIdent { - // Pattern binding rename: source name → unique C local - let ren: String = Lcx_PatLookup(ctx, expr.strValue); - if !String_Eq(ren, "") { + func Lcx_MakeBinHir(op: int, left: *HirNode, right: *HirNode, line: uint32, col: uint32) -> *HirNode { + let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + n.kind = hBinary; + n.line = line; + n.column = col; + n.intValue = op; + n.child1 = left; + n.child2 = right; + return n; + } + + func Lcx_MakeTrueHir(line: uint32, col: uint32) -> *HirNode { + return Lcx_MakeLitHir(tkBoolLiteral, "true", line, col); + } + + // Build condition HirNode for a match pattern. Returns null = always-true. + func Lcx_PatternCond(ctx: *LowerCtx, subject: *HirNode, pat: *Pattern, + subjectEnumName: String, subjectHasData: bool, + line: uint32, col: uint32) -> *HirNode { + if pat == null as *Pattern { return null as *HirNode; } + let kind: int = pat.kind; + + // Guarded: condition is only the inner pattern; guard applied after binds + if kind == pkGuarded { + return Lcx_PatternCond(ctx, subject, pat.patChild1, subjectEnumName, subjectHasData, line, col); + } + + if kind == pkWildcard || kind == pkIdent { + return null as *HirNode; + } + + if kind == pkLiteral { + let lit: *HirNode = Lcx_MakeLitHir(pat.patLitKind, pat.patLitText, line, col); + return Lcx_MakeBinHir(tkEq, subject, lit, line, col); + } + + if kind == pkRange { + let loPat: *Pattern = pat.patChild1; + let hiPat: *Pattern = pat.patChild2; + if loPat == null as *Pattern || hiPat == null as *Pattern { return null as *HirNode; } + if loPat.kind != pkLiteral || hiPat.kind != pkLiteral { return null as *HirNode; } + let lo: *HirNode = Lcx_MakeLitHir(loPat.patLitKind, loPat.patLitText, line, col); + let hi: *HirNode = Lcx_MakeLitHir(hiPat.patLitKind, hiPat.patLitText, line, col); + let loOk: *HirNode = Lcx_MakeBinHir(tkGe, subject, lo, line, col); + var hiOp: int = tkLt; + if pat.patRangeInclusive { hiOp = tkLe; } + let hiOk: *HirNode = Lcx_MakeBinHir(hiOp, subject, hi, line, col); + return Lcx_MakeBinHir(tkAmpAmp, loOk, hiOk, line, col); + } + + if kind == pkEnum { + let path: String = pat.patEnumPath; + // path is "Enum::Variant" or just "Variant" + var enumName: String = ""; + var variantName: String = path; + if String_Contains(path, "::") { + enumName = String_SplitPart(path, "::", 0); + variantName = String_SplitPart(path, "::", 1); + } + let tagName: String = String_Concat(String_Concat(enumName, "_"), variantName); + // Prefer subject enum name when path is full + var useEnum: String = enumName; + if String_Eq(useEnum, "") { useEnum = subjectEnumName; } + let fullTag: String = String_Concat(String_Concat(useEnum, "_"), variantName); + + if subjectHasData && (String_Eq(enumName, subjectEnumName) || String_Eq(enumName, "")) { + // Algebraic: subject.tag == Enum_Variant + let tagPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tagPtr.kind = hFieldPtr; + tagPtr.line = line; + tagPtr.column = col; + tagPtr.strValue = "tag"; + tagPtr.child1 = subject; + let tagLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tagLoad.kind = hLoad; + tagLoad.line = line; + tagLoad.column = col; + tagLoad.child1 = tagPtr; + let tagConst: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tagConst.kind = hVar; + tagConst.line = line; + tagConst.column = col; + tagConst.strValue = fullTag; + return Lcx_MakeBinHir(tkEq, tagLoad, tagConst, line, col); + } else { + // Simple enum: subject == Enum_Variant + let tagConst: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tagConst.kind = hVar; + tagConst.line = line; + tagConst.column = col; + if !String_Eq(enumName, "") { + tagConst.strValue = fullTag; + } else { + tagConst.strValue = tagName; + } + return Lcx_MakeBinHir(tkEq, subject, tagConst, line, col); + } + } + + return null as *HirNode; + } + + // Emit binding stmts for pattern payload: Option::Some(value) → alloca value; value = subject.data.Some_0 + // Returns head of child3-linked list of HirNodes (may be null). + func Lcx_PatternBindings(ctx: *LowerCtx, subject: *HirNode, pat: *Pattern, + subjectEnumName: String, subjectHasData: bool, + line: uint32, col: uint32) -> *HirNode { + if pat == null as *Pattern { return null as *HirNode; } + // Guarded: bind from inner pattern + if pat.kind == pkGuarded { + return Lcx_PatternBindings(ctx, subject, pat.patChild1, subjectEnumName, subjectHasData, line, col); + } + if pat.kind == pkIdent { + let ty: String = "int"; + if subject != null as *HirNode && !String_Eq(subject.typeName, "") { + ty = subject.typeName; + } + return Lcx_BindPatIdent(ctx, pat.patIdent, ty, subject, line, col); + } + + // Tuple: (a, b) → a = subject._0; b = subject._1 + if pat.kind == pkTuple { + var head: *HirNode = null as *HirNode; + var tail: *HirNode = null as *HirNode; + var ei: int = 0; + var elem: *Pattern = pat.patArgs; + while elem != null as *Pattern { + if elem.kind == pkIdent && !String_Eq(elem.patIdent, "_") { + var fieldName: String = "_0"; + if ei == 1 { fieldName = "_1"; } + else if ei == 2 { fieldName = "_2"; } + else if ei == 3 { fieldName = "_3"; } + else if ei > 3 { fieldName = String_Concat("_", String_FromInt(ei as int64)); } + let fPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + fPtr.kind = hFieldPtr; + fPtr.line = line; + fPtr.column = col; + fPtr.strValue = fieldName; + fPtr.child1 = subject; + let fLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + fLoad.kind = hLoad; + fLoad.line = line; + fLoad.column = col; + fLoad.child1 = fPtr; + fLoad.typeName = "int"; + let bound: *HirNode = Lcx_BindPatIdent(ctx, elem.patIdent, "int", fLoad, line, col); + if bound != null as *HirNode { + if head == null as *HirNode { + head = bound; + tail = bound; + while tail.child3 != null as *HirNode { tail = tail.child3; } + } else { + tail.child3 = bound; + while tail.child3 != null as *HirNode { tail = tail.child3; } + } + } + } + elem = elem.patNext; + ei = ei + 1; + } + return head; + } + + // Struct: Point { x: a } → a = subject.x + if pat.kind == pkStruct { + var head: *HirNode = null as *HirNode; + var tail: *HirNode = null as *HirNode; + var field: *Pattern = pat.patArgs; + while field != null as *Pattern { + if field.kind == pkIdent && !String_Eq(field.patIdent, "_") { + var fname: String = field.patFieldName; + if String_Eq(fname, "") { fname = field.patIdent; } + let fPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + fPtr.kind = hFieldPtr; + fPtr.line = line; + fPtr.column = col; + fPtr.strValue = fname; + fPtr.child1 = subject; + let fLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + fLoad.kind = hLoad; + fLoad.line = line; + fLoad.column = col; + fLoad.child1 = fPtr; + fLoad.typeName = "int"; + let bound: *HirNode = Lcx_BindPatIdent(ctx, field.patIdent, "int", fLoad, line, col); + if bound != null as *HirNode { + if head == null as *HirNode { + head = bound; + tail = bound; + while tail.child3 != null as *HirNode { tail = tail.child3; } + } else { + tail.child3 = bound; + while tail.child3 != null as *HirNode { tail = tail.child3; } + } + } + } + field = field.patNext; + } + return head; + } + + if pat.kind != pkEnum || !subjectHasData { return null as *HirNode; } + + var enumName: String = ""; + var variantName: String = pat.patEnumPath; + if String_Contains(pat.patEnumPath, "::") { + enumName = String_SplitPart(pat.patEnumPath, "::", 0); + variantName = String_SplitPart(pat.patEnumPath, "::", 1); + } else { + enumName = subjectEnumName; + } + if String_Eq(enumName, "") || String_Eq(variantName, "") { return null as *HirNode; } + + // Look up field type names from enum decl + var fieldType0: String = "int"; + var fieldType1: String = "int"; + var fieldCount: int = 0; + let enumSym: Symbol = Scope_Lookup(ctx.scope, enumName); + if enumSym.decl != null as *Decl && enumSym.decl.kind == dkEnum { + var vi: int = 0; + while vi < enumSym.decl.variantCount { + var vv: *EnumVariant = null as *EnumVariant; + if vi == 0 { vv = &enumSym.decl.variant0; } + else if vi == 1 { vv = &enumSym.decl.variant1; } + else if vi == 2 { vv = &enumSym.decl.variant2; } + else if vi == 3 { vv = &enumSym.decl.variant3; } + else if vi == 4 { vv = &enumSym.decl.variant4; } + else if vi == 5 { vv = &enumSym.decl.variant5; } + else if vi == 6 { vv = &enumSym.decl.variant6; } + else if vi == 7 { vv = &enumSym.decl.variant7; } + else if vi == 8 { vv = &enumSym.decl.variant8; } + if vv != null as *EnumVariant && String_Eq(vv.name, variantName) { + fieldCount = vv.fieldCount; + if !String_Eq(vv.fieldTypeName0, "") { fieldType0 = vv.fieldTypeName0; } + if !String_Eq(vv.fieldTypeName1, "") { fieldType1 = vv.fieldTypeName1; } + } + vi = vi + 1; + } + } + + // dataLoad = subject.data + let dataPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + dataPtr.kind = hFieldPtr; + dataPtr.line = line; + dataPtr.column = col; + dataPtr.strValue = "data"; + dataPtr.child1 = subject; + let dataLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + dataLoad.kind = hLoad; + dataLoad.line = line; + dataLoad.column = col; + dataLoad.child1 = dataPtr; + dataLoad.typeName = String_Concat(enumName, "_Data"); + + // Multi-field: nested struct data.Variant (anonymous or Enum_Variant_Payload); + // single-field: flat data.Variant_0 + var payloadBase: *HirNode = dataLoad; + if fieldCount > 1 { + let nestedName: String = String_Concat(String_Concat(enumName, "_"), + String_Concat(variantName, "_Payload")); + let vPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + vPtr.kind = hFieldPtr; + vPtr.line = line; + vPtr.column = col; + vPtr.strValue = variantName; + vPtr.child1 = dataLoad; + let vLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + vLoad.kind = hLoad; + vLoad.line = line; + vLoad.column = col; + vLoad.child1 = vPtr; + vLoad.typeName = nestedName; + payloadBase = vLoad; + } + + var head: *HirNode = null as *HirNode; + var tail: *HirNode = null as *HirNode; + var arg: *Pattern = pat.patArgs; + var ai: int = 0; + while arg != null as *Pattern { + var ftype: String = "int"; + if ai == 0 { ftype = fieldType0; } + else if ai == 1 { ftype = fieldType1; } + let fieldName: String = String_Concat(String_Concat(variantName, "_"), String_FromInt(ai as int64)); + + let fPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + fPtr.kind = hFieldPtr; + fPtr.line = line; + fPtr.column = col; + fPtr.strValue = fieldName; + fPtr.child1 = payloadBase; + let fLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + fLoad.kind = hLoad; + fLoad.line = line; + fLoad.column = col; + fLoad.child1 = fPtr; + fLoad.typeName = ftype; + + if arg.kind == pkIdent && !String_Eq(arg.patIdent, "_") { + let bound: *HirNode = Lcx_BindPatIdent(ctx, arg.patIdent, ftype, fLoad, line, col); + if bound != null as *HirNode { + if head == null as *HirNode { + head = bound; + tail = bound; + while tail.child3 != null as *HirNode { tail = tail.child3; } + } else { + tail.child3 = bound; + while tail.child3 != null as *HirNode { tail = tail.child3; } + } + } + } else if arg.kind == pkTuple || arg.kind == pkStruct || arg.kind == pkEnum { + // Nested pattern on payload field + let nested: *HirNode = Lcx_PatternBindings(ctx, fLoad, arg, subjectEnumName, subjectHasData, line, col); + if nested != null as *HirNode { + if head == null as *HirNode { + head = nested; + tail = nested; + while tail.child3 != null as *HirNode { tail = tail.child3; } + } else { + tail.child3 = nested; + while tail.child3 != null as *HirNode { tail = tail.child3; } + } + } + } + arg = arg.patNext; + ai = ai + 1; + } + return head; + } + + // True when n is a multi-stmt yield block (match result, etc.) + func Lcx_IsMatchYield(n: *HirNode) -> bool { + if n == null as *HirNode { return false; } + if n.kind != hBlock { return false; } + // strValue must be a real temp name — null/"" is a plain statement block + if n.strValue == null as String { return false; } + return !String_Eq(n.strValue, ""); + } + + func Lcx_YieldVarOf(n: *HirNode) -> *HirNode { + let v: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + v.kind = hVar; + v.strValue = n.strValue; + v.typeName = n.typeName; + return v; + } + + // Append `node` at the end of a child3-linked chain starting at `head` (or its child1 if head is hBlock). + func Lcx_AppendToChain(head: *HirNode, node: *HirNode) { + if head == null as *HirNode || node == null as *HirNode { return; } + var cur: *HirNode = head; + if head.kind == hBlock && head.child1 != null as *HirNode { + cur = head.child1; + } + while cur.child3 != null as *HirNode { + cur = cur.child3; + } + cur.child3 = node; + } + + // Lower match expr → sequential ifs with a found flag (no shared HIR DAG). + // Each arm: if (!found) { if (cond) { binds; if (guard) { result=body; found=true; } } } + // Guards see pattern bindings. Supports pkGuarded (`p if cond`). + func Lcx_LowerMatch(ctx: *LowerCtx, expr: *Expr) -> *HirNode { + let line: uint32 = expr.line; + let col: uint32 = expr.column; + let subject: *HirNode = Lcx_LowerExpr(ctx, expr.child1); + + ctx.varCounter = ctx.varCounter + 1; + let resultName: String = String_Concat("__match_", String_FromInt(ctx.varCounter as int64)); + ctx.varCounter = ctx.varCounter + 1; + let foundName: String = String_Concat("__found_", String_FromInt(ctx.varCounter as int64)); + + // Result type from sema refType, default int + var typeName: String = "int"; + if expr.refType != null as *TypeExpr && !String_Eq(expr.refType.typeName, "") { + typeName = expr.refType.typeName; + } + + // Subject enum info + var subjectEnumName: String = ""; + var subjectHasData: bool = false; + if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { + if expr.child1.refType.kind == tekNamed { + subjectEnumName = expr.child1.refType.typeName; + subjectHasData = Lcx_EnumHasData(ctx, subjectEnumName); + } + } + + // Alloca result + found flag + let allocaNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + allocaNode.kind = hAlloca; + allocaNode.line = line; + allocaNode.column = col; + allocaNode.strValue = resultName; + allocaNode.typeName = typeName; + + let foundAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + foundAlloca.kind = hAlloca; + foundAlloca.line = line; + foundAlloca.column = col; + foundAlloca.strValue = foundName; + foundAlloca.typeName = "bool"; + allocaNode.child3 = foundAlloca; + + let foundInit: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + foundInit.kind = hStore; + foundInit.line = line; + foundInit.column = col; + let foundVar0: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + foundVar0.kind = hVar; + foundVar0.strValue = foundName; + foundInit.child1 = foundVar0; + foundInit.child2 = Lcx_MakeLitHir(tkBoolLiteral, "false", line, col); + foundAlloca.child3 = foundInit; + + // Chain of arm ifs (forward order), linked via child3 + var tail: *HirNode = foundInit; + var cur: *MatchArm = expr.matchArms; + while cur != null as *MatchArm { + // Snapshot rename map so this arm's bindings don't leak to later arms + let savedMapCount: int = ctx.patMapCount; + var bindPat: *Pattern = cur.pattern; + var guardExpr: *Expr = null as *Expr; + if cur.pattern != null as *Pattern && cur.pattern.kind == pkGuarded { + bindPat = cur.pattern.patChild1; + guardExpr = cur.pattern.patGuardExpr; + } + // Bindings before guard/body so renames are active and allocas precede uses + let bindHead: *HirNode = Lcx_PatternBindings(ctx, subject, bindPat, subjectEnumName, subjectHasData, line, col); + var guardHirEarly: *HirNode = null as *HirNode; + if guardExpr != null as *Expr { + guardHirEarly = Lcx_LowerExpr(ctx, guardExpr); + } + let bodyHir: *HirNode = Lcx_LowerExpr(ctx, cur.body); + // Pop this arm's renames (nested matches already restored themselves) + ctx.patMapCount = savedMapCount; + + // store result = body + let storeNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + storeNode.kind = hStore; + storeNode.line = line; + storeNode.column = col; + let resVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + resVar.kind = hVar; + resVar.strValue = resultName; + storeNode.child1 = resVar; + var bodyPrefix: *HirNode = null as *HirNode; + if Lcx_IsMatchYield(bodyHir) { + storeNode.child2 = Lcx_YieldVarOf(bodyHir); + bodyHir.strValue = ""; + bodyPrefix = bodyHir.child1; + } else { + storeNode.child2 = bodyHir; + } + + // found = true + let foundSet: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + foundSet.kind = hStore; + foundSet.line = line; + foundSet.column = col; + let foundVar1: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + foundVar1.kind = hVar; + foundVar1.strValue = foundName; + foundSet.child1 = foundVar1; + foundSet.child2 = Lcx_MakeLitHir(tkBoolLiteral, "true", line, col); + storeNode.child3 = foundSet; + + // success block: bodyPrefix → store → found=true + let successBlock: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + successBlock.kind = hBlock; + successBlock.line = line; + successBlock.column = col; + if bodyPrefix != null as *HirNode { + successBlock.child1 = bodyPrefix; + var sbt: *HirNode = bodyPrefix; + while sbt.child3 != null as *HirNode { sbt = sbt.child3; } + sbt.child3 = storeNode; + } else { + successBlock.child1 = storeNode; + } + + // Optional guard wraps success (already lowered with renames active) + var afterBinds: *HirNode = successBlock; + if guardHirEarly != null as *HirNode { + let guardIf: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + guardIf.kind = hIf; + guardIf.line = line; + guardIf.column = col; + guardIf.child1 = guardHirEarly; + guardIf.child2 = successBlock; + afterBinds = guardIf; + } + + // armInner: binds → afterBinds + let armInner: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + armInner.kind = hBlock; + armInner.line = line; + armInner.column = col; + if bindHead != null as *HirNode { + armInner.child1 = bindHead; + var ibt: *HirNode = bindHead; + while ibt.child3 != null as *HirNode { ibt = ibt.child3; } + ibt.child3 = afterBinds; + } else { + armInner.child1 = afterBinds; + } + + // Optional pattern condition + let cond: *HirNode = Lcx_PatternCond(ctx, subject, bindPat, subjectEnumName, subjectHasData, line, col); + var armBody: *HirNode = armInner; + if cond != null as *HirNode { + let condIf: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + condIf.kind = hIf; + condIf.line = line; + condIf.column = col; + condIf.child1 = cond; + condIf.child2 = armInner; + armBody = condIf; + } + + // if (!found) armBody + let foundLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + foundLoad.kind = hVar; + foundLoad.strValue = foundName; + foundLoad.typeName = "bool"; + let notFound: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + notFound.kind = hUnary; + notFound.line = line; + notFound.column = col; + notFound.intValue = tkBang; + notFound.child1 = foundLoad; + + let tryIf: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tryIf.kind = hIf; + tryIf.line = line; + tryIf.column = col; + tryIf.child1 = notFound; + tryIf.child2 = armBody; + + tail.child3 = tryIf; + tail = tryIf; + cur = cur.next; + } + + let block: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + block.kind = hBlock; + block.line = line; + block.column = col; + block.child1 = allocaNode; + // Yield marker: strValue = result var name for last-expr return / let init + block.strValue = resultName; + block.typeName = typeName; + return block; + } + + // --------------------------------------------------------------------------- + // Expression lowering + // --------------------------------------------------------------------------- + + func Lcx_LowerExpr(ctx: *LowerCtx, expr: *Expr) -> *HirNode { + if expr == null as *Expr { return null as *HirNode; } + + let line: uint32 = expr.line; + let col: uint32 = expr.column; + let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + n.kind = hBlock; + n.line = line; + n.column = col; + + let kind: int = expr.kind; + + // Match expression + if kind == ekMatch { + return Lcx_LowerMatch(ctx, expr); + } + + // String interpolation: desugar to String_Concat + String_FromInt/Bool/Float + // Parts in callArgs are interleaved text lits and expressions. + if kind == ekStringInterp { + var result: *HirNode = null as *HirNode; + var part: *ExprList = expr.callArgs; + while part != null as *ExprList { + let pe: *Expr = part.expr; + var piece: *HirNode = null as *HirNode; + if pe != null as *Expr && pe.kind == ekLiteral && pe.tokKind == tkStringLiteral { + piece = Lcx_LowerExpr(ctx, pe); + } else { + let lowered: *HirNode = Lcx_LowerExpr(ctx, pe); + // Convert non-string to String + var needConv: bool = true; + var convName: String = "String_FromInt"; + if pe != null as *Expr && pe.refType != null as *TypeExpr { + let tn: String = pe.refType.typeName; + if String_Eq(tn, "String") || String_Eq(tn, "str") { + needConv = false; + } else if String_Eq(tn, "bool") { + convName = "String_FromBool"; + } else if String_Eq(tn, "float64") || String_Eq(tn, "float") || String_Eq(tn, "float32") { + convName = "String_FromFloat"; + } else { + convName = "String_FromInt"; + } + } + if needConv { + let callN: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + callN.kind = hCall; + callN.line = line; + callN.column = col; + callN.strValue = convName; + callN.child1 = lowered; + piece = callN; + } else { + piece = lowered; + } + } + if result == null as *HirNode { + result = piece; + } else { + let cat: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + cat.kind = hCall; + cat.line = line; + cat.column = col; + cat.strValue = "String_Concat"; + cat.child1 = result; + cat.child2 = piece; + result = cat; + } + part = part.next; + } + if result == null as *HirNode { + // empty f"" + let empty: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + empty.kind = hLit; + empty.line = line; + empty.column = col; + empty.intValue = tkStringLiteral; + empty.strValue = "\"\""; + return empty; + } + return result; + } + + // Literal + if kind == ekLiteral { + n.kind = hLit; + n.intValue = expr.tokKind; + n.strValue = expr.tokText; + return n; + } + + // Identifier → variable reference + if kind == ekIdent { + // Pattern binding rename: source name → unique C local + let ren: String = Lcx_PatLookup(ctx, expr.strValue); + if !String_Eq(ren, "") { + n.kind = hVar; + n.strValue = ren; + let rsym: Symbol = Scope_Lookup(ctx.scope, expr.strValue); + n.typeKind = rsym.typeKind; + if rsym.typeName != null as String && !String_Eq(rsym.typeName, "") { + n.typeName = rsym.typeName; + } + return n; + } + // Capture rewriting: if inside closure body and this ident is captured, + // emit field access on env instance instead of bare variable + if ctx.closureDepth > 0 && ctx.currentClosureExpr != null as *Expr && !String_Eq(ctx.envInstanceName, "") { + let capCount: int = ctx.currentClosureExpr.captureCount; + var ci: int = 0; + var isCaptured: bool = false; + var capType: int = 0; + while ci < capCount { + var capName: String = ""; + if ci == 0 { capName = ctx.currentClosureExpr.captureName0; capType = ctx.currentClosureExpr.captureType0; } + else if ci == 1 { capName = ctx.currentClosureExpr.captureName1; capType = ctx.currentClosureExpr.captureType1; } + else if ci == 2 { capName = ctx.currentClosureExpr.captureName2; capType = ctx.currentClosureExpr.captureType2; } + else if ci == 3 { capName = ctx.currentClosureExpr.captureName3; capType = ctx.currentClosureExpr.captureType3; } + else if ci == 4 { capName = ctx.currentClosureExpr.captureName4; capType = ctx.currentClosureExpr.captureType4; } + else if ci == 5 { capName = ctx.currentClosureExpr.captureName5; capType = ctx.currentClosureExpr.captureType5; } + else if ci == 6 { capName = ctx.currentClosureExpr.captureName6; capType = ctx.currentClosureExpr.captureType6; } + else if ci == 7 { capName = ctx.currentClosureExpr.captureName7; capType = ctx.currentClosureExpr.captureType7; } + if String_Eq(capName, expr.strValue) { + isCaptured = true; + } + ci = ci + 1; + } + if isCaptured { + n.kind = hFieldAccess; + n.strValue = expr.strValue; + let baseNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + baseNode.kind = hVar; + baseNode.strValue = ctx.envInstanceName; + n.child1 = baseNode; + n.typeKind = capType; + n.typeName = Lcx_TypeKindToName(capType); + return n; + } + } + let sym: Symbol = Scope_Lookup(ctx.scope, expr.strValue); + // Named function used as a value → fat pointer via __adapt_ wrapper + if sym.kind == skFunc { + var fatName: String = "BuxFn_int_int"; + if sym.refType != null as *TypeExpr && sym.refType.kind == tekFunc { + fatName = Lcx_BuildFuncTypeName(sym.refType); + } else if !String_Eq(sym.typeName, "") && String_StartsWith(sym.typeName, "BuxFn_") { + fatName = sym.typeName; + } + n.kind = hStructInit; + n.strValue = fatName; + n.typeKind = tyFunc; + n.typeName = fatName; + let codeField: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + codeField.kind = hBlock; + codeField.strValue = "code"; + let codeVal: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + codeVal.kind = hVar; + codeVal.strValue = String_Concat("__adapt_", expr.strValue); + codeField.child1 = codeVal; + let envField: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + envField.kind = hBlock; + envField.strValue = "env"; + let nullEnv: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + nullEnv.kind = hCast; + nullEnv.typeName = "void*"; + let zero: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + zero.kind = hLit; + zero.intValue = tkIntLiteral; + zero.strValue = "0"; + nullEnv.child1 = zero; + envField.child1 = nullEnv; + codeField.child3 = envField; + n.child1 = codeField; + return n; + } n.kind = hVar; - n.strValue = ren; - let rsym: Symbol = Scope_Lookup(ctx.scope, expr.strValue); - n.typeKind = rsym.typeKind; - if rsym.typeName != null as String && !String_Eq(rsym.typeName, "") { - n.typeName = rsym.typeName; + n.strValue = expr.strValue; + n.typeKind = sym.typeKind; + + if expr.refType != null as *TypeExpr { + n.typeName = expr.refType.typeName; + } + if sym.typeName != null as String && !String_Eq(sym.typeName, "") { + n.typeName = sym.typeName; } return n; } - // Capture rewriting: if inside closure body and this ident is captured, - // emit field access on env instance instead of bare variable - if ctx.closureDepth > 0 && ctx.currentClosureExpr != null as *Expr && !String_Eq(ctx.envInstanceName, "") { - let capCount: int = ctx.currentClosureExpr.captureCount; - var ci: int = 0; - var isCaptured: bool = false; - var capType: int = 0; - while ci < capCount { - var capName: String = ""; - if ci == 0 { capName = ctx.currentClosureExpr.captureName0; capType = ctx.currentClosureExpr.captureType0; } - else if ci == 1 { capName = ctx.currentClosureExpr.captureName1; capType = ctx.currentClosureExpr.captureType1; } - else if ci == 2 { capName = ctx.currentClosureExpr.captureName2; capType = ctx.currentClosureExpr.captureType2; } - else if ci == 3 { capName = ctx.currentClosureExpr.captureName3; capType = ctx.currentClosureExpr.captureType3; } - else if ci == 4 { capName = ctx.currentClosureExpr.captureName4; capType = ctx.currentClosureExpr.captureType4; } - else if ci == 5 { capName = ctx.currentClosureExpr.captureName5; capType = ctx.currentClosureExpr.captureType5; } - else if ci == 6 { capName = ctx.currentClosureExpr.captureName6; capType = ctx.currentClosureExpr.captureType6; } - else if ci == 7 { capName = ctx.currentClosureExpr.captureName7; capType = ctx.currentClosureExpr.captureType7; } - if String_Eq(capName, expr.strValue) { - isCaptured = true; - } - ci = ci + 1; + + // self → variable reference named "self" + if kind == ekSelf { + n.kind = hVar; + n.strValue = "self"; + let sym: Symbol = Scope_Lookup(ctx.scope, "self"); + n.typeKind = sym.typeKind; + if sym.typeName != null as String && !String_Eq(sym.typeName, "") { + n.typeName = sym.typeName; } - if isCaptured { - n.kind = hFieldAccess; - n.strValue = expr.strValue; - let baseNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - baseNode.kind = hVar; - baseNode.strValue = ctx.envInstanceName; - n.child1 = baseNode; - n.typeKind = capType; - n.typeName = Lcx_TypeKindToName(capType); + return n; + } + + // Binary + if kind == ekBinary { + // Assignment operator → use hAssign + if expr.intValue == tkAssign { + n.kind = hAssign; + n.child1 = Lcx_LowerExpr(ctx, expr.child1); + n.child2 = Lcx_LowerExpr(ctx, expr.child2); return n; } - } - let sym: Symbol = Scope_Lookup(ctx.scope, expr.strValue); - // Named function used as a value → fat pointer via __adapt_ wrapper - if sym.kind == skFunc { - var fatName: String = "BuxFn_int_int"; - if sym.refType != null as *TypeExpr && sym.refType.kind == tekFunc { - fatName = Lcx_BuildFuncTypeName(sym.refType); - } else if !String_Eq(sym.typeName, "") && String_StartsWith(sym.typeName, "BuxFn_") { - fatName = sym.typeName; + + // Operator overloading: try method call + var opMethodName: String = ""; + if expr.intValue == tkPlus { opMethodName = "operator_add"; } + else if expr.intValue == tkMinus { opMethodName = "operator_sub"; } + else if expr.intValue == tkStar { opMethodName = "operator_mul"; } + else if expr.intValue == tkSlash { opMethodName = "operator_div"; } + else if expr.intValue == tkPercent { opMethodName = "operator_mod"; } + else if expr.intValue == tkEq { opMethodName = "operator_eq"; } + else if expr.intValue == tkNe { opMethodName = "operator_ne"; } + else if expr.intValue == tkLt { opMethodName = "operator_lt"; } + else if expr.intValue == tkLe { opMethodName = "operator_le"; } + else if expr.intValue == tkGt { opMethodName = "operator_gt"; } + else if expr.intValue == tkGe { opMethodName = "operator_ge"; } + else if expr.intValue == tkAmp { opMethodName = "operator_bitand"; } + else if expr.intValue == tkPipe { opMethodName = "operator_bitor"; } + else if expr.intValue == tkCaret { opMethodName = "operator_xor"; } + else if expr.intValue == tkShl { opMethodName = "operator_shl"; } + else if expr.intValue == tkShr { opMethodName = "operator_shr"; } + + if !String_Eq(opMethodName, "") { + var receiverTypeName: String = ""; + if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { + let refTe: *TypeExpr = expr.child1.refType; + if refTe.kind == tekNamed { + if refTe.typeName != null as String { receiverTypeName = refTe.typeName; } + } else if refTe.kind == tekPointer && refTe.pointerPointee != null as *TypeExpr && refTe.pointerPointee.kind == tekNamed { + if refTe.pointerPointee.typeName != null as String { + receiverTypeName = refTe.pointerPointee.typeName; + } + } + } + // Note: String_Eq(null, "") is false — must also reject null type names + if receiverTypeName != null as String && !String_Eq(receiverTypeName, "") { + let funcName: String = String_Concat(String_Concat(receiverTypeName, "_"), opMethodName); + let sym: Symbol = Scope_Lookup(ctx.scope, funcName); + if sym.kind == skFunc && sym.decl != null as *Decl { + n.kind = hCall; + n.strValue = funcName; + let recv: *HirNode = Lcx_LowerExpr(ctx, expr.child1); + // If method expects pointer/reference but receiver is a value, add & + if sym.decl.paramCount > 0 && sym.decl.param0.refParamType != null as *TypeExpr { + let paramKind: int = sym.decl.param0.refParamType.kind; + if paramKind == tekPointer || paramKind == tekRef || paramKind == tekMutRef { + if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind != tekPointer && expr.child1.refType.kind != tekRef && expr.child1.refType.kind != tekMutRef { + let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrNode.kind = hUnary; + addrNode.intValue = tkAmp; + addrNode.child1 = recv; + n.child1 = addrNode; + } else { + n.child1 = recv; + } + } else { + n.child1 = recv; + } + } else { + n.child1 = recv; + } + n.child2 = Lcx_LowerExpr(ctx, expr.child2); + return n; + } + } } + + // Overflow checking: in @[Checked] mode, lower +, -, * on signed integers to checked calls + if ctx.checkedFunc && !ctx.releaseFunc { + var opKind: int = expr.intValue; + var isArithOp: bool = opKind == tkPlus || opKind == tkMinus || opKind == tkStar; + var isSignedInt: bool = false; + if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { + let lhsKind: int = Lcx_ResolveTypeKind(expr.child1.refType); + isSignedInt = Type_IsSigned(lhsKind); + } + if isArithOp && isSignedInt { + var checkedFunc: String = ""; + if opKind == tkPlus { checkedFunc = "bux_add_i64_checked"; } + else if opKind == tkMinus { checkedFunc = "bux_sub_i64_checked"; } + else if opKind == tkStar { checkedFunc = "bux_mul_i64_checked"; } + if !String_Eq(checkedFunc, "") { + n.kind = hCall; + n.strValue = checkedFunc; + n.child1 = Lcx_LowerExpr(ctx, expr.child1); + n.child2 = Lcx_LowerExpr(ctx, expr.child2); + return n; + } + } + } + + n.kind = hBinary; + n.intValue = expr.intValue; // operator + let leftHir: *HirNode = Lcx_LowerExpr(ctx, expr.child1); + let rightHir: *HirNode = Lcx_LowerExpr(ctx, expr.child2); + // If either side is a match yield block, expand to: + // match stmts...; int __binop_N = leftVal op rightVal; yield __binop_N + if Lcx_IsMatchYield(leftHir) || Lcx_IsMatchYield(rightHir) { + ctx.varCounter = ctx.varCounter + 1; + let tmpName: String = String_Concat("__binop_", String_FromInt(ctx.varCounter as int64)); + var leftVal: *HirNode = leftHir; + var rightVal: *HirNode = rightHir; + let outer: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + outer.kind = hBlock; + outer.line = line; + outer.column = col; + outer.strValue = tmpName; + outer.typeName = "int"; + var first: *HirNode = null as *HirNode; + if Lcx_IsMatchYield(leftHir) { + leftVal = Lcx_YieldVarOf(leftHir); + leftHir.strValue = ""; + first = leftHir; + } + if Lcx_IsMatchYield(rightHir) { + rightVal = Lcx_YieldVarOf(rightHir); + rightHir.strValue = ""; + if first == null as *HirNode { + first = rightHir; + } else { + Lcx_AppendToChain(first, rightHir); + } + } + let tmpAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tmpAlloca.kind = hAlloca; + tmpAlloca.line = line; + tmpAlloca.column = col; + tmpAlloca.strValue = tmpName; + tmpAlloca.typeName = "int"; + let binNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + binNode.kind = hBinary; + binNode.line = line; + binNode.column = col; + binNode.intValue = expr.intValue; + binNode.child1 = leftVal; + binNode.child2 = rightVal; + let tmpStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tmpStore.kind = hStore; + tmpStore.line = line; + tmpStore.column = col; + let tmpVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tmpVar.kind = hVar; + tmpVar.strValue = tmpName; + tmpStore.child1 = tmpVar; + tmpStore.child2 = binNode; + tmpAlloca.child3 = tmpStore; + if first == null as *HirNode { + outer.child1 = tmpAlloca; + } else { + outer.child1 = first; + Lcx_AppendToChain(first, tmpAlloca); + } + return outer; + } + n.child1 = leftHir; + n.child2 = rightHir; + return n; + } + + // Unary + if kind == ekUnary { + // Overflow checking: in @[Checked] mode, lower negation on signed integers to checked call + if ctx.checkedFunc && !ctx.releaseFunc && expr.intValue == tkMinus { + var isSignedInt: bool = false; + if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { + let operandKind: int = Lcx_ResolveTypeKind(expr.child1.refType); + isSignedInt = Type_IsSigned(operandKind); + } + if isSignedInt { + n.kind = hCall; + n.strValue = "bux_neg_i64_checked"; + n.child1 = Lcx_LowerExpr(ctx, expr.child1); + return n; + } + } + n.kind = hUnary; + n.intValue = expr.intValue; + n.child1 = Lcx_LowerExpr(ctx, expr.child1); + if expr.intValue == tkAmp { + n.typeKind = tyPointer; + if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind == tekFunc { + n.typeName = Lcx_BuildFuncTypeName(expr.child1.refType); + } + } + return n; + } + + // Call + if kind == ekCall { + // Method call desugaring: obj.method(args) → Type_method(obj, args) + if expr.child1 != null as *Expr && expr.child1.kind == ekField { + n.kind = hCall; + let methodName: String = expr.child1.strValue; + var receiverTypeName: String = ""; + var receiverRefType: *TypeExpr = null as *TypeExpr; + if expr.child1.child1 != null as *Expr && expr.child1.child1.kind == ekIdent { + let sym: Symbol = Scope_Lookup(ctx.scope, expr.child1.child1.strValue); + receiverTypeName = sym.typeName; + receiverRefType = sym.refType; + } + if String_Eq(receiverTypeName, "") && expr.child1.child1 != null as *Expr && expr.child1.child1.refType != null as *TypeExpr { + receiverTypeName = expr.child1.child1.refType.typeName; + receiverRefType = expr.child1.child1.refType; + } + + var methodDecl: *Decl = null as *Decl; + if !String_Eq(receiverTypeName, "") { + // Strip trailing '*' from pointer type names (e.g. "Box*" → "Box") + var baseName: String = receiverTypeName; + let len: int = bux_strlen(baseName) as int; + if len > 0 { + let lastChar: String = bux_str_slice(baseName, (len - 1) as uint, 1); + if String_Eq(lastChar, "*") { + baseName = bux_str_slice(baseName, 0, (len - 1) as uint); + } + } + n.strValue = String_Concat(baseName, "_"); + n.strValue = String_Concat(n.strValue, methodName); + + // Generic method monomorphization: Box_Get on Box -> Box_Get_int + var genericRecvType: *TypeExpr = receiverRefType; + if genericRecvType != null as *TypeExpr && genericRecvType.kind == tekPointer && genericRecvType.pointerPointee != null as *TypeExpr { + genericRecvType = genericRecvType.pointerPointee; + } + if genericRecvType != null as *TypeExpr && genericRecvType.typeArgCount > 0 { + let baseTypeName: String = Lcx_StripTypeArgs(genericRecvType.typeName, genericRecvType.typeArgName0, genericRecvType.typeArgName1, genericRecvType.typeArgCount); + let baseMethodName: String = String_Concat(String_Concat(baseTypeName, "_"), methodName); + let genDecl: *Decl = Lcx_FindGenericFunc(ctx, baseMethodName); + if genDecl != null as *Decl { + let mangled: String = Lcx_GenerateFuncInstance(ctx, genDecl, genericRecvType.typeArgName0, genericRecvType.typeArgName1, genericRecvType.typeArgCount); + n.strValue = mangled; + methodDecl = genDecl; + } + } + } + // Lower receiver as first argument + let recv: *HirNode = Lcx_LowerExpr(ctx, expr.child1.child1); + // Find method decl if not already found (non-generic case) + if methodDecl == null as *Decl { + let sym: Symbol = Scope_Lookup(ctx.scope, n.strValue); + if sym.kind == skFunc && sym.decl != null as *Decl { + methodDecl = sym.decl; + } + } + // Auto-address if method expects pointer/reference but receiver is a value + if methodDecl != null as *Decl && methodDecl.paramCount > 0 && methodDecl.param0.refParamType != null as *TypeExpr { + let paramKind: int = methodDecl.param0.refParamType.kind; + if paramKind == tekPointer || paramKind == tekRef || paramKind == tekMutRef { + if expr.child1.child1 != null as *Expr && expr.child1.child1.refType != null as *TypeExpr && + expr.child1.child1.refType.kind != tekPointer && expr.child1.child1.refType.kind != tekRef && expr.child1.child1.refType.kind != tekMutRef { + let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrNode.kind = hUnary; + addrNode.intValue = tkAmp; + addrNode.child1 = recv; + n.child1 = addrNode; + } else { + n.child1 = recv; + } + } else { + n.child1 = recv; + } + } else { + n.child1 = recv; + } + // Lower remaining arguments from linked list + var arg: *ExprList = expr.callArgs; + var argIdx: int = 0; + while arg != null as *ExprList { + let lowered: *HirNode = Lcx_LowerExpr(ctx, arg.expr); + if argIdx == 0 { + n.child2 = lowered; + } else if argIdx == 1 { + // Third argument — start linked list + let firstExtra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + firstExtra.node = lowered; + firstExtra.next = null as *HirArgList; + n.extraData = firstExtra as *void; + n.extraCount = 1; + } else { + // Additional args — append to linked list + var cur: *HirArgList = n.extraData as *HirArgList; + while cur.next != null as *HirArgList { + cur = cur.next; + } + let newNode: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + newNode.node = lowered; + newNode.next = null as *HirArgList; + cur.next = newNode; + n.extraCount = n.extraCount + 1; + } + arg = arg.next; + argIdx = argIdx + 1; + } + return n; + } + + // Decide direct vs indirect call + var isDirectFunc: bool = false; + if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { + let sym: Symbol = Scope_Lookup(ctx.scope, expr.child1.strValue); + if sym.kind == skFunc { + isDirectFunc = true; + } + } + + if isDirectFunc { + n.kind = hCall; + n.strValue = expr.child1.strValue; + + // Generic call monomorphization (explicit / inferred type args) + if expr.child1 != null as *Expr { + var argc: int = expr.child1.genericTypeArgCount; + var typeArg0: String = expr.child1.genericTypeArg0; + var typeArg1: String = expr.child1.genericTypeArg1; + // Fallback: infer T from first *Array/*Iter arg when sema left count=0 + if argc == 0 { + let genTry: *Decl = Lcx_FindGenericFunc(ctx, expr.child1.strValue); + if genTry != null as *Decl && genTry.typeParamCount > 0 { + if expr.callArgs != null as *ExprList && expr.callArgs.expr != null as *Expr { + var a0: *Expr = expr.callArgs.expr; + var te: *TypeExpr = a0.refType; + if te == null as *TypeExpr && a0.kind == ekUnary && a0.intValue == tkAmp { + if a0.child1 != null as *Expr { te = a0.child1.refType; } + } + if te != null as *TypeExpr { + // Unwrap pointer + if (te.kind == tekPointer || te.kind == tekRef || te.kind == tekMutRef) + && te.pointerPointee != null as *TypeExpr { + te = te.pointerPointee; + } + var elem: String = ""; + if te.typeArgCount > 0 { + elem = te.typeArgName0; + } else { + // Mangled Array_int / Iter_String + elem = Lcx_ExtractElemFromName(te.typeName); + } + if !String_Eq(elem, "") { + typeArg0 = elem; + argc = 1; + // Second type arg from func-typed second argument if needed + if genTry.typeParamCount >= 2 && expr.callArgs.next != null as *ExprList { + let a1e: *Expr = expr.callArgs.next.expr; + if a1e != null as *Expr && a1e.kind == ekIdent { + let fsym: Symbol = Scope_Lookup(ctx.scope, a1e.strValue); + if fsym.kind == skFunc && fsym.decl != null as *Decl + && fsym.decl.retType != null as *TypeExpr + && fsym.decl.retType.kind == tekNamed { + typeArg1 = fsym.decl.retType.typeName; + argc = 2; + } + } + } + } + } + } + } + } + if argc > 0 { + let genDecl: *Decl = Lcx_FindGenericFunc(ctx, expr.child1.strValue); + if genDecl != null as *Decl { + if String_Eq(typeArg0, ctx.substParam0) { typeArg0 = ctx.substArg0; } + if String_Eq(typeArg0, ctx.substParam1) { typeArg0 = ctx.substArg1; } + if String_Eq(typeArg1, ctx.substParam0) { typeArg1 = ctx.substArg0; } + if String_Eq(typeArg1, ctx.substParam1) { typeArg1 = ctx.substArg1; } + let mangled: String = Lcx_GenerateFuncInstance(ctx, genDecl, typeArg0, typeArg1, argc); + n.strValue = mangled; + } + } + } + + // Lower arguments into child1/child2/extraData + var arg: *ExprList = expr.callArgs; + var argIdx: int = 0; + while arg != null as *ExprList { + let lowered: *HirNode = Lcx_LowerExpr(ctx, arg.expr); + if argIdx == 0 { + n.child1 = lowered; + } else if argIdx == 1 { + n.child2 = lowered; + } else if argIdx == 2 { + let firstExtra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + firstExtra.node = lowered; + firstExtra.next = null as *HirArgList; + n.extraData = firstExtra as *void; + n.extraCount = 1; + } else { + var cur: *HirArgList = n.extraData as *HirArgList; + while cur.next != null as *HirArgList { + cur = cur.next; + } + let newNode: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + newNode.node = lowered; + newNode.next = null as *HirArgList; + cur.next = newNode; + n.extraCount = n.extraCount + 1; + } + arg = arg.next; + argIdx = argIdx + 1; + } + } else { + n.kind = hCallIndirect; + n.child1 = Lcx_LowerExpr(ctx, expr.child1); + // Lower arguments into child2/child3/extraData (child1 is callee) + var arg: *ExprList = expr.callArgs; + var argIdx: int = 0; + while arg != null as *ExprList { + let lowered: *HirNode = Lcx_LowerExpr(ctx, arg.expr); + if argIdx == 0 { + n.child2 = lowered; + } else if argIdx == 1 { + n.child3 = lowered; + } else if argIdx == 2 { + let firstExtra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + firstExtra.node = lowered; + firstExtra.next = null as *HirArgList; + n.extraData = firstExtra as *void; + n.extraCount = 1; + } else { + var cur: *HirArgList = n.extraData as *HirArgList; + while cur.next != null as *HirArgList { + cur = cur.next; + } + let newNode: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + newNode.node = lowered; + newNode.next = null as *HirArgList; + cur.next = newNode; + n.extraCount = n.extraCount + 1; + } + arg = arg.next; + argIdx = argIdx + 1; + } + } + return n; + } + + // Sizeof + if kind == ekSizeOf { + n.kind = hSizeOf; + if expr.refType != null as *TypeExpr { + let substTe: *TypeExpr = Lcx_SubstituteType(ctx, expr.refType); + if substTe != null as *TypeExpr { + n.typeName = substTe.typeName; + } else { + n.typeName = expr.refType.typeName; + } + } + return n; + } + + // Field access + if kind == ekField { + // Check if this is enum variant access: Color::Green + if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { + let sym: Symbol = Scope_Lookup(ctx.scope, expr.child1.strValue); + if sym.decl != null as *Decl && sym.decl.kind == dkEnum { + // Emit as variable reference: Color_Green + n.kind = hVar; + n.strValue = String_Concat(String_Concat(expr.child1.strValue, "_"), expr.strValue); + return n; + } + } + // Simple enum .tag is the enum value itself + if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind == tekNamed && String_Eq(expr.strValue, "tag") { + let sym: Symbol = Scope_Lookup(ctx.scope, expr.child1.refType.typeName); + if sym.decl != null as *Decl && sym.decl.kind == dkEnum { + var hasData: bool = false; + if sym.decl.variantCount > 0 && sym.decl.variant0.fieldCount > 0 { hasData = true; } + if sym.decl.variantCount > 1 && sym.decl.variant1.fieldCount > 0 { hasData = true; } + if sym.decl.variantCount > 2 && sym.decl.variant2.fieldCount > 0 { hasData = true; } + if sym.decl.variantCount > 3 && sym.decl.variant3.fieldCount > 0 { hasData = true; } + if sym.decl.variantCount > 4 && sym.decl.variant4.fieldCount > 0 { hasData = true; } + if sym.decl.variantCount > 5 && sym.decl.variant5.fieldCount > 0 { hasData = true; } + if sym.decl.variantCount > 6 && sym.decl.variant6.fieldCount > 0 { hasData = true; } + if sym.decl.variantCount > 7 && sym.decl.variant7.fieldCount > 0 { hasData = true; } + if sym.decl.variantCount > 8 && sym.decl.variant8.fieldCount > 0 { hasData = true; } + if !hasData { + return Lcx_LowerExpr(ctx, expr.child1); + } + } + } + n.kind = hFieldPtr; + n.child1 = Lcx_LowerExpr(ctx, expr.child1); + n.strValue = expr.strValue; + + // Get struct type from base expr refType + if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { + n.typeName = expr.child1.refType.typeName; + } + return n; + } + + // spawn Callee(args) + if kind == ekSpawn { + n.kind = hSpawn; + n.boolValue = expr.boolValue; + if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { + n.strValue = expr.child1.strValue; + } + if expr.child2 != null as *Expr { + n.child1 = Lcx_LowerExpr(ctx, expr.child2); + } + return n; + } + + // expr.await + if kind == ekAwait { + n.kind = hAwait; + n.child1 = Lcx_LowerExpr(ctx, expr.child1); + return n; + } + + // Index: arr[idx] + if kind == ekIndex { + // In @[Checked] functions, Array access goes through Array_Get with bounds check + if ctx.checkedFunc && !ctx.releaseFunc && expr.child1 != null as *Expr && Lcx_IsArrayTypeExpr(expr.child1.refType) { + let elemType: String = Lcx_GetArrayElemType(expr.child1.refType); + if !String_Eq(elemType, "") { + let baseNode: *HirNode = Lcx_LowerExpr(ctx, expr.child1); + let idxNode: *HirNode = Lcx_LowerExpr(ctx, expr.child2); + + var isPtr: bool = false; + if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind == tekPointer { + isPtr = true; + } + + let callNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + callNode.kind = hCall; + callNode.strValue = Lcx_MangleName("Array_Get", elemType, "", 1); + callNode.line = line; + callNode.column = col; + + let genGet: *Decl = Lcx_FindGenericFunc(ctx, "Array_Get"); + if genGet != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genGet, elemType, "", 1); + } + + if isPtr { + callNode.child1 = baseNode; + } else { + let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrNode.kind = hUnary; + addrNode.intValue = tkAmp; + addrNode.child1 = baseNode; + callNode.child1 = addrNode; + } + callNode.child2 = idxNode; + callNode.extraCount = 0; + callNode.extraData = null as *void; + + return callNode; + } + } + + // For Array or *Array, desugar arr[idx] → arr.data[idx] + if expr.child1 != null as *Expr && Lcx_IsArrayTypeExpr(expr.child1.refType) { + let baseNode: *HirNode = Lcx_LowerExpr(ctx, expr.child1); + let idxNode: *HirNode = Lcx_LowerExpr(ctx, expr.child2); + + let fieldPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + fieldPtr.kind = hFieldPtr; + fieldPtr.line = line; + fieldPtr.column = col; + fieldPtr.strValue = "data"; + fieldPtr.child1 = baseNode; + + n.kind = hIndexPtr; + n.child1 = fieldPtr; + n.child2 = idxNode; + return n; + } + + // Operator overloading: try operator_index_get + if expr.child1 != null as *Expr { + var receiverTypeName: String = ""; + if expr.child1.refType != null as *TypeExpr { + let refTe: *TypeExpr = expr.child1.refType; + if refTe.kind == tekNamed { + receiverTypeName = refTe.typeName; + } else if refTe.kind == tekPointer && refTe.pointerPointee != null as *TypeExpr && refTe.pointerPointee.kind == tekNamed { + receiverTypeName = refTe.pointerPointee.typeName; + } + } + if !String_Eq(receiverTypeName, "") { + var funcName: String = String_Concat(String_Concat(receiverTypeName, "_"), "operator_index_get"); + let sym: Symbol = Scope_Lookup(ctx.scope, funcName); + var didMono: bool = false; + // Generic monomorphization: if not found or is generic, monomorphize + if sym.kind != skFunc || sym.decl == null as *Decl || sym.decl.typeParamCount > 0 { + var typeArg0: String = ""; + if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { + let refTe2: *TypeExpr = expr.child1.refType; + if refTe2.kind == tekNamed && refTe2.typeArgCount > 0 { + typeArg0 = refTe2.typeArgName0; + } else if refTe2.kind == tekPointer && refTe2.pointerPointee != null as *TypeExpr && refTe2.pointerPointee.typeArgCount > 0 { + typeArg0 = refTe2.pointerPointee.typeArgName0; + } + } + if !String_Eq(typeArg0, "") { + let genericFuncName: String = String_Concat(String_Concat(receiverTypeName, "_"), "operator_index_get"); + let genDecl: *Decl = Lcx_FindGenericFunc(ctx, genericFuncName); + if genDecl != null as *Decl { + funcName = Lcx_GenerateFuncInstance(ctx, genDecl, typeArg0, "", 1); + didMono = true; + } + } + } + let sym2: Symbol = Scope_Lookup(ctx.scope, funcName); + let targetDecl: *Decl = sym2.decl; + if didMono { + targetDecl = sym.decl; + } + if sym2.kind == skFunc && sym2.decl != null as *Decl || didMono { + n.kind = hCall; + n.strValue = funcName; + let recv: *HirNode = Lcx_LowerExpr(ctx, expr.child1); + // If method expects pointer/reference but receiver is a value, add & + if targetDecl != null as *Decl && targetDecl.paramCount > 0 && targetDecl.param0.refParamType != null as *TypeExpr { + let paramKind: int = targetDecl.param0.refParamType.kind; + if paramKind == tekPointer || paramKind == tekRef || paramKind == tekMutRef { + if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind != tekPointer && expr.child1.refType.kind != tekRef && expr.child1.refType.kind != tekMutRef { + let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrNode.kind = hUnary; + addrNode.intValue = tkAmp; + addrNode.child1 = recv; + n.child1 = addrNode; + } else { + n.child1 = recv; + } + } else { + n.child1 = recv; + } + } else { + n.child1 = recv; + } + n.child2 = Lcx_LowerExpr(ctx, expr.child2); + return n; + } + } + } + + n.kind = hIndexPtr; + n.child1 = Lcx_LowerExpr(ctx, expr.child1); + n.child2 = Lcx_LowerExpr(ctx, expr.child2); + return n; + } + + // Assign: target = value + if kind == ekAssign { + // Array bounds-checking for write in @[Checked]: arr[idx] = val → Array_Set_T(&arr, idx, val) + // Only for plain assignment (=), not compound operators (+=, -=, etc.) + if expr.intValue == tkAssign && ctx.checkedFunc && !ctx.releaseFunc && expr.child1 != null as *Expr && expr.child1.kind == ekIndex && expr.child1.child1 != null as *Expr && Lcx_IsArrayTypeExpr(expr.child1.child1.refType) { + let elemType: String = Lcx_GetArrayElemType(expr.child1.child1.refType); + if !String_Eq(elemType, "") { + let baseNode: *HirNode = Lcx_LowerExpr(ctx, expr.child1.child1); + let idxNode: *HirNode = Lcx_LowerExpr(ctx, expr.child1.child2); + let valNode: *HirNode = Lcx_LowerExpr(ctx, expr.child2); + + var isPtr: bool = false; + if expr.child1.child1.refType != null as *TypeExpr && expr.child1.child1.refType.kind == tekPointer { + isPtr = true; + } + + let callNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + callNode.kind = hCall; + callNode.strValue = Lcx_MangleName("Array_Set", elemType, "", 1); + callNode.line = line; + callNode.column = col; + + let genSet: *Decl = Lcx_FindGenericFunc(ctx, "Array_Set"); + if genSet != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genSet, elemType, "", 1); + } + + if isPtr { + callNode.child1 = baseNode; + } else { + let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrNode.kind = hUnary; + addrNode.intValue = tkAmp; + addrNode.child1 = baseNode; + callNode.child1 = addrNode; + } + callNode.child2 = idxNode; + + let extra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + extra.node = valNode; + extra.next = null as *HirArgList; + callNode.extraData = extra as *void; + callNode.extraCount = 1; + + return callNode; + } + } + + // Operator overloading: try operator_index_set + if expr.intValue == tkAssign && expr.child1 != null as *Expr && expr.child1.kind == ekIndex && expr.child1.child1 != null as *Expr { + var receiverTypeName: String = ""; + let objExpr: *Expr = expr.child1.child1; + if objExpr.refType != null as *TypeExpr { + let refTe: *TypeExpr = objExpr.refType; + if refTe.kind == tekNamed { + receiverTypeName = refTe.typeName; + } else if refTe.kind == tekPointer && refTe.pointerPointee != null as *TypeExpr && refTe.pointerPointee.kind == tekNamed { + receiverTypeName = refTe.pointerPointee.typeName; + } + } + if !String_Eq(receiverTypeName, "") { + var funcName: String = String_Concat(String_Concat(receiverTypeName, "_"), "operator_index_set"); + let sym: Symbol = Scope_Lookup(ctx.scope, funcName); + var didMono: bool = false; + // Generic monomorphization: if not found or is generic, monomorphize + if sym.kind != skFunc || sym.decl == null as *Decl || sym.decl.typeParamCount > 0 { + var typeArg0: String = ""; + if objExpr != null as *Expr && objExpr.refType != null as *TypeExpr { + let refTe2: *TypeExpr = objExpr.refType; + if refTe2.kind == tekNamed && refTe2.typeArgCount > 0 { + typeArg0 = refTe2.typeArgName0; + } else if refTe2.kind == tekPointer && refTe2.pointerPointee != null as *TypeExpr && refTe2.pointerPointee.typeArgCount > 0 { + typeArg0 = refTe2.pointerPointee.typeArgName0; + } + } + if !String_Eq(typeArg0, "") { + let genericFuncName: String = String_Concat(String_Concat(receiverTypeName, "_"), "operator_index_set"); + let genDecl: *Decl = Lcx_FindGenericFunc(ctx, genericFuncName); + if genDecl != null as *Decl { + funcName = Lcx_GenerateFuncInstance(ctx, genDecl, typeArg0, "", 1); + didMono = true; + } + } + } + let sym2: Symbol = Scope_Lookup(ctx.scope, funcName); + let targetDecl: *Decl = sym2.decl; + if didMono { + targetDecl = sym.decl; + } + if sym2.kind == skFunc && sym2.decl != null as *Decl || didMono { + let callNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + callNode.kind = hCall; + callNode.strValue = funcName; + callNode.line = line; + callNode.column = col; + let recv: *HirNode = Lcx_LowerExpr(ctx, objExpr); + // If method expects pointer/reference but receiver is a value, add & + if targetDecl != null as *Decl && targetDecl.paramCount > 0 && targetDecl.param0.refParamType != null as *TypeExpr { + let paramKind: int = targetDecl.param0.refParamType.kind; + if paramKind == tekPointer || paramKind == tekRef || paramKind == tekMutRef { + if objExpr.refType != null as *TypeExpr && objExpr.refType.kind != tekPointer && objExpr.refType.kind != tekRef && objExpr.refType.kind != tekMutRef { + let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrNode.kind = hUnary; + addrNode.intValue = tkAmp; + addrNode.child1 = recv; + callNode.child1 = addrNode; + } else { + callNode.child1 = recv; + } + } else { + callNode.child1 = recv; + } + } else { + callNode.child1 = recv; + } + callNode.child2 = Lcx_LowerExpr(ctx, expr.child1.child2); + let extra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + extra.node = Lcx_LowerExpr(ctx, expr.child2); + extra.next = null as *HirArgList; + callNode.extraData = extra as *void; + callNode.extraCount = 1; + return callNode; + } + } + } + + n.kind = hAssign; + n.child1 = Lcx_LowerExpr(ctx, expr.child1); // target + n.child2 = Lcx_LowerExpr(ctx, expr.child2); // value + return n; + } + + // Tuple expression (a, b, ...) → struct init Tuple_int_int { ._0 = a, ._1 = b } + if kind == ekTuple { + var tname: String = "Tuple"; + var ti: int = 0; + while ti < expr.callArgCount { + tname = String_Concat(tname, "_int"); + ti = ti + 1; + } + if expr.callArgCount == 0 { tname = "Tuple_Empty"; } + if expr.refType != null as *TypeExpr && !String_Eq(expr.refType.typeName, "") { + tname = expr.refType.typeName; + } + n.kind = hStructInit; + n.strValue = tname; + n.typeKind = tyNamed; + n.typeName = tname; + var firstField: *HirNode = null as *HirNode; + var lastField: *HirNode = null as *HirNode; + var tcur: *ExprList = expr.callArgs; + var tidx: int = 0; + while tcur != null as *ExprList { + let fNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + fNode.kind = hBlock; + fNode.strValue = String_Concat("_", String_FromInt(tidx as int64)); + fNode.child1 = Lcx_LowerExpr(ctx, tcur.expr); + if firstField == null as *HirNode { + firstField = fNode; + lastField = fNode; + } else { + lastField.child3 = fNode; + lastField = fNode; + } + tcur = tcur.next; + tidx = tidx + 1; + } + n.child1 = firstField; + return n; + } + + // Closure: fat function pointer (multi-instance via heap env + maker) + if kind == ekClosure { + let f: *HirFunc = Lcx_LowerClosureFunc(ctx, expr); + var fatName: String = "BuxFn_int_int"; + if expr.refType != null as *TypeExpr && expr.refType.kind == tekFunc { + fatName = Lcx_BuildFuncTypeName(expr.refType); + } else if f.paramCount >= 2 { + // thunk has __env + user params; approximate from ret + user arity + fatName = "BuxFn_int_int"; + if f.paramCount == 3 { fatName = "BuxFn_int_int_int"; } + if f.paramCount == 1 { fatName = "BuxFn_int_void"; } + } + if f.captureCount > 0 { + // Call __make_(captures...) which heap-allocs env + n.kind = hCall; + n.strValue = String_Concat("__make_", f.name); + n.typeKind = tyFunc; + n.typeName = fatName; + var ci: int = 0; + while ci < f.captureCount { + var capName: String = ""; + if ci == 0 { capName = f.captureName0; } + else if ci == 1 { capName = f.captureName1; } + else if ci == 2 { capName = f.captureName2; } + else if ci == 3 { capName = f.captureName3; } + else if ci == 4 { capName = f.captureName4; } + else if ci == 5 { capName = f.captureName5; } + else if ci == 6 { capName = f.captureName6; } + else if ci == 7 { capName = f.captureName7; } + let capVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + capVar.kind = hVar; + capVar.strValue = capName; + if ci == 0 { n.child1 = capVar; } + else if ci == 1 { n.child2 = capVar; } + else if ci == 2 { + let firstExtra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + firstExtra.node = capVar; + firstExtra.next = null as *HirArgList; + n.extraData = firstExtra as *void; + n.extraCount = 1; + } else { + var cur: *HirArgList = n.extraData as *HirArgList; + while cur.next != null as *HirArgList { cur = cur.next; } + let newNode: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; + newNode.node = capVar; + newNode.next = null as *HirArgList; + cur.next = newNode; + n.extraCount = n.extraCount + 1; + } + ci = ci + 1; + } + return n; + } + // Capture-less: compound literal fat pointer with NULL env n.kind = hStructInit; n.strValue = fatName; n.typeKind = tyFunc; @@ -1298,7 +2229,7 @@ func Lcx_LowerExpr(ctx: *LowerCtx, expr: *Expr) -> *HirNode { codeField.strValue = "code"; let codeVal: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; codeVal.kind = hVar; - codeVal.strValue = String_Concat("__adapt_", expr.strValue); + codeVal.strValue = f.name; codeField.child1 = codeVal; let envField: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; envField.kind = hBlock; @@ -1316,2880 +2247,1949 @@ func Lcx_LowerExpr(ctx: *LowerCtx, expr: *Expr) -> *HirNode { n.child1 = codeField; return n; } - n.kind = hVar; - n.strValue = expr.strValue; - n.typeKind = sym.typeKind; - if expr.refType != null as *TypeExpr { - n.typeName = expr.refType.typeName; - } - if sym.typeName != null as String && !String_Eq(sym.typeName, "") { - n.typeName = sym.typeName; - } - return n; - } - - // self → variable reference named "self" - if kind == ekSelf { - n.kind = hVar; - n.strValue = "self"; - let sym: Symbol = Scope_Lookup(ctx.scope, "self"); - n.typeKind = sym.typeKind; - if sym.typeName != null as String && !String_Eq(sym.typeName, "") { - n.typeName = sym.typeName; - } - return n; - } - - // Binary - if kind == ekBinary { - // Assignment operator → use hAssign - if expr.intValue == tkAssign { - n.kind = hAssign; + // Cast + if kind == ekCast { + n.kind = hCast; n.child1 = Lcx_LowerExpr(ctx, expr.child1); - n.child2 = Lcx_LowerExpr(ctx, expr.child2); - return n; - } - - // Operator overloading: try method call - var opMethodName: String = ""; - if expr.intValue == tkPlus { opMethodName = "operator_add"; } - else if expr.intValue == tkMinus { opMethodName = "operator_sub"; } - else if expr.intValue == tkStar { opMethodName = "operator_mul"; } - else if expr.intValue == tkSlash { opMethodName = "operator_div"; } - else if expr.intValue == tkPercent { opMethodName = "operator_mod"; } - else if expr.intValue == tkEq { opMethodName = "operator_eq"; } - else if expr.intValue == tkNe { opMethodName = "operator_ne"; } - else if expr.intValue == tkLt { opMethodName = "operator_lt"; } - else if expr.intValue == tkLe { opMethodName = "operator_le"; } - else if expr.intValue == tkGt { opMethodName = "operator_gt"; } - else if expr.intValue == tkGe { opMethodName = "operator_ge"; } - else if expr.intValue == tkAmp { opMethodName = "operator_bitand"; } - else if expr.intValue == tkPipe { opMethodName = "operator_bitor"; } - else if expr.intValue == tkCaret { opMethodName = "operator_xor"; } - else if expr.intValue == tkShl { opMethodName = "operator_shl"; } - else if expr.intValue == tkShr { opMethodName = "operator_shr"; } - - if !String_Eq(opMethodName, "") { - var receiverTypeName: String = ""; - if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { - let refTe: *TypeExpr = expr.child1.refType; - if refTe.kind == tekNamed { - if refTe.typeName != null as String { receiverTypeName = refTe.typeName; } - } else if refTe.kind == tekPointer && refTe.pointerPointee != null as *TypeExpr && refTe.pointerPointee.kind == tekNamed { - if refTe.pointerPointee.typeName != null as String { - receiverTypeName = refTe.pointerPointee.typeName; - } + if expr.refType != null as *TypeExpr { + let substTe: *TypeExpr = Lcx_SubstituteType(ctx, expr.refType); + if substTe == null as *TypeExpr { substTe = expr.refType; } + let resolvedKind: int = Lcx_ResolveTypeKind(substTe); + n.typeKind = resolvedKind; + // For pointer types, construct "PointeeType*" + if substTe.kind == tekPointer && substTe.pointerPointee != null as *TypeExpr { + n.typeName = String_Concat(substTe.pointerPointee.typeName, "*"); + } else if !String_Eq(substTe.typeName, "") { + n.typeName = substTe.typeName; } } - // Note: String_Eq(null, "") is false — must also reject null type names - if receiverTypeName != null as String && !String_Eq(receiverTypeName, "") { - let funcName: String = String_Concat(String_Concat(receiverTypeName, "_"), opMethodName); - let sym: Symbol = Scope_Lookup(ctx.scope, funcName); - if sym.kind == skFunc && sym.decl != null as *Decl { - n.kind = hCall; - n.strValue = funcName; - let recv: *HirNode = Lcx_LowerExpr(ctx, expr.child1); - // If method expects pointer/reference but receiver is a value, add & - if sym.decl.paramCount > 0 && sym.decl.param0.refParamType != null as *TypeExpr { - let paramKind: int = sym.decl.param0.refParamType.kind; - if paramKind == tekPointer || paramKind == tekRef || paramKind == tekMutRef { - if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind != tekPointer && expr.child1.refType.kind != tekRef && expr.child1.refType.kind != tekMutRef { - let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrNode.kind = hUnary; - addrNode.intValue = tkAmp; - addrNode.child1 = recv; - n.child1 = addrNode; - } else { - n.child1 = recv; - } - } else { - n.child1 = recv; - } - } else { - n.child1 = recv; - } - n.child2 = Lcx_LowerExpr(ctx, expr.child2); - return n; - } - } - } - - // Overflow checking: in @[Checked] mode, lower +, -, * on signed integers to checked calls - if ctx.checkedFunc && !ctx.releaseFunc { - var opKind: int = expr.intValue; - var isArithOp: bool = opKind == tkPlus || opKind == tkMinus || opKind == tkStar; - var isSignedInt: bool = false; - if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { - let lhsKind: int = Lcx_ResolveTypeKind(expr.child1.refType); - isSignedInt = Type_IsSigned(lhsKind); - } - if isArithOp && isSignedInt { - var checkedFunc: String = ""; - if opKind == tkPlus { checkedFunc = "bux_add_i64_checked"; } - else if opKind == tkMinus { checkedFunc = "bux_sub_i64_checked"; } - else if opKind == tkStar { checkedFunc = "bux_mul_i64_checked"; } - if !String_Eq(checkedFunc, "") { - n.kind = hCall; - n.strValue = checkedFunc; - n.child1 = Lcx_LowerExpr(ctx, expr.child1); - n.child2 = Lcx_LowerExpr(ctx, expr.child2); - return n; - } - } - } - - n.kind = hBinary; - n.intValue = expr.intValue; // operator - let leftHir: *HirNode = Lcx_LowerExpr(ctx, expr.child1); - let rightHir: *HirNode = Lcx_LowerExpr(ctx, expr.child2); - // If either side is a match yield block, expand to: - // match stmts...; int __binop_N = leftVal op rightVal; yield __binop_N - if Lcx_IsMatchYield(leftHir) || Lcx_IsMatchYield(rightHir) { - ctx.varCounter = ctx.varCounter + 1; - let tmpName: String = String_Concat("__binop_", String_FromInt(ctx.varCounter as int64)); - var leftVal: *HirNode = leftHir; - var rightVal: *HirNode = rightHir; - let outer: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - outer.kind = hBlock; - outer.line = line; - outer.column = col; - outer.strValue = tmpName; - outer.typeName = "int"; - var first: *HirNode = null as *HirNode; - if Lcx_IsMatchYield(leftHir) { - leftVal = Lcx_YieldVarOf(leftHir); - leftHir.strValue = ""; - first = leftHir; - } - if Lcx_IsMatchYield(rightHir) { - rightVal = Lcx_YieldVarOf(rightHir); - rightHir.strValue = ""; - if first == null as *HirNode { - first = rightHir; - } else { - Lcx_AppendToChain(first, rightHir); - } - } - let tmpAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tmpAlloca.kind = hAlloca; - tmpAlloca.line = line; - tmpAlloca.column = col; - tmpAlloca.strValue = tmpName; - tmpAlloca.typeName = "int"; - let binNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - binNode.kind = hBinary; - binNode.line = line; - binNode.column = col; - binNode.intValue = expr.intValue; - binNode.child1 = leftVal; - binNode.child2 = rightVal; - let tmpStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tmpStore.kind = hStore; - tmpStore.line = line; - tmpStore.column = col; - let tmpVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tmpVar.kind = hVar; - tmpVar.strValue = tmpName; - tmpStore.child1 = tmpVar; - tmpStore.child2 = binNode; - tmpAlloca.child3 = tmpStore; - if first == null as *HirNode { - outer.child1 = tmpAlloca; - } else { - outer.child1 = first; - Lcx_AppendToChain(first, tmpAlloca); - } - return outer; - } - n.child1 = leftHir; - n.child2 = rightHir; - return n; - } - - // Unary - if kind == ekUnary { - // Overflow checking: in @[Checked] mode, lower negation on signed integers to checked call - if ctx.checkedFunc && !ctx.releaseFunc && expr.intValue == tkMinus { - var isSignedInt: bool = false; - if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { - let operandKind: int = Lcx_ResolveTypeKind(expr.child1.refType); - isSignedInt = Type_IsSigned(operandKind); - } - if isSignedInt { - n.kind = hCall; - n.strValue = "bux_neg_i64_checked"; - n.child1 = Lcx_LowerExpr(ctx, expr.child1); - return n; - } - } - n.kind = hUnary; - n.intValue = expr.intValue; - n.child1 = Lcx_LowerExpr(ctx, expr.child1); - if expr.intValue == tkAmp { - n.typeKind = tyPointer; - if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind == tekFunc { - n.typeName = Lcx_BuildFuncTypeName(expr.child1.refType); - } - } - return n; - } - - // Call - if kind == ekCall { - // Method call desugaring: obj.method(args) → Type_method(obj, args) - if expr.child1 != null as *Expr && expr.child1.kind == ekField { - n.kind = hCall; - let methodName: String = expr.child1.strValue; - var receiverTypeName: String = ""; - var receiverRefType: *TypeExpr = null as *TypeExpr; - if expr.child1.child1 != null as *Expr && expr.child1.child1.kind == ekIdent { - let sym: Symbol = Scope_Lookup(ctx.scope, expr.child1.child1.strValue); - receiverTypeName = sym.typeName; - receiverRefType = sym.refType; - } - if String_Eq(receiverTypeName, "") && expr.child1.child1 != null as *Expr && expr.child1.child1.refType != null as *TypeExpr { - receiverTypeName = expr.child1.child1.refType.typeName; - receiverRefType = expr.child1.child1.refType; - } - - var methodDecl: *Decl = null as *Decl; - if !String_Eq(receiverTypeName, "") { - // Strip trailing '*' from pointer type names (e.g. "Box*" → "Box") - var baseName: String = receiverTypeName; - let len: int = bux_strlen(baseName) as int; - if len > 0 { - let lastChar: String = bux_str_slice(baseName, (len - 1) as uint, 1); - if String_Eq(lastChar, "*") { - baseName = bux_str_slice(baseName, 0, (len - 1) as uint); - } - } - n.strValue = String_Concat(baseName, "_"); - n.strValue = String_Concat(n.strValue, methodName); - - // Generic method monomorphization: Box_Get on Box -> Box_Get_int - var genericRecvType: *TypeExpr = receiverRefType; - if genericRecvType != null as *TypeExpr && genericRecvType.kind == tekPointer && genericRecvType.pointerPointee != null as *TypeExpr { - genericRecvType = genericRecvType.pointerPointee; - } - if genericRecvType != null as *TypeExpr && genericRecvType.typeArgCount > 0 { - let baseTypeName: String = Lcx_StripTypeArgs(genericRecvType.typeName, genericRecvType.typeArgName0, genericRecvType.typeArgName1, genericRecvType.typeArgCount); - let baseMethodName: String = String_Concat(String_Concat(baseTypeName, "_"), methodName); - let genDecl: *Decl = Lcx_FindGenericFunc(ctx, baseMethodName); - if genDecl != null as *Decl { - let mangled: String = Lcx_GenerateFuncInstance(ctx, genDecl, genericRecvType.typeArgName0, genericRecvType.typeArgName1, genericRecvType.typeArgCount); - n.strValue = mangled; - methodDecl = genDecl; - } - } - } - // Lower receiver as first argument - let recv: *HirNode = Lcx_LowerExpr(ctx, expr.child1.child1); - // Find method decl if not already found (non-generic case) - if methodDecl == null as *Decl { - let sym: Symbol = Scope_Lookup(ctx.scope, n.strValue); - if sym.kind == skFunc && sym.decl != null as *Decl { - methodDecl = sym.decl; - } - } - // Auto-address if method expects pointer/reference but receiver is a value - if methodDecl != null as *Decl && methodDecl.paramCount > 0 && methodDecl.param0.refParamType != null as *TypeExpr { - let paramKind: int = methodDecl.param0.refParamType.kind; - if paramKind == tekPointer || paramKind == tekRef || paramKind == tekMutRef { - if expr.child1.child1 != null as *Expr && expr.child1.child1.refType != null as *TypeExpr && - expr.child1.child1.refType.kind != tekPointer && expr.child1.child1.refType.kind != tekRef && expr.child1.child1.refType.kind != tekMutRef { - let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrNode.kind = hUnary; - addrNode.intValue = tkAmp; - addrNode.child1 = recv; - n.child1 = addrNode; - } else { - n.child1 = recv; - } - } else { - n.child1 = recv; - } - } else { - n.child1 = recv; - } - // Lower remaining arguments from linked list - var arg: *ExprList = expr.callArgs; - var argIdx: int = 0; - while arg != null as *ExprList { - let lowered: *HirNode = Lcx_LowerExpr(ctx, arg.expr); - if argIdx == 0 { - n.child2 = lowered; - } else if argIdx == 1 { - // Third argument — start linked list - let firstExtra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - firstExtra.node = lowered; - firstExtra.next = null as *HirArgList; - n.extraData = firstExtra as *void; - n.extraCount = 1; - } else { - // Additional args — append to linked list - var cur: *HirArgList = n.extraData as *HirArgList; - while cur.next != null as *HirArgList { - cur = cur.next; - } - let newNode: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - newNode.node = lowered; - newNode.next = null as *HirArgList; - cur.next = newNode; - n.extraCount = n.extraCount + 1; - } - arg = arg.next; - argIdx = argIdx + 1; - } return n; } - // Decide direct vs indirect call - var isDirectFunc: bool = false; - if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { - let sym: Symbol = Scope_Lookup(ctx.scope, expr.child1.strValue); - if sym.kind == skFunc { - isDirectFunc = true; - } - } - - if isDirectFunc { - n.kind = hCall; - n.strValue = expr.child1.strValue; - - // Generic call monomorphization (explicit / inferred type args) - if expr.child1 != null as *Expr { - var argc: int = expr.child1.genericTypeArgCount; - var typeArg0: String = expr.child1.genericTypeArg0; - var typeArg1: String = expr.child1.genericTypeArg1; - // Fallback: infer T from first *Array/*Iter arg when sema left count=0 - if argc == 0 { - let genTry: *Decl = Lcx_FindGenericFunc(ctx, expr.child1.strValue); - if genTry != null as *Decl && genTry.typeParamCount > 0 { - if expr.callArgs != null as *ExprList && expr.callArgs.expr != null as *Expr { - var a0: *Expr = expr.callArgs.expr; - var te: *TypeExpr = a0.refType; - if te == null as *TypeExpr && a0.kind == ekUnary && a0.intValue == tkAmp { - if a0.child1 != null as *Expr { te = a0.child1.refType; } - } - if te != null as *TypeExpr { - // Unwrap pointer - if (te.kind == tekPointer || te.kind == tekRef || te.kind == tekMutRef) - && te.pointerPointee != null as *TypeExpr { - te = te.pointerPointee; - } - var elem: String = ""; - if te.typeArgCount > 0 { - elem = te.typeArgName0; - } else { - // Mangled Array_int / Iter_String - elem = Lcx_ExtractElemFromName(te.typeName); - } - if !String_Eq(elem, "") { - typeArg0 = elem; - argc = 1; - // Second type arg from func-typed second argument if needed - if genTry.typeParamCount >= 2 && expr.callArgs.next != null as *ExprList { - let a1e: *Expr = expr.callArgs.next.expr; - if a1e != null as *Expr && a1e.kind == ekIdent { - let fsym: Symbol = Scope_Lookup(ctx.scope, a1e.strValue); - if fsym.kind == skFunc && fsym.decl != null as *Decl - && fsym.decl.retType != null as *TypeExpr - && fsym.decl.retType.kind == tekNamed { - typeArg1 = fsym.decl.retType.typeName; - argc = 2; - } - } - } - } - } - } - } - } - if argc > 0 { - let genDecl: *Decl = Lcx_FindGenericFunc(ctx, expr.child1.strValue); - if genDecl != null as *Decl { - if String_Eq(typeArg0, ctx.substParam0) { typeArg0 = ctx.substArg0; } - if String_Eq(typeArg0, ctx.substParam1) { typeArg0 = ctx.substArg1; } - if String_Eq(typeArg1, ctx.substParam0) { typeArg1 = ctx.substArg0; } - if String_Eq(typeArg1, ctx.substParam1) { typeArg1 = ctx.substArg1; } - let mangled: String = Lcx_GenerateFuncInstance(ctx, genDecl, typeArg0, typeArg1, argc); - n.strValue = mangled; - } - } - } - - // Lower arguments into child1/child2/extraData - var arg: *ExprList = expr.callArgs; - var argIdx: int = 0; - while arg != null as *ExprList { - let lowered: *HirNode = Lcx_LowerExpr(ctx, arg.expr); - if argIdx == 0 { - n.child1 = lowered; - } else if argIdx == 1 { - n.child2 = lowered; - } else if argIdx == 2 { - let firstExtra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - firstExtra.node = lowered; - firstExtra.next = null as *HirArgList; - n.extraData = firstExtra as *void; - n.extraCount = 1; - } else { - var cur: *HirArgList = n.extraData as *HirArgList; - while cur.next != null as *HirArgList { - cur = cur.next; - } - let newNode: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - newNode.node = lowered; - newNode.next = null as *HirArgList; - cur.next = newNode; - n.extraCount = n.extraCount + 1; - } - arg = arg.next; - argIdx = argIdx + 1; - } - } else { - n.kind = hCallIndirect; - n.child1 = Lcx_LowerExpr(ctx, expr.child1); - // Lower arguments into child2/child3/extraData (child1 is callee) - var arg: *ExprList = expr.callArgs; - var argIdx: int = 0; - while arg != null as *ExprList { - let lowered: *HirNode = Lcx_LowerExpr(ctx, arg.expr); - if argIdx == 0 { - n.child2 = lowered; - } else if argIdx == 1 { - n.child3 = lowered; - } else if argIdx == 2 { - let firstExtra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - firstExtra.node = lowered; - firstExtra.next = null as *HirArgList; - n.extraData = firstExtra as *void; - n.extraCount = 1; - } else { - var cur: *HirArgList = n.extraData as *HirArgList; - while cur.next != null as *HirArgList { - cur = cur.next; - } - let newNode: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - newNode.node = lowered; - newNode.next = null as *HirArgList; - cur.next = newNode; - n.extraCount = n.extraCount + 1; - } - arg = arg.next; - argIdx = argIdx + 1; - } - } - return n; - } - - // Sizeof - if kind == ekSizeOf { - n.kind = hSizeOf; - if expr.refType != null as *TypeExpr { - let substTe: *TypeExpr = Lcx_SubstituteType(ctx, expr.refType); - if substTe != null as *TypeExpr { - n.typeName = substTe.typeName; - } else { - n.typeName = expr.refType.typeName; - } - } - return n; - } - - // Field access - if kind == ekField { - // Check if this is enum variant access: Color::Green - if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { - let sym: Symbol = Scope_Lookup(ctx.scope, expr.child1.strValue); - if sym.decl != null as *Decl && sym.decl.kind == dkEnum { - // Emit as variable reference: Color_Green - n.kind = hVar; - n.strValue = String_Concat(String_Concat(expr.child1.strValue, "_"), expr.strValue); - return n; - } - } - // Simple enum .tag is the enum value itself - if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind == tekNamed && String_Eq(expr.strValue, "tag") { - let sym: Symbol = Scope_Lookup(ctx.scope, expr.child1.refType.typeName); - if sym.decl != null as *Decl && sym.decl.kind == dkEnum { + // Struct init: TypeName { field: value, ... } + if kind == ekStructInit { + // Simple enum init: EnumName { tag: EnumName_Variant } -> EnumName_Variant + let enumSym: Symbol = Scope_Lookup(ctx.scope, expr.structName); + if enumSym.decl != null as *Decl && enumSym.decl.kind == dkEnum { var hasData: bool = false; - if sym.decl.variantCount > 0 && sym.decl.variant0.fieldCount > 0 { hasData = true; } - if sym.decl.variantCount > 1 && sym.decl.variant1.fieldCount > 0 { hasData = true; } - if sym.decl.variantCount > 2 && sym.decl.variant2.fieldCount > 0 { hasData = true; } - if sym.decl.variantCount > 3 && sym.decl.variant3.fieldCount > 0 { hasData = true; } - if sym.decl.variantCount > 4 && sym.decl.variant4.fieldCount > 0 { hasData = true; } - if sym.decl.variantCount > 5 && sym.decl.variant5.fieldCount > 0 { hasData = true; } - if sym.decl.variantCount > 6 && sym.decl.variant6.fieldCount > 0 { hasData = true; } - if sym.decl.variantCount > 7 && sym.decl.variant7.fieldCount > 0 { hasData = true; } - if sym.decl.variantCount > 8 && sym.decl.variant8.fieldCount > 0 { hasData = true; } - if !hasData { - return Lcx_LowerExpr(ctx, expr.child1); + if enumSym.decl.variantCount > 0 && enumSym.decl.variant0.fieldCount > 0 { hasData = true; } + if enumSym.decl.variantCount > 1 && enumSym.decl.variant1.fieldCount > 0 { hasData = true; } + if enumSym.decl.variantCount > 2 && enumSym.decl.variant2.fieldCount > 0 { hasData = true; } + if enumSym.decl.variantCount > 3 && enumSym.decl.variant3.fieldCount > 0 { hasData = true; } + if enumSym.decl.variantCount > 4 && enumSym.decl.variant4.fieldCount > 0 { hasData = true; } + if enumSym.decl.variantCount > 5 && enumSym.decl.variant5.fieldCount > 0 { hasData = true; } + if enumSym.decl.variantCount > 6 && enumSym.decl.variant6.fieldCount > 0 { hasData = true; } + if enumSym.decl.variantCount > 7 && enumSym.decl.variant7.fieldCount > 0 { hasData = true; } + if enumSym.decl.variantCount > 8 && enumSym.decl.variant8.fieldCount > 0 { hasData = true; } + if !hasData && expr.child1 != null as *Expr && String_Eq(expr.child1.strValue, "tag") { + return Lcx_LowerExpr(ctx, expr.child1.child1); } } - } - n.kind = hFieldPtr; - n.child1 = Lcx_LowerExpr(ctx, expr.child1); - n.strValue = expr.strValue; - - // Get struct type from base expr refType - if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { - n.typeName = expr.child1.refType.typeName; - } - return n; - } - - // spawn Callee(args) - if kind == ekSpawn { - n.kind = hSpawn; - n.boolValue = expr.boolValue; - if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { - n.strValue = expr.child1.strValue; - } - if expr.child2 != null as *Expr { - n.child1 = Lcx_LowerExpr(ctx, expr.child2); - } - return n; - } - - // expr.await - if kind == ekAwait { - n.kind = hAwait; - n.child1 = Lcx_LowerExpr(ctx, expr.child1); - return n; - } - - // Index: arr[idx] - if kind == ekIndex { - // In @[Checked] functions, Array access goes through Array_Get with bounds check - if ctx.checkedFunc && !ctx.releaseFunc && expr.child1 != null as *Expr && Lcx_IsArrayTypeExpr(expr.child1.refType) { - let elemType: String = Lcx_GetArrayElemType(expr.child1.refType); - if !String_Eq(elemType, "") { - let baseNode: *HirNode = Lcx_LowerExpr(ctx, expr.child1); - let idxNode: *HirNode = Lcx_LowerExpr(ctx, expr.child2); - - var isPtr: bool = false; - if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind == tekPointer { - isPtr = true; + n.kind = hStructInit; + var structName: String = expr.structName; + // Generic struct monomorphization + if expr.genericTypeArgCount > 0 { + let genDecl: *Decl = Lcx_FindGenericStruct(ctx, expr.structName); + if genDecl != null as *Decl { + var typeArg0: String = expr.genericTypeArg0; + var typeArg1: String = expr.genericTypeArg1; + if String_Eq(typeArg0, ctx.substParam0) { typeArg0 = ctx.substArg0; } + if String_Eq(typeArg0, ctx.substParam1) { typeArg0 = ctx.substArg1; } + if String_Eq(typeArg1, ctx.substParam0) { typeArg1 = ctx.substArg0; } + if String_Eq(typeArg1, ctx.substParam1) { typeArg1 = ctx.substArg1; } + structName = Lcx_GenerateStructInstance(ctx, genDecl, typeArg0, typeArg1, expr.genericTypeArgCount); } - - let callNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - callNode.kind = hCall; - callNode.strValue = Lcx_MangleName("Array_Get", elemType, "", 1); - callNode.line = line; - callNode.column = col; - - let genGet: *Decl = Lcx_FindGenericFunc(ctx, "Array_Get"); - if genGet != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genGet, elemType, "", 1); - } - - if isPtr { - callNode.child1 = baseNode; + } + n.strValue = structName; + // Lower each field (fields are chained via child3 on synthetic ekField exprs) + var field: *Expr = expr.child1; + var firstField: *HirNode = null as *HirNode; + var lastField: *HirNode = null as *HirNode; + while field != null as *Expr { + let fNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + fNode.kind = hBlock; // placeholder, field is identified by name+value + fNode.line = expr.line; + fNode.column = expr.column; + fNode.strValue = field.strValue; // field name + fNode.child1 = Lcx_LowerExpr(ctx, field.child1); // field value + if firstField == null as *HirNode { + firstField = fNode; + lastField = fNode; } else { - let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrNode.kind = hUnary; - addrNode.intValue = tkAmp; - addrNode.child1 = baseNode; - callNode.child1 = addrNode; + lastField.child3 = fNode; + lastField = fNode; } - callNode.child2 = idxNode; - callNode.extraCount = 0; - callNode.extraData = null as *void; - - return callNode; + field = field.child3; } - } - - // For Array or *Array, desugar arr[idx] → arr.data[idx] - if expr.child1 != null as *Expr && Lcx_IsArrayTypeExpr(expr.child1.refType) { - let baseNode: *HirNode = Lcx_LowerExpr(ctx, expr.child1); - let idxNode: *HirNode = Lcx_LowerExpr(ctx, expr.child2); - - let fieldPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - fieldPtr.kind = hFieldPtr; - fieldPtr.line = line; - fieldPtr.column = col; - fieldPtr.strValue = "data"; - fieldPtr.child1 = baseNode; - - n.kind = hIndexPtr; - n.child1 = fieldPtr; - n.child2 = idxNode; + n.child1 = firstField; return n; } - // Operator overloading: try operator_index_get - if expr.child1 != null as *Expr { - var receiverTypeName: String = ""; - if expr.child1.refType != null as *TypeExpr { - let refTe: *TypeExpr = expr.child1.refType; - if refTe.kind == tekNamed { - receiverTypeName = refTe.typeName; - } else if refTe.kind == tekPointer && refTe.pointerPointee != null as *TypeExpr && refTe.pointerPointee.kind == tekNamed { - receiverTypeName = refTe.pointerPointee.typeName; - } - } - if !String_Eq(receiverTypeName, "") { - var funcName: String = String_Concat(String_Concat(receiverTypeName, "_"), "operator_index_get"); - let sym: Symbol = Scope_Lookup(ctx.scope, funcName); - var didMono: bool = false; - // Generic monomorphization: if not found or is generic, monomorphize - if sym.kind != skFunc || sym.decl == null as *Decl || sym.decl.typeParamCount > 0 { - var typeArg0: String = ""; - if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { - let refTe2: *TypeExpr = expr.child1.refType; - if refTe2.kind == tekNamed && refTe2.typeArgCount > 0 { - typeArg0 = refTe2.typeArgName0; - } else if refTe2.kind == tekPointer && refTe2.pointerPointee != null as *TypeExpr && refTe2.pointerPointee.typeArgCount > 0 { - typeArg0 = refTe2.pointerPointee.typeArgName0; - } - } - if !String_Eq(typeArg0, "") { - let genericFuncName: String = String_Concat(String_Concat(receiverTypeName, "_"), "operator_index_get"); - let genDecl: *Decl = Lcx_FindGenericFunc(ctx, genericFuncName); - if genDecl != null as *Decl { - funcName = Lcx_GenerateFuncInstance(ctx, genDecl, typeArg0, "", 1); - didMono = true; - } - } - } - let sym2: Symbol = Scope_Lookup(ctx.scope, funcName); - let targetDecl: *Decl = sym2.decl; - if didMono { - targetDecl = sym.decl; - } - if sym2.kind == skFunc && sym2.decl != null as *Decl || didMono { - n.kind = hCall; - n.strValue = funcName; - let recv: *HirNode = Lcx_LowerExpr(ctx, expr.child1); - // If method expects pointer/reference but receiver is a value, add & - if targetDecl != null as *Decl && targetDecl.paramCount > 0 && targetDecl.param0.refParamType != null as *TypeExpr { - let paramKind: int = targetDecl.param0.refParamType.kind; - if paramKind == tekPointer || paramKind == tekRef || paramKind == tekMutRef { - if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind != tekPointer && expr.child1.refType.kind != tekRef && expr.child1.refType.kind != tekMutRef { - let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrNode.kind = hUnary; - addrNode.intValue = tkAmp; - addrNode.child1 = recv; - n.child1 = addrNode; - } else { - n.child1 = recv; - } - } else { - n.child1 = recv; - } - } else { - n.child1 = recv; - } - n.child2 = Lcx_LowerExpr(ctx, expr.child2); - return n; - } - } - } - - n.kind = hIndexPtr; - n.child1 = Lcx_LowerExpr(ctx, expr.child1); - n.child2 = Lcx_LowerExpr(ctx, expr.child2); - return n; - } - - // Assign: target = value - if kind == ekAssign { - // Array bounds-checking for write in @[Checked]: arr[idx] = val → Array_Set_T(&arr, idx, val) - // Only for plain assignment (=), not compound operators (+=, -=, etc.) - if expr.intValue == tkAssign && ctx.checkedFunc && !ctx.releaseFunc && expr.child1 != null as *Expr && expr.child1.kind == ekIndex && expr.child1.child1 != null as *Expr && Lcx_IsArrayTypeExpr(expr.child1.child1.refType) { - let elemType: String = Lcx_GetArrayElemType(expr.child1.child1.refType); - if !String_Eq(elemType, "") { - let baseNode: *HirNode = Lcx_LowerExpr(ctx, expr.child1.child1); - let idxNode: *HirNode = Lcx_LowerExpr(ctx, expr.child1.child2); - let valNode: *HirNode = Lcx_LowerExpr(ctx, expr.child2); - - var isPtr: bool = false; - if expr.child1.child1.refType != null as *TypeExpr && expr.child1.child1.refType.kind == tekPointer { - isPtr = true; - } - - let callNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - callNode.kind = hCall; - callNode.strValue = Lcx_MangleName("Array_Set", elemType, "", 1); - callNode.line = line; - callNode.column = col; - - let genSet: *Decl = Lcx_FindGenericFunc(ctx, "Array_Set"); - if genSet != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genSet, elemType, "", 1); - } - - if isPtr { - callNode.child1 = baseNode; + // Block expression (boolValue = true means unsafe block) + // retTypeKind -2 → yield last expression as block value + if kind == ekBlock { + if expr.refBlock != null as *Block { + if expr.boolValue { + let oldChecked: bool = ctx.checkedFunc; + let oldRelease: bool = ctx.releaseFunc; + ctx.checkedFunc = false; + ctx.releaseFunc = false; + let blockNode: *HirNode = Lcx_LowerBlock(ctx, expr.refBlock, -2); + ctx.checkedFunc = oldChecked; + ctx.releaseFunc = oldRelease; + return blockNode; } else { - let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrNode.kind = hUnary; - addrNode.intValue = tkAmp; - addrNode.child1 = baseNode; - callNode.child1 = addrNode; + return Lcx_LowerBlock(ctx, expr.refBlock, -2); } - callNode.child2 = idxNode; - - let extra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - extra.node = valNode; - extra.next = null as *HirArgList; - callNode.extraData = extra as *void; - callNode.extraCount = 1; - - return callNode; - } - } - - // Operator overloading: try operator_index_set - if expr.intValue == tkAssign && expr.child1 != null as *Expr && expr.child1.kind == ekIndex && expr.child1.child1 != null as *Expr { - var receiverTypeName: String = ""; - let objExpr: *Expr = expr.child1.child1; - if objExpr.refType != null as *TypeExpr { - let refTe: *TypeExpr = objExpr.refType; - if refTe.kind == tekNamed { - receiverTypeName = refTe.typeName; - } else if refTe.kind == tekPointer && refTe.pointerPointee != null as *TypeExpr && refTe.pointerPointee.kind == tekNamed { - receiverTypeName = refTe.pointerPointee.typeName; - } - } - if !String_Eq(receiverTypeName, "") { - var funcName: String = String_Concat(String_Concat(receiverTypeName, "_"), "operator_index_set"); - let sym: Symbol = Scope_Lookup(ctx.scope, funcName); - var didMono: bool = false; - // Generic monomorphization: if not found or is generic, monomorphize - if sym.kind != skFunc || sym.decl == null as *Decl || sym.decl.typeParamCount > 0 { - var typeArg0: String = ""; - if objExpr != null as *Expr && objExpr.refType != null as *TypeExpr { - let refTe2: *TypeExpr = objExpr.refType; - if refTe2.kind == tekNamed && refTe2.typeArgCount > 0 { - typeArg0 = refTe2.typeArgName0; - } else if refTe2.kind == tekPointer && refTe2.pointerPointee != null as *TypeExpr && refTe2.pointerPointee.typeArgCount > 0 { - typeArg0 = refTe2.pointerPointee.typeArgName0; - } - } - if !String_Eq(typeArg0, "") { - let genericFuncName: String = String_Concat(String_Concat(receiverTypeName, "_"), "operator_index_set"); - let genDecl: *Decl = Lcx_FindGenericFunc(ctx, genericFuncName); - if genDecl != null as *Decl { - funcName = Lcx_GenerateFuncInstance(ctx, genDecl, typeArg0, "", 1); - didMono = true; - } - } - } - let sym2: Symbol = Scope_Lookup(ctx.scope, funcName); - let targetDecl: *Decl = sym2.decl; - if didMono { - targetDecl = sym.decl; - } - if sym2.kind == skFunc && sym2.decl != null as *Decl || didMono { - let callNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - callNode.kind = hCall; - callNode.strValue = funcName; - callNode.line = line; - callNode.column = col; - let recv: *HirNode = Lcx_LowerExpr(ctx, objExpr); - // If method expects pointer/reference but receiver is a value, add & - if targetDecl != null as *Decl && targetDecl.paramCount > 0 && targetDecl.param0.refParamType != null as *TypeExpr { - let paramKind: int = targetDecl.param0.refParamType.kind; - if paramKind == tekPointer || paramKind == tekRef || paramKind == tekMutRef { - if objExpr.refType != null as *TypeExpr && objExpr.refType.kind != tekPointer && objExpr.refType.kind != tekRef && objExpr.refType.kind != tekMutRef { - let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrNode.kind = hUnary; - addrNode.intValue = tkAmp; - addrNode.child1 = recv; - callNode.child1 = addrNode; - } else { - callNode.child1 = recv; - } - } else { - callNode.child1 = recv; - } - } else { - callNode.child1 = recv; - } - callNode.child2 = Lcx_LowerExpr(ctx, expr.child1.child2); - let extra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - extra.node = Lcx_LowerExpr(ctx, expr.child2); - extra.next = null as *HirArgList; - callNode.extraData = extra as *void; - callNode.extraCount = 1; - return callNode; - } - } - } - - n.kind = hAssign; - n.child1 = Lcx_LowerExpr(ctx, expr.child1); // target - n.child2 = Lcx_LowerExpr(ctx, expr.child2); // value - return n; - } - - // Tuple expression (a, b, ...) → struct init Tuple_int_int { ._0 = a, ._1 = b } - if kind == ekTuple { - var tname: String = "Tuple"; - var ti: int = 0; - while ti < expr.callArgCount { - tname = String_Concat(tname, "_int"); - ti = ti + 1; - } - if expr.callArgCount == 0 { tname = "Tuple_Empty"; } - if expr.refType != null as *TypeExpr && !String_Eq(expr.refType.typeName, "") { - tname = expr.refType.typeName; - } - n.kind = hStructInit; - n.strValue = tname; - n.typeKind = tyNamed; - n.typeName = tname; - var firstField: *HirNode = null as *HirNode; - var lastField: *HirNode = null as *HirNode; - var tcur: *ExprList = expr.callArgs; - var tidx: int = 0; - while tcur != null as *ExprList { - let fNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - fNode.kind = hBlock; - fNode.strValue = String_Concat("_", String_FromInt(tidx as int64)); - fNode.child1 = Lcx_LowerExpr(ctx, tcur.expr); - if firstField == null as *HirNode { - firstField = fNode; - lastField = fNode; - } else { - lastField.child3 = fNode; - lastField = fNode; - } - tcur = tcur.next; - tidx = tidx + 1; - } - n.child1 = firstField; - return n; - } - - // Closure: fat function pointer (multi-instance via heap env + maker) - if kind == ekClosure { - let f: *HirFunc = Lcx_LowerClosureFunc(ctx, expr); - var fatName: String = "BuxFn_int_int"; - if expr.refType != null as *TypeExpr && expr.refType.kind == tekFunc { - fatName = Lcx_BuildFuncTypeName(expr.refType); - } else if f.paramCount >= 2 { - // thunk has __env + user params; approximate from ret + user arity - fatName = "BuxFn_int_int"; - if f.paramCount == 3 { fatName = "BuxFn_int_int_int"; } - if f.paramCount == 1 { fatName = "BuxFn_int_void"; } - } - if f.captureCount > 0 { - // Call __make_(captures...) which heap-allocs env - n.kind = hCall; - n.strValue = String_Concat("__make_", f.name); - n.typeKind = tyFunc; - n.typeName = fatName; - var ci: int = 0; - while ci < f.captureCount { - var capName: String = ""; - if ci == 0 { capName = f.captureName0; } - else if ci == 1 { capName = f.captureName1; } - else if ci == 2 { capName = f.captureName2; } - else if ci == 3 { capName = f.captureName3; } - else if ci == 4 { capName = f.captureName4; } - else if ci == 5 { capName = f.captureName5; } - else if ci == 6 { capName = f.captureName6; } - else if ci == 7 { capName = f.captureName7; } - let capVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - capVar.kind = hVar; - capVar.strValue = capName; - if ci == 0 { n.child1 = capVar; } - else if ci == 1 { n.child2 = capVar; } - else if ci == 2 { - let firstExtra: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - firstExtra.node = capVar; - firstExtra.next = null as *HirArgList; - n.extraData = firstExtra as *void; - n.extraCount = 1; - } else { - var cur: *HirArgList = n.extraData as *HirArgList; - while cur.next != null as *HirArgList { cur = cur.next; } - let newNode: *HirArgList = bux_alloc(sizeof(HirArgList)) as *HirArgList; - newNode.node = capVar; - newNode.next = null as *HirArgList; - cur.next = newNode; - n.extraCount = n.extraCount + 1; - } - ci = ci + 1; } return n; } - // Capture-less: compound literal fat pointer with NULL env - n.kind = hStructInit; - n.strValue = fatName; - n.typeKind = tyFunc; - n.typeName = fatName; - let codeField: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - codeField.kind = hBlock; - codeField.strValue = "code"; - let codeVal: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - codeVal.kind = hVar; - codeVal.strValue = f.name; - codeField.child1 = codeVal; - let envField: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - envField.kind = hBlock; - envField.strValue = "env"; - let nullEnv: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - nullEnv.kind = hCast; - nullEnv.typeName = "void*"; - let zero: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - zero.kind = hLit; - zero.intValue = tkIntLiteral; - zero.strValue = "0"; - nullEnv.child1 = zero; - envField.child1 = nullEnv; - codeField.child3 = envField; - n.child1 = codeField; + return n; } - // Cast - if kind == ekCast { - n.kind = hCast; - n.child1 = Lcx_LowerExpr(ctx, expr.child1); - if expr.refType != null as *TypeExpr { - let substTe: *TypeExpr = Lcx_SubstituteType(ctx, expr.refType); - if substTe == null as *TypeExpr { substTe = expr.refType; } - let resolvedKind: int = Lcx_ResolveTypeKind(substTe); - n.typeKind = resolvedKind; - // For pointer types, construct "PointeeType*" - if substTe.kind == tekPointer && substTe.pointerPointee != null as *TypeExpr { - n.typeName = String_Concat(substTe.pointerPointee.typeName, "*"); - } else if !String_Eq(substTe.typeName, "") { - n.typeName = substTe.typeName; - } - } - return n; - } + // --------------------------------------------------------------------------- + // Statement lowering + // --------------------------------------------------------------------------- - // Struct init: TypeName { field: value, ... } - if kind == ekStructInit { - // Simple enum init: EnumName { tag: EnumName_Variant } -> EnumName_Variant - let enumSym: Symbol = Scope_Lookup(ctx.scope, expr.structName); - if enumSym.decl != null as *Decl && enumSym.decl.kind == dkEnum { - var hasData: bool = false; - if enumSym.decl.variantCount > 0 && enumSym.decl.variant0.fieldCount > 0 { hasData = true; } - if enumSym.decl.variantCount > 1 && enumSym.decl.variant1.fieldCount > 0 { hasData = true; } - if enumSym.decl.variantCount > 2 && enumSym.decl.variant2.fieldCount > 0 { hasData = true; } - if enumSym.decl.variantCount > 3 && enumSym.decl.variant3.fieldCount > 0 { hasData = true; } - if enumSym.decl.variantCount > 4 && enumSym.decl.variant4.fieldCount > 0 { hasData = true; } - if enumSym.decl.variantCount > 5 && enumSym.decl.variant5.fieldCount > 0 { hasData = true; } - if enumSym.decl.variantCount > 6 && enumSym.decl.variant6.fieldCount > 0 { hasData = true; } - if enumSym.decl.variantCount > 7 && enumSym.decl.variant7.fieldCount > 0 { hasData = true; } - if enumSym.decl.variantCount > 8 && enumSym.decl.variant8.fieldCount > 0 { hasData = true; } - if !hasData && expr.child1 != null as *Expr && String_Eq(expr.child1.strValue, "tag") { - return Lcx_LowerExpr(ctx, expr.child1.child1); - } - } - n.kind = hStructInit; - var structName: String = expr.structName; - // Generic struct monomorphization - if expr.genericTypeArgCount > 0 { - let genDecl: *Decl = Lcx_FindGenericStruct(ctx, expr.structName); - if genDecl != null as *Decl { - var typeArg0: String = expr.genericTypeArg0; - var typeArg1: String = expr.genericTypeArg1; - if String_Eq(typeArg0, ctx.substParam0) { typeArg0 = ctx.substArg0; } - if String_Eq(typeArg0, ctx.substParam1) { typeArg0 = ctx.substArg1; } - if String_Eq(typeArg1, ctx.substParam0) { typeArg1 = ctx.substArg0; } - if String_Eq(typeArg1, ctx.substParam1) { typeArg1 = ctx.substArg1; } - structName = Lcx_GenerateStructInstance(ctx, genDecl, typeArg0, typeArg1, expr.genericTypeArgCount); - } - } - n.strValue = structName; - // Lower each field (fields are chained via child3 on synthetic ekField exprs) - var field: *Expr = expr.child1; - var firstField: *HirNode = null as *HirNode; - var lastField: *HirNode = null as *HirNode; - while field != null as *Expr { - let fNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - fNode.kind = hBlock; // placeholder, field is identified by name+value - fNode.line = expr.line; - fNode.column = expr.column; - fNode.strValue = field.strValue; // field name - fNode.child1 = Lcx_LowerExpr(ctx, field.child1); // field value - if firstField == null as *HirNode { - firstField = fNode; - lastField = fNode; - } else { - lastField.child3 = fNode; - lastField = fNode; - } - field = field.child3; - } - n.child1 = firstField; - return n; - } + func Lcx_LowerStmt(ctx: *LowerCtx, stmt: *Stmt) -> *HirNode { + if stmt == null as *Stmt { return null as *HirNode; } - // Block expression (boolValue = true means unsafe block) - // retTypeKind -2 → yield last expression as block value - if kind == ekBlock { - if expr.refBlock != null as *Block { - if expr.boolValue { - let oldChecked: bool = ctx.checkedFunc; - let oldRelease: bool = ctx.releaseFunc; - ctx.checkedFunc = false; - ctx.releaseFunc = false; - let blockNode: *HirNode = Lcx_LowerBlock(ctx, expr.refBlock, -2); - ctx.checkedFunc = oldChecked; - ctx.releaseFunc = oldRelease; - return blockNode; - } else { - return Lcx_LowerBlock(ctx, expr.refBlock, -2); - } - } - return n; - } + let line: uint32 = stmt.line; + let col: uint32 = stmt.column; + let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + n.kind = hBlock; + n.line = line; + n.column = col; - return n; -} + let kind: int = stmt.kind; -// --------------------------------------------------------------------------- -// Statement lowering -// --------------------------------------------------------------------------- - -func Lcx_LowerStmt(ctx: *LowerCtx, stmt: *Stmt) -> *HirNode { - if stmt == null as *Stmt { return null as *HirNode; } - - let line: uint32 = stmt.line; - let col: uint32 = stmt.column; - let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - n.kind = hBlock; - n.line = line; - n.column = col; - - let kind: int = stmt.kind; - - // Let/var → alloca + store - if kind == skLet { - // Try operator: let x: T = operand? -> tmp = operand; if tmp.tag == Err { return tmp; } let x = tmp.data.Ok; - if stmt.child1 != null as *Expr && stmt.child1.kind == ekTry { - let tryExpr: *Expr = stmt.child1; - let operandExpr: *Expr = tryExpr.child1; - let operandTypeExpr: *TypeExpr = operandExpr.refType; - var typeName: String = "Result"; - var errTag: String = "Result_Err"; - var okField: String = "Ok_0"; - if operandTypeExpr != null as *TypeExpr && operandTypeExpr.kind == tekNamed { - typeName = operandTypeExpr.typeName; - if String_Eq(typeName, "Option") { - errTag = "Option_None"; - okField = "Some_0"; - } else if !String_Eq(typeName, "Result") { - errTag = String_Concat(String_Concat(typeName, "_"), "Err"); - okField = "Ok_0"; + // Let/var → alloca + store + if kind == skLet { + // Try operator: let x: T = operand? -> tmp = operand; if tmp.tag == Err { return tmp; } let x = tmp.data.Ok; + if stmt.child1 != null as *Expr && stmt.child1.kind == ekTry { + let tryExpr: *Expr = stmt.child1; + let operandExpr: *Expr = tryExpr.child1; + let operandTypeExpr: *TypeExpr = operandExpr.refType; + var typeName: String = "Result"; + var errTag: String = "Result_Err"; + var okField: String = "Ok_0"; + if operandTypeExpr != null as *TypeExpr && operandTypeExpr.kind == tekNamed { + typeName = operandTypeExpr.typeName; + if String_Eq(typeName, "Option") { + errTag = "Option_None"; + okField = "Some_0"; + } else if !String_Eq(typeName, "Result") { + errTag = String_Concat(String_Concat(typeName, "_"), "Err"); + okField = "Ok_0"; + } } - } - let tmpName: String = String_Concat("__try_tmp_", String_FromInt(ctx.tryCounter as int64)); - ctx.tryCounter = ctx.tryCounter + 1; + let tmpName: String = String_Concat("__try_tmp_", String_FromInt(ctx.tryCounter as int64)); + ctx.tryCounter = ctx.tryCounter + 1; - // alloca tmp - let tmpAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tmpAlloca.kind = hAlloca; - tmpAlloca.line = line; - tmpAlloca.column = col; - tmpAlloca.strValue = tmpName; - tmpAlloca.typeName = typeName; + // alloca tmp + let tmpAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tmpAlloca.kind = hAlloca; + tmpAlloca.line = line; + tmpAlloca.column = col; + tmpAlloca.strValue = tmpName; + tmpAlloca.typeName = typeName; - // tmp = operand - let tmpStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tmpStore.kind = hStore; - tmpStore.line = line; - tmpStore.column = col; - let tmpVarRef: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tmpVarRef.kind = hVar; - tmpVarRef.strValue = tmpName; - tmpStore.child1 = tmpVarRef; - tmpStore.child2 = Lcx_LowerExpr(ctx, operandExpr); + // tmp = operand + let tmpStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tmpStore.kind = hStore; + tmpStore.line = line; + tmpStore.column = col; + let tmpVarRef: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tmpVarRef.kind = hVar; + tmpVarRef.strValue = tmpName; + tmpStore.child1 = tmpVarRef; + tmpStore.child2 = Lcx_LowerExpr(ctx, operandExpr); - // if (tmp.tag == errTag) return tmp - let tagPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tagPtr.kind = hFieldPtr; - tagPtr.line = line; - tagPtr.column = col; - tagPtr.strValue = "tag"; - tagPtr.child1 = tmpVarRef; - let tagLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - tagLoad.kind = hLoad; - tagLoad.line = line; - tagLoad.column = col; - tagLoad.child1 = tagPtr; - let errConst: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - errConst.kind = hVar; - errConst.strValue = errTag; - let cond: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - cond.kind = hBinary; - cond.line = line; - cond.column = col; - cond.intValue = tkEq; - cond.child1 = tagLoad; - cond.child2 = errConst; - let retNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - retNode.kind = hReturn; - retNode.line = line; - retNode.column = col; - retNode.child1 = tmpVarRef; - let thenBlock: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - thenBlock.kind = hBlock; - thenBlock.line = line; - thenBlock.column = col; - thenBlock.child1 = retNode; - let ifNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - ifNode.kind = hIf; - ifNode.line = line; - ifNode.column = col; - ifNode.child1 = cond; - ifNode.child2 = thenBlock; - - // New initializer: tmp.data.OkField - let dataPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - dataPtr.kind = hFieldPtr; - dataPtr.line = line; - dataPtr.column = col; - dataPtr.strValue = "data"; - dataPtr.child1 = tmpVarRef; - let dataLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - dataLoad.kind = hLoad; - dataLoad.line = line; - dataLoad.column = col; - dataLoad.child1 = dataPtr; - let okPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - okPtr.kind = hFieldPtr; - okPtr.line = line; - okPtr.column = col; - okPtr.strValue = okField; - okPtr.child1 = dataLoad; - let okLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - okLoad.kind = hLoad; - okLoad.line = line; - okLoad.column = col; - okLoad.child1 = okPtr; - - // alloca x - let xAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - xAlloca.kind = hAlloca; - xAlloca.line = line; - xAlloca.column = col; - xAlloca.strValue = stmt.strValue; - xAlloca.typeName = ""; - let letTe: *TypeExpr = Lcx_SubstituteType(ctx, stmt.refStmtType); - if letTe != null as *TypeExpr { - xAlloca.intValue = letTe.kind; - xAlloca.typeKind = Lcx_ResolveTypeKind(letTe); - if letTe.kind == tekFunc { - xAlloca.typeName = Lcx_BuildFuncTypeName(letTe); - } else if letTe.kind == tekPointer && letTe.pointerPointee != null as *TypeExpr { - xAlloca.typeName = String_Concat(letTe.pointerPointee.typeName, "*"); - } else if !String_Eq(letTe.typeName, "") { - xAlloca.typeName = letTe.typeName; - } - } - var xSym: Symbol; - xSym.kind = skVar; - xSym.name = stmt.strValue; - xSym.typeKind = xAlloca.typeKind; - xSym.typeName = xAlloca.typeName; - xSym.refType = letTe; - xSym.isMutable = false; - xSym.isPublic = false; - xSym.decl = null as *Decl; - discard Scope_Define(ctx.scope, xSym); - - let xStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - xStore.kind = hStore; - xStore.line = line; - xStore.column = col; - xStore.child1 = xAlloca; - xStore.child2 = okLoad; - - tmpAlloca.child3 = tmpStore; - tmpStore.child3 = ifNode; - ifNode.child3 = xStore; - let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - blockNode.kind = hBlock; - blockNode.line = line; - blockNode.column = col; - blockNode.child1 = tmpAlloca; - return blockNode; - } - - let init: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); - // alloca for the variable - let alloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - alloca.kind = hAlloca; - alloca.line = line; - alloca.column = col; - alloca.strValue = stmt.strValue; - // Set type from the declared type expression (with generic substitution) - alloca.typeName = ""; - let letTe: *TypeExpr = Lcx_SubstituteType(ctx, stmt.refStmtType); - if letTe != null as *TypeExpr { - alloca.intValue = letTe.kind; - alloca.typeKind = Lcx_ResolveTypeKind(letTe); - // For function types, build C function-pointer syntax - if letTe.kind == tekFunc { - alloca.typeName = Lcx_BuildFuncTypeName(letTe); - } else if letTe.kind == tekPointer && letTe.pointerPointee != null as *TypeExpr { - alloca.typeName = String_Concat(letTe.pointerPointee.typeName, "*"); - } else if !String_Eq(letTe.typeName, "") { - alloca.typeName = letTe.typeName; - } - } - // Add to scope for field offset lookups (skip if already defined) - var sym: Symbol; - sym.kind = skVar; - sym.name = stmt.strValue; - sym.typeKind = alloca.typeKind; - sym.typeName = alloca.typeName; - sym.refType = letTe; - sym.isMutable = false; - sym.isPublic = false; - sym.decl = null as *Decl; - discard Scope_Define(ctx.scope, sym); - - // Match (or other multi-stmt yield) as let initializer: - // match stmts...; Type x = __match_N; - // instead of illegal `Type x = ;` - if Lcx_IsMatchYield(init) { - let yieldName: String = init.strValue; - init.strValue = ""; - let yieldVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - yieldVar.kind = hVar; - yieldVar.strValue = yieldName; - let storeNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - storeNode.kind = hStore; - storeNode.line = line; - storeNode.column = col; - storeNode.child1 = alloca; - storeNode.child2 = yieldVar; - Lcx_AppendToChain(init, storeNode); - return init; - } - - // store the init value - let storeNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - storeNode.kind = hStore; - storeNode.child1 = alloca; - storeNode.child2 = init; - - // Auto-Drop for @[Drop] types and heap-allocated stdlib types - var deferNode: *HirNode = null as *HirNode; - if !String_Eq(alloca.typeName, "") { - let typeName: String = alloca.typeName; - let freeName: String = Lcx_BuildAutoDropFree(ctx, typeName); - if !String_Eq(freeName, "") { - let varRef: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - varRef.kind = hVar; - varRef.strValue = stmt.strValue; - let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrNode.kind = hUnary; - addrNode.intValue = tkAmp; - addrNode.child1 = varRef; - let callNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - callNode.kind = hCall; - callNode.strValue = freeName; - callNode.child1 = addrNode; - deferNode = bux_alloc(sizeof(HirNode)) as *HirNode; - deferNode.kind = hDefer; - deferNode.child1 = callNode; - } - } - - // Capturing closures allocate env via __make_* at ekClosure site. - // Wrap with defer if present - if deferNode != null as *HirNode { - storeNode.child3 = deferNode; - let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - blockNode.kind = hBlock; - blockNode.line = line; - blockNode.column = col; - blockNode.child1 = storeNode; - return blockNode; - } - return storeNode; - } - - // Return - if kind == skReturn { - if stmt.child1 != null as *Expr { - let retVal: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); - // `return match { ... }` / other multi-stmt yields: expand stmts then return result var - if retVal != null as *HirNode && Lcx_IsMatchYield(retVal) { - let retVar: *HirNode = Lcx_YieldVarOf(retVal); + // if (tmp.tag == errTag) return tmp + let tagPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tagPtr.kind = hFieldPtr; + tagPtr.line = line; + tagPtr.column = col; + tagPtr.strValue = "tag"; + tagPtr.child1 = tmpVarRef; + let tagLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + tagLoad.kind = hLoad; + tagLoad.line = line; + tagLoad.column = col; + tagLoad.child1 = tagPtr; + let errConst: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + errConst.kind = hVar; + errConst.strValue = errTag; + let cond: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + cond.kind = hBinary; + cond.line = line; + cond.column = col; + cond.intValue = tkEq; + cond.child1 = tagLoad; + cond.child2 = errConst; let retNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; retNode.kind = hReturn; retNode.line = line; retNode.column = col; - retNode.child1 = retVar; - retVal.strValue = ""; - var lastIn: *HirNode = retVal.child1; - if lastIn == null as *HirNode { - retVal.child1 = retNode; - } else { - while lastIn.child3 != null as *HirNode { - lastIn = lastIn.child3; + retNode.child1 = tmpVarRef; + let thenBlock: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + thenBlock.kind = hBlock; + thenBlock.line = line; + thenBlock.column = col; + thenBlock.child1 = retNode; + let ifNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + ifNode.kind = hIf; + ifNode.line = line; + ifNode.column = col; + ifNode.child1 = cond; + ifNode.child2 = thenBlock; + + // New initializer: tmp.data.OkField + let dataPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + dataPtr.kind = hFieldPtr; + dataPtr.line = line; + dataPtr.column = col; + dataPtr.strValue = "data"; + dataPtr.child1 = tmpVarRef; + let dataLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + dataLoad.kind = hLoad; + dataLoad.line = line; + dataLoad.column = col; + dataLoad.child1 = dataPtr; + let okPtr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + okPtr.kind = hFieldPtr; + okPtr.line = line; + okPtr.column = col; + okPtr.strValue = okField; + okPtr.child1 = dataLoad; + let okLoad: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + okLoad.kind = hLoad; + okLoad.line = line; + okLoad.column = col; + okLoad.child1 = okPtr; + + // alloca x + let xAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + xAlloca.kind = hAlloca; + xAlloca.line = line; + xAlloca.column = col; + xAlloca.strValue = stmt.strValue; + xAlloca.typeName = ""; + let letTe: *TypeExpr = Lcx_SubstituteType(ctx, stmt.refStmtType); + if letTe != null as *TypeExpr { + xAlloca.intValue = letTe.kind; + xAlloca.typeKind = Lcx_ResolveTypeKind(letTe); + if letTe.kind == tekFunc { + xAlloca.typeName = Lcx_BuildFuncTypeName(letTe); + } else if letTe.kind == tekPointer && letTe.pointerPointee != null as *TypeExpr { + xAlloca.typeName = String_Concat(letTe.pointerPointee.typeName, "*"); + } else if !String_Eq(letTe.typeName, "") { + xAlloca.typeName = letTe.typeName; } - lastIn.child3 = retNode; } - return retVal; - } - n.kind = hReturn; - n.child1 = retVal; - return n; - } - n.kind = hReturn; - return n; - } + var xSym: Symbol; + xSym.kind = skVar; + xSym.name = stmt.strValue; + xSym.typeKind = xAlloca.typeKind; + xSym.typeName = xAlloca.typeName; + xSym.refType = letTe; + xSym.isMutable = false; + xSym.isPublic = false; + xSym.decl = null as *Decl; + discard Scope_Define(ctx.scope, xSym); - // Expression statement - if kind == skExpr && stmt.child1 != null as *Expr { - return Lcx_LowerExpr(ctx, stmt.child1); - } + let xStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + xStore.kind = hStore; + xStore.line = line; + xStore.column = col; + xStore.child1 = xAlloca; + xStore.child2 = okLoad; - // If - if kind == skIf { - n.kind = hIf; - n.child1 = Lcx_LowerExpr(ctx, stmt.child1); // condition - if stmt.refStmtBlock != null as *Block { - n.child2 = Lcx_LowerBlock(ctx, stmt.refStmtBlock, -1); - } - if stmt.refStmtElse != null as *Block { - n.extraData = Lcx_LowerBlock(ctx, stmt.refStmtElse, -1) as *void; - } - return n; - } - - // While - if kind == skWhile { - n.kind = hWhile; - n.child1 = Lcx_LowerExpr(ctx, stmt.child1); - if stmt.refStmtBlock != null as *Block { - n.child2 = Lcx_LowerBlock(ctx, stmt.refStmtBlock, -1); - } - return n; - } - - // Loop - if kind == skLoop { - n.kind = hLoop; - if stmt.refStmtBlock != null as *Block { - n.child1 = Lcx_LowerBlock(ctx, stmt.refStmtBlock, -1); - } - return n; - } - - // For - if kind == skFor { - let iterExpr: *Expr = stmt.child1; - let varName: String = stmt.strValue; - let body: *Block = stmt.refStmtBlock; - - // Range-based for: for i in lo..hi { body } - // (selfhost parses .. as ekBinary; bootstrap parses as ekRange) - let isRangeExpr: bool = iterExpr != null as *Expr && (iterExpr.kind == ekRange || (iterExpr.kind == ekBinary && (iterExpr.intValue == tkDotDot || iterExpr.intValue == tkDotDotEqual))); - if isRangeExpr { - let lo: *HirNode = Lcx_LowerExpr(ctx, iterExpr.child1); - let hi: *HirNode = Lcx_LowerExpr(ctx, iterExpr.child2); - var inclusive: bool = iterExpr.boolValue; - if iterExpr.kind == ekBinary && iterExpr.intValue == tkDotDotEqual { - inclusive = true; + tmpAlloca.child3 = tmpStore; + tmpStore.child3 = ifNode; + ifNode.child3 = xStore; + let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + blockNode.kind = hBlock; + blockNode.line = line; + blockNode.column = col; + blockNode.child1 = tmpAlloca; + return blockNode; } - let varTypeKind: int = tyInt; - let varTypeName: String = "int"; - - // alloca for loop variable + let init: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); + // alloca for the variable let alloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; alloca.kind = hAlloca; alloca.line = line; alloca.column = col; - alloca.strValue = varName; - alloca.typeName = varTypeName; - alloca.typeKind = varTypeKind; - - // store init value - let store: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - store.kind = hStore; - store.child1 = alloca; - store.child2 = lo; - - // var node for reading in condition - let varRead: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - varRead.kind = hVar; - varRead.strValue = varName; - varRead.typeName = varTypeName; - varRead.typeKind = varTypeKind; - - // condition: var < hi (or <=) - let cond: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - cond.kind = hBinary; - if inclusive { - cond.intValue = tkLe; - } else { - cond.intValue = tkLt; + alloca.strValue = stmt.strValue; + // Set type from the declared type expression (with generic substitution) + alloca.typeName = ""; + let letTe: *TypeExpr = Lcx_SubstituteType(ctx, stmt.refStmtType); + if letTe != null as *TypeExpr { + alloca.intValue = letTe.kind; + alloca.typeKind = Lcx_ResolveTypeKind(letTe); + // For function types, build C function-pointer syntax + if letTe.kind == tekFunc { + alloca.typeName = Lcx_BuildFuncTypeName(letTe); + } else if letTe.kind == tekPointer && letTe.pointerPointee != null as *TypeExpr { + alloca.typeName = String_Concat(letTe.pointerPointee.typeName, "*"); + } else if !String_Eq(letTe.typeName, "") { + alloca.typeName = letTe.typeName; + } } - cond.child1 = varRead; - cond.child2 = hi; + // Add to scope for field offset lookups (skip if already defined) + var sym: Symbol; + sym.kind = skVar; + sym.name = stmt.strValue; + sym.typeKind = alloca.typeKind; + sym.typeName = alloca.typeName; + sym.refType = letTe; + sym.isMutable = false; + sym.isPublic = false; + sym.decl = null as *Decl; + discard Scope_Define(ctx.scope, sym); - // Build while body: original body + increment - let bodyBlock: *HirNode = Lcx_LowerBlock(ctx, body, -1); + // Match (or other multi-stmt yield) as let initializer: + // match stmts...; Type x = __match_N; + // instead of illegal `Type x = ;` + if Lcx_IsMatchYield(init) { + let yieldName: String = init.strValue; + init.strValue = ""; + let yieldVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + yieldVar.kind = hVar; + yieldVar.strValue = yieldName; + let storeNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + storeNode.kind = hStore; + storeNode.line = line; + storeNode.column = col; + storeNode.child1 = alloca; + storeNode.child2 = yieldVar; + Lcx_AppendToChain(init, storeNode); + return init; + } - // increment: var = var + 1 - let varRead2: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - varRead2.kind = hVar; - varRead2.strValue = varName; - varRead2.typeName = varTypeName; - varRead2.typeKind = varTypeKind; + // store the init value + let storeNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + storeNode.kind = hStore; + storeNode.child1 = alloca; + storeNode.child2 = init; - let one: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - one.kind = hLit; - one.intValue = tkIntLiteral; - one.strValue = "1"; - one.typeKind = varTypeKind; + // Auto-Drop for @[Drop] types and heap-allocated stdlib types + var deferNode: *HirNode = null as *HirNode; + if !String_Eq(alloca.typeName, "") { + let typeName: String = alloca.typeName; + let freeName: String = Lcx_BuildAutoDropFree(ctx, typeName); + if !String_Eq(freeName, "") { + let varRef: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + varRef.kind = hVar; + varRef.strValue = stmt.strValue; + let addrNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrNode.kind = hUnary; + addrNode.intValue = tkAmp; + addrNode.child1 = varRef; + let callNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + callNode.kind = hCall; + callNode.strValue = freeName; + callNode.child1 = addrNode; + deferNode = bux_alloc(sizeof(HirNode)) as *HirNode; + deferNode.kind = hDefer; + deferNode.child1 = callNode; + } + } - let inc: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - inc.kind = hBinary; - inc.intValue = tkPlus; - inc.child1 = varRead2; - inc.child2 = one; + // Capturing closures allocate env via __make_* at ekClosure site. + // Wrap with defer if present + if deferNode != null as *HirNode { + storeNode.child3 = deferNode; + let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + blockNode.kind = hBlock; + blockNode.line = line; + blockNode.column = col; + blockNode.child1 = storeNode; + return blockNode; + } + return storeNode; + } - let storeInc: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - storeInc.kind = hStore; - // Use hVar (not alloca) for assignment to existing variable - let varForInc: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - varForInc.kind = hVar; - varForInc.strValue = varName; - varForInc.typeName = varTypeName; - varForInc.typeKind = varTypeKind; - storeInc.child1 = varForInc; - storeInc.child2 = inc; + // Return + if kind == skReturn { + if stmt.child1 != null as *Expr { + let retVal: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); + // `return match { ... }` / other multi-stmt yields: expand stmts then return result var + if retVal != null as *HirNode && Lcx_IsMatchYield(retVal) { + let retVar: *HirNode = Lcx_YieldVarOf(retVal); + let retNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + retNode.kind = hReturn; + retNode.line = line; + retNode.column = col; + retNode.child1 = retVar; + retVal.strValue = ""; + var lastIn: *HirNode = retVal.child1; + if lastIn == null as *HirNode { + retVal.child1 = retNode; + } else { + while lastIn.child3 != null as *HirNode { + lastIn = lastIn.child3; + } + lastIn.child3 = retNode; + } + return retVal; + } + n.kind = hReturn; + n.child1 = retVal; + return n; + } + n.kind = hReturn; + return n; + } - // Append storeInc to body block chain - if bodyBlock != null as *HirNode && bodyBlock.kind == hBlock { - if bodyBlock.child1 != null as *HirNode { - var last: *HirNode = bodyBlock.child1; + // Expression statement + if kind == skExpr && stmt.child1 != null as *Expr { + return Lcx_LowerExpr(ctx, stmt.child1); + } + + // If + if kind == skIf { + n.kind = hIf; + n.child1 = Lcx_LowerExpr(ctx, stmt.child1); // condition + if stmt.refStmtBlock != null as *Block { + n.child2 = Lcx_LowerBlock(ctx, stmt.refStmtBlock, -1); + } + if stmt.refStmtElse != null as *Block { + n.extraData = Lcx_LowerBlock(ctx, stmt.refStmtElse, -1) as *void; + } + return n; + } + + // While + if kind == skWhile { + n.kind = hWhile; + n.child1 = Lcx_LowerExpr(ctx, stmt.child1); + if stmt.refStmtBlock != null as *Block { + n.child2 = Lcx_LowerBlock(ctx, stmt.refStmtBlock, -1); + } + return n; + } + + // Loop + if kind == skLoop { + n.kind = hLoop; + if stmt.refStmtBlock != null as *Block { + n.child1 = Lcx_LowerBlock(ctx, stmt.refStmtBlock, -1); + } + return n; + } + + // For + if kind == skFor { + let iterExpr: *Expr = stmt.child1; + let varName: String = stmt.strValue; + let body: *Block = stmt.refStmtBlock; + + // Range-based for: for i in lo..hi { body } + // (selfhost parses .. as ekBinary; bootstrap parses as ekRange) + let isRangeExpr: bool = iterExpr != null as *Expr && (iterExpr.kind == ekRange || (iterExpr.kind == ekBinary && (iterExpr.intValue == tkDotDot || iterExpr.intValue == tkDotDotEqual))); + if isRangeExpr { + let lo: *HirNode = Lcx_LowerExpr(ctx, iterExpr.child1); + let hi: *HirNode = Lcx_LowerExpr(ctx, iterExpr.child2); + var inclusive: bool = iterExpr.boolValue; + if iterExpr.kind == ekBinary && iterExpr.intValue == tkDotDotEqual { + inclusive = true; + } + + let varTypeKind: int = tyInt; + let varTypeName: String = "int"; + + // alloca for loop variable + let alloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + alloca.kind = hAlloca; + alloca.line = line; + alloca.column = col; + alloca.strValue = varName; + alloca.typeName = varTypeName; + alloca.typeKind = varTypeKind; + + // store init value + let store: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + store.kind = hStore; + store.child1 = alloca; + store.child2 = lo; + + // var node for reading in condition + let varRead: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + varRead.kind = hVar; + varRead.strValue = varName; + varRead.typeName = varTypeName; + varRead.typeKind = varTypeKind; + + // condition: var < hi (or <=) + let cond: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + cond.kind = hBinary; + if inclusive { + cond.intValue = tkLe; + } else { + cond.intValue = tkLt; + } + cond.child1 = varRead; + cond.child2 = hi; + + // Build while body: original body + increment + let bodyBlock: *HirNode = Lcx_LowerBlock(ctx, body, -1); + + // increment: var = var + 1 + let varRead2: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + varRead2.kind = hVar; + varRead2.strValue = varName; + varRead2.typeName = varTypeName; + varRead2.typeKind = varTypeKind; + + let one: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + one.kind = hLit; + one.intValue = tkIntLiteral; + one.strValue = "1"; + one.typeKind = varTypeKind; + + let inc: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + inc.kind = hBinary; + inc.intValue = tkPlus; + inc.child1 = varRead2; + inc.child2 = one; + + let storeInc: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + storeInc.kind = hStore; + // Use hVar (not alloca) for assignment to existing variable + let varForInc: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + varForInc.kind = hVar; + varForInc.strValue = varName; + varForInc.typeName = varTypeName; + varForInc.typeKind = varTypeKind; + storeInc.child1 = varForInc; + storeInc.child2 = inc; + + // Append storeInc to body block chain + if bodyBlock != null as *HirNode && bodyBlock.kind == hBlock { + if bodyBlock.child1 != null as *HirNode { + var last: *HirNode = bodyBlock.child1; + while last.child3 != null as *HirNode { + last = last.child3; + } + last.child3 = storeInc; + } else { + bodyBlock.child1 = storeInc; + } + } else if bodyBlock != null as *HirNode { + // Wrap single node into a block + let wrapBlock: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + wrapBlock.kind = hBlock; + wrapBlock.child1 = bodyBlock; + var last: *HirNode = bodyBlock; while last.child3 != null as *HirNode { last = last.child3; } last.child3 = storeInc; + bodyBlock = wrapBlock; } else { - bodyBlock.child1 = storeInc; + let wrapBlock: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + wrapBlock.kind = hBlock; + wrapBlock.child1 = storeInc; + bodyBlock = wrapBlock; } - } else if bodyBlock != null as *HirNode { - // Wrap single node into a block - let wrapBlock: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - wrapBlock.kind = hBlock; - wrapBlock.child1 = bodyBlock; - var last: *HirNode = bodyBlock; - while last.child3 != null as *HirNode { - last = last.child3; - } - last.child3 = storeInc; - bodyBlock = wrapBlock; - } else { - let wrapBlock: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - wrapBlock.kind = hBlock; - wrapBlock.child1 = storeInc; - bodyBlock = wrapBlock; + + // while node + let whileNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + whileNode.kind = hWhile; + whileNode.child1 = cond; + whileNode.child2 = bodyBlock; + + // Chain: store (contains alloca as child1) -> while + // C backend emits hStore with hAlloca child1 as "Type x = value;" + store.child3 = whileNode; + + let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + blockNode.kind = hBlock; + blockNode.line = line; + blockNode.column = col; + blockNode.child1 = store; + return blockNode; } - // while node - let whileNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - whileNode.kind = hWhile; - whileNode.child1 = cond; - whileNode.child2 = bodyBlock; - - // Chain: store (contains alloca as child1) -> while - // C backend emits hStore with hAlloca child1 as "Type x = value;" - store.child3 = whileNode; - - let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - blockNode.kind = hBlock; - blockNode.line = line; - blockNode.column = col; - blockNode.child1 = store; - return blockNode; - } - - // Collection-based for: for x in arr { body } - // Desugar to: - // let __iter = Array_Iter_T(&arr); - // while Iter_HasNext_T(&__iter) { - // let x = Iter_Next_T(&__iter); - // body - // } - if iterExpr != null as *Expr { - let collTypeExpr: *TypeExpr = iterExpr.refType; - if collTypeExpr == null as *TypeExpr && iterExpr.kind == ekIdent { - // Fallback: try scope lookup (may have substituted type) - let collSym: Symbol = Scope_Lookup(ctx.scope, iterExpr.strValue); - collTypeExpr = collSym.refType; - } - if collTypeExpr != null as *TypeExpr && collTypeExpr.kind == tekNamed { - let collTypeName: String = collTypeExpr.typeName; - var elemTypeName: String = ""; - var elemTypeKind: int = tyInt; - if collTypeExpr.typeArgCount > 0 { - elemTypeName = collTypeExpr.typeArgName0; - elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName); + // Collection-based for: for x in arr { body } + // Desugar to: + // let __iter = Array_Iter_T(&arr); + // while Iter_HasNext_T(&__iter) { + // let x = Iter_Next_T(&__iter); + // body + // } + if iterExpr != null as *Expr { + let collTypeExpr: *TypeExpr = iterExpr.refType; + if collTypeExpr == null as *TypeExpr && iterExpr.kind == ekIdent { + // Fallback: try scope lookup (may have substituted type) + let collSym: Symbol = Scope_Lookup(ctx.scope, iterExpr.strValue); + collTypeExpr = collSym.refType; } + if collTypeExpr != null as *TypeExpr && collTypeExpr.kind == tekNamed { + let collTypeName: String = collTypeExpr.typeName; + var elemTypeName: String = ""; + var elemTypeKind: int = tyInt; + if collTypeExpr.typeArgCount > 0 { + elemTypeName = collTypeExpr.typeArgName0; + elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName); + } - // Handle already-monomorphized types like Array_int, Iter_string - var isArray: bool = String_Eq(collTypeName, "Array"); - var isIter: bool = String_Eq(collTypeName, "Iter"); - var isChannel: bool = String_Eq(collTypeName, "Channel"); + // Handle already-monomorphized types like Array_int, Iter_string + var isArray: bool = String_Eq(collTypeName, "Array"); + var isIter: bool = String_Eq(collTypeName, "Iter"); + var isChannel: bool = String_Eq(collTypeName, "Channel"); - // Also check for mangled names like Array_int, Iter_string - if !isArray && !isIter && !isChannel { - if String_StartsWith(collTypeName, "Array_") { - isArray = true; - let prefixLen: uint = 6; // len("Array_") - let totalLen: uint = bux_strlen(collTypeName); - if totalLen > prefixLen { - elemTypeName = bux_str_slice(collTypeName, prefixLen, totalLen - prefixLen); - elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName); + // Also check for mangled names like Array_int, Iter_string + if !isArray && !isIter && !isChannel { + if String_StartsWith(collTypeName, "Array_") { + isArray = true; + let prefixLen: uint = 6; // len("Array_") + let totalLen: uint = bux_strlen(collTypeName); + if totalLen > prefixLen { + elemTypeName = bux_str_slice(collTypeName, prefixLen, totalLen - prefixLen); + elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName); + } + } else if String_StartsWith(collTypeName, "Iter_") { + isIter = true; + let prefixLen: uint = 5; // len("Iter_") + let totalLen: uint = bux_strlen(collTypeName); + if totalLen > prefixLen { + elemTypeName = bux_str_slice(collTypeName, prefixLen, totalLen - prefixLen); + elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName); + } + } else if String_StartsWith(collTypeName, "Channel_") { + isChannel = true; + let prefixLen: uint = 8; // len("Channel_") + let totalLen: uint = bux_strlen(collTypeName); + if totalLen > prefixLen { + elemTypeName = bux_str_slice(collTypeName, prefixLen, totalLen - prefixLen); + elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName); + } } - } else if String_StartsWith(collTypeName, "Iter_") { - isIter = true; - let prefixLen: uint = 5; // len("Iter_") - let totalLen: uint = bux_strlen(collTypeName); - if totalLen > prefixLen { - elemTypeName = bux_str_slice(collTypeName, prefixLen, totalLen - prefixLen); - elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName); + } + + if !String_Eq(elemTypeName, "") { + if isChannel { + // Channel-based for: for x in ch { body } + // Desugar to: + // while true { + // let x: T; + // if !Channel_Recv_Ok_T(&ch, &x) { break; } + // body + // } + let recvOkFuncName: String = Lcx_MangleName("Channel_Recv_Ok", elemTypeName, "", 1); + let genRecvOk: *Decl = Lcx_FindGenericFunc(ctx, "Channel_Recv_Ok"); + if genRecvOk != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genRecvOk, elemTypeName, "", 1); + } + + let bodyBlock: *HirNode = Lcx_LowerBlock(ctx, body, -1); + + // alloca for x + let xAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + xAlloca.kind = hAlloca; + xAlloca.line = line; + xAlloca.column = col; + xAlloca.strValue = varName; + xAlloca.typeName = elemTypeName; + xAlloca.typeKind = elemTypeKind; + + // call Channel_Recv_Ok_T(&ch, &x) + let recvOkCall: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + recvOkCall.kind = hCall; + recvOkCall.strValue = recvOkFuncName; + let addrCh: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrCh.kind = hUnary; + addrCh.intValue = tkAmp; + if iterExpr.kind == ekIdent { + let chVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + chVar.kind = hVar; + chVar.strValue = iterExpr.strValue; + addrCh.child1 = chVar; + } else { + addrCh.child1 = Lcx_LowerExpr(ctx, iterExpr); + } + let addrX: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrX.kind = hUnary; + addrX.intValue = tkAmp; + let xVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + xVar.kind = hVar; + xVar.strValue = varName; + addrX.child1 = xVar; + recvOkCall.child1 = addrCh; + recvOkCall.child2 = addrX; + + // if !recvOk { break; } + let notRecvOk: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + notRecvOk.kind = hUnary; + notRecvOk.intValue = tkBang; + notRecvOk.child1 = recvOkCall; + let breakNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + breakNode.kind = hBreak; + let ifNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + ifNode.kind = hIf; + ifNode.child1 = notRecvOk; + ifNode.child2 = breakNode; + + // Build while body block: ifNode -> bodyBlock + let whileBody: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + whileBody.kind = hBlock; + whileBody.child1 = xAlloca; + xAlloca.child3 = ifNode; + if bodyBlock != null as *HirNode && bodyBlock.kind == hBlock { + ifNode.child3 = bodyBlock.child1; + } else if bodyBlock != null as *HirNode { + ifNode.child3 = bodyBlock; + } + + // while true + let trueLit: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + trueLit.kind = hLit; + trueLit.intValue = tkBoolLiteral; + trueLit.strValue = "true"; + let whileNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + whileNode.kind = hWhile; + whileNode.child1 = trueLit; + whileNode.child2 = whileBody; + + let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + blockNode.kind = hBlock; + blockNode.line = line; + blockNode.column = col; + blockNode.child1 = whileNode; + return blockNode; } - } else if String_StartsWith(collTypeName, "Channel_") { - isChannel = true; - let prefixLen: uint = 8; // len("Channel_") - let totalLen: uint = bux_strlen(collTypeName); - if totalLen > prefixLen { - elemTypeName = bux_str_slice(collTypeName, prefixLen, totalLen - prefixLen); - elemTypeKind = Lcx_ResolveTypeKindFromName(elemTypeName); + if isArray || isIter { + let iterVarName: String = String_Concat("__iter_", varName); + let iterTypeName: String = Lcx_MangleName("Iter", elemTypeName, "", 1); + + // Ensure struct instances exist + let iterGenStruct: *Decl = Lcx_FindGenericStruct(ctx, "Iter"); + if iterGenStruct != null as *Decl { + Lcx_GenerateStructInstance(ctx, iterGenStruct, elemTypeName, "", 1); + } + + // Ensure function instances exist + let genIter: *Decl = Lcx_FindGenericFunc(ctx, "Array_Iter"); + let genHasNext: *Decl = Lcx_FindGenericFunc(ctx, "Iter_HasNext"); + let genNext: *Decl = Lcx_FindGenericFunc(ctx, "Iter_Next"); + let iterFuncName: String = Lcx_MangleName("Array_Iter", elemTypeName, "", 1); + let hasNextFuncName: String = Lcx_MangleName("Iter_HasNext", elemTypeName, "", 1); + let nextFuncName: String = Lcx_MangleName("Iter_Next", elemTypeName, "", 1); + if genIter != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genIter, elemTypeName, "", 1); + } + if genHasNext != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genHasNext, elemTypeName, "", 1); + } + if genNext != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genNext, elemTypeName, "", 1); + } + + // alloca for __iter + let iterAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + iterAlloca.kind = hAlloca; + iterAlloca.line = line; + iterAlloca.column = col; + iterAlloca.strValue = iterVarName; + iterAlloca.typeName = iterTypeName; + iterAlloca.typeKind = tyNamed; + + // __iter = Array_Iter_T(&arr) or just copy if already Iter + var iterInit: *HirNode = null as *HirNode; + var collStore: *HirNode = null as *HirNode; + if isArray { + let callIter: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + callIter.kind = hCall; + callIter.strValue = iterFuncName; + let addrArr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrArr.kind = hUnary; + addrArr.intValue = tkAmp; + if iterExpr.kind == ekIdent { + let arrVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + arrVar.kind = hVar; + arrVar.strValue = iterExpr.strValue; + addrArr.child1 = arrVar; + } else { + // Non-identifier: create temp variable for collection + ctx.varCounter = ctx.varCounter + 1; + let tmpName: String = String_Concat("__tmp_coll_", String_FromInt(ctx.varCounter)); + // Ensure Array struct instance exists and get mangled name + let arrayGenStruct: *Decl = Lcx_FindGenericStruct(ctx, "Array"); + var arrayMangledName: String = collTypeName; + if arrayGenStruct != null as *Decl { + arrayMangledName = Lcx_GenerateStructInstance(ctx, arrayGenStruct, elemTypeName, "", 1); + } + let collAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + collAlloca.kind = hAlloca; + collAlloca.strValue = tmpName; + collAlloca.typeName = arrayMangledName; + collAlloca.typeKind = tyNamed; + collStore = bux_alloc(sizeof(HirNode)) as *HirNode; + collStore.kind = hStore; + collStore.child1 = collAlloca; + collStore.child2 = Lcx_LowerExpr(ctx, iterExpr); + let collVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + collVar.kind = hVar; + collVar.strValue = tmpName; + addrArr.child1 = collVar; + } + callIter.child1 = addrArr; + iterInit = callIter; + } else { + // Already an iterator: __iter = arr + if iterExpr.kind == ekIdent { + let arrVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + arrVar.kind = hVar; + arrVar.strValue = iterExpr.strValue; + iterInit = arrVar; + } else { + iterInit = Lcx_LowerExpr(ctx, iterExpr); + } + } + + let iterStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + iterStore.kind = hStore; + iterStore.child1 = iterAlloca; + iterStore.child2 = iterInit; + + // Chain collStore -> iterStore if temp was created + if collStore != null as *HirNode { + collStore.child3 = iterStore; + } + + // condition: Iter_HasNext_T(&__iter) + let condCall: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + condCall.kind = hCall; + condCall.strValue = hasNextFuncName; + let addrIter: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrIter.kind = hUnary; + addrIter.intValue = tkAmp; + let iterVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + iterVar.kind = hVar; + iterVar.strValue = iterVarName; + addrIter.child1 = iterVar; + condCall.child1 = addrIter; + + // while body: alloca x + store x = Iter_Next_T(&__iter) + original body + let bodyBlock: *HirNode = Lcx_LowerBlock(ctx, body, -1); + + // alloca for x + let xAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + xAlloca.kind = hAlloca; + xAlloca.line = line; + xAlloca.column = col; + xAlloca.strValue = varName; + xAlloca.typeName = elemTypeName; + xAlloca.typeKind = elemTypeKind; + + // x = Iter_Next_T(&__iter) + let nextCall: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + nextCall.kind = hCall; + nextCall.strValue = nextFuncName; + let addrIter2: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + addrIter2.kind = hUnary; + addrIter2.intValue = tkAmp; + let iterVar2: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + iterVar2.kind = hVar; + iterVar2.strValue = iterVarName; + addrIter2.child1 = iterVar2; + nextCall.child1 = addrIter2; + + let xStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + xStore.kind = hStore; + xStore.child1 = xAlloca; + xStore.child2 = nextCall; + + // Build while body block: xStore -> bodyBlock + let whileBody: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + whileBody.kind = hBlock; + whileBody.child1 = xStore; + if bodyBlock != null as *HirNode && bodyBlock.kind == hBlock { + xStore.child3 = bodyBlock.child1; + } else if bodyBlock != null as *HirNode { + xStore.child3 = bodyBlock; + } + + // while node + let whileNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + whileNode.kind = hWhile; + whileNode.child1 = condCall; + whileNode.child2 = whileBody; + + // Chain: iterStore -> whileNode + iterStore.child3 = whileNode; + + let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + blockNode.kind = hBlock; + blockNode.line = line; + blockNode.column = col; + if collStore != null as *HirNode { + blockNode.child1 = collStore; + } else { + blockNode.child1 = iterStore; + } + return blockNode; } } } + } - if !String_Eq(elemTypeName, "") { - if isChannel { - // Channel-based for: for x in ch { body } - // Desugar to: - // while true { - // let x: T; - // if !Channel_Recv_Ok_T(&ch, &x) { break; } - // body - // } - let recvOkFuncName: String = Lcx_MangleName("Channel_Recv_Ok", elemTypeName, "", 1); - let genRecvOk: *Decl = Lcx_FindGenericFunc(ctx, "Channel_Recv_Ok"); - if genRecvOk != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genRecvOk, elemTypeName, "", 1); - } + // Fallback: infinite loop + n.kind = hLoop; + if stmt.refStmtBlock != null as *Block { + n.child1 = Lcx_LowerBlock(ctx, stmt.refStmtBlock, -1); + } + return n; + } - let bodyBlock: *HirNode = Lcx_LowerBlock(ctx, body, -1); + // Break + if kind == skBreak { + n.kind = hBreak; + return n; + } - // alloca for x - let xAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - xAlloca.kind = hAlloca; - xAlloca.line = line; - xAlloca.column = col; - xAlloca.strValue = varName; - xAlloca.typeName = elemTypeName; - xAlloca.typeKind = elemTypeKind; + // Continue + if kind == skContinue { + n.kind = hContinue; + return n; + } - // call Channel_Recv_Ok_T(&ch, &x) - let recvOkCall: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - recvOkCall.kind = hCall; - recvOkCall.strValue = recvOkFuncName; - let addrCh: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrCh.kind = hUnary; - addrCh.intValue = tkAmp; - if iterExpr.kind == ekIdent { - let chVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - chVar.kind = hVar; - chVar.strValue = iterExpr.strValue; - addrCh.child1 = chVar; - } else { - addrCh.child1 = Lcx_LowerExpr(ctx, iterExpr); - } - let addrX: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrX.kind = hUnary; - addrX.intValue = tkAmp; - let xVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - xVar.kind = hVar; - xVar.strValue = varName; - addrX.child1 = xVar; - recvOkCall.child1 = addrCh; - recvOkCall.child2 = addrX; + // Defer + if kind == skDefer { + n.kind = hDefer; + if stmt.child1 != null as *Expr { + n.child1 = Lcx_LowerExpr(ctx, stmt.child1); + } + return n; + } - // if !recvOk { break; } - let notRecvOk: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - notRecvOk.kind = hUnary; - notRecvOk.intValue = tkBang; - notRecvOk.child1 = recvOkCall; - let breakNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - breakNode.kind = hBreak; + // Switch — desugar to if-else chain + if kind == skSwitch { + let subject: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); + var current: *HirNode = null as *HirNode; + // Default first (bottom of chain) + if stmt.refStmtElse != null as *Block { + current = Lcx_LowerBlock(ctx, stmt.refStmtElse, -1); + } + // Cases in reverse order (from caseBlock) + if stmt.refStmtBlock != null as *Block { + let caseBlock: *Block = stmt.refStmtBlock; + var caseCount: int = caseBlock.stmtCount; + // Collect cases into array for reverse iteration + var c0: *Stmt = null as *Stmt; + var c1: *Stmt = null as *Stmt; + var c2: *Stmt = null as *Stmt; + var c3: *Stmt = null as *Stmt; + var c4: *Stmt = null as *Stmt; + var c5: *Stmt = null as *Stmt; + var c6: *Stmt = null as *Stmt; + var c7: *Stmt = null as *Stmt; + var ci: int = 0; + var cs: *Stmt = caseBlock.firstStmt; + while cs != null as *Stmt && ci < 8 { + if ci == 0 { c0 = cs; } + if ci == 1 { c1 = cs; } + if ci == 2 { c2 = cs; } + if ci == 3 { c3 = cs; } + if ci == 4 { c4 = cs; } + if ci == 5 { c5 = cs; } + if ci == 6 { c6 = cs; } + if ci == 7 { c7 = cs; } + ci = ci + 1; + cs = cs.nextStmt; + } + while caseCount > 0 { + caseCount = caseCount - 1; + var c: *Stmt = null as *Stmt; + if caseCount == 0 { c = c0; } + if caseCount == 1 { c = c1; } + if caseCount == 2 { c = c2; } + if caseCount == 3 { c = c3; } + if caseCount == 4 { c = c4; } + if caseCount == 5 { c = c5; } + if caseCount == 6 { c = c6; } + if caseCount == 7 { c = c7; } + if c != null as *Stmt { + let caseVal: *HirNode = Lcx_LowerExpr(ctx, c.child1); + let caseBody: *HirNode = Lcx_LowerBlock(ctx, c.refStmtBlock, -1); + let cond: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + cond.kind = hBinary; + cond.intValue = 74; // tkEq + cond.child1 = subject; + cond.child2 = caseVal; let ifNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; ifNode.kind = hIf; - ifNode.child1 = notRecvOk; - ifNode.child2 = breakNode; - - // Build while body block: ifNode -> bodyBlock - let whileBody: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - whileBody.kind = hBlock; - whileBody.child1 = xAlloca; - xAlloca.child3 = ifNode; - if bodyBlock != null as *HirNode && bodyBlock.kind == hBlock { - ifNode.child3 = bodyBlock.child1; - } else if bodyBlock != null as *HirNode { - ifNode.child3 = bodyBlock; - } - - // while true - let trueLit: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - trueLit.kind = hLit; - trueLit.intValue = tkBoolLiteral; - trueLit.strValue = "true"; - let whileNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - whileNode.kind = hWhile; - whileNode.child1 = trueLit; - whileNode.child2 = whileBody; - - let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - blockNode.kind = hBlock; - blockNode.line = line; - blockNode.column = col; - blockNode.child1 = whileNode; - return blockNode; - } - if isArray || isIter { - let iterVarName: String = String_Concat("__iter_", varName); - let iterTypeName: String = Lcx_MangleName("Iter", elemTypeName, "", 1); - - // Ensure struct instances exist - let iterGenStruct: *Decl = Lcx_FindGenericStruct(ctx, "Iter"); - if iterGenStruct != null as *Decl { - Lcx_GenerateStructInstance(ctx, iterGenStruct, elemTypeName, "", 1); - } - - // Ensure function instances exist - let genIter: *Decl = Lcx_FindGenericFunc(ctx, "Array_Iter"); - let genHasNext: *Decl = Lcx_FindGenericFunc(ctx, "Iter_HasNext"); - let genNext: *Decl = Lcx_FindGenericFunc(ctx, "Iter_Next"); - let iterFuncName: String = Lcx_MangleName("Array_Iter", elemTypeName, "", 1); - let hasNextFuncName: String = Lcx_MangleName("Iter_HasNext", elemTypeName, "", 1); - let nextFuncName: String = Lcx_MangleName("Iter_Next", elemTypeName, "", 1); - if genIter != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genIter, elemTypeName, "", 1); - } - if genHasNext != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genHasNext, elemTypeName, "", 1); - } - if genNext != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genNext, elemTypeName, "", 1); - } - - // alloca for __iter - let iterAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - iterAlloca.kind = hAlloca; - iterAlloca.line = line; - iterAlloca.column = col; - iterAlloca.strValue = iterVarName; - iterAlloca.typeName = iterTypeName; - iterAlloca.typeKind = tyNamed; - - // __iter = Array_Iter_T(&arr) or just copy if already Iter - var iterInit: *HirNode = null as *HirNode; - var collStore: *HirNode = null as *HirNode; - if isArray { - let callIter: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - callIter.kind = hCall; - callIter.strValue = iterFuncName; - let addrArr: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrArr.kind = hUnary; - addrArr.intValue = tkAmp; - if iterExpr.kind == ekIdent { - let arrVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - arrVar.kind = hVar; - arrVar.strValue = iterExpr.strValue; - addrArr.child1 = arrVar; - } else { - // Non-identifier: create temp variable for collection - ctx.varCounter = ctx.varCounter + 1; - let tmpName: String = String_Concat("__tmp_coll_", String_FromInt(ctx.varCounter)); - // Ensure Array struct instance exists and get mangled name - let arrayGenStruct: *Decl = Lcx_FindGenericStruct(ctx, "Array"); - var arrayMangledName: String = collTypeName; - if arrayGenStruct != null as *Decl { - arrayMangledName = Lcx_GenerateStructInstance(ctx, arrayGenStruct, elemTypeName, "", 1); - } - let collAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - collAlloca.kind = hAlloca; - collAlloca.strValue = tmpName; - collAlloca.typeName = arrayMangledName; - collAlloca.typeKind = tyNamed; - collStore = bux_alloc(sizeof(HirNode)) as *HirNode; - collStore.kind = hStore; - collStore.child1 = collAlloca; - collStore.child2 = Lcx_LowerExpr(ctx, iterExpr); - let collVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - collVar.kind = hVar; - collVar.strValue = tmpName; - addrArr.child1 = collVar; - } - callIter.child1 = addrArr; - iterInit = callIter; - } else { - // Already an iterator: __iter = arr - if iterExpr.kind == ekIdent { - let arrVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - arrVar.kind = hVar; - arrVar.strValue = iterExpr.strValue; - iterInit = arrVar; - } else { - iterInit = Lcx_LowerExpr(ctx, iterExpr); - } - } - - let iterStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - iterStore.kind = hStore; - iterStore.child1 = iterAlloca; - iterStore.child2 = iterInit; - - // Chain collStore -> iterStore if temp was created - if collStore != null as *HirNode { - collStore.child3 = iterStore; - } - - // condition: Iter_HasNext_T(&__iter) - let condCall: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - condCall.kind = hCall; - condCall.strValue = hasNextFuncName; - let addrIter: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrIter.kind = hUnary; - addrIter.intValue = tkAmp; - let iterVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - iterVar.kind = hVar; - iterVar.strValue = iterVarName; - addrIter.child1 = iterVar; - condCall.child1 = addrIter; - - // while body: alloca x + store x = Iter_Next_T(&__iter) + original body - let bodyBlock: *HirNode = Lcx_LowerBlock(ctx, body, -1); - - // alloca for x - let xAlloca: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - xAlloca.kind = hAlloca; - xAlloca.line = line; - xAlloca.column = col; - xAlloca.strValue = varName; - xAlloca.typeName = elemTypeName; - xAlloca.typeKind = elemTypeKind; - - // x = Iter_Next_T(&__iter) - let nextCall: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - nextCall.kind = hCall; - nextCall.strValue = nextFuncName; - let addrIter2: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - addrIter2.kind = hUnary; - addrIter2.intValue = tkAmp; - let iterVar2: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - iterVar2.kind = hVar; - iterVar2.strValue = iterVarName; - addrIter2.child1 = iterVar2; - nextCall.child1 = addrIter2; - - let xStore: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - xStore.kind = hStore; - xStore.child1 = xAlloca; - xStore.child2 = nextCall; - - // Build while body block: xStore -> bodyBlock - let whileBody: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - whileBody.kind = hBlock; - whileBody.child1 = xStore; - if bodyBlock != null as *HirNode && bodyBlock.kind == hBlock { - xStore.child3 = bodyBlock.child1; - } else if bodyBlock != null as *HirNode { - xStore.child3 = bodyBlock; - } - - // while node - let whileNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - whileNode.kind = hWhile; - whileNode.child1 = condCall; - whileNode.child2 = whileBody; - - // Chain: iterStore -> whileNode - iterStore.child3 = whileNode; - - let blockNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - blockNode.kind = hBlock; - blockNode.line = line; - blockNode.column = col; - if collStore != null as *HirNode { - blockNode.child1 = collStore; - } else { - blockNode.child1 = iterStore; - } - return blockNode; + ifNode.child1 = cond; + ifNode.child2 = caseBody; + ifNode.child3 = current; + current = ifNode; } } } + return current; } - // Fallback: infinite loop - n.kind = hLoop; - if stmt.refStmtBlock != null as *Block { - n.child1 = Lcx_LowerBlock(ctx, stmt.refStmtBlock, -1); - } return n; } - // Break - if kind == skBreak { - n.kind = hBreak; - return n; - } + // --------------------------------------------------------------------------- + // Block lowering + // --------------------------------------------------------------------------- - // Continue - if kind == skContinue { - n.kind = hContinue; - return n; - } + func Lcx_LowerBlock(ctx: *LowerCtx, block: *Block, retTypeKind: int) -> *HirNode { + if block == null as *Block { return null as *HirNode; } + if block.stmtCount == 0 { return null as *HirNode; } - // Defer - if kind == skDefer { - n.kind = hDefer; - if stmt.child1 != null as *Expr { - n.child1 = Lcx_LowerExpr(ctx, stmt.child1); + // retTypeKind: + // >= 0 → function body; last skExpr becomes return + // -1 → statement block (if/while/for); no return, no yield + // -2 → block-as-expression (match arm / let { ... }); yield last skExpr + let asExpr: bool = retTypeKind == -2; + var yieldName: String = ""; + if asExpr { + ctx.varCounter = ctx.varCounter + 1; + yieldName = String_Concat("__blk_", String_FromInt(ctx.varCounter as int64)); } - return n; - } - // Switch — desugar to if-else chain - if kind == skSwitch { - let subject: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); - var current: *HirNode = null as *HirNode; - // Default first (bottom of chain) - if stmt.refStmtElse != null as *Block { - current = Lcx_LowerBlock(ctx, stmt.refStmtElse, -1); - } - // Cases in reverse order (from caseBlock) - if stmt.refStmtBlock != null as *Block { - let caseBlock: *Block = stmt.refStmtBlock; - var caseCount: int = caseBlock.stmtCount; - // Collect cases into array for reverse iteration - var c0: *Stmt = null as *Stmt; - var c1: *Stmt = null as *Stmt; - var c2: *Stmt = null as *Stmt; - var c3: *Stmt = null as *Stmt; - var c4: *Stmt = null as *Stmt; - var c5: *Stmt = null as *Stmt; - var c6: *Stmt = null as *Stmt; - var c7: *Stmt = null as *Stmt; - var ci: int = 0; - var cs: *Stmt = caseBlock.firstStmt; - while cs != null as *Stmt && ci < 8 { - if ci == 0 { c0 = cs; } - if ci == 1 { c1 = cs; } - if ci == 2 { c2 = cs; } - if ci == 3 { c3 = cs; } - if ci == 4 { c4 = cs; } - if ci == 5 { c5 = cs; } - if ci == 6 { c6 = cs; } - if ci == 7 { c7 = cs; } - ci = ci + 1; - cs = cs.nextStmt; - } - while caseCount > 0 { - caseCount = caseCount - 1; - var c: *Stmt = null as *Stmt; - if caseCount == 0 { c = c0; } - if caseCount == 1 { c = c1; } - if caseCount == 2 { c = c2; } - if caseCount == 3 { c = c3; } - if caseCount == 4 { c = c4; } - if caseCount == 5 { c = c5; } - if caseCount == 6 { c = c6; } - if caseCount == 7 { c = c7; } - if c != null as *Stmt { - let caseVal: *HirNode = Lcx_LowerExpr(ctx, c.child1); - let caseBody: *HirNode = Lcx_LowerBlock(ctx, c.refStmtBlock, -1); - let cond: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - cond.kind = hBinary; - cond.intValue = 74; // tkEq - cond.child1 = subject; - cond.child2 = caseVal; - let ifNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - ifNode.kind = hIf; - ifNode.child1 = cond; - ifNode.child2 = caseBody; - ifNode.child3 = current; - current = ifNode; - } - } - } - return current; - } + // Build a linked list of HirNodes via child3 + var firstNode: *HirNode = null as *HirNode; + var prevNode: *HirNode = null as *HirNode; + var stmt: *Stmt = block.firstStmt; + while stmt != null as *Stmt { + let isLast: bool = stmt.nextStmt == null as *Stmt; + var lowered: *HirNode = null as *HirNode; - return n; -} - -// --------------------------------------------------------------------------- -// Block lowering -// --------------------------------------------------------------------------- - -func Lcx_LowerBlock(ctx: *LowerCtx, block: *Block, retTypeKind: int) -> *HirNode { - if block == null as *Block { return null as *HirNode; } - if block.stmtCount == 0 { return null as *HirNode; } - - // retTypeKind: - // >= 0 → function body; last skExpr becomes return - // -1 → statement block (if/while/for); no return, no yield - // -2 → block-as-expression (match arm / let { ... }); yield last skExpr - let asExpr: bool = retTypeKind == -2; - var yieldName: String = ""; - if asExpr { - ctx.varCounter = ctx.varCounter + 1; - yieldName = String_Concat("__blk_", String_FromInt(ctx.varCounter as int64)); - } - - // Build a linked list of HirNodes via child3 - var firstNode: *HirNode = null as *HirNode; - var prevNode: *HirNode = null as *HirNode; - var stmt: *Stmt = block.firstStmt; - while stmt != null as *Stmt { - let isLast: bool = stmt.nextStmt == null as *Stmt; - var lowered: *HirNode = null as *HirNode; - - // Last expression statement in a non-void function → implicit return - if isLast && !asExpr && retTypeKind != tyVoid && retTypeKind != tyUnknown && retTypeKind >= 0 + // Last expression statement in a non-void function → implicit return + if isLast && !asExpr && retTypeKind != tyVoid && retTypeKind != tyUnknown && retTypeKind >= 0 && stmt.kind == skExpr && stmt.child1 != null as *Expr { - let exprNode: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); - if exprNode != null as *HirNode { - if exprNode.kind == hBlock && !String_Eq(exprNode.strValue, "") { - let retVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - retVar.kind = hVar; - retVar.strValue = exprNode.strValue; - let retNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - retNode.kind = hReturn; - retNode.line = stmt.line; - retNode.column = stmt.column; - retNode.child1 = retVar; - var lastInBlock: *HirNode = exprNode.child1; - if lastInBlock == null as *HirNode { - exprNode.child1 = retNode; - } else { - while lastInBlock.child3 != null as *HirNode { - lastInBlock = lastInBlock.child3; + let exprNode: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); + if exprNode != null as *HirNode { + if exprNode.kind == hBlock && !String_Eq(exprNode.strValue, "") { + let retVar: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + retVar.kind = hVar; + retVar.strValue = exprNode.strValue; + let retNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + retNode.kind = hReturn; + retNode.line = stmt.line; + retNode.column = stmt.column; + retNode.child1 = retVar; + var lastInBlock: *HirNode = exprNode.child1; + if lastInBlock == null as *HirNode { + exprNode.child1 = retNode; + } else { + while lastInBlock.child3 != null as *HirNode { + lastInBlock = lastInBlock.child3; + } + lastInBlock.child3 = retNode; } - lastInBlock.child3 = retNode; + exprNode.strValue = ""; + lowered = exprNode; + } else if exprNode.kind == hReturn { + lowered = exprNode; + } else { + let retNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + retNode.kind = hReturn; + retNode.line = stmt.line; + retNode.column = stmt.column; + retNode.child1 = exprNode; + lowered = retNode; } - exprNode.strValue = ""; - lowered = exprNode; - } else if exprNode.kind == hReturn { - lowered = exprNode; - } else { - let retNode: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - retNode.kind = hReturn; - retNode.line = stmt.line; - retNode.column = stmt.column; - retNode.child1 = exprNode; - lowered = retNode; } - } - } else if isLast && asExpr && stmt.kind == skExpr && stmt.child1 != null as *Expr { - // Block-as-expression: last expr is the yield value - let exprNode: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); - // alloca yield temp - let allocaN: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - allocaN.kind = hAlloca; - allocaN.line = stmt.line; - allocaN.column = stmt.column; - allocaN.strValue = yieldName; - allocaN.typeName = "int"; - if exprNode != null as *HirNode && exprNode.typeName != null as String + } else if isLast && asExpr && stmt.kind == skExpr && stmt.child1 != null as *Expr { + // Block-as-expression: last expr is the yield value + let exprNode: *HirNode = Lcx_LowerExpr(ctx, stmt.child1); + // alloca yield temp + let allocaN: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + allocaN.kind = hAlloca; + allocaN.line = stmt.line; + allocaN.column = stmt.column; + allocaN.strValue = yieldName; + allocaN.typeName = "int"; + if exprNode != null as *HirNode && exprNode.typeName != null as String && !String_Eq(exprNode.typeName, "") { - allocaN.typeName = exprNode.typeName; - } - // store: yield = value (handle nested match yield) - let storeN: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - storeN.kind = hStore; - storeN.line = stmt.line; - storeN.column = stmt.column; - let yv: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - yv.kind = hVar; - yv.strValue = yieldName; - storeN.child1 = yv; - if exprNode != null as *HirNode && Lcx_IsMatchYield(exprNode) { - // Expand nested match stmts then store its result var - let yvar: *HirNode = Lcx_YieldVarOf(exprNode); - storeN.child2 = yvar; - exprNode.strValue = ""; - // chain: exprNode stmts → alloca → store - var lastIn: *HirNode = exprNode.child1; - if lastIn == null as *HirNode { - exprNode.child1 = allocaN; - allocaN.child3 = storeN; - lowered = exprNode; - } else { - while lastIn.child3 != null as *HirNode { - lastIn = lastIn.child3; + allocaN.typeName = exprNode.typeName; + } + // store: yield = value (handle nested match yield) + let storeN: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + storeN.kind = hStore; + storeN.line = stmt.line; + storeN.column = stmt.column; + let yv: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + yv.kind = hVar; + yv.strValue = yieldName; + storeN.child1 = yv; + if exprNode != null as *HirNode && Lcx_IsMatchYield(exprNode) { + // Expand nested match stmts then store its result var + let yvar: *HirNode = Lcx_YieldVarOf(exprNode); + storeN.child2 = yvar; + exprNode.strValue = ""; + // chain: exprNode stmts → alloca → store + var lastIn: *HirNode = exprNode.child1; + if lastIn == null as *HirNode { + exprNode.child1 = allocaN; + allocaN.child3 = storeN; + lowered = exprNode; + } else { + while lastIn.child3 != null as *HirNode { + lastIn = lastIn.child3; + } + lastIn.child3 = allocaN; + allocaN.child3 = storeN; + lowered = exprNode; } - lastIn.child3 = allocaN; + } else { + storeN.child2 = exprNode; allocaN.child3 = storeN; - lowered = exprNode; + lowered = allocaN; } } else { - storeN.child2 = exprNode; - allocaN.child3 = storeN; - lowered = allocaN; + lowered = Lcx_LowerStmt(ctx, stmt); } - } else { - lowered = Lcx_LowerStmt(ctx, stmt); - } - if lowered != null as *HirNode { - if firstNode == null as *HirNode { - firstNode = lowered; - prevNode = lowered; - } else { - // Walk to end of chain (lowered may itself be a multi-node chain) - prevNode.child3 = lowered; - prevNode = lowered; - while prevNode.child3 != null as *HirNode { - prevNode = prevNode.child3; + if lowered != null as *HirNode { + if firstNode == null as *HirNode { + firstNode = lowered; + prevNode = lowered; + } else { + // Walk to end of chain (lowered may itself be a multi-node chain) + prevNode.child3 = lowered; + prevNode = lowered; + while prevNode.child3 != null as *HirNode { + prevNode = prevNode.child3; + } } } + stmt = stmt.nextStmt; } - stmt = stmt.nextStmt; + + // Wrap in an hBlock node with child1 = first statement in chain + let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; + n.kind = hBlock; + n.line = block.line; + n.column = block.column; + n.boolValue = true; + n.child1 = firstNode; + if asExpr && !String_Eq(yieldName, "") { + n.strValue = yieldName; + n.typeName = "int"; + } + return n; } - // Wrap in an hBlock node with child1 = first statement in chain - let n: *HirNode = bux_alloc(sizeof(HirNode)) as *HirNode; - n.kind = hBlock; - n.line = block.line; - n.column = block.column; - n.boolValue = true; - n.child1 = firstNode; - if asExpr && !String_Eq(yieldName, "") { - n.strValue = yieldName; - n.typeName = "int"; - } - return n; -} + // --------------------------------------------------------------------------- + // Param → HirParam conversion + // --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// Param → HirParam conversion -// --------------------------------------------------------------------------- - -func Lcx_LowerParam(out: *HirParam, p: *Param, ctx: *LowerCtx) { - out.name = p.name; - var te: *TypeExpr = p.refParamType; - if ctx != null as *LowerCtx { - te = Lcx_SubstituteType(ctx, te); - } - if te != null as *TypeExpr { - out.typeKind = Lcx_ResolveTypeKind(te); - // Function type: build C function-pointer syntax - if te.kind == tekFunc { - out.typeName = Lcx_BuildFuncTypeName(te); - } else if !String_Eq(te.typeName, "") { - out.typeName = te.typeName; - } else if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { - out.typeName = String_Concat(te.pointerPointee.typeName, "*"); + func Lcx_LowerParam(out: *HirParam, p: *Param, ctx: *LowerCtx) { + out.name = p.name; + var te: *TypeExpr = p.refParamType; + if ctx != null as *LowerCtx { + te = Lcx_SubstituteType(ctx, te); + } + if te != null as *TypeExpr { + out.typeKind = Lcx_ResolveTypeKind(te); + // Function type: build C function-pointer syntax + if te.kind == tekFunc { + out.typeName = Lcx_BuildFuncTypeName(te); + } else if !String_Eq(te.typeName, "") { + out.typeName = te.typeName; + } else if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { + out.typeName = String_Concat(te.pointerPointee.typeName, "*"); + } else { + out.typeName = ""; + } } else { + out.typeKind = 0; out.typeName = ""; } - } else { - out.typeKind = 0; - out.typeName = ""; } -} -// --------------------------------------------------------------------------- -// Function lowering -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Function lowering + // --------------------------------------------------------------------------- -func Lcx_LowerFunc(ctx: *LowerCtx, decl: *Decl) -> *HirFunc { - let oldChecked: bool = ctx.checkedFunc; - ctx.checkedFunc = decl.isChecked != 0; - let oldRelease: bool = ctx.releaseFunc; - ctx.releaseFunc = decl.isRelease != 0; + func Lcx_LowerFunc(ctx: *LowerCtx, decl: *Decl) -> *HirFunc { + let oldChecked: bool = ctx.checkedFunc; + ctx.checkedFunc = decl.isChecked != 0; + let oldRelease: bool = ctx.releaseFunc; + ctx.releaseFunc = decl.isRelease != 0; - let f: *HirFunc = bux_alloc(sizeof(HirFunc)) as *HirFunc; - f.name = decl.strValue; - f.isPublic = decl.isPublic; - f.checkedFunc = ctx.checkedFunc; - f.paramCount = decl.paramCount; - f.param0 = bux_alloc(sizeof(HirParam)) as *HirParam; - Lcx_LowerParam(f.param0, &decl.param0, ctx); - f.param1 = bux_alloc(sizeof(HirParam)) as *HirParam; - Lcx_LowerParam(f.param1, &decl.param1, ctx); - f.param2 = bux_alloc(sizeof(HirParam)) as *HirParam; - Lcx_LowerParam(f.param2, &decl.param2, ctx); - f.param3 = bux_alloc(sizeof(HirParam)) as *HirParam; - Lcx_LowerParam(f.param3, &decl.param3, ctx); - f.param4 = bux_alloc(sizeof(HirParam)) as *HirParam; - Lcx_LowerParam(f.param4, &decl.param4, ctx); - f.param5 = bux_alloc(sizeof(HirParam)) as *HirParam; - Lcx_LowerParam(f.param5, &decl.param5, ctx); - f.param6 = bux_alloc(sizeof(HirParam)) as *HirParam; - Lcx_LowerParam(f.param6, &decl.param6, ctx); - f.param7 = bux_alloc(sizeof(HirParam)) as *HirParam; - Lcx_LowerParam(f.param7, &decl.param7, ctx); - f.param8 = bux_alloc(sizeof(HirParam)) as *HirParam; - Lcx_LowerParam(f.param8, &decl.param8, ctx); + let f: *HirFunc = bux_alloc(sizeof(HirFunc)) as *HirFunc; + f.name = decl.strValue; + f.isPublic = decl.isPublic; + f.checkedFunc = ctx.checkedFunc; + f.paramCount = decl.paramCount; + f.param0 = bux_alloc(sizeof(HirParam)) as *HirParam; + Lcx_LowerParam(f.param0, &decl.param0, ctx); + f.param1 = bux_alloc(sizeof(HirParam)) as *HirParam; + Lcx_LowerParam(f.param1, &decl.param1, ctx); + f.param2 = bux_alloc(sizeof(HirParam)) as *HirParam; + Lcx_LowerParam(f.param2, &decl.param2, ctx); + f.param3 = bux_alloc(sizeof(HirParam)) as *HirParam; + Lcx_LowerParam(f.param3, &decl.param3, ctx); + f.param4 = bux_alloc(sizeof(HirParam)) as *HirParam; + Lcx_LowerParam(f.param4, &decl.param4, ctx); + f.param5 = bux_alloc(sizeof(HirParam)) as *HirParam; + Lcx_LowerParam(f.param5, &decl.param5, ctx); + f.param6 = bux_alloc(sizeof(HirParam)) as *HirParam; + Lcx_LowerParam(f.param6, &decl.param6, ctx); + f.param7 = bux_alloc(sizeof(HirParam)) as *HirParam; + Lcx_LowerParam(f.param7, &decl.param7, ctx); + f.param8 = bux_alloc(sizeof(HirParam)) as *HirParam; + Lcx_LowerParam(f.param8, &decl.param8, ctx); - let retTe: *TypeExpr = Lcx_SubstituteType(ctx, decl.retType); - if retTe != null as *TypeExpr { - f.retTypeKind = Lcx_ResolveTypeKind(retTe); - if retTe.kind == tekFunc { - f.retTypeName = Lcx_BuildFuncTypeName(retTe); - } else if !String_Eq(retTe.typeName, "") { - f.retTypeName = retTe.typeName; - } else if retTe.kind == tekPointer && retTe.pointerPointee != null as *TypeExpr { - f.retTypeName = String_Concat(retTe.pointerPointee.typeName, "*"); + let retTe: *TypeExpr = Lcx_SubstituteType(ctx, decl.retType); + if retTe != null as *TypeExpr { + f.retTypeKind = Lcx_ResolveTypeKind(retTe); + if retTe.kind == tekFunc { + f.retTypeName = Lcx_BuildFuncTypeName(retTe); + } else if !String_Eq(retTe.typeName, "") { + f.retTypeName = retTe.typeName; + } else if retTe.kind == tekPointer && retTe.pointerPointee != null as *TypeExpr { + f.retTypeName = String_Concat(retTe.pointerPointee.typeName, "*"); + } else { + f.retTypeName = ""; + } } else { f.retTypeName = ""; + f.retTypeKind = 0; } - } else { - f.retTypeName = ""; - f.retTypeKind = 0; - } - // Create function scope as child of current scope - var funcScope: Scope = Scope_NewChild(ctx.scope); + // Create function scope as child of current scope + var funcScope: Scope = Scope_NewChild(ctx.scope); - // Add parameters to function scope for field offset lookups - var pi: int = 0; - while pi < decl.paramCount { - var p: *Param = null as *Param; - if pi == 0 { p = &decl.param0; } - else if pi == 1 { p = &decl.param1; } - else if pi == 2 { p = &decl.param2; } - else if pi == 3 { p = &decl.param3; } - else if pi == 4 { p = &decl.param4; } - else if pi == 5 { p = &decl.param5; } - else if pi == 6 { p = &decl.param6; } - else if pi == 7 { p = &decl.param7; } - else if pi == 8 { p = &decl.param8; } - if p != null as *Param && p.refParamType != null as *TypeExpr { - let pTe: *TypeExpr = Lcx_SubstituteType(ctx, p.refParamType); - var sym: Symbol; - sym.kind = skVar; - sym.name = p.name; - sym.typeKind = Lcx_ResolveTypeKind(pTe); - sym.refType = pTe; - // Build typeName same as Lcx_LowerParam - if pTe.kind == tekFunc { - sym.typeName = Lcx_BuildFuncTypeName(pTe); - } else if !String_Eq(pTe.typeName, "") { - sym.typeName = pTe.typeName; - } else if pTe.kind == tekPointer && pTe.pointerPointee != null as *TypeExpr { - sym.typeName = String_Concat(pTe.pointerPointee.typeName, "*"); - } else { - sym.typeName = ""; + // Add parameters to function scope for field offset lookups + var pi: int = 0; + while pi < decl.paramCount { + var p: *Param = null as *Param; + if pi == 0 { p = &decl.param0; } + else if pi == 1 { p = &decl.param1; } + else if pi == 2 { p = &decl.param2; } + else if pi == 3 { p = &decl.param3; } + else if pi == 4 { p = &decl.param4; } + else if pi == 5 { p = &decl.param5; } + else if pi == 6 { p = &decl.param6; } + else if pi == 7 { p = &decl.param7; } + else if pi == 8 { p = &decl.param8; } + if p != null as *Param && p.refParamType != null as *TypeExpr { + let pTe: *TypeExpr = Lcx_SubstituteType(ctx, p.refParamType); + var sym: Symbol; + sym.kind = skVar; + sym.name = p.name; + sym.typeKind = Lcx_ResolveTypeKind(pTe); + sym.refType = pTe; + // Build typeName same as Lcx_LowerParam + if pTe.kind == tekFunc { + sym.typeName = Lcx_BuildFuncTypeName(pTe); + } else if !String_Eq(pTe.typeName, "") { + sym.typeName = pTe.typeName; + } else if pTe.kind == tekPointer && pTe.pointerPointee != null as *TypeExpr { + sym.typeName = String_Concat(pTe.pointerPointee.typeName, "*"); + } else { + sym.typeName = ""; + } + sym.isMutable = false; + sym.isPublic = false; + sym.decl = null as *Decl; + discard Scope_Define(&funcScope, sym); } - sym.isMutable = false; - sym.isPublic = false; - sym.decl = null as *Decl; - discard Scope_Define(&funcScope, sym); + pi = pi + 1; } - pi = pi + 1; - } - // Lower body with function scope active (pass ret kind for last-expr return) - let prevScope: *Scope = ctx.scope; - ctx.scope = &funcScope; - if decl.refBody != null as *Block { - f.body = Lcx_LowerBlock(ctx, decl.refBody, f.retTypeKind); - } else { - f.body = null as *HirNode; - } - ctx.scope = prevScope; - ctx.checkedFunc = oldChecked; - ctx.releaseFunc = oldRelease; - - return f; -} - -// --------------------------------------------------------------------------- -// Closure lowering — generate a global function for a closure expression -// --------------------------------------------------------------------------- - -func Lcx_LowerClosureFunc(ctx: *LowerCtx, expr: *Expr) -> *HirFunc { - let f: *HirFunc = bux_alloc(sizeof(HirFunc)) as *HirFunc; - - // Generate unique name - let numStr: String = String_FromInt(ctx.funcCount); - f.name = String_Concat("__closure_", numStr); - f.isPublic = false; - - let params: *Decl = expr.closureParams; - // Fat-func ABI: leading void* __env, then user params - var userCount: int = 0; - if params != null as *Decl { userCount = params.paramCount; } - f.paramCount = userCount + 1; - f.param0 = bux_alloc(sizeof(HirParam)) as *HirParam; - f.param0.name = "__env"; - f.param0.typeKind = tyPointer; - f.param0.typeName = "void*"; - if userCount > 0 { f.param1 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param1, ¶ms.param0, ctx); } - if userCount > 1 { f.param2 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param2, ¶ms.param1, ctx); } - if userCount > 2 { f.param3 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param3, ¶ms.param2, ctx); } - if userCount > 3 { f.param4 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param4, ¶ms.param3, ctx); } - if userCount > 4 { f.param5 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param5, ¶ms.param4, ctx); } - if userCount > 5 { f.param6 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param6, ¶ms.param5, ctx); } - if userCount > 6 { f.param7 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param7, ¶ms.param6, ctx); } - if userCount > 7 { f.param8 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param8, ¶ms.param7, ctx); } - - if expr.refType != null as *TypeExpr && expr.refType.kind == tekFunc { - // Return type of the *thunk* is the closure's return type (not the fat type) - if expr.refType.funcRet != null as *TypeExpr { - f.retTypeName = expr.refType.funcRet.typeName; - if String_Eq(f.retTypeName, "") { f.retTypeName = "int"; } - f.retTypeKind = Lcx_ResolveTypeKind(expr.refType.funcRet); + // Lower body with function scope active (pass ret kind for last-expr return) + let prevScope: *Scope = ctx.scope; + ctx.scope = &funcScope; + if decl.refBody != null as *Block { + f.body = Lcx_LowerBlock(ctx, decl.refBody, f.retTypeKind); } else { - f.retTypeName = "void"; - f.retTypeKind = tyVoid; + f.body = null as *HirNode; } - } else { - f.retTypeName = "int"; - f.retTypeKind = tyInt; + ctx.scope = prevScope; + ctx.checkedFunc = oldChecked; + ctx.releaseFunc = oldRelease; + + return f; } - // Copy capture metadata from AST - f.captureCount = expr.captureCount; - f.captureName0 = expr.captureName0; - f.captureName1 = expr.captureName1; - f.captureName2 = expr.captureName2; - f.captureName3 = expr.captureName3; - f.captureName4 = expr.captureName4; - f.captureName5 = expr.captureName5; - f.captureName6 = expr.captureName6; - f.captureName7 = expr.captureName7; - f.captureType0 = expr.captureType0; - f.captureType1 = expr.captureType1; - f.captureType2 = expr.captureType2; - f.captureType3 = expr.captureType3; - f.captureType4 = expr.captureType4; - f.captureType5 = expr.captureType5; - f.captureType6 = expr.captureType6; - f.captureType7 = expr.captureType7; + // --------------------------------------------------------------------------- + // Closure lowering — generate a global function for a closure expression + // --------------------------------------------------------------------------- - // Generate env struct and instance names if there are captures - var envStructName: String = ""; - var envInstanceName: String = ""; - if f.captureCount > 0 { - envStructName = String_Concat("__closure_env_", numStr); - envInstanceName = String_Concat("__closure_env_instance_", numStr); - f.envStructName = envStructName; - f.envInstanceName = envInstanceName; + func Lcx_LowerClosureFunc(ctx: *LowerCtx, expr: *Expr) -> *HirFunc { + let f: *HirFunc = bux_alloc(sizeof(HirFunc)) as *HirFunc; - // Env struct is emitted directly by C backend from func capture metadata - } + // Generate unique name + let numStr: String = String_FromInt(ctx.funcCount); + f.name = String_Concat("__closure_", numStr); + f.isPublic = false; - // Create function scope - var funcScope: Scope = Scope_NewChild(ctx.scope); - var pi: int = 0; - while pi < params.paramCount { - var p: *Param = null as *Param; - if pi == 0 { p = ¶ms.param0; } - else if pi == 1 { p = ¶ms.param1; } - else if pi == 2 { p = ¶ms.param2; } - else if pi == 3 { p = ¶ms.param3; } - else if pi == 4 { p = ¶ms.param4; } - else if pi == 5 { p = ¶ms.param5; } - else if pi == 6 { p = ¶ms.param6; } - else if pi == 7 { p = ¶ms.param7; } - else if pi == 8 { p = ¶ms.param8; } - if p != null as *Param && p.refParamType != null as *TypeExpr { - let pTe: *TypeExpr = Lcx_SubstituteType(ctx, p.refParamType); - var sym: Symbol; - sym.kind = skVar; - sym.name = p.name; - sym.typeKind = Lcx_ResolveTypeKind(pTe); - sym.refType = pTe; - if pTe.kind == tekFunc { - sym.typeName = Lcx_BuildFuncTypeName(pTe); - } else if !String_Eq(pTe.typeName, "") { - sym.typeName = pTe.typeName; - } else if pTe.kind == tekPointer && pTe.pointerPointee != null as *TypeExpr { - sym.typeName = String_Concat(pTe.pointerPointee.typeName, "*"); + let params: *Decl = expr.closureParams; + // Fat-func ABI: leading void* __env, then user params + var userCount: int = 0; + if params != null as *Decl { userCount = params.paramCount; } + f.paramCount = userCount + 1; + f.param0 = bux_alloc(sizeof(HirParam)) as *HirParam; + f.param0.name = "__env"; + f.param0.typeKind = tyPointer; + f.param0.typeName = "void*"; + if userCount > 0 { f.param1 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param1, ¶ms.param0, ctx); } + if userCount > 1 { f.param2 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param2, ¶ms.param1, ctx); } + if userCount > 2 { f.param3 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param3, ¶ms.param2, ctx); } + if userCount > 3 { f.param4 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param4, ¶ms.param3, ctx); } + if userCount > 4 { f.param5 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param5, ¶ms.param4, ctx); } + if userCount > 5 { f.param6 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param6, ¶ms.param5, ctx); } + if userCount > 6 { f.param7 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param7, ¶ms.param6, ctx); } + if userCount > 7 { f.param8 = bux_alloc(sizeof(HirParam)) as *HirParam; Lcx_LowerParam(f.param8, ¶ms.param7, ctx); } + + if expr.refType != null as *TypeExpr && expr.refType.kind == tekFunc { + // Return type of the *thunk* is the closure's return type (not the fat type) + if expr.refType.funcRet != null as *TypeExpr { + f.retTypeName = expr.refType.funcRet.typeName; + if String_Eq(f.retTypeName, "") { f.retTypeName = "int"; } + f.retTypeKind = Lcx_ResolveTypeKind(expr.refType.funcRet); } else { - sym.typeName = ""; + f.retTypeName = "void"; + f.retTypeKind = tyVoid; } - sym.isMutable = false; - sym.isPublic = false; - sym.decl = null as *Decl; - discard Scope_Define(&funcScope, sym); - } - pi = pi + 1; - } - - let prevScope: *Scope = ctx.scope; - let prevClosureDepth: int = ctx.closureDepth; - let prevClosureExpr: *Expr = ctx.currentClosureExpr; - let prevEnvInstanceName: String = ctx.envInstanceName; - ctx.scope = &funcScope; - ctx.closureDepth = ctx.closureDepth + 1; - ctx.currentClosureExpr = expr; - ctx.envInstanceName = envInstanceName; - if expr.refBlock != null as *Block { - f.body = Lcx_LowerBlock(ctx, expr.refBlock, -1); - } else { - f.body = null as *HirNode; - } - ctx.scope = prevScope; - ctx.closureDepth = prevClosureDepth; - ctx.currentClosureExpr = prevClosureExpr; - ctx.envInstanceName = prevEnvInstanceName; - - // Add to module functions - ctx.funcs[ctx.funcCount] = *f; - ctx.funcCount = ctx.funcCount + 1; - - return f; -} - -// --------------------------------------------------------------------------- -// Compile-Time Function Execution (CTFE) — constant expression evaluator -// --------------------------------------------------------------------------- - -const CTFE_MAX_LOCALS: int = 64; - -struct CtfeLocal { - name: String, - value: int, -} - -struct CtfeEnv { - locals: *CtfeLocal, - count: int, -} - -struct CtVal { - value: int, - isReturn: bool, -} - -func CtfeEnv_New() -> CtfeEnv { - let locals: *CtfeLocal = bux_alloc(CTFE_MAX_LOCALS as uint * sizeof(CtfeLocal)) as *CtfeLocal; - return CtfeEnv { locals: locals, count: 0 }; -} - -func CtfeEnv_Get(env: *CtfeEnv, name: String) -> int { - var i: int = env.count - 1; - while i >= 0 { - if String_Eq(env.locals[i].name, name) { - return env.locals[i].value; - } - i = i - 1; - } - return 0; -} - -func CtfeEnv_Set(env: *CtfeEnv, name: String, value: int) { - if env.count >= CTFE_MAX_LOCALS { return; } - env.locals[env.count].name = name; - env.locals[env.count].value = value; - env.count = env.count + 1; -} - -func Lcx_FindConstFunc(ctx: *LowerCtx, name: String) -> *Decl { - var decl: *Decl = ctx.module.firstItem; - while decl != null as *Decl { - if decl.kind == dkFunc && decl.isConst == 1 && String_Eq(decl.strValue, name) { - return decl; - } - decl = decl.childDecl2; - } - return null as *Decl; -} - -func Lcx_ParamName(fd: *Decl, idx: int) -> String { - if fd == null as *Decl { return ""; } - if idx == 0 { return fd.param0.name; } - if idx == 1 { return fd.param1.name; } - if idx == 2 { return fd.param2.name; } - if idx == 3 { return fd.param3.name; } - if idx == 4 { return fd.param4.name; } - if idx == 5 { return fd.param5.name; } - if idx == 6 { return fd.param6.name; } - if idx == 7 { return fd.param7.name; } - if idx == 8 { return fd.param8.name; } - return ""; -} - -func CtVal_Make(value: int) -> CtVal { - return CtVal { value: value, isReturn: false }; -} - -func CtVal_Return(value: int) -> CtVal { - return CtVal { value: value, isReturn: true }; -} - -func Lcx_EvalConstExprEnv(ctx: *LowerCtx, expr: *Expr, env: *CtfeEnv) -> CtVal { - if expr == null as *Expr { - return CtVal_Make(0); - } - - // Literal integer - if expr.kind == ekLiteral { - return CtVal_Make(expr.intValue); - } - - // Reference to local or another constant - if expr.kind == ekIdent { - let localVal: int = CtfeEnv_Get(env, expr.strValue); - // Local takes precedence; 0 from Get could mean not found, but global const 0 - // will still be looked up below if needed. For Factorial parameters this works - // because params are always set in env. - if localVal != 0 { - return CtVal_Make(localVal); - } - let name: String = expr.strValue; - var i: int = 0; - while i < ctx.hm.constCount { - if String_Eq(ctx.hm.consts[i].name, name) { - return CtVal_Make(ctx.hm.consts[i].value); - } - i = i + 1; - } - return CtVal_Make(0); - } - - // Unary operators - if expr.kind == ekUnary { - let operand: CtVal = Lcx_EvalConstExprEnv(ctx, expr.child1, env); - let op: int = expr.intValue; - if op == tkMinus { return CtVal_Make(-operand.value); } - if op == tkBang { return CtVal_Make((operand.value == 0) as int); } - if op == tkTilde { return CtVal_Make(~operand.value); } - return CtVal_Make(operand.value); - } - - // Binary operators - if expr.kind == ekBinary { - let left: CtVal = Lcx_EvalConstExprEnv(ctx, expr.child1, env); - let right: CtVal = Lcx_EvalConstExprEnv(ctx, expr.child2, env); - let op: int = expr.intValue; - if op == tkPlus { return CtVal_Make(left.value + right.value); } - if op == tkMinus { return CtVal_Make(left.value - right.value); } - if op == tkStar { return CtVal_Make(left.value * right.value); } - if op == tkSlash { - if right.value == 0 { return CtVal_Make(0); } - return CtVal_Make(left.value / right.value); - } - if op == tkPercent { - if right.value == 0 { return CtVal_Make(0); } - return CtVal_Make(left.value % right.value); - } - if op == tkLt { return CtVal_Make((left.value < right.value) as int); } - if op == tkLe { return CtVal_Make((left.value <= right.value) as int); } - if op == tkGt { return CtVal_Make((left.value > right.value) as int); } - if op == tkGe { return CtVal_Make((left.value >= right.value) as int); } - if op == tkEq { return CtVal_Make((left.value == right.value) as int); } - if op == tkNe { return CtVal_Make((left.value != right.value) as int); } - if op == tkAmp { return CtVal_Make(left.value & right.value); } - if op == tkPipe { return CtVal_Make(left.value | right.value); } - if op == tkCaret { return CtVal_Make(left.value ^ right.value); } - if op == tkShl { return CtVal_Make(left.value << right.value); } - if op == tkShr { return CtVal_Make(left.value >> right.value); } - if op == tkAmpAmp { return CtVal_Make((left.value != 0 && right.value != 0) as int); } - if op == tkPipePipe { return CtVal_Make((left.value != 0 || right.value != 0) as int); } - return CtVal_Make(0); - } - - // Ternary operator - if expr.kind == ekTernary { - let cond: CtVal = Lcx_EvalConstExprEnv(ctx, expr.child1, env); - if cond.value != 0 { - return Lcx_EvalConstExprEnv(ctx, expr.child2, env); } else { - return Lcx_EvalConstExprEnv(ctx, expr.child3, env); + f.retTypeName = "int"; + f.retTypeKind = tyInt; } - } - // Cast — evaluate operand (types don't affect integer values) - if expr.kind == ekCast { - return Lcx_EvalConstExprEnv(ctx, expr.child1, env); - } + // Copy capture metadata from AST + f.captureCount = expr.captureCount; + f.captureName0 = expr.captureName0; + f.captureName1 = expr.captureName1; + f.captureName2 = expr.captureName2; + f.captureName3 = expr.captureName3; + f.captureName4 = expr.captureName4; + f.captureName5 = expr.captureName5; + f.captureName6 = expr.captureName6; + f.captureName7 = expr.captureName7; + f.captureType0 = expr.captureType0; + f.captureType1 = expr.captureType1; + f.captureType2 = expr.captureType2; + f.captureType3 = expr.captureType3; + f.captureType4 = expr.captureType4; + f.captureType5 = expr.captureType5; + f.captureType6 = expr.captureType6; + f.captureType7 = expr.captureType7; - // Const function call - if expr.kind == ekCall { - if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { - let funcName: String = expr.child1.strValue; - let fd: *Decl = Lcx_FindConstFunc(ctx, funcName); - if fd != null as *Decl && fd.refBody != null as *Block { - // Evaluate arguments - var argExpr: *ExprList = expr.callArgs; - var ai: int = 0; - var argVals: *int = bux_alloc(fd.paramCount as uint * sizeof(int)) as *int; - while ai < fd.paramCount { - argVals[ai] = 0; - ai = ai + 1; + // Generate env struct and instance names if there are captures + var envStructName: String = ""; + var envInstanceName: String = ""; + if f.captureCount > 0 { + envStructName = String_Concat("__closure_env_", numStr); + envInstanceName = String_Concat("__closure_env_instance_", numStr); + f.envStructName = envStructName; + f.envInstanceName = envInstanceName; + + // Env struct is emitted directly by C backend from func capture metadata + } + + // Create function scope + var funcScope: Scope = Scope_NewChild(ctx.scope); + var pi: int = 0; + while pi < params.paramCount { + var p: *Param = null as *Param; + if pi == 0 { p = ¶ms.param0; } + else if pi == 1 { p = ¶ms.param1; } + else if pi == 2 { p = ¶ms.param2; } + else if pi == 3 { p = ¶ms.param3; } + else if pi == 4 { p = ¶ms.param4; } + else if pi == 5 { p = ¶ms.param5; } + else if pi == 6 { p = ¶ms.param6; } + else if pi == 7 { p = ¶ms.param7; } + else if pi == 8 { p = ¶ms.param8; } + if p != null as *Param && p.refParamType != null as *TypeExpr { + let pTe: *TypeExpr = Lcx_SubstituteType(ctx, p.refParamType); + var sym: Symbol; + sym.kind = skVar; + sym.name = p.name; + sym.typeKind = Lcx_ResolveTypeKind(pTe); + sym.refType = pTe; + if pTe.kind == tekFunc { + sym.typeName = Lcx_BuildFuncTypeName(pTe); + } else if !String_Eq(pTe.typeName, "") { + sym.typeName = pTe.typeName; + } else if pTe.kind == tekPointer && pTe.pointerPointee != null as *TypeExpr { + sym.typeName = String_Concat(pTe.pointerPointee.typeName, "*"); + } else { + sym.typeName = ""; } - ai = 0; - while argExpr != null as *ExprList && ai < fd.paramCount { - let av: CtVal = Lcx_EvalConstExprEnv(ctx, argExpr.expr, env); - argVals[ai] = av.value; - argExpr = argExpr.next; - ai = ai + 1; - } - // Set up call environment - let callEnv: CtfeEnv = CtfeEnv_New(); - var pi: int = 0; - while pi < fd.paramCount { - CtfeEnv_Set(&callEnv, Lcx_ParamName(fd, pi), argVals[pi]); - pi = pi + 1; - } - let result: CtVal = Lcx_EvalConstBlock(ctx, fd.refBody, &callEnv); - return CtVal_Make(result.value); + sym.isMutable = false; + sym.isPublic = false; + sym.decl = null as *Decl; + discard Scope_Define(&funcScope, sym); } + pi = pi + 1; } - return CtVal_Make(0); + + let prevScope: *Scope = ctx.scope; + let prevClosureDepth: int = ctx.closureDepth; + let prevClosureExpr: *Expr = ctx.currentClosureExpr; + let prevEnvInstanceName: String = ctx.envInstanceName; + ctx.scope = &funcScope; + ctx.closureDepth = ctx.closureDepth + 1; + ctx.currentClosureExpr = expr; + ctx.envInstanceName = envInstanceName; + if expr.refBlock != null as *Block { + f.body = Lcx_LowerBlock(ctx, expr.refBlock, -1); + } else { + f.body = null as *HirNode; + } + ctx.scope = prevScope; + ctx.closureDepth = prevClosureDepth; + ctx.currentClosureExpr = prevClosureExpr; + ctx.envInstanceName = prevEnvInstanceName; + + // Add to module functions + ctx.funcs[ctx.funcCount] = *f; + ctx.funcCount = ctx.funcCount + 1; + + return f; } - return CtVal_Make(0); -} + // --------------------------------------------------------------------------- + // Compile-Time Function Execution (CTFE) — constant expression evaluator + // --------------------------------------------------------------------------- -func Lcx_EvalConstBlock(ctx: *LowerCtx, block: *Block, env: *CtfeEnv) -> CtVal { - if block == null as *Block { - return CtVal_Make(0); - } - var stmt: *Stmt = block.firstStmt; - while stmt != null as *Stmt { - if stmt.kind == skLet && stmt.child1 != null as *Expr { - let val: CtVal = Lcx_EvalConstExprEnv(ctx, stmt.child1, env); - CtfeEnv_Set(env, stmt.strValue, val.value); - } else if stmt.kind == skIf { - let cond: CtVal = Lcx_EvalConstExprEnv(ctx, stmt.child1, env); - if cond.value != 0 { - let r: CtVal = Lcx_EvalConstBlock(ctx, stmt.refStmtBlock, env); - if r.isReturn { return r; } - } else if stmt.refStmtElse != null as *Block { - let r: CtVal = Lcx_EvalConstBlock(ctx, stmt.refStmtElse, env); - if r.isReturn { return r; } - } - } else if stmt.kind == skReturn { - if stmt.child1 != null as *Expr { - let val: CtVal = Lcx_EvalConstExprEnv(ctx, stmt.child1, env); - return CtVal_Return(val.value); - } - return CtVal_Return(0); - } else if stmt.kind == skExpr { - discard Lcx_EvalConstExprEnv(ctx, stmt.child1, env); - } - stmt = stmt.nextStmt; - } - return CtVal_Make(0); -} + const CTFE_MAX_LOCALS: int = 64; -func Lcx_EvalConstExpr(ctx: *LowerCtx, expr: *Expr) -> int { - let env: CtfeEnv = CtfeEnv_New(); - let result: CtVal = Lcx_EvalConstExprEnv(ctx, expr, &env); - return result.value; -} - -// --------------------------------------------------------------------------- -// Auto-Drop: build the Free function name for a given type -// --------------------------------------------------------------------------- - -func Lcx_BuildAutoDropFree(ctx: *LowerCtx, typeName: String) -> String { - if String_StartsWith(typeName, "Array_") { - let elemType: String = bux_str_slice(typeName, 6, bux_strlen(typeName) - 6); - // Ensure inner free is also monomorphized since Drop calls Free - let genFree: *Decl = Lcx_FindGenericFunc(ctx, "Array_Free"); - if genFree != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genFree, elemType, "", 1); - } - let genDrop: *Decl = Lcx_FindGenericFunc(ctx, "Array_Drop"); - if genDrop != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genDrop, elemType, "", 1); - } - return String_Concat("Array_Drop_", elemType); - } - if String_StartsWith(typeName, "Channel_") { - let elemType: String = bux_str_slice(typeName, 8, bux_strlen(typeName) - 8); - let genFree: *Decl = Lcx_FindGenericFunc(ctx, "Channel_Free"); - if genFree != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genFree, elemType, "", 1); - } - let genDrop: *Decl = Lcx_FindGenericFunc(ctx, "Channel_Drop"); - if genDrop != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genDrop, elemType, "", 1); - } - return String_Concat("Channel_Drop_", elemType); - } - if String_StartsWith(typeName, "Set_") { - let elemType: String = bux_str_slice(typeName, 4, bux_strlen(typeName) - 4); - let genFree: *Decl = Lcx_FindGenericFunc(ctx, "Set_Free"); - if genFree != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genFree, elemType, "", 1); - } - let genDrop: *Decl = Lcx_FindGenericFunc(ctx, "Set_Drop"); - if genDrop != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genDrop, elemType, "", 1); - } - return String_Concat("Set_Drop_", elemType); - } - if String_StartsWith(typeName, "Map_") { - let rest: String = bux_str_slice(typeName, 4, bux_strlen(typeName) - 4); - // Find underscore separator between K and V - var ki: int = 0; - var klen: int = bux_strlen(rest) as int; - while ki < klen { - if (rest[ki] as int) == ('_' as int) { - break; - } - ki = ki + 1; - } - if ki < klen { - let kType: String = bux_str_slice(rest, 0, ki); - let vType: String = bux_str_slice(rest, ki + 1, klen - ki - 1); - let genFree: *Decl = Lcx_FindGenericFunc(ctx, "Map_Free"); - if genFree != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genFree, kType, vType, 2); - } - let genDrop: *Decl = Lcx_FindGenericFunc(ctx, "Map_Drop"); - if genDrop != null as *Decl { - Lcx_GenerateFuncInstance(ctx, genDrop, kType, vType, 2); - } - return String_Concat(String_Concat("Map_Drop_", kType), String_Concat("_", vType)); - } - } - // User-defined types with @[Drop] OR an explicit TypeName_Drop method - let typeSym: Symbol = Scope_Lookup(ctx.scope, typeName); - if typeSym.kind == skType && typeSym.decl != null as *Decl { - let dropName: String = String_Concat(typeName, "_Drop"); - let dropSym: Symbol = Scope_Lookup(ctx.scope, dropName); - let hasAttr: bool = typeSym.decl.isDrop != 0; - let hasMethod: bool = dropSym.decl != null as *Decl; - if hasAttr || hasMethod { - return dropName; - } - } - return ""; -} - -// --------------------------------------------------------------------------- -// Module lowering — main entry point -// --------------------------------------------------------------------------- - -func HirLower_LowerModule(mod: *Module, sema: *Sema) -> *HirModule { - let ctx: *LowerCtx = bux_alloc(sizeof(LowerCtx)) as *LowerCtx; - ctx.module = mod; - ctx.scope = sema.scope; - ctx.funcs = bux_alloc(512 as uint * sizeof(HirFunc)) as *HirFunc; - ctx.funcCount = 0; - ctx.externFuncs = bux_alloc(512 as uint * sizeof(HirFunc)) as *HirFunc; - ctx.externCount = 0; - ctx.varCounter = 0; - ctx.genFuncCount = 0; - ctx.genFuncs = bux_alloc(256 as uint * sizeof(Decl)) as *Decl; - ctx.genStructCount = 0; - ctx.genStructs = bux_alloc(256 as uint * sizeof(Decl)) as *Decl; - ctx.substParam0 = ""; - ctx.substArg0 = ""; - ctx.substParam1 = ""; - ctx.substArg1 = ""; - - let hm: *HirModule = bux_alloc(sizeof(HirModule)) as *HirModule; - hm.funcCount = 0; - hm.funcs = ctx.funcs; - hm.structCount = 0; - hm.structs = bux_alloc(64 as uint * sizeof(HirStruct)) as *HirStruct; - hm.enumCount = 0; - hm.enums = bux_alloc(64 as uint * sizeof(HirEnum)) as *HirEnum; - hm.constCount = 0; - hm.consts = bux_alloc(512 as uint * sizeof(HirConst)) as *HirConst; - ctx.hm = hm; - - // First pass: count structs (to allocate field arrays later) - // Second pass: actually collect them - // For simplicity, do single pass with pre-allocated field arrays - - // Pass 1: collect generic declarations for monomorphization - var decl: *Decl = mod.firstItem; - while decl != null as *Decl { - if decl.kind == dkFunc && decl.typeParamCount > 0 { - ctx.genFuncs[ctx.genFuncCount] = *decl; - ctx.genFuncCount = ctx.genFuncCount + 1; - } - if decl.kind == dkStruct && decl.typeParamCount > 0 { - ctx.genStructs[ctx.genStructCount] = *decl; - ctx.genStructCount = ctx.genStructCount + 1; - } - // Generic impl/extend blocks: methods inherit the impl's type params - if decl.kind == dkImpl && decl.typeParamCount > 0 { - let implTypeName: String = decl.strValue; - var implDecl: *Decl = decl.childDecl1; - while implDecl != null as *Decl { - if implDecl.kind == dkFunc { - let renamed: String = String_Concat(String_Concat(implTypeName, "_"), implDecl.strValue); - var copy: Decl = *implDecl; - copy.strValue = renamed; - copy.typeParam0 = decl.typeParam0; - copy.typeParam1 = decl.typeParam1; - copy.typeParamCount = decl.typeParamCount; - ctx.genFuncs[ctx.genFuncCount] = copy; - ctx.genFuncCount = ctx.genFuncCount + 1; - } - implDecl = implDecl.childDecl2; - } - } - decl = decl.childDecl2; + struct CtfeLocal { + name: String, + value: int, } - // Pass 2: lower all declarations - decl = mod.firstItem; - while decl != null as *Decl { - if decl.kind == dkStruct && decl.typeParamCount == 0 && !String_Eq(decl.strValue, "") { - // Collect struct definition for C codegen - let si: int = hm.structCount; - hm.structs[si].name = decl.strValue; - hm.structs[si].fieldCount = decl.fieldCount; - hm.structs[si].fields = bux_alloc(decl.fieldCount as uint * sizeof(HirStructField)) as *HirStructField; - var fi: int = 0; - while fi < decl.fieldCount { - var fname: String = ""; - var ftype: *TypeExpr = null as *TypeExpr; - fname = decl.fields[fi].name; - ftype = decl.fields[fi].refFieldType; - // Skip empty field names - if String_Eq(fname, "") { - fi = fi + 1; - continue; - } - hm.structs[si].fields[fi].name = fname; - if ftype != null as *TypeExpr { - if ftype.kind == tekPointer && ftype.pointerPointee != null as *TypeExpr { - // Pointer type: emit "TypeName*" - if !String_Eq(ftype.pointerPointee.typeName, "") { - hm.structs[si].fields[fi].typeName = String_Concat(ftype.pointerPointee.typeName, "*"); - } - } else if !String_Eq(ftype.typeName, "") { - hm.structs[si].fields[fi].typeName = ftype.typeName; - } - } - fi = fi + 1; - } - hm.structCount = hm.structCount + 1; - } - if decl.kind == dkFunc && decl.refBody != null as *Block && decl.typeParamCount == 0 { - let f: *HirFunc = Lcx_LowerFunc(ctx, decl); - ctx.funcs[ctx.funcCount] = *f; - ctx.funcCount = ctx.funcCount + 1; - } - if decl.kind == dkImpl { - let implTypeName: String = decl.strValue; - var implDecl: *Decl = decl.childDecl1; - while implDecl != null as *Decl { - if implDecl.kind == dkFunc && implDecl.refBody != null as *Block { - // Generic impl methods are monomorphized on demand; skip direct lowering - if decl.typeParamCount > 0 { - implDecl = implDecl.childDecl2; - continue; - } - let mangled: String = String_Concat(implTypeName, "_"); - implDecl.strValue = String_Concat(mangled, implDecl.strValue); - let f: *HirFunc = Lcx_LowerFunc(ctx, implDecl); - ctx.funcs[ctx.funcCount] = *f; - ctx.funcCount = ctx.funcCount + 1; - } - implDecl = implDecl.childDecl2; - } - } - if decl.kind == dkExternFunc { - let f: *HirFunc = Lcx_LowerFunc(ctx, decl); - ctx.externFuncs[ctx.externCount] = *f; - ctx.externCount = ctx.externCount + 1; - } - // Pass 1: collect const names (expressions evaluated in Pass 2) - if decl.kind == dkConst && hm.constCount < 512 { - let ci: int = hm.constCount; - hm.consts[ci].name = decl.strValue; - hm.consts[ci].value = 0; - hm.constCount = hm.constCount + 1; - } - if decl.kind == dkEnum { - let ei: int = hm.enumCount; - hm.enums[ei].name = decl.strValue; - // Populate variants - hm.enums[ei].variantCount = decl.variantCount; - if decl.variantCount > 0 { - hm.enums[ei].variants = bux_alloc(decl.variantCount as uint * sizeof(HirEnumVariant)) as *HirEnumVariant; - } - var vi: int = 0; - while vi < decl.variantCount { - var v: *EnumVariant = null as *EnumVariant; - if vi == 0 { v = &decl.variant0; } - if vi == 1 { v = &decl.variant1; } - if vi == 2 { v = &decl.variant2; } - if vi == 3 { v = &decl.variant3; } - if vi == 4 { v = &decl.variant4; } - if vi == 5 { v = &decl.variant5; } - if vi == 6 { v = &decl.variant6; } - if vi == 7 { v = &decl.variant7; } - if vi == 8 { v = &decl.variant8; } - if v != null as *EnumVariant { - hm.enums[ei].variants[vi].name = v.name; - hm.enums[ei].variants[vi].fieldCount = v.fieldCount; - if v.fieldCount > 0 { - // Positional field names: Variant_0, Variant_1 (matches data.Variant_i / nested struct) - hm.enums[ei].variants[vi].fieldName0 = String_Concat(v.name, "_0"); - hm.enums[ei].variants[vi].fieldType0 = Lcx_ResolveTypeKindFromName(v.fieldTypeName0); - hm.enums[ei].variants[vi].fieldTypeName0 = v.fieldTypeName0; - } - if v.fieldCount > 1 { - hm.enums[ei].variants[vi].fieldName1 = String_Concat(v.name, "_1"); - hm.enums[ei].variants[vi].fieldType1 = Lcx_ResolveTypeKindFromName(v.fieldTypeName1); - hm.enums[ei].variants[vi].fieldTypeName1 = v.fieldTypeName1; - } - } - vi = vi + 1; - } - hm.enumCount = hm.enumCount + 1; - } - decl = decl.childDecl2; + struct CtfeEnv { + locals: *CtfeLocal, + count: int, } + struct CtVal { + value: int, + isReturn: bool, + } - // Pass 2: evaluate all const expressions (multiple passes for forward refs) - var changed: bool = true; - var maxPasses: int = 10; - var pass: int = 0; - while changed && pass < maxPasses { - changed = false; - decl = mod.firstItem; - var ci2: int = 0; - while decl != null as *Decl && ci2 < hm.constCount { - if decl.kind == dkConst { - if decl.constValue != null as *Expr { - let newVal: int = Lcx_EvalConstExpr(ctx, decl.constValue); - if newVal != hm.consts[ci2].value { - hm.consts[ci2].value = newVal; - changed = true; - } - } - ci2 = ci2 + 1; + func CtfeEnv_New() -> CtfeEnv { + let locals: *CtfeLocal = bux_alloc(CTFE_MAX_LOCALS as uint * sizeof(CtfeLocal)) as *CtfeLocal; + return CtfeEnv { locals: locals, count: 0 }; + } + + func CtfeEnv_Get(env: *CtfeEnv, name: String) -> int { + var i: int = env.count - 1; + while i >= 0 { + if String_Eq(env.locals[i].name, name) { + return env.locals[i].value; + } + i = i - 1; + } + return 0; + } + + func CtfeEnv_Set(env: *CtfeEnv, name: String, value: int) { + if env.count >= CTFE_MAX_LOCALS { return; } + env.locals[env.count].name = name; + env.locals[env.count].value = value; + env.count = env.count + 1; + } + + func Lcx_FindConstFunc(ctx: *LowerCtx, name: String) -> *Decl { + var decl: *Decl = ctx.module.firstItem; + while decl != null as *Decl { + if decl.kind == dkFunc && decl.isConst == 1 && String_Eq(decl.strValue, name) { + return decl; } decl = decl.childDecl2; } - pass = pass + 1; + return null as *Decl; } - hm.funcCount = ctx.funcCount; - hm.funcs = ctx.funcs; - hm.externCount = ctx.externCount; - hm.externFuncs = ctx.externFuncs; + func Lcx_ParamName(fd: *Decl, idx: int) -> String { + if fd == null as *Decl { return ""; } + if idx == 0 { return fd.param0.name; } + if idx == 1 { return fd.param1.name; } + if idx == 2 { return fd.param2.name; } + if idx == 3 { return fd.param3.name; } + if idx == 4 { return fd.param4.name; } + if idx == 5 { return fd.param5.name; } + if idx == 6 { return fd.param6.name; } + if idx == 7 { return fd.param7.name; } + if idx == 8 { return fd.param8.name; } + return ""; + } + + func CtVal_Make(value: int) -> CtVal { + return CtVal { value: value, isReturn: false }; + } + + func CtVal_Return(value: int) -> CtVal { + return CtVal { value: value, isReturn: true }; + } + + func Lcx_EvalConstExprEnv(ctx: *LowerCtx, expr: *Expr, env: *CtfeEnv) -> CtVal { + if expr == null as *Expr { + return CtVal_Make(0); + } + + // Literal integer + if expr.kind == ekLiteral { + return CtVal_Make(expr.intValue); + } + + // Reference to local or another constant + if expr.kind == ekIdent { + let localVal: int = CtfeEnv_Get(env, expr.strValue); + // Local takes precedence; 0 from Get could mean not found, but global const 0 + // will still be looked up below if needed. For Factorial parameters this works + // because params are always set in env. + if localVal != 0 { + return CtVal_Make(localVal); + } + let name: String = expr.strValue; + var i: int = 0; + while i < ctx.hm.constCount { + if String_Eq(ctx.hm.consts[i].name, name) { + return CtVal_Make(ctx.hm.consts[i].value); + } + i = i + 1; + } + return CtVal_Make(0); + } + + // Unary operators + if expr.kind == ekUnary { + let operand: CtVal = Lcx_EvalConstExprEnv(ctx, expr.child1, env); + let op: int = expr.intValue; + if op == tkMinus { return CtVal_Make(-operand.value); } + if op == tkBang { return CtVal_Make((operand.value == 0) as int); } + if op == tkTilde { return CtVal_Make(~operand.value); } + return CtVal_Make(operand.value); + } + + // Binary operators + if expr.kind == ekBinary { + let left: CtVal = Lcx_EvalConstExprEnv(ctx, expr.child1, env); + let right: CtVal = Lcx_EvalConstExprEnv(ctx, expr.child2, env); + let op: int = expr.intValue; + if op == tkPlus { return CtVal_Make(left.value + right.value); } + if op == tkMinus { return CtVal_Make(left.value - right.value); } + if op == tkStar { return CtVal_Make(left.value * right.value); } + if op == tkSlash { + if right.value == 0 { return CtVal_Make(0); } + return CtVal_Make(left.value / right.value); + } + if op == tkPercent { + if right.value == 0 { return CtVal_Make(0); } + return CtVal_Make(left.value % right.value); + } + if op == tkLt { return CtVal_Make((left.value < right.value) as int); } + if op == tkLe { return CtVal_Make((left.value <= right.value) as int); } + if op == tkGt { return CtVal_Make((left.value > right.value) as int); } + if op == tkGe { return CtVal_Make((left.value >= right.value) as int); } + if op == tkEq { return CtVal_Make((left.value == right.value) as int); } + if op == tkNe { return CtVal_Make((left.value != right.value) as int); } + if op == tkAmp { return CtVal_Make(left.value & right.value); } + if op == tkPipe { return CtVal_Make(left.value | right.value); } + if op == tkCaret { return CtVal_Make(left.value ^ right.value); } + if op == tkShl { return CtVal_Make(left.value << right.value); } + if op == tkShr { return CtVal_Make(left.value >> right.value); } + if op == tkAmpAmp { return CtVal_Make((left.value != 0 && right.value != 0) as int); } + if op == tkPipePipe { return CtVal_Make((left.value != 0 || right.value != 0) as int); } + return CtVal_Make(0); + } + + // Ternary operator + if expr.kind == ekTernary { + let cond: CtVal = Lcx_EvalConstExprEnv(ctx, expr.child1, env); + if cond.value != 0 { + return Lcx_EvalConstExprEnv(ctx, expr.child2, env); + } else { + return Lcx_EvalConstExprEnv(ctx, expr.child3, env); + } + } + + // Cast — evaluate operand (types don't affect integer values) + if expr.kind == ekCast { + return Lcx_EvalConstExprEnv(ctx, expr.child1, env); + } + + // Const function call + if expr.kind == ekCall { + if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { + let funcName: String = expr.child1.strValue; + let fd: *Decl = Lcx_FindConstFunc(ctx, funcName); + if fd != null as *Decl && fd.refBody != null as *Block { + // Evaluate arguments + var argExpr: *ExprList = expr.callArgs; + var ai: int = 0; + var argVals: *int = bux_alloc(fd.paramCount as uint * sizeof(int)) as *int; + while ai < fd.paramCount { + argVals[ai] = 0; + ai = ai + 1; + } + ai = 0; + while argExpr != null as *ExprList && ai < fd.paramCount { + let av: CtVal = Lcx_EvalConstExprEnv(ctx, argExpr.expr, env); + argVals[ai] = av.value; + argExpr = argExpr.next; + ai = ai + 1; + } + // Set up call environment + let callEnv: CtfeEnv = CtfeEnv_New(); + var pi: int = 0; + while pi < fd.paramCount { + CtfeEnv_Set(&callEnv, Lcx_ParamName(fd, pi), argVals[pi]); + pi = pi + 1; + } + let result: CtVal = Lcx_EvalConstBlock(ctx, fd.refBody, &callEnv); + return CtVal_Make(result.value); + } + } + return CtVal_Make(0); + } + + return CtVal_Make(0); + } + + func Lcx_EvalConstBlock(ctx: *LowerCtx, block: *Block, env: *CtfeEnv) -> CtVal { + if block == null as *Block { + return CtVal_Make(0); + } + var stmt: *Stmt = block.firstStmt; + while stmt != null as *Stmt { + if stmt.kind == skLet && stmt.child1 != null as *Expr { + let val: CtVal = Lcx_EvalConstExprEnv(ctx, stmt.child1, env); + CtfeEnv_Set(env, stmt.strValue, val.value); + } else if stmt.kind == skIf { + let cond: CtVal = Lcx_EvalConstExprEnv(ctx, stmt.child1, env); + if cond.value != 0 { + let r: CtVal = Lcx_EvalConstBlock(ctx, stmt.refStmtBlock, env); + if r.isReturn { return r; } + } else if stmt.refStmtElse != null as *Block { + let r: CtVal = Lcx_EvalConstBlock(ctx, stmt.refStmtElse, env); + if r.isReturn { return r; } + } + } else if stmt.kind == skReturn { + if stmt.child1 != null as *Expr { + let val: CtVal = Lcx_EvalConstExprEnv(ctx, stmt.child1, env); + return CtVal_Return(val.value); + } + return CtVal_Return(0); + } else if stmt.kind == skExpr { + discard Lcx_EvalConstExprEnv(ctx, stmt.child1, env); + } + stmt = stmt.nextStmt; + } + return CtVal_Make(0); + } + + func Lcx_EvalConstExpr(ctx: *LowerCtx, expr: *Expr) -> int { + let env: CtfeEnv = CtfeEnv_New(); + let result: CtVal = Lcx_EvalConstExprEnv(ctx, expr, &env); + return result.value; + } + + // --------------------------------------------------------------------------- + // Auto-Drop: build the Free function name for a given type + // --------------------------------------------------------------------------- + + func Lcx_BuildAutoDropFree(ctx: *LowerCtx, typeName: String) -> String { + if String_StartsWith(typeName, "Array_") { + let elemType: String = bux_str_slice(typeName, 6, bux_strlen(typeName) - 6); + // Ensure inner free is also monomorphized since Drop calls Free + let genFree: *Decl = Lcx_FindGenericFunc(ctx, "Array_Free"); + if genFree != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genFree, elemType, "", 1); + } + let genDrop: *Decl = Lcx_FindGenericFunc(ctx, "Array_Drop"); + if genDrop != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genDrop, elemType, "", 1); + } + return String_Concat("Array_Drop_", elemType); + } + if String_StartsWith(typeName, "Channel_") { + let elemType: String = bux_str_slice(typeName, 8, bux_strlen(typeName) - 8); + let genFree: *Decl = Lcx_FindGenericFunc(ctx, "Channel_Free"); + if genFree != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genFree, elemType, "", 1); + } + let genDrop: *Decl = Lcx_FindGenericFunc(ctx, "Channel_Drop"); + if genDrop != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genDrop, elemType, "", 1); + } + return String_Concat("Channel_Drop_", elemType); + } + if String_StartsWith(typeName, "Set_") { + let elemType: String = bux_str_slice(typeName, 4, bux_strlen(typeName) - 4); + let genFree: *Decl = Lcx_FindGenericFunc(ctx, "Set_Free"); + if genFree != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genFree, elemType, "", 1); + } + let genDrop: *Decl = Lcx_FindGenericFunc(ctx, "Set_Drop"); + if genDrop != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genDrop, elemType, "", 1); + } + return String_Concat("Set_Drop_", elemType); + } + if String_StartsWith(typeName, "Map_") { + let rest: String = bux_str_slice(typeName, 4, bux_strlen(typeName) - 4); + // Find underscore separator between K and V + var ki: int = 0; + var klen: int = bux_strlen(rest) as int; + while ki < klen { + if (rest[ki] as int) == ('_' as int) { + break; + } + ki = ki + 1; + } + if ki < klen { + let kType: String = bux_str_slice(rest, 0, ki); + let vType: String = bux_str_slice(rest, ki + 1, klen - ki - 1); + let genFree: *Decl = Lcx_FindGenericFunc(ctx, "Map_Free"); + if genFree != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genFree, kType, vType, 2); + } + let genDrop: *Decl = Lcx_FindGenericFunc(ctx, "Map_Drop"); + if genDrop != null as *Decl { + Lcx_GenerateFuncInstance(ctx, genDrop, kType, vType, 2); + } + return String_Concat(String_Concat("Map_Drop_", kType), String_Concat("_", vType)); + } + } + // User-defined types with @[Drop] OR an explicit TypeName_Drop method + let typeSym: Symbol = Scope_Lookup(ctx.scope, typeName); + if typeSym.kind == skType && typeSym.decl != null as *Decl { + let dropName: String = String_Concat(typeName, "_Drop"); + let dropSym: Symbol = Scope_Lookup(ctx.scope, dropName); + let hasAttr: bool = typeSym.decl.isDrop != 0; + let hasMethod: bool = dropSym.decl != null as *Decl; + if hasAttr || hasMethod { + return dropName; + } + } + return ""; + } + + // --------------------------------------------------------------------------- + // Module lowering — main entry point + // --------------------------------------------------------------------------- + + func HirLower_LowerModule(mod: *Module, sema: *Sema) -> *HirModule { + let ctx: *LowerCtx = bux_alloc(sizeof(LowerCtx)) as *LowerCtx; + ctx.module = mod; + ctx.scope = sema.scope; + ctx.funcs = bux_alloc(512 as uint * sizeof(HirFunc)) as *HirFunc; + ctx.funcCount = 0; + ctx.externFuncs = bux_alloc(512 as uint * sizeof(HirFunc)) as *HirFunc; + ctx.externCount = 0; + ctx.varCounter = 0; + ctx.genFuncCount = 0; + ctx.genFuncs = bux_alloc(256 as uint * sizeof(Decl)) as *Decl; + ctx.genStructCount = 0; + ctx.genStructs = bux_alloc(256 as uint * sizeof(Decl)) as *Decl; + ctx.substParam0 = ""; + ctx.substArg0 = ""; + ctx.substParam1 = ""; + ctx.substArg1 = ""; + + let hm: *HirModule = bux_alloc(sizeof(HirModule)) as *HirModule; + hm.funcCount = 0; + hm.funcs = ctx.funcs; + hm.structCount = 0; + hm.structs = bux_alloc(64 as uint * sizeof(HirStruct)) as *HirStruct; + hm.enumCount = 0; + hm.enums = bux_alloc(64 as uint * sizeof(HirEnum)) as *HirEnum; + hm.constCount = 0; + hm.consts = bux_alloc(512 as uint * sizeof(HirConst)) as *HirConst; + ctx.hm = hm; + + // First pass: count structs (to allocate field arrays later) + // Second pass: actually collect them + // For simplicity, do single pass with pre-allocated field arrays + + // Pass 1: collect generic declarations for monomorphization + var decl: *Decl = mod.firstItem; + while decl != null as *Decl { + if decl.kind == dkFunc && decl.typeParamCount > 0 { + ctx.genFuncs[ctx.genFuncCount] = *decl; + ctx.genFuncCount = ctx.genFuncCount + 1; + } + if decl.kind == dkStruct && decl.typeParamCount > 0 { + ctx.genStructs[ctx.genStructCount] = *decl; + ctx.genStructCount = ctx.genStructCount + 1; + } + // Generic impl/extend blocks: methods inherit the impl's type params + if decl.kind == dkImpl && decl.typeParamCount > 0 { + let implTypeName: String = decl.strValue; + var implDecl: *Decl = decl.childDecl1; + while implDecl != null as *Decl { + if implDecl.kind == dkFunc { + let renamed: String = String_Concat(String_Concat(implTypeName, "_"), implDecl.strValue); + var copy: Decl = *implDecl; + copy.strValue = renamed; + copy.typeParam0 = decl.typeParam0; + copy.typeParam1 = decl.typeParam1; + copy.typeParamCount = decl.typeParamCount; + ctx.genFuncs[ctx.genFuncCount] = copy; + ctx.genFuncCount = ctx.genFuncCount + 1; + } + implDecl = implDecl.childDecl2; + } + } + decl = decl.childDecl2; + } + + // Pass 2: lower all declarations + decl = mod.firstItem; + while decl != null as *Decl { + if decl.kind == dkStruct && decl.typeParamCount == 0 && !String_Eq(decl.strValue, "") { + // Collect struct definition for C codegen + let si: int = hm.structCount; + hm.structs[si].name = decl.strValue; + hm.structs[si].fieldCount = decl.fieldCount; + hm.structs[si].fields = bux_alloc(decl.fieldCount as uint * sizeof(HirStructField)) as *HirStructField; + var fi: int = 0; + while fi < decl.fieldCount { + var fname: String = ""; + var ftype: *TypeExpr = null as *TypeExpr; + fname = decl.fields[fi].name; + ftype = decl.fields[fi].refFieldType; + // Skip empty field names + if String_Eq(fname, "") { + fi = fi + 1; + continue; + } + hm.structs[si].fields[fi].name = fname; + if ftype != null as *TypeExpr { + if ftype.kind == tekPointer && ftype.pointerPointee != null as *TypeExpr { + // Pointer type: emit "TypeName*" + if !String_Eq(ftype.pointerPointee.typeName, "") { + hm.structs[si].fields[fi].typeName = String_Concat(ftype.pointerPointee.typeName, "*"); + } + } else if !String_Eq(ftype.typeName, "") { + hm.structs[si].fields[fi].typeName = ftype.typeName; + } + } + fi = fi + 1; + } + hm.structCount = hm.structCount + 1; + } + if decl.kind == dkFunc && decl.refBody != null as *Block && decl.typeParamCount == 0 { + let f: *HirFunc = Lcx_LowerFunc(ctx, decl); + ctx.funcs[ctx.funcCount] = *f; + ctx.funcCount = ctx.funcCount + 1; + } + if decl.kind == dkImpl { + let implTypeName: String = decl.strValue; + var implDecl: *Decl = decl.childDecl1; + while implDecl != null as *Decl { + if implDecl.kind == dkFunc && implDecl.refBody != null as *Block { + // Generic impl methods are monomorphized on demand; skip direct lowering + if decl.typeParamCount > 0 { + implDecl = implDecl.childDecl2; + continue; + } + let mangled: String = String_Concat(implTypeName, "_"); + implDecl.strValue = String_Concat(mangled, implDecl.strValue); + let f: *HirFunc = Lcx_LowerFunc(ctx, implDecl); + ctx.funcs[ctx.funcCount] = *f; + ctx.funcCount = ctx.funcCount + 1; + } + implDecl = implDecl.childDecl2; + } + } + if decl.kind == dkExternFunc { + let f: *HirFunc = Lcx_LowerFunc(ctx, decl); + ctx.externFuncs[ctx.externCount] = *f; + ctx.externCount = ctx.externCount + 1; + } + // Pass 1: collect const names (expressions evaluated in Pass 2) + if decl.kind == dkConst && hm.constCount < 512 { + let ci: int = hm.constCount; + hm.consts[ci].name = decl.strValue; + hm.consts[ci].value = 0; + hm.constCount = hm.constCount + 1; + } + if decl.kind == dkEnum { + let ei: int = hm.enumCount; + hm.enums[ei].name = decl.strValue; + // Populate variants + hm.enums[ei].variantCount = decl.variantCount; + if decl.variantCount > 0 { + hm.enums[ei].variants = bux_alloc(decl.variantCount as uint * sizeof(HirEnumVariant)) as *HirEnumVariant; + } + var vi: int = 0; + while vi < decl.variantCount { + var v: *EnumVariant = null as *EnumVariant; + if vi == 0 { v = &decl.variant0; } + if vi == 1 { v = &decl.variant1; } + if vi == 2 { v = &decl.variant2; } + if vi == 3 { v = &decl.variant3; } + if vi == 4 { v = &decl.variant4; } + if vi == 5 { v = &decl.variant5; } + if vi == 6 { v = &decl.variant6; } + if vi == 7 { v = &decl.variant7; } + if vi == 8 { v = &decl.variant8; } + if v != null as *EnumVariant { + hm.enums[ei].variants[vi].name = v.name; + hm.enums[ei].variants[vi].fieldCount = v.fieldCount; + if v.fieldCount > 0 { + // Positional field names: Variant_0, Variant_1 (matches data.Variant_i / nested struct) + hm.enums[ei].variants[vi].fieldName0 = String_Concat(v.name, "_0"); + hm.enums[ei].variants[vi].fieldType0 = Lcx_ResolveTypeKindFromName(v.fieldTypeName0); + hm.enums[ei].variants[vi].fieldTypeName0 = v.fieldTypeName0; + } + if v.fieldCount > 1 { + hm.enums[ei].variants[vi].fieldName1 = String_Concat(v.name, "_1"); + hm.enums[ei].variants[vi].fieldType1 = Lcx_ResolveTypeKindFromName(v.fieldTypeName1); + hm.enums[ei].variants[vi].fieldTypeName1 = v.fieldTypeName1; + } + } + vi = vi + 1; + } + hm.enumCount = hm.enumCount + 1; + } + decl = decl.childDecl2; + } - return hm; -} + // Pass 2: evaluate all const expressions (multiple passes for forward refs) + var changed: bool = true; + var maxPasses: int = 10; + var pass: int = 0; + while changed && pass < maxPasses { + changed = false; + decl = mod.firstItem; + var ci2: int = 0; + while decl != null as *Decl && ci2 < hm.constCount { + if decl.kind == dkConst { + if decl.constValue != null as *Expr { + let newVal: int = Lcx_EvalConstExpr(ctx, decl.constValue); + if newVal != hm.consts[ci2].value { + hm.consts[ci2].value = newVal; + changed = true; + } + } + ci2 = ci2 + 1; + } + decl = decl.childDecl2; + } + pass = pass + 1; + } + + hm.funcCount = ctx.funcCount; + hm.funcs = ctx.funcs; + hm.externCount = ctx.externCount; + hm.externFuncs = ctx.externFuncs; + + + return hm; + } } diff --git a/src/lexer.bux b/src/lexer.bux index 0f8f6ce..a2fef11 100644 --- a/src/lexer.bux +++ b/src/lexer.bux @@ -2,800 +2,813 @@ // Tokenizes Bux source into a stream of tokens. module Lexer { -extern func bux_strlen(s: String) -> uint; + extern func bux_strlen(s: String) -> uint; -// --------------------------------------------------------------------------- -// Character helpers (wrap C ctype) -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Character helpers (wrap C ctype) + // --------------------------------------------------------------------------- -func Lex_IsDigit(c: uint32) -> bool { - return c >= 48 && c <= 57; // '0'..'9' -} - -func Lex_IsHexDigit(c: uint32) -> bool { - if c >= 48 && c <= 57 { return true; } // 0-9 - if c >= 65 && c <= 70 { return true; } // A-F - if c >= 97 && c <= 102 { return true; } // a-f - return false; -} - -func Lex_IsBinDigit(c: uint32) -> bool { - return c == 48 || c == 49; // '0' or '1' -} - -func Lex_IsOctDigit(c: uint32) -> bool { - return c >= 48 && c <= 55; // '0'..'7' -} - -func Lex_IsIdentStart(c: uint32) -> bool { - if c >= 97 && c <= 122 { return true; } // a-z - if c >= 65 && c <= 90 { return true; } // A-Z - return c == 95; // '_' -} - -func Lex_IsIdentChar(c: uint32) -> bool { - if Lex_IsIdentStart(c) { return true; } - return Lex_IsDigit(c); -} - -// --------------------------------------------------------------------------- -// Lexer state -// --------------------------------------------------------------------------- - -const maxTokens: int = 32768; -const maxDiags: int = 128; - -struct LexerDiag { - line: uint32; - column: uint32; - message: String; -} - -struct Lexer { - source: String; - sourceLen: int; - pos: int; - line: uint32; - column: uint32; - startLine: uint32; - startColumn: uint32; - startPos: int; - tokenCount: int; - tokens: *LexToken; - diagCount: int; - diags: *LexerDiag; -} - -struct LexToken { - kind: int; - text: String; - line: uint32; - column: uint32; -} - -// --------------------------------------------------------------------------- -// Core primitives -// --------------------------------------------------------------------------- - -func lexIsAtEnd(lex: *Lexer) -> bool { - return lex.pos >= lex.sourceLen; -} - -func lexPeek(lex: *Lexer, ahead: int) -> uint32 { - let i: int = lex.pos + ahead; - if i < lex.sourceLen { - return (lex.source[i] as uint32) & 255; + func Lex_IsDigit(c: uint32) -> bool { + return c >= 48 && c <= 57; // '0'..'9' } - return 0; -} -func lexAdvance(lex: *Lexer) -> uint32 { - let c: uint32 = lexPeek(lex, 0); - if !lexIsAtEnd(lex) { - lex.pos = lex.pos + 1; - if c == 10 { // '\n' - lex.line = lex.line + 1; - lex.column = 1; - } else { - lex.column = lex.column + 1; + func Lex_IsHexDigit(c: uint32) -> bool { + if c >= 48 && c <= 57 { return true; } // 0-9 + if c >= 65 && c <= 70 { return true; } // A-F + if c >= 97 && c <= 102 { return true; } // a-f + return false; + } + + func Lex_IsBinDigit(c: uint32) -> bool { + return c == 48 || c == 49; // '0' or '1' + } + + func Lex_IsOctDigit(c: uint32) -> bool { + return c >= 48 && c <= 55; // '0'..'7' + } + + func Lex_IsIdentStart(c: uint32) -> bool { + if c >= 97 && c <= 122 { return true; } // a-z + if c >= 65 && c <= 90 { return true; } // A-Z + return c == 95; // '_' + } + + func Lex_IsIdentChar(c: uint32) -> bool { + if Lex_IsIdentStart(c) { return true; } + return Lex_IsDigit(c); + } + + // --------------------------------------------------------------------------- + // Lexer state + // --------------------------------------------------------------------------- + + const maxTokens: int = 32768; + const maxDiags: int = 128; + + struct LexerDiag { + line: uint32; + column: uint32; + message: String; + } + + struct Lexer { + source: String; + sourceLen: int; + pos: int; + line: uint32; + column: uint32; + startLine: uint32; + startColumn: uint32; + startPos: int; + tokenCount: int; + tokens: *LexToken; + diagCount: int; + diags: *LexerDiag; + } + + struct LexToken { + kind: int; + text: String; + line: uint32; + column: uint32; + } + + // --------------------------------------------------------------------------- + // Core primitives + // --------------------------------------------------------------------------- + + func lexIsAtEnd(lex: *Lexer) -> bool { + return lex.pos >= lex.sourceLen; + } + + func lexPeek(lex: *Lexer, ahead: int) -> uint32 { + let i: int = lex.pos + ahead; + if i < lex.sourceLen { + return (lex.source[i] as uint32) & 255; } + return 0; } - return c; -} -func lexMatch(lex: *Lexer, expected: uint32) -> bool { - if lexIsAtEnd(lex) { return false; } - if lexPeek(lex, 0) != expected { return false; } - discard lexAdvance(lex); - return true; -} - -func lexMatchStr(lex: *Lexer, s: String) -> bool { - let len: uint = bux_strlen(s); - var i: int = 0; - while i < (len as int) { - if lexPeek(lex, i) != (s[i] as uint32) { - return false; + func lexAdvance(lex: *Lexer) -> uint32 { + let c: uint32 = lexPeek(lex, 0); + if !lexIsAtEnd(lex) { + lex.pos = lex.pos + 1; + if c == 10 { // '\n' + lex.line = lex.line + 1; + lex.column = 1; + } else { + lex.column = lex.column + 1; + } } - i = i + 1; + return c; } - i = 0; - while i < (len as int) { + + func lexMatch(lex: *Lexer, expected: uint32) -> bool { + if lexIsAtEnd(lex) { return false; } + if lexPeek(lex, 0) != expected { return false; } discard lexAdvance(lex); - i = i + 1; + return true; } - return true; -} -// --------------------------------------------------------------------------- -// Token emission -// --------------------------------------------------------------------------- - -func lexMarkStart(lex: *Lexer) { - lex.startLine = lex.line; - lex.startColumn = lex.column; - lex.startPos = lex.pos; -} - -func lexMakeToken(lex: *Lexer, kind: int) -> LexToken { - var text: String = ""; - let endPos: int = lex.pos; - let startPos: int = lex.startPos; - if endPos > startPos { - let len: int = endPos - startPos; - let buf: *char8 = bux_alloc((len + 1) as uint) as *char8; + func lexMatchStr(lex: *Lexer, s: String) -> bool { + let len: uint = bux_strlen(s); var i: int = 0; - while i < len { - buf[i] = lex.source[startPos + i] as char8; + while i < (len as int) { + if lexPeek(lex, i) != (s[i] as uint32) { + return false; + } i = i + 1; } - buf[len] = 0 as char8; - text = buf; - } else { - text = ""; + i = 0; + while i < (len as int) { + discard lexAdvance(lex); + i = i + 1; + } + return true; } - return LexToken { - kind: kind, text: text, - line: lex.startLine, column: lex.startColumn - }; -} -func lexEmitToken(lex: *Lexer, kind: int) { - let tok: LexToken = lexMakeToken(lex, kind); - if lex.tokenCount < maxTokens { - lex.tokens[lex.tokenCount] = tok; - lex.tokenCount = lex.tokenCount + 1; + // --------------------------------------------------------------------------- + // Token emission + // --------------------------------------------------------------------------- + + func lexMarkStart(lex: *Lexer) { + lex.startLine = lex.line; + lex.startColumn = lex.column; + lex.startPos = lex.pos; } -} -func lexSetLastTokenText(lex: *Lexer, text: String) { - if lex.tokenCount > 0 { - lex.tokens[lex.tokenCount - 1].text = text; - } -} - -func lexEmitDiag(lex: *Lexer, msg: String) { - if lex.diagCount < maxDiags { - lex.diags[lex.diagCount] = LexerDiag { - line: lex.line, column: lex.column, message: msg + func lexMakeToken(lex: *Lexer, kind: int) -> LexToken { + var text: String = ""; + let endPos: int = lex.pos; + let startPos: int = lex.startPos; + if endPos > startPos { + let len: int = endPos - startPos; + let buf: *char8 = bux_alloc((len + 1) as uint) as *char8; + var i: int = 0; + while i < len { + buf[i] = lex.source[startPos + i] as char8; + i = i + 1; + } + buf[len] = 0 as char8; + text = buf; + } else { + text = ""; + } + return LexToken { + kind: kind, text: text, + line: lex.startLine, column: lex.startColumn }; - lex.diagCount = lex.diagCount + 1; } -} -// --------------------------------------------------------------------------- -// Whitespace / comments -// --------------------------------------------------------------------------- - -func lexSkipLineComment(lex: *Lexer) { - while !lexIsAtEnd(lex) && lexPeek(lex, 0) != 10 { // '\n' - discard lexAdvance(lex); + func lexEmitToken(lex: *Lexer, kind: int) { + let tok: LexToken = lexMakeToken(lex, kind); + if lex.tokenCount < maxTokens { + lex.tokens[lex.tokenCount] = tok; + lex.tokenCount = lex.tokenCount + 1; + } } -} -func lexSkipBlockComment(lex: *Lexer) { - var depth: int = 1; - while !lexIsAtEnd(lex) && depth > 0 { - if lexPeek(lex, 0) == 47 && lexPeek(lex, 1) == 42 { // /* - discard lexAdvance(lex); - discard lexAdvance(lex); - depth = depth + 1; - } else if lexPeek(lex, 0) == 42 && lexPeek(lex, 1) == 47 { // */ - discard lexAdvance(lex); - discard lexAdvance(lex); - depth = depth - 1; - } else { + func lexSetLastTokenText(lex: *Lexer, text: String) { + if lex.tokenCount > 0 { + lex.tokens[lex.tokenCount - 1].text = text; + } + } + + func lexEmitDiag(lex: *Lexer, msg: String) { + if lex.diagCount < maxDiags { + lex.diags[lex.diagCount] = LexerDiag { + line: lex.line, column: lex.column, message: msg + }; + lex.diagCount = lex.diagCount + 1; + } + } + + // --------------------------------------------------------------------------- + // Whitespace / comments + // --------------------------------------------------------------------------- + + func lexSkipLineComment(lex: *Lexer) { + while !lexIsAtEnd(lex) && lexPeek(lex, 0) != 10 { // '\n' discard lexAdvance(lex); } } - if depth > 0 { - lexEmitDiag(lex, "unterminated block comment"); - } -} -func lexSkipWhitespace(lex: *Lexer) { - while !lexIsAtEnd(lex) { - let c: uint32 = lexPeek(lex, 0); - if c == 32 || c == 9 || c == 13 { - discard lexAdvance(lex); - } else { - if c == 47 && lexPeek(lex, 1) == 47 { - lexSkipLineComment(lex); + func lexSkipBlockComment(lex: *Lexer) { + var depth: int = 1; + while !lexIsAtEnd(lex) && depth > 0 { + if lexPeek(lex, 0) == 47 && lexPeek(lex, 1) == 42 { // /* + discard lexAdvance(lex); + discard lexAdvance(lex); + depth = depth + 1; + } else if lexPeek(lex, 0) == 42 && lexPeek(lex, 1) == 47 { // */ + discard lexAdvance(lex); + discard lexAdvance(lex); + depth = depth - 1; } else { - if c == 47 && lexPeek(lex, 1) == 42 { - discard lexAdvance(lex); - discard lexAdvance(lex); - lexSkipBlockComment(lex); + discard lexAdvance(lex); + } + } + if depth > 0 { + lexEmitDiag(lex, "unterminated block comment"); + } + } + + func lexSkipWhitespace(lex: *Lexer) { + while !lexIsAtEnd(lex) { + let c: uint32 = lexPeek(lex, 0); + if c == 32 || c == 9 || c == 13 { + discard lexAdvance(lex); + } else { + if c == 47 && lexPeek(lex, 1) == 47 { + lexSkipLineComment(lex); } else { - break; + if c == 47 && lexPeek(lex, 1) == 42 { + discard lexAdvance(lex); + discard lexAdvance(lex); + lexSkipBlockComment(lex); + } else { + break; + } } } } } -} -// --------------------------------------------------------------------------- -// Identifiers -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Identifiers + // --------------------------------------------------------------------------- -func lexKeywordKind(text: String) -> int { - if String_Eq(text, "true") { return tkBoolLiteral; } - if String_Eq(text, "false") { return tkBoolLiteral; } - if String_Eq(text, "func") { return tkFunc; } - if String_Eq(text, "let") { return tkLet; } - if String_Eq(text, "var") { return tkVar; } - if String_Eq(text, "const") { return tkConst; } - if String_Eq(text, "type") { return tkType; } - if String_Eq(text, "struct") { return tkStruct; } - if String_Eq(text, "enum") { return tkEnum; } - if String_Eq(text, "union") { return tkUnion; } - if String_Eq(text, "interface") { return tkInterface; } - if String_Eq(text, "extend") { return tkExtend; } - if String_Eq(text, "module") { return tkModule; } - if String_Eq(text, "import") { return tkImport; } - if String_Eq(text, "pub") { return tkPub; } - if String_Eq(text, "extern") { return tkExtern; } - if String_Eq(text, "if") { return tkIf; } - if String_Eq(text, "else") { return tkElse; } - if String_Eq(text, "while") { return tkWhile; } - if String_Eq(text, "do") { return tkDo; } - if String_Eq(text, "loop") { return tkLoop; } - if String_Eq(text, "for") { return tkFor; } - if String_Eq(text, "in") { return tkIn; } - if String_Eq(text, "break") { return tkBreak; } - if String_Eq(text, "continue") { return tkContinue; } - if String_Eq(text, "return") { return tkReturn; } - if String_Eq(text, "match") { return tkMatch; } - if String_Eq(text, "as") { return tkAs; } - if String_Eq(text, "is") { return tkIs; } - if String_Eq(text, "null") { return tkNull; } - if String_Eq(text, "self") { return tkSelf; } - if String_Eq(text, "super") { return tkSuper; } - if String_Eq(text, "sizeof") { return tkSizeOf; } - if String_Eq(text, "discard") { return tkDiscard; } - if String_Eq(text, "defer") { return tkDefer; } - if String_Eq(text, "switch") { return tkSwitch; } - if String_Eq(text, "case") { return tkCase; } - if String_Eq(text, "default") { return tkDefault; } - if String_Eq(text, "unsafe") { return tkUnsafe; } - if String_Eq(text, "async") { return tkAsync; } - if String_Eq(text, "await") { return tkAwait; } - if String_Eq(text, "spawn") { return tkSpawn; } - return tkIdent; -} - -func lexScanIdent(lex: *Lexer) { - lexMarkStart(lex); - while !lexIsAtEnd(lex) && Lex_IsIdentChar(lexPeek(lex, 0)) { - discard lexAdvance(lex); + func lexKeywordKind(text: String) -> int { + if String_Eq(text, "true") { return tkBoolLiteral; } + if String_Eq(text, "false") { return tkBoolLiteral; } + if String_Eq(text, "func") { return tkFunc; } + if String_Eq(text, "let") { return tkLet; } + if String_Eq(text, "var") { return tkVar; } + if String_Eq(text, "const") { return tkConst; } + if String_Eq(text, "type") { return tkType; } + if String_Eq(text, "struct") { return tkStruct; } + if String_Eq(text, "enum") { return tkEnum; } + if String_Eq(text, "union") { return tkUnion; } + if String_Eq(text, "interface") { return tkInterface; } + if String_Eq(text, "extend") { return tkExtend; } + if String_Eq(text, "module") { return tkModule; } + if String_Eq(text, "import") { return tkImport; } + if String_Eq(text, "pub") { return tkPub; } + if String_Eq(text, "extern") { return tkExtern; } + if String_Eq(text, "if") { return tkIf; } + if String_Eq(text, "else") { return tkElse; } + if String_Eq(text, "while") { return tkWhile; } + if String_Eq(text, "do") { return tkDo; } + if String_Eq(text, "loop") { return tkLoop; } + if String_Eq(text, "for") { return tkFor; } + if String_Eq(text, "in") { return tkIn; } + if String_Eq(text, "break") { return tkBreak; } + if String_Eq(text, "continue") { return tkContinue; } + if String_Eq(text, "return") { return tkReturn; } + if String_Eq(text, "match") { return tkMatch; } + if String_Eq(text, "as") { return tkAs; } + if String_Eq(text, "is") { return tkIs; } + if String_Eq(text, "null") { return tkNull; } + if String_Eq(text, "self") { return tkSelf; } + if String_Eq(text, "super") { return tkSuper; } + if String_Eq(text, "sizeof") { return tkSizeOf; } + if String_Eq(text, "discard") { return tkDiscard; } + if String_Eq(text, "defer") { return tkDefer; } + if String_Eq(text, "switch") { return tkSwitch; } + if String_Eq(text, "case") { return tkCase; } + if String_Eq(text, "default") { return tkDefault; } + if String_Eq(text, "unsafe") { return tkUnsafe; } + if String_Eq(text, "async") { return tkAsync; } + if String_Eq(text, "await") { return tkAwait; } + if String_Eq(text, "spawn") { return tkSpawn; } + return tkIdent; } - let tok: LexToken = lexMakeToken(lex, tkIdent); - let kind: int = lexKeywordKind(tok.text); - tok.kind = kind; - if lex.tokenCount < maxTokens { - lex.tokens[lex.tokenCount] = tok; - lex.tokenCount = lex.tokenCount + 1; + + func lexScanIdent(lex: *Lexer) { + lexMarkStart(lex); + while !lexIsAtEnd(lex) && Lex_IsIdentChar(lexPeek(lex, 0)) { + discard lexAdvance(lex); + } + let tok: LexToken = lexMakeToken(lex, tkIdent); + let kind: int = lexKeywordKind(tok.text); + tok.kind = kind; + if lex.tokenCount < maxTokens { + lex.tokens[lex.tokenCount] = tok; + lex.tokenCount = lex.tokenCount + 1; + } } -} -// --------------------------------------------------------------------------- -// Numbers -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Numbers + // --------------------------------------------------------------------------- -func lexScanDigits(lex: *Lexer) { - while !lexIsAtEnd(lex) && Lex_IsDigit(lexPeek(lex, 0)) { - discard lexAdvance(lex); + func lexScanDigits(lex: *Lexer) { + while !lexIsAtEnd(lex) && Lex_IsDigit(lexPeek(lex, 0)) { + discard lexAdvance(lex); + } } -} -func lexScanHexDigits(lex: *Lexer) { - while !lexIsAtEnd(lex) && Lex_IsHexDigit(lexPeek(lex, 0)) { - discard lexAdvance(lex); + func lexScanHexDigits(lex: *Lexer) { + while !lexIsAtEnd(lex) && Lex_IsHexDigit(lexPeek(lex, 0)) { + discard lexAdvance(lex); + } } -} -func lexScanNumber(lex: *Lexer) { - lexMarkStart(lex); - var isFloat: bool = false; + func lexScanNumber(lex: *Lexer) { + lexMarkStart(lex); + var isFloat: bool = false; - if lexPeek(lex, 0) == 48 { // '0' - let p1: uint32 = lexPeek(lex, 1); - if p1 == 120 || p1 == 88 || p1 == 98 || p1 == 66 || p1 == 111 || p1 == 79 { // x X b B o O - discard lexAdvance(lex); // 0 - discard lexAdvance(lex); // prefix - if p1 == 120 || p1 == 88 { lexScanHexDigits(lex); } - else if p1 == 98 || p1 == 66 { - while !lexIsAtEnd(lex) && Lex_IsBinDigit(lexPeek(lex, 0)) { - discard lexAdvance(lex); + if lexPeek(lex, 0) == 48 { // '0' + let p1: uint32 = lexPeek(lex, 1); + if p1 == 120 || p1 == 88 || p1 == 98 || p1 == 66 || p1 == 111 || p1 == 79 { // x X b B o O + discard lexAdvance(lex); // 0 + discard lexAdvance(lex); // prefix + if p1 == 120 || p1 == 88 { lexScanHexDigits(lex); } + else if p1 == 98 || p1 == 66 { + while !lexIsAtEnd(lex) && Lex_IsBinDigit(lexPeek(lex, 0)) { + discard lexAdvance(lex); + } } - } - else { - while !lexIsAtEnd(lex) && Lex_IsOctDigit(lexPeek(lex, 0)) { - discard lexAdvance(lex); + else { + while !lexIsAtEnd(lex) && Lex_IsOctDigit(lexPeek(lex, 0)) { + discard lexAdvance(lex); + } } + lexEmitToken(lex, tkIntLiteral); + return; } + } + + lexScanDigits(lex); + + if lexPeek(lex, 0) == 46 && Lex_IsDigit(lexPeek(lex, 1)) { // . digit + isFloat = true; + discard lexAdvance(lex); // . + lexScanDigits(lex); + } + + let e: uint32 = lexPeek(lex, 0); + if e == 101 || e == 69 { // e E + isFloat = true; + discard lexAdvance(lex); + let sign: uint32 = lexPeek(lex, 0); + if sign == 43 || sign == 45 { discard lexAdvance(lex); } // + - + lexScanDigits(lex); + } + + if isFloat { + lexEmitToken(lex, tkFloatLiteral); + } else { lexEmitToken(lex, tkIntLiteral); + } + } + + // --------------------------------------------------------------------------- + // Strings and chars + // --------------------------------------------------------------------------- + + func lexScanBacktickString(lex: *Lexer) { + lexMarkStart(lex); + if lexPeek(lex, 0) == 96 { discard lexAdvance(lex); } // opening backtick + while !lexIsAtEnd(lex) && lexPeek(lex, 0) != 96 { + discard lexAdvance(lex); + } + if lexIsAtEnd(lex) { + lexEmitDiag(lex, "unterminated backtick string literal"); + } else { + discard lexAdvance(lex); // closing backtick + } + lexEmitToken(lex, tkStringLiteral); + } + + // Assumes lex.startPos already marked (may include f/c8/… prefix before the quote). + func lexScanStringFrom(lex: *Lexer) { + // Collect the prefix (before opening quote) for the token text + var prefix: String = ""; + var prefixLen: int = 0; + if lex.pos > lex.startPos { + let plen: int = lex.pos - lex.startPos; + let pbuf: *char8 = bux_alloc((plen + 1) as uint) as *char8; + var pi: int = 0; + while pi < plen { + pbuf[pi] = lex.source[lex.startPos + pi] as char8; + pi = pi + 1; + } + pbuf[plen] = 0 as char8; + prefix = pbuf; + prefixLen = plen; + } + // Allocate buffer for resolved content (max = remaining source length) + let maxLen: int = 4096; + let resolved: *char8 = bux_alloc(maxLen as uint) as *char8; + var rpos: int = 0; + if lexPeek(lex, 0) == 34 { discard lexAdvance(lex); } // opening " + while !lexIsAtEnd(lex) && lexPeek(lex, 0) != 34 { // closing " + if lexPeek(lex, 0) == 10 { // \n + lexEmitDiag(lex, "unterminated string literal"); + break; + } + if lexPeek(lex, 0) == 92 { // backslash + discard lexAdvance(lex); + if !lexIsAtEnd(lex) { + let ec: uint32 = lexAdvance(lex); + // Preserve \{ and \} as two chars for f"..." brace escaping + if ec == 123 || ec == 125 { + resolved[rpos] = 92 as char8; + rpos = rpos + 1; + resolved[rpos] = ec as char8; + rpos = rpos + 1; + } else { + var rc: char8 = ec as char8; + if ec == 110 { rc = 10 as char8; } // \n + else if ec == 114 { rc = 13 as char8; } // \r + else if ec == 116 { rc = 9 as char8; } // \t + else if ec == 48 { rc = 0 as char8; } // \0 + else if ec == 92 { rc = 92 as char8; } // \\ + else if ec == 34 { rc = 34 as char8; } // \" + else if ec == 39 { rc = 39 as char8; } // \' + resolved[rpos] = rc; + rpos = rpos + 1; + } + } + } else { + let c: uint32 = lexAdvance(lex); + resolved[rpos] = c as char8; + rpos = rpos + 1; + } + } + resolved[rpos] = 0 as char8; + if lexIsAtEnd(lex) { + lexEmitDiag(lex, "unterminated string literal"); + } else { + discard lexAdvance(lex); // closing " + } + lexEmitToken(lex, tkStringLiteral); + // Replace token text with resolved version: prefix + " + resolved + " + let totalLen: int = prefixLen + 1 + rpos + 1; + let finalBuf: *char8 = bux_alloc((totalLen + 1) as uint) as *char8; + var fi: int = 0; + var pi2: int = 0; + while pi2 < prefixLen { finalBuf[fi] = prefix[pi2] as char8; fi = fi + 1; pi2 = pi2 + 1; } + finalBuf[fi] = 34 as char8; fi = fi + 1; // opening " + var ri: int = 0; + while ri < rpos { finalBuf[fi] = resolved[ri]; fi = fi + 1; ri = ri + 1; } + finalBuf[fi] = 34 as char8; fi = fi + 1; // closing " + finalBuf[fi] = 0 as char8; + lexSetLastTokenText(lex, finalBuf); + } + + func lexScanString(lex: *Lexer) { + lexMarkStart(lex); + lexScanStringFrom(lex); + } + + func lexScanChar(lex: *Lexer) { + lexMarkStart(lex); + // Collect the prefix for the token text + var prefix: String = ""; + var prefixLen: int = 0; + if lex.pos > lex.startPos { + let plen: int = lex.pos - lex.startPos; + let pbuf: *char8 = bux_alloc((plen + 1) as uint) as *char8; + var pi: int = 0; + while pi < plen { + pbuf[pi] = lex.source[lex.startPos + pi] as char8; + pi = pi + 1; + } + pbuf[plen] = 0 as char8; + prefix = pbuf; + prefixLen = plen; + } + var resolved: char8 = 0 as char8; + if lexPeek(lex, 0) == 39 { discard lexAdvance(lex); } // opening ' + if lexIsAtEnd(lex) { + lexEmitDiag(lex, "unterminated char literal"); + lexEmitToken(lex, tkCharLiteral); return; } - } - - lexScanDigits(lex); - - if lexPeek(lex, 0) == 46 && Lex_IsDigit(lexPeek(lex, 1)) { // . digit - isFloat = true; - discard lexAdvance(lex); // . - lexScanDigits(lex); - } - - let e: uint32 = lexPeek(lex, 0); - if e == 101 || e == 69 { // e E - isFloat = true; - discard lexAdvance(lex); - let sign: uint32 = lexPeek(lex, 0); - if sign == 43 || sign == 45 { discard lexAdvance(lex); } // + - - lexScanDigits(lex); - } - - if isFloat { - lexEmitToken(lex, tkFloatLiteral); - } else { - lexEmitToken(lex, tkIntLiteral); - } -} - -// --------------------------------------------------------------------------- -// Strings and chars -// --------------------------------------------------------------------------- - -func lexScanBacktickString(lex: *Lexer) { - lexMarkStart(lex); - if lexPeek(lex, 0) == 96 { discard lexAdvance(lex); } // opening backtick - while !lexIsAtEnd(lex) && lexPeek(lex, 0) != 96 { - discard lexAdvance(lex); - } - if lexIsAtEnd(lex) { - lexEmitDiag(lex, "unterminated backtick string literal"); - } else { - discard lexAdvance(lex); // closing backtick - } - lexEmitToken(lex, tkStringLiteral); -} - -// Assumes lex.startPos already marked (may include f/c8/… prefix before the quote). -func lexScanStringFrom(lex: *Lexer) { - // Collect the prefix (before opening quote) for the token text - var prefix: String = ""; - var prefixLen: int = 0; - if lex.pos > lex.startPos { - let plen: int = lex.pos - lex.startPos; - let pbuf: *char8 = bux_alloc((plen + 1) as uint) as *char8; - var pi: int = 0; - while pi < plen { - pbuf[pi] = lex.source[lex.startPos + pi] as char8; - pi = pi + 1; - } - pbuf[plen] = 0 as char8; - prefix = pbuf; - prefixLen = plen; - } - // Allocate buffer for resolved content (max = remaining source length) - let maxLen: int = 4096; - let resolved: *char8 = bux_alloc(maxLen as uint) as *char8; - var rpos: int = 0; - if lexPeek(lex, 0) == 34 { discard lexAdvance(lex); } // opening " - while !lexIsAtEnd(lex) && lexPeek(lex, 0) != 34 { // closing " if lexPeek(lex, 0) == 10 { // \n - lexEmitDiag(lex, "unterminated string literal"); - break; - } - if lexPeek(lex, 0) == 92 { // backslash + lexEmitDiag(lex, "newline in char literal"); + } else if lexPeek(lex, 0) == 92 { // backslash discard lexAdvance(lex); if !lexIsAtEnd(lex) { let ec: uint32 = lexAdvance(lex); - // Preserve \{ and \} as two chars for f"..." brace escaping - if ec == 123 || ec == 125 { - resolved[rpos] = 92 as char8; - rpos = rpos + 1; - resolved[rpos] = ec as char8; - rpos = rpos + 1; - } else { - var rc: char8 = ec as char8; - if ec == 110 { rc = 10 as char8; } // \n - else if ec == 114 { rc = 13 as char8; } // \r - else if ec == 116 { rc = 9 as char8; } // \t - else if ec == 48 { rc = 0 as char8; } // \0 - else if ec == 92 { rc = 92 as char8; } // \\ - else if ec == 34 { rc = 34 as char8; } // \" - else if ec == 39 { rc = 39 as char8; } // \' - resolved[rpos] = rc; - rpos = rpos + 1; - } + if ec == 110 { resolved = 10 as char8; } // \n + else if ec == 114 { resolved = 13 as char8; } // \r + else if ec == 116 { resolved = 9 as char8; } // \t + else if ec == 48 { resolved = 0 as char8; } // \0 + else if ec == 92 { resolved = 92 as char8; } // \\ + else if ec == 34 { resolved = 34 as char8; } // \" + else if ec == 39 { resolved = 39 as char8; } // \' + else { resolved = ec as char8; } } } else { - let c: uint32 = lexAdvance(lex); - resolved[rpos] = c as char8; - rpos = rpos + 1; + resolved = lexAdvance(lex) as char8; } - } - resolved[rpos] = 0 as char8; - if lexIsAtEnd(lex) { - lexEmitDiag(lex, "unterminated string literal"); - } else { - discard lexAdvance(lex); // closing " - } - lexEmitToken(lex, tkStringLiteral); - // Replace token text with resolved version: prefix + " + resolved + " - let totalLen: int = prefixLen + 1 + rpos + 1; - let finalBuf: *char8 = bux_alloc((totalLen + 1) as uint) as *char8; - var fi: int = 0; - var pi2: int = 0; - while pi2 < prefixLen { finalBuf[fi] = prefix[pi2] as char8; fi = fi + 1; pi2 = pi2 + 1; } - finalBuf[fi] = 34 as char8; fi = fi + 1; // opening " - var ri: int = 0; - while ri < rpos { finalBuf[fi] = resolved[ri]; fi = fi + 1; ri = ri + 1; } - finalBuf[fi] = 34 as char8; fi = fi + 1; // closing " - finalBuf[fi] = 0 as char8; - lexSetLastTokenText(lex, finalBuf); -} - -func lexScanString(lex: *Lexer) { - lexMarkStart(lex); - lexScanStringFrom(lex); -} - -func lexScanChar(lex: *Lexer) { - lexMarkStart(lex); - // Collect the prefix for the token text - var prefix: String = ""; - var prefixLen: int = 0; - if lex.pos > lex.startPos { - let plen: int = lex.pos - lex.startPos; - let pbuf: *char8 = bux_alloc((plen + 1) as uint) as *char8; - var pi: int = 0; - while pi < plen { - pbuf[pi] = lex.source[lex.startPos + pi] as char8; - pi = pi + 1; + if lexIsAtEnd(lex) || lexPeek(lex, 0) != 39 { + lexEmitDiag(lex, "expected closing ' for char literal"); + } else { + discard lexAdvance(lex); // closing ' } - pbuf[plen] = 0 as char8; - prefix = pbuf; - prefixLen = plen; - } - var resolved: char8 = 0 as char8; - if lexPeek(lex, 0) == 39 { discard lexAdvance(lex); } // opening ' - if lexIsAtEnd(lex) { - lexEmitDiag(lex, "unterminated char literal"); lexEmitToken(lex, tkCharLiteral); - return; - } - if lexPeek(lex, 0) == 10 { // \n - lexEmitDiag(lex, "newline in char literal"); - } else if lexPeek(lex, 0) == 92 { // backslash - discard lexAdvance(lex); - if !lexIsAtEnd(lex) { - let ec: uint32 = lexAdvance(lex); - if ec == 110 { resolved = 10 as char8; } // \n - else if ec == 114 { resolved = 13 as char8; } // \r - else if ec == 116 { resolved = 9 as char8; } // \t - else if ec == 48 { resolved = 0 as char8; } // \0 - else if ec == 92 { resolved = 92 as char8; } // \\ - else if ec == 34 { resolved = 34 as char8; } // \" - else if ec == 39 { resolved = 39 as char8; } // \' - else { resolved = ec as char8; } - } - } else { - resolved = lexAdvance(lex) as char8; - } - if lexIsAtEnd(lex) || lexPeek(lex, 0) != 39 { - lexEmitDiag(lex, "expected closing ' for char literal"); - } else { - discard lexAdvance(lex); // closing ' - } - lexEmitToken(lex, tkCharLiteral); - // Replace token text with resolved version - let totalLen: int = prefixLen + 1 + 1 + 1; - let finalBuf: *char8 = bux_alloc((totalLen + 1) as uint) as *char8; - var fi: int = 0; - var pi2: int = 0; - while pi2 < prefixLen { finalBuf[fi] = prefix[pi2] as char8; fi = fi + 1; pi2 = pi2 + 1; } - finalBuf[fi] = 39 as char8; fi = fi + 1; // opening ' - finalBuf[fi] = resolved; fi = fi + 1; // resolved char - finalBuf[fi] = 39 as char8; fi = fi + 1; // closing ' - finalBuf[fi] = 0 as char8; - lexSetLastTokenText(lex, finalBuf); -} - -// --------------------------------------------------------------------------- -// Symbols / operators -// --------------------------------------------------------------------------- - -func lexScanSymbol(lex: *Lexer) { - lexMarkStart(lex); - let c: uint32 = lexAdvance(lex); - - // Single-char tokens - if c == 40 { lexEmitToken(lex, tkLParen); return; } - if c == 41 { lexEmitToken(lex, tkRParen); return; } - if c == 123 { lexEmitToken(lex, tkLBrace); return; } - if c == 125 { lexEmitToken(lex, tkRBrace); return; } - if c == 91 { lexEmitToken(lex, tkLBracket); return; } - if c == 93 { lexEmitToken(lex, tkRBracket); return; } - if c == 44 { lexEmitToken(lex, tkComma); return; } - if c == 59 { lexEmitToken(lex, tkSemicolon); return; } - if c == 64 { lexEmitToken(lex, tkAt); return; } - if c == 63 { lexEmitToken(lex, tkQuestion); return; } - if c == 126 { lexEmitToken(lex, tkTilde); return; } - - // : :: - if c == 58 { - if lexMatch(lex, 58) { lexEmitToken(lex, tkColonColon); } - else { lexEmitToken(lex, tkColon); } - return; + // Replace token text with resolved version + let totalLen: int = prefixLen + 1 + 1 + 1; + let finalBuf: *char8 = bux_alloc((totalLen + 1) as uint) as *char8; + var fi: int = 0; + var pi2: int = 0; + while pi2 < prefixLen { finalBuf[fi] = prefix[pi2] as char8; fi = fi + 1; pi2 = pi2 + 1; } + finalBuf[fi] = 39 as char8; fi = fi + 1; // opening ' + finalBuf[fi] = resolved; fi = fi + 1; // resolved char + finalBuf[fi] = 39 as char8; fi = fi + 1; // closing ' + finalBuf[fi] = 0 as char8; + lexSetLastTokenText(lex, finalBuf); } - // . .. ... ..= - if c == 46 { - if lexPeek(lex, 0) == 46 && lexPeek(lex, 1) == 46 { - discard lexAdvance(lex); discard lexAdvance(lex); - lexEmitToken(lex, tkDotDotDot); return; - } - if lexPeek(lex, 0) == 46 && lexPeek(lex, 1) == 61 { - discard lexAdvance(lex); discard lexAdvance(lex); - lexEmitToken(lex, tkDotDotEqual); return; - } - if lexMatch(lex, 46) { lexEmitToken(lex, tkDotDot); return; } - lexEmitToken(lex, tkDot); return; - } + // --------------------------------------------------------------------------- + // Symbols / operators + // --------------------------------------------------------------------------- - // - -> -- -= - if c == 45 { - if lexMatch(lex, 62) { lexEmitToken(lex, tkArrow); return; } - if lexMatch(lex, 45) { lexEmitToken(lex, tkMinusMinus); return; } - if lexMatch(lex, 61) { lexEmitToken(lex, tkMinusAssign); return; } - lexEmitToken(lex, tkMinus); return; - } - - // + ++ += - if c == 43 { - if lexMatch(lex, 43) { lexEmitToken(lex, tkPlusPlus); return; } - if lexMatch(lex, 61) { lexEmitToken(lex, tkPlusAssign); return; } - lexEmitToken(lex, tkPlus); return; - } - - // * ** *= - if c == 42 { - if lexMatch(lex, 42) { lexEmitToken(lex, tkStarStar); return; } - if lexMatch(lex, 61) { lexEmitToken(lex, tkStarAssign); return; } - lexEmitToken(lex, tkStar); return; - } - - // / /= - if c == 47 { - if lexMatch(lex, 61) { lexEmitToken(lex, tkSlashAssign); return; } - lexEmitToken(lex, tkSlash); return; - } - - // % %= - if c == 37 { - if lexMatch(lex, 61) { lexEmitToken(lex, tkPercentAssign); return; } - lexEmitToken(lex, tkPercent); return; - } - - // = == => - if c == 61 { - if lexMatch(lex, 61) { lexEmitToken(lex, tkEq); return; } - if lexMatch(lex, 62) { lexEmitToken(lex, tkFatArrow); return; } - lexEmitToken(lex, tkAssign); return; - } - - // ! != - if c == 33 { - if lexMatch(lex, 61) { lexEmitToken(lex, tkNe); return; } - lexEmitToken(lex, tkBang); return; - } - - // < <= << <<= - if c == 60 { - if lexMatch(lex, 61) { lexEmitToken(lex, tkLe); return; } - if lexMatch(lex, 60) { - if lexMatch(lex, 61) { lexEmitToken(lex, tkShlAssign); return; } - lexEmitToken(lex, tkShl); return; - } - lexEmitToken(lex, tkLt); return; - } - - // > >= >> >>= - if c == 62 { - if lexMatch(lex, 61) { lexEmitToken(lex, tkGe); return; } - if lexMatch(lex, 62) { - if lexMatch(lex, 61) { lexEmitToken(lex, tkShrAssign); return; } - lexEmitToken(lex, tkShr); return; - } - lexEmitToken(lex, tkGt); return; - } - - // & && &= - if c == 38 { - if lexMatch(lex, 38) { lexEmitToken(lex, tkAmpAmp); return; } - if lexMatch(lex, 61) { lexEmitToken(lex, tkAmpAssign); return; } - lexEmitToken(lex, tkAmp); return; - } - - // | || |= - if c == 124 { - if lexMatch(lex, 124) { lexEmitToken(lex, tkPipePipe); return; } - if lexMatch(lex, 61) { lexEmitToken(lex, tkPipeAssign); return; } - lexEmitToken(lex, tkPipe); return; - } - - // ^ ^= - if c == 94 { - if lexMatch(lex, 61) { lexEmitToken(lex, tkCaretAssign); return; } - lexEmitToken(lex, tkCaret); return; - } - - // # intrinsics - if c == 35 { - if lexMatchStr(lex, "line") { lexEmitToken(lex, tkHashLine); return; } - if lexMatchStr(lex, "column") { lexEmitToken(lex, tkHashColumn); return; } - if lexMatchStr(lex, "file") { lexEmitToken(lex, tkHashFile); return; } - if lexMatchStr(lex, "function") { lexEmitToken(lex, tkHashFunction); return; } - if lexMatchStr(lex, "date") { lexEmitToken(lex, tkHashDate); return; } - if lexMatchStr(lex, "time") { lexEmitToken(lex, tkHashTime); return; } - if lexMatchStr(lex, "module") { lexEmitToken(lex, tkHashModule); return; } - lexEmitToken(lex, tkHash); return; - } - - lexEmitDiag(lex, "unexpected character"); - lexEmitToken(lex, tkUnknown); -} - -// --------------------------------------------------------------------------- -// Next token -// --------------------------------------------------------------------------- - -func lexNextToken(lex: *Lexer) { - lexSkipWhitespace(lex); - - if lexIsAtEnd(lex) { + func lexScanSymbol(lex: *Lexer) { lexMarkStart(lex); - lexEmitToken(lex, tkEndOfFile); - return; - } - let c: uint32 = lexPeek(lex, 0); + let c: uint32 = lexAdvance(lex); - if c == 10 { // \n - lexMarkStart(lex); - discard lexAdvance(lex); - lexEmitToken(lex, tkNewLine); - return; + // Single-char tokens + if c == 40 { lexEmitToken(lex, tkLParen); return; } + if c == 41 { lexEmitToken(lex, tkRParen); return; } + if c == 123 { lexEmitToken(lex, tkLBrace); return; } + if c == 125 { lexEmitToken(lex, tkRBrace); return; } + if c == 91 { lexEmitToken(lex, tkLBracket); return; } + if c == 93 { lexEmitToken(lex, tkRBracket); return; } + if c == 44 { lexEmitToken(lex, tkComma); return; } + if c == 59 { lexEmitToken(lex, tkSemicolon); return; } + if c == 64 { lexEmitToken(lex, tkAt); return; } + if c == 63 { lexEmitToken(lex, tkQuestion); return; } + if c == 126 { lexEmitToken(lex, tkTilde); return; } + + // : :: + if c == 58 { + if lexMatch(lex, 58) { lexEmitToken(lex, tkColonColon); } + else { lexEmitToken(lex, tkColon); } + return; + } + + // . .. ... ..= + if c == 46 { + if lexPeek(lex, 0) == 46 && lexPeek(lex, 1) == 46 { + discard lexAdvance(lex); discard lexAdvance(lex); + lexEmitToken(lex, tkDotDotDot); return; + } + if lexPeek(lex, 0) == 46 && lexPeek(lex, 1) == 61 { + discard lexAdvance(lex); discard lexAdvance(lex); + lexEmitToken(lex, tkDotDotEqual); return; + } + if lexMatch(lex, 46) { lexEmitToken(lex, tkDotDot); return; } + lexEmitToken(lex, tkDot); return; + } + + // - -> -- -= + if c == 45 { + if lexMatch(lex, 62) { lexEmitToken(lex, tkArrow); return; } + if lexMatch(lex, 45) { lexEmitToken(lex, tkMinusMinus); return; } + if lexMatch(lex, 61) { lexEmitToken(lex, tkMinusAssign); return; } + lexEmitToken(lex, tkMinus); return; + } + + // + ++ += + if c == 43 { + if lexMatch(lex, 43) { lexEmitToken(lex, tkPlusPlus); return; } + if lexMatch(lex, 61) { lexEmitToken(lex, tkPlusAssign); return; } + lexEmitToken(lex, tkPlus); return; + } + + // * ** *= + if c == 42 { + if lexMatch(lex, 42) { lexEmitToken(lex, tkStarStar); return; } + if lexMatch(lex, 61) { lexEmitToken(lex, tkStarAssign); return; } + lexEmitToken(lex, tkStar); return; + } + + // / /= + if c == 47 { + if lexMatch(lex, 61) { lexEmitToken(lex, tkSlashAssign); return; } + lexEmitToken(lex, tkSlash); return; + } + + // % %= + if c == 37 { + if lexMatch(lex, 61) { lexEmitToken(lex, tkPercentAssign); return; } + lexEmitToken(lex, tkPercent); return; + } + + // = == => + if c == 61 { + if lexMatch(lex, 61) { lexEmitToken(lex, tkEq); return; } + if lexMatch(lex, 62) { lexEmitToken(lex, tkFatArrow); return; } + lexEmitToken(lex, tkAssign); return; + } + + // ! != + if c == 33 { + if lexMatch(lex, 61) { lexEmitToken(lex, tkNe); return; } + lexEmitToken(lex, tkBang); return; + } + + // < <= << <<= + if c == 60 { + if lexMatch(lex, 61) { lexEmitToken(lex, tkLe); return; } + if lexMatch(lex, 60) { + if lexMatch(lex, 61) { lexEmitToken(lex, tkShlAssign); return; } + lexEmitToken(lex, tkShl); return; + } + lexEmitToken(lex, tkLt); return; + } + + // > >= >> >>= + if c == 62 { + if lexMatch(lex, 61) { lexEmitToken(lex, tkGe); return; } + if lexMatch(lex, 62) { + if lexMatch(lex, 61) { lexEmitToken(lex, tkShrAssign); return; } + lexEmitToken(lex, tkShr); return; + } + lexEmitToken(lex, tkGt); return; + } + + // & && &= + if c == 38 { + if lexMatch(lex, 38) { lexEmitToken(lex, tkAmpAmp); return; } + if lexMatch(lex, 61) { lexEmitToken(lex, tkAmpAssign); return; } + lexEmitToken(lex, tkAmp); return; + } + + // | || |= + if c == 124 { + if lexMatch(lex, 124) { lexEmitToken(lex, tkPipePipe); return; } + if lexMatch(lex, 61) { lexEmitToken(lex, tkPipeAssign); return; } + lexEmitToken(lex, tkPipe); return; + } + + // ^ ^= + if c == 94 { + if lexMatch(lex, 61) { lexEmitToken(lex, tkCaretAssign); return; } + lexEmitToken(lex, tkCaret); return; + } + + // # intrinsics + if c == 35 { + if lexMatchStr(lex, "line") { lexEmitToken(lex, tkHashLine); return; } + if lexMatchStr(lex, "column") { lexEmitToken(lex, tkHashColumn); return; } + if lexMatchStr(lex, "file") { lexEmitToken(lex, tkHashFile); return; } + if lexMatchStr(lex, "function") { lexEmitToken(lex, tkHashFunction); return; } + if lexMatchStr(lex, "date") { lexEmitToken(lex, tkHashDate); return; } + if lexMatchStr(lex, "time") { lexEmitToken(lex, tkHashTime); return; } + if lexMatchStr(lex, "module") { lexEmitToken(lex, tkHashModule); return; } + lexEmitToken(lex, tkHash); return; + } + + lexEmitDiag(lex, "unexpected character"); + lexEmitToken(lex, tkUnknown); } - // String prefixes: f" c8" c16" c32" - // Keep `f` in token text so the parser can detect interpolating strings. - if c == 102 && lexPeek(lex, 1) == 34 { // f" - lexMarkStart(lex); // start at 'f' - discard lexAdvance(lex); // consume f; startPos still at f - lexScanStringFrom(lex); // does not re-mark — prefix = "f" - return; - } - if c == 99 { // 'c' - let d: uint32 = lexPeek(lex, 1); - if d == 56 && lexPeek(lex, 2) == 34 { // c8" - discard lexAdvance(lex); discard lexAdvance(lex); // c 8 + // --------------------------------------------------------------------------- + // Next token + // --------------------------------------------------------------------------- + + func lexNextToken(lex: *Lexer) { + lexSkipWhitespace(lex); + + if lexIsAtEnd(lex) { + lexMarkStart(lex); + lexEmitToken(lex, tkEndOfFile); + return; + } + let c: uint32 = lexPeek(lex, 0); + + if c == 10 { // \n + lexMarkStart(lex); + discard lexAdvance(lex); + lexEmitToken(lex, tkNewLine); + return; + } + + // String prefixes: f" c8" c16" c32" + // Keep `f` in token text so the parser can detect interpolating strings. + if c == 102 && lexPeek(lex, 1) == 34 { // f" + lexMarkStart(lex); // start at 'f' + discard lexAdvance(lex); // consume f; startPos still at f + lexScanStringFrom(lex); // does not re-mark — prefix = "f" + return; + } + if c == 99 { // 'c' + let d: uint32 = lexPeek(lex, 1); + if d == 56 && lexPeek(lex, 2) == 34 { // c8" + discard lexAdvance(lex); discard lexAdvance(lex); // c 8 + lexScanString(lex); return; + } + if d == 49 && lexPeek(lex, 2) == 54 && lexPeek(lex, 3) == 34 { // c16" + discard lexAdvance(lex); discard lexAdvance(lex); discard lexAdvance(lex); + lexScanString(lex); return; + } + if d == 51 && lexPeek(lex, 2) == 50 && lexPeek(lex, 3) == 34 { // c32" + discard lexAdvance(lex); discard lexAdvance(lex); discard lexAdvance(lex); + lexScanString(lex); return; + } + } + + if c == 34 { // " lexScanString(lex); return; } - if d == 49 && lexPeek(lex, 2) == 54 && lexPeek(lex, 3) == 34 { // c16" - discard lexAdvance(lex); discard lexAdvance(lex); discard lexAdvance(lex); - lexScanString(lex); return; + + // Backtick raw string + if c == 96 { // backtick + lexScanBacktickString(lex); return; } - if d == 51 && lexPeek(lex, 2) == 50 && lexPeek(lex, 3) == 34 { // c32" - discard lexAdvance(lex); discard lexAdvance(lex); discard lexAdvance(lex); - lexScanString(lex); return; + + // Char prefixes: c8' c16' c32' + if c == 99 { // 'c' + let d: uint32 = lexPeek(lex, 1); + if d == 56 && lexPeek(lex, 2) == 39 { // c8' + discard lexAdvance(lex); discard lexAdvance(lex); + lexScanChar(lex); return; + } + if d == 49 && lexPeek(lex, 2) == 54 && lexPeek(lex, 3) == 39 { // c16' + discard lexAdvance(lex); discard lexAdvance(lex); discard lexAdvance(lex); + lexScanChar(lex); return; + } + if d == 51 && lexPeek(lex, 2) == 50 && lexPeek(lex, 3) == 39 { // c32' + discard lexAdvance(lex); discard lexAdvance(lex); discard lexAdvance(lex); + lexScanChar(lex); return; + } } - } - if c == 34 { // " - lexScanString(lex); return; - } - - // Backtick raw string - if c == 96 { // backtick - lexScanBacktickString(lex); return; - } - - // Char prefixes: c8' c16' c32' - if c == 99 { // 'c' - let d: uint32 = lexPeek(lex, 1); - if d == 56 && lexPeek(lex, 2) == 39 { // c8' - discard lexAdvance(lex); discard lexAdvance(lex); + if c == 39 { // ' + // Lifetime 'a vs char literal 'x' / '\n' + // Lifetime: ' + ident-start, and the char after that is NOT closing ' + let n1: uint32 = lexPeek(lex, 1); + let n2: uint32 = lexPeek(lex, 2); + if Lex_IsIdentStart(n1) && n2 != 39 && n2 != 0 { + lexMarkStart(lex); + discard lexAdvance(lex); // ' + while !lexIsAtEnd(lex) && Lex_IsIdentChar(lexPeek(lex, 0)) { + discard lexAdvance(lex); + } + lexEmitToken(lex, tkLifetime); + return; + } lexScanChar(lex); return; } - if d == 49 && lexPeek(lex, 2) == 54 && lexPeek(lex, 3) == 39 { // c16' - discard lexAdvance(lex); discard lexAdvance(lex); discard lexAdvance(lex); - lexScanChar(lex); return; + + if Lex_IsIdentStart(c) { + lexScanIdent(lex); return; } - if d == 51 && lexPeek(lex, 2) == 50 && lexPeek(lex, 3) == 39 { // c32' - discard lexAdvance(lex); discard lexAdvance(lex); discard lexAdvance(lex); - lexScanChar(lex); return; + + if Lex_IsDigit(c) { + lexScanNumber(lex); return; } + + lexScanSymbol(lex); } - if c == 39 { // ' - lexScanChar(lex); return; - } + // --------------------------------------------------------------------------- + // Tokenize — main entry point + // --------------------------------------------------------------------------- - if Lex_IsIdentStart(c) { - lexScanIdent(lex); return; - } + func Lexer_Tokenize(source: String) -> *Lexer { + let lex: *Lexer = bux_alloc(sizeof(Lexer)) as *Lexer; + lex.source = source; + lex.sourceLen = bux_strlen(source) as int; + lex.pos = 0; + lex.line = 1; + lex.column = 1; + lex.startLine = 0; + lex.startColumn = 0; + lex.startPos = 0; + let tokBuf: *LexToken = bux_alloc(maxTokens as uint * sizeof(LexToken)) as *LexToken; + let diagBuf: *LexerDiag = bux_alloc(maxDiags as uint * sizeof(LexerDiag)) as *LexerDiag; + lex.tokens = tokBuf; + lex.diags = diagBuf; + lex.tokenCount = 0; + lex.diagCount = 0; - if Lex_IsDigit(c) { - lexScanNumber(lex); return; - } - - lexScanSymbol(lex); -} - -// --------------------------------------------------------------------------- -// Tokenize — main entry point -// --------------------------------------------------------------------------- - -func Lexer_Tokenize(source: String) -> *Lexer { - let lex: *Lexer = bux_alloc(sizeof(Lexer)) as *Lexer; - lex.source = source; - lex.sourceLen = bux_strlen(source) as int; - lex.pos = 0; - lex.line = 1; - lex.column = 1; - lex.startLine = 0; - lex.startColumn = 0; - lex.startPos = 0; - let tokBuf: *LexToken = bux_alloc(maxTokens as uint * sizeof(LexToken)) as *LexToken; - let diagBuf: *LexerDiag = bux_alloc(maxDiags as uint * sizeof(LexerDiag)) as *LexerDiag; - lex.tokens = tokBuf; - lex.diags = diagBuf; - lex.tokenCount = 0; - lex.diagCount = 0; - - while true { - lexNextToken(lex); - if lex.tokenCount >= maxTokens { - lexEmitDiag(lex, "too many tokens"); - break; - } - if lex.tokens[lex.tokenCount - 1].kind == tkEndOfFile { - break; + while true { + lexNextToken(lex); + if lex.tokenCount >= maxTokens { + lexEmitDiag(lex, "too many tokens"); + break; + } + if lex.tokens[lex.tokenCount - 1].kind == tkEndOfFile { + break; + } } + return lex; } - return lex; -} -func Lexer_DiagCount(lex: *Lexer) -> int { - return lex.diagCount; -} + func Lexer_DiagCount(lex: *Lexer) -> int { + return lex.diagCount; + } -func Lexer_Free(lex: *Lexer) { - bux_free(lex.tokens as *void); - bux_free(lex.diags as *void); - bux_free(lex as *void); -} + func Lexer_Free(lex: *Lexer) { + bux_free(lex.tokens as *void); + bux_free(lex.diags as *void); + bux_free(lex as *void); + } } diff --git a/src/manifest.bux b/src/manifest.bux index 4003b09..7724258 100644 --- a/src/manifest.bux +++ b/src/manifest.bux @@ -2,224 +2,137 @@ // Parses package metadata: name, version, type, build output. module Manifest { -extern func bux_strlen(s: String) -> uint; + extern func bux_strlen(s: String) -> uint; -// --------------------------------------------------------------------------- -// Manifest struct -// --------------------------------------------------------------------------- -struct Manifest { - name: String; - version: String; - pkgType: String; - output: String; - depCount: int; - depName0: String; - depUrl0: String; - depName1: String; - depUrl1: String; - depName2: String; - depUrl2: String; - depName3: String; - depUrl3: String; - depName4: String; - depUrl4: String; - depName5: String; - depUrl5: String; - depName6: String; - depUrl6: String; - depName7: String; - depUrl7: String; -} + // --------------------------------------------------------------------------- + // Manifest struct + // --------------------------------------------------------------------------- + struct Manifest { + name: String; + version: String; + pkgType: String; + output: String; + depCount: int; + depName0: String; + depUrl0: String; + depName1: String; + depUrl1: String; + depName2: String; + depUrl2: String; + depName3: String; + depUrl3: String; + depName4: String; + depUrl4: String; + depName5: String; + depUrl5: String; + depName6: String; + depUrl6: String; + depName7: String; + depUrl7: String; + } -// --------------------------------------------------------------------------- -// Simple TOML parser (handles [Package] and [Build] sections) -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Simple TOML parser (handles [Package] and [Build] sections) + // --------------------------------------------------------------------------- -func Manifest_Parse(content: String) -> Manifest { - var m: Manifest; - m.name = ""; - m.version = "0.1.0"; - m.pkgType = "bin"; - m.output = "Bin"; - m.depCount = 0; + func Manifest_Parse(content: String) -> Manifest { + var m: Manifest; + m.name = ""; + m.version = "0.1.0"; + m.pkgType = "bin"; + m.output = "Bin"; + m.depCount = 0; - if String_Eq(content, "") { return m; } + if String_Eq(content, "") { return m; } - var currentSection: String = ""; - let count: uint = String_SplitCount(content, "\n"); - var i: uint = 0; - while i < count { - let line: String = String_SplitPart(content, "\n", i); + var currentSection: String = ""; + let count: uint = String_SplitCount(content, "\n"); + var i: uint = 0; + while i < count { + let line: String = String_SplitPart(content, "\n", i); - // Skip empty lines and comments - if String_Eq(line, "") { i = i + 1; continue; } - if String_StartsWith(line, "#") { i = i + 1; continue; } + // Skip empty lines and comments + if String_Eq(line, "") { i = i + 1; continue; } + if String_StartsWith(line, "#") { i = i + 1; continue; } - // Section header: [Section] - if String_StartsWith(line, "[") { - if String_StartsWith(line, "[Package]") { - currentSection = "Package"; - } else if String_StartsWith(line, "[Build]") { - currentSection = "Build"; - } else if String_StartsWith(line, "[dependencies]") { - currentSection = "dependencies"; - } else { - currentSection = ""; + // Section header: [Section] + if String_StartsWith(line, "[") { + if String_StartsWith(line, "[Package]") { + currentSection = "Package"; + } else if String_StartsWith(line, "[Build]") { + currentSection = "Build"; + } else if String_StartsWith(line, "[dependencies]") { + currentSection = "dependencies"; + } else { + currentSection = ""; + } + i = i + 1; continue; } - i = i + 1; continue; - } - // Key = Value - let eqCount: uint = String_SplitCount(line, "="); - if eqCount >= 2 { - let key: String = String_Trim(String_SplitPart(line, "=", 0)); - let rawVal: String = String_Trim(String_SplitPart(line, "=", 1)); + // Key = Value + let eqCount: uint = String_SplitCount(line, "="); + if eqCount >= 2 { + let key: String = String_Trim(String_SplitPart(line, "=", 0)); + let rawVal: String = String_Trim(String_SplitPart(line, "=", 1)); - // Strip quotes from value - var val: String = rawVal; - if String_StartsWith(val, "\"") && String_EndsWith(val, "\"") { - let vlen: uint = bux_strlen(val); - if vlen >= 2 { - val = String_Slice(val, 1, vlen - 2); - } - } - - if String_Eq(currentSection, "Package") { - if String_Eq(key, "Name") { m.name = val; } - if String_Eq(key, "Version") { m.version = val; } - if String_Eq(key, "Type") { m.pkgType = val; } - } else if String_Eq(currentSection, "Build") { - if String_Eq(key, "Output") { m.output = val; } - } else if String_Eq(currentSection, "dependencies") { - if m.depCount < 8 { - if m.depCount == 0 { m.depName0 = key; m.depUrl0 = val; } - else if m.depCount == 1 { m.depName1 = key; m.depUrl1 = val; } - else if m.depCount == 2 { m.depName2 = key; m.depUrl2 = val; } - else if m.depCount == 3 { m.depName3 = key; m.depUrl3 = val; } - else if m.depCount == 4 { m.depName4 = key; m.depUrl4 = val; } - else if m.depCount == 5 { m.depName5 = key; m.depUrl5 = val; } - else if m.depCount == 6 { m.depName6 = key; m.depUrl6 = val; } - else if m.depCount == 7 { m.depName7 = key; m.depUrl7 = val; } - m.depCount = m.depCount + 1; + // Strip quotes from value + var val: String = rawVal; + if String_StartsWith(val, "\"") && String_EndsWith(val, "\"") { + let vlen: uint = bux_strlen(val); + if vlen >= 2 { + val = String_Slice(val, 1, vlen - 2); + } + } + + if String_Eq(currentSection, "Package") { + if String_Eq(key, "Name") { m.name = val; } + if String_Eq(key, "Version") { m.version = val; } + if String_Eq(key, "Type") { m.pkgType = val; } + } else if String_Eq(currentSection, "Build") { + if String_Eq(key, "Output") { m.output = val; } + } else if String_Eq(currentSection, "dependencies") { + if m.depCount < 8 { + if m.depCount == 0 { m.depName0 = key; m.depUrl0 = val; } + else if m.depCount == 1 { m.depName1 = key; m.depUrl1 = val; } + else if m.depCount == 2 { m.depName2 = key; m.depUrl2 = val; } + else if m.depCount == 3 { m.depName3 = key; m.depUrl3 = val; } + else if m.depCount == 4 { m.depName4 = key; m.depUrl4 = val; } + else if m.depCount == 5 { m.depName5 = key; m.depUrl5 = val; } + else if m.depCount == 6 { m.depName6 = key; m.depUrl6 = val; } + else if m.depCount == 7 { m.depName7 = key; m.depUrl7 = val; } + m.depCount = m.depCount + 1; + } } } + i = i + 1; } - i = i + 1; + + return m; } - return m; -} + // --------------------------------------------------------------------------- + // Dependency helpers + // --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// Dependency helpers -// --------------------------------------------------------------------------- - -func Manifest_HasDep(m: Manifest, name: String) -> bool { - var i: int = 0; - while i < m.depCount { - var depName: String = ""; - if i == 0 { depName = m.depName0; } - else if i == 1 { depName = m.depName1; } - else if i == 2 { depName = m.depName2; } - else if i == 3 { depName = m.depName3; } - else if i == 4 { depName = m.depName4; } - else if i == 5 { depName = m.depName5; } - else if i == 6 { depName = m.depName6; } - else if i == 7 { depName = m.depName7; } - if String_Eq(depName, name) { return true; } - i = i + 1; + func Manifest_HasDep(m: Manifest, name: String) -> bool { + var i: int = 0; + while i < m.depCount { + var depName: String = ""; + if i == 0 { depName = m.depName0; } + else if i == 1 { depName = m.depName1; } + else if i == 2 { depName = m.depName2; } + else if i == 3 { depName = m.depName3; } + else if i == 4 { depName = m.depName4; } + else if i == 5 { depName = m.depName5; } + else if i == 6 { depName = m.depName6; } + else if i == 7 { depName = m.depName7; } + if String_Eq(depName, name) { return true; } + i = i + 1; + } + return false; } - return false; -} -func Manifest_GetDepUrl(m: Manifest, name: String) -> String { - var i: int = 0; - while i < m.depCount { - var depName: String = ""; - var depUrl: String = ""; - if i == 0 { depName = m.depName0; depUrl = m.depUrl0; } - else if i == 1 { depName = m.depName1; depUrl = m.depUrl1; } - else if i == 2 { depName = m.depName2; depUrl = m.depUrl2; } - else if i == 3 { depName = m.depName3; depUrl = m.depUrl3; } - else if i == 4 { depName = m.depName4; depUrl = m.depUrl4; } - else if i == 5 { depName = m.depName5; depUrl = m.depUrl5; } - else if i == 6 { depName = m.depName6; depUrl = m.depUrl6; } - else if i == 7 { depName = m.depName7; depUrl = m.depUrl7; } - if String_Eq(depName, name) { return depUrl; } - i = i + 1; - } - return ""; -} - -func Manifest_AddDep(m: *Manifest, name: String, url: String) -> bool { - if Manifest_HasDep(*m, name) { return false; } - if m.depCount >= 8 { return false; } - if m.depCount == 0 { m.depName0 = name; m.depUrl0 = url; } - else if m.depCount == 1 { m.depName1 = name; m.depUrl1 = url; } - else if m.depCount == 2 { m.depName2 = name; m.depUrl2 = url; } - else if m.depCount == 3 { m.depName3 = name; m.depUrl3 = url; } - else if m.depCount == 4 { m.depName4 = name; m.depUrl4 = url; } - else if m.depCount == 5 { m.depName5 = name; m.depUrl5 = url; } - else if m.depCount == 6 { m.depName6 = name; m.depUrl6 = url; } - else if m.depCount == 7 { m.depName7 = name; m.depUrl7 = url; } - m.depCount = m.depCount + 1; - return true; -} - -func Manifest_RemoveDep(m: *Manifest, name: String) -> bool { - var found: int = -1; - var i: int = 0; - while i < m.depCount { - var depName: String = ""; - if i == 0 { depName = m.depName0; } - else if i == 1 { depName = m.depName1; } - else if i == 2 { depName = m.depName2; } - else if i == 3 { depName = m.depName3; } - else if i == 4 { depName = m.depName4; } - else if i == 5 { depName = m.depName5; } - else if i == 6 { depName = m.depName6; } - else if i == 7 { depName = m.depName7; } - if String_Eq(depName, name) { found = i; break; } - i = i + 1; - } - if found < 0 { return false; } - i = found; - while i < m.depCount - 1 { - if i == 0 { m.depName0 = m.depName1; m.depUrl0 = m.depUrl1; } - else if i == 1 { m.depName1 = m.depName2; m.depUrl1 = m.depUrl2; } - else if i == 2 { m.depName2 = m.depName3; m.depUrl2 = m.depUrl3; } - else if i == 3 { m.depName3 = m.depName4; m.depUrl3 = m.depUrl4; } - else if i == 4 { m.depName4 = m.depName5; m.depUrl4 = m.depUrl5; } - else if i == 5 { m.depName5 = m.depName6; m.depUrl5 = m.depUrl6; } - else if i == 6 { m.depName6 = m.depName7; m.depUrl6 = m.depUrl7; } - i = i + 1; - } - m.depCount = m.depCount - 1; - return true; -} - -// --------------------------------------------------------------------------- -// Serialize manifest back to TOML -// --------------------------------------------------------------------------- - -func Manifest_ToString(m: Manifest) -> String { - let sb: StringBuilder = StringBuilder_New(); - StringBuilder_Append(&sb, "[Package]\n"); - StringBuilder_Append(&sb, "Name = \""); - StringBuilder_Append(&sb, m.name); - StringBuilder_Append(&sb, "\"\n"); - StringBuilder_Append(&sb, "Version = \""); - StringBuilder_Append(&sb, m.version); - StringBuilder_Append(&sb, "\"\n"); - StringBuilder_Append(&sb, "Type = \""); - StringBuilder_Append(&sb, m.pkgType); - StringBuilder_Append(&sb, "\"\n\n"); - StringBuilder_Append(&sb, "[Build]\n"); - StringBuilder_Append(&sb, "Output = \""); - StringBuilder_Append(&sb, m.output); - StringBuilder_Append(&sb, "\"\n"); - if m.depCount > 0 { - StringBuilder_Append(&sb, "\n[dependencies]\n"); + func Manifest_GetDepUrl(m: Manifest, name: String) -> String { var i: int = 0; while i < m.depCount { var depName: String = ""; @@ -232,22 +145,109 @@ func Manifest_ToString(m: Manifest) -> String { else if i == 5 { depName = m.depName5; depUrl = m.depUrl5; } else if i == 6 { depName = m.depName6; depUrl = m.depUrl6; } else if i == 7 { depName = m.depName7; depUrl = m.depUrl7; } - StringBuilder_Append(&sb, depName); - StringBuilder_Append(&sb, " = \""); - StringBuilder_Append(&sb, depUrl); - StringBuilder_Append(&sb, "\"\n"); + if String_Eq(depName, name) { return depUrl; } i = i + 1; } + return ""; } - return StringBuilder_Build(&sb); -} -// --------------------------------------------------------------------------- -// Load manifest from file -// --------------------------------------------------------------------------- + func Manifest_AddDep(m: *Manifest, name: String, url: String) -> bool { + if Manifest_HasDep(*m, name) { return false; } + if m.depCount >= 8 { return false; } + if m.depCount == 0 { m.depName0 = name; m.depUrl0 = url; } + else if m.depCount == 1 { m.depName1 = name; m.depUrl1 = url; } + else if m.depCount == 2 { m.depName2 = name; m.depUrl2 = url; } + else if m.depCount == 3 { m.depName3 = name; m.depUrl3 = url; } + else if m.depCount == 4 { m.depName4 = name; m.depUrl4 = url; } + else if m.depCount == 5 { m.depName5 = name; m.depUrl5 = url; } + else if m.depCount == 6 { m.depName6 = name; m.depUrl6 = url; } + else if m.depCount == 7 { m.depName7 = name; m.depUrl7 = url; } + m.depCount = m.depCount + 1; + return true; + } -func Manifest_Load(path: String) -> Manifest { - let content: String = ReadFile(path); - return Manifest_Parse(content); -} + func Manifest_RemoveDep(m: *Manifest, name: String) -> bool { + var found: int = -1; + var i: int = 0; + while i < m.depCount { + var depName: String = ""; + if i == 0 { depName = m.depName0; } + else if i == 1 { depName = m.depName1; } + else if i == 2 { depName = m.depName2; } + else if i == 3 { depName = m.depName3; } + else if i == 4 { depName = m.depName4; } + else if i == 5 { depName = m.depName5; } + else if i == 6 { depName = m.depName6; } + else if i == 7 { depName = m.depName7; } + if String_Eq(depName, name) { found = i; break; } + i = i + 1; + } + if found < 0 { return false; } + i = found; + while i < m.depCount - 1 { + if i == 0 { m.depName0 = m.depName1; m.depUrl0 = m.depUrl1; } + else if i == 1 { m.depName1 = m.depName2; m.depUrl1 = m.depUrl2; } + else if i == 2 { m.depName2 = m.depName3; m.depUrl2 = m.depUrl3; } + else if i == 3 { m.depName3 = m.depName4; m.depUrl3 = m.depUrl4; } + else if i == 4 { m.depName4 = m.depName5; m.depUrl4 = m.depUrl5; } + else if i == 5 { m.depName5 = m.depName6; m.depUrl5 = m.depUrl6; } + else if i == 6 { m.depName6 = m.depName7; m.depUrl6 = m.depUrl7; } + i = i + 1; + } + m.depCount = m.depCount - 1; + return true; + } + + // --------------------------------------------------------------------------- + // Serialize manifest back to TOML + // --------------------------------------------------------------------------- + + func Manifest_ToString(m: Manifest) -> String { + let sb: StringBuilder = StringBuilder_New(); + StringBuilder_Append(&sb, "[Package]\n"); + StringBuilder_Append(&sb, "Name = \""); + StringBuilder_Append(&sb, m.name); + StringBuilder_Append(&sb, "\"\n"); + StringBuilder_Append(&sb, "Version = \""); + StringBuilder_Append(&sb, m.version); + StringBuilder_Append(&sb, "\"\n"); + StringBuilder_Append(&sb, "Type = \""); + StringBuilder_Append(&sb, m.pkgType); + StringBuilder_Append(&sb, "\"\n\n"); + StringBuilder_Append(&sb, "[Build]\n"); + StringBuilder_Append(&sb, "Output = \""); + StringBuilder_Append(&sb, m.output); + StringBuilder_Append(&sb, "\"\n"); + if m.depCount > 0 { + StringBuilder_Append(&sb, "\n[dependencies]\n"); + var i: int = 0; + while i < m.depCount { + var depName: String = ""; + var depUrl: String = ""; + if i == 0 { depName = m.depName0; depUrl = m.depUrl0; } + else if i == 1 { depName = m.depName1; depUrl = m.depUrl1; } + else if i == 2 { depName = m.depName2; depUrl = m.depUrl2; } + else if i == 3 { depName = m.depName3; depUrl = m.depUrl3; } + else if i == 4 { depName = m.depName4; depUrl = m.depUrl4; } + else if i == 5 { depName = m.depName5; depUrl = m.depUrl5; } + else if i == 6 { depName = m.depName6; depUrl = m.depUrl6; } + else if i == 7 { depName = m.depName7; depUrl = m.depUrl7; } + StringBuilder_Append(&sb, depName); + StringBuilder_Append(&sb, " = \""); + StringBuilder_Append(&sb, depUrl); + StringBuilder_Append(&sb, "\"\n"); + i = i + 1; + } + } + return StringBuilder_Build(&sb); + } + + // --------------------------------------------------------------------------- + // Load manifest from file + // --------------------------------------------------------------------------- + + func Manifest_Load(path: String) -> Manifest { + let content: String = ReadFile(path); + return Manifest_Parse(content); + } } diff --git a/src/parser.bux b/src/parser.bux index 56617ff..c507942 100644 --- a/src/parser.bux +++ b/src/parser.bux @@ -2,2263 +2,2177 @@ // Parses Bux source tokens into an AST. module Parser { -extern func bux_strlen(s: String) -> uint; -extern func bux_str_to_int(s: String) -> int64; -extern func bux_str_slice(s: String, start: uint, len: uint) -> String; + extern func bux_strlen(s: String) -> uint; + extern func bux_str_to_int(s: String) -> int64; + extern func bux_str_slice(s: String, start: uint, len: uint) -> String; -// Forward declarations for mutual recursion -func parserParseExpr(p: *Parser) -> *Expr; -func parserParseStmt(p: *Parser) -> *Stmt; -func parserParseBlock(p: *Parser) -> *Block; -func parserParsePrimary(p: *Parser) -> *Expr; -func parserParsePostfixExpr(p: *Parser) -> *Expr; -func parserParseUnary(p: *Parser) -> *Expr; -func parserParseBinaryPrec(p: *Parser, minPrec: int) -> *Expr; -func parserParsePattern(p: *Parser) -> *Pattern; -func parserParseMatchExpr(p: *Parser) -> *Expr; + // Forward declarations for mutual recursion + func parserParseExpr(p: *Parser) -> *Expr; + func parserParseStmt(p: *Parser) -> *Stmt; + func parserParseBlock(p: *Parser) -> *Block; + func parserParsePrimary(p: *Parser) -> *Expr; + func parserParsePostfixExpr(p: *Parser) -> *Expr; + func parserParseUnary(p: *Parser) -> *Expr; + func parserParseBinaryPrec(p: *Parser, minPrec: int) -> *Expr; + func parserParsePattern(p: *Parser) -> *Pattern; + func parserParseMatchExpr(p: *Parser) -> *Expr; -// --------------------------------------------------------------------------- -// Parser state -// --------------------------------------------------------------------------- -struct Parser { - tokens: *LexToken, - tokenCount: int, - pos: int, - diagCount: int, - diags: *ParserDiag, - structInitAllowed: bool, -} - -struct ParserDiag { - line: uint32, - column: uint32, - message: String, - severity: int, /* 0=error (fatal), 1=warning (recoverable) */ -} - -// --------------------------------------------------------------------------- -// Token helpers -// --------------------------------------------------------------------------- - -func parserCurToken(p: *Parser) -> LexToken { - if p.pos < p.tokenCount { - return p.tokens[p.pos]; + // --------------------------------------------------------------------------- + // Parser state + // --------------------------------------------------------------------------- + struct Parser { + tokens: *LexToken, + tokenCount: int, + pos: int, + diagCount: int, + diags: *ParserDiag, + structInitAllowed: bool, } - var eof: LexToken; - eof.kind = tkEndOfFile; - eof.text = ""; - return eof; -} -func parserPeek(p: *Parser, ahead: int) -> int { - let i: int = p.pos + ahead; - if i >= 0 && i < p.tokenCount { - return p.tokens[i].kind; + struct ParserDiag { + line: uint32, + column: uint32, + message: String, + severity: int, /* 0=error (fatal), 1=warning (recoverable) */ } - return tkEndOfFile; -} -// Lookahead to determine if '<' starts a type argument list (`Foo`). -// Must not treat value comparisons `x < 0` as generics when a later `x > 0` -// exists (e.g. multiple match arm guards). -func parserIsTypeArgListAhead(p: *Parser) -> bool { - if !parserCheck(p, tkLt) { return false; } - var depth: int = 0; - var ahead: int = 0; - while true { - let kind: int = parserPeek(p, ahead); - // Hard stops: cannot appear inside <...> type args - if kind == tkEndOfFile || kind == tkLBrace || kind == tkRBrace || kind == tkSemicolon + // --------------------------------------------------------------------------- + // Token helpers + // --------------------------------------------------------------------------- + + func parserCurToken(p: *Parser) -> LexToken { + if p.pos < p.tokenCount { + return p.tokens[p.pos]; + } + var eof: LexToken; + eof.kind = tkEndOfFile; + eof.text = ""; + return eof; + } + + func parserPeek(p: *Parser, ahead: int) -> int { + let i: int = p.pos + ahead; + if i >= 0 && i < p.tokenCount { + return p.tokens[i].kind; + } + return tkEndOfFile; + } + + // Lookahead to determine if '<' starts a type argument list (`Foo`). + // Must not treat value comparisons `x < 0` as generics when a later `x > 0` + // exists (e.g. multiple match arm guards). + func parserIsTypeArgListAhead(p: *Parser) -> bool { + if !parserCheck(p, tkLt) { return false; } + var depth: int = 0; + var ahead: int = 0; + while true { + let kind: int = parserPeek(p, ahead); + // Hard stops: cannot appear inside <...> type args + if kind == tkEndOfFile || kind == tkLBrace || kind == tkRBrace || kind == tkSemicolon || kind == tkFatArrow || kind == tkIf || kind == tkElse || kind == tkWhile || kind == tkFor || kind == tkMatch || kind == tkReturn || kind == tkLet || kind == tkVar || kind == tkEq || kind == tkNe || kind == tkLe || kind == tkGe || kind == tkAmpAmp || kind == tkPipePipe || kind == tkAssign { - return false; - } - // Literals / arithmetic ⇒ value expression, not type args - if kind == tkIntLiteral || kind == tkFloatLiteral || kind == tkStringLiteral + return false; + } + // Literals / arithmetic ⇒ value expression, not type args + if kind == tkIntLiteral || kind == tkFloatLiteral || kind == tkStringLiteral || kind == tkCharLiteral || kind == tkBoolLiteral || kind == tkPlus || kind == tkMinus || kind == tkSlash || kind == tkPercent { - return false; - } - if kind == tkLt { - depth = depth + 1; - } else if kind == tkGt { - depth = depth - 1; - if depth == 0 { - return true; + return false; } - } - ahead = ahead + 1; - } - return false; -} - -func parserAdvance(p: *Parser) -> LexToken { - let tok: LexToken = parserCurToken(p); - if p.pos < p.tokenCount { - p.pos = p.pos + 1; - } - return tok; -} - -func parserCheck(p: *Parser, kind: int) -> bool { - return parserPeek(p, 0) == kind; -} - -func parserMatch(p: *Parser, kind: int) -> bool { - if parserCheck(p, kind) { - discard parserAdvance(p); - return true; - } - return false; -} - -func parserExpect(p: *Parser, kind: int, msg: String) -> LexToken { - if parserCheck(p, kind) { - return parserAdvance(p); - } - let tok: LexToken = parserCurToken(p); - if p.diagCount < 256 { - p.diags[p.diagCount] = ParserDiag { - line: tok.line, column: tok.column, message: msg, severity: 1 - }; - p.diagCount = p.diagCount + 1; - } - return tok; -} - -func parserEmitDiag(p: *Parser, line: uint32, col: uint32, msg: String) { - if p.diagCount < 256 { - p.diags[p.diagCount] = ParserDiag { - line: line, column: col, message: msg, severity: 1 - }; - p.diagCount = p.diagCount + 1; - } -} - -func parserIsKeyword(kind: int) -> bool { - if kind >= tkIf && kind <= tkSuper { return true; } - if kind == tkSizeOf { return true; } - return false; -} - -func parserExpectIdentOrKeyword(p: *Parser, msg: String) -> LexToken { - let tok: LexToken = parserCurToken(p); - if tok.kind == tkIdent || parserIsKeyword(tok.kind) { - return parserAdvance(p); - } - if p.diagCount < 256 { - p.diags[p.diagCount] = ParserDiag { - line: tok.line, column: tok.column, message: msg, severity: 1 - }; - p.diagCount = p.diagCount + 1; - } - return tok; -} - -// --------------------------------------------------------------------------- -// Type parsing -// --------------------------------------------------------------------------- - -// C-friendly type name from a TypeExpr (named, tuple, pointer, …). -func parserTypeExprCName(te: *TypeExpr) -> String { - if te == null as *TypeExpr { return "int"; } - if te.kind == tekTuple { - if !String_Eq(te.typeName, "") { return te.typeName; } - return "Tuple_Empty"; - } - if te.kind == tekPointer || te.kind == tekRef || te.kind == tekMutRef { - if te.pointerPointee != null as *TypeExpr { - return String_Concat(parserTypeExprCName(te.pointerPointee), "*"); - } - return "void*"; - } - if !String_Eq(te.typeName, "") { - if String_Eq(te.typeName, "String") || String_Eq(te.typeName, "str") { - return "const char*"; - } - return te.typeName; - } - return "int"; -} - -func parserParseType(p: *Parser) -> *TypeExpr { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - let kindTok: int = parserPeek(p, 0); - - // &T (shared reference) and &mut T (mutable reference) - if kindTok == tkAmp { - discard parserAdvance(p); // & - var isMut: bool = false; - // Check for "mut" keyword - if parserCheck(p, tkIdent) { - let tok: LexToken = parserCurToken(p); - if String_Eq(tok.text, "mut") { - isMut = true; - discard parserAdvance(p); // mut - } - } - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - if isMut { - te.kind = tekMutRef; - } else { - te.kind = tekRef; - } - te.line = line; - te.column = col; - te.pointerPointee = parserParseType(p); - if te.pointerPointee != null as *TypeExpr { - te.typeName = String_Concat(te.pointerPointee.typeName, "*"); - } - return te; - } - - // *T (pointer) - if kindTok == tkStar { - discard parserAdvance(p); - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekPointer; - te.line = line; - te.column = col; - te.pointerPointee = parserParseType(p); - // Set typeName to "Pointee*" - if te.pointerPointee != null as *TypeExpr { - te.typeName = String_Concat(te.pointerPointee.typeName, "*"); - } - return te; - } - - // func(Params) -> Ret - if kindTok == tkFunc { - discard parserAdvance(p); - discard parserExpect(p, tkLParen, "expected '(' after 'func'"); - var params: *TypeExprList = null as *TypeExprList; - var paramsTail: *TypeExprList = null as *TypeExprList; - var count: int = 0; - while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { - let paramTe: *TypeExpr = parserParseType(p); - let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; - node.te = paramTe; - node.next = null as *TypeExprList; - if params == null as *TypeExprList { - params = node; - } else { - paramsTail.next = node; - } - paramsTail = node; - count = count + 1; - if parserCheck(p, tkComma) { - discard parserAdvance(p); - } - } - discard parserExpect(p, tkRParen, "expected ')' after func params"); - var ret: *TypeExpr = null as *TypeExpr; - if parserCheck(p, tkArrow) { - discard parserAdvance(p); - ret = parserParseType(p); - } - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekFunc; - te.line = line; - te.column = col; - te.funcParams = params; - te.funcRet = ret; - te.funcParamCount = count; - return te; - } - - // (T, U, ...) tuple type - if kindTok == tkLParen { - discard parserAdvance(p); - var elems: *TypeExprList = null as *TypeExprList; - var elemsTail: *TypeExprList = null as *TypeExprList; - var count: int = 0; - var typeName: String = "Tuple"; - while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { - let elemTe: *TypeExpr = parserParseType(p); - let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; - node.te = elemTe; - node.next = null as *TypeExprList; - if elems == null as *TypeExprList { - elems = node; - } else { - elemsTail.next = node; - } - elemsTail = node; - count = count + 1; - // Build mangled name: Tuple_int_int - var part: String = "int"; - if elemTe != null as *TypeExpr { - if !String_Eq(elemTe.typeName, "") { - part = elemTe.typeName; - } else if elemTe.kind == tekPointer && elemTe.pointerPointee != null as *TypeExpr { - part = String_Concat(elemTe.pointerPointee.typeName, "Ptr"); + if kind == tkLt { + depth = depth + 1; + } else if kind == tkGt { + depth = depth - 1; + if depth == 0 { + return true; } } - if String_Eq(part, "String") || String_Eq(part, "str") { part = "cstr"; } - typeName = String_Concat(typeName, "_"); - typeName = String_Concat(typeName, part); - if parserCheck(p, tkComma) { - discard parserAdvance(p); - } else { - break; + ahead = ahead + 1; + } + return false; + } + + func parserAdvance(p: *Parser) -> LexToken { + let tok: LexToken = parserCurToken(p); + if p.pos < p.tokenCount { + p.pos = p.pos + 1; + } + return tok; + } + + func parserCheck(p: *Parser, kind: int) -> bool { + return parserPeek(p, 0) == kind; + } + + func parserMatch(p: *Parser, kind: int) -> bool { + if parserCheck(p, kind) { + discard parserAdvance(p); + return true; + } + return false; + } + + func parserExpect(p: *Parser, kind: int, msg: String) -> LexToken { + if parserCheck(p, kind) { + return parserAdvance(p); + } + let tok: LexToken = parserCurToken(p); + if p.diagCount < 256 { + p.diags[p.diagCount] = ParserDiag { + line: tok.line, column: tok.column, message: msg, severity: 1 + }; + p.diagCount = p.diagCount + 1; + } + return tok; + } + + func parserEmitDiag(p: *Parser, line: uint32, col: uint32, msg: String) { + if p.diagCount < 256 { + p.diags[p.diagCount] = ParserDiag { + line: line, column: col, message: msg, severity: 1 + }; + p.diagCount = p.diagCount + 1; + } + } + + func parserIsKeyword(kind: int) -> bool { + if kind >= tkIf && kind <= tkSuper { return true; } + if kind == tkSizeOf { return true; } + return false; + } + + func parserExpectIdentOrKeyword(p: *Parser, msg: String) -> LexToken { + let tok: LexToken = parserCurToken(p); + if tok.kind == tkIdent || parserIsKeyword(tok.kind) { + return parserAdvance(p); + } + if p.diagCount < 256 { + p.diags[p.diagCount] = ParserDiag { + line: tok.line, column: tok.column, message: msg, severity: 1 + }; + p.diagCount = p.diagCount + 1; + } + return tok; + } + + // --------------------------------------------------------------------------- + // Type parsing + // --------------------------------------------------------------------------- + + // C-friendly type name from a TypeExpr (named, tuple, pointer, …). + func parserTypeExprCName(te: *TypeExpr) -> String { + if te == null as *TypeExpr { return "int"; } + if te.kind == tekTuple { + if !String_Eq(te.typeName, "") { return te.typeName; } + return "Tuple_Empty"; + } + if te.kind == tekPointer || te.kind == tekRef || te.kind == tekMutRef { + if te.pointerPointee != null as *TypeExpr { + return String_Concat(parserTypeExprCName(te.pointerPointee), "*"); } + return "void*"; } - discard parserExpect(p, tkRParen, "expected ')' to close tuple type"); - if count == 0 { - typeName = "Tuple_Empty"; + if !String_Eq(te.typeName, "") { + if String_Eq(te.typeName, "String") || String_Eq(te.typeName, "str") { + return "const char*"; + } + return te.typeName; } - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekTuple; - te.line = line; - te.column = col; - te.tupleElems = elems; - te.tupleCount = count; - te.typeName = typeName; - return te; + return "int"; } - // name - let nameTok: LexToken = parserExpect(p, tkIdent, "expected type name"); - // self / Self -> tekSelf - if String_Eq(nameTok.text, "self") || String_Eq(nameTok.text, "Self") { - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekSelf; - te.line = nameTok.line; - te.column = nameTok.column; - te.typeName = "Self"; - return te; - } - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.line = nameTok.line; - te.column = nameTok.column; - te.typeName = nameTok.text; + func parserParseType(p: *Parser) -> *TypeExpr { + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let kindTok: int = parserPeek(p, 0); - // Optional type args - if parserCheck(p, tkLt) { - discard parserAdvance(p); // < - let arg0: LexToken = parserExpect(p, tkIdent, "expected type argument"); - te.typeArgName0 = arg0.text; - te.typeArgCount = 1; - if parserMatch(p, tkComma) { - let arg1: LexToken = parserExpect(p, tkIdent, "expected type argument"); - te.typeArgName1 = arg1.text; - te.typeArgCount = 2; + // &T / &'a T (shared) and &mut T / &'a mut T (mutable) + if kindTok == tkAmp { + discard parserAdvance(p); // & + var lt: String = ""; + // Optional lifetime: &'a or &'a mut + if parserCheck(p, tkLifetime) { + let ltTok: LexToken = parserCurToken(p); + lt = ltTok.text; + discard parserAdvance(p); + } + var isMut: bool = false; + // Check for "mut" keyword + if parserCheck(p, tkIdent) { + let tok: LexToken = parserCurToken(p); + if String_Eq(tok.text, "mut") { + isMut = true; + discard parserAdvance(p); // mut + } + } + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + if isMut { + te.kind = tekMutRef; + } else { + te.kind = tekRef; + } + te.line = line; + te.column = col; + te.refLifetime = lt; + te.pointerPointee = parserParseType(p); + if te.pointerPointee != null as *TypeExpr { + te.typeName = String_Concat(te.pointerPointee.typeName, "*"); + } + return te; } - discard parserExpect(p, tkGt, "expected '>' to close type arguments"); - } - return te; -} -// --------------------------------------------------------------------------- -// Forward declarations and helpers -// --------------------------------------------------------------------------- + // *T (pointer) + if kindTok == tkStar { + discard parserAdvance(p); + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekPointer; + te.line = line; + te.column = col; + te.pointerPointee = parserParseType(p); + // Set typeName to "Pointee*" + if te.pointerPointee != null as *TypeExpr { + te.typeName = String_Concat(te.pointerPointee.typeName, "*"); + } + return te; + } -func parserParseExpr(p: *Parser) -> *Expr; -func parserParseStmt(p: *Parser) -> *Stmt; -func parserParseBlock(p: *Parser) -> *Block; - -func parserMakeExpr(kind: int, line: uint32, col: uint32) -> *Expr { - let e: *Expr = bux_alloc(sizeof(Expr)) as *Expr; - e.kind = kind; - e.line = line; - e.column = col; - e.strValue = ""; - e.intValue = 0; - e.boolValue = false; - e.tokKind = 0; - e.tokText = ""; - e.child1 = null as *Expr; - e.child2 = null as *Expr; - e.child3 = null as *Expr; - e.refType = null as *TypeExpr; - e.refBlock = null as *Block; - e.genericCallee = ""; - e.genericTypeArg0 = ""; - e.genericTypeArg1 = ""; - e.genericTypeArgCount = 0; - e.structName = ""; - e.structFieldCount = 0; - e.callArgs = null as *ExprList; - e.callArgCount = 0; - e.matchArms = null as *MatchArm; - e.matchArmCount = 0; - return e; -} - - -func parserMakeStringLitExpr(text: String, line: uint32, col: uint32) -> *Expr { - let quoted: String = String_Concat(String_Concat("\"", text), "\""); - let e: *Expr = parserMakeExpr(ekLiteral, line, col); - e.tokKind = tkStringLiteral; - e.tokText = quoted; - return e; -} - -func parserParseInterpFragment(exprStr: String) -> *Expr { - let lex: *Lexer = Lexer_Tokenize(exprStr); - var sub: Parser; - sub.tokens = lex.tokens; - sub.tokenCount = lex.tokenCount; - sub.pos = 0; - sub.diagCount = 0; - sub.diags = null as *ParserDiag; - sub.structInitAllowed = true; - return parserParseExpr(&sub); -} - -func parserAppendPart(head: *ExprList, tail: *ExprList, e: *Expr) -> *ExprList { - // returns new tail; head updated via pointer trick not possible — return pair as side effect on first arg using double pointer? - // simpler: just inline in main - return tail; -} - -func parserParseStringInterp(p: *Parser, tok: LexToken) -> *Expr { - let text: String = tok.text; - let tlen: uint = bux_strlen(text); - if tlen < 3 as uint { - let e: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); - e.tokKind = tkStringLiteral; - e.tokText = text; - return e; - } - if text[0] as int != 102 { - let e: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); - e.tokKind = tkStringLiteral; - e.tokText = text; - return e; - } - if text[1] as int != 34 { - let e: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); - e.tokKind = tkStringLiteral; - e.tokText = text; - return e; - } - let inner: String = bux_str_slice(text, 2, tlen - 3); - let innerLen: uint = bux_strlen(inner); - var head: *ExprList = null as *ExprList; - var tail: *ExprList = null as *ExprList; - var currentText: String = ""; - var i: uint = 0; - var partCount: int = 0; - while i < innerLen { - let ch: int = inner[i] as int; - var handled: bool = false; - if ch == 92 { - if i + 1 < innerLen { - let nch: int = inner[i + 1] as int; - if nch == 123 { - currentText = String_Concat(currentText, "{"); - i = i + 2; - handled = true; + // func(Params) -> Ret + if kindTok == tkFunc { + discard parserAdvance(p); + discard parserExpect(p, tkLParen, "expected '(' after 'func'"); + var params: *TypeExprList = null as *TypeExprList; + var paramsTail: *TypeExprList = null as *TypeExprList; + var count: int = 0; + while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { + let paramTe: *TypeExpr = parserParseType(p); + let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; + node.te = paramTe; + node.next = null as *TypeExprList; + if params == null as *TypeExprList { + params = node; } else { - if nch == 125 { - currentText = String_Concat(currentText, "}"); - i = i + 2; - handled = true; + paramsTail.next = node; + } + paramsTail = node; + count = count + 1; + if parserCheck(p, tkComma) { + discard parserAdvance(p); + } + } + discard parserExpect(p, tkRParen, "expected ')' after func params"); + var ret: *TypeExpr = null as *TypeExpr; + if parserCheck(p, tkArrow) { + discard parserAdvance(p); + ret = parserParseType(p); + } + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekFunc; + te.line = line; + te.column = col; + te.funcParams = params; + te.funcRet = ret; + te.funcParamCount = count; + return te; + } + + // (T, U, ...) tuple type + if kindTok == tkLParen { + discard parserAdvance(p); + var elems: *TypeExprList = null as *TypeExprList; + var elemsTail: *TypeExprList = null as *TypeExprList; + var count: int = 0; + var typeName: String = "Tuple"; + while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { + let elemTe: *TypeExpr = parserParseType(p); + let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; + node.te = elemTe; + node.next = null as *TypeExprList; + if elems == null as *TypeExprList { + elems = node; + } else { + elemsTail.next = node; + } + elemsTail = node; + count = count + 1; + // Build mangled name: Tuple_int_int + var part: String = "int"; + if elemTe != null as *TypeExpr { + if !String_Eq(elemTe.typeName, "") { + part = elemTe.typeName; + } else if elemTe.kind == tekPointer && elemTe.pointerPointee != null as *TypeExpr { + part = String_Concat(elemTe.pointerPointee.typeName, "Ptr"); } } - } - } - if handled { - continue; - } - if ch == 123 { - let textPart: *Expr = parserMakeStringLitExpr(currentText, tok.line, tok.column); - let textNode: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; - textNode.expr = textPart; - textNode.next = null as *ExprList; - textNode.argName = ""; - if head == null as *ExprList { - head = textNode; - tail = textNode; - } else { - tail.next = textNode; - tail = textNode; - } - partCount = partCount + 1; - currentText = ""; - var j: uint = i + 1; - var depth: int = 1; - while j < innerLen { - if depth <= 0 { + if String_Eq(part, "String") || String_Eq(part, "str") { part = "cstr"; } + typeName = String_Concat(typeName, "_"); + typeName = String_Concat(typeName, part); + if parserCheck(p, tkComma) { + discard parserAdvance(p); + } else { break; } - let cj: int = inner[j] as int; - if cj == 123 { - depth = depth + 1; - } - if cj == 125 { - depth = depth - 1; - } - j = j + 1; } - if depth != 0 { - parserEmitDiag(p, tok.line, tok.column, "unmatched brace in string interpolation"); - let bad: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); - bad.tokKind = tkStringLiteral; - bad.tokText = "\"\""; - return bad; + discard parserExpect(p, tkRParen, "expected ')' to close tuple type"); + if count == 0 { + typeName = "Tuple_Empty"; } - let exprLen: uint = j - i - 2; - let exprStr: String = bux_str_slice(inner, i + 1, exprLen); - if bux_strlen(exprStr) == 0 { - parserEmitDiag(p, tok.line, tok.column, "empty interpolation"); - let bad: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); - bad.tokKind = tkStringLiteral; - bad.tokText = "\"\""; - return bad; - } - let frag: *Expr = parserParseInterpFragment(exprStr); - let fragNode: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; - fragNode.expr = frag; - fragNode.next = null as *ExprList; - fragNode.argName = ""; - if head == null as *ExprList { - head = fragNode; - tail = fragNode; - } else { - tail.next = fragNode; - tail = fragNode; - } - partCount = partCount + 1; - i = j; - continue; + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekTuple; + te.line = line; + te.column = col; + te.tupleElems = elems; + te.tupleCount = count; + te.typeName = typeName; + return te; } - let one: String = bux_str_slice(inner, i, 1); - currentText = String_Concat(currentText, one); - i = i + 1; - } - let lastPart: *Expr = parserMakeStringLitExpr(currentText, tok.line, tok.column); - let lastNode: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; - lastNode.expr = lastPart; - lastNode.next = null as *ExprList; - lastNode.argName = ""; - if head == null as *ExprList { - head = lastNode; - tail = lastNode; - } else { - tail.next = lastNode; - tail = lastNode; - } - partCount = partCount + 1; - if partCount == 1 { - return head.expr; - } - let e: *Expr = parserMakeExpr(ekStringInterp, tok.line, tok.column); - e.callArgs = head; - e.callArgCount = partCount; - return e; -} -// --------------------------------------------------------------------------- -// Primary expressions -// --------------------------------------------------------------------------- - -func parserParsePrimary(p: *Parser) -> *Expr { - while parserCheck(p, tkNewLine) { - discard parserAdvance(p); - } - let tok: LexToken = parserCurToken(p); - let line: uint32 = tok.line; - let col: uint32 = tok.column; - let kind: int = tok.kind; - - // Literals - if kind == tkIntLiteral || kind == tkFloatLiteral || kind == tkStringLiteral - || kind == tkCharLiteral || kind == tkBoolLiteral { - discard parserAdvance(p); - if kind == tkStringLiteral && bux_strlen(tok.text) >= 2 as uint - && tok.text[0] as int == 102 && tok.text[1] as int == 34 { - return parserParseStringInterp(p, tok); + // name + let nameTok: LexToken = parserExpect(p, tkIdent, "expected type name"); + // self / Self -> tekSelf + if String_Eq(nameTok.text, "self") || String_Eq(nameTok.text, "Self") { + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekSelf; + te.line = nameTok.line; + te.column = nameTok.column; + te.typeName = "Self"; + return te; } + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.line = nameTok.line; + te.column = nameTok.column; + te.typeName = nameTok.text; + + // Optional type args + if parserCheck(p, tkLt) { + discard parserAdvance(p); // < + let arg0: LexToken = parserExpect(p, tkIdent, "expected type argument"); + te.typeArgName0 = arg0.text; + te.typeArgCount = 1; + if parserMatch(p, tkComma) { + let arg1: LexToken = parserExpect(p, tkIdent, "expected type argument"); + te.typeArgName1 = arg1.text; + te.typeArgCount = 2; + } + discard parserExpect(p, tkGt, "expected '>' to close type arguments"); + } + return te; + } + + // --------------------------------------------------------------------------- + // Forward declarations and helpers + // --------------------------------------------------------------------------- + + func parserParseExpr(p: *Parser) -> *Expr; + func parserParseStmt(p: *Parser) -> *Stmt; + func parserParseBlock(p: *Parser) -> *Block; + + func parserMakeExpr(kind: int, line: uint32, col: uint32) -> *Expr { + let e: *Expr = bux_alloc(sizeof(Expr)) as *Expr; + e.kind = kind; + e.line = line; + e.column = col; + e.strValue = ""; + e.intValue = 0; + e.boolValue = false; + e.tokKind = 0; + e.tokText = ""; + e.child1 = null as *Expr; + e.child2 = null as *Expr; + e.child3 = null as *Expr; + e.refType = null as *TypeExpr; + e.refBlock = null as *Block; + e.genericCallee = ""; + e.genericTypeArg0 = ""; + e.genericTypeArg1 = ""; + e.genericTypeArgCount = 0; + e.structName = ""; + e.structFieldCount = 0; + e.callArgs = null as *ExprList; + e.callArgCount = 0; + e.matchArms = null as *MatchArm; + e.matchArmCount = 0; + return e; + } + + + func parserMakeStringLitExpr(text: String, line: uint32, col: uint32) -> *Expr { + let quoted: String = String_Concat(String_Concat("\"", text), "\""); let e: *Expr = parserMakeExpr(ekLiteral, line, col); - e.tokKind = kind; - e.tokText = tok.text; - if kind == tkIntLiteral { - e.intValue = bux_str_to_int(tok.text) as int; + e.tokKind = tkStringLiteral; + e.tokText = quoted; + return e; + } + + func parserParseInterpFragment(exprStr: String) -> *Expr { + let lex: *Lexer = Lexer_Tokenize(exprStr); + var sub: Parser; + sub.tokens = lex.tokens; + sub.tokenCount = lex.tokenCount; + sub.pos = 0; + sub.diagCount = 0; + sub.diags = null as *ParserDiag; + sub.structInitAllowed = true; + return parserParseExpr(&sub); + } + + func parserAppendPart(head: *ExprList, tail: *ExprList, e: *Expr) -> *ExprList { + // returns new tail; head updated via pointer trick not possible — return pair as side effect on first arg using double pointer? + // simpler: just inline in main + return tail; + } + + func parserParseStringInterp(p: *Parser, tok: LexToken) -> *Expr { + let text: String = tok.text; + let tlen: uint = bux_strlen(text); + if tlen < 3 as uint { + let e: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); + e.tokKind = tkStringLiteral; + e.tokText = text; + return e; } - return e; - } - - // Identifier - if kind == tkIdent { - discard parserAdvance(p); - let e: *Expr = parserMakeExpr(ekIdent, line, col); - e.strValue = tok.text; - return e; - } - - // self - if kind == tkSelf { - discard parserAdvance(p); - return parserMakeExpr(ekSelf, line, col); - } - - // null - if kind == tkNull { - discard parserAdvance(p); - let e: *Expr = parserMakeExpr(ekLiteral, line, col); - e.tokKind = tkNull; - return e; - } - - // sizeof(Type) - if kind == tkSizeOf { - discard parserAdvance(p); - discard parserExpect(p, tkLParen, "expected '(' after sizeof"); - let e: *Expr = parserMakeExpr(ekSizeOf, line, col); - e.refType = parserParseType(p); - discard parserExpect(p, tkRParen, "expected ')' after sizeof type"); - return e; - } - - // spawn Callee(args) - if kind == tkSpawn { - discard parserAdvance(p); - let e: *Expr = parserMakeExpr(ekSpawn, line, col); - e.child1 = parserParsePrimary(p); - // Optional call arguments - if parserCheck(p, tkLParen) { - discard parserAdvance(p); - if !parserCheck(p, tkRParen) { - e.child2 = parserParseExpr(p); - if parserMatch(p, tkComma) { - e.child3 = parserParseExpr(p); - while parserMatch(p, tkComma) { - discard parserParseExpr(p); + if text[0] as int != 102 { + let e: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); + e.tokKind = tkStringLiteral; + e.tokText = text; + return e; + } + if text[1] as int != 34 { + let e: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); + e.tokKind = tkStringLiteral; + e.tokText = text; + return e; + } + let inner: String = bux_str_slice(text, 2, tlen - 3); + let innerLen: uint = bux_strlen(inner); + var head: *ExprList = null as *ExprList; + var tail: *ExprList = null as *ExprList; + var currentText: String = ""; + var i: uint = 0; + var partCount: int = 0; + while i < innerLen { + let ch: int = inner[i] as int; + var handled: bool = false; + if ch == 92 { + if i + 1 < innerLen { + let nch: int = inner[i + 1] as int; + if nch == 123 { + currentText = String_Concat(currentText, "{"); + i = i + 2; + handled = true; + } else { + if nch == 125 { + currentText = String_Concat(currentText, "}"); + i = i + 2; + handled = true; + } } } } - discard parserExpect(p, tkRParen, "expected ')' after spawn arguments"); - } - return e; - } - - // #intrinsics - if kind >= tkHashLine && kind <= tkHashModule { - discard parserAdvance(p); - let e: *Expr = parserMakeExpr(ekLiteral, line, col); - e.intValue = kind; - return e; - } - - // ( expr ) or (a, b, ...) tuple - if kind == tkLParen { - discard parserAdvance(p); - // Empty tuple () - if parserCheck(p, tkRParen) { - discard parserAdvance(p); - let te: *Expr = parserMakeExpr(ekTuple, line, col); - te.callArgCount = 0; - return te; - } - let first: *Expr = parserParseExpr(p); - if parserCheck(p, tkComma) { - // Tuple expression - let te: *Expr = parserMakeExpr(ekTuple, line, col); - var firstArg: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; - firstArg.expr = first; - firstArg.next = null as *ExprList; - var lastArg: *ExprList = firstArg; - var count: int = 1; - while parserCheck(p, tkComma) { - discard parserAdvance(p); - if parserCheck(p, tkRParen) { break; } - let elem: *Expr = parserParseExpr(p); - let node: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; - node.expr = elem; - node.next = null as *ExprList; - lastArg.next = node; - lastArg = node; - count = count + 1; + if handled { + continue; } - discard parserExpect(p, tkRParen, "expected ')' to close tuple"); - te.callArgs = firstArg; - te.callArgCount = count; - return te; + if ch == 123 { + let textPart: *Expr = parserMakeStringLitExpr(currentText, tok.line, tok.column); + let textNode: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; + textNode.expr = textPart; + textNode.next = null as *ExprList; + textNode.argName = ""; + if head == null as *ExprList { + head = textNode; + tail = textNode; + } else { + tail.next = textNode; + tail = textNode; + } + partCount = partCount + 1; + currentText = ""; + var j: uint = i + 1; + var depth: int = 1; + while j < innerLen { + if depth <= 0 { + break; + } + let cj: int = inner[j] as int; + if cj == 123 { + depth = depth + 1; + } + if cj == 125 { + depth = depth - 1; + } + j = j + 1; + } + if depth != 0 { + parserEmitDiag(p, tok.line, tok.column, "unmatched brace in string interpolation"); + let bad: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); + bad.tokKind = tkStringLiteral; + bad.tokText = "\"\""; + return bad; + } + let exprLen: uint = j - i - 2; + let exprStr: String = bux_str_slice(inner, i + 1, exprLen); + if bux_strlen(exprStr) == 0 { + parserEmitDiag(p, tok.line, tok.column, "empty interpolation"); + let bad: *Expr = parserMakeExpr(ekLiteral, tok.line, tok.column); + bad.tokKind = tkStringLiteral; + bad.tokText = "\"\""; + return bad; + } + let frag: *Expr = parserParseInterpFragment(exprStr); + let fragNode: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; + fragNode.expr = frag; + fragNode.next = null as *ExprList; + fragNode.argName = ""; + if head == null as *ExprList { + head = fragNode; + tail = fragNode; + } else { + tail.next = fragNode; + tail = fragNode; + } + partCount = partCount + 1; + i = j; + continue; + } + let one: String = bux_str_slice(inner, i, 1); + currentText = String_Concat(currentText, one); + i = i + 1; } - discard parserExpect(p, tkRParen, "expected ')'"); - return first; - } - - // Empty-param closure: `||` is lexed as tkPipePipe (logical-or token). - // As a primary it can only mean a zero-param closure: || -> T { ... } - if kind == tkPipePipe { - return parserParseEmptyClosure(p); - } - - // Closure: |params| -> Ret { body } - if kind == tkPipe { - return parserParseClosure(p); - } - - // Block expression { stmts; value } - if kind == tkLBrace { - let e: *Expr = parserMakeExpr(ekBlock, line, col); - e.boolValue = false; - e.refBlock = parserParseBlock(p); + let lastPart: *Expr = parserMakeStringLitExpr(currentText, tok.line, tok.column); + let lastNode: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; + lastNode.expr = lastPart; + lastNode.next = null as *ExprList; + lastNode.argName = ""; + if head == null as *ExprList { + head = lastNode; + tail = lastNode; + } else { + tail.next = lastNode; + tail = lastNode; + } + partCount = partCount + 1; + if partCount == 1 { + return head.expr; + } + let e: *Expr = parserMakeExpr(ekStringInterp, tok.line, tok.column); + e.callArgs = head; + e.callArgCount = partCount; return e; } - // unsafe { ... } — unsafe block expression - if kind == tkUnsafe { - discard parserAdvance(p); - let e: *Expr = parserMakeExpr(ekBlock, line, col); - e.boolValue = true; // marks this block as unsafe - e.refBlock = parserParseBlock(p); - return e; - } + // --------------------------------------------------------------------------- + // Primary expressions + // --------------------------------------------------------------------------- - // match expr { arms } - if kind == tkMatch { - return parserParseMatchExpr(p); - } + func parserParsePrimary(p: *Parser) -> *Expr { + while parserCheck(p, tkNewLine) { + discard parserAdvance(p); + } + let tok: LexToken = parserCurToken(p); + let line: uint32 = tok.line; + let col: uint32 = tok.column; + let kind: int = tok.kind; - parserEmitDiag(p, line, col, "expected expression"); - return parserMakeExpr(ekLiteral, line, col); -} - -// --------------------------------------------------------------------------- -// Patterns (for match arms) -// --------------------------------------------------------------------------- - -func parserMakePattern(kind: int, line: uint32, col: uint32) -> *Pattern { - let pat: *Pattern = bux_alloc(sizeof(Pattern)) as *Pattern; - pat.kind = kind; - pat.line = line; - pat.column = col; - pat.patIdent = ""; - pat.patLitKind = 0; - pat.patLitText = ""; - pat.patRangeInclusive = false; - pat.patEnumPath = ""; - pat.patStructName = ""; - pat.patFieldName = ""; - pat.patChild1 = null as *Pattern; - pat.patChild2 = null as *Pattern; - pat.patArgs = null as *Pattern; - pat.patNext = null as *Pattern; - pat.patGuardExpr = null as *Expr; - return pat; -} - -func parserParsePrimaryPattern(p: *Parser) -> *Pattern { - while parserCheck(p, tkNewLine) { discard parserAdvance(p); } - let tok: LexToken = parserCurToken(p); - let line: uint32 = tok.line; - let col: uint32 = tok.column; - let kind: int = tok.kind; - - // _ - if kind == tkUnderscore { - discard parserAdvance(p); - return parserMakePattern(pkWildcard, line, col); - } - - // Literals - if kind == tkIntLiteral || kind == tkFloatLiteral || kind == tkStringLiteral + // Literals + if kind == tkIntLiteral || kind == tkFloatLiteral || kind == tkStringLiteral || kind == tkCharLiteral || kind == tkBoolLiteral { - discard parserAdvance(p); - let pat: *Pattern = parserMakePattern(pkLiteral, line, col); - pat.patLitKind = kind; - pat.patLitText = tok.text; + discard parserAdvance(p); + if kind == tkStringLiteral && bux_strlen(tok.text) >= 2 as uint + && tok.text[0] as int == 102 && tok.text[1] as int == 34 { + return parserParseStringInterp(p, tok); + } + let e: *Expr = parserMakeExpr(ekLiteral, line, col); + e.tokKind = kind; + e.tokText = tok.text; + if kind == tkIntLiteral { + e.intValue = bux_str_to_int(tok.text) as int; + } + return e; + } + + // Identifier + if kind == tkIdent { + discard parserAdvance(p); + let e: *Expr = parserMakeExpr(ekIdent, line, col); + e.strValue = tok.text; + return e; + } + + // self + if kind == tkSelf { + discard parserAdvance(p); + return parserMakeExpr(ekSelf, line, col); + } + + // null + if kind == tkNull { + discard parserAdvance(p); + let e: *Expr = parserMakeExpr(ekLiteral, line, col); + e.tokKind = tkNull; + return e; + } + + // sizeof(Type) + if kind == tkSizeOf { + discard parserAdvance(p); + discard parserExpect(p, tkLParen, "expected '(' after sizeof"); + let e: *Expr = parserMakeExpr(ekSizeOf, line, col); + e.refType = parserParseType(p); + discard parserExpect(p, tkRParen, "expected ')' after sizeof type"); + return e; + } + + // spawn Callee(args) + if kind == tkSpawn { + discard parserAdvance(p); + let e: *Expr = parserMakeExpr(ekSpawn, line, col); + e.child1 = parserParsePrimary(p); + // Optional call arguments + if parserCheck(p, tkLParen) { + discard parserAdvance(p); + if !parserCheck(p, tkRParen) { + e.child2 = parserParseExpr(p); + if parserMatch(p, tkComma) { + e.child3 = parserParseExpr(p); + while parserMatch(p, tkComma) { + discard parserParseExpr(p); + } + } + } + discard parserExpect(p, tkRParen, "expected ')' after spawn arguments"); + } + return e; + } + + // #intrinsics + if kind >= tkHashLine && kind <= tkHashModule { + discard parserAdvance(p); + let e: *Expr = parserMakeExpr(ekLiteral, line, col); + e.intValue = kind; + return e; + } + + // ( expr ) or (a, b, ...) tuple + if kind == tkLParen { + discard parserAdvance(p); + // Empty tuple () + if parserCheck(p, tkRParen) { + discard parserAdvance(p); + let te: *Expr = parserMakeExpr(ekTuple, line, col); + te.callArgCount = 0; + return te; + } + let first: *Expr = parserParseExpr(p); + if parserCheck(p, tkComma) { + // Tuple expression + let te: *Expr = parserMakeExpr(ekTuple, line, col); + var firstArg: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; + firstArg.expr = first; + firstArg.next = null as *ExprList; + var lastArg: *ExprList = firstArg; + var count: int = 1; + while parserCheck(p, tkComma) { + discard parserAdvance(p); + if parserCheck(p, tkRParen) { break; } + let elem: *Expr = parserParseExpr(p); + let node: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; + node.expr = elem; + node.next = null as *ExprList; + lastArg.next = node; + lastArg = node; + count = count + 1; + } + discard parserExpect(p, tkRParen, "expected ')' to close tuple"); + te.callArgs = firstArg; + te.callArgCount = count; + return te; + } + discard parserExpect(p, tkRParen, "expected ')'"); + return first; + } + + // Empty-param closure: `||` is lexed as tkPipePipe (logical-or token). + // As a primary it can only mean a zero-param closure: || -> T { ... } + if kind == tkPipePipe { + return parserParseEmptyClosure(p); + } + + // Closure: |params| -> Ret { body } + if kind == tkPipe { + return parserParseClosure(p); + } + + // Block expression { stmts; value } + if kind == tkLBrace { + let e: *Expr = parserMakeExpr(ekBlock, line, col); + e.boolValue = false; + e.refBlock = parserParseBlock(p); + return e; + } + + // unsafe { ... } — unsafe block expression + if kind == tkUnsafe { + discard parserAdvance(p); + let e: *Expr = parserMakeExpr(ekBlock, line, col); + e.boolValue = true; // marks this block as unsafe + e.refBlock = parserParseBlock(p); + return e; + } + + // match expr { arms } + if kind == tkMatch { + return parserParseMatchExpr(p); + } + + parserEmitDiag(p, line, col, "expected expression"); + return parserMakeExpr(ekLiteral, line, col); + } + + // --------------------------------------------------------------------------- + // Patterns (for match arms) + // --------------------------------------------------------------------------- + + func parserMakePattern(kind: int, line: uint32, col: uint32) -> *Pattern { + let pat: *Pattern = bux_alloc(sizeof(Pattern)) as *Pattern; + pat.kind = kind; + pat.line = line; + pat.column = col; + pat.patIdent = ""; + pat.patLitKind = 0; + pat.patLitText = ""; + pat.patRangeInclusive = false; + pat.patEnumPath = ""; + pat.patStructName = ""; + pat.patFieldName = ""; + pat.patChild1 = null as *Pattern; + pat.patChild2 = null as *Pattern; + pat.patArgs = null as *Pattern; + pat.patNext = null as *Pattern; + pat.patGuardExpr = null as *Expr; return pat; } - // Ident / enum path / true|false as names - if kind == tkIdent { - discard parserAdvance(p); - let name: String = tok.text; - if String_Eq(name, "true") || String_Eq(name, "false") { + func parserParsePrimaryPattern(p: *Parser) -> *Pattern { + while parserCheck(p, tkNewLine) { discard parserAdvance(p); } + let tok: LexToken = parserCurToken(p); + let line: uint32 = tok.line; + let col: uint32 = tok.column; + let kind: int = tok.kind; + + // _ + if kind == tkUnderscore { + discard parserAdvance(p); + return parserMakePattern(pkWildcard, line, col); + } + + // Literals + if kind == tkIntLiteral || kind == tkFloatLiteral || kind == tkStringLiteral + || kind == tkCharLiteral || kind == tkBoolLiteral { + discard parserAdvance(p); let pat: *Pattern = parserMakePattern(pkLiteral, line, col); - pat.patLitKind = tkBoolLiteral; - pat.patLitText = name; + pat.patLitKind = kind; + pat.patLitText = tok.text; return pat; } - // Enum path: Enum::Variant or Enum::Variant(...) - if parserCheck(p, tkColonColon) { - var path: String = name; - while parserCheck(p, tkColonColon) { - discard parserAdvance(p); - let seg: LexToken = parserExpectIdentOrKeyword(p, "expected identifier in pattern path"); - path = String_Concat(path, "::"); - path = String_Concat(path, seg.text); + + // Ident / enum path / true|false as names + if kind == tkIdent { + discard parserAdvance(p); + let name: String = tok.text; + if String_Eq(name, "true") || String_Eq(name, "false") { + let pat: *Pattern = parserMakePattern(pkLiteral, line, col); + pat.patLitKind = tkBoolLiteral; + pat.patLitText = name; + return pat; } - // Optional (args) for algebraic variants — store as patArgs linked list - var enumArgs: *Pattern = null as *Pattern; - var lastArg: *Pattern = null as *Pattern; - if parserCheck(p, tkLParen) { + // Enum path: Enum::Variant or Enum::Variant(...) + if parserCheck(p, tkColonColon) { + var path: String = name; + while parserCheck(p, tkColonColon) { + discard parserAdvance(p); + let seg: LexToken = parserExpectIdentOrKeyword(p, "expected identifier in pattern path"); + path = String_Concat(path, "::"); + path = String_Concat(path, seg.text); + } + // Optional (args) for algebraic variants — store as patArgs linked list + var enumArgs: *Pattern = null as *Pattern; + var lastArg: *Pattern = null as *Pattern; + if parserCheck(p, tkLParen) { + discard parserAdvance(p); + while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { + let argPat: *Pattern = parserParsePattern(p); + if enumArgs == null as *Pattern { + enumArgs = argPat; + lastArg = argPat; + } else { + lastArg.patNext = argPat; + lastArg = argPat; + } + if parserCheck(p, tkComma) { discard parserAdvance(p); } + else { break; } + } + discard parserExpect(p, tkRParen, "expected ')' to close enum pattern"); + } + let pat: *Pattern = parserMakePattern(pkEnum, line, col); + pat.patEnumPath = path; + pat.patArgs = enumArgs; + return pat; + } + // Struct pattern: Point { x: a, y: b } or shorthand Point { x, y } + if parserCheck(p, tkLBrace) { discard parserAdvance(p); - while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { - let argPat: *Pattern = parserParsePattern(p); - if enumArgs == null as *Pattern { - enumArgs = argPat; - lastArg = argPat; + var fieldHead: *Pattern = null as *Pattern; + var fieldTail: *Pattern = null as *Pattern; + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { + while parserCheck(p, tkNewLine) { discard parserAdvance(p); } + if parserCheck(p, tkRBrace) { break; } + let ftok: LexToken = parserExpectIdentOrKeyword(p, "expected field name in struct pattern"); + let fieldName: String = ftok.text; + var fieldPat: *Pattern = null as *Pattern; + if parserCheck(p, tkColon) { + discard parserAdvance(p); + fieldPat = parserParsePattern(p); } else { - lastArg.patNext = argPat; - lastArg = argPat; + // Shorthand { x } → { x: x } + fieldPat = parserMakePattern(pkIdent, line, col); + fieldPat.patIdent = fieldName; + } + fieldPat.patFieldName = fieldName; + if fieldHead == null as *Pattern { + fieldHead = fieldPat; + fieldTail = fieldPat; + } else { + fieldTail.patNext = fieldPat; + fieldTail = fieldPat; } if parserCheck(p, tkComma) { discard parserAdvance(p); } else { break; } } - discard parserExpect(p, tkRParen, "expected ')' to close enum pattern"); + discard parserExpect(p, tkRBrace, "expected '}' to close struct pattern"); + let spat: *Pattern = parserMakePattern(pkStruct, line, col); + spat.patStructName = name; + spat.patArgs = fieldHead; + return spat; } - let pat: *Pattern = parserMakePattern(pkEnum, line, col); - pat.patEnumPath = path; - pat.patArgs = enumArgs; + // Bare name with (args): Variant(...) treated as single-segment enum + if parserCheck(p, tkLParen) { + discard parserAdvance(p); + var bareArgs: *Pattern = null as *Pattern; + var bareLast: *Pattern = null as *Pattern; + while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { + let argPat: *Pattern = parserParsePattern(p); + if bareArgs == null as *Pattern { + bareArgs = argPat; + bareLast = argPat; + } else { + bareLast.patNext = argPat; + bareLast = argPat; + } + if parserCheck(p, tkComma) { discard parserAdvance(p); } + else { break; } + } + discard parserExpect(p, tkRParen, "expected ')' to close pattern"); + let pat: *Pattern = parserMakePattern(pkEnum, line, col); + pat.patEnumPath = name; + pat.patArgs = bareArgs; + return pat; + } + // Ident binding / catch-all name + let pat: *Pattern = parserMakePattern(pkIdent, line, col); + pat.patIdent = name; return pat; } - // Struct pattern: Point { x: a, y: b } or shorthand Point { x, y } - if parserCheck(p, tkLBrace) { + + // Tuple pattern: (a, b) + if kind == tkLParen { discard parserAdvance(p); - var fieldHead: *Pattern = null as *Pattern; - var fieldTail: *Pattern = null as *Pattern; - while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { - while parserCheck(p, tkNewLine) { discard parserAdvance(p); } - if parserCheck(p, tkRBrace) { break; } - let ftok: LexToken = parserExpectIdentOrKeyword(p, "expected field name in struct pattern"); - let fieldName: String = ftok.text; - var fieldPat: *Pattern = null as *Pattern; - if parserCheck(p, tkColon) { - discard parserAdvance(p); - fieldPat = parserParsePattern(p); - } else { - // Shorthand { x } → { x: x } - fieldPat = parserMakePattern(pkIdent, line, col); - fieldPat.patIdent = fieldName; - } - fieldPat.patFieldName = fieldName; - if fieldHead == null as *Pattern { - fieldHead = fieldPat; - fieldTail = fieldPat; - } else { - fieldTail.patNext = fieldPat; - fieldTail = fieldPat; - } - if parserCheck(p, tkComma) { discard parserAdvance(p); } - else { break; } - } - discard parserExpect(p, tkRBrace, "expected '}' to close struct pattern"); - let spat: *Pattern = parserMakePattern(pkStruct, line, col); - spat.patStructName = name; - spat.patArgs = fieldHead; - return spat; - } - // Bare name with (args): Variant(...) treated as single-segment enum - if parserCheck(p, tkLParen) { - discard parserAdvance(p); - var bareArgs: *Pattern = null as *Pattern; - var bareLast: *Pattern = null as *Pattern; + var head: *Pattern = null as *Pattern; + var tail: *Pattern = null as *Pattern; while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { - let argPat: *Pattern = parserParsePattern(p); - if bareArgs == null as *Pattern { - bareArgs = argPat; - bareLast = argPat; + let elem: *Pattern = parserParsePattern(p); + if head == null as *Pattern { + head = elem; + tail = elem; } else { - bareLast.patNext = argPat; - bareLast = argPat; + tail.patNext = elem; + tail = elem; } if parserCheck(p, tkComma) { discard parserAdvance(p); } else { break; } } - discard parserExpect(p, tkRParen, "expected ')' to close pattern"); - let pat: *Pattern = parserMakePattern(pkEnum, line, col); - pat.patEnumPath = name; - pat.patArgs = bareArgs; + discard parserExpect(p, tkRParen, "expected ')' to close tuple pattern"); + let tpat: *Pattern = parserMakePattern(pkTuple, line, col); + tpat.patArgs = head; + return tpat; + } + + parserEmitDiag(p, line, col, "expected pattern"); + return parserMakePattern(pkWildcard, line, col); + } + + func parserParsePattern(p: *Parser) -> *Pattern { + let locTok: LexToken = parserCurToken(p); + let line: uint32 = locTok.line; + let col: uint32 = locTok.column; + let left: *Pattern = parserParsePrimaryPattern(p); + // Range pattern: lo..hi or lo..=hi + if parserCheck(p, tkDotDot) || parserCheck(p, tkDotDotEqual) { + let inclusive: bool = parserCheck(p, tkDotDotEqual); + discard parserAdvance(p); + let right: *Pattern = parserParsePrimaryPattern(p); + let pat: *Pattern = parserMakePattern(pkRange, line, col); + pat.patRangeInclusive = inclusive; + pat.patChild1 = left; + pat.patChild2 = right; + // Range can still take a guard: `1..10 if x % 2 == 0` + if parserCheck(p, tkIf) { + discard parserAdvance(p); + let guard: *Expr = parserParseExpr(p); + let gpat: *Pattern = parserMakePattern(pkGuarded, line, col); + gpat.patChild1 = pat; + gpat.patGuardExpr = guard; + return gpat; + } return pat; } - // Ident binding / catch-all name - let pat: *Pattern = parserMakePattern(pkIdent, line, col); - pat.patIdent = name; - return pat; - } - - // Tuple pattern: (a, b) - if kind == tkLParen { - discard parserAdvance(p); - var head: *Pattern = null as *Pattern; - var tail: *Pattern = null as *Pattern; - while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { - let elem: *Pattern = parserParsePattern(p); - if head == null as *Pattern { - head = elem; - tail = elem; - } else { - tail.patNext = elem; - tail = elem; - } - if parserCheck(p, tkComma) { discard parserAdvance(p); } - else { break; } - } - discard parserExpect(p, tkRParen, "expected ')' to close tuple pattern"); - let tpat: *Pattern = parserMakePattern(pkTuple, line, col); - tpat.patArgs = head; - return tpat; - } - - parserEmitDiag(p, line, col, "expected pattern"); - return parserMakePattern(pkWildcard, line, col); -} - -func parserParsePattern(p: *Parser) -> *Pattern { - let locTok: LexToken = parserCurToken(p); - let line: uint32 = locTok.line; - let col: uint32 = locTok.column; - let left: *Pattern = parserParsePrimaryPattern(p); - // Range pattern: lo..hi or lo..=hi - if parserCheck(p, tkDotDot) || parserCheck(p, tkDotDotEqual) { - let inclusive: bool = parserCheck(p, tkDotDotEqual); - discard parserAdvance(p); - let right: *Pattern = parserParsePrimaryPattern(p); - let pat: *Pattern = parserMakePattern(pkRange, line, col); - pat.patRangeInclusive = inclusive; - pat.patChild1 = left; - pat.patChild2 = right; - // Range can still take a guard: `1..10 if x % 2 == 0` + // Guarded pattern: `p if cond` (bindings from p visible in cond) if parserCheck(p, tkIf) { discard parserAdvance(p); let guard: *Expr = parserParseExpr(p); - let gpat: *Pattern = parserMakePattern(pkGuarded, line, col); - gpat.patChild1 = pat; - gpat.patGuardExpr = guard; - return gpat; + let pat: *Pattern = parserMakePattern(pkGuarded, line, col); + pat.patChild1 = left; + pat.patGuardExpr = guard; + return pat; } - return pat; - } - // Guarded pattern: `p if cond` (bindings from p visible in cond) - if parserCheck(p, tkIf) { - discard parserAdvance(p); - let guard: *Expr = parserParseExpr(p); - let pat: *Pattern = parserMakePattern(pkGuarded, line, col); - pat.patChild1 = left; - pat.patGuardExpr = guard; - return pat; - } - return left; -} - -// match subject { pat => body, ... } -func parserParseMatchExpr(p: *Parser) -> *Expr { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - discard parserAdvance(p); // match - p.structInitAllowed = false; - let subject: *Expr = parserParseExpr(p); - p.structInitAllowed = true; - // Allow newline before '{' (needed for `let x = match n \n { ... }`) - while parserCheck(p, tkNewLine) { discard parserAdvance(p); } - discard parserExpect(p, tkLBrace, "expected '{' to start match body"); - - var firstArm: *MatchArm = null as *MatchArm; - var lastArm: *MatchArm = null as *MatchArm; - var armCount: int = 0; - - while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { - while parserCheck(p, tkNewLine) { discard parserAdvance(p); } - if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { break; } - let armLine: uint32 = parserCurToken(p).line; - let armCol: uint32 = parserCurToken(p).column; - let mp: int = p.pos; - let pat: *Pattern = parserParsePattern(p); - discard parserExpect(p, tkFatArrow, "expected '=>' in match arm"); - let body: *Expr = parserParseExpr(p); - let arm: *MatchArm = bux_alloc(sizeof(MatchArm)) as *MatchArm; - arm.line = armLine; - arm.column = armCol; - arm.pattern = pat; - arm.body = body; - arm.next = null as *MatchArm; - if firstArm == null as *MatchArm { - firstArm = arm; - lastArm = arm; - } else { - lastArm.next = arm; - lastArm = arm; - } - armCount = armCount + 1; - if parserCheck(p, tkComma) { discard parserAdvance(p); } - if p.pos == mp { discard parserAdvance(p); } - } - discard parserExpect(p, tkRBrace, "expected '}' to close match"); - - let e: *Expr = parserMakeExpr(ekMatch, line, col); - e.child1 = subject; - e.matchArms = firstArm; - e.matchArmCount = armCount; - return e; -} - -// --------------------------------------------------------------------------- -// Closure: |params| -> Ret { body } -// --------------------------------------------------------------------------- - -// Zero-param closure when written as `||` (single tkPipePipe token from lexer) -func parserParseEmptyClosure(p: *Parser) -> *Expr { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - discard parserAdvance(p); // || - let e: *Expr = parserMakeExpr(ekClosure, line, col); - let params: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - params.kind = dkFunc; - params.paramCount = 0; - e.closureParams = params; - if parserCheck(p, tkArrow) { - discard parserAdvance(p); - e.refType = parserParseType(p); - } - e.refBlock = parserParseBlock(p); - return e; -} - -func parserParseClosure(p: *Parser) -> *Expr { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - discard parserExpect(p, tkPipe, "expected '|' to start closure params"); - - let e: *Expr = parserMakeExpr(ekClosure, line, col); - let params: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - params.kind = dkFunc; - params.paramCount = 0; - - // Parse params: name: Type - while !parserCheck(p, tkPipe) && parserPeek(p, 0) != tkEndOfFile { - while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { - discard parserAdvance(p); - } - if parserCheck(p, tkPipe) || parserPeek(p, 0) == tkEndOfFile { - break; - } - if params.paramCount >= 9 { break; } - let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected parameter name in closure"); - discard parserExpect(p, tkColon, "expected ':' in closure parameter"); - let ptype: *TypeExpr = parserParseType(p); - - let idx: int = params.paramCount; - if idx == 0 { - params.param0.name = nameTok.text; - params.param0.refParamType = ptype; - } else if idx == 1 { - params.param1.name = nameTok.text; - params.param1.refParamType = ptype; - } else if idx == 2 { - params.param2.name = nameTok.text; - params.param2.refParamType = ptype; - } else if idx == 3 { - params.param3.name = nameTok.text; - params.param3.refParamType = ptype; - } else if idx == 4 { - params.param4.name = nameTok.text; - params.param4.refParamType = ptype; - } else if idx == 5 { - params.param5.name = nameTok.text; - params.param5.refParamType = ptype; - } else if idx == 6 { - params.param6.name = nameTok.text; - params.param6.refParamType = ptype; - } else if idx == 7 { - params.param7.name = nameTok.text; - params.param7.refParamType = ptype; - } else if idx == 8 { - params.param8.name = nameTok.text; - params.param8.refParamType = ptype; - } - params.paramCount = params.paramCount + 1; - if parserMatch(p, tkComma) { continue; } - break; + return left; } - discard parserExpect(p, tkPipe, "expected '|' to close closure params"); - e.closureParams = params; - - // Optional return type: -> Type - if parserMatch(p, tkArrow) { - e.refType = parserParseType(p); - } - - // Body: { ... } - e.refBlock = parserParseBlock(p); - return e; -} - -// --------------------------------------------------------------------------- -// Postfix: call, index, field access, as, is, ? -// --------------------------------------------------------------------------- - -func parserParsePostfixExpr(p: *Parser) -> *Expr { - var left: *Expr = parserParsePrimary(p); - while true { - let kind: int = parserPeek(p, 0); - - // Call: expr(args) - if kind == tkLParen { - discard parserAdvance(p); - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - let e: *Expr = parserMakeExpr(ekCall, line, col); - e.child1 = left; - // Parse all arguments into linked list - var argCount: int = 0; - var firstArg: *ExprList = null as *ExprList; - var lastArg: *ExprList = null as *ExprList; - while !parserCheck(p, tkRParen) { - var argExpr: *Expr = null as *Expr; - var argName: String = ""; - // Named argument: name: value - if parserPeek(p, 0) == tkIdent && parserPeek(p, 1) == tkColon { - let nameTok: LexToken = parserCurToken(p); - argName = nameTok.text; - discard parserAdvance(p); // ident - discard parserAdvance(p); // : - argExpr = parserParseExpr(p); - } else { - argExpr = parserParseExpr(p); - } - let argNode: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; - argNode.expr = argExpr; - argNode.next = null as *ExprList; - argNode.argName = argName; - if firstArg == null as *ExprList { - firstArg = argNode; - lastArg = argNode; - } else { - lastArg.next = argNode; - lastArg = argNode; - } - argCount = argCount + 1; - if !parserMatch(p, tkComma) { break; } - } - e.callArgs = firstArg; - e.callArgCount = argCount; - discard parserExpect(p, tkRParen, "expected ')'"); - left = e; - continue; - } - - // Generic call: Func(args) or Type { ... } - if kind == tkLt { - if left.kind == ekIdent && parserIsTypeArgListAhead(p) { - discard parserAdvance(p); // < - let ta0: LexToken = parserExpect(p, tkIdent, "expected type argument"); - left.genericCallee = left.strValue; - left.genericTypeArg0 = ta0.text; - left.genericTypeArgCount = 1; - if parserMatch(p, tkComma) { - let ta1: LexToken = parserExpect(p, tkIdent, "expected type argument"); - left.genericTypeArg1 = ta1.text; - left.genericTypeArgCount = 2; - } - discard parserExpect(p, tkGt, "expected '>' to close type arguments"); - // After generic args, continue loop to handle call or struct init - continue; - } - } - - // Index: expr[expr] - if kind == tkLBracket { - discard parserAdvance(p); - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - let e: *Expr = parserMakeExpr(ekIndex, line, col); - e.child1 = left; - e.child2 = parserParseExpr(p); - discard parserExpect(p, tkRBracket, "expected ']'"); - left = e; - continue; - } - - // .await - if kind == tkDot { - if parserPeek(p, 1) == tkAwait { - discard parserAdvance(p); // . - discard parserAdvance(p); // await - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - let e: *Expr = parserMakeExpr(ekAwait, line, col); - e.child1 = left; - left = e; - continue; - } - } - - // Field: expr.name or tuple index expr.0 / expr.1 - if kind == tkDot { - discard parserAdvance(p); - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - if parserCheck(p, tkIntLiteral) { - let idxTok: LexToken = parserCurToken(p); - discard parserAdvance(p); - let e: *Expr = parserMakeExpr(ekField, line, col); - e.child1 = left; - e.strValue = String_Concat("_", idxTok.text); - left = e; - continue; - } - let name: LexToken = parserExpectIdentOrKeyword(p, "expected field name"); - let e: *Expr = parserMakeExpr(ekField, line, col); - e.child1 = left; - e.strValue = name.text; - left = e; - continue; - } - - // Path: expr::name - if kind == tkColonColon { - discard parserAdvance(p); - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - let name: LexToken = parserExpectIdentOrKeyword(p, "expected path segment"); - let e: *Expr = parserMakeExpr(ekField, line, col); - e.child1 = left; - e.strValue = name.text; - left = e; - continue; - } - - // as, is - if kind == tkAs || kind == tkIs { - discard parserAdvance(p); - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - let ek: int = 0; - if kind == tkAs { ek = ekCast; } else { ek = ekIs; } - let e: *Expr = parserMakeExpr(ek, line, col); - e.child1 = left; - e.refType = parserParseType(p); - left = e; - continue; - } - - // ? (try operator) - if kind == tkQuestion { - discard parserAdvance(p); - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - let e: *Expr = parserMakeExpr(ekTry, line, col); - e.child1 = left; - left = e; - continue; - } - - // ! (unwrap operator) - if kind == tkBang { - discard parserAdvance(p); - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - let e: *Expr = parserMakeExpr(ekUnwrap, line, col); - e.child1 = left; - left = e; - continue; - } - - // ++, -- - if kind == tkPlusPlus || kind == tkMinusMinus { - discard parserAdvance(p); - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - let e: *Expr = parserMakeExpr(ekPostfix, line, col); - e.child1 = left; - e.intValue = kind; - left = e; - continue; - } - - // Struct init: TypeName { field: value, ... } - if kind == tkLBrace { - if p.structInitAllowed && left.kind == ekIdent { - discard parserAdvance(p); // consume { - let siLine: uint32 = parserCurToken(p).line; - let siCol: uint32 = parserCurToken(p).column; - let typeName: String = left.strValue; - var fieldCount: int = 0; - var firstField: *Expr = null as *Expr; - var lastField: *Expr = null as *Expr; - while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { - while parserCheck(p, tkNewLine) { discard parserAdvance(p); } - if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { break; } - let sip: int = p.pos; - let fName: LexToken = parserExpectIdentOrKeyword(p, "expected field name"); - discard parserExpect(p, tkColon, "expected ':'"); - let fValue: *Expr = parserParseExpr(p); - let fExpr: *Expr = parserMakeExpr(ekField, fName.line, fName.column); - fExpr.strValue = fName.text; - fExpr.child1 = fValue; - if firstField == null as *Expr { - firstField = fExpr; - lastField = fExpr; - } else { - lastField.child3 = fExpr; - lastField = fExpr; - } - fieldCount = fieldCount + 1; - parserMatch(p, tkComma); - if p.pos == sip { discard parserAdvance(p); } - } - discard parserExpect(p, tkRBrace, "expected '}'"); - let e: *Expr = parserMakeExpr(ekStructInit, siLine, siCol); - e.structName = typeName; - e.structFieldCount = fieldCount; - e.child1 = firstField; - // Propagate generic type args from the identifier - e.genericTypeArg0 = left.genericTypeArg0; - e.genericTypeArg1 = left.genericTypeArg1; - e.genericTypeArgCount = left.genericTypeArgCount; - left = e; - continue; - } else { - break; - } - } - - break; - } - return left; -} - -// --------------------------------------------------------------------------- -// Binary expression (precedence climbing) -// All binary operators: arithmetic, comparison, logical, bitwise, assignment -// --------------------------------------------------------------------------- - -func parserPrecedence(op: int) -> int { - // Assignment operators are parsed by parserParseAssign, not here - if op == tkPipePipe { return 2; } - if op == tkAmpAmp { return 3; } - if op == tkPipe { return 4; } - if op == tkCaret { return 5; } - if op == tkAmp { return 6; } - if op == tkEq || op == tkNe { return 7; } - if op == tkLt || op == tkLe || op == tkGt || op == tkGe { return 8; } - if op == tkShl || op == tkShr { return 9; } - if op == tkPlus || op == tkMinus { return 10; } - if op == tkStar || op == tkSlash || op == tkPercent { return 11; } - if op == tkStarStar { return 12; } - return 0; -} - -func parserParseUnary(p: *Parser) -> *Expr { - while parserCheck(p, tkNewLine) { - discard parserAdvance(p); - } - let tok: LexToken = parserCurToken(p); - let line: uint32 = tok.line; - let col: uint32 = tok.column; - let kind: int = tok.kind; - - // -expr, !expr, ~expr, *expr, &expr - if kind == tkMinus || kind == tkBang || kind == tkTilde || kind == tkStar || kind == tkAmp { - discard parserAdvance(p); - let e: *Expr = parserMakeExpr(ekUnary, line, col); - e.intValue = kind; - e.child1 = parserParseUnary(p); - return e; - } - - return parserParsePostfixExpr(p); -} - -func parserParseBinaryPrec(p: *Parser, minPrec: int) -> *Expr { - var left: *Expr = parserParseUnary(p); - while true { - while parserCheck(p, tkNewLine) { - discard parserAdvance(p); - } - let op: int = parserPeek(p, 0); - let prec: int = parserPrecedence(op); - if prec < minPrec { break; } - let opTok: LexToken = parserAdvance(p); - let line: uint32 = opTok.line; - let col: uint32 = opTok.column; - let nextMinPrec: int = prec + 1; - let right: *Expr = parserParseBinaryPrec(p, nextMinPrec); - let e: *Expr = parserMakeExpr(ekBinary, line, col); - e.intValue = opTok.kind; - e.child1 = left; - e.child2 = right; - left = e; - } - return left; -} - -func parserParseBinary(p: *Parser) -> *Expr { - return parserParseBinaryPrec(p, 1); -} - -// --------------------------------------------------------------------------- -// Range: lo .. hi or lo ..= hi -// --------------------------------------------------------------------------- - -func parserParseRange(p: *Parser) -> *Expr { - var left: *Expr = parserParseBinary(p); - if parserCheck(p, tkDotDot) || parserCheck(p, tkDotDotEqual) { - let inclusive: bool = parserCheck(p, tkDotDotEqual); - let opTok: LexToken = parserAdvance(p); - let right: *Expr = parserParseBinary(p); - let e: *Expr = parserMakeExpr(ekRange, opTok.line, opTok.column); - e.child1 = left; - e.child2 = right; - e.boolValue = inclusive; - return e; - } - return left; -} - -// --------------------------------------------------------------------------- -// Ternary: cond ? then : else -// --------------------------------------------------------------------------- - -func parserParseTernary(p: *Parser) -> *Expr { - var left: *Expr = parserParseRange(p); - if parserMatch(p, tkQuestion) { - let thenExpr: *Expr = parserParseExpr(p); - discard parserExpect(p, tkColon, "expected ':' in ternary"); - let elseExpr: *Expr = parserParseExpr(p); - let e: *Expr = parserMakeExpr(ekTernary, left.line, left.column); - e.child1 = left; - e.child2 = thenExpr; - e.child3 = elseExpr; - return e; - } - return left; -} - -// --------------------------------------------------------------------------- -// Assignment: target = value (right-associative) -// --------------------------------------------------------------------------- - -func parserParseAssign(p: *Parser) -> *Expr { - let left: *Expr = parserParseTernary(p); - let op: int = parserPeek(p, 0); - if op == tkAssign || op == tkPlusAssign || op == tkMinusAssign || op == tkStarAssign || op == tkSlashAssign || op == tkPercentAssign || op == tkAmpAssign || op == tkPipeAssign || op == tkCaretAssign || op == tkShlAssign || op == tkShrAssign { - let opTok: LexToken = parserAdvance(p); - let right: *Expr = parserParseAssign(p); - let e: *Expr = parserMakeExpr(ekAssign, opTok.line, opTok.column); - e.intValue = opTok.kind; - e.child1 = left; - e.child2 = right; - return e; - } - return left; -} - -// --------------------------------------------------------------------------- -// Top-level expression -// --------------------------------------------------------------------------- - -func parserParseExpr(p: *Parser) -> *Expr { - return parserParseAssign(p); -} - -// --------------------------------------------------------------------------- -// Statements -// --------------------------------------------------------------------------- - -func parserParseStmt(p: *Parser) -> *Stmt { - let tok: LexToken = parserCurToken(p); - let line: uint32 = tok.line; - let col: uint32 = tok.column; - let kind: int = tok.kind; - - // let / var - if kind == tkLet || kind == tkVar { - let isVar: bool = (kind == tkVar); - discard parserAdvance(p); - let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected variable name"); - var typeExpr: *TypeExpr = null as *TypeExpr; - if parserMatch(p, tkColon) { - typeExpr = parserParseType(p); - } - var init: *Expr = null as *Expr; - if parserMatch(p, tkAssign) { - init = parserParseExpr(p); - } else if !isVar { - discard parserExpect(p, tkAssign, "expected '=' in let statement"); - init = parserParseExpr(p); - } - parserMatch(p, tkSemicolon); // optional ; - - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skLet; - s.line = line; - s.column = col; - s.strValue = nameTok.text; - s.boolValue = isVar; - s.child1 = init; - s.refStmtType = typeExpr; - return s; - } - - // discard expr - if kind == tkDiscard { - discard parserAdvance(p); - var val: *Expr = null as *Expr; - if !parserCheck(p, tkSemicolon) && !parserCheck(p, tkRBrace) && !parserCheck(p, tkNewLine) { - val = parserParseExpr(p); - } - parserMatch(p, tkSemicolon); - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skExpr; - s.line = line; - s.column = col; - s.child1 = val; - return s; - } - - // defer expr - if kind == tkDefer { - discard parserAdvance(p); - let val: *Expr = parserParseExpr(p); - parserMatch(p, tkSemicolon); - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skDefer; - s.line = line; - s.column = col; - s.child1 = val; - return s; - } - - // if - if kind == tkIf { - discard parserAdvance(p); - p.structInitAllowed = false; - let cond: *Expr = parserParseExpr(p); - p.structInitAllowed = true; - let thenBlock: *Block = parserParseBlock(p); - var elseBlock: *Block = null as *Block; - while parserCheck(p, tkNewLine) { - discard parserAdvance(p); - } - if parserMatch(p, tkElse) { - if parserCheck(p, tkIf) { - // else if → parse the if statement, wrap in a synthetic block - let innerIf: *Stmt = parserParseStmt(p); - elseBlock = bux_alloc(sizeof(Block)) as *Block; - elseBlock.line = innerIf.line; - elseBlock.column = innerIf.column; - elseBlock.stmtCount = 1; - elseBlock.firstStmt = innerIf; - elseBlock.lastStmt = innerIf; - innerIf.nextStmt = null as *Stmt; - } else { - elseBlock = parserParseBlock(p); - } - } - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skIf; - s.line = line; - s.column = col; - s.child1 = cond; - s.refStmtBlock = thenBlock; - s.refStmtElse = elseBlock; - return s; - } - - // while - if kind == tkWhile { - discard parserAdvance(p); - p.structInitAllowed = false; - let cond: *Expr = parserParseExpr(p); - p.structInitAllowed = true; - let body: *Block = parserParseBlock(p); - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skWhile; - s.line = line; - s.column = col; - s.child1 = cond; - s.refStmtBlock = body; - return s; - } - - // loop - if kind == tkLoop { - discard parserAdvance(p); - let body: *Block = parserParseBlock(p); - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skLoop; - s.line = line; - s.column = col; - s.refStmtBlock = body; - return s; - } - - // for - if kind == tkFor { - discard parserAdvance(p); - let varName: LexToken = parserExpect(p, tkIdent, "expected loop variable"); - discard parserExpect(p, tkIn, "expected 'in'"); - p.structInitAllowed = false; - let iter: *Expr = parserParseExpr(p); - p.structInitAllowed = true; - let body: *Block = parserParseBlock(p); - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skFor; - s.line = line; - s.column = col; - s.strValue = varName.text; - s.child1 = iter; - s.refStmtBlock = body; - return s; - } - - // return - if kind == tkReturn { - discard parserAdvance(p); - var value: *Expr = null as *Expr; - if !parserCheck(p, tkSemicolon) && !parserCheck(p, tkNewLine) && !parserCheck(p, tkRBrace) { - value = parserParseExpr(p); - } - parserMatch(p, tkSemicolon); - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skReturn; - s.line = line; - s.column = col; - s.child1 = value; - return s; - } - - // break / continue - if kind == tkBreak || kind == tkContinue { - let sk: int = 0; - if kind == tkBreak { sk = skBreak; } else { sk = skContinue; } - discard parserAdvance(p); - parserMatch(p, tkSemicolon); - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = sk; - s.line = line; - s.column = col; - return s; - } - - // match — expression statement (arms fully parsed) - if kind == tkMatch { - let matchExpr: *Expr = parserParseMatchExpr(p); - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skExpr; - s.line = line; - s.column = col; - s.child1 = matchExpr; - return s; - } - - // switch - if kind == tkSwitch { - discard parserAdvance(p); + // match subject { pat => body, ... } + func parserParseMatchExpr(p: *Parser) -> *Expr { + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + discard parserAdvance(p); // match p.structInitAllowed = false; let subject: *Expr = parserParseExpr(p); p.structInitAllowed = true; + // Allow newline before '{' (needed for `let x = match n \n { ... }`) while parserCheck(p, tkNewLine) { discard parserAdvance(p); } - discard parserExpect(p, tkLBrace, "expected '{' to start switch body"); - var caseBlock: *Block = bux_alloc(sizeof(Block)) as *Block; - caseBlock.line = line; - caseBlock.column = col; - caseBlock.stmtCount = 0; - caseBlock.firstStmt = null as *Stmt; - caseBlock.lastStmt = null as *Stmt; - var defaultBody: *Block = null as *Block; + discard parserExpect(p, tkLBrace, "expected '{' to start match body"); + + var firstArm: *MatchArm = null as *MatchArm; + var lastArm: *MatchArm = null as *MatchArm; + var armCount: int = 0; + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { while parserCheck(p, tkNewLine) { discard parserAdvance(p); } if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { break; } - if parserCheck(p, tkDefault) { - discard parserAdvance(p); - discard parserExpect(p, tkColon, "expected ':' after default"); - let defaultStmt: *Stmt = parserParseStmt(p); - defaultBody = bux_alloc(sizeof(Block)) as *Block; - defaultBody.line = defaultStmt.line; - defaultBody.column = defaultStmt.column; - defaultBody.stmtCount = 1; - defaultBody.firstStmt = defaultStmt; - defaultBody.lastStmt = defaultStmt; - defaultStmt.nextStmt = null as *Stmt; - continue; + let armLine: uint32 = parserCurToken(p).line; + let armCol: uint32 = parserCurToken(p).column; + let mp: int = p.pos; + let pat: *Pattern = parserParsePattern(p); + discard parserExpect(p, tkFatArrow, "expected '=>' in match arm"); + let body: *Expr = parserParseExpr(p); + let arm: *MatchArm = bux_alloc(sizeof(MatchArm)) as *MatchArm; + arm.line = armLine; + arm.column = armCol; + arm.pattern = pat; + arm.body = body; + arm.next = null as *MatchArm; + if firstArm == null as *MatchArm { + firstArm = arm; + lastArm = arm; + } else { + lastArm.next = arm; + lastArm = arm; } - if parserCheck(p, tkCase) { + armCount = armCount + 1; + if parserCheck(p, tkComma) { discard parserAdvance(p); } + if p.pos == mp { discard parserAdvance(p); } + } + discard parserExpect(p, tkRBrace, "expected '}' to close match"); + + let e: *Expr = parserMakeExpr(ekMatch, line, col); + e.child1 = subject; + e.matchArms = firstArm; + e.matchArmCount = armCount; + return e; + } + + // --------------------------------------------------------------------------- + // Closure: |params| -> Ret { body } + // --------------------------------------------------------------------------- + + // Zero-param closure when written as `||` (single tkPipePipe token from lexer) + func parserParseEmptyClosure(p: *Parser) -> *Expr { + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + discard parserAdvance(p); // || + let e: *Expr = parserMakeExpr(ekClosure, line, col); + let params: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + params.kind = dkFunc; + params.paramCount = 0; + e.closureParams = params; + if parserCheck(p, tkArrow) { + discard parserAdvance(p); + e.refType = parserParseType(p); + } + e.refBlock = parserParseBlock(p); + return e; + } + + func parserParseClosure(p: *Parser) -> *Expr { + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + discard parserExpect(p, tkPipe, "expected '|' to start closure params"); + + let e: *Expr = parserMakeExpr(ekClosure, line, col); + let params: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + params.kind = dkFunc; + params.paramCount = 0; + + // Parse params: name: Type + while !parserCheck(p, tkPipe) && parserPeek(p, 0) != tkEndOfFile { + while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { discard parserAdvance(p); - let caseVal: *Expr = parserParseExpr(p); - discard parserExpect(p, tkColon, "expected ':' after case value"); - let caseStmt: *Stmt = parserParseStmt(p); - let caseBody: *Block = bux_alloc(sizeof(Block)) as *Block; - caseBody.line = caseStmt.line; - caseBody.column = caseStmt.column; - caseBody.stmtCount = 1; - caseBody.firstStmt = caseStmt; - caseBody.lastStmt = caseStmt; - caseStmt.nextStmt = null as *Stmt; - let c: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - c.kind = skExpr; - c.line = caseVal.line; - c.column = caseVal.column; - c.child1 = caseVal; - c.refStmtBlock = caseBody; - c.nextStmt = null as *Stmt; - if caseBlock.firstStmt == null as *Stmt { - caseBlock.firstStmt = c; - caseBlock.lastStmt = c; - } else { - caseBlock.lastStmt.nextStmt = c; - caseBlock.lastStmt = c; + } + if parserCheck(p, tkPipe) || parserPeek(p, 0) == tkEndOfFile { + break; + } + if params.paramCount >= 9 { break; } + let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected parameter name in closure"); + discard parserExpect(p, tkColon, "expected ':' in closure parameter"); + let ptype: *TypeExpr = parserParseType(p); + + let idx: int = params.paramCount; + if idx == 0 { + params.param0.name = nameTok.text; + params.param0.refParamType = ptype; + } else if idx == 1 { + params.param1.name = nameTok.text; + params.param1.refParamType = ptype; + } else if idx == 2 { + params.param2.name = nameTok.text; + params.param2.refParamType = ptype; + } else if idx == 3 { + params.param3.name = nameTok.text; + params.param3.refParamType = ptype; + } else if idx == 4 { + params.param4.name = nameTok.text; + params.param4.refParamType = ptype; + } else if idx == 5 { + params.param5.name = nameTok.text; + params.param5.refParamType = ptype; + } else if idx == 6 { + params.param6.name = nameTok.text; + params.param6.refParamType = ptype; + } else if idx == 7 { + params.param7.name = nameTok.text; + params.param7.refParamType = ptype; + } else if idx == 8 { + params.param8.name = nameTok.text; + params.param8.refParamType = ptype; + } + params.paramCount = params.paramCount + 1; + if parserMatch(p, tkComma) { continue; } + break; + } + + discard parserExpect(p, tkPipe, "expected '|' to close closure params"); + e.closureParams = params; + + // Optional return type: -> Type + if parserMatch(p, tkArrow) { + e.refType = parserParseType(p); + } + + // Body: { ... } + e.refBlock = parserParseBlock(p); + return e; + } + + // --------------------------------------------------------------------------- + // Postfix: call, index, field access, as, is, ? + // --------------------------------------------------------------------------- + + func parserParsePostfixExpr(p: *Parser) -> *Expr { + var left: *Expr = parserParsePrimary(p); + while true { + let kind: int = parserPeek(p, 0); + + // Call: expr(args) + if kind == tkLParen { + discard parserAdvance(p); + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let e: *Expr = parserMakeExpr(ekCall, line, col); + e.child1 = left; + // Parse all arguments into linked list + var argCount: int = 0; + var firstArg: *ExprList = null as *ExprList; + var lastArg: *ExprList = null as *ExprList; + while !parserCheck(p, tkRParen) { + var argExpr: *Expr = null as *Expr; + var argName: String = ""; + // Named argument: name: value + if parserPeek(p, 0) == tkIdent && parserPeek(p, 1) == tkColon { + let nameTok: LexToken = parserCurToken(p); + argName = nameTok.text; + discard parserAdvance(p); // ident + discard parserAdvance(p); // : + argExpr = parserParseExpr(p); + } else { + argExpr = parserParseExpr(p); + } + let argNode: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; + argNode.expr = argExpr; + argNode.next = null as *ExprList; + argNode.argName = argName; + if firstArg == null as *ExprList { + firstArg = argNode; + lastArg = argNode; + } else { + lastArg.next = argNode; + lastArg = argNode; + } + argCount = argCount + 1; + if !parserMatch(p, tkComma) { break; } } - caseBlock.stmtCount = caseBlock.stmtCount + 1; + e.callArgs = firstArg; + e.callArgCount = argCount; + discard parserExpect(p, tkRParen, "expected ')'"); + left = e; continue; } + + // Generic call: Func(args) or Type { ... } + if kind == tkLt { + if left.kind == ekIdent && parserIsTypeArgListAhead(p) { + discard parserAdvance(p); // < + let ta0: LexToken = parserExpect(p, tkIdent, "expected type argument"); + left.genericCallee = left.strValue; + left.genericTypeArg0 = ta0.text; + left.genericTypeArgCount = 1; + if parserMatch(p, tkComma) { + let ta1: LexToken = parserExpect(p, tkIdent, "expected type argument"); + left.genericTypeArg1 = ta1.text; + left.genericTypeArgCount = 2; + } + discard parserExpect(p, tkGt, "expected '>' to close type arguments"); + // After generic args, continue loop to handle call or struct init + continue; + } + } + + // Index: expr[expr] + if kind == tkLBracket { + discard parserAdvance(p); + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let e: *Expr = parserMakeExpr(ekIndex, line, col); + e.child1 = left; + e.child2 = parserParseExpr(p); + discard parserExpect(p, tkRBracket, "expected ']'"); + left = e; + continue; + } + + // .await + if kind == tkDot { + if parserPeek(p, 1) == tkAwait { + discard parserAdvance(p); // . + discard parserAdvance(p); // await + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let e: *Expr = parserMakeExpr(ekAwait, line, col); + e.child1 = left; + left = e; + continue; + } + } + + // Field: expr.name or tuple index expr.0 / expr.1 + if kind == tkDot { + discard parserAdvance(p); + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + if parserCheck(p, tkIntLiteral) { + let idxTok: LexToken = parserCurToken(p); + discard parserAdvance(p); + let e: *Expr = parserMakeExpr(ekField, line, col); + e.child1 = left; + e.strValue = String_Concat("_", idxTok.text); + left = e; + continue; + } + let name: LexToken = parserExpectIdentOrKeyword(p, "expected field name"); + let e: *Expr = parserMakeExpr(ekField, line, col); + e.child1 = left; + e.strValue = name.text; + left = e; + continue; + } + + // Path: expr::name + if kind == tkColonColon { + discard parserAdvance(p); + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let name: LexToken = parserExpectIdentOrKeyword(p, "expected path segment"); + let e: *Expr = parserMakeExpr(ekField, line, col); + e.child1 = left; + e.strValue = name.text; + left = e; + continue; + } + + // as, is + if kind == tkAs || kind == tkIs { + discard parserAdvance(p); + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let ek: int = 0; + if kind == tkAs { ek = ekCast; } else { ek = ekIs; } + let e: *Expr = parserMakeExpr(ek, line, col); + e.child1 = left; + e.refType = parserParseType(p); + left = e; + continue; + } + + // ? (try operator) + if kind == tkQuestion { + discard parserAdvance(p); + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let e: *Expr = parserMakeExpr(ekTry, line, col); + e.child1 = left; + left = e; + continue; + } + + // ! (unwrap operator) + if kind == tkBang { + discard parserAdvance(p); + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let e: *Expr = parserMakeExpr(ekUnwrap, line, col); + e.child1 = left; + left = e; + continue; + } + + // ++, -- + if kind == tkPlusPlus || kind == tkMinusMinus { + discard parserAdvance(p); + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let e: *Expr = parserMakeExpr(ekPostfix, line, col); + e.child1 = left; + e.intValue = kind; + left = e; + continue; + } + + // Struct init: TypeName { field: value, ... } + if kind == tkLBrace { + if p.structInitAllowed && left.kind == ekIdent { + discard parserAdvance(p); // consume { + let siLine: uint32 = parserCurToken(p).line; + let siCol: uint32 = parserCurToken(p).column; + let typeName: String = left.strValue; + var fieldCount: int = 0; + var firstField: *Expr = null as *Expr; + var lastField: *Expr = null as *Expr; + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { + while parserCheck(p, tkNewLine) { discard parserAdvance(p); } + if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { break; } + let sip: int = p.pos; + let fName: LexToken = parserExpectIdentOrKeyword(p, "expected field name"); + discard parserExpect(p, tkColon, "expected ':'"); + let fValue: *Expr = parserParseExpr(p); + let fExpr: *Expr = parserMakeExpr(ekField, fName.line, fName.column); + fExpr.strValue = fName.text; + fExpr.child1 = fValue; + if firstField == null as *Expr { + firstField = fExpr; + lastField = fExpr; + } else { + lastField.child3 = fExpr; + lastField = fExpr; + } + fieldCount = fieldCount + 1; + parserMatch(p, tkComma); + if p.pos == sip { discard parserAdvance(p); } + } + discard parserExpect(p, tkRBrace, "expected '}'"); + let e: *Expr = parserMakeExpr(ekStructInit, siLine, siCol); + e.structName = typeName; + e.structFieldCount = fieldCount; + e.child1 = firstField; + // Propagate generic type args from the identifier + e.genericTypeArg0 = left.genericTypeArg0; + e.genericTypeArg1 = left.genericTypeArg1; + e.genericTypeArgCount = left.genericTypeArgCount; + left = e; + continue; + } else { + break; + } + } + + break; + } + return left; + } + + // --------------------------------------------------------------------------- + // Binary expression (precedence climbing) + // All binary operators: arithmetic, comparison, logical, bitwise, assignment + // --------------------------------------------------------------------------- + + func parserPrecedence(op: int) -> int { + // Assignment operators are parsed by parserParseAssign, not here + if op == tkPipePipe { return 2; } + if op == tkAmpAmp { return 3; } + if op == tkPipe { return 4; } + if op == tkCaret { return 5; } + if op == tkAmp { return 6; } + if op == tkEq || op == tkNe { return 7; } + if op == tkLt || op == tkLe || op == tkGt || op == tkGe { return 8; } + if op == tkShl || op == tkShr { return 9; } + if op == tkPlus || op == tkMinus { return 10; } + if op == tkStar || op == tkSlash || op == tkPercent { return 11; } + if op == tkStarStar { return 12; } + return 0; + } + + func parserParseUnary(p: *Parser) -> *Expr { + while parserCheck(p, tkNewLine) { discard parserAdvance(p); } - discard parserExpect(p, tkRBrace, "expected '}' to close switch"); + let tok: LexToken = parserCurToken(p); + let line: uint32 = tok.line; + let col: uint32 = tok.column; + let kind: int = tok.kind; + + // -expr, !expr, ~expr, *expr, &expr + if kind == tkMinus || kind == tkBang || kind == tkTilde || kind == tkStar || kind == tkAmp { + discard parserAdvance(p); + let e: *Expr = parserMakeExpr(ekUnary, line, col); + e.intValue = kind; + e.child1 = parserParseUnary(p); + return e; + } + + return parserParsePostfixExpr(p); + } + + func parserParseBinaryPrec(p: *Parser, minPrec: int) -> *Expr { + var left: *Expr = parserParseUnary(p); + while true { + while parserCheck(p, tkNewLine) { + discard parserAdvance(p); + } + let op: int = parserPeek(p, 0); + let prec: int = parserPrecedence(op); + if prec < minPrec { break; } + let opTok: LexToken = parserAdvance(p); + let line: uint32 = opTok.line; + let col: uint32 = opTok.column; + let nextMinPrec: int = prec + 1; + let right: *Expr = parserParseBinaryPrec(p, nextMinPrec); + let e: *Expr = parserMakeExpr(ekBinary, line, col); + e.intValue = opTok.kind; + e.child1 = left; + e.child2 = right; + left = e; + } + return left; + } + + func parserParseBinary(p: *Parser) -> *Expr { + return parserParseBinaryPrec(p, 1); + } + + // --------------------------------------------------------------------------- + // Range: lo .. hi or lo ..= hi + // --------------------------------------------------------------------------- + + func parserParseRange(p: *Parser) -> *Expr { + var left: *Expr = parserParseBinary(p); + if parserCheck(p, tkDotDot) || parserCheck(p, tkDotDotEqual) { + let inclusive: bool = parserCheck(p, tkDotDotEqual); + let opTok: LexToken = parserAdvance(p); + let right: *Expr = parserParseBinary(p); + let e: *Expr = parserMakeExpr(ekRange, opTok.line, opTok.column); + e.child1 = left; + e.child2 = right; + e.boolValue = inclusive; + return e; + } + return left; + } + + // --------------------------------------------------------------------------- + // Ternary: cond ? then : else + // --------------------------------------------------------------------------- + + func parserParseTernary(p: *Parser) -> *Expr { + var left: *Expr = parserParseRange(p); + if parserMatch(p, tkQuestion) { + let thenExpr: *Expr = parserParseExpr(p); + discard parserExpect(p, tkColon, "expected ':' in ternary"); + let elseExpr: *Expr = parserParseExpr(p); + let e: *Expr = parserMakeExpr(ekTernary, left.line, left.column); + e.child1 = left; + e.child2 = thenExpr; + e.child3 = elseExpr; + return e; + } + return left; + } + + // --------------------------------------------------------------------------- + // Assignment: target = value (right-associative) + // --------------------------------------------------------------------------- + + func parserParseAssign(p: *Parser) -> *Expr { + let left: *Expr = parserParseTernary(p); + let op: int = parserPeek(p, 0); + if op == tkAssign || op == tkPlusAssign || op == tkMinusAssign || op == tkStarAssign || op == tkSlashAssign || op == tkPercentAssign || op == tkAmpAssign || op == tkPipeAssign || op == tkCaretAssign || op == tkShlAssign || op == tkShrAssign { + let opTok: LexToken = parserAdvance(p); + let right: *Expr = parserParseAssign(p); + let e: *Expr = parserMakeExpr(ekAssign, opTok.line, opTok.column); + e.intValue = opTok.kind; + e.child1 = left; + e.child2 = right; + return e; + } + return left; + } + + // --------------------------------------------------------------------------- + // Top-level expression + // --------------------------------------------------------------------------- + + func parserParseExpr(p: *Parser) -> *Expr { + return parserParseAssign(p); + } + + // --------------------------------------------------------------------------- + // Statements + // --------------------------------------------------------------------------- + + func parserParseStmt(p: *Parser) -> *Stmt { + let tok: LexToken = parserCurToken(p); + let line: uint32 = tok.line; + let col: uint32 = tok.column; + let kind: int = tok.kind; + + // let / var + if kind == tkLet || kind == tkVar { + let isVar: bool = (kind == tkVar); + discard parserAdvance(p); + let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected variable name"); + var typeExpr: *TypeExpr = null as *TypeExpr; + if parserMatch(p, tkColon) { + typeExpr = parserParseType(p); + } + var init: *Expr = null as *Expr; + if parserMatch(p, tkAssign) { + init = parserParseExpr(p); + } else if !isVar { + discard parserExpect(p, tkAssign, "expected '=' in let statement"); + init = parserParseExpr(p); + } + parserMatch(p, tkSemicolon); // optional ; + + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skLet; + s.line = line; + s.column = col; + s.strValue = nameTok.text; + s.boolValue = isVar; + s.child1 = init; + s.refStmtType = typeExpr; + return s; + } + + // discard expr + if kind == tkDiscard { + discard parserAdvance(p); + var val: *Expr = null as *Expr; + if !parserCheck(p, tkSemicolon) && !parserCheck(p, tkRBrace) && !parserCheck(p, tkNewLine) { + val = parserParseExpr(p); + } + parserMatch(p, tkSemicolon); + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skExpr; + s.line = line; + s.column = col; + s.child1 = val; + return s; + } + + // defer expr + if kind == tkDefer { + discard parserAdvance(p); + let val: *Expr = parserParseExpr(p); + parserMatch(p, tkSemicolon); + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skDefer; + s.line = line; + s.column = col; + s.child1 = val; + return s; + } + + // if + if kind == tkIf { + discard parserAdvance(p); + p.structInitAllowed = false; + let cond: *Expr = parserParseExpr(p); + p.structInitAllowed = true; + let thenBlock: *Block = parserParseBlock(p); + var elseBlock: *Block = null as *Block; + while parserCheck(p, tkNewLine) { + discard parserAdvance(p); + } + if parserMatch(p, tkElse) { + if parserCheck(p, tkIf) { + // else if → parse the if statement, wrap in a synthetic block + let innerIf: *Stmt = parserParseStmt(p); + elseBlock = bux_alloc(sizeof(Block)) as *Block; + elseBlock.line = innerIf.line; + elseBlock.column = innerIf.column; + elseBlock.stmtCount = 1; + elseBlock.firstStmt = innerIf; + elseBlock.lastStmt = innerIf; + innerIf.nextStmt = null as *Stmt; + } else { + elseBlock = parserParseBlock(p); + } + } + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skIf; + s.line = line; + s.column = col; + s.child1 = cond; + s.refStmtBlock = thenBlock; + s.refStmtElse = elseBlock; + return s; + } + + // while + if kind == tkWhile { + discard parserAdvance(p); + p.structInitAllowed = false; + let cond: *Expr = parserParseExpr(p); + p.structInitAllowed = true; + let body: *Block = parserParseBlock(p); + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skWhile; + s.line = line; + s.column = col; + s.child1 = cond; + s.refStmtBlock = body; + return s; + } + + // loop + if kind == tkLoop { + discard parserAdvance(p); + let body: *Block = parserParseBlock(p); + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skLoop; + s.line = line; + s.column = col; + s.refStmtBlock = body; + return s; + } + + // for + if kind == tkFor { + discard parserAdvance(p); + let varName: LexToken = parserExpect(p, tkIdent, "expected loop variable"); + discard parserExpect(p, tkIn, "expected 'in'"); + p.structInitAllowed = false; + let iter: *Expr = parserParseExpr(p); + p.structInitAllowed = true; + let body: *Block = parserParseBlock(p); + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skFor; + s.line = line; + s.column = col; + s.strValue = varName.text; + s.child1 = iter; + s.refStmtBlock = body; + return s; + } + + // return + if kind == tkReturn { + discard parserAdvance(p); + var value: *Expr = null as *Expr; + if !parserCheck(p, tkSemicolon) && !parserCheck(p, tkNewLine) && !parserCheck(p, tkRBrace) { + value = parserParseExpr(p); + } + parserMatch(p, tkSemicolon); + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skReturn; + s.line = line; + s.column = col; + s.child1 = value; + return s; + } + + // break / continue + if kind == tkBreak || kind == tkContinue { + let sk: int = 0; + if kind == tkBreak { sk = skBreak; } else { sk = skContinue; } + discard parserAdvance(p); + parserMatch(p, tkSemicolon); + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = sk; + s.line = line; + s.column = col; + return s; + } + + // match — expression statement (arms fully parsed) + if kind == tkMatch { + let matchExpr: *Expr = parserParseMatchExpr(p); + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skExpr; + s.line = line; + s.column = col; + s.child1 = matchExpr; + return s; + } + + // switch + if kind == tkSwitch { + discard parserAdvance(p); + p.structInitAllowed = false; + let subject: *Expr = parserParseExpr(p); + p.structInitAllowed = true; + while parserCheck(p, tkNewLine) { discard parserAdvance(p); } + discard parserExpect(p, tkLBrace, "expected '{' to start switch body"); + var caseBlock: *Block = bux_alloc(sizeof(Block)) as *Block; + caseBlock.line = line; + caseBlock.column = col; + caseBlock.stmtCount = 0; + caseBlock.firstStmt = null as *Stmt; + caseBlock.lastStmt = null as *Stmt; + var defaultBody: *Block = null as *Block; + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { + while parserCheck(p, tkNewLine) { discard parserAdvance(p); } + if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { break; } + if parserCheck(p, tkDefault) { + discard parserAdvance(p); + discard parserExpect(p, tkColon, "expected ':' after default"); + let defaultStmt: *Stmt = parserParseStmt(p); + defaultBody = bux_alloc(sizeof(Block)) as *Block; + defaultBody.line = defaultStmt.line; + defaultBody.column = defaultStmt.column; + defaultBody.stmtCount = 1; + defaultBody.firstStmt = defaultStmt; + defaultBody.lastStmt = defaultStmt; + defaultStmt.nextStmt = null as *Stmt; + continue; + } + if parserCheck(p, tkCase) { + discard parserAdvance(p); + let caseVal: *Expr = parserParseExpr(p); + discard parserExpect(p, tkColon, "expected ':' after case value"); + let caseStmt: *Stmt = parserParseStmt(p); + let caseBody: *Block = bux_alloc(sizeof(Block)) as *Block; + caseBody.line = caseStmt.line; + caseBody.column = caseStmt.column; + caseBody.stmtCount = 1; + caseBody.firstStmt = caseStmt; + caseBody.lastStmt = caseStmt; + caseStmt.nextStmt = null as *Stmt; + let c: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + c.kind = skExpr; + c.line = caseVal.line; + c.column = caseVal.column; + c.child1 = caseVal; + c.refStmtBlock = caseBody; + c.nextStmt = null as *Stmt; + if caseBlock.firstStmt == null as *Stmt { + caseBlock.firstStmt = c; + caseBlock.lastStmt = c; + } else { + caseBlock.lastStmt.nextStmt = c; + caseBlock.lastStmt = c; + } + caseBlock.stmtCount = caseBlock.stmtCount + 1; + continue; + } + discard parserAdvance(p); + } + discard parserExpect(p, tkRBrace, "expected '}' to close switch"); + let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; + s.kind = skSwitch; + s.line = line; + s.column = col; + s.child1 = subject; + s.refStmtBlock = caseBlock; + s.refStmtElse = defaultBody; + return s; + } + + // Expression statement + if kind == tkNewLine || kind == tkSemicolon { + discard parserAdvance(p); + return null as *Stmt; + } + + let expr: *Expr = parserParseExpr(p); + parserMatch(p, tkSemicolon); let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skSwitch; + s.kind = skExpr; s.line = line; s.column = col; - s.child1 = subject; - s.refStmtBlock = caseBlock; - s.refStmtElse = defaultBody; + s.child1 = expr; return s; } - // Expression statement - if kind == tkNewLine || kind == tkSemicolon { - discard parserAdvance(p); - return null as *Stmt; - } + // --------------------------------------------------------------------------- + // Block: { stmt* } + // --------------------------------------------------------------------------- - let expr: *Expr = parserParseExpr(p); - parserMatch(p, tkSemicolon); - let s: *Stmt = bux_alloc(sizeof(Stmt)) as *Stmt; - s.kind = skExpr; - s.line = line; - s.column = col; - s.child1 = expr; - return s; -} + func parserParseBlock(p: *Parser) -> *Block { + discard parserExpect(p, tkLBrace, "expected '{'"); + let b: *Block = bux_alloc(sizeof(Block)) as *Block; + b.line = parserCurToken(p).line; + b.column = parserCurToken(p).column; + b.stmtCount = 0; + b.firstStmt = null as *Stmt; + b.lastStmt = null as *Stmt; -// --------------------------------------------------------------------------- -// Block: { stmt* } -// --------------------------------------------------------------------------- - -func parserParseBlock(p: *Parser) -> *Block { - discard parserExpect(p, tkLBrace, "expected '{'"); - let b: *Block = bux_alloc(sizeof(Block)) as *Block; - b.line = parserCurToken(p).line; - b.column = parserCurToken(p).column; - b.stmtCount = 0; - b.firstStmt = null as *Stmt; - b.lastStmt = null as *Stmt; - - // Build AST with parserParseStmt (may not consume all tokens) - var blockPos: int = p.pos; - while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { - while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { + // Build AST with parserParseStmt (may not consume all tokens) + var blockPos: int = p.pos; + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { + while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { + discard parserAdvance(p); + } + if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { + break; + } + let beforePos: int = p.pos; + let s: *Stmt = parserParseStmt(p); + if p.pos == beforePos { + discard parserAdvance(p); + continue; + } + if s != null as *Stmt { + s.nextStmt = null as *Stmt; + if b.firstStmt == null as *Stmt { + b.firstStmt = s; + b.lastStmt = s; + } else { + b.lastStmt.nextStmt = s; + b.lastStmt = s; + } + b.stmtCount = b.stmtCount + 1; + } + } + // Reliable token consumption: reset to after { and use depth counter + p.pos = blockPos; + var depth: int = 1; + while depth > 0 && parserPeek(p, 0) != tkEndOfFile { + if parserCheck(p, tkLBrace) { depth = depth + 1; } + else if parserCheck(p, tkRBrace) { depth = depth - 1; } discard parserAdvance(p); } - if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { + return b; + } + + // --------------------------------------------------------------------------- + // Function parameters + // --------------------------------------------------------------------------- + + func parserParseParamList(p: *Parser) -> *Decl { + let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + d.kind = dkFunc; + d.paramCount = 0; + + discard parserExpect(p, tkLParen, "expected '('"); + while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { + while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { + discard parserAdvance(p); + } + if parserCheck(p, tkRParen) || parserPeek(p, 0) == tkEndOfFile { + break; + } + if d.paramCount >= 9 { break; } + let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected parameter name"); + discard parserExpect(p, tkColon, "expected ':' in parameter"); + let ptype: *TypeExpr = parserParseType(p); + var defExpr: *Expr = null as *Expr; + if parserMatch(p, tkAssign) { + defExpr = parserParseExpr(p); + } + + if d.paramCount == 0 { + d.param0.name = nameTok.text; + d.param0.refParamType = ptype; + d.param0.defaultExpr = defExpr; + } else if d.paramCount == 1 { + d.param1.name = nameTok.text; + d.param1.refParamType = ptype; + d.param1.defaultExpr = defExpr; + } else if d.paramCount == 2 { + d.param2.name = nameTok.text; + d.param2.refParamType = ptype; + d.param2.defaultExpr = defExpr; + } else if d.paramCount == 3 { + d.param3.name = nameTok.text; + d.param3.refParamType = ptype; + d.param3.defaultExpr = defExpr; + } else if d.paramCount == 4 { + d.param4.name = nameTok.text; + d.param4.refParamType = ptype; + d.param4.defaultExpr = defExpr; + } else if d.paramCount == 5 { + d.param5.name = nameTok.text; + d.param5.refParamType = ptype; + d.param5.defaultExpr = defExpr; + } else if d.paramCount == 6 { + d.param6.name = nameTok.text; + d.param6.refParamType = ptype; + d.param6.defaultExpr = defExpr; + } else if d.paramCount == 7 { + d.param7.name = nameTok.text; + d.param7.refParamType = ptype; + d.param7.defaultExpr = defExpr; + } else if d.paramCount == 8 { + d.param8.name = nameTok.text; + d.param8.refParamType = ptype; + d.param8.defaultExpr = defExpr; + } + d.paramCount = d.paramCount + 1; + + if parserMatch(p, tkComma) { continue; } break; } - let beforePos: int = p.pos; - let s: *Stmt = parserParseStmt(p); - if p.pos == beforePos { - discard parserAdvance(p); - continue; - } - if s != null as *Stmt { - s.nextStmt = null as *Stmt; - if b.firstStmt == null as *Stmt { - b.firstStmt = s; - b.lastStmt = s; - } else { - b.lastStmt.nextStmt = s; - b.lastStmt = s; - } - b.stmtCount = b.stmtCount + 1; - } + discard parserExpect(p, tkRParen, "expected ')'"); + return d; } - // Reliable token consumption: reset to after { and use depth counter - p.pos = blockPos; - var depth: int = 1; - while depth > 0 && parserPeek(p, 0) != tkEndOfFile { - if parserCheck(p, tkLBrace) { depth = depth + 1; } - else if parserCheck(p, tkRBrace) { depth = depth - 1; } + + // --------------------------------------------------------------------------- + // Type parameters: + // --------------------------------------------------------------------------- + + func parserParseTypeParams(p: *Parser, d: *Decl) { + // Lifetime params ('a) are accepted and skipped for monomorphization — + // they only annotate &/'a T on parameters/returns (stored in TypeExpr.refLifetime). + if !parserCheck(p, tkLt) { return; } discard parserAdvance(p); - } - return b; -} - -// --------------------------------------------------------------------------- -// Function parameters -// --------------------------------------------------------------------------- - -func parserParseParamList(p: *Parser) -> *Decl { - let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.kind = dkFunc; - d.paramCount = 0; - - discard parserExpect(p, tkLParen, "expected '('"); - while !parserCheck(p, tkRParen) && parserPeek(p, 0) != tkEndOfFile { - while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { - discard parserAdvance(p); - } - if parserCheck(p, tkRParen) || parserPeek(p, 0) == tkEndOfFile { - break; - } - if d.paramCount >= 9 { break; } - let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected parameter name"); - discard parserExpect(p, tkColon, "expected ':' in parameter"); - let ptype: *TypeExpr = parserParseType(p); - var defExpr: *Expr = null as *Expr; - if parserMatch(p, tkAssign) { - defExpr = parserParseExpr(p); - } - - if d.paramCount == 0 { - d.param0.name = nameTok.text; - d.param0.refParamType = ptype; - d.param0.defaultExpr = defExpr; - } else if d.paramCount == 1 { - d.param1.name = nameTok.text; - d.param1.refParamType = ptype; - d.param1.defaultExpr = defExpr; - } else if d.paramCount == 2 { - d.param2.name = nameTok.text; - d.param2.refParamType = ptype; - d.param2.defaultExpr = defExpr; - } else if d.paramCount == 3 { - d.param3.name = nameTok.text; - d.param3.refParamType = ptype; - d.param3.defaultExpr = defExpr; - } else if d.paramCount == 4 { - d.param4.name = nameTok.text; - d.param4.refParamType = ptype; - d.param4.defaultExpr = defExpr; - } else if d.paramCount == 5 { - d.param5.name = nameTok.text; - d.param5.refParamType = ptype; - d.param5.defaultExpr = defExpr; - } else if d.paramCount == 6 { - d.param6.name = nameTok.text; - d.param6.refParamType = ptype; - d.param6.defaultExpr = defExpr; - } else if d.paramCount == 7 { - d.param7.name = nameTok.text; - d.param7.refParamType = ptype; - d.param7.defaultExpr = defExpr; - } else if d.paramCount == 8 { - d.param8.name = nameTok.text; - d.param8.refParamType = ptype; - d.param8.defaultExpr = defExpr; - } - d.paramCount = d.paramCount + 1; - - if parserMatch(p, tkComma) { continue; } - break; - } - discard parserExpect(p, tkRParen, "expected ')'"); - return d; -} - -// --------------------------------------------------------------------------- -// Type parameters: -// --------------------------------------------------------------------------- - -func parserParseTypeParams(p: *Parser, d: *Decl) { - if !parserCheck(p, tkLt) { return; } - discard parserAdvance(p); - let tp0: LexToken = parserExpect(p, tkIdent, "expected type param"); - d.typeParam0 = tp0.text; - d.typeParamCount = 1; - if parserMatch(p, tkColon) { - let bound0: LexToken = parserExpect(p, tkIdent, "expected trait bound name"); - d.typeParam0Bound = bound0.text; - } - if parserMatch(p, tkComma) { - let tp1: LexToken = parserExpect(p, tkIdent, "expected type param"); - d.typeParam1 = tp1.text; - d.typeParamCount = 2; - if parserMatch(p, tkColon) { - let bound1: LexToken = parserExpect(p, tkIdent, "expected trait bound name"); - d.typeParam1Bound = bound1.text; - } - } - discard parserExpect(p, tkGt, "expected '>'"); -} - -// --------------------------------------------------------------------------- -// Declarations -// --------------------------------------------------------------------------- - -func parserParseFuncDecl(p: *Parser, isPublic: bool, isExtern: bool, isAsync: bool) -> *Decl { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - discard parserExpect(p, tkFunc, "expected 'func'"); - - let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected function name"); - let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.kind = dkFunc; - d.line = line; - d.column = col; - d.isPublic = isPublic; - d.isAsync = isAsync; - d.strValue = nameTok.text; - - // Type params - parserParseTypeParams(p, d); - - // Params - let params: *Decl = parserParseParamList(p); - d.paramCount = params.paramCount; - d.param0 = params.param0; - d.param1 = params.param1; - d.param2 = params.param2; - d.param3 = params.param3; - d.param4 = params.param4; - d.param5 = params.param5; - d.param6 = params.param6; - d.param7 = params.param7; - d.param8 = params.param8; - - // Return type - if parserMatch(p, tkArrow) { - d.retType = parserParseType(p); - } - - // Body - if !isExtern && parserCheck(p, tkLBrace) { - d.refBody = parserParseBlock(p); - } else { - d.refBody = null as *Block; - } - - return d; -} - -func parserParseStructDecl(p: *Parser, isPublic: bool) -> *Decl { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - discard parserExpect(p, tkStruct, "expected 'struct'"); - let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected struct name"); - - let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.fields = bux_alloc(256 as uint * sizeof(StructField)) as *StructField; - if d.fields == null as *StructField { - PrintLine("ERROR: bux_alloc returned null for fields"); - } - d.kind = dkStruct; - d.line = line; - d.column = col; - d.isPublic = isPublic; - d.strValue = nameTok.text; - var fieldCount: int = 0; - - // Type params - parserParseTypeParams(p, d); - - discard parserExpect(p, tkLBrace, "expected '{'"); - while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { - if fieldCount >= 256 { break; } - if parserCheck(p, tkNewLine) { discard parserAdvance(p); continue; } - if parserCheck(p, tkSemicolon) { discard parserAdvance(p); continue; } - let beforePos: int = p.pos; - let fName: LexToken = parserExpectIdentOrKeyword(p, "expected field name"); - if fieldCount >= 250 && fieldCount <= 256 { - PrintLine(String_Concat("RAW fieldCount=", bux_int_to_str(fieldCount as int64))); - PrintLine(String_Concat("RAW fName=", fName.text)); - PrintLine(String_Concat("RAW pos=", bux_int_to_str(p.pos as int64))); - } - discard parserExpect(p, tkColon, "expected ':' in struct field"); - let fType: *TypeExpr = parserParseType(p); - parserMatch(p, tkSemicolon); - // Infinite-loop safeguard - if p.pos == beforePos { - discard parserAdvance(p); - continue; - } - - d.fields[fieldCount].name = fName.text; - d.fields[fieldCount].refFieldType = fType; - fieldCount = fieldCount + 1; - } - d.fieldCount = fieldCount; - discard parserExpect(p, tkRBrace, "expected '}'"); - return d; -} - -func parserParseEnumDecl(p: *Parser, isPublic: bool) -> *Decl { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - discard parserExpect(p, tkEnum, "expected 'enum'"); - let nameTok: LexToken = parserExpect(p, tkIdent, "expected enum name"); - - let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.kind = dkEnum; - d.line = line; - d.column = col; - d.isPublic = isPublic; - d.strValue = nameTok.text; - - discard parserExpect(p, tkLBrace, "expected '{'"); - while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { - if d.variantCount >= 9 { break; } - if parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { discard parserAdvance(p); continue; } - let vName: LexToken = parserExpect(p, tkIdent, "expected variant name"); - - var v: EnumVariant; - v.name = vName.text; - v.fieldCount = 0; - v.fieldTypeName0 = ""; - v.fieldTypeName1 = ""; - - // Optional payload: (Type, Type) or (Tuple, ...) — full type expressions - if parserMatch(p, tkLParen) { - let te0: *TypeExpr = parserParseType(p); - v.fieldTypeName0 = parserTypeExprCName(te0); - v.fieldCount = 1; - if parserMatch(p, tkComma) { - let te1: *TypeExpr = parserParseType(p); - v.fieldTypeName1 = parserTypeExprCName(te1); - v.fieldCount = 2; - } - discard parserExpect(p, tkRParen, "expected ')'"); - } - - if d.variantCount == 0 { d.variant0 = v; } - else if d.variantCount == 1 { d.variant1 = v; } - else if d.variantCount == 2 { d.variant2 = v; } - else if d.variantCount == 3 { d.variant3 = v; } - else if d.variantCount == 4 { d.variant4 = v; } - else if d.variantCount == 5 { d.variant5 = v; } - else if d.variantCount == 6 { d.variant6 = v; } - else if d.variantCount == 7 { d.variant7 = v; } - else if d.variantCount == 8 { d.variant8 = v; } - d.variantCount = d.variantCount + 1; - - parserMatch(p, tkComma); - if parserCheck(p, tkNewLine) { discard parserAdvance(p); } - } - discard parserExpect(p, tkRBrace, "expected '}'"); - return d; -} - -func parserParseImportDecl(p: *Parser, isPublic: bool) -> *Decl { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - discard parserExpect(p, tkImport, "expected 'import'"); - - let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.kind = dkUse; - d.line = line; - d.column = col; - d.isPublic = isPublic; - - // Parse path: Std::Io::PrintLine - var pathStr: String = ""; - var segCount: int = 0; - while parserCheck(p, tkIdent) || (segCount > 0 && parserCheck(p, tkColonColon) && parserPeek(p, 1) != tkLBrace) { - if segCount > 0 { - discard parserAdvance(p); // :: - if String_Len(pathStr) > 0 { - let tmp: *char8 = bux_alloc(256) as *char8; - // Append to path string (simplified) - pathStr = String_Concat(pathStr, "::"); - } - } - let seg: LexToken = parserExpect(p, tkIdent, "expected module path segment"); - pathStr = String_Concat(pathStr, seg.text); - segCount = segCount + 1; - } - d.usePath = pathStr; - - // Optional ::{name1, name2} or ::* - if parserMatch(p, tkColonColon) { - if parserCheck(p, tkLBrace) { - discard parserAdvance(p); // { - var names: String = ""; - while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { - while parserCheck(p, tkNewLine) { - discard parserAdvance(p); - } - if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { - break; - } - let n: LexToken = parserExpect(p, tkIdent, "expected import name"); - names = String_Concat(names, n.text); - names = String_Concat(names, ","); + var typeCount: int = 0; + var first: bool = true; + while !parserCheck(p, tkGt) && parserPeek(p, 0) != tkEndOfFile { + if !first { if !parserMatch(p, tkComma) { break; } } - discard parserExpect(p, tkRBrace, "expected '}'"); - d.useNames = names; - d.useKind = 2; // ukMulti - } else if parserCheck(p, tkStar) { - discard parserAdvance(p); // * - d.useKind = 1; // ukGlob - } else { - d.useKind = 0; // ukSingle - } - } else { - d.useKind = 0; // ukSingle - } - - parserMatch(p, tkSemicolon); - return d; -} - -func parserParseExternDecl(p: *Parser, isPublic: bool) -> *Decl { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - discard parserExpect(p, tkExtern, "expected 'extern'"); - - if parserCheck(p, tkFunc) { - let d: *Decl = parserParseFuncDecl(p, isPublic, true, false); - d.kind = dkExternFunc; - return d; - } - - let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.kind = dkExternFunc; - d.line = line; - d.column = col; - d.isPublic = isPublic; - return d; -} - -// --------------------------------------------------------------------------- -// Interface declaration -// --------------------------------------------------------------------------- - -func parserParseInterfaceDecl(p: *Parser, isPublic: bool) -> *Decl { - let line: uint32 = parserCurToken(p).line; - let col: uint32 = parserCurToken(p).column; - discard parserExpect(p, tkInterface, "expected 'interface'"); - let nameTok: LexToken = parserExpect(p, tkIdent, "expected interface name"); - discard parserExpect(p, tkLBrace, "expected '{' to start interface body"); - - let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.kind = dkInterface; - d.line = line; - d.column = col; - d.isPublic = isPublic; - d.strValue = nameTok.text; - - var methods: *Decl = null as *Decl; - var lastMethod: *Decl = null as *Decl; - while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { - if parserCheck(p, tkNewLine) { discard parserAdvance(p); continue; } - if parserCheck(p, tkFunc) { - let m: *Decl = parserParseFuncDecl(p, false, false, false); - if methods == null as *Decl { - methods = m; - lastMethod = m; + first = false; + while parserCheck(p, tkNewLine) { discard parserAdvance(p); } + if parserCheck(p, tkGt) { break; } + // Lifetime type param: 'a — parse and ignore for mono slots + if parserCheck(p, tkLifetime) { + discard parserAdvance(p); + // optional trait bound is nonsense for lifetimes; skip : Bound if present + if parserMatch(p, tkColon) { + discard parserExpect(p, tkIdent, "expected trait bound name"); + } + continue; + } + let tpTok: LexToken = parserExpect(p, tkIdent, "expected type param"); + if typeCount == 0 { + d.typeParam0 = tpTok.text; + typeCount = 1; + if parserMatch(p, tkColon) { + let bound0: LexToken = parserExpect(p, tkIdent, "expected trait bound name"); + d.typeParam0Bound = bound0.text; + } + } else if typeCount == 1 { + d.typeParam1 = tpTok.text; + typeCount = 2; + if parserMatch(p, tkColon) { + let bound1: LexToken = parserExpect(p, tkIdent, "expected trait bound name"); + d.typeParam1Bound = bound1.text; + } } else { - lastMethod.childDecl2 = m; - lastMethod = m; - } - d.methodCount = d.methodCount + 1; - } else { - break; - } - } - d.childDecl1 = methods; - discard parserExpect(p, tkRBrace, "expected '}' to close interface"); - return d; -} - -// --------------------------------------------------------------------------- -// Top-level declaration -// --------------------------------------------------------------------------- - -func parserParseDecl(p: *Parser) -> *Decl { - // Skip newlines before declaration (matching bootstrap behavior) - while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { - discard parserAdvance(p); - } - let isPublic: bool = parserMatch(p, tkPub); - - // Parse @[Checked] / @[Drop] / @[Release] attribute - var isChecked: int = 0; - var isDrop: int = 0; - var isRelease: int = 0; - if parserCheck(p, tkAt) { - discard parserAdvance(p); // @ - if parserCheck(p, tkLBracket) { - discard parserAdvance(p); // [ - if parserCheck(p, tkIdent) { - let attrName: LexToken = parserCurToken(p); - if String_Eq(attrName.text, "Checked") { - isChecked = 1; + // Extra type params beyond 2 — consume and ignore + if parserMatch(p, tkColon) { + discard parserExpect(p, tkIdent, "expected trait bound name"); } - if String_Eq(attrName.text, "Drop") { - isDrop = 1; - } - if String_Eq(attrName.text, "Release") { - isRelease = 1; - } - discard parserAdvance(p); // attribute name - } - if parserCheck(p, tkRBracket) { - discard parserAdvance(p); // ] } } - // Skip newlines after attribute before the declaration - while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { - discard parserAdvance(p); - } + d.typeParamCount = typeCount; + discard parserExpect(p, tkGt, "expected '>'"); } - let kind: int = parserPeek(p, 0); + // --------------------------------------------------------------------------- + // Declarations + // --------------------------------------------------------------------------- - if kind == tkAsync && parserPeek(p, 1) == tkFunc { - discard parserAdvance(p); // async - let d: *Decl = parserParseFuncDecl(p, isPublic, false, true); - d.isChecked = isChecked; - d.isRelease = isRelease; - return d; - } - if kind == tkConst && parserPeek(p, 1) == tkFunc { - discard parserAdvance(p); // const - let d: *Decl = parserParseFuncDecl(p, isPublic, false, false); - d.isConst = 1; - d.isChecked = isChecked; - d.isRelease = isRelease; - return d; - } - if kind == tkFunc { - let d: *Decl = parserParseFuncDecl(p, isPublic, false, false); - d.isChecked = isChecked; - d.isRelease = isRelease; - return d; - } - if kind == tkStruct { - let d: *Decl = parserParseStructDecl(p, isPublic); - d.isDrop = isDrop; - return d; - } - if kind == tkEnum { return parserParseEnumDecl(p, isPublic); } - if kind == tkImport { return parserParseImportDecl(p, isPublic); } - if kind == tkExtern { return parserParseExternDecl(p, isPublic); } - if kind == tkInterface { return parserParseInterfaceDecl(p, isPublic); } - - if kind == tkExtend { - discard parserAdvance(p); + func parserParseFuncDecl(p: *Parser, isPublic: bool, isExtern: bool, isAsync: bool) -> *Decl { let line: uint32 = parserCurToken(p).line; let col: uint32 = parserCurToken(p).column; - let typeName: LexToken = parserExpect(p, tkIdent, "expected type name"); + discard parserExpect(p, tkFunc, "expected 'func'"); + let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected function name"); let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.kind = dkImpl; + d.kind = dkFunc; d.line = line; d.column = col; d.isPublic = isPublic; - d.strValue = typeName.text; + d.isAsync = isAsync; + d.strValue = nameTok.text; - // Optional + // Type params parserParseTypeParams(p, d); - // Optional 'for InterfaceName' - if parserMatch(p, tkFor) { - let ifaceName: LexToken = parserExpect(p, tkIdent, "expected interface name"); - d.strValue2 = ifaceName.text; + // Params + let params: *Decl = parserParseParamList(p); + d.paramCount = params.paramCount; + d.param0 = params.param0; + d.param1 = params.param1; + d.param2 = params.param2; + d.param3 = params.param3; + d.param4 = params.param4; + d.param5 = params.param5; + d.param6 = params.param6; + d.param7 = params.param7; + d.param8 = params.param8; + + // Return type + if parserMatch(p, tkArrow) { + d.retType = parserParseType(p); } + // Body + if !isExtern && parserCheck(p, tkLBrace) { + d.refBody = parserParseBlock(p); + } else { + d.refBody = null as *Block; + } + + return d; + } + + func parserParseStructDecl(p: *Parser, isPublic: bool) -> *Decl { + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + discard parserExpect(p, tkStruct, "expected 'struct'"); + let nameTok: LexToken = parserExpectIdentOrKeyword(p, "expected struct name"); + + let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + d.fields = bux_alloc(256 as uint * sizeof(StructField)) as *StructField; + if d.fields == null as *StructField { + PrintLine("ERROR: bux_alloc returned null for fields"); + } + d.kind = dkStruct; + d.line = line; + d.column = col; + d.isPublic = isPublic; + d.strValue = nameTok.text; + var fieldCount: int = 0; + + // Type params + parserParseTypeParams(p, d); + discard parserExpect(p, tkLBrace, "expected '{'"); + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { + if fieldCount >= 256 { break; } + if parserCheck(p, tkNewLine) { discard parserAdvance(p); continue; } + if parserCheck(p, tkSemicolon) { discard parserAdvance(p); continue; } + let beforePos: int = p.pos; + let fName: LexToken = parserExpectIdentOrKeyword(p, "expected field name"); + if fieldCount >= 250 && fieldCount <= 256 { + PrintLine(String_Concat("RAW fieldCount=", bux_int_to_str(fieldCount as int64))); + PrintLine(String_Concat("RAW fName=", fName.text)); + PrintLine(String_Concat("RAW pos=", bux_int_to_str(p.pos as int64))); + } + discard parserExpect(p, tkColon, "expected ':' in struct field"); + let fType: *TypeExpr = parserParseType(p); + parserMatch(p, tkSemicolon); + // Infinite-loop safeguard + if p.pos == beforePos { + discard parserAdvance(p); + continue; + } + + d.fields[fieldCount].name = fName.text; + d.fields[fieldCount].refFieldType = fType; + fieldCount = fieldCount + 1; + } + d.fieldCount = fieldCount; + discard parserExpect(p, tkRBrace, "expected '}'"); + return d; + } + + func parserParseEnumDecl(p: *Parser, isPublic: bool) -> *Decl { + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + discard parserExpect(p, tkEnum, "expected 'enum'"); + let nameTok: LexToken = parserExpect(p, tkIdent, "expected enum name"); + + let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + d.kind = dkEnum; + d.line = line; + d.column = col; + d.isPublic = isPublic; + d.strValue = nameTok.text; + + discard parserExpect(p, tkLBrace, "expected '{'"); + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { + if d.variantCount >= 9 { break; } + if parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { discard parserAdvance(p); continue; } + let vName: LexToken = parserExpect(p, tkIdent, "expected variant name"); + + var v: EnumVariant; + v.name = vName.text; + v.fieldCount = 0; + v.fieldTypeName0 = ""; + v.fieldTypeName1 = ""; + + // Optional payload: (Type, Type) or (Tuple, ...) — full type expressions + if parserMatch(p, tkLParen) { + let te0: *TypeExpr = parserParseType(p); + v.fieldTypeName0 = parserTypeExprCName(te0); + v.fieldCount = 1; + if parserMatch(p, tkComma) { + let te1: *TypeExpr = parserParseType(p); + v.fieldTypeName1 = parserTypeExprCName(te1); + v.fieldCount = 2; + } + discard parserExpect(p, tkRParen, "expected ')'"); + } + + if d.variantCount == 0 { d.variant0 = v; } + else if d.variantCount == 1 { d.variant1 = v; } + else if d.variantCount == 2 { d.variant2 = v; } + else if d.variantCount == 3 { d.variant3 = v; } + else if d.variantCount == 4 { d.variant4 = v; } + else if d.variantCount == 5 { d.variant5 = v; } + else if d.variantCount == 6 { d.variant6 = v; } + else if d.variantCount == 7 { d.variant7 = v; } + else if d.variantCount == 8 { d.variant8 = v; } + d.variantCount = d.variantCount + 1; + + parserMatch(p, tkComma); + if parserCheck(p, tkNewLine) { discard parserAdvance(p); } + } + discard parserExpect(p, tkRBrace, "expected '}'"); + return d; + } + + func parserParseImportDecl(p: *Parser, isPublic: bool) -> *Decl { + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + discard parserExpect(p, tkImport, "expected 'import'"); + + let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + d.kind = dkUse; + d.line = line; + d.column = col; + d.isPublic = isPublic; + + // Parse path: Std::Io::PrintLine + var pathStr: String = ""; + var segCount: int = 0; + while parserCheck(p, tkIdent) || (segCount > 0 && parserCheck(p, tkColonColon) && parserPeek(p, 1) != tkLBrace) { + if segCount > 0 { + discard parserAdvance(p); // :: + if String_Len(pathStr) > 0 { + let tmp: *char8 = bux_alloc(256) as *char8; + // Append to path string (simplified) + pathStr = String_Concat(pathStr, "::"); + } + } + let seg: LexToken = parserExpect(p, tkIdent, "expected module path segment"); + pathStr = String_Concat(pathStr, seg.text); + segCount = segCount + 1; + } + d.usePath = pathStr; + + // Optional ::{name1, name2} or ::* + if parserMatch(p, tkColonColon) { + if parserCheck(p, tkLBrace) { + discard parserAdvance(p); // { + var names: String = ""; + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { + while parserCheck(p, tkNewLine) { + discard parserAdvance(p); + } + if parserCheck(p, tkRBrace) || parserPeek(p, 0) == tkEndOfFile { + break; + } + let n: LexToken = parserExpect(p, tkIdent, "expected import name"); + names = String_Concat(names, n.text); + names = String_Concat(names, ","); + if !parserMatch(p, tkComma) { break; } + } + discard parserExpect(p, tkRBrace, "expected '}'"); + d.useNames = names; + d.useKind = 2; // ukMulti + } else if parserCheck(p, tkStar) { + discard parserAdvance(p); // * + d.useKind = 1; // ukGlob + } else { + d.useKind = 0; // ukSingle + } + } else { + d.useKind = 0; // ukSingle + } + + parserMatch(p, tkSemicolon); + return d; + } + + func parserParseExternDecl(p: *Parser, isPublic: bool) -> *Decl { + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + discard parserExpect(p, tkExtern, "expected 'extern'"); + + if parserCheck(p, tkFunc) { + let d: *Decl = parserParseFuncDecl(p, isPublic, true, false); + d.kind = dkExternFunc; + return d; + } + + let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + d.kind = dkExternFunc; + d.line = line; + d.column = col; + d.isPublic = isPublic; + return d; + } + + // --------------------------------------------------------------------------- + // Interface declaration + // --------------------------------------------------------------------------- + + func parserParseInterfaceDecl(p: *Parser, isPublic: bool) -> *Decl { + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + discard parserExpect(p, tkInterface, "expected 'interface'"); + let nameTok: LexToken = parserExpect(p, tkIdent, "expected interface name"); + discard parserExpect(p, tkLBrace, "expected '{' to start interface body"); + + let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + d.kind = dkInterface; + d.line = line; + d.column = col; + d.isPublic = isPublic; + d.strValue = nameTok.text; + var methods: *Decl = null as *Decl; var lastMethod: *Decl = null as *Decl; while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { @@ -2278,147 +2192,268 @@ func parserParseDecl(p: *Parser) -> *Decl { } } d.childDecl1 = methods; - discard parserExpect(p, tkRBrace, "expected '}'"); + discard parserExpect(p, tkRBrace, "expected '}' to close interface"); return d; } - if kind == tkModule { - discard parserAdvance(p); - let name: LexToken = parserExpect(p, tkIdent, "expected module name"); - // Parse optional path segments (::Name) - while parserCheck(p, tkColonColon) { + // --------------------------------------------------------------------------- + // Top-level declaration + // --------------------------------------------------------------------------- + + func parserParseDecl(p: *Parser) -> *Decl { + // Skip newlines before declaration (matching bootstrap behavior) + while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { discard parserAdvance(p); - discard parserExpect(p, tkIdent, "expected module path segment"); } - let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.kind = dkModule; - d.strValue = name.text; - // Parse module body with braces - if parserCheck(p, tkLBrace) { - discard parserAdvance(p); // consume { - var items: *Decl = null as *Decl; - var lastItem: *Decl = null as *Decl; - while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { - if parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { - discard parserAdvance(p); - continue; + let isPublic: bool = parserMatch(p, tkPub); + + // Parse @[Checked] / @[Drop] / @[Release] attribute + var isChecked: int = 0; + var isDrop: int = 0; + var isRelease: int = 0; + if parserCheck(p, tkAt) { + discard parserAdvance(p); // @ + if parserCheck(p, tkLBracket) { + discard parserAdvance(p); // [ + if parserCheck(p, tkIdent) { + let attrName: LexToken = parserCurToken(p); + if String_Eq(attrName.text, "Checked") { + isChecked = 1; + } + if String_Eq(attrName.text, "Drop") { + isDrop = 1; + } + if String_Eq(attrName.text, "Release") { + isRelease = 1; + } + discard parserAdvance(p); // attribute name } - let beforePos: int = p.pos; - let item: *Decl = parserParseDecl(p); - if item != null as *Decl { - item.childDecl2 = null as *Decl; - if items == null as *Decl { - items = item; - lastItem = item; + if parserCheck(p, tkRBracket) { + discard parserAdvance(p); // ] + } + } + // Skip newlines after attribute before the declaration + while parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { + discard parserAdvance(p); + } + } + + let kind: int = parserPeek(p, 0); + + if kind == tkAsync && parserPeek(p, 1) == tkFunc { + discard parserAdvance(p); // async + let d: *Decl = parserParseFuncDecl(p, isPublic, false, true); + d.isChecked = isChecked; + d.isRelease = isRelease; + return d; + } + if kind == tkConst && parserPeek(p, 1) == tkFunc { + discard parserAdvance(p); // const + let d: *Decl = parserParseFuncDecl(p, isPublic, false, false); + d.isConst = 1; + d.isChecked = isChecked; + d.isRelease = isRelease; + return d; + } + if kind == tkFunc { + let d: *Decl = parserParseFuncDecl(p, isPublic, false, false); + d.isChecked = isChecked; + d.isRelease = isRelease; + return d; + } + if kind == tkStruct { + let d: *Decl = parserParseStructDecl(p, isPublic); + d.isDrop = isDrop; + return d; + } + if kind == tkEnum { return parserParseEnumDecl(p, isPublic); } + if kind == tkImport { return parserParseImportDecl(p, isPublic); } + if kind == tkExtern { return parserParseExternDecl(p, isPublic); } + if kind == tkInterface { return parserParseInterfaceDecl(p, isPublic); } + + if kind == tkExtend { + discard parserAdvance(p); + let line: uint32 = parserCurToken(p).line; + let col: uint32 = parserCurToken(p).column; + let typeName: LexToken = parserExpect(p, tkIdent, "expected type name"); + + let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + d.kind = dkImpl; + d.line = line; + d.column = col; + d.isPublic = isPublic; + d.strValue = typeName.text; + + // Optional + parserParseTypeParams(p, d); + + // Optional 'for InterfaceName' + if parserMatch(p, tkFor) { + let ifaceName: LexToken = parserExpect(p, tkIdent, "expected interface name"); + d.strValue2 = ifaceName.text; + } + + discard parserExpect(p, tkLBrace, "expected '{'"); + var methods: *Decl = null as *Decl; + var lastMethod: *Decl = null as *Decl; + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { + if parserCheck(p, tkNewLine) { discard parserAdvance(p); continue; } + if parserCheck(p, tkFunc) { + let m: *Decl = parserParseFuncDecl(p, false, false, false); + if methods == null as *Decl { + methods = m; + lastMethod = m; } else { - lastItem.childDecl2 = item; - lastItem = item; + lastMethod.childDecl2 = m; + lastMethod = m; + } + d.methodCount = d.methodCount + 1; + } else { + break; + } + } + d.childDecl1 = methods; + discard parserExpect(p, tkRBrace, "expected '}'"); + return d; + } + + if kind == tkModule { + discard parserAdvance(p); + let name: LexToken = parserExpect(p, tkIdent, "expected module name"); + // Parse optional path segments (::Name) + while parserCheck(p, tkColonColon) { + discard parserAdvance(p); + discard parserExpect(p, tkIdent, "expected module path segment"); + } + let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + d.kind = dkModule; + d.strValue = name.text; + // Parse module body with braces + if parserCheck(p, tkLBrace) { + discard parserAdvance(p); // consume { + var items: *Decl = null as *Decl; + var lastItem: *Decl = null as *Decl; + while !parserCheck(p, tkRBrace) && parserPeek(p, 0) != tkEndOfFile { + if parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { + discard parserAdvance(p); + continue; + } + let beforePos: int = p.pos; + let item: *Decl = parserParseDecl(p); + if item != null as *Decl { + item.childDecl2 = null as *Decl; + if items == null as *Decl { + items = item; + lastItem = item; + } else { + lastItem.childDecl2 = item; + lastItem = item; + } + } + // Infinite-loop safeguard: if no progress, skip token + if p.pos == beforePos { + discard parserAdvance(p); } } - // Infinite-loop safeguard: if no progress, skip token - if p.pos == beforePos { - discard parserAdvance(p); - } + discard parserExpect(p, tkRBrace, "expected '}' to close module"); + d.childDecl1 = items; // first item of module + } else { + parserMatch(p, tkSemicolon); } - discard parserExpect(p, tkRBrace, "expected '}' to close module"); - d.childDecl1 = items; // first item of module - } else { + return d; + } + + if kind == tkConst { + discard parserAdvance(p); + let name: LexToken = parserExpect(p, tkIdent, "expected const name"); + discard parserExpect(p, tkColon, "expected ':'"); + let ct: *TypeExpr = parserParseType(p); + discard parserExpect(p, tkAssign, "expected '='"); + let val: *Expr = parserParseExpr(p); parserMatch(p, tkSemicolon); + let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; + d.kind = dkConst; + d.strValue = name.text; + d.constType = ct; + d.constValue = val; + return d; } - return d; - } - if kind == tkConst { + // Unknown declaration — skip one token and return null + // (was: skip to newline/}, which was destructive) + parserEmitDiag(p, parserCurToken(p).line, parserCurToken(p).column, "skipping unknown declaration"); discard parserAdvance(p); - let name: LexToken = parserExpect(p, tkIdent, "expected const name"); - discard parserExpect(p, tkColon, "expected ':'"); - let ct: *TypeExpr = parserParseType(p); - discard parserExpect(p, tkAssign, "expected '='"); - let val: *Expr = parserParseExpr(p); - parserMatch(p, tkSemicolon); - let d: *Decl = bux_alloc(sizeof(Decl)) as *Decl; - d.kind = dkConst; - d.strValue = name.text; - d.constType = ct; - d.constValue = val; - return d; + return null as *Decl; } - // Unknown declaration — skip one token and return null - // (was: skip to newline/}, which was destructive) - parserEmitDiag(p, parserCurToken(p).line, parserCurToken(p).column, "skipping unknown declaration"); - discard parserAdvance(p); - return null as *Decl; -} + // --------------------------------------------------------------------------- + // Module parsing + // --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// Module parsing -// --------------------------------------------------------------------------- + func Parser_Parse(tokens: *LexToken, tokenCount: int) -> *Module { + let p: *Parser = bux_alloc(sizeof(Parser)) as *Parser; + p.tokens = tokens; + p.tokenCount = tokenCount; + p.pos = 0; + p.structInitAllowed = true; + let diagBuf: *ParserDiag = bux_alloc(256 as uint * sizeof(ParserDiag)) as *ParserDiag; + p.diags = diagBuf; + p.diagCount = 0; -func Parser_Parse(tokens: *LexToken, tokenCount: int) -> *Module { - let p: *Parser = bux_alloc(sizeof(Parser)) as *Parser; - p.tokens = tokens; - p.tokenCount = tokenCount; - p.pos = 0; - p.structInitAllowed = true; - let diagBuf: *ParserDiag = bux_alloc(256 as uint * sizeof(ParserDiag)) as *ParserDiag; - p.diags = diagBuf; - p.diagCount = 0; + let mod: *Module = bux_alloc(sizeof(Module)) as *Module; + mod.name = ""; + mod.itemCount = 0; + mod.firstItem = null as *Decl; - let mod: *Module = bux_alloc(sizeof(Module)) as *Module; - mod.name = ""; - mod.itemCount = 0; - mod.firstItem = null as *Decl; - - // Parse declarations until EOF - while parserPeek(p, 0) != tkEndOfFile { - if parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { - discard parserAdvance(p); - continue; - } - let beforePos: int = p.pos; - let decl: *Decl = parserParseDecl(p); - if decl != null as *Decl { - decl.childDecl2 = mod.firstItem; // push front - mod.firstItem = decl; - mod.itemCount = mod.itemCount + 1; - } - // Infinite-loop safeguard: if no progress, skip token - if p.pos == beforePos { - discard parserAdvance(p); - } - } - - /* Print fatal parser diagnostics (severity == 0) or if nothing valid was parsed */ - if p.diagCount > 0 && mod.itemCount == 0 { - var di: int = 0; - while di < p.diagCount { - let d: ParserDiag = p.diags[di]; - Print("error: "); - PrintLine(d.message); - Print(" --> :"); - PrintInt(d.line as int64); - Print(":"); - PrintInt(d.column as int64); - PrintLine(""); - Print(" |"); - PrintLine(""); - Print(" "); - PrintInt(d.line as int64); - Print(" | "); - PrintLine(""); - Print(" | "); - var sp: uint32 = 0; - while sp < d.column - 1 && sp < 120 { - Print(" "); - sp = sp + 1; + // Parse declarations until EOF + while parserPeek(p, 0) != tkEndOfFile { + if parserCheck(p, tkNewLine) || parserCheck(p, tkSemicolon) { + discard parserAdvance(p); + continue; + } + let beforePos: int = p.pos; + let decl: *Decl = parserParseDecl(p); + if decl != null as *Decl { + decl.childDecl2 = mod.firstItem; // push front + mod.firstItem = decl; + mod.itemCount = mod.itemCount + 1; + } + // Infinite-loop safeguard: if no progress, skip token + if p.pos == beforePos { + discard parserAdvance(p); } - PrintLine("^"); - di = di + 1; } + + /* Print fatal parser diagnostics (severity == 0) or if nothing valid was parsed */ + if p.diagCount > 0 && mod.itemCount == 0 { + var di: int = 0; + while di < p.diagCount { + let d: ParserDiag = p.diags[di]; + Print("error: "); + PrintLine(d.message); + Print(" --> :"); + PrintInt(d.line as int64); + Print(":"); + PrintInt(d.column as int64); + PrintLine(""); + Print(" |"); + PrintLine(""); + Print(" "); + PrintInt(d.line as int64); + Print(" | "); + PrintLine(""); + Print(" | "); + var sp: uint32 = 0; + while sp < d.column - 1 && sp < 120 { + Print(" "); + sp = sp + 1; + } + PrintLine("^"); + di = di + 1; + } + } + + return mod; } - return mod; -} - } diff --git a/src/scope.bux b/src/scope.bux index 1ba1e84..4d85f75 100644 --- a/src/scope.bux +++ b/src/scope.bux @@ -1,115 +1,115 @@ // scope.bux — Symbol table with parent-chain lookup module Scope { -// Symbol kinds -const skVar: int = 0; -const skFunc: int = 1; -const skType: int = 2; -const skConst: int = 3; -const skModule: int = 4; + // Symbol kinds + const skVar: int = 0; + const skFunc: int = 1; + const skType: int = 2; + const skConst: int = 3; + const skModule: int = 4; -// Maximum symbols per scope -const maxSymbols: int = 8192; + // Maximum symbols per scope + const maxSymbols: int = 8192; -struct Symbol { - kind: int; - name: String; - typeKind: int; - typeName: String; - refType: *TypeExpr; // original type expression (for func types, etc.) - isMutable: bool; - isPublic: bool; - decl: *Decl; // associated declaration (for funcs, structs, enums) -} - -struct Scope { - symbols: *Symbol; - count: int; - parent: *Scope; -} - -// --------------------------------------------------------------------------- -// Scope operations -// --------------------------------------------------------------------------- - -func Scope_New() -> Scope { - let sz: uint = maxSymbols as uint * sizeof(Symbol); - let data: *Symbol = bux_alloc(sz) as *Symbol; - return Scope { symbols: data, count: 0, parent: null as *Scope }; -} - -func Scope_NewChild(parent: *Scope) -> Scope { - let sz: uint = maxSymbols as uint * sizeof(Symbol); - let data: *Symbol = bux_alloc(sz) as *Symbol; - return Scope { symbols: data, count: 0, parent: parent }; -} - -func Scope_Define(scope: *Scope, sym: Symbol) -> bool { - // Check local scope for duplicates - var i: int = 0; - while i < scope.count { - if String_Eq(scope.symbols[i].name, sym.name) { - return false; - } - i = i + 1; + struct Symbol { + kind: int; + name: String; + typeKind: int; + typeName: String; + refType: *TypeExpr; // original type expression (for func types, etc.) + isMutable: bool; + isPublic: bool; + decl: *Decl; // associated declaration (for funcs, structs, enums) } - if scope.count < maxSymbols { - scope.symbols[scope.count] = sym; - scope.count = scope.count + 1; - return true; - } - return false; -} -func Scope_Lookup(scope: *Scope, name: String) -> Symbol { - var cur: *Scope = scope; - while cur != null as *Scope { + struct Scope { + symbols: *Symbol; + count: int; + parent: *Scope; + } + + // --------------------------------------------------------------------------- + // Scope operations + // --------------------------------------------------------------------------- + + func Scope_New() -> Scope { + let sz: uint = maxSymbols as uint * sizeof(Symbol); + let data: *Symbol = bux_alloc(sz) as *Symbol; + return Scope { symbols: data, count: 0, parent: null as *Scope }; + } + + func Scope_NewChild(parent: *Scope) -> Scope { + let sz: uint = maxSymbols as uint * sizeof(Symbol); + let data: *Symbol = bux_alloc(sz) as *Symbol; + return Scope { symbols: data, count: 0, parent: parent }; + } + + func Scope_Define(scope: *Scope, sym: Symbol) -> bool { + // Check local scope for duplicates var i: int = 0; - while i < cur.count { - if String_Eq(cur.symbols[i].name, name) { - return cur.symbols[i]; + while i < scope.count { + if String_Eq(scope.symbols[i].name, sym.name) { + return false; } i = i + 1; } - cur = cur.parent; - } - var empty: Symbol = Symbol { kind: 0, name: "", typeKind: 0, typeName: "", refType: null as *TypeExpr, isMutable: false, isPublic: false, decl: null as *Decl }; - return empty; -} - -func Scope_LookupLocal(scope: *Scope, name: String) -> Symbol { - var i: int = 0; - while i < scope.count { - if String_Eq(scope.symbols[i].name, name) { - return scope.symbols[i]; + if scope.count < maxSymbols { + scope.symbols[scope.count] = sym; + scope.count = scope.count + 1; + return true; } - i = i + 1; + return false; } - var empty: Symbol = Symbol { kind: 0, name: "", typeKind: 0, typeName: "", refType: null as *TypeExpr, isMutable: false, isPublic: false, decl: null as *Decl }; - return empty; -} -func Scope_LookupUpTo(scope: *Scope, name: String, limit: *Scope) -> Symbol { - var cur: *Scope = scope; - while cur != null as *Scope { + func Scope_Lookup(scope: *Scope, name: String) -> Symbol { + var cur: *Scope = scope; + while cur != null as *Scope { + var i: int = 0; + while i < cur.count { + if String_Eq(cur.symbols[i].name, name) { + return cur.symbols[i]; + } + i = i + 1; + } + cur = cur.parent; + } + var empty: Symbol = Symbol { kind: 0, name: "", typeKind: 0, typeName: "", refType: null as *TypeExpr, isMutable: false, isPublic: false, decl: null as *Decl }; + return empty; + } + + func Scope_LookupLocal(scope: *Scope, name: String) -> Symbol { var i: int = 0; - while i < cur.count { - if String_Eq(cur.symbols[i].name, name) { - return cur.symbols[i]; + while i < scope.count { + if String_Eq(scope.symbols[i].name, name) { + return scope.symbols[i]; } i = i + 1; } - if cur == limit { - break; - } - cur = cur.parent; + var empty: Symbol = Symbol { kind: 0, name: "", typeKind: 0, typeName: "", refType: null as *TypeExpr, isMutable: false, isPublic: false, decl: null as *Decl }; + return empty; } - var empty: Symbol = Symbol { kind: 0, name: "", typeKind: 0, typeName: "", refType: null as *TypeExpr, isMutable: false, isPublic: false, decl: null as *Decl }; - return empty; -} -func Scope_Free(scope: *Scope) { - bux_free(scope.symbols as *void); -} + func Scope_LookupUpTo(scope: *Scope, name: String, limit: *Scope) -> Symbol { + var cur: *Scope = scope; + while cur != null as *Scope { + var i: int = 0; + while i < cur.count { + if String_Eq(cur.symbols[i].name, name) { + return cur.symbols[i]; + } + i = i + 1; + } + if cur == limit { + break; + } + cur = cur.parent; + } + var empty: Symbol = Symbol { kind: 0, name: "", typeKind: 0, typeName: "", refType: null as *TypeExpr, isMutable: false, isPublic: false, decl: null as *Decl }; + return empty; + } + + func Scope_Free(scope: *Scope) { + bux_free(scope.symbols as *void); + } } diff --git a/src/sema.bux b/src/sema.bux index 6a1460f..65838af 100644 --- a/src/sema.bux +++ b/src/sema.bux @@ -2,721 +2,1190 @@ // Validates types, resolves identifiers, checks function calls. module Sema { -extern func bux_string_concat(a: String, b: String) -> String; -extern func bux_int_to_str(n: int64) -> String; -extern func bux_strlen(s: String) -> uint; -extern func bux_str_slice(s: String, start: uint, len: uint) -> String; + extern func bux_string_concat(a: String, b: String) -> String; + extern func bux_int_to_str(n: int64) -> String; + extern func bux_strlen(s: String) -> uint; + extern func bux_str_slice(s: String, start: uint, len: uint) -> String; -// --------------------------------------------------------------------------- -// Sema context -// --------------------------------------------------------------------------- -struct Sema { - module: *Module; - scope: *Scope; - typeTable: *void; - methodTable: *void; - diagCount: int; - diags: *SemaDiag; - hasError: bool; - currentRetType: int; // return type of the function being checked - checkedFunc: bool; // true inside @[Checked] function - releaseFunc: bool; // true inside @[Release] function - movedCount: int; // number of moved variables - movedName0: String; // inline moved var names (up to 8) - movedName1: String; - movedName2: String; - movedName3: String; - movedName4: String; - movedName5: String; - movedName6: String; - movedName7: String; - closureDepth: int; // nesting depth inside closures - currentClosureExpr: *Expr; // current closure being analyzed (for capture tracking) - closureScope: *Scope; // scope at which the current closure was entered - // Trait bounds tables - interfaceTable: *InterfaceEntry; - interfaceCount: int; - methodEntries: *MethodEntry; - methodCount: int; -} - -struct SemaDiag { - line: uint32; - column: uint32; - message: String; -} - -// --------------------------------------------------------------------------- -// Interface / Method tables for trait bounds checking -// --------------------------------------------------------------------------- - -struct InterfaceEntry { - name: String, - decl: *Decl, -} - -struct MethodEntry { - typeName: String, - methodName: String, - decl: *Decl, -} - -// --------------------------------------------------------------------------- -// Diagnostics -// --------------------------------------------------------------------------- - -func Sema_EmitError(sema: *Sema, line: uint32, col: uint32, msg: String) { - if sema.diagCount < 256 { - sema.diags[sema.diagCount] = SemaDiag { line: line, column: col, message: msg }; - sema.diagCount = sema.diagCount + 1; + // --------------------------------------------------------------------------- + // Sema context + // --------------------------------------------------------------------------- + struct Sema { + module: *Module; + scope: *Scope; + typeTable: *void; + methodTable: *void; + diagCount: int; + diags: *SemaDiag; + hasError: bool; + currentRetType: int; // return type of the function being checked + checkedFunc: bool; // true inside @[Checked] function + releaseFunc: bool; // true inside @[Release] function + movedCount: int; // number of moved variables + movedName0: String; // inline moved var names (up to 8) + movedName1: String; + movedName2: String; + movedName3: String; + movedName4: String; + movedName5: String; + movedName6: String; + movedName7: String; + // Lifetime elision (C.1) — binding name → lifetime id (up to 8) + ltCount: int; + ltName0: String; + ltName1: String; + ltName2: String; + ltName3: String; + ltName4: String; + ltName5: String; + ltName6: String; + ltName7: String; + ltVal0: String; + ltVal1: String; + ltVal2: String; + ltVal3: String; + ltVal4: String; + ltVal5: String; + ltVal6: String; + ltVal7: String; + returnLifetime: String; // expected return ref lifetime ("" if not a ref return) + ltAnon: int; // next #elidedN counter + closureDepth: int; // nesting depth inside closures + currentClosureExpr: *Expr; // current closure being analyzed (for capture tracking) + closureScope: *Scope; // scope at which the current closure was entered + // Trait bounds tables + interfaceTable: *InterfaceEntry; + interfaceCount: int; + methodEntries: *MethodEntry; + methodCount: int; } - sema.hasError = true; -} -// --------------------------------------------------------------------------- -// Symbol zero-init helper (bootstrap C backend does not zero-init structs) -// --------------------------------------------------------------------------- + struct SemaDiag { + line: uint32; + column: uint32; + message: String; + } -func Sema_ZeroInitSymbol(sym: *Symbol) { - sym.kind = 0; - sym.name = ""; - sym.typeKind = 0; - sym.typeName = ""; - sym.refType = null as *TypeExpr; - sym.isMutable = false; - sym.isPublic = false; - sym.decl = null as *Decl; -} + // --------------------------------------------------------------------------- + // Interface / Method tables for trait bounds checking + // --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// Build a tekFunc TypeExpr from a function declaration -// --------------------------------------------------------------------------- + struct InterfaceEntry { + name: String, + decl: *Decl, + } -func Sema_BuildFuncTypeExprFromDecl(decl: *Decl) -> *TypeExpr { - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekFunc; - te.line = decl.line; - te.column = decl.column; - te.funcRet = decl.retType; - te.funcParamCount = decl.paramCount; - var head: *TypeExprList = null as *TypeExprList; - var tail: *TypeExprList = null as *TypeExprList; - var i: int = 0; - while i < decl.paramCount && i < 9 { - var p: Param; - if i == 0 { p = decl.param0; } - else if i == 1 { p = decl.param1; } - else if i == 2 { p = decl.param2; } - else if i == 3 { p = decl.param3; } - else if i == 4 { p = decl.param4; } - else if i == 5 { p = decl.param5; } - else if i == 6 { p = decl.param6; } - else if i == 7 { p = decl.param7; } - else { p = decl.param8; } - if p.refParamType != null as *TypeExpr { - let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; - node.te = p.refParamType; - node.next = null as *TypeExprList; - if head == null as *TypeExprList { - head = node; - } else { - tail.next = node; - } - tail = node; + struct MethodEntry { + typeName: String, + methodName: String, + decl: *Decl, + } + + // --------------------------------------------------------------------------- + // Diagnostics + // --------------------------------------------------------------------------- + + func Sema_EmitError(sema: *Sema, line: uint32, col: uint32, msg: String) { + if sema.diagCount < 256 { + sema.diags[sema.diagCount] = SemaDiag { line: line, column: col, message: msg }; + sema.diagCount = sema.diagCount + 1; } - i = i + 1; - } - te.funcParams = head; - return te; -} - -// --------------------------------------------------------------------------- -// Type resolution from TypeExpr → Type constants -// --------------------------------------------------------------------------- - -func Sema_ResolveType(sema: *Sema, te: *TypeExpr) -> int { - if te == null as *TypeExpr { return tyUnknown; } - - if te.kind == tekPointer { - return tyPointer; + sema.hasError = true; } - if te.kind == tekFunc { - return tyFunc; - } + // --------------------------------------------------------------------------- + // Symbol zero-init helper (bootstrap C backend does not zero-init structs) + // --------------------------------------------------------------------------- - if te.kind == tekTuple { - // Tuples lower to named C structs (Tuple_int_int, ...) - return tyNamed; - } - - return Type_FromName(te.typeName); -} - -// --------------------------------------------------------------------------- -// Type predicates -// --------------------------------------------------------------------------- - -func Sema_IsNumeric(kind: int) -> bool { - if kind == tyUnknown || kind == tyNamed || kind == tyTypeParam { return true; } - if kind == tyInt8 || kind == tyInt16 || kind == tyInt32 || kind == tyInt64 || kind == tyInt { return true; } - if kind == tyUInt8 || kind == tyUInt16 || kind == tyUInt32 || kind == tyUInt64 || kind == tyUInt { return true; } - if kind == tyFloat32 || kind == tyFloat64 { return true; } - return false; -} - -func Sema_IsBool(kind: int) -> bool { - return kind == tyBool || kind == tyBool8 || kind == tyBool16 || kind == tyBool32; -} - -// --------------------------------------------------------------------------- -// Block checking helper -// --------------------------------------------------------------------------- - -func Sema_CheckBlock(sema: *Sema, block: *Block) { - if block == null as *Block { return; } - // Create child scope for block (matching Nim bootstrap behavior) - var blockScope: Scope = Scope_NewChild(sema.scope); - let prevScope: *Scope = sema.scope; - sema.scope = &blockScope; - var stmt: *Stmt = block.firstStmt; - while stmt != null as *Stmt { - Sema_CheckStmt(sema, stmt); - stmt = stmt.nextStmt; - } - sema.scope = prevScope; -} - -// --------------------------------------------------------------------------- -// Call argument resolution: inject defaults and reorder named args -// --------------------------------------------------------------------------- - -func Sema_ResolveCallArgs(sema: *Sema, expr: *Expr) { - if expr == null as *Expr || expr.kind != ekCall { return; } - if expr.child1 == null as *Expr || expr.child1.kind != ekIdent { return; } - let sym: Symbol = Scope_Lookup(sema.scope, expr.child1.strValue); - if sym.kind != skFunc || sym.decl == null as *Decl { return; } - let decl: *Decl = sym.decl; - if decl.paramCount == 0 { return; } - - // Check if any named args present - var hasNamed: bool = false; - var arg: *ExprList = expr.callArgs; - while arg != null as *ExprList { - if !String_Eq(arg.argName, "") { hasNamed = true; } - arg = arg.next; - } - if !hasNamed && expr.callArgCount >= decl.paramCount { return; } - - // Build new linked list in param order - var newFirst: *ExprList = null as *ExprList; - var newLast: *ExprList = null as *ExprList; - var newCount: int = 0; - var usedPositional: int = 0; - var positionalAfterNamed: bool = false; - - var i: int = 0; - while i < decl.paramCount { - var p: *Param = null as *Param; - if i == 0 { p = &decl.param0; } - else if i == 1 { p = &decl.param1; } - else if i == 2 { p = &decl.param2; } - else if i == 3 { p = &decl.param3; } - else if i == 4 { p = &decl.param4; } - else if i == 5 { p = &decl.param5; } - else if i == 6 { p = &decl.param6; } - else if i == 7 { p = &decl.param7; } - else if i == 8 { p = &decl.param8; } - - var matched: *Expr = null as *Expr; - - // Look for positional arg at this index - if usedPositional < expr.callArgCount { - var posIdx: int = 0; - var posArg: *ExprList = expr.callArgs; - while posArg != null as *ExprList { - if String_Eq(posArg.argName, "") { - if posIdx == usedPositional { - matched = posArg.expr; - usedPositional = usedPositional + 1; - break; - } - posIdx = posIdx + 1; - } - posArg = posArg.next; - } - } - - // Look for named arg matching this param - if matched == null as *Expr { - var namedArg: *ExprList = expr.callArgs; - while namedArg != null as *ExprList { - if String_Eq(namedArg.argName, p.name) { - matched = namedArg.expr; - break; - } - namedArg = namedArg.next; - } - } - - // Use default if available - if matched == null as *Expr && p.defaultExpr != null as *Expr { - matched = p.defaultExpr; - } - - if matched != null as *Expr { - let node: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; - node.expr = matched; - node.next = null as *ExprList; - node.argName = ""; - if newFirst == null as *ExprList { - newFirst = node; - newLast = node; - } else { - newLast.next = node; - newLast = node; - } - newCount = newCount + 1; - } - - i = i + 1; - } - - expr.callArgs = newFirst; - expr.callArgCount = newCount; -} - -// --------------------------------------------------------------------------- -// Borrow checker helpers (inline array, matching Decl param pattern) -// --------------------------------------------------------------------------- - -func Sema_AddMoved(sema: *Sema, name: String) { - if sema == null as *Sema { return; } - if sema.movedCount >= 8 { return; } - if sema.movedCount == 0 { sema.movedName0 = name; } - else if sema.movedCount == 1 { sema.movedName1 = name; } - else if sema.movedCount == 2 { sema.movedName2 = name; } - else if sema.movedCount == 3 { sema.movedName3 = name; } - else if sema.movedCount == 4 { sema.movedName4 = name; } - else if sema.movedCount == 5 { sema.movedName5 = name; } - else if sema.movedCount == 6 { sema.movedName6 = name; } - else if sema.movedCount == 7 { sema.movedName7 = name; } - sema.movedCount = sema.movedCount + 1; -} - -func Sema_IsMoved(sema: *Sema, name: String) -> bool { - if sema == null as *Sema { return false; } - if sema.movedCount > 0 && String_Eq(sema.movedName0, name) { return true; } - if sema.movedCount > 1 && String_Eq(sema.movedName1, name) { return true; } - if sema.movedCount > 2 && String_Eq(sema.movedName2, name) { return true; } - if sema.movedCount > 3 && String_Eq(sema.movedName3, name) { return true; } - if sema.movedCount > 4 && String_Eq(sema.movedName4, name) { return true; } - if sema.movedCount > 5 && String_Eq(sema.movedName5, name) { return true; } - if sema.movedCount > 6 && String_Eq(sema.movedName6, name) { return true; } - if sema.movedCount > 7 && String_Eq(sema.movedName7, name) { return true; } - return false; -} - -func Sema_RemoveMoved(sema: *Sema, name: String) { - if sema == null as *Sema { return; } - var found: int = -1; - if sema.movedCount > 0 && String_Eq(sema.movedName0, name) { found = 0; } - else if sema.movedCount > 1 && String_Eq(sema.movedName1, name) { found = 1; } - else if sema.movedCount > 2 && String_Eq(sema.movedName2, name) { found = 2; } - else if sema.movedCount > 3 && String_Eq(sema.movedName3, name) { found = 3; } - else if sema.movedCount > 4 && String_Eq(sema.movedName4, name) { found = 4; } - else if sema.movedCount > 5 && String_Eq(sema.movedName5, name) { found = 5; } - else if sema.movedCount > 6 && String_Eq(sema.movedName6, name) { found = 6; } - else if sema.movedCount > 7 && String_Eq(sema.movedName7, name) { found = 7; } - if found >= 0 { - var i: int = found; - while i < sema.movedCount - 1 { - if i == 0 { sema.movedName0 = sema.movedName1; } - else if i == 1 { sema.movedName1 = sema.movedName2; } - else if i == 2 { sema.movedName2 = sema.movedName3; } - else if i == 3 { sema.movedName3 = sema.movedName4; } - else if i == 4 { sema.movedName4 = sema.movedName5; } - else if i == 5 { sema.movedName5 = sema.movedName6; } - else if i == 6 { sema.movedName6 = sema.movedName7; } - i = i + 1; - } - sema.movedCount = sema.movedCount - 1; - } -} - -// --------------------------------------------------------------------------- -// Capture tracking for closures -// --------------------------------------------------------------------------- - -func Sema_AddCapture(closureExpr: *Expr, name: String, typeKind: int) { - if closureExpr == null as *Expr { return; } - // Check if already captured - var i: int = 0; - while i < closureExpr.captureCount { - var capName: String = ""; - if i == 0 { capName = closureExpr.captureName0; } - else if i == 1 { capName = closureExpr.captureName1; } - else if i == 2 { capName = closureExpr.captureName2; } - else if i == 3 { capName = closureExpr.captureName3; } - else if i == 4 { capName = closureExpr.captureName4; } - else if i == 5 { capName = closureExpr.captureName5; } - else if i == 6 { capName = closureExpr.captureName6; } - else if i == 7 { capName = closureExpr.captureName7; } - if String_Eq(capName, name) { return; } - i = i + 1; - } - // Add new capture (up to 8) - if closureExpr.captureCount < 8 { - let idx: int = closureExpr.captureCount; - if idx == 0 { closureExpr.captureName0 = name; closureExpr.captureType0 = typeKind; } - else if idx == 1 { closureExpr.captureName1 = name; closureExpr.captureType1 = typeKind; } - else if idx == 2 { closureExpr.captureName2 = name; closureExpr.captureType2 = typeKind; } - else if idx == 3 { closureExpr.captureName3 = name; closureExpr.captureType3 = typeKind; } - else if idx == 4 { closureExpr.captureName4 = name; closureExpr.captureType4 = typeKind; } - else if idx == 5 { closureExpr.captureName5 = name; closureExpr.captureType5 = typeKind; } - else if idx == 6 { closureExpr.captureName6 = name; closureExpr.captureType6 = typeKind; } - else if idx == 7 { closureExpr.captureName7 = name; closureExpr.captureType7 = typeKind; } - closureExpr.captureCount = closureExpr.captureCount + 1; - } -} - -// --------------------------------------------------------------------------- -// Expression type checking -// --------------------------------------------------------------------------- - -// Bind identifiers from a match pattern into the current scope. -// Enum payloads: Option::Some(value) → value:int (from variant field type). -func Sema_BindPattern(sema: *Sema, pat: *Pattern, subject: *Expr) { - if pat == null as *Pattern { return; } - // Guarded: bind from inner pattern only (`p if cond`) - if pat.kind == pkGuarded { - Sema_BindPattern(sema, pat.patChild1, subject); - return; - } - if pat.kind == pkIdent { - var sym: Symbol; - Sema_ZeroInitSymbol(&sym); - sym.kind = skVar; - sym.name = pat.patIdent; - sym.typeKind = tyInt; - sym.typeName = "int"; - if subject != null as *Expr && subject.refType != null as *TypeExpr { - sym.refType = subject.refType; - sym.typeName = subject.refType.typeName; - sym.typeKind = Sema_ResolveType(sema, subject.refType); - } + func Sema_ZeroInitSymbol(sym: *Symbol) { + sym.kind = 0; + sym.name = ""; + sym.typeKind = 0; + sym.typeName = ""; + sym.refType = null as *TypeExpr; sym.isMutable = false; sym.isPublic = false; sym.decl = null as *Decl; - discard Scope_Define(sema.scope, sym); - return; } - if pat.kind == pkEnum { - // Resolve enum + variant field types for payload bindings - var enumName: String = ""; - var variantName: String = pat.patEnumPath; - if String_Contains(pat.patEnumPath, "::") { - enumName = String_SplitPart(pat.patEnumPath, "::", 0); - variantName = String_SplitPart(pat.patEnumPath, "::", 1); - } else if subject != null as *Expr && subject.refType != null as *TypeExpr { - enumName = subject.refType.typeName; - } - var fieldType0: String = "int"; - var fieldType1: String = "int"; - var fieldCount: int = 0; - if !String_Eq(enumName, "") { - let enumSym: Symbol = Scope_Lookup(sema.scope, enumName); - if enumSym.decl != null as *Decl && enumSym.decl.kind == dkEnum { - var vi: int = 0; - while vi < enumSym.decl.variantCount { - var v: *EnumVariant = null as *EnumVariant; - if vi == 0 { v = &enumSym.decl.variant0; } - else if vi == 1 { v = &enumSym.decl.variant1; } - else if vi == 2 { v = &enumSym.decl.variant2; } - else if vi == 3 { v = &enumSym.decl.variant3; } - else if vi == 4 { v = &enumSym.decl.variant4; } - else if vi == 5 { v = &enumSym.decl.variant5; } - else if vi == 6 { v = &enumSym.decl.variant6; } - else if vi == 7 { v = &enumSym.decl.variant7; } - else if vi == 8 { v = &enumSym.decl.variant8; } - if v != null as *EnumVariant && String_Eq(v.name, variantName) { - fieldCount = v.fieldCount; - if !String_Eq(v.fieldTypeName0, "") { fieldType0 = v.fieldTypeName0; } - if !String_Eq(v.fieldTypeName1, "") { fieldType1 = v.fieldTypeName1; } - } - vi = vi + 1; - } - } - } - var arg: *Pattern = pat.patArgs; - var ai: int = 0; - while arg != null as *Pattern { - var ftype: String = "int"; - if ai == 0 { ftype = fieldType0; } - else if ai == 1 { ftype = fieldType1; } - if arg.kind == pkIdent { - var bsym: Symbol; - Sema_ZeroInitSymbol(&bsym); - bsym.kind = skVar; - bsym.name = arg.patIdent; - bsym.typeName = ftype; - bsym.typeKind = tyInt; - if String_Eq(ftype, "String") || String_Eq(ftype, "str") { bsym.typeKind = tyStr; } - else if String_Eq(ftype, "bool") { bsym.typeKind = tyBool; } - else if String_Eq(ftype, "float64") || String_Eq(ftype, "float") { bsym.typeKind = tyFloat64; } - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.typeName = ftype; - bsym.refType = te; - bsym.isMutable = false; - bsym.isPublic = false; - bsym.decl = null as *Decl; - discard Scope_Define(sema.scope, bsym); - } else { - // Nested pattern: synthesize a fake subject expr with payload type - let fake: *Expr = bux_alloc(sizeof(Expr)) as *Expr; - let fte: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - fte.kind = tekNamed; - fte.typeName = ftype; - fake.refType = fte; - Sema_BindPattern(sema, arg, fake); - } - arg = arg.patNext; - ai = ai + 1; - } - return; - } - // Tuple pattern: (a, b) — bind elements from subject tuple types - if pat.kind == pkTuple { - var ei: int = 0; - var elem: *Pattern = pat.patArgs; - while elem != null as *Pattern { - var ety: String = "int"; - if subject != null as *Expr && subject.refType != null as *TypeExpr { - if subject.refType.kind == tekTuple { - if ei == 0 && !String_Eq(subject.refType.typeArgName0, "") { - ety = subject.refType.typeArgName0; - } else if ei == 1 && !String_Eq(subject.refType.typeArgName1, "") { - ety = subject.refType.typeArgName1; - } - } - } - if elem.kind == pkIdent { - var bsym: Symbol; - Sema_ZeroInitSymbol(&bsym); - bsym.kind = skVar; - bsym.name = elem.patIdent; - bsym.typeName = ety; - bsym.typeKind = tyInt; - if String_Eq(ety, "String") || String_Eq(ety, "str") { bsym.typeKind = tyStr; } - else if String_Eq(ety, "bool") { bsym.typeKind = tyBool; } - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.typeName = ety; - bsym.refType = te; - bsym.isMutable = false; - discard Scope_Define(sema.scope, bsym); - } else { - let fake: *Expr = bux_alloc(sizeof(Expr)) as *Expr; - let fte: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - fte.kind = tekNamed; - fte.typeName = ety; - fake.refType = fte; - Sema_BindPattern(sema, elem, fake); - } - elem = elem.patNext; - ei = ei + 1; - } - return; - } - // Struct pattern: Point { x: a, y: b } - if pat.kind == pkStruct { - var structName: String = pat.patStructName; - if String_Eq(structName, "") && subject != null as *Expr && subject.refType != null as *TypeExpr { - structName = subject.refType.typeName; - } - var field: *Pattern = pat.patArgs; - while field != null as *Pattern { - var ftype: String = "int"; - if !String_Eq(structName, "") { - let ssym: Symbol = Scope_Lookup(sema.scope, structName); - if ssym.decl != null as *Decl && ssym.decl.kind == dkStruct && ssym.decl.fields != null as *StructField { - var fi: int = 0; - while fi < ssym.decl.fieldCount { - let sf: StructField = ssym.decl.fields[fi]; - var fname: String = field.patFieldName; - if String_Eq(fname, "") { fname = field.patIdent; } - if String_Eq(sf.name, fname) { - if sf.refFieldType != null as *TypeExpr && !String_Eq(sf.refFieldType.typeName, "") { - ftype = sf.refFieldType.typeName; - } - } - fi = fi + 1; - } - } - } - if field.kind == pkIdent { - var bsym: Symbol; - Sema_ZeroInitSymbol(&bsym); - bsym.kind = skVar; - bsym.name = field.patIdent; - bsym.typeName = ftype; - bsym.typeKind = tyInt; - if String_Eq(ftype, "String") || String_Eq(ftype, "str") { bsym.typeKind = tyStr; } - else if String_Eq(ftype, "bool") { bsym.typeKind = tyBool; } - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.typeName = ftype; - bsym.refType = te; - bsym.isMutable = false; - discard Scope_Define(sema.scope, bsym); - } else { - let fake: *Expr = bux_alloc(sizeof(Expr)) as *Expr; - let fte: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - fte.kind = tekNamed; - fte.typeName = ftype; - fake.refType = fte; - Sema_BindPattern(sema, field, fake); - } - field = field.patNext; - } - return; - } -} -func Sema_IsMutRefDeref(target: *Expr) -> bool { - if target == null as *Expr { return false; } - if target.kind != ekUnary { return false; } - if target.intValue != tkStar { return false; } - let operand: *Expr = target.child1; - if operand == null as *Expr { return false; } - if operand.refType == null as *TypeExpr { return false; } - return operand.refType.kind == tekMutRef; -} + // --------------------------------------------------------------------------- + // Build a tekFunc TypeExpr from a function declaration + // --------------------------------------------------------------------------- -func Sema_CheckExpr(sema: *Sema, expr: *Expr) -> int { - if expr == null as *Expr { return tyUnknown; } - let kind: int = expr.kind; - - // Literal - if kind == ekLiteral { - let tk: int = expr.tokKind; + func Sema_BuildFuncTypeExprFromDecl(decl: *Decl) -> *TypeExpr { let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - if tk == tkIntLiteral { te.typeName = "int"; expr.refType = te; return tyInt; } - if tk == tkFloatLiteral { te.typeName = "float64"; expr.refType = te; return tyFloat64; } - if tk == tkStringLiteral { te.typeName = "String"; expr.refType = te; return tyStr; } - if tk == tkBoolLiteral { te.typeName = "bool"; expr.refType = te; return tyBool; } - if tk == tkCharLiteral { te.typeName = "char32"; expr.refType = te; return tyChar32; } - if tk == tkNull { - te.typeName = "*void"; - expr.refType = te; + te.kind = tekFunc; + te.line = decl.line; + te.column = decl.column; + te.funcRet = decl.retType; + te.funcParamCount = decl.paramCount; + var head: *TypeExprList = null as *TypeExprList; + var tail: *TypeExprList = null as *TypeExprList; + var i: int = 0; + while i < decl.paramCount && i < 9 { + var p: Param; + if i == 0 { p = decl.param0; } + else if i == 1 { p = decl.param1; } + else if i == 2 { p = decl.param2; } + else if i == 3 { p = decl.param3; } + else if i == 4 { p = decl.param4; } + else if i == 5 { p = decl.param5; } + else if i == 6 { p = decl.param6; } + else if i == 7 { p = decl.param7; } + else { p = decl.param8; } + if p.refParamType != null as *TypeExpr { + let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; + node.te = p.refParamType; + node.next = null as *TypeExprList; + if head == null as *TypeExprList { + head = node; + } else { + tail.next = node; + } + tail = node; + } + i = i + 1; + } + te.funcParams = head; + return te; + } + + // --------------------------------------------------------------------------- + // Type resolution from TypeExpr → Type constants + // --------------------------------------------------------------------------- + + func Sema_ResolveType(sema: *Sema, te: *TypeExpr) -> int { + if te == null as *TypeExpr { return tyUnknown; } + + if te.kind == tekPointer { return tyPointer; } - return tyUnknown; + + if te.kind == tekFunc { + return tyFunc; + } + + if te.kind == tekTuple { + // Tuples lower to named C structs (Tuple_int_int, ...) + return tyNamed; + } + + return Type_FromName(te.typeName); } - // Identifier — look up in scope - if kind == ekIdent { - // Borrow check: use-after-move in @[Checked] functions - if sema.checkedFunc && !sema.releaseFunc && Sema_IsMoved(sema, expr.strValue) { - Sema_EmitError(sema, expr.line, expr.column, - String_Concat("use of moved value '", String_Concat(expr.strValue, "'"))); + // --------------------------------------------------------------------------- + // Type predicates + // --------------------------------------------------------------------------- + + func Sema_IsNumeric(kind: int) -> bool { + if kind == tyUnknown || kind == tyNamed || kind == tyTypeParam { return true; } + if kind == tyInt8 || kind == tyInt16 || kind == tyInt32 || kind == tyInt64 || kind == tyInt { return true; } + if kind == tyUInt8 || kind == tyUInt16 || kind == tyUInt32 || kind == tyUInt64 || kind == tyUInt { return true; } + if kind == tyFloat32 || kind == tyFloat64 { return true; } + return false; + } + + func Sema_IsBool(kind: int) -> bool { + return kind == tyBool || kind == tyBool8 || kind == tyBool16 || kind == tyBool32; + } + + // --------------------------------------------------------------------------- + // Block checking helper + // --------------------------------------------------------------------------- + + func Sema_CheckBlock(sema: *Sema, block: *Block) { + if block == null as *Block { return; } + // Create child scope for block (matching Nim bootstrap behavior) + var blockScope: Scope = Scope_NewChild(sema.scope); + let prevScope: *Scope = sema.scope; + sema.scope = &blockScope; + var stmt: *Stmt = block.firstStmt; + while stmt != null as *Stmt { + Sema_CheckStmt(sema, stmt); + stmt = stmt.nextStmt; } - let sym: Symbol = Scope_Lookup(sema.scope, expr.strValue); - if sym.kind == 0 && !String_Eq(sym.name, expr.strValue) { - let errMsg: String = String_Concat("undeclared identifier '", expr.strValue); - let errMsg2: String = String_Concat(errMsg, "'"); - Sema_EmitError(sema, expr.line, expr.column, errMsg2); - return tyUnknown; + sema.scope = prevScope; + } + + // --------------------------------------------------------------------------- + // Call argument resolution: inject defaults and reorder named args + // --------------------------------------------------------------------------- + + func Sema_ResolveCallArgs(sema: *Sema, expr: *Expr) { + if expr == null as *Expr || expr.kind != ekCall { return; } + if expr.child1 == null as *Expr || expr.child1.kind != ekIdent { return; } + let sym: Symbol = Scope_Lookup(sema.scope, expr.child1.strValue); + if sym.kind != skFunc || sym.decl == null as *Decl { return; } + let decl: *Decl = sym.decl; + if decl.paramCount == 0 { return; } + + // Check if any named args present + var hasNamed: bool = false; + var arg: *ExprList = expr.callArgs; + while arg != null as *ExprList { + if !String_Eq(arg.argName, "") { hasNamed = true; } + arg = arg.next; } - if sym.refType != null as *TypeExpr { - expr.refType = sym.refType; - } else if sym.typeName != null as String && !String_Eq(sym.typeName, "") { - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.typeName = sym.typeName; - expr.refType = te; - } - // Capture tracking: if inside closure and identifier is not local but from parent scope - if sema.closureDepth > 0 && sema.currentClosureExpr != null as *Expr && sema.closureScope != null as *Scope { - let localSym: Symbol = Scope_LookupUpTo(sema.scope, expr.strValue, sema.closureScope); - if localSym.kind == 0 && !String_Eq(localSym.name, expr.strValue) { - // Not local to closure scope — check if it's a variable from outer scope - if sym.kind == skVar { - Sema_AddCapture(sema.currentClosureExpr, expr.strValue, sym.typeKind); + if !hasNamed && expr.callArgCount >= decl.paramCount { return; } + + // Build new linked list in param order + var newFirst: *ExprList = null as *ExprList; + var newLast: *ExprList = null as *ExprList; + var newCount: int = 0; + var usedPositional: int = 0; + var positionalAfterNamed: bool = false; + + var i: int = 0; + while i < decl.paramCount { + var p: *Param = null as *Param; + if i == 0 { p = &decl.param0; } + else if i == 1 { p = &decl.param1; } + else if i == 2 { p = &decl.param2; } + else if i == 3 { p = &decl.param3; } + else if i == 4 { p = &decl.param4; } + else if i == 5 { p = &decl.param5; } + else if i == 6 { p = &decl.param6; } + else if i == 7 { p = &decl.param7; } + else if i == 8 { p = &decl.param8; } + + var matched: *Expr = null as *Expr; + + // Look for positional arg at this index + if usedPositional < expr.callArgCount { + var posIdx: int = 0; + var posArg: *ExprList = expr.callArgs; + while posArg != null as *ExprList { + if String_Eq(posArg.argName, "") { + if posIdx == usedPositional { + matched = posArg.expr; + usedPositional = usedPositional + 1; + break; + } + posIdx = posIdx + 1; + } + posArg = posArg.next; } } + + // Look for named arg matching this param + if matched == null as *Expr { + var namedArg: *ExprList = expr.callArgs; + while namedArg != null as *ExprList { + if String_Eq(namedArg.argName, p.name) { + matched = namedArg.expr; + break; + } + namedArg = namedArg.next; + } + } + + // Use default if available + if matched == null as *Expr && p.defaultExpr != null as *Expr { + matched = p.defaultExpr; + } + + if matched != null as *Expr { + let node: *ExprList = bux_alloc(sizeof(ExprList)) as *ExprList; + node.expr = matched; + node.next = null as *ExprList; + node.argName = ""; + if newFirst == null as *ExprList { + newFirst = node; + newLast = node; + } else { + newLast.next = node; + newLast = node; + } + newCount = newCount + 1; + } + + i = i + 1; } - return sym.typeKind; + + expr.callArgs = newFirst; + expr.callArgCount = newCount; } - // self - if kind == ekSelf { - let sym: Symbol = Scope_Lookup(sema.scope, "self"); - if sym.kind == 0 && !String_Eq(sym.name, "self") { - Sema_EmitError(sema, expr.line, expr.column, "self outside method"); - return tyUnknown; - } - return sym.typeKind; + // --------------------------------------------------------------------------- + // Borrow checker helpers (inline array, matching Decl param pattern) + // --------------------------------------------------------------------------- + + func Sema_AddMoved(sema: *Sema, name: String) { + if sema == null as *Sema { return; } + if sema.movedCount >= 8 { return; } + if sema.movedCount == 0 { sema.movedName0 = name; } + else if sema.movedCount == 1 { sema.movedName1 = name; } + else if sema.movedCount == 2 { sema.movedName2 = name; } + else if sema.movedCount == 3 { sema.movedName3 = name; } + else if sema.movedCount == 4 { sema.movedName4 = name; } + else if sema.movedCount == 5 { sema.movedName5 = name; } + else if sema.movedCount == 6 { sema.movedName6 = name; } + else if sema.movedCount == 7 { sema.movedName7 = name; } + sema.movedCount = sema.movedCount + 1; } - // Binary - if kind == ekBinary { - let left: int = Sema_CheckExpr(sema, expr.child1); - let right: int = Sema_CheckExpr(sema, expr.child2); - let op: int = expr.intValue; + func Sema_IsMoved(sema: *Sema, name: String) -> bool { + if sema == null as *Sema { return false; } + if sema.movedCount > 0 && String_Eq(sema.movedName0, name) { return true; } + if sema.movedCount > 1 && String_Eq(sema.movedName1, name) { return true; } + if sema.movedCount > 2 && String_Eq(sema.movedName2, name) { return true; } + if sema.movedCount > 3 && String_Eq(sema.movedName3, name) { return true; } + if sema.movedCount > 4 && String_Eq(sema.movedName4, name) { return true; } + if sema.movedCount > 5 && String_Eq(sema.movedName5, name) { return true; } + if sema.movedCount > 6 && String_Eq(sema.movedName6, name) { return true; } + if sema.movedCount > 7 && String_Eq(sema.movedName7, name) { return true; } + return false; + } - // Borrow check: reject assignment through raw pointer in @[Checked] functions. - // Allow writes through &mut T references. - if sema.checkedFunc && !sema.releaseFunc && op == tkAssign && - expr.child1 != null as *Expr && expr.child1.kind == ekUnary && expr.child1.intValue == tkStar && - !Sema_IsMutRefDeref(expr.child1) { - Sema_EmitError(sema, expr.line, expr.column, - "cannot assign through raw pointer in checked function — use '&mut T' instead"); + func Sema_RemoveMoved(sema: *Sema, name: String) { + if sema == null as *Sema { return; } + var found: int = -1; + if sema.movedCount > 0 && String_Eq(sema.movedName0, name) { found = 0; } + else if sema.movedCount > 1 && String_Eq(sema.movedName1, name) { found = 1; } + else if sema.movedCount > 2 && String_Eq(sema.movedName2, name) { found = 2; } + else if sema.movedCount > 3 && String_Eq(sema.movedName3, name) { found = 3; } + else if sema.movedCount > 4 && String_Eq(sema.movedName4, name) { found = 4; } + else if sema.movedCount > 5 && String_Eq(sema.movedName5, name) { found = 5; } + else if sema.movedCount > 6 && String_Eq(sema.movedName6, name) { found = 6; } + else if sema.movedCount > 7 && String_Eq(sema.movedName7, name) { found = 7; } + if found >= 0 { + var i: int = found; + while i < sema.movedCount - 1 { + if i == 0 { sema.movedName0 = sema.movedName1; } + else if i == 1 { sema.movedName1 = sema.movedName2; } + else if i == 2 { sema.movedName2 = sema.movedName3; } + else if i == 3 { sema.movedName3 = sema.movedName4; } + else if i == 4 { sema.movedName4 = sema.movedName5; } + else if i == 5 { sema.movedName5 = sema.movedName6; } + else if i == 6 { sema.movedName6 = sema.movedName7; } + i = i + 1; + } + sema.movedCount = sema.movedCount - 1; + } + } + + // --------------------------------------------------------------------------- + // Lifetime elision helpers (C.1) — selfhost parity with bootstrap + // --------------------------------------------------------------------------- + + func Sema_ClearLifetimes(sema: *Sema) { + if sema == null as *Sema { return; } + sema.ltCount = 0; + sema.returnLifetime = ""; + sema.ltAnon = 0; + } + + func Sema_SetVarLifetime(sema: *Sema, name: String, lt: String) { + if sema == null as *Sema { return; } + if String_Eq(name, "") { return; } + // Update existing binding + if sema.ltCount > 0 && String_Eq(sema.ltName0, name) { sema.ltVal0 = lt; return; } + if sema.ltCount > 1 && String_Eq(sema.ltName1, name) { sema.ltVal1 = lt; return; } + if sema.ltCount > 2 && String_Eq(sema.ltName2, name) { sema.ltVal2 = lt; return; } + if sema.ltCount > 3 && String_Eq(sema.ltName3, name) { sema.ltVal3 = lt; return; } + if sema.ltCount > 4 && String_Eq(sema.ltName4, name) { sema.ltVal4 = lt; return; } + if sema.ltCount > 5 && String_Eq(sema.ltName5, name) { sema.ltVal5 = lt; return; } + if sema.ltCount > 6 && String_Eq(sema.ltName6, name) { sema.ltVal6 = lt; return; } + if sema.ltCount > 7 && String_Eq(sema.ltName7, name) { sema.ltVal7 = lt; return; } + if sema.ltCount >= 8 { return; } + if sema.ltCount == 0 { sema.ltName0 = name; sema.ltVal0 = lt; } + else if sema.ltCount == 1 { sema.ltName1 = name; sema.ltVal1 = lt; } + else if sema.ltCount == 2 { sema.ltName2 = name; sema.ltVal2 = lt; } + else if sema.ltCount == 3 { sema.ltName3 = name; sema.ltVal3 = lt; } + else if sema.ltCount == 4 { sema.ltName4 = name; sema.ltVal4 = lt; } + else if sema.ltCount == 5 { sema.ltName5 = name; sema.ltVal5 = lt; } + else if sema.ltCount == 6 { sema.ltName6 = name; sema.ltVal6 = lt; } + else if sema.ltCount == 7 { sema.ltName7 = name; sema.ltVal7 = lt; } + sema.ltCount = sema.ltCount + 1; + } + + func Sema_GetVarLifetime(sema: *Sema, name: String) -> String { + if sema == null as *Sema { return ""; } + if sema.ltCount > 0 && String_Eq(sema.ltName0, name) { return sema.ltVal0; } + if sema.ltCount > 1 && String_Eq(sema.ltName1, name) { return sema.ltVal1; } + if sema.ltCount > 2 && String_Eq(sema.ltName2, name) { return sema.ltVal2; } + if sema.ltCount > 3 && String_Eq(sema.ltName3, name) { return sema.ltVal3; } + if sema.ltCount > 4 && String_Eq(sema.ltName4, name) { return sema.ltVal4; } + if sema.ltCount > 5 && String_Eq(sema.ltName5, name) { return sema.ltVal5; } + if sema.ltCount > 6 && String_Eq(sema.ltName6, name) { return sema.ltVal6; } + if sema.ltCount > 7 && String_Eq(sema.ltName7, name) { return sema.ltVal7; } + return ""; + } + + func Sema_DeclParam(decl: *Decl, i: int) -> *Param { + if decl == null as *Decl { return null as *Param; } + if i == 0 { return &decl.param0; } + if i == 1 { return &decl.param1; } + if i == 2 { return &decl.param2; } + if i == 3 { return &decl.param3; } + if i == 4 { return &decl.param4; } + if i == 5 { return &decl.param5; } + if i == 6 { return &decl.param6; } + if i == 7 { return &decl.param7; } + if i == 8 { return &decl.param8; } + return null as *Param; + } + + func Sema_ApplyLifetimeElision(sema: *Sema, decl: *Decl) { + // Rust-style elision for @[Checked] functions (single-input + self). + Sema_ClearLifetimes(sema); + if sema == null as *Sema || decl == null as *Decl { return; } + if !sema.checkedFunc || sema.releaseFunc { return; } + + var inputLt0: String = ""; + var inputCount: int = 0; + var firstParamName: String = ""; + var i: int = 0; + while i < decl.paramCount { + let p: *Param = Sema_DeclParam(decl, i); + if p != null as *Param && p.refParamType != null as *TypeExpr { + let pk: int = p.refParamType.kind; + if pk == tekRef || pk == tekMutRef { + var lt: String = p.refParamType.refLifetime; + if String_Eq(lt, "") { + lt = String_Concat("#elided", bux_int_to_str(sema.ltAnon as int64)); + sema.ltAnon = sema.ltAnon + 1; + } + Sema_SetVarLifetime(sema, p.name, lt); + if inputCount == 0 { inputLt0 = lt; } + inputCount = inputCount + 1; + } + } + if i == 0 && p != null as *Param { + firstParamName = p.name; + } + i = i + 1; } - // Borrow check: reinitialization after move - if sema.checkedFunc && !sema.releaseFunc && op == tkAssign { - if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { - Sema_RemoveMoved(sema, expr.child1.strValue); + if decl.retType == null as *TypeExpr { return; } + let rk: int = decl.retType.kind; + if rk != tekRef && rk != tekMutRef { return; } + + var rlt: String = decl.retType.refLifetime; + if String_Eq(rlt, "") { + if inputCount == 1 { + rlt = inputLt0; + } else if inputCount == 0 { + rlt = "#out"; + } else if String_Eq(firstParamName, "self") || String_Eq(firstParamName, "Self") { + rlt = inputLt0; + } else { + Sema_EmitError(sema, decl.line, decl.column, + "lifetime elision failed: return type needs an explicit lifetime (multiple input references); e.g. func F<'a>(a: &'a T, b: &'a U) -> &'a T"); + rlt = "#ambiguous"; } } + sema.returnLifetime = rlt; + } - // Assignment operators return target type - if op == tkAssign || (op >= tkPlusAssign && op <= tkShrAssign) { - return left; + func Sema_ExtractBorrowedIdent(expr: *Expr) -> String { + // Identify source var of &x + if expr == null as *Expr { return ""; } + if expr.kind == ekUnary && expr.intValue == tkAmp { + if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { + return expr.child1.strValue; + } + if expr.child1 != null as *Expr && expr.child1.kind == ekUnary && + expr.child1.intValue == tkAmp && expr.child1.child1 != null as *Expr && + expr.child1.child1.kind == ekIdent { + return expr.child1.child1.strValue; + } + } + return ""; + } + + func Sema_ExprRefLifetime(sema: *Sema, expr: *Expr) -> String { + if sema == null as *Sema || expr == null as *Expr { return ""; } + if expr.kind == ekIdent { + return Sema_GetVarLifetime(sema, expr.strValue); + } + if expr.kind == ekUnary && expr.intValue == tkAmp { + let name: String = Sema_ExtractBorrowedIdent(expr); + if String_Eq(name, "") { return "#local"; } + let existing: String = Sema_GetVarLifetime(sema, name); + if !String_Eq(existing, "") { + // Reborrow of an existing ref binding keeps its lifetime + let sym: Symbol = Scope_Lookup(sema.scope, name); + if sym.refType != null as *TypeExpr { + if sym.refType.kind == tekRef || sym.refType.kind == tekMutRef { + return existing; + } + } + // Named as input lifetime but not a ref type? still use it + return existing; + } + return "#local"; + } + if expr.kind == ekUnary && expr.intValue == tkStar { + return Sema_ExprRefLifetime(sema, expr.child1); + } + if expr.kind == ekField { + let baseLt: String = Sema_ExprRefLifetime(sema, expr.child1); + if !String_Eq(baseLt, "") { return baseLt; } + if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { + let bl: String = Sema_GetVarLifetime(sema, expr.child1.strValue); + if !String_Eq(bl, "") { return bl; } + return "#local"; + } + return ""; + } + return ""; + } + + func Sema_CheckReturnLifetime(sema: *Sema, retExpr: *Expr, line: uint32, col: uint32) { + if sema == null as *Sema { return; } + if !sema.checkedFunc || sema.releaseFunc { return; } + if String_Eq(sema.returnLifetime, "") { return; } + if retExpr == null as *Expr { return; } + + let got: String = Sema_ExprRefLifetime(sema, retExpr); + if String_Eq(sema.returnLifetime, "#out") { + Sema_EmitError(sema, line, col, + "cannot return a reference: function has no input reference to borrow from"); + return; + } + if String_Eq(got, "#local") { + Sema_EmitError(sema, line, col, "cannot return reference to local variable"); + return; + } + if String_Eq(got, "") { return; } + if String_Eq(got, "#ambiguous") || String_Eq(sema.returnLifetime, "#ambiguous") { return; } + // Explicit lifetime mismatch + if String_StartsWith(got, "'") && String_StartsWith(sema.returnLifetime, "'") && + !String_Eq(got, sema.returnLifetime) { + Sema_EmitError(sema, line, col, + String_Concat("lifetime mismatch: returning '", + String_Concat(got, String_Concat("' but function returns '", + String_Concat(sema.returnLifetime, "'"))))); + return; + } + if String_StartsWith(got, "#elided") && String_StartsWith(sema.returnLifetime, "#elided") && + !String_Eq(got, sema.returnLifetime) { + Sema_EmitError(sema, line, col, + "lifetime mismatch: returned reference does not outlive the return type (multiple input references; annotate with an explicit lifetime)"); + } + } + + // --------------------------------------------------------------------------- + // Capture tracking for closures + // --------------------------------------------------------------------------- + + func Sema_AddCapture(closureExpr: *Expr, name: String, typeKind: int) { + if closureExpr == null as *Expr { return; } + // Check if already captured + var i: int = 0; + while i < closureExpr.captureCount { + var capName: String = ""; + if i == 0 { capName = closureExpr.captureName0; } + else if i == 1 { capName = closureExpr.captureName1; } + else if i == 2 { capName = closureExpr.captureName2; } + else if i == 3 { capName = closureExpr.captureName3; } + else if i == 4 { capName = closureExpr.captureName4; } + else if i == 5 { capName = closureExpr.captureName5; } + else if i == 6 { capName = closureExpr.captureName6; } + else if i == 7 { capName = closureExpr.captureName7; } + if String_Eq(capName, name) { return; } + i = i + 1; + } + // Add new capture (up to 8) + if closureExpr.captureCount < 8 { + let idx: int = closureExpr.captureCount; + if idx == 0 { closureExpr.captureName0 = name; closureExpr.captureType0 = typeKind; } + else if idx == 1 { closureExpr.captureName1 = name; closureExpr.captureType1 = typeKind; } + else if idx == 2 { closureExpr.captureName2 = name; closureExpr.captureType2 = typeKind; } + else if idx == 3 { closureExpr.captureName3 = name; closureExpr.captureType3 = typeKind; } + else if idx == 4 { closureExpr.captureName4 = name; closureExpr.captureType4 = typeKind; } + else if idx == 5 { closureExpr.captureName5 = name; closureExpr.captureType5 = typeKind; } + else if idx == 6 { closureExpr.captureName6 = name; closureExpr.captureType6 = typeKind; } + else if idx == 7 { closureExpr.captureName7 = name; closureExpr.captureType7 = typeKind; } + closureExpr.captureCount = closureExpr.captureCount + 1; + } + } + + // --------------------------------------------------------------------------- + // Expression type checking + // --------------------------------------------------------------------------- + + // Bind identifiers from a match pattern into the current scope. + // Enum payloads: Option::Some(value) → value:int (from variant field type). + func Sema_BindPattern(sema: *Sema, pat: *Pattern, subject: *Expr) { + if pat == null as *Pattern { return; } + // Guarded: bind from inner pattern only (`p if cond`) + if pat.kind == pkGuarded { + Sema_BindPattern(sema, pat.patChild1, subject); + return; + } + if pat.kind == pkIdent { + var sym: Symbol; + Sema_ZeroInitSymbol(&sym); + sym.kind = skVar; + sym.name = pat.patIdent; + sym.typeKind = tyInt; + sym.typeName = "int"; + if subject != null as *Expr && subject.refType != null as *TypeExpr { + sym.refType = subject.refType; + sym.typeName = subject.refType.typeName; + sym.typeKind = Sema_ResolveType(sema, subject.refType); + } + sym.isMutable = false; + sym.isPublic = false; + sym.decl = null as *Decl; + discard Scope_Define(sema.scope, sym); + return; + } + if pat.kind == pkEnum { + // Resolve enum + variant field types for payload bindings + var enumName: String = ""; + var variantName: String = pat.patEnumPath; + if String_Contains(pat.patEnumPath, "::") { + enumName = String_SplitPart(pat.patEnumPath, "::", 0); + variantName = String_SplitPart(pat.patEnumPath, "::", 1); + } else if subject != null as *Expr && subject.refType != null as *TypeExpr { + enumName = subject.refType.typeName; + } + var fieldType0: String = "int"; + var fieldType1: String = "int"; + var fieldCount: int = 0; + if !String_Eq(enumName, "") { + let enumSym: Symbol = Scope_Lookup(sema.scope, enumName); + if enumSym.decl != null as *Decl && enumSym.decl.kind == dkEnum { + var vi: int = 0; + while vi < enumSym.decl.variantCount { + var v: *EnumVariant = null as *EnumVariant; + if vi == 0 { v = &enumSym.decl.variant0; } + else if vi == 1 { v = &enumSym.decl.variant1; } + else if vi == 2 { v = &enumSym.decl.variant2; } + else if vi == 3 { v = &enumSym.decl.variant3; } + else if vi == 4 { v = &enumSym.decl.variant4; } + else if vi == 5 { v = &enumSym.decl.variant5; } + else if vi == 6 { v = &enumSym.decl.variant6; } + else if vi == 7 { v = &enumSym.decl.variant7; } + else if vi == 8 { v = &enumSym.decl.variant8; } + if v != null as *EnumVariant && String_Eq(v.name, variantName) { + fieldCount = v.fieldCount; + if !String_Eq(v.fieldTypeName0, "") { fieldType0 = v.fieldTypeName0; } + if !String_Eq(v.fieldTypeName1, "") { fieldType1 = v.fieldTypeName1; } + } + vi = vi + 1; + } + } + } + var arg: *Pattern = pat.patArgs; + var ai: int = 0; + while arg != null as *Pattern { + var ftype: String = "int"; + if ai == 0 { ftype = fieldType0; } + else if ai == 1 { ftype = fieldType1; } + if arg.kind == pkIdent { + var bsym: Symbol; + Sema_ZeroInitSymbol(&bsym); + bsym.kind = skVar; + bsym.name = arg.patIdent; + bsym.typeName = ftype; + bsym.typeKind = tyInt; + if String_Eq(ftype, "String") || String_Eq(ftype, "str") { bsym.typeKind = tyStr; } + else if String_Eq(ftype, "bool") { bsym.typeKind = tyBool; } + else if String_Eq(ftype, "float64") || String_Eq(ftype, "float") { bsym.typeKind = tyFloat64; } + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.typeName = ftype; + bsym.refType = te; + bsym.isMutable = false; + bsym.isPublic = false; + bsym.decl = null as *Decl; + discard Scope_Define(sema.scope, bsym); + } else { + // Nested pattern: synthesize a fake subject expr with payload type + let fake: *Expr = bux_alloc(sizeof(Expr)) as *Expr; + let fte: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + fte.kind = tekNamed; + fte.typeName = ftype; + fake.refType = fte; + Sema_BindPattern(sema, arg, fake); + } + arg = arg.patNext; + ai = ai + 1; + } + return; + } + // Tuple pattern: (a, b) — bind elements from subject tuple types + if pat.kind == pkTuple { + var ei: int = 0; + var elem: *Pattern = pat.patArgs; + while elem != null as *Pattern { + var ety: String = "int"; + if subject != null as *Expr && subject.refType != null as *TypeExpr { + if subject.refType.kind == tekTuple { + if ei == 0 && !String_Eq(subject.refType.typeArgName0, "") { + ety = subject.refType.typeArgName0; + } else if ei == 1 && !String_Eq(subject.refType.typeArgName1, "") { + ety = subject.refType.typeArgName1; + } + } + } + if elem.kind == pkIdent { + var bsym: Symbol; + Sema_ZeroInitSymbol(&bsym); + bsym.kind = skVar; + bsym.name = elem.patIdent; + bsym.typeName = ety; + bsym.typeKind = tyInt; + if String_Eq(ety, "String") || String_Eq(ety, "str") { bsym.typeKind = tyStr; } + else if String_Eq(ety, "bool") { bsym.typeKind = tyBool; } + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.typeName = ety; + bsym.refType = te; + bsym.isMutable = false; + discard Scope_Define(sema.scope, bsym); + } else { + let fake: *Expr = bux_alloc(sizeof(Expr)) as *Expr; + let fte: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + fte.kind = tekNamed; + fte.typeName = ety; + fake.refType = fte; + Sema_BindPattern(sema, elem, fake); + } + elem = elem.patNext; + ei = ei + 1; + } + return; + } + // Struct pattern: Point { x: a, y: b } + if pat.kind == pkStruct { + var structName: String = pat.patStructName; + if String_Eq(structName, "") && subject != null as *Expr && subject.refType != null as *TypeExpr { + structName = subject.refType.typeName; + } + var field: *Pattern = pat.patArgs; + while field != null as *Pattern { + var ftype: String = "int"; + if !String_Eq(structName, "") { + let ssym: Symbol = Scope_Lookup(sema.scope, structName); + if ssym.decl != null as *Decl && ssym.decl.kind == dkStruct && ssym.decl.fields != null as *StructField { + var fi: int = 0; + while fi < ssym.decl.fieldCount { + let sf: StructField = ssym.decl.fields[fi]; + var fname: String = field.patFieldName; + if String_Eq(fname, "") { fname = field.patIdent; } + if String_Eq(sf.name, fname) { + if sf.refFieldType != null as *TypeExpr && !String_Eq(sf.refFieldType.typeName, "") { + ftype = sf.refFieldType.typeName; + } + } + fi = fi + 1; + } + } + } + if field.kind == pkIdent { + var bsym: Symbol; + Sema_ZeroInitSymbol(&bsym); + bsym.kind = skVar; + bsym.name = field.patIdent; + bsym.typeName = ftype; + bsym.typeKind = tyInt; + if String_Eq(ftype, "String") || String_Eq(ftype, "str") { bsym.typeKind = tyStr; } + else if String_Eq(ftype, "bool") { bsym.typeKind = tyBool; } + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.typeName = ftype; + bsym.refType = te; + bsym.isMutable = false; + discard Scope_Define(sema.scope, bsym); + } else { + let fake: *Expr = bux_alloc(sizeof(Expr)) as *Expr; + let fte: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + fte.kind = tekNamed; + fte.typeName = ftype; + fake.refType = fte; + Sema_BindPattern(sema, field, fake); + } + field = field.patNext; + } + return; + } + } + + func Sema_IsMutRefDeref(target: *Expr) -> bool { + if target == null as *Expr { return false; } + if target.kind != ekUnary { return false; } + if target.intValue != tkStar { return false; } + let operand: *Expr = target.child1; + if operand == null as *Expr { return false; } + if operand.refType == null as *TypeExpr { return false; } + return operand.refType.kind == tekMutRef; + } + + func Sema_CheckExpr(sema: *Sema, expr: *Expr) -> int { + if expr == null as *Expr { return tyUnknown; } + let kind: int = expr.kind; + + // Literal + if kind == ekLiteral { + let tk: int = expr.tokKind; + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + if tk == tkIntLiteral { te.typeName = "int"; expr.refType = te; return tyInt; } + if tk == tkFloatLiteral { te.typeName = "float64"; expr.refType = te; return tyFloat64; } + if tk == tkStringLiteral { te.typeName = "String"; expr.refType = te; return tyStr; } + if tk == tkBoolLiteral { te.typeName = "bool"; expr.refType = te; return tyBool; } + if tk == tkCharLiteral { te.typeName = "char32"; expr.refType = te; return tyChar32; } + if tk == tkNull { + te.typeName = "*void"; + expr.refType = te; + return tyPointer; + } + return tyUnknown; } - // Operator overloading: check method table - var opMethodName: String = ""; - if op == tkPlus { opMethodName = "operator_add"; } - else if op == tkMinus { opMethodName = "operator_sub"; } - else if op == tkStar { opMethodName = "operator_mul"; } - else if op == tkSlash { opMethodName = "operator_div"; } - else if op == tkPercent { opMethodName = "operator_mod"; } - else if op == tkEq { opMethodName = "operator_eq"; } - else if op == tkNe { opMethodName = "operator_ne"; } - else if op == tkLt { opMethodName = "operator_lt"; } - else if op == tkLe { opMethodName = "operator_le"; } - else if op == tkGt { opMethodName = "operator_gt"; } - else if op == tkGe { opMethodName = "operator_ge"; } - else if op == tkAmp { opMethodName = "operator_bitand"; } - else if op == tkPipe { opMethodName = "operator_bitor"; } - else if op == tkCaret { opMethodName = "operator_xor"; } - else if op == tkShl { opMethodName = "operator_shl"; } - else if op == tkShr { opMethodName = "operator_shr"; } + // Identifier — look up in scope + if kind == ekIdent { + // Borrow check: use-after-move in @[Checked] functions + if sema.checkedFunc && !sema.releaseFunc && Sema_IsMoved(sema, expr.strValue) { + Sema_EmitError(sema, expr.line, expr.column, + String_Concat("use of moved value '", String_Concat(expr.strValue, "'"))); + } + let sym: Symbol = Scope_Lookup(sema.scope, expr.strValue); + if sym.kind == 0 && !String_Eq(sym.name, expr.strValue) { + let errMsg: String = String_Concat("undeclared identifier '", expr.strValue); + let errMsg2: String = String_Concat(errMsg, "'"); + Sema_EmitError(sema, expr.line, expr.column, errMsg2); + return tyUnknown; + } + if sym.refType != null as *TypeExpr { + expr.refType = sym.refType; + } else if sym.typeName != null as String && !String_Eq(sym.typeName, "") { + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.typeName = sym.typeName; + expr.refType = te; + } + // Capture tracking: if inside closure and identifier is not local but from parent scope + if sema.closureDepth > 0 && sema.currentClosureExpr != null as *Expr && sema.closureScope != null as *Scope { + let localSym: Symbol = Scope_LookupUpTo(sema.scope, expr.strValue, sema.closureScope); + if localSym.kind == 0 && !String_Eq(localSym.name, expr.strValue) { + // Not local to closure scope — check if it's a variable from outer scope + if sym.kind == skVar { + Sema_AddCapture(sema.currentClosureExpr, expr.strValue, sym.typeKind); + } + } + } + return sym.typeKind; + } - if !String_Eq(opMethodName, "") && left == tyNamed { + // self + if kind == ekSelf { + let sym: Symbol = Scope_Lookup(sema.scope, "self"); + if sym.kind == 0 && !String_Eq(sym.name, "self") { + Sema_EmitError(sema, expr.line, expr.column, "self outside method"); + return tyUnknown; + } + return sym.typeKind; + } + + // Binary + if kind == ekBinary { + let left: int = Sema_CheckExpr(sema, expr.child1); + let right: int = Sema_CheckExpr(sema, expr.child2); + let op: int = expr.intValue; + + // Borrow check: reject assignment through raw pointer in @[Checked] functions. + // Allow writes through &mut T references. + if sema.checkedFunc && !sema.releaseFunc && op == tkAssign && + expr.child1 != null as *Expr && expr.child1.kind == ekUnary && expr.child1.intValue == tkStar && + !Sema_IsMutRefDeref(expr.child1) { + Sema_EmitError(sema, expr.line, expr.column, + "cannot assign through raw pointer in checked function — use '&mut T' instead"); + } + + // Borrow check: reinitialization after move + if sema.checkedFunc && !sema.releaseFunc && op == tkAssign { + if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { + Sema_RemoveMoved(sema, expr.child1.strValue); + } + } + + // Assignment operators return target type + if op == tkAssign || (op >= tkPlusAssign && op <= tkShrAssign) { + return left; + } + + // Operator overloading: check method table + var opMethodName: String = ""; + if op == tkPlus { opMethodName = "operator_add"; } + else if op == tkMinus { opMethodName = "operator_sub"; } + else if op == tkStar { opMethodName = "operator_mul"; } + else if op == tkSlash { opMethodName = "operator_div"; } + else if op == tkPercent { opMethodName = "operator_mod"; } + else if op == tkEq { opMethodName = "operator_eq"; } + else if op == tkNe { opMethodName = "operator_ne"; } + else if op == tkLt { opMethodName = "operator_lt"; } + else if op == tkLe { opMethodName = "operator_le"; } + else if op == tkGt { opMethodName = "operator_gt"; } + else if op == tkGe { opMethodName = "operator_ge"; } + else if op == tkAmp { opMethodName = "operator_bitand"; } + else if op == tkPipe { opMethodName = "operator_bitor"; } + else if op == tkCaret { opMethodName = "operator_xor"; } + else if op == tkShl { opMethodName = "operator_shl"; } + else if op == tkShr { opMethodName = "operator_shr"; } + + if !String_Eq(opMethodName, "") && left == tyNamed { + var receiverTypeName: String = ""; + if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { + receiverTypeName = expr.child1.refType.typeName; + } + if !String_Eq(receiverTypeName, "") { + var i: int = 0; + while i < sema.methodCount { + if String_Eq(sema.methodEntries[i].typeName, receiverTypeName) && + String_Eq(sema.methodEntries[i].methodName, opMethodName) { + let methodDecl: *Decl = sema.methodEntries[i].decl; + if methodDecl != null as *Decl && methodDecl.paramCount == 2 { + if methodDecl.retType != null as *TypeExpr { + expr.refType = methodDecl.retType; + return Sema_ResolveType(sema, methodDecl.retType); + } + return tyUnknown; + } + } + i = i + 1; + } + } + } + + // Comparison operators return bool + if op >= tkEq && op <= tkGe { return tyBool; } + // Logical operators return bool + if op == tkAmpAmp || op == tkPipePipe || op == tkBang { return tyBool; } + // Arithmetic returns wider type + if !Sema_IsNumeric(left) || !Sema_IsNumeric(right) { + Sema_EmitError(sema, expr.line, expr.column, "arithmetic requires numeric operands"); + } + if left == tyFloat64 || right == tyFloat64 { return tyFloat64; } + return tyInt; + } + + // Unary + if kind == ekUnary { + let operand: int = Sema_CheckExpr(sema, expr.child1); + let op: int = expr.intValue; + if op == tkStar { + return tyUnknown; + } + if op == tkBang { return tyBool; } + if op == tkAmp { + if expr.child1.refType != null as *TypeExpr { + expr.refType = expr.child1.refType; + } + return tyPointer; + } + return operand; + } + + // Assign + if kind == ekAssign { + let target: int = Sema_CheckExpr(sema, expr.child1); + let value: int = Sema_CheckExpr(sema, expr.child2); + // Borrow check: reject assignment through raw pointer in @[Checked] functions. + // Allow writes through &mut T references. + if sema.checkedFunc && !sema.releaseFunc && + expr.child1 != null as *Expr && expr.child1.kind == ekUnary && expr.child1.intValue == tkStar && + !Sema_IsMutRefDeref(expr.child1) { + Sema_EmitError(sema, expr.line, expr.column, + "cannot assign through raw pointer in checked function — use '&mut T' instead"); + } + return target; + } + + // Call + if kind == ekCall { + let calleeType: int = Sema_CheckExpr(sema, expr.child1); + Sema_ResolveCallArgs(sema, expr); + var arg: *ExprList = expr.callArgs; + while arg != null as *ExprList { + discard Sema_CheckExpr(sema, arg.expr); + arg = arg.next; + } + // Borrow check: reject double mutable borrow in @[Checked] functions + if sema.checkedFunc && !sema.releaseFunc { + var a: *ExprList = expr.callArgs; + var ai: int = 0; + while a != null as *ExprList { + if a.expr != null as *Expr && a.expr.kind == ekUnary && a.expr.intValue == tkAmp { + if a.expr.child1 != null as *Expr && a.expr.child1.kind == ekIdent { + let name1: String = a.expr.child1.strValue; + var b: *ExprList = a.next; + var bi: int = ai + 1; + while b != null as *ExprList { + if b.expr != null as *Expr && b.expr.kind == ekUnary && b.expr.intValue == tkAmp { + if b.expr.child1 != null as *Expr && b.expr.child1.kind == ekIdent { + if String_Eq(name1, b.expr.child1.strValue) { + Sema_EmitError(sema, expr.line, expr.column, + String_Concat("mutable borrow conflict: multiple &mut references to '", String_Concat(name1, "'"))); + } + } + } + b = b.next; + bi = bi + 1; + } + } + } + a = a.next; + ai = ai + 1; + } + } + // Trait bounds + inference for generic calls: Max / Iter_Map / Array_Push + if expr.child1.kind == ekIdent { + let sym: Symbol = Scope_Lookup(sema.scope, expr.child1.strValue); + if sym.kind == skFunc && sym.decl != null as *Decl { + // Implicit generic type argument inference + if expr.child1.genericTypeArgCount == 0 && sym.decl.typeParamCount > 0 { + Sema_InferGenericArgs(sema, sym.decl, expr); + } + if expr.child1.genericTypeArgCount > 0 { + Sema_CheckTraitBounds(sema, sym.decl, expr.child1.genericTypeArg0, expr.child1.genericTypeArg1, expr.child1.genericTypeArgCount, expr.line, expr.column); + } + } + } + // Indirect call through function-typed value + if calleeType == tyFunc { + if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind == tekFunc { + if expr.child1.refType.funcRet != null as *TypeExpr { + expr.refType = expr.child1.refType.funcRet; + return Sema_ResolveType(sema, expr.child1.refType.funcRet); + } + return tyVoid; + } + } + // Direct call to named function — substitute return type with inferred args + if expr.child1.kind == ekIdent { + let sym: Symbol = Scope_Lookup(sema.scope, expr.child1.strValue); + if sym.kind == skFunc && sym.decl != null as *Decl { + if sym.decl.retType != null as *TypeExpr { + var retTe: *TypeExpr = sym.decl.retType; + // Substitute type params in return type when we inferred args + if expr.child1.genericTypeArgCount > 0 { + retTe = Sema_SubstTypeExpr(sym.decl.retType, + sym.decl.typeParam0, expr.child1.genericTypeArg0, + sym.decl.typeParam1, expr.child1.genericTypeArg1, + expr.child1.genericTypeArgCount); + } + expr.refType = retTe; + return Sema_ResolveType(sema, retTe); + } + } + } + return tyUnknown; + } + + // Ternary + if kind == ekTernary { + return Sema_CheckExpr(sema, expr.child2); // then type + } + + // Cast — return target type + if kind == ekCast { + // Must type-check the operand (enables generic inference on nested calls) + if expr.child1 != null as *Expr { + discard Sema_CheckExpr(sema, expr.child1); + } + if expr.refType != null as *TypeExpr { + return Sema_ResolveType(sema, expr.refType); + } + return tyUnknown; + } + + // Try (?) + if kind == ekTry { + let inner: int = Sema_CheckExpr(sema, expr.child1); + return inner; // simplified + } + + // spawn Callee(args) + if kind == ekSpawn { + discard Sema_CheckExpr(sema, expr.child1); + if expr.child2 != null as *Expr { + discard Sema_CheckExpr(sema, expr.child2); + } + // Determine if callee is async + var calleeName: String = ""; + if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { + calleeName = expr.child1.strValue; + } + if !String_Eq(calleeName, "") { + let sym: Symbol = Scope_Lookup(sema.scope, calleeName); + if sym.decl != null as *Decl && sym.decl.kind == dkFunc && sym.decl.isAsync { + expr.boolValue = true; + } + } + return tyPointer; + } + + // Struct init: TypeName { field: value, ... } + if kind == ekStructInit { + return tyNamed; + } + + // Tuple expression (a, b, ...) + if kind == ekTuple { + var cur: *ExprList = expr.callArgs; + while cur != null as *ExprList { + discard Sema_CheckExpr(sema, cur.expr); + cur = cur.next; + } + // Build Tuple_* type name from element types (default int) + var tname: String = "Tuple"; + var i: int = 0; + while i < expr.callArgCount { + tname = String_Concat(tname, "_int"); + i = i + 1; + } + if expr.callArgCount == 0 { tname = "Tuple_Empty"; } + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekTuple; + te.typeName = tname; + te.tupleCount = expr.callArgCount; + expr.refType = te; + return tyNamed; + } + + // Field access + if kind == ekField { + discard Sema_CheckExpr(sema, expr.child1); + // Tuple field .0 / .1 stored as "_0" / "_1" → element type (int for now) + if String_StartsWith(expr.strValue, "_") { + // Propagate element type as int; real C type is Tuple field + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.typeName = "int"; + expr.refType = te; + return tyInt; + } + return tyUnknown; + } + + // Index + if kind == ekIndex { + let obj: int = Sema_CheckExpr(sema, expr.child1); + let idx: int = Sema_CheckExpr(sema, expr.child2); + if !Sema_IsNumeric(idx) && idx != tyUnknown { + Sema_EmitError(sema, expr.line, expr.column, "index must be integer"); + } + // Operator overloading: check method table for operator_index_get var receiverTypeName: String = ""; if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { - receiverTypeName = expr.child1.refType.typeName; + let refTe: *TypeExpr = expr.child1.refType; + if refTe.kind == tekNamed { + receiverTypeName = refTe.typeName; + } else if refTe.kind == tekPointer && refTe.pointerPointee != null as *TypeExpr && refTe.pointerPointee.kind == tekNamed { + receiverTypeName = refTe.pointerPointee.typeName; + } } if !String_Eq(receiverTypeName, "") { var i: int = 0; while i < sema.methodCount { if String_Eq(sema.methodEntries[i].typeName, receiverTypeName) && - String_Eq(sema.methodEntries[i].methodName, opMethodName) { + String_Eq(sema.methodEntries[i].methodName, "operator_index_get") { let methodDecl: *Decl = sema.methodEntries[i].decl; if methodDecl != null as *Decl && methodDecl.paramCount == 2 { if methodDecl.retType != null as *TypeExpr { @@ -729,1392 +1198,1173 @@ func Sema_CheckExpr(sema: *Sema, expr: *Expr) -> int { i = i + 1; } } - } - - // Comparison operators return bool - if op >= tkEq && op <= tkGe { return tyBool; } - // Logical operators return bool - if op == tkAmpAmp || op == tkPipePipe || op == tkBang { return tyBool; } - // Arithmetic returns wider type - if !Sema_IsNumeric(left) || !Sema_IsNumeric(right) { - Sema_EmitError(sema, expr.line, expr.column, "arithmetic requires numeric operands"); - } - if left == tyFloat64 || right == tyFloat64 { return tyFloat64; } - return tyInt; - } - - // Unary - if kind == ekUnary { - let operand: int = Sema_CheckExpr(sema, expr.child1); - let op: int = expr.intValue; - if op == tkStar { return tyUnknown; } - if op == tkBang { return tyBool; } - if op == tkAmp { - if expr.child1.refType != null as *TypeExpr { - expr.refType = expr.child1.refType; - } - return tyPointer; - } - return operand; - } - // Assign - if kind == ekAssign { - let target: int = Sema_CheckExpr(sema, expr.child1); - let value: int = Sema_CheckExpr(sema, expr.child2); - // Borrow check: reject assignment through raw pointer in @[Checked] functions. - // Allow writes through &mut T references. - if sema.checkedFunc && !sema.releaseFunc && - expr.child1 != null as *Expr && expr.child1.kind == ekUnary && expr.child1.intValue == tkStar && - !Sema_IsMutRefDeref(expr.child1) { - Sema_EmitError(sema, expr.line, expr.column, - "cannot assign through raw pointer in checked function — use '&mut T' instead"); - } - return target; - } - - // Call - if kind == ekCall { - let calleeType: int = Sema_CheckExpr(sema, expr.child1); - Sema_ResolveCallArgs(sema, expr); - var arg: *ExprList = expr.callArgs; - while arg != null as *ExprList { - discard Sema_CheckExpr(sema, arg.expr); - arg = arg.next; - } - // Borrow check: reject double mutable borrow in @[Checked] functions - if sema.checkedFunc && !sema.releaseFunc { - var a: *ExprList = expr.callArgs; - var ai: int = 0; - while a != null as *ExprList { - if a.expr != null as *Expr && a.expr.kind == ekUnary && a.expr.intValue == tkAmp { - if a.expr.child1 != null as *Expr && a.expr.child1.kind == ekIdent { - let name1: String = a.expr.child1.strValue; - var b: *ExprList = a.next; - var bi: int = ai + 1; - while b != null as *ExprList { - if b.expr != null as *Expr && b.expr.kind == ekUnary && b.expr.intValue == tkAmp { - if b.expr.child1 != null as *Expr && b.expr.child1.kind == ekIdent { - if String_Eq(name1, b.expr.child1.strValue) { - Sema_EmitError(sema, expr.line, expr.column, - String_Concat("mutable borrow conflict: multiple &mut references to '", String_Concat(name1, "'"))); - } - } - } - b = b.next; - bi = bi + 1; - } - } - } - a = a.next; - ai = ai + 1; - } - } - // Trait bounds + inference for generic calls: Max / Iter_Map / Array_Push - if expr.child1.kind == ekIdent { - let sym: Symbol = Scope_Lookup(sema.scope, expr.child1.strValue); - if sym.kind == skFunc && sym.decl != null as *Decl { - // Implicit generic type argument inference - if expr.child1.genericTypeArgCount == 0 && sym.decl.typeParamCount > 0 { - Sema_InferGenericArgs(sema, sym.decl, expr); - } - if expr.child1.genericTypeArgCount > 0 { - Sema_CheckTraitBounds(sema, sym.decl, expr.child1.genericTypeArg0, expr.child1.genericTypeArg1, expr.child1.genericTypeArgCount, expr.line, expr.column); + // Block expression (boolValue = true means unsafe block) + if kind == ekBlock { + if expr.refBlock != null as *Block { + if expr.boolValue { + let prevChecked: bool = sema.checkedFunc; + sema.checkedFunc = false; + Sema_CheckBlock(sema, expr.refBlock); + sema.checkedFunc = prevChecked; + } else { + Sema_CheckBlock(sema, expr.refBlock); } } + return tyVoid; } - // Indirect call through function-typed value - if calleeType == tyFunc { - if expr.child1.refType != null as *TypeExpr && expr.child1.refType.kind == tekFunc { - if expr.child1.refType.funcRet != null as *TypeExpr { - expr.refType = expr.child1.refType.funcRet; - return Sema_ResolveType(sema, expr.child1.refType.funcRet); - } - return tyVoid; - } - } - // Direct call to named function — substitute return type with inferred args - if expr.child1.kind == ekIdent { - let sym: Symbol = Scope_Lookup(sema.scope, expr.child1.strValue); - if sym.kind == skFunc && sym.decl != null as *Decl { - if sym.decl.retType != null as *TypeExpr { - var retTe: *TypeExpr = sym.decl.retType; - // Substitute type params in return type when we inferred args - if expr.child1.genericTypeArgCount > 0 { - retTe = Sema_SubstTypeExpr(sym.decl.retType, - sym.decl.typeParam0, expr.child1.genericTypeArg0, - sym.decl.typeParam1, expr.child1.genericTypeArg1, - expr.child1.genericTypeArgCount); - } - expr.refType = retTe; - return Sema_ResolveType(sema, retTe); - } - } - } - return tyUnknown; - } - // Ternary - if kind == ekTernary { - return Sema_CheckExpr(sema, expr.child2); // then type - } - - // Cast — return target type - if kind == ekCast { - // Must type-check the operand (enables generic inference on nested calls) - if expr.child1 != null as *Expr { - discard Sema_CheckExpr(sema, expr.child1); - } - if expr.refType != null as *TypeExpr { - return Sema_ResolveType(sema, expr.refType); - } - return tyUnknown; - } - - // Try (?) - if kind == ekTry { - let inner: int = Sema_CheckExpr(sema, expr.child1); - return inner; // simplified - } - - // spawn Callee(args) - if kind == ekSpawn { - discard Sema_CheckExpr(sema, expr.child1); - if expr.child2 != null as *Expr { - discard Sema_CheckExpr(sema, expr.child2); - } - // Determine if callee is async - var calleeName: String = ""; - if expr.child1 != null as *Expr && expr.child1.kind == ekIdent { - calleeName = expr.child1.strValue; - } - if !String_Eq(calleeName, "") { - let sym: Symbol = Scope_Lookup(sema.scope, calleeName); - if sym.decl != null as *Decl && sym.decl.kind == dkFunc && sym.decl.isAsync { - expr.boolValue = true; - } - } - return tyPointer; - } - - // Struct init: TypeName { field: value, ... } - if kind == ekStructInit { - return tyNamed; - } - - // Tuple expression (a, b, ...) - if kind == ekTuple { - var cur: *ExprList = expr.callArgs; - while cur != null as *ExprList { - discard Sema_CheckExpr(sema, cur.expr); - cur = cur.next; - } - // Build Tuple_* type name from element types (default int) - var tname: String = "Tuple"; - var i: int = 0; - while i < expr.callArgCount { - tname = String_Concat(tname, "_int"); - i = i + 1; - } - if expr.callArgCount == 0 { tname = "Tuple_Empty"; } - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekTuple; - te.typeName = tname; - te.tupleCount = expr.callArgCount; - expr.refType = te; - return tyNamed; - } - - // Field access - if kind == ekField { - discard Sema_CheckExpr(sema, expr.child1); - // Tuple field .0 / .1 stored as "_0" / "_1" → element type (int for now) - if String_StartsWith(expr.strValue, "_") { - // Propagate element type as int; real C type is Tuple field - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.typeName = "int"; - expr.refType = te; - return tyInt; - } - return tyUnknown; - } - - // Index - if kind == ekIndex { - let obj: int = Sema_CheckExpr(sema, expr.child1); - let idx: int = Sema_CheckExpr(sema, expr.child2); - if !Sema_IsNumeric(idx) && idx != tyUnknown { - Sema_EmitError(sema, expr.line, expr.column, "index must be integer"); - } - // Operator overloading: check method table for operator_index_get - var receiverTypeName: String = ""; - if expr.child1 != null as *Expr && expr.child1.refType != null as *TypeExpr { - let refTe: *TypeExpr = expr.child1.refType; - if refTe.kind == tekNamed { - receiverTypeName = refTe.typeName; - } else if refTe.kind == tekPointer && refTe.pointerPointee != null as *TypeExpr && refTe.pointerPointee.kind == tekNamed { - receiverTypeName = refTe.pointerPointee.typeName; - } - } - if !String_Eq(receiverTypeName, "") { - var i: int = 0; - while i < sema.methodCount { - if String_Eq(sema.methodEntries[i].typeName, receiverTypeName) && - String_Eq(sema.methodEntries[i].methodName, "operator_index_get") { - let methodDecl: *Decl = sema.methodEntries[i].decl; - if methodDecl != null as *Decl && methodDecl.paramCount == 2 { - if methodDecl.retType != null as *TypeExpr { - expr.refType = methodDecl.retType; - return Sema_ResolveType(sema, methodDecl.retType); - } - return tyUnknown; - } - } - i = i + 1; - } - } - return tyUnknown; - } - - // Block expression (boolValue = true means unsafe block) - if kind == ekBlock { - if expr.refBlock != null as *Block { - if expr.boolValue { - let prevChecked: bool = sema.checkedFunc; - sema.checkedFunc = false; - Sema_CheckBlock(sema, expr.refBlock); - sema.checkedFunc = prevChecked; - } else { - Sema_CheckBlock(sema, expr.refBlock); - } - } - return tyVoid; - } - - // Match expression - if kind == ekMatch { - discard Sema_CheckExpr(sema, expr.child1); // subject - var armType: int = tyUnknown; - var first: bool = true; - var arm: *MatchArm = expr.matchArms; - while arm != null as *MatchArm { - // Pattern bindings: Option::Some(value) → define value in arm scope - let armScope: Scope = Scope_NewChild(sema.scope); - let savedScope: *Scope = sema.scope; - sema.scope = &armScope; - Sema_BindPattern(sema, arm.pattern, expr.child1); - // Type-check `p if guard` (must be bool; sees pattern bindings) - if arm.pattern != null as *Pattern && arm.pattern.kind == pkGuarded { - if arm.pattern.patGuardExpr != null as *Expr { - let gt: int = Sema_CheckExpr(sema, arm.pattern.patGuardExpr); - if gt != tyBool && gt != tyUnknown { - Sema_EmitError(sema, arm.pattern.line, arm.pattern.column, + // Match expression + if kind == ekMatch { + discard Sema_CheckExpr(sema, expr.child1); // subject + var armType: int = tyUnknown; + var first: bool = true; + var arm: *MatchArm = expr.matchArms; + while arm != null as *MatchArm { + // Pattern bindings: Option::Some(value) → define value in arm scope + let armScope: Scope = Scope_NewChild(sema.scope); + let savedScope: *Scope = sema.scope; + sema.scope = &armScope; + Sema_BindPattern(sema, arm.pattern, expr.child1); + // Type-check `p if guard` (must be bool; sees pattern bindings) + if arm.pattern != null as *Pattern && arm.pattern.kind == pkGuarded { + if arm.pattern.patGuardExpr != null as *Expr { + let gt: int = Sema_CheckExpr(sema, arm.pattern.patGuardExpr); + if gt != tyBool && gt != tyUnknown { + Sema_EmitError(sema, arm.pattern.line, arm.pattern.column, "match guard condition must be bool"); + } } } + let bt: int = Sema_CheckExpr(sema, arm.body); + sema.scope = savedScope; + if first { + armType = bt; + first = false; + } + arm = arm.next; } - let bt: int = Sema_CheckExpr(sema, arm.body); - sema.scope = savedScope; - if first { - armType = bt; - first = false; + // Propagate type of first arm for codegen (result temp type) + if armType == tyStr { + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.typeName = "String"; + expr.refType = te; + } else if armType == tyBool { + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.typeName = "bool"; + expr.refType = te; + } else if armType == tyInt || armType == tyUnknown { + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.typeName = "int"; + expr.refType = te; + if armType == tyUnknown { armType = tyInt; } + } else { + let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te.kind = tekNamed; + te.typeName = "int"; + expr.refType = te; } - arm = arm.next; + return armType; } - // Propagate type of first arm for codegen (result temp type) - if armType == tyStr { + + // String interpolation f"...{expr}..." → String + if kind == ekStringInterp { + var part: *ExprList = expr.callArgs; + while part != null as *ExprList { + discard Sema_CheckExpr(sema, part.expr); + part = part.next; + } let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; te.kind = tekNamed; te.typeName = "String"; expr.refType = te; - } else if armType == tyBool { - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.typeName = "bool"; - expr.refType = te; - } else if armType == tyInt || armType == tyUnknown { - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.typeName = "int"; - expr.refType = te; - if armType == tyUnknown { armType = tyInt; } - } else { - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.typeName = "int"; - expr.refType = te; + return tyStr; } - return armType; - } - // String interpolation f"...{expr}..." → String - if kind == ekStringInterp { - var part: *ExprList = expr.callArgs; - while part != null as *ExprList { - discard Sema_CheckExpr(sema, part.expr); - part = part.next; - } - let te: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te.kind = tekNamed; - te.typeName = "String"; - expr.refType = te; - return tyStr; - } + // Closure: |params| -> Ret { body } + if kind == ekClosure { + let savedRetType: int = sema.currentRetType; + let savedScope: *Scope = sema.scope; + let savedClosureDepth: int = sema.closureDepth; + let savedClosureExpr: *Expr = sema.currentClosureExpr; + let savedClosureScope: *Scope = sema.closureScope; + let childScope: Scope = Scope_NewChild(sema.scope); + sema.scope = &childScope; - // Closure: |params| -> Ret { body } - if kind == ekClosure { - let savedRetType: int = sema.currentRetType; - let savedScope: *Scope = sema.scope; - let savedClosureDepth: int = sema.closureDepth; - let savedClosureExpr: *Expr = sema.currentClosureExpr; - let savedClosureScope: *Scope = sema.closureScope; - let childScope: Scope = Scope_NewChild(sema.scope); - sema.scope = &childScope; + // Set up closure tracking + sema.closureDepth = sema.closureDepth + 1; + sema.currentClosureExpr = expr; + sema.closureScope = &childScope; + expr.captureCount = 0; - // Set up closure tracking - sema.closureDepth = sema.closureDepth + 1; - sema.currentClosureExpr = expr; - sema.closureScope = &childScope; - expr.captureCount = 0; - - // Set return type from annotation, or unknown for inference - var closureRetType: int = tyUnknown; - if expr.refType != null as *TypeExpr { - closureRetType = Sema_ResolveType(sema, expr.refType); - } - sema.currentRetType = closureRetType; - - // Register params in child scope - let params: *Decl = expr.closureParams; - if params != null as *Decl { - var i: int = 0; - while i < params.paramCount { - var p: Param; - if i == 0 { p = params.param0; } - else if i == 1 { p = params.param1; } - else if i == 2 { p = params.param2; } - else if i == 3 { p = params.param3; } - else if i == 4 { p = params.param4; } - else if i == 5 { p = params.param5; } - else if i == 6 { p = params.param6; } - else if i == 7 { p = params.param7; } - else if i == 8 { p = params.param8; } - - if !String_Eq(p.name, "") { - var sym: Symbol; - sym.kind = skVar; - sym.name = p.name; - sym.typeKind = tyUnknown; - if p.refParamType != null as *TypeExpr { - sym.typeKind = Sema_ResolveType(sema, p.refParamType); - sym.refType = p.refParamType; - } - sym.typeName = ""; - sym.isMutable = false; - sym.isPublic = false; - sym.decl = null as *Decl; - discard Scope_Define(sema.scope, sym); - } - i = i + 1; + // Set return type from annotation, or unknown for inference + var closureRetType: int = tyUnknown; + if expr.refType != null as *TypeExpr { + closureRetType = Sema_ResolveType(sema, expr.refType); } + sema.currentRetType = closureRetType; + + // Register params in child scope + let params: *Decl = expr.closureParams; + if params != null as *Decl { + var i: int = 0; + while i < params.paramCount { + var p: Param; + if i == 0 { p = params.param0; } + else if i == 1 { p = params.param1; } + else if i == 2 { p = params.param2; } + else if i == 3 { p = params.param3; } + else if i == 4 { p = params.param4; } + else if i == 5 { p = params.param5; } + else if i == 6 { p = params.param6; } + else if i == 7 { p = params.param7; } + else if i == 8 { p = params.param8; } + + if !String_Eq(p.name, "") { + var sym: Symbol; + sym.kind = skVar; + sym.name = p.name; + sym.typeKind = tyUnknown; + if p.refParamType != null as *TypeExpr { + sym.typeKind = Sema_ResolveType(sema, p.refParamType); + sym.refType = p.refParamType; + } + sym.typeName = ""; + sym.isMutable = false; + sym.isPublic = false; + sym.decl = null as *Decl; + discard Scope_Define(sema.scope, sym); + } + i = i + 1; + } + } + + // Check body + if expr.refBlock != null as *Block { + Sema_CheckBlock(sema, expr.refBlock); + } + + // Restore + sema.scope = savedScope; + sema.currentRetType = savedRetType; + sema.closureDepth = savedClosureDepth; + sema.currentClosureExpr = savedClosureExpr; + sema.closureScope = savedClosureScope; + + // Build function type expression for later use + let funcType: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + funcType.kind = tekFunc; + funcType.funcRet = expr.refType; + funcType.funcParamCount = params.paramCount; + // Build param type list + if params.paramCount > 0 { + var head: *TypeExprList = null as *TypeExprList; + var tail: *TypeExprList = null as *TypeExprList; + var i: int = 0; + while i < params.paramCount { + var p: Param; + if i == 0 { p = params.param0; } + else if i == 1 { p = params.param1; } + else if i == 2 { p = params.param2; } + else if i == 3 { p = params.param3; } + else if i == 4 { p = params.param4; } + else if i == 5 { p = params.param5; } + else if i == 6 { p = params.param6; } + else if i == 7 { p = params.param7; } + else if i == 8 { p = params.param8; } + + let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; + node.te = p.refParamType; + node.next = null as *TypeExprList; + if head == null as *TypeExprList { + head = node; + tail = node; + } else { + tail.next = node; + tail = node; + } + i = i + 1; + } + funcType.funcParams = head; + } + expr.refType = funcType; + + return tyFunc; } - // Check body - if expr.refBlock != null as *Block { - Sema_CheckBlock(sema, expr.refBlock); - } + return tyUnknown; + } - // Restore - sema.scope = savedScope; - sema.currentRetType = savedRetType; - sema.closureDepth = savedClosureDepth; - sema.currentClosureExpr = savedClosureExpr; - sema.closureScope = savedClosureScope; + // --------------------------------------------------------------------------- + // Statement checking + // --------------------------------------------------------------------------- - // Build function type expression for later use - let funcType: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - funcType.kind = tekFunc; - funcType.funcRet = expr.refType; - funcType.funcParamCount = params.paramCount; - // Build param type list - if params.paramCount > 0 { - var head: *TypeExprList = null as *TypeExprList; - var tail: *TypeExprList = null as *TypeExprList; - var i: int = 0; - while i < params.paramCount { - var p: Param; - if i == 0 { p = params.param0; } - else if i == 1 { p = params.param1; } - else if i == 2 { p = params.param2; } - else if i == 3 { p = params.param3; } - else if i == 4 { p = params.param4; } - else if i == 5 { p = params.param5; } - else if i == 6 { p = params.param6; } - else if i == 7 { p = params.param7; } - else if i == 8 { p = params.param8; } + func Sema_CheckStmt(sema: *Sema, stmt: *Stmt) { + if stmt == null as *Stmt { return; } + let kind: int = stmt.kind; - let node: *TypeExprList = bux_alloc(sizeof(TypeExprList)) as *TypeExprList; - node.te = p.refParamType; - node.next = null as *TypeExprList; - if head == null as *TypeExprList { - head = node; - tail = node; + // Let/var + if kind == skLet { + let initType: int = Sema_CheckExpr(sema, stmt.child1); + // Borrow check: move tracking + if sema.checkedFunc && !sema.releaseFunc && stmt.child1 != null as *Expr && stmt.child1.kind == ekIdent { + Sema_AddMoved(sema, stmt.child1.strValue); + } + // Register variable in scope + var sym: Symbol; + sym.kind = skVar; + sym.name = stmt.strValue; + sym.typeKind = initType; + sym.typeName = ""; + sym.refType = null as *TypeExpr; + if stmt.refStmtType != null as *TypeExpr { + sym.refType = stmt.refStmtType; + if stmt.refStmtType.kind == tekPointer && stmt.refStmtType.pointerPointee != null as *TypeExpr { + sym.typeName = String_Concat(stmt.refStmtType.pointerPointee.typeName, "*"); } else { - tail.next = node; - tail = node; + sym.typeName = stmt.refStmtType.typeName; + } + } else if stmt.child1 != null as *Expr && stmt.child1.refType != null as *TypeExpr { + // Infer type from initializer expression + sym.refType = stmt.child1.refType; + stmt.refStmtType = stmt.child1.refType; + if stmt.child1.refType.kind == tekPointer && stmt.child1.refType.pointerPointee != null as *TypeExpr { + sym.typeName = String_Concat(stmt.child1.refType.pointerPointee.typeName, "*"); + } else { + sym.typeName = stmt.child1.refType.typeName; } - i = i + 1; } - funcType.funcParams = head; - } - expr.refType = funcType; - - return tyFunc; - } - - return tyUnknown; -} - -// --------------------------------------------------------------------------- -// Statement checking -// --------------------------------------------------------------------------- - -func Sema_CheckStmt(sema: *Sema, stmt: *Stmt) { - if stmt == null as *Stmt { return; } - let kind: int = stmt.kind; - - // Let/var - if kind == skLet { - let initType: int = Sema_CheckExpr(sema, stmt.child1); - // Borrow check: move tracking - if sema.checkedFunc && !sema.releaseFunc && stmt.child1 != null as *Expr && stmt.child1.kind == ekIdent { - Sema_AddMoved(sema, stmt.child1.strValue); - } - // Register variable in scope - var sym: Symbol; - sym.kind = skVar; - sym.name = stmt.strValue; - sym.typeKind = initType; - sym.typeName = ""; - sym.refType = null as *TypeExpr; - if stmt.refStmtType != null as *TypeExpr { - sym.refType = stmt.refStmtType; - if stmt.refStmtType.kind == tekPointer && stmt.refStmtType.pointerPointee != null as *TypeExpr { - sym.typeName = String_Concat(stmt.refStmtType.pointerPointee.typeName, "*"); - } else { - sym.typeName = stmt.refStmtType.typeName; - } - } else if stmt.child1 != null as *Expr && stmt.child1.refType != null as *TypeExpr { - // Infer type from initializer expression - sym.refType = stmt.child1.refType; - stmt.refStmtType = stmt.child1.refType; - if stmt.child1.refType.kind == tekPointer && stmt.child1.refType.pointerPointee != null as *TypeExpr { - sym.typeName = String_Concat(stmt.child1.refType.pointerPointee.typeName, "*"); - } else { - sym.typeName = stmt.child1.refType.typeName; - } - } - sym.isMutable = stmt.boolValue; - sym.isPublic = false; - sym.decl = null as *Decl; - discard Scope_Define(sema.scope, sym); - return; - } - - // Return - if kind == skReturn { - if stmt.child1 != null as *Expr { - let retType: int = Sema_CheckExpr(sema, stmt.child1); - if sema.currentRetType != tyUnknown && retType != tyUnknown { - if retType != sema.currentRetType { - // Be permissive: allow numeric widening, pointer compatibility - if !Sema_IsNumeric(retType) || !Sema_IsNumeric(sema.currentRetType) { - // Allow pointer-type compatibility (String <-> *T, *T <-> *U) - let retIsPtr: bool = retType == tyPointer || retType == tyStr; - let expectedIsPtr: bool = sema.currentRetType == tyPointer || sema.currentRetType == tyStr; - if !retIsPtr || !expectedIsPtr { - Sema_EmitError(sema, stmt.line, stmt.column, "return type mismatch"); - } - } - } - } - } else { - if sema.currentRetType != tyVoid && sema.currentRetType != tyUnknown { - Sema_EmitError(sema, stmt.line, stmt.column, "missing return value"); - } - } - return; - } - - // If - if kind == skIf { - let condType: int = Sema_CheckExpr(sema, stmt.child1); - if !Sema_IsBool(condType) && condType != tyUnknown { - Sema_EmitError(sema, stmt.line, stmt.column, "if condition must be bool"); - } - Sema_CheckBlock(sema, stmt.refStmtBlock); - Sema_CheckBlock(sema, stmt.refStmtElse); - return; - } - - // While - if kind == skWhile { - let condType: int = Sema_CheckExpr(sema, stmt.child1); - if !Sema_IsBool(condType) && condType != tyUnknown { - Sema_EmitError(sema, stmt.line, stmt.column, "while condition must be bool"); - } - Sema_CheckBlock(sema, stmt.refStmtBlock); - return; - } - - // Do-while - if kind == skDoWhile { - Sema_CheckBlock(sema, stmt.refStmtBlock); - let condType: int = Sema_CheckExpr(sema, stmt.child1); - if !Sema_IsBool(condType) && condType != tyUnknown { - Sema_EmitError(sema, stmt.line, stmt.column, "do-while condition must be bool"); - } - return; - } - - // Loop - if kind == skLoop { - Sema_CheckBlock(sema, stmt.refStmtBlock); - return; - } - - // For - if kind == skFor { - let iterType: int = Sema_CheckExpr(sema, stmt.child1); - var forScope: Scope = Scope_NewChild(sema.scope); - var loopSym: Symbol; - loopSym.kind = skVar; - loopSym.name = stmt.strValue; - loopSym.typeKind = tyUnknown; - loopSym.typeName = ""; - loopSym.refType = null as *TypeExpr; - loopSym.isMutable = true; - loopSym.isPublic = false; - loopSym.decl = null as *Decl; - - // Determine loop variable type from iterator expression - if stmt.child1 != null as *Expr { - // Range-based: type from lower bound (selfhost parses .. as ekBinary) - if stmt.child1.kind == ekRange || (stmt.child1.kind == ekBinary && (stmt.child1.intValue == tkDotDot || stmt.child1.intValue == tkDotDotEqual)) { - let boundType: int = Sema_CheckExpr(sema, stmt.child1.child1); - loopSym.typeKind = boundType; - } - // Array-based: extract element type from Array annotation - if stmt.child1.kind == ekIdent { - let sym: Symbol = Scope_Lookup(sema.scope, stmt.child1.strValue); - if sym.refType != null as *TypeExpr { - if String_Eq(sym.refType.typeName, "Array") && sym.refType.typeArgCount > 0 { - let elemTe: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - elemTe.kind = tekNamed; - elemTe.typeName = sym.refType.typeArgName0; - elemTe.line = stmt.line; - elemTe.column = stmt.column; - loopSym.typeKind = Sema_ResolveType(sema, elemTe); - loopSym.typeName = sym.refType.typeArgName0; - loopSym.refType = elemTe; + sym.isMutable = stmt.boolValue; + sym.isPublic = false; + sym.decl = null as *Decl; + discard Scope_Define(sema.scope, sym); + // Propagate ref lifetime for return-site checks + if sema.checkedFunc && !sema.releaseFunc && stmt.child1 != null as *Expr { + var isRefBind: bool = false; + if stmt.refStmtType != null as *TypeExpr { + if stmt.refStmtType.kind == tekRef || stmt.refStmtType.kind == tekMutRef { + isRefBind = true; + } + } + if !isRefBind && stmt.child1.refType != null as *TypeExpr { + if stmt.child1.refType.kind == tekRef || stmt.child1.refType.kind == tekMutRef { + isRefBind = true; + } + } + // Also treat address-of as creating a ref binding + if !isRefBind && stmt.child1.kind == ekUnary && stmt.child1.intValue == tkAmp { + isRefBind = true; + } + if isRefBind { + let lt: String = Sema_ExprRefLifetime(sema, stmt.child1); + if !String_Eq(lt, "") { + Sema_SetVarLifetime(sema, stmt.strValue, lt); } } } + return; } - discard Scope_Define(&forScope, loopSym); - let prevScope: *Scope = sema.scope; - sema.scope = &forScope; - Sema_CheckBlock(sema, stmt.refStmtBlock); - sema.scope = prevScope; - return; - } - - // Match (legacy skMatch — prefer ekMatch via skExpr) - if kind == skMatch { - discard Sema_CheckExpr(sema, stmt.child1); - return; - } - - // Break / Continue - if kind == skBreak || kind == skContinue { - return; - } - - // Expression statement - if kind == skExpr && stmt.child1 != null as *Expr { - discard Sema_CheckExpr(sema, stmt.child1); - return; - } - - // Decl (nested) - if kind == skDecl { - if stmt.refStmtDecl != null as *Decl && stmt.refStmtDecl.kind == dkFunc { - Sema_EmitError(sema, stmt.line, stmt.column, "nested functions not yet supported"); - } - return; - } -} - -// --------------------------------------------------------------------------- -// Collect globals (register functions, structs, enums in scope) -// --------------------------------------------------------------------------- - -func Sema_CollectGlobals(sema: *Sema) { - var decl: *Decl = sema.module.firstItem; - var funcCount: int = 0; - var lastDecl: *Decl = null as *Decl; - while decl != null as *Decl { - lastDecl = decl; - let dk: int = decl.kind; - - // Function - if dk == dkFunc { - var sym: Symbol; - Sema_ZeroInitSymbol(&sym); - sym.kind = skFunc; - sym.name = decl.strValue; - sym.typeKind = tyFunc; - sym.refType = Sema_BuildFuncTypeExprFromDecl(decl); - sym.isPublic = decl.isPublic; - sym.decl = decl; - discard Scope_Define(sema.scope, sym); - } - - // Struct - if dk == dkStruct { - var sym: Symbol; - Sema_ZeroInitSymbol(&sym); - sym.kind = skType; - sym.name = decl.strValue; - sym.typeKind = tyNamed; - sym.isPublic = decl.isPublic; - sym.decl = decl; - discard Scope_Define(sema.scope, sym); - } - - // Enum - if dk == dkEnum { - var sym: Symbol; - Sema_ZeroInitSymbol(&sym); - sym.kind = skType; - sym.name = decl.strValue; - sym.typeKind = tyNamed; - sym.isPublic = decl.isPublic; - sym.decl = decl; - discard Scope_Define(sema.scope, sym); - - // Register enum variants as constants - var vi: int = 0; - while vi < decl.variantCount && vi < 9 { - var v: EnumVariant; - if vi == 0 { v = decl.variant0; } - else if vi == 1 { v = decl.variant1; } - else if vi == 2 { v = decl.variant2; } - else if vi == 3 { v = decl.variant3; } - else if vi == 4 { v = decl.variant4; } - else if vi == 5 { v = decl.variant5; } - else if vi == 6 { v = decl.variant6; } - else if vi == 7 { v = decl.variant7; } - else if vi == 8 { v = decl.variant8; } - if v.name == null as String || String_Eq(v.name, "") { - vi = vi + 1; - continue; - } - let variantName: String = String_Concat(decl.strValue, "_"); - let variantName2: String = String_Concat(variantName, v.name); - var vSym: Symbol; - vSym.kind = skConst; - vSym.name = variantName2; - vSym.typeKind = tyNamed; - vSym.typeName = String_Concat(decl.strValue, "_Tag"); - vSym.refType = null as *TypeExpr; - vSym.isMutable = false; - vSym.isPublic = decl.isPublic; - vSym.decl = decl; - discard Scope_Define(sema.scope, vSym); - vi = vi + 1; - } - } - - // Const - if dk == dkConst { - var sym: Symbol; - Sema_ZeroInitSymbol(&sym); - sym.kind = skConst; - sym.name = decl.strValue; - if decl.constType != null as *TypeExpr { - sym.typeKind = Sema_ResolveType(sema, decl.constType); - sym.typeName = decl.constType.typeName; - sym.refType = decl.constType; - } else { - sym.typeKind = tyInt; - } - sym.isMutable = false; - sym.isPublic = decl.isPublic; - sym.decl = decl; - discard Scope_Define(sema.scope, sym); - } - - // Extern function - if dk == dkExternFunc { - var sym: Symbol; - Sema_ZeroInitSymbol(&sym); - sym.kind = skFunc; - sym.name = decl.strValue; - sym.typeKind = tyFunc; - sym.isPublic = true; - sym.decl = decl; - discard Scope_Define(sema.scope, sym); - } - - // Interface - if dk == dkInterface { - if sema.interfaceCount < 64 { - sema.interfaceTable[sema.interfaceCount].name = decl.strValue; - sema.interfaceTable[sema.interfaceCount].decl = decl; - sema.interfaceCount = sema.interfaceCount + 1; - } - } - - // Impl block (inherent methods or trait implementations) - if dk == dkImpl { - let implTypeName: String = decl.strValue; - var m: *Decl = decl.childDecl1; - while m != null as *Decl { - if m.kind == dkFunc { - if sema.methodCount < 256 { - sema.methodEntries[sema.methodCount].typeName = implTypeName; - sema.methodEntries[sema.methodCount].methodName = m.strValue; - sema.methodEntries[sema.methodCount].decl = m; - sema.methodCount = sema.methodCount + 1; - } - // Also define TypeName_MethodName in scope so auto-drop can find it - let methodSymName: String = String_Concat(implTypeName, "_"); - let methodSymName2: String = String_Concat(methodSymName, m.strValue); - var methodSym: Symbol; - Sema_ZeroInitSymbol(&methodSym); - methodSym.kind = skFunc; - methodSym.name = methodSymName2; - methodSym.typeKind = tyFunc; - methodSym.isPublic = decl.isPublic; - methodSym.decl = m; - discard Scope_Define(sema.scope, methodSym); - } - m = m.childDecl2; - } - } - - decl = decl.childDecl2; - } - - // Pass 2: resolve imports by looking up actual symbols - decl = sema.module.firstItem; - while decl != null as *Decl { - let dk: int = decl.kind; - - if dk == dkUse { - if decl.useKind == 1 { - // Glob import: add all public symbols from scope - var scope: *Scope = sema.scope; - while scope != null as *Scope { - var i: int = 0; - while i < scope.count { - let sym: Symbol = scope.symbols[i]; - if sym.isPublic { - let existing: Symbol = Scope_LookupLocal(sema.scope, sym.name); - if String_Eq(existing.name, "") { - discard Scope_Define(sema.scope, sym); + // Return + if kind == skReturn { + if stmt.child1 != null as *Expr { + let retType: int = Sema_CheckExpr(sema, stmt.child1); + if sema.currentRetType != tyUnknown && retType != tyUnknown { + if retType != sema.currentRetType { + // Be permissive: allow numeric widening, pointer compatibility + if !Sema_IsNumeric(retType) || !Sema_IsNumeric(sema.currentRetType) { + // Allow pointer-type compatibility (String <-> *T, *T <-> *U) + let retIsPtr: bool = retType == tyPointer || retType == tyStr; + let expectedIsPtr: bool = sema.currentRetType == tyPointer || sema.currentRetType == tyStr; + if !retIsPtr || !expectedIsPtr { + Sema_EmitError(sema, stmt.line, stmt.column, "return type mismatch"); } } - i = i + 1; - } - scope = scope.parent; - } - } else if decl.useKind == 2 { - // Multi-import: resolve each name - let namesStr: String = decl.useNames; - if !String_Eq(namesStr, "") { - var start: uint = 0; - var pos: uint = 0; - let totalLen: uint = String_Len(namesStr); - while pos <= totalLen { - let atEnd: bool = pos == totalLen; - let isComma: bool = false; - if pos < totalLen { - let chStr: String = bux_str_slice(namesStr, pos, 1); - isComma = String_Eq(chStr, ","); - } - if atEnd || isComma { - let nameLen: uint = pos - start; - if nameLen > 0 { - let name: String = bux_str_slice(namesStr, start, nameLen); - let found: Symbol = Scope_Lookup(sema.scope, name); - if !String_Eq(found.name, "") && found.isPublic { - let existing: Symbol = Scope_LookupLocal(sema.scope, name); - if String_Eq(existing.name, "") { - discard Scope_Define(sema.scope, found); - } - } - } - start = pos + 1; - } - pos = pos + 1; } } + // C.1 lifetime: reject dangling returns / elision mismatches + Sema_CheckReturnLifetime(sema, stmt.child1, stmt.line, stmt.column); } else { - // Single import: resolve last path segment - let path: String = decl.usePath; - if !String_Eq(path, "") { - var lastSeg: String = path; - let containsColons: int = bux_str_contains(path, "::"); - if containsColons != 0 { - let pathLen: uint = String_Len(path); - var tryPos: uint = 0; - while tryPos < pathLen { - let slice: String = bux_str_slice(path, tryPos, pathLen - tryPos); - if String_StartsWith(slice, "::") { - lastSeg = bux_str_slice(slice, 2, String_Len(slice) - 2); - } - tryPos = tryPos + 1; - } - } - let found: Symbol = Scope_Lookup(sema.scope, lastSeg); - if !String_Eq(found.name, "") && found.isPublic { - let existing: Symbol = Scope_LookupLocal(sema.scope, lastSeg); - if String_Eq(existing.name, "") { - discard Scope_Define(sema.scope, found); + if sema.currentRetType != tyVoid && sema.currentRetType != tyUnknown { + Sema_EmitError(sema, stmt.line, stmt.column, "missing return value"); + } + } + return; + } + + // If + if kind == skIf { + let condType: int = Sema_CheckExpr(sema, stmt.child1); + if !Sema_IsBool(condType) && condType != tyUnknown { + Sema_EmitError(sema, stmt.line, stmt.column, "if condition must be bool"); + } + Sema_CheckBlock(sema, stmt.refStmtBlock); + Sema_CheckBlock(sema, stmt.refStmtElse); + return; + } + + // While + if kind == skWhile { + let condType: int = Sema_CheckExpr(sema, stmt.child1); + if !Sema_IsBool(condType) && condType != tyUnknown { + Sema_EmitError(sema, stmt.line, stmt.column, "while condition must be bool"); + } + Sema_CheckBlock(sema, stmt.refStmtBlock); + return; + } + + // Do-while + if kind == skDoWhile { + Sema_CheckBlock(sema, stmt.refStmtBlock); + let condType: int = Sema_CheckExpr(sema, stmt.child1); + if !Sema_IsBool(condType) && condType != tyUnknown { + Sema_EmitError(sema, stmt.line, stmt.column, "do-while condition must be bool"); + } + return; + } + + // Loop + if kind == skLoop { + Sema_CheckBlock(sema, stmt.refStmtBlock); + return; + } + + // For + if kind == skFor { + let iterType: int = Sema_CheckExpr(sema, stmt.child1); + var forScope: Scope = Scope_NewChild(sema.scope); + var loopSym: Symbol; + loopSym.kind = skVar; + loopSym.name = stmt.strValue; + loopSym.typeKind = tyUnknown; + loopSym.typeName = ""; + loopSym.refType = null as *TypeExpr; + loopSym.isMutable = true; + loopSym.isPublic = false; + loopSym.decl = null as *Decl; + + // Determine loop variable type from iterator expression + if stmt.child1 != null as *Expr { + // Range-based: type from lower bound (selfhost parses .. as ekBinary) + if stmt.child1.kind == ekRange || (stmt.child1.kind == ekBinary && (stmt.child1.intValue == tkDotDot || stmt.child1.intValue == tkDotDotEqual)) { + let boundType: int = Sema_CheckExpr(sema, stmt.child1.child1); + loopSym.typeKind = boundType; + } + // Array-based: extract element type from Array annotation + if stmt.child1.kind == ekIdent { + let sym: Symbol = Scope_Lookup(sema.scope, stmt.child1.strValue); + if sym.refType != null as *TypeExpr { + if String_Eq(sym.refType.typeName, "Array") && sym.refType.typeArgCount > 0 { + let elemTe: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + elemTe.kind = tekNamed; + elemTe.typeName = sym.refType.typeArgName0; + elemTe.line = stmt.line; + elemTe.column = stmt.column; + loopSym.typeKind = Sema_ResolveType(sema, elemTe); + loopSym.typeName = sym.refType.typeArgName0; + loopSym.refType = elemTe; } } } } + + discard Scope_Define(&forScope, loopSym); + let prevScope: *Scope = sema.scope; + sema.scope = &forScope; + Sema_CheckBlock(sema, stmt.refStmtBlock); + sema.scope = prevScope; + return; } - decl = decl.childDecl2; - } + // Match (legacy skMatch — prefer ekMatch via skExpr) + if kind == skMatch { + discard Sema_CheckExpr(sema, stmt.child1); + return; + } - // Pass 3: auto-register func Type_Method(self: Type, ...) as methods - decl = sema.module.firstItem; - while decl != null as *Decl { - if decl.kind == dkFunc && decl.paramCount > 0 { - let selfParam: Param = decl.param0; - if String_Eq(selfParam.name, "self") { - var typeName: String = ""; - var i: int = bux_strlen(decl.strValue) as int - 1; - while i > 0 { - if decl.strValue[i] as int == 95 { // '_' - let prefix: String = bux_str_slice(decl.strValue, 0, i as uint); - let typeSym: Symbol = Scope_Lookup(sema.scope, prefix); - if typeSym.kind == skType && typeSym.decl != null as *Decl && typeSym.decl.kind == dkStruct { - typeName = prefix; - break; - } - } - i = i - 1; - } - if !String_Eq(typeName, "") { - let methodName: String = bux_str_slice(decl.strValue, (i + 1) as uint, bux_strlen(decl.strValue) - (i + 1) as uint); - if sema.methodCount < 256 { - sema.methodEntries[sema.methodCount].typeName = typeName; - sema.methodEntries[sema.methodCount].methodName = methodName; - sema.methodEntries[sema.methodCount].decl = decl; - sema.methodCount = sema.methodCount + 1; - } - } + // Break / Continue + if kind == skBreak || kind == skContinue { + return; + } + + // Expression statement + if kind == skExpr && stmt.child1 != null as *Expr { + discard Sema_CheckExpr(sema, stmt.child1); + return; + } + + // Decl (nested) + if kind == skDecl { + if stmt.refStmtDecl != null as *Decl && stmt.refStmtDecl.kind == dkFunc { + Sema_EmitError(sema, stmt.line, stmt.column, "nested functions not yet supported"); } - } - decl = decl.childDecl2; - } -} - -// --------------------------------------------------------------------------- -// Trait bounds checking -// --------------------------------------------------------------------------- - -func Sema_FindInterface(sema: *Sema, name: String) -> *Decl { - var i: int = 0; - while i < sema.interfaceCount { - if String_Eq(sema.interfaceTable[i].name, name) { - return sema.interfaceTable[i].decl; - } - i = i + 1; - } - return null as *Decl; -} - -func Sema_TypeHasMethod(sema: *Sema, typeName: String, methodName: String) -> bool { - var i: int = 0; - while i < sema.methodCount { - if String_Eq(sema.methodEntries[i].typeName, typeName) && String_Eq(sema.methodEntries[i].methodName, methodName) { - return true; - } - i = i + 1; - } - return false; -} - -func Sema_TypeImplements(sema: *Sema, typeName: String, interfaceName: String) -> bool { - let iface: *Decl = Sema_FindInterface(sema, interfaceName); - if iface == null as *Decl { - return true; // Unknown interface — be permissive - } - var req: *Decl = iface.childDecl1; - while req != null as *Decl { - if req.kind == dkFunc { - if !Sema_TypeHasMethod(sema, typeName, req.strValue) { - return false; - } - } - req = req.childDecl2; - } - return true; -} - -// Extract element type name from a collection TypeExpr. -// Handles both explicit generic types (Array) and mangled types (Array_int). -func Sema_ExtractElemType(te: *TypeExpr) -> String { - if te == null as *TypeExpr { return ""; } - // Pointer: unwrap and recurse - if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { - return Sema_ExtractElemType(te.pointerPointee); - } - if te.kind == tekNamed { - // Explicit generic: Array - if String_Eq(te.typeName, "Array") || String_Eq(te.typeName, "Iter") { - if te.typeArgCount > 0 { - return te.typeArgName0; - } - } - // Mangled: Array_int, Iter_string - let name: String = te.typeName; - let len: uint = bux_strlen(name); - // Check for "Array_" prefix - if len > 6 && name[0] as int == 65 && name[1] as int == 114 && name[2] as int == 114 && name[3] as int == 97 && name[4] as int == 121 && name[5] as int == 95 { - return bux_str_slice(name, 6, len - 6); - } - // Check for "Iter_" prefix - if len > 5 && name[0] as int == 73 && name[1] as int == 116 && name[2] as int == 101 && name[3] as int == 114 && name[4] as int == 95 { - return bux_str_slice(name, 5, len - 5); - } - } - return ""; -} - -// Substitute type params in a TypeExpr (shallow clone). Used for call return types -// after inference: Array + U=String → Array with typeArgName0=String / Array_String. -func Sema_SubstTypeExpr(te: *TypeExpr, p0: String, a0: String, p1: String, a1: String, argc: int) -> *TypeExpr { - if te == null as *TypeExpr { return null as *TypeExpr; } - let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - r.kind = te.kind; - r.line = te.line; - r.column = te.column; - r.typeName = te.typeName; - r.pathStr = te.pathStr; - r.pathCount = te.pathCount; - r.typeArgName0 = te.typeArgName0; - r.typeArgName1 = te.typeArgName1; - r.typeArgCount = te.typeArgCount; - r.sliceElement = te.sliceElement; - r.pointerPointee = te.pointerPointee; - r.funcParams = te.funcParams; - r.funcRet = te.funcRet; - r.funcParamCount = te.funcParamCount; - r.tupleElems = te.tupleElems; - r.tupleCount = te.tupleCount; - - if te.kind == tekNamed { - // Bare type param → concrete named type - if te.typeArgCount == 0 { - if argc >= 1 && String_Eq(te.typeName, p0) { - r.typeName = a0; - return r; - } - if argc >= 2 && String_Eq(te.typeName, p1) { - r.typeName = a1; - return r; - } - } - // Named with type args: Array → Array_String (mangled) for downstream mono - if te.typeArgCount > 0 { - var na0: String = te.typeArgName0; - var na1: String = te.typeArgName1; - if argc >= 1 && String_Eq(na0, p0) { na0 = a0; } - if argc >= 2 && String_Eq(na0, p1) { na0 = a1; } - if argc >= 1 && String_Eq(na1, p0) { na1 = a0; } - if argc >= 2 && String_Eq(na1, p1) { na1 = a1; } - r.typeArgName0 = na0; - r.typeArgName1 = na1; - // Mangle for monomorphized struct name (Array_int, Iter_String) - if te.typeArgCount == 1 && !String_Eq(na0, "") { - r.typeName = String_Concat(String_Concat(te.typeName, "_"), na0); - r.typeArgCount = 0; - r.typeArgName0 = ""; - } else if te.typeArgCount >= 2 { - r.typeName = String_Concat(String_Concat(te.typeName, "_"), - String_Concat(na0, String_Concat("_", na1))); - r.typeArgCount = 0; - r.typeArgName0 = ""; - r.typeArgName1 = ""; - } - return r; - } - } - if te.kind == tekPointer || te.kind == tekRef || te.kind == tekMutRef { - r.pointerPointee = Sema_SubstTypeExpr(te.pointerPointee, p0, a0, p1, a1, argc); - return r; - } - if te.kind == tekFunc { - r.funcRet = Sema_SubstTypeExpr(te.funcRet, p0, a0, p1, a1, argc); - return r; - } - return r; -} - -// Bind a type param name on the call callee if not already set. -func Sema_BindInferredArg(expr: *Expr, funcDecl: *Decl, tpName: String, typeName: String) { - if String_Eq(tpName, "") || String_Eq(typeName, "") { return; } - if expr.child1 == null as *Expr { return; } - if funcDecl.typeParamCount >= 1 && String_Eq(tpName, funcDecl.typeParam0) { - if String_Eq(expr.child1.genericTypeArg0, "") { - expr.child1.genericTypeArg0 = typeName; - } - if expr.child1.genericTypeArgCount < 1 { expr.child1.genericTypeArgCount = 1; } - } - if funcDecl.typeParamCount >= 2 && String_Eq(tpName, funcDecl.typeParam1) { - if String_Eq(expr.child1.genericTypeArg1, "") { - expr.child1.genericTypeArg1 = typeName; - } - if expr.child1.genericTypeArgCount < 2 { expr.child1.genericTypeArgCount = 2; } - } -} - -// Resolve concrete type name for a value expression (for bare type-param params). -func Sema_ArgTypeName(argExpr: *Expr) -> String { - if argExpr == null as *Expr { return ""; } - var argType: *TypeExpr = argExpr.refType; - if argType == null as *TypeExpr && argExpr.kind == ekUnary && argExpr.intValue == tkAmp { - if argExpr.child1 != null as *Expr { argType = argExpr.child1.refType; } - } - if argType == null as *TypeExpr { return ""; } - if argType.kind == tekNamed { return argType.typeName; } - if argType.kind == tekPointer && argType.pointerPointee != null as *TypeExpr { - if argType.pointerPointee.kind == tekNamed { - return argType.pointerPointee.typeName; - } - } - return ""; -} - -// Infer type args from a param TypeExpr pattern against a concrete arg TypeExpr. -func Sema_UnifyInfer(expr: *Expr, funcDecl: *Decl, pattern: *TypeExpr, concrete: *TypeExpr) { - if pattern == null as *TypeExpr || concrete == null as *TypeExpr { return; } - - // Bare type param: T / Acc / U - if pattern.kind == tekNamed && pattern.typeArgCount == 0 { - if String_Eq(pattern.typeName, funcDecl.typeParam0) || String_Eq(pattern.typeName, funcDecl.typeParam1) { - var cn: String = ""; - if concrete.kind == tekNamed { cn = concrete.typeName; } - Sema_BindInferredArg(expr, funcDecl, pattern.typeName, cn); return; } } - // *T / &T — unwrap pointer/ref on both sides - if pattern.kind == tekPointer || pattern.kind == tekRef || pattern.kind == tekMutRef { - var conc: *TypeExpr = concrete; - if concrete.kind == tekPointer || concrete.kind == tekRef || concrete.kind == tekMutRef { - conc = concrete.pointerPointee; - } - Sema_UnifyInfer(expr, funcDecl, pattern.pointerPointee, conc); - return; - } + // --------------------------------------------------------------------------- + // Collect globals (register functions, structs, enums in scope) + // --------------------------------------------------------------------------- - // Named with type args: Iter, Array, Map - if pattern.kind == tekNamed && pattern.typeArgCount > 0 { - // concrete may be Iter with typeArgName0, or mangled Iter_int - if concrete.kind == tekNamed { - if concrete.typeArgCount > 0 { - if pattern.typeArgCount >= 1 && !String_Eq(pattern.typeArgName0, "") { - let te0: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te0.kind = tekNamed; - te0.typeName = pattern.typeArgName0; - te0.typeArgCount = 0; - let ce0: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - ce0.kind = tekNamed; - ce0.typeName = concrete.typeArgName0; - ce0.typeArgCount = 0; - Sema_UnifyInfer(expr, funcDecl, te0, ce0); - } - if pattern.typeArgCount >= 2 && !String_Eq(pattern.typeArgName1, "") { - let te1: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te1.kind = tekNamed; - te1.typeName = pattern.typeArgName1; - te1.typeArgCount = 0; - let ce1: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - ce1.kind = tekNamed; - ce1.typeName = concrete.typeArgName1; - ce1.typeArgCount = 0; - Sema_UnifyInfer(expr, funcDecl, te1, ce1); - } - } else { - // Mangled Array_int / Iter_String - let elem: String = Sema_ExtractElemType(concrete); - if !String_Eq(elem, "") && pattern.typeArgCount >= 1 { - let te0: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - te0.kind = tekNamed; - te0.typeName = pattern.typeArgName0; - te0.typeArgCount = 0; - let ce0: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; - ce0.kind = tekNamed; - ce0.typeName = elem; - ce0.typeArgCount = 0; - Sema_UnifyInfer(expr, funcDecl, te0, ce0); + func Sema_CollectGlobals(sema: *Sema) { + var decl: *Decl = sema.module.firstItem; + var funcCount: int = 0; + var lastDecl: *Decl = null as *Decl; + while decl != null as *Decl { + lastDecl = decl; + let dk: int = decl.kind; + + // Function + if dk == dkFunc { + var sym: Symbol; + Sema_ZeroInitSymbol(&sym); + sym.kind = skFunc; + sym.name = decl.strValue; + sym.typeKind = tyFunc; + sym.refType = Sema_BuildFuncTypeExprFromDecl(decl); + sym.isPublic = decl.isPublic; + sym.decl = decl; + discard Scope_Define(sema.scope, sym); + } + + // Struct + if dk == dkStruct { + var sym: Symbol; + Sema_ZeroInitSymbol(&sym); + sym.kind = skType; + sym.name = decl.strValue; + sym.typeKind = tyNamed; + sym.isPublic = decl.isPublic; + sym.decl = decl; + discard Scope_Define(sema.scope, sym); + } + + // Enum + if dk == dkEnum { + var sym: Symbol; + Sema_ZeroInitSymbol(&sym); + sym.kind = skType; + sym.name = decl.strValue; + sym.typeKind = tyNamed; + sym.isPublic = decl.isPublic; + sym.decl = decl; + discard Scope_Define(sema.scope, sym); + + // Register enum variants as constants + var vi: int = 0; + while vi < decl.variantCount && vi < 9 { + var v: EnumVariant; + if vi == 0 { v = decl.variant0; } + else if vi == 1 { v = decl.variant1; } + else if vi == 2 { v = decl.variant2; } + else if vi == 3 { v = decl.variant3; } + else if vi == 4 { v = decl.variant4; } + else if vi == 5 { v = decl.variant5; } + else if vi == 6 { v = decl.variant6; } + else if vi == 7 { v = decl.variant7; } + else if vi == 8 { v = decl.variant8; } + if v.name == null as String || String_Eq(v.name, "") { + vi = vi + 1; + continue; + } + let variantName: String = String_Concat(decl.strValue, "_"); + let variantName2: String = String_Concat(variantName, v.name); + var vSym: Symbol; + vSym.kind = skConst; + vSym.name = variantName2; + vSym.typeKind = tyNamed; + vSym.typeName = String_Concat(decl.strValue, "_Tag"); + vSym.refType = null as *TypeExpr; + vSym.isMutable = false; + vSym.isPublic = decl.isPublic; + vSym.decl = decl; + discard Scope_Define(sema.scope, vSym); + vi = vi + 1; } } - } - return; - } - // func(T)->U vs concrete function type - if pattern.kind == tekFunc { - var conc: *TypeExpr = concrete; - // Named function used as value: build tekFunc from its decl if needed — refType may already be tekFunc - if conc.kind == tekFunc { - // Params - var pp: *TypeExprList = pattern.funcParams; - var cp: *TypeExprList = conc.funcParams; - while pp != null as *TypeExprList && cp != null as *TypeExprList { - Sema_UnifyInfer(expr, funcDecl, pp.te, cp.te); - pp = pp.next; - cp = cp.next; + // Const + if dk == dkConst { + var sym: Symbol; + Sema_ZeroInitSymbol(&sym); + sym.kind = skConst; + sym.name = decl.strValue; + if decl.constType != null as *TypeExpr { + sym.typeKind = Sema_ResolveType(sema, decl.constType); + sym.typeName = decl.constType.typeName; + sym.refType = decl.constType; + } else { + sym.typeKind = tyInt; + } + sym.isMutable = false; + sym.isPublic = decl.isPublic; + sym.decl = decl; + discard Scope_Define(sema.scope, sym); } - if pattern.funcRet != null as *TypeExpr && conc.funcRet != null as *TypeExpr { - Sema_UnifyInfer(expr, funcDecl, pattern.funcRet, conc.funcRet); + + // Extern function + if dk == dkExternFunc { + var sym: Symbol; + Sema_ZeroInitSymbol(&sym); + sym.kind = skFunc; + sym.name = decl.strValue; + sym.typeKind = tyFunc; + sym.isPublic = true; + sym.decl = decl; + discard Scope_Define(sema.scope, sym); } - } - return; - } -} -// Infer generic type arguments from call arguments (structural). -// Handles *Array, *Iter, func(T)->U, bare Acc, etc. -func Sema_InferGenericArgs(sema: *Sema, funcDecl: *Decl, expr: *Expr) { - if expr.callArgs == null as *ExprList { return; } - if expr.child1 == null as *Expr { return; } - var argList: *ExprList = expr.callArgs; - var pi: int = 0; - while argList != null as *ExprList && pi < funcDecl.paramCount { - let argExpr: *Expr = argList.expr; - if argExpr == null as *Expr { argList = argList.next; pi = pi + 1; continue; } - - var paramType: *TypeExpr = null as *TypeExpr; - if pi == 0 { paramType = funcDecl.param0.refParamType; } - else if pi == 1 { paramType = funcDecl.param1.refParamType; } - else if pi == 2 { paramType = funcDecl.param2.refParamType; } - else if pi == 3 { paramType = funcDecl.param3.refParamType; } - else if pi == 4 { paramType = funcDecl.param4.refParamType; } - else if pi == 5 { paramType = funcDecl.param5.refParamType; } - else if pi == 6 { paramType = funcDecl.param6.refParamType; } - else if pi == 7 { paramType = funcDecl.param7.refParamType; } - else if pi == 8 { paramType = funcDecl.param8.refParamType; } - - var argType: *TypeExpr = argExpr.refType; - // &x → use type of x, wrap as pointer if pattern expects pointer - if argType == null as *TypeExpr && argExpr.kind == ekUnary && argExpr.intValue == tkAmp { - if argExpr.child1 != null as *Expr { - argType = argExpr.child1.refType; - } - } - // Named function as value: synthesize tekFunc from its declaration - if (argType == null as *TypeExpr || argType.kind != tekFunc) && argExpr.kind == ekIdent { - let fsym: Symbol = Scope_Lookup(sema.scope, argExpr.strValue); - if fsym.kind == skFunc && fsym.decl != null as *Decl { - argType = Sema_BuildFuncTypeExprFromDecl(fsym.decl); - } - } - - if paramType != null as *TypeExpr && argType != null as *TypeExpr { - Sema_UnifyInfer(expr, funcDecl, paramType, argType); - // If pattern is *T and arg is bare T (from &x we unwrapped), re-wrap - if (paramType.kind == tekPointer || paramType.kind == tekRef || paramType.kind == tekMutRef) - && argExpr.kind == ekUnary && argExpr.intValue == tkAmp { - // already handled via unwrap of pattern against pointee type of variable - if argExpr.child1 != null as *Expr && argExpr.child1.refType != null as *TypeExpr { - Sema_UnifyInfer(expr, funcDecl, paramType.pointerPointee, argExpr.child1.refType); + // Interface + if dk == dkInterface { + if sema.interfaceCount < 64 { + sema.interfaceTable[sema.interfaceCount].name = decl.strValue; + sema.interfaceTable[sema.interfaceCount].decl = decl; + sema.interfaceCount = sema.interfaceCount + 1; } } - } - argList = argList.next; - pi = pi + 1; - } -} -func Sema_CheckTraitBounds(sema: *Sema, funcDecl: *Decl, typeArg0: String, typeArg1: String, typeArgCount: int, line: uint32, col: uint32) { - // Trait bounds checking - if funcDecl.typeParamCount >= 1 && typeArgCount >= 1 && !String_Eq(funcDecl.typeParam0Bound, "") { - if !Sema_TypeImplements(sema, typeArg0, funcDecl.typeParam0Bound) { - let errMsg: String = String_Concat("type '", String_Concat(typeArg0, "' does not implement trait '")); - let errMsg2: String = String_Concat(errMsg, String_Concat(funcDecl.typeParam0Bound, "'")); - Sema_EmitError(sema, line, col, errMsg2); - } - } - if funcDecl.typeParamCount >= 2 && typeArgCount >= 2 && !String_Eq(funcDecl.typeParam1Bound, "") { - if !Sema_TypeImplements(sema, typeArg1, funcDecl.typeParam1Bound) { - let errMsg: String = String_Concat("type '", String_Concat(typeArg1, "' does not implement trait '")); - let errMsg2: String = String_Concat(errMsg, String_Concat(funcDecl.typeParam1Bound, "'")); - Sema_EmitError(sema, line, col, errMsg2); - } - } -} - -// --------------------------------------------------------------------------- -// Analyze — main entry point -// --------------------------------------------------------------------------- - -func Sema_Analyze(mod: *Module) -> *Sema { - let s: *Sema = bux_alloc(sizeof(Sema)) as *Sema; - s.module = mod; - s.scope = bux_alloc(sizeof(Scope)) as *Scope; - s.scope.symbols = bux_alloc(1024 as uint * sizeof(Symbol)) as *Symbol; - s.scope.count = 0; - s.scope.parent = null as *Scope; - s.hasError = false; - s.diagCount = 0; - s.diags = bux_alloc(256 as uint * sizeof(SemaDiag)) as *SemaDiag; - s.typeTable = null as *void; - s.methodTable = null as *void; - s.currentRetType = tyVoid; - s.interfaceTable = bux_alloc(64 as uint * sizeof(InterfaceEntry)) as *InterfaceEntry; - s.interfaceCount = 0; - s.methodEntries = bux_alloc(256 as uint * sizeof(MethodEntry)) as *MethodEntry; - s.methodCount = 0; - - // First pass: collect globals - Sema_CollectGlobals(s); - - // Second pass: check function bodies - var decl: *Decl = mod.firstItem; - while decl != null as *Decl { - if decl.kind == dkFunc && decl.refBody != null as *Block { - // Create function scope (child of global) - var funcScope: Scope = Scope_NewChild(s.scope); - - // Add type params to scope - if decl.typeParamCount >= 1 { - var tpSym: Symbol; - Sema_ZeroInitSymbol(&tpSym); - tpSym.kind = skType; - tpSym.name = decl.typeParam0; - tpSym.typeKind = tyTypeParam; - tpSym.decl = null as *Decl; - discard Scope_Define(&funcScope, tpSym); - } - if decl.typeParamCount >= 2 { - var tpSym2: Symbol; - Sema_ZeroInitSymbol(&tpSym2); - tpSym2.kind = skType; - tpSym2.name = decl.typeParam1; - tpSym2.typeKind = tyTypeParam; - tpSym2.decl = null as *Decl; - discard Scope_Define(&funcScope, tpSym2); + // Impl block (inherent methods or trait implementations) + if dk == dkImpl { + let implTypeName: String = decl.strValue; + var m: *Decl = decl.childDecl1; + while m != null as *Decl { + if m.kind == dkFunc { + if sema.methodCount < 256 { + sema.methodEntries[sema.methodCount].typeName = implTypeName; + sema.methodEntries[sema.methodCount].methodName = m.strValue; + sema.methodEntries[sema.methodCount].decl = m; + sema.methodCount = sema.methodCount + 1; + } + // Also define TypeName_MethodName in scope so auto-drop can find it + let methodSymName: String = String_Concat(implTypeName, "_"); + let methodSymName2: String = String_Concat(methodSymName, m.strValue); + var methodSym: Symbol; + Sema_ZeroInitSymbol(&methodSym); + methodSym.kind = skFunc; + methodSym.name = methodSymName2; + methodSym.typeKind = tyFunc; + methodSym.isPublic = decl.isPublic; + methodSym.decl = m; + discard Scope_Define(sema.scope, methodSym); + } + m = m.childDecl2; + } } - // Add parameters to scope - var i: int = 0; - while i < decl.paramCount { - var p: *Param = null as *Param; - if i == 0 { p = &decl.param0; } - else if i == 1 { p = &decl.param1; } - else if i == 2 { p = &decl.param2; } - else if i == 3 { p = &decl.param3; } - else if i == 4 { p = &decl.param4; } - else if i == 5 { p = &decl.param5; } - else if i == 6 { p = &decl.param6; } - else if i == 7 { p = &decl.param7; } - else if i == 8 { p = &decl.param8; } - var pSym: Symbol; - Sema_ZeroInitSymbol(&pSym); - pSym.kind = skVar; - if p != null as *Param && p.refParamType != null as *TypeExpr { - pSym.typeKind = Sema_ResolveType(s, p.refParamType); - pSym.refType = p.refParamType; - if p.refParamType.kind == tekPointer && p.refParamType.pointerPointee != null as *TypeExpr { - pSym.typeName = String_Concat(p.refParamType.pointerPointee.typeName, "*"); - } else { - pSym.typeName = p.refParamType.typeName; + decl = decl.childDecl2; + } + + // Pass 2: resolve imports by looking up actual symbols + decl = sema.module.firstItem; + while decl != null as *Decl { + let dk: int = decl.kind; + + if dk == dkUse { + if decl.useKind == 1 { + // Glob import: add all public symbols from scope + var scope: *Scope = sema.scope; + while scope != null as *Scope { + var i: int = 0; + while i < scope.count { + let sym: Symbol = scope.symbols[i]; + if sym.isPublic { + let existing: Symbol = Scope_LookupLocal(sema.scope, sym.name); + if String_Eq(existing.name, "") { + discard Scope_Define(sema.scope, sym); + } + } + i = i + 1; + } + scope = scope.parent; + } + } else if decl.useKind == 2 { + // Multi-import: resolve each name + let namesStr: String = decl.useNames; + if !String_Eq(namesStr, "") { + var start: uint = 0; + var pos: uint = 0; + let totalLen: uint = String_Len(namesStr); + while pos <= totalLen { + let atEnd: bool = pos == totalLen; + let isComma: bool = false; + if pos < totalLen { + let chStr: String = bux_str_slice(namesStr, pos, 1); + isComma = String_Eq(chStr, ","); + } + if atEnd || isComma { + let nameLen: uint = pos - start; + if nameLen > 0 { + let name: String = bux_str_slice(namesStr, start, nameLen); + let found: Symbol = Scope_Lookup(sema.scope, name); + if !String_Eq(found.name, "") && found.isPublic { + let existing: Symbol = Scope_LookupLocal(sema.scope, name); + if String_Eq(existing.name, "") { + discard Scope_Define(sema.scope, found); + } + } + } + start = pos + 1; + } + pos = pos + 1; + } } } else { - pSym.typeKind = tyInt; - pSym.typeName = ""; + // Single import: resolve last path segment + let path: String = decl.usePath; + if !String_Eq(path, "") { + var lastSeg: String = path; + let containsColons: int = bux_str_contains(path, "::"); + if containsColons != 0 { + let pathLen: uint = String_Len(path); + var tryPos: uint = 0; + while tryPos < pathLen { + let slice: String = bux_str_slice(path, tryPos, pathLen - tryPos); + if String_StartsWith(slice, "::") { + lastSeg = bux_str_slice(slice, 2, String_Len(slice) - 2); + } + tryPos = tryPos + 1; + } + } + let found: Symbol = Scope_Lookup(sema.scope, lastSeg); + if !String_Eq(found.name, "") && found.isPublic { + let existing: Symbol = Scope_LookupLocal(sema.scope, lastSeg); + if String_Eq(existing.name, "") { + discard Scope_Define(sema.scope, found); + } + } + } } - pSym.isMutable = false; - pSym.isPublic = false; - pSym.decl = null as *Decl; - if i == 0 { pSym.name = decl.param0.name; } - else if i == 1 { pSym.name = decl.param1.name; } - else if i == 2 { pSym.name = decl.param2.name; } - else if i == 3 { pSym.name = decl.param3.name; } - else if i == 4 { pSym.name = decl.param4.name; } - else if i == 5 { pSym.name = decl.param5.name; } - else if i == 6 { pSym.name = decl.param6.name; } - else if i == 7 { pSym.name = decl.param7.name; } - else if i == 8 { pSym.name = decl.param8.name; } - discard Scope_Define(&funcScope, pSym); - i = i + 1; } - // Switch to function scope and check body statements - let prevScope: *Scope = s.scope; - s.scope = &funcScope; - - // Set current function return type - if decl.retType != null as *TypeExpr { - s.currentRetType = Sema_ResolveType(s, decl.retType); - } else { - s.currentRetType = tyVoid; - s.checkedFunc = false; - s.movedCount = 0; - } - - // Enable borrow checking for @[Checked] functions - let wasChecked: bool = s.checkedFunc; - s.checkedFunc = decl.isChecked != 0; - let wasRelease: bool = s.releaseFunc; - s.releaseFunc = decl.isRelease != 0; - - // Check body statements - var stmt: *Stmt = decl.refBody.firstStmt; - while stmt != null as *Stmt { - Sema_CheckStmt(s, stmt); - stmt = stmt.nextStmt; - } - - s.checkedFunc = wasChecked; - s.releaseFunc = wasRelease; - s.scope = prevScope; + decl = decl.childDecl2; + } + + // Pass 3: auto-register func Type_Method(self: Type, ...) as methods + decl = sema.module.firstItem; + while decl != null as *Decl { + if decl.kind == dkFunc && decl.paramCount > 0 { + let selfParam: Param = decl.param0; + if String_Eq(selfParam.name, "self") { + var typeName: String = ""; + var i: int = bux_strlen(decl.strValue) as int - 1; + while i > 0 { + if decl.strValue[i] as int == 95 { // '_' + let prefix: String = bux_str_slice(decl.strValue, 0, i as uint); + let typeSym: Symbol = Scope_Lookup(sema.scope, prefix); + if typeSym.kind == skType && typeSym.decl != null as *Decl && typeSym.decl.kind == dkStruct { + typeName = prefix; + break; + } + } + i = i - 1; + } + if !String_Eq(typeName, "") { + let methodName: String = bux_str_slice(decl.strValue, (i + 1) as uint, bux_strlen(decl.strValue) - (i + 1) as uint); + if sema.methodCount < 256 { + sema.methodEntries[sema.methodCount].typeName = typeName; + sema.methodEntries[sema.methodCount].methodName = methodName; + sema.methodEntries[sema.methodCount].decl = decl; + sema.methodCount = sema.methodCount + 1; + } + } + } + } + decl = decl.childDecl2; } - decl = decl.childDecl2; } - return s; -} + // --------------------------------------------------------------------------- + // Trait bounds checking + // --------------------------------------------------------------------------- -func Sema_HasError(sema: *Sema) -> bool { - return sema.hasError; -} + func Sema_FindInterface(sema: *Sema, name: String) -> *Decl { + var i: int = 0; + while i < sema.interfaceCount { + if String_Eq(sema.interfaceTable[i].name, name) { + return sema.interfaceTable[i].decl; + } + i = i + 1; + } + return null as *Decl; + } -func Sema_DiagCount(sema: *Sema) -> int { - return sema.diagCount; -} + func Sema_TypeHasMethod(sema: *Sema, typeName: String, methodName: String) -> bool { + var i: int = 0; + while i < sema.methodCount { + if String_Eq(sema.methodEntries[i].typeName, typeName) && String_Eq(sema.methodEntries[i].methodName, methodName) { + return true; + } + i = i + 1; + } + return false; + } -func Sema_Free(sema: *Sema) { - bux_free(sema.scope.symbols as *void); - bux_free(sema.scope as *void); - bux_free(sema.diags as *void); - bux_free(sema as *void); -} + func Sema_TypeImplements(sema: *Sema, typeName: String, interfaceName: String) -> bool { + let iface: *Decl = Sema_FindInterface(sema, interfaceName); + if iface == null as *Decl { + return true; // Unknown interface — be permissive + } + var req: *Decl = iface.childDecl1; + while req != null as *Decl { + if req.kind == dkFunc { + if !Sema_TypeHasMethod(sema, typeName, req.strValue) { + return false; + } + } + req = req.childDecl2; + } + return true; + } + + // Extract element type name from a collection TypeExpr. + // Handles both explicit generic types (Array) and mangled types (Array_int). + func Sema_ExtractElemType(te: *TypeExpr) -> String { + if te == null as *TypeExpr { return ""; } + // Pointer: unwrap and recurse + if te.kind == tekPointer && te.pointerPointee != null as *TypeExpr { + return Sema_ExtractElemType(te.pointerPointee); + } + if te.kind == tekNamed { + // Explicit generic: Array + if String_Eq(te.typeName, "Array") || String_Eq(te.typeName, "Iter") { + if te.typeArgCount > 0 { + return te.typeArgName0; + } + } + // Mangled: Array_int, Iter_string + let name: String = te.typeName; + let len: uint = bux_strlen(name); + // Check for "Array_" prefix + if len > 6 && name[0] as int == 65 && name[1] as int == 114 && name[2] as int == 114 && name[3] as int == 97 && name[4] as int == 121 && name[5] as int == 95 { + return bux_str_slice(name, 6, len - 6); + } + // Check for "Iter_" prefix + if len > 5 && name[0] as int == 73 && name[1] as int == 116 && name[2] as int == 101 && name[3] as int == 114 && name[4] as int == 95 { + return bux_str_slice(name, 5, len - 5); + } + } + return ""; + } + + // Substitute type params in a TypeExpr (shallow clone). Used for call return types + // after inference: Array + U=String → Array with typeArgName0=String / Array_String. + func Sema_SubstTypeExpr(te: *TypeExpr, p0: String, a0: String, p1: String, a1: String, argc: int) -> *TypeExpr { + if te == null as *TypeExpr { return null as *TypeExpr; } + let r: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + r.kind = te.kind; + r.line = te.line; + r.column = te.column; + r.typeName = te.typeName; + r.pathStr = te.pathStr; + r.pathCount = te.pathCount; + r.typeArgName0 = te.typeArgName0; + r.typeArgName1 = te.typeArgName1; + r.typeArgCount = te.typeArgCount; + r.sliceElement = te.sliceElement; + r.pointerPointee = te.pointerPointee; + r.funcParams = te.funcParams; + r.funcRet = te.funcRet; + r.funcParamCount = te.funcParamCount; + r.tupleElems = te.tupleElems; + r.tupleCount = te.tupleCount; + + if te.kind == tekNamed { + // Bare type param → concrete named type + if te.typeArgCount == 0 { + if argc >= 1 && String_Eq(te.typeName, p0) { + r.typeName = a0; + return r; + } + if argc >= 2 && String_Eq(te.typeName, p1) { + r.typeName = a1; + return r; + } + } + // Named with type args: Array → Array_String (mangled) for downstream mono + if te.typeArgCount > 0 { + var na0: String = te.typeArgName0; + var na1: String = te.typeArgName1; + if argc >= 1 && String_Eq(na0, p0) { na0 = a0; } + if argc >= 2 && String_Eq(na0, p1) { na0 = a1; } + if argc >= 1 && String_Eq(na1, p0) { na1 = a0; } + if argc >= 2 && String_Eq(na1, p1) { na1 = a1; } + r.typeArgName0 = na0; + r.typeArgName1 = na1; + // Mangle for monomorphized struct name (Array_int, Iter_String) + if te.typeArgCount == 1 && !String_Eq(na0, "") { + r.typeName = String_Concat(String_Concat(te.typeName, "_"), na0); + r.typeArgCount = 0; + r.typeArgName0 = ""; + } else if te.typeArgCount >= 2 { + r.typeName = String_Concat(String_Concat(te.typeName, "_"), + String_Concat(na0, String_Concat("_", na1))); + r.typeArgCount = 0; + r.typeArgName0 = ""; + r.typeArgName1 = ""; + } + return r; + } + } + if te.kind == tekPointer || te.kind == tekRef || te.kind == tekMutRef { + r.pointerPointee = Sema_SubstTypeExpr(te.pointerPointee, p0, a0, p1, a1, argc); + return r; + } + if te.kind == tekFunc { + r.funcRet = Sema_SubstTypeExpr(te.funcRet, p0, a0, p1, a1, argc); + return r; + } + return r; + } + + // Bind a type param name on the call callee if not already set. + func Sema_BindInferredArg(expr: *Expr, funcDecl: *Decl, tpName: String, typeName: String) { + if String_Eq(tpName, "") || String_Eq(typeName, "") { return; } + if expr.child1 == null as *Expr { return; } + if funcDecl.typeParamCount >= 1 && String_Eq(tpName, funcDecl.typeParam0) { + if String_Eq(expr.child1.genericTypeArg0, "") { + expr.child1.genericTypeArg0 = typeName; + } + if expr.child1.genericTypeArgCount < 1 { expr.child1.genericTypeArgCount = 1; } + } + if funcDecl.typeParamCount >= 2 && String_Eq(tpName, funcDecl.typeParam1) { + if String_Eq(expr.child1.genericTypeArg1, "") { + expr.child1.genericTypeArg1 = typeName; + } + if expr.child1.genericTypeArgCount < 2 { expr.child1.genericTypeArgCount = 2; } + } + } + + // Resolve concrete type name for a value expression (for bare type-param params). + func Sema_ArgTypeName(argExpr: *Expr) -> String { + if argExpr == null as *Expr { return ""; } + var argType: *TypeExpr = argExpr.refType; + if argType == null as *TypeExpr && argExpr.kind == ekUnary && argExpr.intValue == tkAmp { + if argExpr.child1 != null as *Expr { argType = argExpr.child1.refType; } + } + if argType == null as *TypeExpr { return ""; } + if argType.kind == tekNamed { return argType.typeName; } + if argType.kind == tekPointer && argType.pointerPointee != null as *TypeExpr { + if argType.pointerPointee.kind == tekNamed { + return argType.pointerPointee.typeName; + } + } + return ""; + } + + // Infer type args from a param TypeExpr pattern against a concrete arg TypeExpr. + func Sema_UnifyInfer(expr: *Expr, funcDecl: *Decl, pattern: *TypeExpr, concrete: *TypeExpr) { + if pattern == null as *TypeExpr || concrete == null as *TypeExpr { return; } + + // Bare type param: T / Acc / U + if pattern.kind == tekNamed && pattern.typeArgCount == 0 { + if String_Eq(pattern.typeName, funcDecl.typeParam0) || String_Eq(pattern.typeName, funcDecl.typeParam1) { + var cn: String = ""; + if concrete.kind == tekNamed { cn = concrete.typeName; } + Sema_BindInferredArg(expr, funcDecl, pattern.typeName, cn); + return; + } + } + + // *T / &T — unwrap pointer/ref on both sides + if pattern.kind == tekPointer || pattern.kind == tekRef || pattern.kind == tekMutRef { + var conc: *TypeExpr = concrete; + if concrete.kind == tekPointer || concrete.kind == tekRef || concrete.kind == tekMutRef { + conc = concrete.pointerPointee; + } + Sema_UnifyInfer(expr, funcDecl, pattern.pointerPointee, conc); + return; + } + + // Named with type args: Iter, Array, Map + if pattern.kind == tekNamed && pattern.typeArgCount > 0 { + // concrete may be Iter with typeArgName0, or mangled Iter_int + if concrete.kind == tekNamed { + if concrete.typeArgCount > 0 { + if pattern.typeArgCount >= 1 && !String_Eq(pattern.typeArgName0, "") { + let te0: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te0.kind = tekNamed; + te0.typeName = pattern.typeArgName0; + te0.typeArgCount = 0; + let ce0: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + ce0.kind = tekNamed; + ce0.typeName = concrete.typeArgName0; + ce0.typeArgCount = 0; + Sema_UnifyInfer(expr, funcDecl, te0, ce0); + } + if pattern.typeArgCount >= 2 && !String_Eq(pattern.typeArgName1, "") { + let te1: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te1.kind = tekNamed; + te1.typeName = pattern.typeArgName1; + te1.typeArgCount = 0; + let ce1: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + ce1.kind = tekNamed; + ce1.typeName = concrete.typeArgName1; + ce1.typeArgCount = 0; + Sema_UnifyInfer(expr, funcDecl, te1, ce1); + } + } else { + // Mangled Array_int / Iter_String + let elem: String = Sema_ExtractElemType(concrete); + if !String_Eq(elem, "") && pattern.typeArgCount >= 1 { + let te0: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + te0.kind = tekNamed; + te0.typeName = pattern.typeArgName0; + te0.typeArgCount = 0; + let ce0: *TypeExpr = bux_alloc(sizeof(TypeExpr)) as *TypeExpr; + ce0.kind = tekNamed; + ce0.typeName = elem; + ce0.typeArgCount = 0; + Sema_UnifyInfer(expr, funcDecl, te0, ce0); + } + } + } + return; + } + + // func(T)->U vs concrete function type + if pattern.kind == tekFunc { + var conc: *TypeExpr = concrete; + // Named function used as value: build tekFunc from its decl if needed — refType may already be tekFunc + if conc.kind == tekFunc { + // Params + var pp: *TypeExprList = pattern.funcParams; + var cp: *TypeExprList = conc.funcParams; + while pp != null as *TypeExprList && cp != null as *TypeExprList { + Sema_UnifyInfer(expr, funcDecl, pp.te, cp.te); + pp = pp.next; + cp = cp.next; + } + if pattern.funcRet != null as *TypeExpr && conc.funcRet != null as *TypeExpr { + Sema_UnifyInfer(expr, funcDecl, pattern.funcRet, conc.funcRet); + } + } + return; + } + } + + // Infer generic type arguments from call arguments (structural). + // Handles *Array, *Iter, func(T)->U, bare Acc, etc. + func Sema_InferGenericArgs(sema: *Sema, funcDecl: *Decl, expr: *Expr) { + if expr.callArgs == null as *ExprList { return; } + if expr.child1 == null as *Expr { return; } + var argList: *ExprList = expr.callArgs; + var pi: int = 0; + while argList != null as *ExprList && pi < funcDecl.paramCount { + let argExpr: *Expr = argList.expr; + if argExpr == null as *Expr { argList = argList.next; pi = pi + 1; continue; } + + var paramType: *TypeExpr = null as *TypeExpr; + if pi == 0 { paramType = funcDecl.param0.refParamType; } + else if pi == 1 { paramType = funcDecl.param1.refParamType; } + else if pi == 2 { paramType = funcDecl.param2.refParamType; } + else if pi == 3 { paramType = funcDecl.param3.refParamType; } + else if pi == 4 { paramType = funcDecl.param4.refParamType; } + else if pi == 5 { paramType = funcDecl.param5.refParamType; } + else if pi == 6 { paramType = funcDecl.param6.refParamType; } + else if pi == 7 { paramType = funcDecl.param7.refParamType; } + else if pi == 8 { paramType = funcDecl.param8.refParamType; } + + var argType: *TypeExpr = argExpr.refType; + // &x → use type of x, wrap as pointer if pattern expects pointer + if argType == null as *TypeExpr && argExpr.kind == ekUnary && argExpr.intValue == tkAmp { + if argExpr.child1 != null as *Expr { + argType = argExpr.child1.refType; + } + } + // Named function as value: synthesize tekFunc from its declaration + if (argType == null as *TypeExpr || argType.kind != tekFunc) && argExpr.kind == ekIdent { + let fsym: Symbol = Scope_Lookup(sema.scope, argExpr.strValue); + if fsym.kind == skFunc && fsym.decl != null as *Decl { + argType = Sema_BuildFuncTypeExprFromDecl(fsym.decl); + } + } + + if paramType != null as *TypeExpr && argType != null as *TypeExpr { + Sema_UnifyInfer(expr, funcDecl, paramType, argType); + // If pattern is *T and arg is bare T (from &x we unwrapped), re-wrap + if (paramType.kind == tekPointer || paramType.kind == tekRef || paramType.kind == tekMutRef) + && argExpr.kind == ekUnary && argExpr.intValue == tkAmp { + // already handled via unwrap of pattern against pointee type of variable + if argExpr.child1 != null as *Expr && argExpr.child1.refType != null as *TypeExpr { + Sema_UnifyInfer(expr, funcDecl, paramType.pointerPointee, argExpr.child1.refType); + } + } + } + argList = argList.next; + pi = pi + 1; + } + } + + func Sema_CheckTraitBounds(sema: *Sema, funcDecl: *Decl, typeArg0: String, typeArg1: String, typeArgCount: int, line: uint32, col: uint32) { + // Trait bounds checking + if funcDecl.typeParamCount >= 1 && typeArgCount >= 1 && !String_Eq(funcDecl.typeParam0Bound, "") { + if !Sema_TypeImplements(sema, typeArg0, funcDecl.typeParam0Bound) { + let errMsg: String = String_Concat("type '", String_Concat(typeArg0, "' does not implement trait '")); + let errMsg2: String = String_Concat(errMsg, String_Concat(funcDecl.typeParam0Bound, "'")); + Sema_EmitError(sema, line, col, errMsg2); + } + } + if funcDecl.typeParamCount >= 2 && typeArgCount >= 2 && !String_Eq(funcDecl.typeParam1Bound, "") { + if !Sema_TypeImplements(sema, typeArg1, funcDecl.typeParam1Bound) { + let errMsg: String = String_Concat("type '", String_Concat(typeArg1, "' does not implement trait '")); + let errMsg2: String = String_Concat(errMsg, String_Concat(funcDecl.typeParam1Bound, "'")); + Sema_EmitError(sema, line, col, errMsg2); + } + } + } + + // --------------------------------------------------------------------------- + // Analyze — main entry point + // --------------------------------------------------------------------------- + + func Sema_Analyze(mod: *Module) -> *Sema { + let s: *Sema = bux_alloc(sizeof(Sema)) as *Sema; + s.module = mod; + s.scope = bux_alloc(sizeof(Scope)) as *Scope; + s.scope.symbols = bux_alloc(1024 as uint * sizeof(Symbol)) as *Symbol; + s.scope.count = 0; + s.scope.parent = null as *Scope; + s.hasError = false; + s.diagCount = 0; + s.diags = bux_alloc(256 as uint * sizeof(SemaDiag)) as *SemaDiag; + s.typeTable = null as *void; + s.methodTable = null as *void; + s.currentRetType = tyVoid; + s.interfaceTable = bux_alloc(64 as uint * sizeof(InterfaceEntry)) as *InterfaceEntry; + s.interfaceCount = 0; + s.methodEntries = bux_alloc(256 as uint * sizeof(MethodEntry)) as *MethodEntry; + s.methodCount = 0; + + // First pass: collect globals + Sema_CollectGlobals(s); + + // Second pass: check function bodies + var decl: *Decl = mod.firstItem; + while decl != null as *Decl { + if decl.kind == dkFunc && decl.refBody != null as *Block { + // Create function scope (child of global) + var funcScope: Scope = Scope_NewChild(s.scope); + + // Add type params to scope + if decl.typeParamCount >= 1 { + var tpSym: Symbol; + Sema_ZeroInitSymbol(&tpSym); + tpSym.kind = skType; + tpSym.name = decl.typeParam0; + tpSym.typeKind = tyTypeParam; + tpSym.decl = null as *Decl; + discard Scope_Define(&funcScope, tpSym); + } + if decl.typeParamCount >= 2 { + var tpSym2: Symbol; + Sema_ZeroInitSymbol(&tpSym2); + tpSym2.kind = skType; + tpSym2.name = decl.typeParam1; + tpSym2.typeKind = tyTypeParam; + tpSym2.decl = null as *Decl; + discard Scope_Define(&funcScope, tpSym2); + } + + // Add parameters to scope + var i: int = 0; + while i < decl.paramCount { + var p: *Param = null as *Param; + if i == 0 { p = &decl.param0; } + else if i == 1 { p = &decl.param1; } + else if i == 2 { p = &decl.param2; } + else if i == 3 { p = &decl.param3; } + else if i == 4 { p = &decl.param4; } + else if i == 5 { p = &decl.param5; } + else if i == 6 { p = &decl.param6; } + else if i == 7 { p = &decl.param7; } + else if i == 8 { p = &decl.param8; } + var pSym: Symbol; + Sema_ZeroInitSymbol(&pSym); + pSym.kind = skVar; + if p != null as *Param && p.refParamType != null as *TypeExpr { + pSym.typeKind = Sema_ResolveType(s, p.refParamType); + pSym.refType = p.refParamType; + if p.refParamType.kind == tekPointer && p.refParamType.pointerPointee != null as *TypeExpr { + pSym.typeName = String_Concat(p.refParamType.pointerPointee.typeName, "*"); + } else { + pSym.typeName = p.refParamType.typeName; + } + } else { + pSym.typeKind = tyInt; + pSym.typeName = ""; + } + pSym.isMutable = false; + pSym.isPublic = false; + pSym.decl = null as *Decl; + if i == 0 { pSym.name = decl.param0.name; } + else if i == 1 { pSym.name = decl.param1.name; } + else if i == 2 { pSym.name = decl.param2.name; } + else if i == 3 { pSym.name = decl.param3.name; } + else if i == 4 { pSym.name = decl.param4.name; } + else if i == 5 { pSym.name = decl.param5.name; } + else if i == 6 { pSym.name = decl.param6.name; } + else if i == 7 { pSym.name = decl.param7.name; } + else if i == 8 { pSym.name = decl.param8.name; } + discard Scope_Define(&funcScope, pSym); + i = i + 1; + } + + // Switch to function scope and check body statements + let prevScope: *Scope = s.scope; + s.scope = &funcScope; + + // Set current function return type + if decl.retType != null as *TypeExpr { + s.currentRetType = Sema_ResolveType(s, decl.retType); + } else { + s.currentRetType = tyVoid; + } + + // Enable borrow checking for @[Checked] functions + let wasChecked: bool = s.checkedFunc; + s.checkedFunc = decl.isChecked != 0; + let wasRelease: bool = s.releaseFunc; + s.releaseFunc = decl.isRelease != 0; + s.movedCount = 0; + // C.1: lifetime elision before walking the body + Sema_ApplyLifetimeElision(s, decl); + + // Check body statements + var stmt: *Stmt = decl.refBody.firstStmt; + while stmt != null as *Stmt { + Sema_CheckStmt(s, stmt); + stmt = stmt.nextStmt; + } + + s.checkedFunc = wasChecked; + s.releaseFunc = wasRelease; + Sema_ClearLifetimes(s); + s.scope = prevScope; + } + decl = decl.childDecl2; + } + + return s; + } + + func Sema_HasError(sema: *Sema) -> bool { + return sema.hasError; + } + + func Sema_DiagCount(sema: *Sema) -> int { + return sema.diagCount; + } + + func Sema_Free(sema: *Sema) { + bux_free(sema.scope.symbols as *void); + bux_free(sema.scope as *void); + bux_free(sema.diags as *void); + bux_free(sema as *void); + } } diff --git a/src/source_location.bux b/src/source_location.bux index 3d01e5e..448f9f2 100644 --- a/src/source_location.bux +++ b/src/source_location.bux @@ -1,13 +1,13 @@ // source_location.bux — Source position tracking module SourceLocation { -struct SourceLocation { - line: uint32; - column: uint32; - offset: uint32; -} + struct SourceLocation { + line: uint32; + column: uint32; + offset: uint32; + } -func SourceLocation_New(line: uint32, column: uint32, offset: uint32) -> SourceLocation { - return SourceLocation { line: line, column: column, offset: offset }; -} + func SourceLocation_New(line: uint32, column: uint32, offset: uint32) -> SourceLocation { + return SourceLocation { line: line, column: column, offset: offset }; + } } diff --git a/src/token.bux b/src/token.bux index 5dc3cc7..d371751 100644 --- a/src/token.bux +++ b/src/token.bux @@ -1,346 +1,350 @@ // token.bux — Token kinds and helpers module Token { -// --------------------------------------------------------------------------- -// TokenKind enum -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // TokenKind enum + // --------------------------------------------------------------------------- -// Literals -const tkIntLiteral: int = 0; -const tkFloatLiteral: int = 1; -const tkStringLiteral: int = 2; -const tkCharLiteral: int = 3; -const tkBoolLiteral: int = 4; + // Literals + const tkIntLiteral: int = 0; + const tkFloatLiteral: int = 1; + const tkStringLiteral: int = 2; + const tkCharLiteral: int = 3; + const tkBoolLiteral: int = 4; -// Identifiers -const tkIdent: int = 5; -const tkUnderscore: int = 6; + // Identifiers + const tkIdent: int = 5; + const tkUnderscore: int = 6; -// Control flow keywords -const tkIf: int = 7; -const tkElse: int = 8; -const tkWhile: int = 9; -const tkDo: int = 10; -const tkLoop: int = 11; -const tkFor: int = 12; -const tkIn: int = 13; -const tkBreak: int = 14; -const tkContinue: int = 15; -const tkReturn: int = 16; -const tkMatch: int = 17; + // Control flow keywords + const tkIf: int = 7; + const tkElse: int = 8; + const tkWhile: int = 9; + const tkDo: int = 10; + const tkLoop: int = 11; + const tkFor: int = 12; + const tkIn: int = 13; + const tkBreak: int = 14; + const tkContinue: int = 15; + const tkReturn: int = 16; + const tkMatch: int = 17; -// Declaration keywords -const tkFunc: int = 18; -const tkLet: int = 19; -const tkVar: int = 20; -const tkConst: int = 21; -const tkType: int = 22; -const tkStruct: int = 23; -const tkEnum: int = 24; -const tkUnion: int = 25; -const tkInterface: int = 26; -const tkExtend: int = 27; -const tkModule: int = 28; -const tkImport: int = 29; -const tkPub: int = 30; -const tkExtern: int = 31; + // Declaration keywords + const tkFunc: int = 18; + const tkLet: int = 19; + const tkVar: int = 20; + const tkConst: int = 21; + const tkType: int = 22; + const tkStruct: int = 23; + const tkEnum: int = 24; + const tkUnion: int = 25; + const tkInterface: int = 26; + const tkExtend: int = 27; + const tkModule: int = 28; + const tkImport: int = 29; + const tkPub: int = 30; + const tkExtern: int = 31; -// Other keywords -const tkAs: int = 32; -const tkIs: int = 33; -const tkNull: int = 34; -const tkSelf: int = 35; -const tkSuper: int = 36; -const tkSizeOf: int = 37; + // Other keywords + const tkAs: int = 32; + const tkIs: int = 33; + const tkNull: int = 34; + const tkSelf: int = 35; + const tkSuper: int = 36; + const tkSizeOf: int = 37; -// Punctuation -const tkLParen: int = 38; -const tkRParen: int = 39; -const tkLBrace: int = 40; -const tkRBrace: int = 41; -const tkLBracket: int = 42; -const tkRBracket: int = 43; -const tkComma: int = 44; -const tkSemicolon: int = 45; -const tkColon: int = 46; -const tkColonColon: int = 47; -const tkDot: int = 48; -const tkDotDot: int = 49; -const tkDotDotDot: int = 50; -const tkDotDotEqual: int = 51; -const tkArrow: int = 52; -const tkFatArrow: int = 53; -const tkAt: int = 54; -const tkHash: int = 55; -const tkQuestion: int = 56; + // Punctuation + const tkLParen: int = 38; + const tkRParen: int = 39; + const tkLBrace: int = 40; + const tkRBrace: int = 41; + const tkLBracket: int = 42; + const tkRBracket: int = 43; + const tkComma: int = 44; + const tkSemicolon: int = 45; + const tkColon: int = 46; + const tkColonColon: int = 47; + const tkDot: int = 48; + const tkDotDot: int = 49; + const tkDotDotDot: int = 50; + const tkDotDotEqual: int = 51; + const tkArrow: int = 52; + const tkFatArrow: int = 53; + const tkAt: int = 54; + const tkHash: int = 55; + const tkQuestion: int = 56; -// Arithmetic operators -const tkPlus: int = 57; -const tkMinus: int = 58; -const tkStar: int = 59; -const tkSlash: int = 60; -const tkPercent: int = 61; -const tkStarStar: int = 62; -const tkPlusPlus: int = 63; -const tkMinusMinus: int = 64; + // Arithmetic operators + const tkPlus: int = 57; + const tkMinus: int = 58; + const tkStar: int = 59; + const tkSlash: int = 60; + const tkPercent: int = 61; + const tkStarStar: int = 62; + const tkPlusPlus: int = 63; + const tkMinusMinus: int = 64; -// Bitwise operators -const tkAmp: int = 65; -const tkPipe: int = 66; -const tkCaret: int = 67; -const tkTilde: int = 68; -const tkShl: int = 69; -const tkShr: int = 70; + // Bitwise operators + const tkAmp: int = 65; + const tkPipe: int = 66; + const tkCaret: int = 67; + const tkTilde: int = 68; + const tkShl: int = 69; + const tkShr: int = 70; -// Logical operators -const tkAmpAmp: int = 71; -const tkPipePipe: int = 72; -const tkBang: int = 73; + // Logical operators + const tkAmpAmp: int = 71; + const tkPipePipe: int = 72; + const tkBang: int = 73; -// Comparison operators -const tkEq: int = 74; -const tkNe: int = 75; -const tkLt: int = 76; -const tkLe: int = 77; -const tkGt: int = 78; -const tkGe: int = 79; + // Comparison operators + const tkEq: int = 74; + const tkNe: int = 75; + const tkLt: int = 76; + const tkLe: int = 77; + const tkGt: int = 78; + const tkGe: int = 79; -// Assignment operators -const tkAssign: int = 80; -const tkPlusAssign: int = 81; -const tkMinusAssign: int = 82; -const tkStarAssign: int = 83; -const tkSlashAssign: int = 84; -const tkPercentAssign: int = 85; -const tkAmpAssign: int = 86; -const tkPipeAssign: int = 87; -const tkCaretAssign: int = 88; -const tkShlAssign: int = 89; -const tkShrAssign: int = 90; + // Assignment operators + const tkAssign: int = 80; + const tkPlusAssign: int = 81; + const tkMinusAssign: int = 82; + const tkStarAssign: int = 83; + const tkSlashAssign: int = 84; + const tkPercentAssign: int = 85; + const tkAmpAssign: int = 86; + const tkPipeAssign: int = 87; + const tkCaretAssign: int = 88; + const tkShlAssign: int = 89; + const tkShrAssign: int = 90; -// Compile-time intrinsics -const tkHashLine: int = 91; -const tkHashColumn: int = 92; -const tkHashFile: int = 93; -const tkHashFunction: int = 94; -const tkHashDate: int = 95; -const tkHashTime: int = 96; -const tkHashModule: int = 97; + // Compile-time intrinsics + const tkHashLine: int = 91; + const tkHashColumn: int = 92; + const tkHashFile: int = 93; + const tkHashFunction: int = 94; + const tkHashDate: int = 95; + const tkHashTime: int = 96; + const tkHashModule: int = 97; -// Special -const tkOwn: int = 98; -const tkNewLine: int = 99; -const tkEndOfFile: int = 100; -const tkUnknown: int = 101; + // Special + const tkOwn: int = 98; + const tkNewLine: int = 99; + const tkEndOfFile: int = 100; + const tkUnknown: int = 101; -// Async / concurrency -const tkAsync: int = 102; -const tkAwait: int = 103; -const tkSpawn: int = 104; -const tkDiscard: int = 105; -const tkDefer: int = 106; -const tkSwitch: int = 107; -const tkCase: int = 108; -const tkDefault: int = 109; -const tkUnsafe: int = 110; + // Async / concurrency + const tkAsync: int = 102; + const tkAwait: int = 103; + const tkSpawn: int = 104; + const tkDiscard: int = 105; + const tkDefer: int = 106; + const tkSwitch: int = 107; + const tkCase: int = 108; + const tkDefault: int = 109; + const tkUnsafe: int = 110; -// --------------------------------------------------------------------------- -// Token struct -// --------------------------------------------------------------------------- + // Lifetime parameter token: 'a, 'b, ... (not a char literal) + const tkLifetime: int = 111; -struct Token { - kind: int; - text: String; - line: uint32; - column: uint32; - offset: uint32; -} - -// --------------------------------------------------------------------------- -// Helpers -// --------------------------------------------------------------------------- - -func Token_IsKeyword(kind: int) -> bool { - if kind >= tkIf && kind <= tkIn { return true; } - if kind >= tkBreak && kind <= tkMatch { return true; } - if kind >= tkFunc && kind <= tkExtern { return true; } - if kind >= tkAs && kind <= tkSuper { return true; } - if kind == tkSizeOf { return true; } - if kind >= tkDefer && kind <= tkUnsafe { return true; } - if kind >= tkAsync && kind <= tkSpawn { return true; } - return false; -} - -func Token_IsLiteral(kind: int) -> bool { - if kind >= tkIntLiteral && kind <= tkBoolLiteral { return true; } - return false; -} - -func Token_IsOperator(kind: int) -> bool { - if kind >= tkPlus && kind <= tkShrAssign { return true; } - return false; -} - -func Token_IsEof(kind: int) -> bool { - return kind == tkEndOfFile; -} - -func Token_KeywordKind(text: String) -> int { - if String_Eq(text, "func") { return tkFunc; } - if String_Eq(text, "let") { return tkLet; } - if String_Eq(text, "var") { return tkVar; } - if String_Eq(text, "const") { return tkConst; } - if String_Eq(text, "type") { return tkType; } - if String_Eq(text, "struct") { return tkStruct; } - if String_Eq(text, "enum") { return tkEnum; } - if String_Eq(text, "union") { return tkUnion; } - if String_Eq(text, "interface") { return tkInterface; } - if String_Eq(text, "extend") { return tkExtend; } - if String_Eq(text, "module") { return tkModule; } - if String_Eq(text, "import") { return tkImport; } - if String_Eq(text, "pub") { return tkPub; } - if String_Eq(text, "extern") { return tkExtern; } - if String_Eq(text, "if") { return tkIf; } - if String_Eq(text, "else") { return tkElse; } - if String_Eq(text, "while") { return tkWhile; } - if String_Eq(text, "do") { return tkDo; } - if String_Eq(text, "loop") { return tkLoop; } - if String_Eq(text, "for") { return tkFor; } - if String_Eq(text, "in") { return tkIn; } - if String_Eq(text, "break") { return tkBreak; } - if String_Eq(text, "continue") { return tkContinue; } - if String_Eq(text, "return") { return tkReturn; } - if String_Eq(text, "match") { return tkMatch; } - if String_Eq(text, "as") { return tkAs; } - if String_Eq(text, "is") { return tkIs; } - if String_Eq(text, "null") { return tkNull; } - if String_Eq(text, "self") { return tkSelf; } - if String_Eq(text, "super") { return tkSuper; } - if String_Eq(text, "sizeof") { return tkSizeOf; } - if String_Eq(text, "defer") { return tkDefer; } - if String_Eq(text, "switch") { return tkSwitch; } - if String_Eq(text, "case") { return tkCase; } - if String_Eq(text, "default") { return tkDefault; } - if String_Eq(text, "unsafe") { return tkUnsafe; } - if String_Eq(text, "discard") { return tkDiscard; } - if String_Eq(text, "async") { return tkAsync; } - if String_Eq(text, "await") { return tkAwait; } - if String_Eq(text, "spawn") { return tkSpawn; } - if String_Eq(text, "true") { return tkBoolLiteral; } - if String_Eq(text, "false") { return tkBoolLiteral; } - return tkIdent; -} - -func Token_KindName(kind: int) -> String { - if kind == tkIntLiteral { return "integer literal"; } - if kind == tkFloatLiteral { return "float literal"; } - if kind == tkStringLiteral { return "string literal"; } - if kind == tkCharLiteral { return "char literal"; } - if kind == tkBoolLiteral { return "boolean literal"; } - if kind == tkIdent { return "identifier"; } - if kind == tkUnderscore { return "_"; } - if kind == tkSizeOf { return "sizeof"; } - if kind == tkIf { return "if"; } - if kind == tkElse { return "else"; } - if kind == tkWhile { return "while"; } - if kind == tkDo { return "do"; } - if kind == tkLoop { return "loop"; } - if kind == tkFor { return "for"; } - if kind == tkIn { return "in"; } - if kind == tkBreak { return "break"; } - if kind == tkContinue { return "continue"; } - if kind == tkReturn { return "return"; } - if kind == tkMatch { return "match"; } - if kind == tkFunc { return "func"; } - if kind == tkLet { return "let"; } - if kind == tkVar { return "var"; } - if kind == tkConst { return "const"; } - if kind == tkType { return "type"; } - if kind == tkStruct { return "struct"; } - if kind == tkEnum { return "enum"; } - if kind == tkUnion { return "union"; } - if kind == tkInterface { return "interface"; } - if kind == tkExtend { return "extend"; } - if kind == tkModule { return "module"; } - if kind == tkImport { return "import"; } - if kind == tkPub { return "pub"; } - if kind == tkExtern { return "extern"; } - if kind == tkAs { return "as"; } - if kind == tkIs { return "is"; } - if kind == tkNull { return "null"; } - if kind == tkSelf { return "self"; } - if kind == tkSuper { return "super"; } - if kind == tkUnsafe { return "unsafe"; } - if kind == tkDefer { return "defer"; } - if kind == tkSwitch { return "switch"; } - if kind == tkCase { return "case"; } - if kind == tkDefault { return "default"; } - if kind == tkAsync { return "async"; } - if kind == tkAwait { return "await"; } - if kind == tkSpawn { return "spawn"; } - if kind == tkDiscard { return "discard"; } - if kind == tkLParen { return "("; } - if kind == tkRParen { return ")"; } - if kind == tkLBrace { return "{"; } - if kind == tkRBrace { return "}"; } - if kind == tkLBracket { return "["; } - if kind == tkRBracket { return "]"; } - if kind == tkComma { return ","; } - if kind == tkSemicolon { return ";"; } - if kind == tkColon { return ":"; } - if kind == tkColonColon { return "::"; } - if kind == tkDot { return "."; } - if kind == tkDotDot { return ".."; } - if kind == tkDotDotDot { return "..."; } - if kind == tkDotDotEqual { return "..="; } - if kind == tkArrow { return "->"; } - if kind == tkFatArrow { return "=>"; } - if kind == tkAt { return "@"; } - if kind == tkHash { return "#"; } - if kind == tkQuestion { return "?"; } - if kind == tkPlus { return "+"; } - if kind == tkMinus { return "-"; } - if kind == tkStar { return "*"; } - if kind == tkSlash { return "/"; } - if kind == tkPercent { return "%"; } - if kind == tkStarStar { return "**"; } - if kind == tkPlusPlus { return "++"; } - if kind == tkMinusMinus { return "--"; } - if kind == tkAmp { return "&"; } - if kind == tkPipe { return "|"; } - if kind == tkCaret { return "^"; } - if kind == tkTilde { return "~"; } - if kind == tkShl { return "<<"; } - if kind == tkShr { return ">>"; } - if kind == tkAmpAmp { return "&&"; } - if kind == tkPipePipe { return "||"; } - if kind == tkBang { return "!"; } - if kind == tkEq { return "=="; } - if kind == tkNe { return "!="; } - if kind == tkLt { return "<"; } - if kind == tkLe { return "<="; } - if kind == tkGt { return ">"; } - if kind == tkGe { return ">="; } - if kind == tkAssign { return "="; } - if kind == tkPlusAssign { return "+="; } - if kind == tkMinusAssign { return "-="; } - if kind == tkStarAssign { return "*="; } - if kind == tkSlashAssign { return "/="; } - if kind == tkPercentAssign { return "%="; } - if kind == tkAmpAssign { return "&="; } - if kind == tkPipeAssign { return "|="; } - if kind == tkCaretAssign { return "^="; } - if kind == tkShlAssign { return "<<="; } - if kind == tkShrAssign { return ">>="; } - if kind == tkHashLine { return "#line"; } - if kind == tkHashColumn { return "#column"; } - if kind == tkHashFile { return "#file"; } - if kind == tkHashFunction { return "#function"; } - if kind == tkHashDate { return "#date"; } - if kind == tkHashTime { return "#time"; } - if kind == tkHashModule { return "#module"; } - if kind == tkNewLine { return "newline"; } - if kind == tkEndOfFile { return "end of file"; } - return "unknown token"; -} + // --------------------------------------------------------------------------- + // Token struct + // --------------------------------------------------------------------------- + + struct Token { + kind: int; + text: String; + line: uint32; + column: uint32; + offset: uint32; + } + + // --------------------------------------------------------------------------- + // Helpers + // --------------------------------------------------------------------------- + + func Token_IsKeyword(kind: int) -> bool { + if kind >= tkIf && kind <= tkIn { return true; } + if kind >= tkBreak && kind <= tkMatch { return true; } + if kind >= tkFunc && kind <= tkExtern { return true; } + if kind >= tkAs && kind <= tkSuper { return true; } + if kind == tkSizeOf { return true; } + if kind >= tkDefer && kind <= tkUnsafe { return true; } + if kind >= tkAsync && kind <= tkSpawn { return true; } + return false; + } + + func Token_IsLiteral(kind: int) -> bool { + if kind >= tkIntLiteral && kind <= tkBoolLiteral { return true; } + return false; + } + + func Token_IsOperator(kind: int) -> bool { + if kind >= tkPlus && kind <= tkShrAssign { return true; } + return false; + } + + func Token_IsEof(kind: int) -> bool { + return kind == tkEndOfFile; + } + + func Token_KeywordKind(text: String) -> int { + if String_Eq(text, "func") { return tkFunc; } + if String_Eq(text, "let") { return tkLet; } + if String_Eq(text, "var") { return tkVar; } + if String_Eq(text, "const") { return tkConst; } + if String_Eq(text, "type") { return tkType; } + if String_Eq(text, "struct") { return tkStruct; } + if String_Eq(text, "enum") { return tkEnum; } + if String_Eq(text, "union") { return tkUnion; } + if String_Eq(text, "interface") { return tkInterface; } + if String_Eq(text, "extend") { return tkExtend; } + if String_Eq(text, "module") { return tkModule; } + if String_Eq(text, "import") { return tkImport; } + if String_Eq(text, "pub") { return tkPub; } + if String_Eq(text, "extern") { return tkExtern; } + if String_Eq(text, "if") { return tkIf; } + if String_Eq(text, "else") { return tkElse; } + if String_Eq(text, "while") { return tkWhile; } + if String_Eq(text, "do") { return tkDo; } + if String_Eq(text, "loop") { return tkLoop; } + if String_Eq(text, "for") { return tkFor; } + if String_Eq(text, "in") { return tkIn; } + if String_Eq(text, "break") { return tkBreak; } + if String_Eq(text, "continue") { return tkContinue; } + if String_Eq(text, "return") { return tkReturn; } + if String_Eq(text, "match") { return tkMatch; } + if String_Eq(text, "as") { return tkAs; } + if String_Eq(text, "is") { return tkIs; } + if String_Eq(text, "null") { return tkNull; } + if String_Eq(text, "self") { return tkSelf; } + if String_Eq(text, "super") { return tkSuper; } + if String_Eq(text, "sizeof") { return tkSizeOf; } + if String_Eq(text, "defer") { return tkDefer; } + if String_Eq(text, "switch") { return tkSwitch; } + if String_Eq(text, "case") { return tkCase; } + if String_Eq(text, "default") { return tkDefault; } + if String_Eq(text, "unsafe") { return tkUnsafe; } + if String_Eq(text, "discard") { return tkDiscard; } + if String_Eq(text, "async") { return tkAsync; } + if String_Eq(text, "await") { return tkAwait; } + if String_Eq(text, "spawn") { return tkSpawn; } + if String_Eq(text, "true") { return tkBoolLiteral; } + if String_Eq(text, "false") { return tkBoolLiteral; } + return tkIdent; + } + + func Token_KindName(kind: int) -> String { + if kind == tkIntLiteral { return "integer literal"; } + if kind == tkFloatLiteral { return "float literal"; } + if kind == tkStringLiteral { return "string literal"; } + if kind == tkCharLiteral { return "char literal"; } + if kind == tkBoolLiteral { return "boolean literal"; } + if kind == tkIdent { return "identifier"; } + if kind == tkUnderscore { return "_"; } + if kind == tkSizeOf { return "sizeof"; } + if kind == tkIf { return "if"; } + if kind == tkElse { return "else"; } + if kind == tkWhile { return "while"; } + if kind == tkDo { return "do"; } + if kind == tkLoop { return "loop"; } + if kind == tkFor { return "for"; } + if kind == tkIn { return "in"; } + if kind == tkBreak { return "break"; } + if kind == tkContinue { return "continue"; } + if kind == tkReturn { return "return"; } + if kind == tkMatch { return "match"; } + if kind == tkFunc { return "func"; } + if kind == tkLet { return "let"; } + if kind == tkVar { return "var"; } + if kind == tkConst { return "const"; } + if kind == tkType { return "type"; } + if kind == tkStruct { return "struct"; } + if kind == tkEnum { return "enum"; } + if kind == tkUnion { return "union"; } + if kind == tkInterface { return "interface"; } + if kind == tkExtend { return "extend"; } + if kind == tkModule { return "module"; } + if kind == tkImport { return "import"; } + if kind == tkPub { return "pub"; } + if kind == tkExtern { return "extern"; } + if kind == tkAs { return "as"; } + if kind == tkIs { return "is"; } + if kind == tkNull { return "null"; } + if kind == tkSelf { return "self"; } + if kind == tkSuper { return "super"; } + if kind == tkUnsafe { return "unsafe"; } + if kind == tkDefer { return "defer"; } + if kind == tkSwitch { return "switch"; } + if kind == tkCase { return "case"; } + if kind == tkDefault { return "default"; } + if kind == tkAsync { return "async"; } + if kind == tkAwait { return "await"; } + if kind == tkSpawn { return "spawn"; } + if kind == tkDiscard { return "discard"; } + if kind == tkLParen { return "("; } + if kind == tkRParen { return ")"; } + if kind == tkLBrace { return "{"; } + if kind == tkRBrace { return "}"; } + if kind == tkLBracket { return "["; } + if kind == tkRBracket { return "]"; } + if kind == tkComma { return ","; } + if kind == tkSemicolon { return ";"; } + if kind == tkColon { return ":"; } + if kind == tkColonColon { return "::"; } + if kind == tkDot { return "."; } + if kind == tkDotDot { return ".."; } + if kind == tkDotDotDot { return "..."; } + if kind == tkDotDotEqual { return "..="; } + if kind == tkArrow { return "->"; } + if kind == tkFatArrow { return "=>"; } + if kind == tkAt { return "@"; } + if kind == tkHash { return "#"; } + if kind == tkQuestion { return "?"; } + if kind == tkPlus { return "+"; } + if kind == tkMinus { return "-"; } + if kind == tkStar { return "*"; } + if kind == tkSlash { return "/"; } + if kind == tkPercent { return "%"; } + if kind == tkStarStar { return "**"; } + if kind == tkPlusPlus { return "++"; } + if kind == tkMinusMinus { return "--"; } + if kind == tkAmp { return "&"; } + if kind == tkPipe { return "|"; } + if kind == tkCaret { return "^"; } + if kind == tkTilde { return "~"; } + if kind == tkShl { return "<<"; } + if kind == tkShr { return ">>"; } + if kind == tkAmpAmp { return "&&"; } + if kind == tkPipePipe { return "||"; } + if kind == tkBang { return "!"; } + if kind == tkEq { return "=="; } + if kind == tkNe { return "!="; } + if kind == tkLt { return "<"; } + if kind == tkLe { return "<="; } + if kind == tkGt { return ">"; } + if kind == tkGe { return ">="; } + if kind == tkAssign { return "="; } + if kind == tkPlusAssign { return "+="; } + if kind == tkMinusAssign { return "-="; } + if kind == tkStarAssign { return "*="; } + if kind == tkSlashAssign { return "/="; } + if kind == tkPercentAssign { return "%="; } + if kind == tkAmpAssign { return "&="; } + if kind == tkPipeAssign { return "|="; } + if kind == tkCaretAssign { return "^="; } + if kind == tkShlAssign { return "<<="; } + if kind == tkShrAssign { return ">>="; } + if kind == tkHashLine { return "#line"; } + if kind == tkHashColumn { return "#column"; } + if kind == tkHashFile { return "#file"; } + if kind == tkHashFunction { return "#function"; } + if kind == tkHashDate { return "#date"; } + if kind == tkHashTime { return "#time"; } + if kind == tkHashModule { return "#module"; } + if kind == tkLifetime { return "lifetime"; } + if kind == tkNewLine { return "newline"; } + if kind == tkEndOfFile { return "end of file"; } + return "unknown token"; + } } diff --git a/src/types.bux b/src/types.bux index 197db0f..802c103 100644 --- a/src/types.bux +++ b/src/types.bux @@ -1,279 +1,279 @@ // types.bux — Type system definitions and factories module Types { -// --------------------------------------------------------------------------- -// TypeKind constants -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // TypeKind constants + // --------------------------------------------------------------------------- -const tyUnknown: int = 0; -const tyVoid: int = 1; -const tyBool: int = 2; -const tyBool8: int = 3; -const tyBool16: int = 4; -const tyBool32: int = 5; -const tyChar8: int = 6; -const tyChar16: int = 7; -const tyChar32: int = 8; -const tyStr: int = 9; -const tyInt8: int = 10; -const tyInt16: int = 11; -const tyInt32: int = 12; -const tyInt64: int = 13; -const tyInt: int = 14; -const tyUInt8: int = 15; -const tyUInt16: int = 16; -const tyUInt32: int = 17; -const tyUInt64: int = 18; -const tyUInt: int = 19; -const tyFloat32: int = 20; -const tyFloat64: int = 21; -const tyPointer: int = 22; -const tySlice: int = 23; -const tyRange: int = 24; -const tyTuple: int = 25; -const tyNamed: int = 26; -const tyTypeParam: int = 27; -const tyFunc: int = 28; + const tyUnknown: int = 0; + const tyVoid: int = 1; + const tyBool: int = 2; + const tyBool8: int = 3; + const tyBool16: int = 4; + const tyBool32: int = 5; + const tyChar8: int = 6; + const tyChar16: int = 7; + const tyChar32: int = 8; + const tyStr: int = 9; + const tyInt8: int = 10; + const tyInt16: int = 11; + const tyInt32: int = 12; + const tyInt64: int = 13; + const tyInt: int = 14; + const tyUInt8: int = 15; + const tyUInt16: int = 16; + const tyUInt32: int = 17; + const tyUInt64: int = 18; + const tyUInt: int = 19; + const tyFloat32: int = 20; + const tyFloat64: int = 21; + const tyPointer: int = 22; + const tySlice: int = 23; + const tyRange: int = 24; + const tyTuple: int = 25; + const tyNamed: int = 26; + const tyTypeParam: int = 27; + const tyFunc: int = 28; -// --------------------------------------------------------------------------- -// Type struct -// --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // Type struct + // --------------------------------------------------------------------------- -struct Type { - kind: int; - name: String; - // inner types stored as array of pointers (simplified) - innerKind1: int; - innerName1: String; - innerKind2: int; - innerName2: String; - innerKind3: int; - innerName3: String; - innerCount: int; -} - -// --------------------------------------------------------------------------- -// Factories -// --------------------------------------------------------------------------- - -func Type_MakeUnknown() -> Type { - return Type { kind: tyUnknown, name: "", innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -func Type_MakeVoid() -> Type { - return Type { kind: tyVoid, name: "void", innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -func Type_MakeBool() -> Type { - return Type { kind: tyBool, name: "bool", innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -func Type_MakeInt() -> Type { - return Type { kind: tyInt, name: "int", innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -func Type_MakeInt64() -> Type { - return Type { kind: tyInt64, name: "int64", innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -func Type_MakeUInt() -> Type { - return Type { kind: tyUInt, name: "uint", innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -func Type_MakeFloat64() -> Type { - return Type { kind: tyFloat64, name: "float64", innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -func Type_MakeStr() -> Type { - return Type { kind: tyStr, name: "String", innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -func Type_MakePointer(pointee: Type) -> Type { - return Type { kind: tyPointer, name: "", innerCount: 1, - innerKind1: pointee.kind, innerName1: pointee.name, - innerKind2: 0, innerName2: "", innerKind3: 0, innerName3: "" }; -} - -func Type_MakeNamed(name: String) -> Type { - return Type { kind: tyNamed, name: name, innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -func Type_MakeTypeParam(name: String) -> Type { - return Type { kind: tyTypeParam, name: name, innerCount: 0, - innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", - innerKind3: 0, innerName3: "" }; -} - -// --------------------------------------------------------------------------- -// Predicates -// --------------------------------------------------------------------------- - -func Type_IsNumeric(t: Type) -> bool { - let k: int = t.kind; - if k == tyInt8 || k == tyInt16 || k == tyInt32 || k == tyInt64 || k == tyInt { return true; } - if k == tyUInt8 || k == tyUInt16 || k == tyUInt32 || k == tyUInt64 || k == tyUInt { return true; } - if k == tyFloat32 || k == tyFloat64 { return true; } - if k == tyUnknown || k == tyNamed || k == tyTypeParam { return true; } - return false; -} - -func Type_IsInteger(t: Type) -> bool { - let k: int = t.kind; - if k == tyInt8 || k == tyInt16 || k == tyInt32 || k == tyInt64 || k == tyInt { return true; } - if k == tyUInt8 || k == tyUInt16 || k == tyUInt32 || k == tyUInt64 || k == tyUInt { return true; } - if k == tyUnknown || k == tyNamed || k == tyTypeParam { return true; } - return false; -} - -func Type_IsBool(t: Type) -> bool { - let k: int = t.kind; - return k == tyBool || k == tyBool8 || k == tyBool16 || k == tyBool32; -} - -func Type_IsPointer(t: Type) -> bool { - return t.kind == tyPointer; -} - -func Type_IsSlice(t: Type) -> bool { - return t.kind == tySlice; -} - -// --------------------------------------------------------------------------- -// Comparison (structural, limited to kind + name for simplicity) -// --------------------------------------------------------------------------- - -func Type_Eq(a: Type, b: Type) -> bool { - if a.kind != b.kind { return false; } - if a.kind == tyNamed || a.kind == tyTypeParam { - return String_Eq(a.name, b.name); + struct Type { + kind: int; + name: String; + // inner types stored as array of pointers (simplified) + innerKind1: int; + innerName1: String; + innerKind2: int; + innerName2: String; + innerKind3: int; + innerName3: String; + innerCount: int; + } + + // --------------------------------------------------------------------------- + // Factories + // --------------------------------------------------------------------------- + + func Type_MakeUnknown() -> Type { + return Type { kind: tyUnknown, name: "", innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + func Type_MakeVoid() -> Type { + return Type { kind: tyVoid, name: "void", innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + func Type_MakeBool() -> Type { + return Type { kind: tyBool, name: "bool", innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + func Type_MakeInt() -> Type { + return Type { kind: tyInt, name: "int", innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + func Type_MakeInt64() -> Type { + return Type { kind: tyInt64, name: "int64", innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + func Type_MakeUInt() -> Type { + return Type { kind: tyUInt, name: "uint", innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + func Type_MakeFloat64() -> Type { + return Type { kind: tyFloat64, name: "float64", innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + func Type_MakeStr() -> Type { + return Type { kind: tyStr, name: "String", innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + func Type_MakePointer(pointee: Type) -> Type { + return Type { kind: tyPointer, name: "", innerCount: 1, + innerKind1: pointee.kind, innerName1: pointee.name, + innerKind2: 0, innerName2: "", innerKind3: 0, innerName3: "" }; + } + + func Type_MakeNamed(name: String) -> Type { + return Type { kind: tyNamed, name: name, innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + func Type_MakeTypeParam(name: String) -> Type { + return Type { kind: tyTypeParam, name: name, innerCount: 0, + innerKind1: 0, innerName1: "", innerKind2: 0, innerName2: "", + innerKind3: 0, innerName3: "" }; + } + + // --------------------------------------------------------------------------- + // Predicates + // --------------------------------------------------------------------------- + + func Type_IsNumeric(t: Type) -> bool { + let k: int = t.kind; + if k == tyInt8 || k == tyInt16 || k == tyInt32 || k == tyInt64 || k == tyInt { return true; } + if k == tyUInt8 || k == tyUInt16 || k == tyUInt32 || k == tyUInt64 || k == tyUInt { return true; } + if k == tyFloat32 || k == tyFloat64 { return true; } + if k == tyUnknown || k == tyNamed || k == tyTypeParam { return true; } + return false; + } + + func Type_IsInteger(t: Type) -> bool { + let k: int = t.kind; + if k == tyInt8 || k == tyInt16 || k == tyInt32 || k == tyInt64 || k == tyInt { return true; } + if k == tyUInt8 || k == tyUInt16 || k == tyUInt32 || k == tyUInt64 || k == tyUInt { return true; } + if k == tyUnknown || k == tyNamed || k == tyTypeParam { return true; } + return false; + } + + func Type_IsBool(t: Type) -> bool { + let k: int = t.kind; + return k == tyBool || k == tyBool8 || k == tyBool16 || k == tyBool32; + } + + func Type_IsPointer(t: Type) -> bool { + return t.kind == tyPointer; + } + + func Type_IsSlice(t: Type) -> bool { + return t.kind == tySlice; + } + + // --------------------------------------------------------------------------- + // Comparison (structural, limited to kind + name for simplicity) + // --------------------------------------------------------------------------- + + func Type_Eq(a: Type, b: Type) -> bool { + if a.kind != b.kind { return false; } + if a.kind == tyNamed || a.kind == tyTypeParam { + return String_Eq(a.name, b.name); + } + return true; + } + + // --------------------------------------------------------------------------- + // toString + // --------------------------------------------------------------------------- + + func Type_ToString(t: Type) -> String { + if t.kind == tyVoid { return "void"; } + if t.kind == tyBool { return "bool"; } + if t.kind == tyStr { return "String"; } + if t.kind == tyInt { return "int"; } + if t.kind == tyInt64 { return "int64"; } + if t.kind == tyUInt { return "uint"; } + if t.kind == tyFloat64 { return "float64"; } + if t.kind == tyNamed { return t.name; } + if t.kind == tyTypeParam { return t.name; } + if t.kind == tyPointer { return String_Concat("*", t.innerName1); } + if t.kind == tyFunc { return t.name; } + return "?"; + } + + // --------------------------------------------------------------------------- + // Type_FromName — central type-name → kind mapping (used by sema, hir_lower) + // --------------------------------------------------------------------------- + + func Type_FromName(name: String) -> int { + if String_Eq(name, "void") { return tyVoid; } + if String_Eq(name, "bool") { return tyBool; } + if String_Eq(name, "bool8") { return tyBool8; } + if String_Eq(name, "bool16") { return tyBool16; } + if String_Eq(name, "bool32") { return tyBool32; } + if String_Eq(name, "char8") { return tyChar8; } + if String_Eq(name, "char16") { return tyChar16; } + if String_Eq(name, "char32") { return tyChar32; } + if String_Eq(name, "String") { return tyStr; } + if String_Eq(name, "str") { return tyStr; } + if String_Eq(name, "int8") { return tyInt8; } + if String_Eq(name, "int16") { return tyInt16; } + if String_Eq(name, "int32") { return tyInt32; } + if String_Eq(name, "int64") { return tyInt64; } + if String_Eq(name, "int") { return tyInt; } + if String_Eq(name, "uint8") { return tyUInt8; } + if String_Eq(name, "uint16") { return tyUInt16; } + if String_Eq(name, "uint32") { return tyUInt32; } + if String_Eq(name, "uint64") { return tyUInt64; } + if String_Eq(name, "uint") { return tyUInt; } + if String_Eq(name, "float32") { return tyFloat32; } + if String_Eq(name, "float64") { return tyFloat64; } + if String_Eq(name, "float") { return tyFloat64; } + return tyNamed; + } + + // --------------------------------------------------------------------------- + // Type_ToCName — type kind → C type name (used by C backend) + // --------------------------------------------------------------------------- + + func Type_ToCName(kind: int) -> String { + if kind == tyVoid { return "void"; } + if kind == tyBool || kind == tyBool8 || kind == tyBool16 || kind == tyBool32 { return "bool"; } + if kind == tyChar8 { return "char"; } + if kind == tyChar16 { return "uint16"; } + if kind == tyChar32 { return "uint32"; } + if kind == tyStr { return "String"; } + if kind == tyInt8 { return "int8"; } + if kind == tyInt16 { return "int16"; } + if kind == tyInt32 { return "int32"; } + if kind == tyInt64 { return "int64"; } + if kind == tyInt { return "int"; } + if kind == tyUInt8 { return "uint8"; } + if kind == tyUInt16 { return "uint16"; } + if kind == tyUInt32 { return "uint32"; } + if kind == tyUInt64 { return "uint64"; } + if kind == tyUInt { return "uint"; } + if kind == tyFloat32 { return "float32"; } + if kind == tyFloat64 { return "float64"; } + if kind == tyPointer { return "void*"; } + // Fat function pointer — concrete BuxFn_* name comes from typeName field + if kind == tyFunc { return "BuxFn"; } + return ""; + } + + // --------------------------------------------------------------------------- + // Signed / Unsigned / Float predicates + // --------------------------------------------------------------------------- + + func Type_IsSigned(kind: int) -> bool { + return kind == tyInt8 || kind == tyInt16 || kind == tyInt32 || kind == tyInt64 || kind == tyInt; + } + + func Type_IsUnsigned(kind: int) -> bool { + return kind == tyUInt8 || kind == tyUInt16 || kind == tyUInt32 || kind == tyUInt64 || kind == tyUInt; + } + + func Type_IsFloat(kind: int) -> bool { + return kind == tyFloat32 || kind == tyFloat64; + } + + // --------------------------------------------------------------------------- + // Type_SizeOf — byte size of a primitive type (0 for non-primitive) + // --------------------------------------------------------------------------- + + func Type_SizeOf(kind: int) -> int { + if kind == tyBool || kind == tyBool8 || kind == tyChar8 || kind == tyInt8 || kind == tyUInt8 { return 1; } + if kind == tyBool16 || kind == tyChar16 || kind == tyInt16 || kind == tyUInt16 { return 2; } + if kind == tyBool32 || kind == tyChar32 || kind == tyInt32 || kind == tyUInt32 || kind == tyFloat32 { return 4; } + if kind == tyInt64 || kind == tyUInt64 || kind == tyFloat64 { return 8; } + if kind == tyInt || kind == tyUInt { return 8; } + if kind == tyPointer { return 8; } + return 0; } - return true; -} - -// --------------------------------------------------------------------------- -// toString -// --------------------------------------------------------------------------- - -func Type_ToString(t: Type) -> String { - if t.kind == tyVoid { return "void"; } - if t.kind == tyBool { return "bool"; } - if t.kind == tyStr { return "String"; } - if t.kind == tyInt { return "int"; } - if t.kind == tyInt64 { return "int64"; } - if t.kind == tyUInt { return "uint"; } - if t.kind == tyFloat64 { return "float64"; } - if t.kind == tyNamed { return t.name; } - if t.kind == tyTypeParam { return t.name; } - if t.kind == tyPointer { return String_Concat("*", t.innerName1); } - if t.kind == tyFunc { return t.name; } - return "?"; -} - -// --------------------------------------------------------------------------- -// Type_FromName — central type-name → kind mapping (used by sema, hir_lower) -// --------------------------------------------------------------------------- - -func Type_FromName(name: String) -> int { - if String_Eq(name, "void") { return tyVoid; } - if String_Eq(name, "bool") { return tyBool; } - if String_Eq(name, "bool8") { return tyBool8; } - if String_Eq(name, "bool16") { return tyBool16; } - if String_Eq(name, "bool32") { return tyBool32; } - if String_Eq(name, "char8") { return tyChar8; } - if String_Eq(name, "char16") { return tyChar16; } - if String_Eq(name, "char32") { return tyChar32; } - if String_Eq(name, "String") { return tyStr; } - if String_Eq(name, "str") { return tyStr; } - if String_Eq(name, "int8") { return tyInt8; } - if String_Eq(name, "int16") { return tyInt16; } - if String_Eq(name, "int32") { return tyInt32; } - if String_Eq(name, "int64") { return tyInt64; } - if String_Eq(name, "int") { return tyInt; } - if String_Eq(name, "uint8") { return tyUInt8; } - if String_Eq(name, "uint16") { return tyUInt16; } - if String_Eq(name, "uint32") { return tyUInt32; } - if String_Eq(name, "uint64") { return tyUInt64; } - if String_Eq(name, "uint") { return tyUInt; } - if String_Eq(name, "float32") { return tyFloat32; } - if String_Eq(name, "float64") { return tyFloat64; } - if String_Eq(name, "float") { return tyFloat64; } - return tyNamed; -} - -// --------------------------------------------------------------------------- -// Type_ToCName — type kind → C type name (used by C backend) -// --------------------------------------------------------------------------- - -func Type_ToCName(kind: int) -> String { - if kind == tyVoid { return "void"; } - if kind == tyBool || kind == tyBool8 || kind == tyBool16 || kind == tyBool32 { return "bool"; } - if kind == tyChar8 { return "char"; } - if kind == tyChar16 { return "uint16"; } - if kind == tyChar32 { return "uint32"; } - if kind == tyStr { return "String"; } - if kind == tyInt8 { return "int8"; } - if kind == tyInt16 { return "int16"; } - if kind == tyInt32 { return "int32"; } - if kind == tyInt64 { return "int64"; } - if kind == tyInt { return "int"; } - if kind == tyUInt8 { return "uint8"; } - if kind == tyUInt16 { return "uint16"; } - if kind == tyUInt32 { return "uint32"; } - if kind == tyUInt64 { return "uint64"; } - if kind == tyUInt { return "uint"; } - if kind == tyFloat32 { return "float32"; } - if kind == tyFloat64 { return "float64"; } - if kind == tyPointer { return "void*"; } - // Fat function pointer — concrete BuxFn_* name comes from typeName field - if kind == tyFunc { return "BuxFn"; } - return ""; -} - -// --------------------------------------------------------------------------- -// Signed / Unsigned / Float predicates -// --------------------------------------------------------------------------- - -func Type_IsSigned(kind: int) -> bool { - return kind == tyInt8 || kind == tyInt16 || kind == tyInt32 || kind == tyInt64 || kind == tyInt; -} - -func Type_IsUnsigned(kind: int) -> bool { - return kind == tyUInt8 || kind == tyUInt16 || kind == tyUInt32 || kind == tyUInt64 || kind == tyUInt; -} - -func Type_IsFloat(kind: int) -> bool { - return kind == tyFloat32 || kind == tyFloat64; -} - -// --------------------------------------------------------------------------- -// Type_SizeOf — byte size of a primitive type (0 for non-primitive) -// --------------------------------------------------------------------------- - -func Type_SizeOf(kind: int) -> int { - if kind == tyBool || kind == tyBool8 || kind == tyChar8 || kind == tyInt8 || kind == tyUInt8 { return 1; } - if kind == tyBool16 || kind == tyChar16 || kind == tyInt16 || kind == tyUInt16 { return 2; } - if kind == tyBool32 || kind == tyChar32 || kind == tyInt32 || kind == tyUInt32 || kind == tyFloat32 { return 4; } - if kind == tyInt64 || kind == tyUInt64 || kind == tyFloat64 { return 8; } - if kind == tyInt || kind == tyUInt { return 8; } - if kind == tyPointer { return 8; } - return 0; -} } diff --git a/tests/borrow_test.nim b/tests/borrow_test.nim index 49cd120..e105a26 100644 --- a/tests/borrow_test.nim +++ b/tests/borrow_test.nim @@ -248,5 +248,126 @@ func Main() -> int { let val: int = (*r).x; return val; } +""") + check(not res.hasErrors) + + # --- C.1 Lifetime elision --- + + test "@[Checked] elided lifetime: return param ref is OK": + let res = checkSource(""" +@[Checked] +func Identity(p: &int) -> &int { + return p; +} +@[Checked] +func Main() -> int { + var x: int = 7; + let r: &int = Identity(&x); + return *r; +} +""") + check(not res.hasErrors) + + test "@[Checked] explicit lifetime 'a works": + let res = checkSource(""" +@[Checked] +func Identity<'a>(p: &'a int) -> &'a int { + return p; +} +@[Checked] +func Main() -> int { + var x: int = 3; + let r: &int = Identity(&x); + return *r; +} +""") + check(not res.hasErrors) + + test "@[Checked] rejects return of reference to local": + let res = checkSource(""" +@[Checked] +func Dangle(p: &int) -> &int { + var x: int = 1; + return &x; +} +@[Checked] +func Main() -> int { + return 0; +} +""") + check(res.hasErrors) + check(res.diagnostics[0].message.contains("local")) + + test "@[Checked] rejects return ref with no input reference": + let res = checkSource(""" +@[Checked] +func Bad() -> &int { + var x: int = 1; + return &x; +} +@[Checked] +func Main() -> int { + return 0; +} +""") + check(res.hasErrors) + check(res.diagnostics[0].message.contains("no input reference") or + res.diagnostics[0].message.contains("local")) + + test "@[Checked] elision fails with multiple input refs": + let res = checkSource(""" +@[Checked] +func Pick(a: &int, b: &int) -> &int { + return a; +} +@[Checked] +func Main() -> int { + return 0; +} +""") + check(res.hasErrors) + check(res.diagnostics[0].message.contains("lifetime elision failed") or + res.diagnostics[0].message.contains("lifetime mismatch")) + + test "@[Checked] multiple inputs OK with explicit lifetime": + let res = checkSource(""" +@[Checked] +func Pick<'a>(a: &'a int, b: &'a int) -> &'a int { + return a; +} +@[Checked] +func Main() -> int { + var x: int = 1; + var y: int = 2; + let r: &int = Pick(&x, &y); + return *r; +} +""") + check(not res.hasErrors) + + test "@[Checked] let-bound reborrow of param may be returned": + let res = checkSource(""" +@[Checked] +func ViaLet(p: &int) -> &int { + let r: &int = p; + return r; +} +@[Checked] +func Main() -> int { + var x: int = 9; + return *ViaLet(&x); +} +""") + check(not res.hasErrors) + + test "unchecked may return &local (no lifetime checks)": + let res = checkSource(""" +func Dangle() -> &int { + var x: int = 1; + return &x; +} +func Main() -> int { + return 0; +} """) check(not res.hasErrors) \ No newline at end of file diff --git a/tests/error_golden/elision_multi_input/bux.toml b/tests/error_golden/elision_multi_input/bux.toml new file mode 100644 index 0000000..b61a6d9 --- /dev/null +++ b/tests/error_golden/elision_multi_input/bux.toml @@ -0,0 +1,7 @@ +[Package] +Name = "elision_multi_input" +Version = "0.1.0" +Type = "bin" + +[Build] +Output = "Bin" diff --git a/tests/error_golden/elision_multi_input/expected.err b/tests/error_golden/elision_multi_input/expected.err new file mode 100644 index 0000000..915fe8a --- /dev/null +++ b/tests/error_golden/elision_multi_input/expected.err @@ -0,0 +1,7 @@ +error: type errors in project +error: lifetime elision failed: return type needs an explicit lifetime (multiple input references); e.g. func F<'a>(a: &'a T, b: &'a U) -> &'a T + --> FILE:2:1 + | + 2 | func Pick(a: &int, b: &int) -> &int { + | ^^^^ + = help: add an explicit lifetime, e.g. func F<'a>(x: &'a T, y: &'a U) -> &'a T diff --git a/tests/error_golden/elision_multi_input/src/Main.bux b/tests/error_golden/elision_multi_input/src/Main.bux new file mode 100644 index 0000000..d923309 --- /dev/null +++ b/tests/error_golden/elision_multi_input/src/Main.bux @@ -0,0 +1,9 @@ +@[Checked] +func Pick(a: &int, b: &int) -> &int { + return a; +} + +@[Checked] +func Main() -> int { + return 0; +} diff --git a/tests/error_golden/return_local_ref/bux.toml b/tests/error_golden/return_local_ref/bux.toml new file mode 100644 index 0000000..86d24b1 --- /dev/null +++ b/tests/error_golden/return_local_ref/bux.toml @@ -0,0 +1,7 @@ +[Package] +Name = "return_local_ref" +Version = "0.1.0" +Type = "bin" + +[Build] +Output = "Bin" diff --git a/tests/error_golden/return_local_ref/expected.err b/tests/error_golden/return_local_ref/expected.err new file mode 100644 index 0000000..9127337 --- /dev/null +++ b/tests/error_golden/return_local_ref/expected.err @@ -0,0 +1,7 @@ +error: type errors in project +error: cannot return reference to local variable + --> FILE:4:5 + | + 4 | return &x; + | ^^^^^^ + = help: return a value, or return a reference borrowed from a function parameter diff --git a/tests/error_golden/return_local_ref/src/Main.bux b/tests/error_golden/return_local_ref/src/Main.bux new file mode 100644 index 0000000..3f7a1a9 --- /dev/null +++ b/tests/error_golden/return_local_ref/src/Main.bux @@ -0,0 +1,10 @@ +@[Checked] +func Dangle(p: &int) -> &int { + var x: int = 42; + return &x; +} + +@[Checked] +func Main() -> int { + return 0; +} diff --git a/tests/golden/algebraic_enums/src/Main.bux b/tests/golden/algebraic_enums/src/Main.bux index ac0ac74..b86d032 100644 --- a/tests/golden/algebraic_enums/src/Main.bux +++ b/tests/golden/algebraic_enums/src/Main.bux @@ -10,20 +10,20 @@ enum Result { func Main() -> int { let r1: Result = Result { tag: Result_Ok }; r1.data.Ok_0 = 42; - + let r2: Result = Result { tag: Result_Err }; r2.data.Err_0 = "error message"; - + if r1.tag == Result_Ok { PrintLine("r1 is Ok:"); PrintInt(r1.data.Ok_0); PrintLine(""); } - + if r2.tag == Result_Err { PrintLine("r2 is Err:"); PrintLine(r2.data.Err_0); } - + return 0; } diff --git a/tests/golden/enums/src/Main.bux b/tests/golden/enums/src/Main.bux index cd94316..86463f7 100644 --- a/tests/golden/enums/src/Main.bux +++ b/tests/golden/enums/src/Main.bux @@ -23,12 +23,12 @@ func ColorName(c: Color) -> String { func Main() -> int { let myColor: Color = Color::Green; - + PrintLine("My color is:"); PrintLine(ColorName(myColor)); PrintLine("Color value:"); PrintInt(myColor as int); PrintLine(""); - + return 0; } diff --git a/tests/golden/fibonacci/src/Main.bux b/tests/golden/fibonacci/src/Main.bux index 7b98826..b0677cc 100644 --- a/tests/golden/fibonacci/src/Main.bux +++ b/tests/golden/fibonacci/src/Main.bux @@ -11,13 +11,13 @@ func Fibonacci(n: int) -> int { func Main() -> int { PrintLine("Fibonacci sequence:"); - + var i: int = 0; while i < 10 { let fib: int = Fibonacci(i); PrintLine(Fmt_Fmt1("{0}", String_FromInt(fib))); i = i + 1; } - + return 0; } diff --git a/tests/golden/generics/src/Main.bux b/tests/golden/generics/src/Main.bux index ae27518..5d6ec5c 100644 --- a/tests/golden/generics/src/Main.bux +++ b/tests/golden/generics/src/Main.bux @@ -13,14 +13,14 @@ func Max(a: T, b: T) -> T { func Main() -> int { let m1: int = Max(10, 20); let m2: int = Max(5, 3); - + PrintLine("Max(10, 20) = "); PrintInt(m1); PrintLine(""); - + PrintLine("Max(5, 3) = "); PrintInt(m2); PrintLine(""); - + return 0; } diff --git a/tests/golden/methods/src/Main.bux b/tests/golden/methods/src/Main.bux index 7efa8ca..fec084b 100644 --- a/tests/golden/methods/src/Main.bux +++ b/tests/golden/methods/src/Main.bux @@ -11,7 +11,7 @@ extend Rectangle { func Area(self: Rectangle) -> int { return self.width * self.height; } - + func Perimeter(self: Rectangle) -> int { return 2 * (self.width + self.height); } @@ -19,7 +19,7 @@ extend Rectangle { func Main() -> int { let rect: Rectangle = Rectangle { width: 10, height: 5 }; - + PrintLine("Rectangle:"); PrintLine("Width = "); PrintInt(rect.width); @@ -33,6 +33,6 @@ func Main() -> int { PrintLine("Perimeter = "); PrintInt(rect.Perimeter()); PrintLine(""); - + return 0; } diff --git a/tests/golden/modern_features/src/Main.bux b/tests/golden/modern_features/src/Main.bux index d7d80a4..2c1fd8b 100644 --- a/tests/golden/modern_features/src/Main.bux +++ b/tests/golden/modern_features/src/Main.bux @@ -1,49 +1,49 @@ module Main { -import Std::Array::{Array, Array_New, Array_Push}; + import Std::Array::{Array, Array_New, Array_Push}; -struct Record { - name: String; - value: int; -} - -struct Box { - items: Array; -} - -enum Payload { - Ok(Record), - Err(String), -} - -enum Color { Red, Green } - -func Name(c: Color) -> String { - match c { - Color::Red => "red", - Color::Green => "green", + struct Record { + name: String; + value: int; } -} -func Main() -> int { - var box: Box; - box.items = Array_New(4); - Array_Push(&box.items, Record { name: "x", value: 10 }); + struct Box { + items: Array; + } - for it in box.items { - if it.value == 10 { - return 0; + enum Payload { + Ok(Record), + Err(String), + } + + enum Color { Red, Green } + + func Name(c: Color) -> String { + match c { + Color::Red => "red", + Color::Green => "green", } } - var r: Payload; - r.tag = Payload_Ok; - r.data.Ok_0 = Record { name: "y", value: 20 }; - if r.data.Ok_0.value == 20 { - return 0; + func Main() -> int { + var box: Box; + box.items = Array_New(4); + Array_Push(&box.items, Record { name: "x", value: 10 }); + + for it in box.items { + if it.value == 10 { + return 0; + } + } + + var r: Payload; + r.tag = Payload_Ok; + r.data.Ok_0 = Record { name: "y", value: 20 }; + if r.data.Ok_0.value == 20 { + return 0; + } + + return 1; } - return 1; -} - } diff --git a/tests/golden/strings/src/Main.bux b/tests/golden/strings/src/Main.bux index ccf85e9..e828751 100644 --- a/tests/golden/strings/src/Main.bux +++ b/tests/golden/strings/src/Main.bux @@ -5,30 +5,30 @@ import Std::String::{String_Len, String_Eq, String_Concat}; func Main() -> int { let hello: String = "Hello"; let world: String = "World"; - + PrintLine("String operations:"); - + // Length PrintLine("Length of 'Hello':"); PrintInt(String_Len(hello)); PrintLine(""); - + // Concatenation let greeting: String = String_Concat(hello, ", "); let greeting2: String = String_Concat(greeting, world); let full: String = String_Concat(greeting2, "!"); - + PrintLine("Concatenated:"); PrintLine(full); - + // Equality if String_Eq(hello, "Hello") { PrintLine("'Hello' equals 'Hello'"); } - + if !String_Eq(hello, world) { PrintLine("'Hello' does not equal 'World'"); } - + return 0; } diff --git a/tests/golden/structs/src/Main.bux b/tests/golden/structs/src/Main.bux index d4da35b..20c69bd 100644 --- a/tests/golden/structs/src/Main.bux +++ b/tests/golden/structs/src/Main.bux @@ -16,7 +16,7 @@ func Main() -> int { let p1: Point = Point { x: 10, y: 20 }; let p2: Point = Point { x: 5, y: 15 }; let sum: Point = AddPoints(p1, p2); - + PrintLine("Point sum:"); PrintLine("x = "); PrintInt(sum.x); @@ -24,6 +24,6 @@ func Main() -> int { PrintLine("y = "); PrintInt(sum.y); PrintLine(""); - + return 0; } diff --git a/tests/stdlib_golden/array/bux.toml b/tests/stdlib_golden/array/bux.toml new file mode 100644 index 0000000..ff6acca --- /dev/null +++ b/tests/stdlib_golden/array/bux.toml @@ -0,0 +1,7 @@ +[Package] +Name = "stdlib_array" +Version = "0.1.0" +Type = "bin" + +[Build] +Output = "Bin" diff --git a/tests/stdlib_golden/array/expected.out b/tests/stdlib_golden/array/expected.out new file mode 100644 index 0000000..e6c35bf --- /dev/null +++ b/tests/stdlib_golden/array/expected.out @@ -0,0 +1,3 @@ +stdlib_array: ok +PASS: +stdlib_array diff --git a/tests/stdlib_golden/array/src/Main.bux b/tests/stdlib_golden/array/src/Main.bux new file mode 100644 index 0000000..bc1f2f9 --- /dev/null +++ b/tests/stdlib_golden/array/src/Main.bux @@ -0,0 +1,50 @@ +// Stdlib golden: Array helpers + Contains/IndexOf/Extend +import Std::Io::{PrintLine}; +import Std::Array::{ + Array, Array_New, Array_Push, Array_Pop, Array_Clear, Array_IsEmpty, + Array_First, Array_Last, Array_Cap, Array_Reserve, Array_Len, Array_Get, + Array_Contains, Array_IndexOf, Array_Extend, Array_Free +}; +import Std::Test::{ + Test_AssertTrue, Test_AssertFalse, Test_AssertEqInt, Test_Pass +}; + +func Main() -> int { + var arr: Array = Array_New(2); + Array_Reserve(&arr, 8); + Test_AssertTrue(Array_Cap(&arr) >= 8); + Test_AssertTrue(Array_IsEmpty(&arr)); + + Array_Push(&arr, 10); + Array_Push(&arr, 20); + Array_Push(&arr, 30); + + Test_AssertFalse(Array_IsEmpty(&arr)); + Test_AssertEqInt(Array_Len(&arr) as int, 3); + Test_AssertEqInt(Array_First(&arr), 10); + Test_AssertEqInt(Array_Last(&arr), 30); + Test_AssertTrue(Array_Contains(&arr, 20)); + Test_AssertFalse(Array_Contains(&arr, 99)); + Test_AssertEqInt(Array_IndexOf(&arr, 30), 2); + + let popped: int = Array_Pop(&arr); + Test_AssertEqInt(popped, 30); + Test_AssertEqInt(Array_Len(&arr) as int, 2); + + var extra: Array = Array_New(2); + Array_Push(&extra, 40); + Array_Push(&extra, 50); + Array_Extend(&arr, &extra); + Test_AssertEqInt(Array_Len(&arr) as int, 4); + Test_AssertEqInt(Array_Get(&arr, 3), 50); + + Array_Clear(&arr); + Test_AssertTrue(Array_IsEmpty(&arr)); + Test_AssertTrue(Array_Cap(&arr) >= 8); + + Array_Free(&arr); + Array_Free(&extra); + PrintLine("stdlib_array: ok"); + Test_Pass("stdlib_array"); + return 0; +} diff --git a/tests/stdlib_golden/collections/bux.toml b/tests/stdlib_golden/collections/bux.toml new file mode 100644 index 0000000..8ddfadd --- /dev/null +++ b/tests/stdlib_golden/collections/bux.toml @@ -0,0 +1,7 @@ +[Package] +Name = "stdlib_collections" +Version = "0.1.0" +Type = "bin" + +[Build] +Output = "Bin" diff --git a/tests/stdlib_golden/collections/expected.out b/tests/stdlib_golden/collections/expected.out new file mode 100644 index 0000000..8035222 --- /dev/null +++ b/tests/stdlib_golden/collections/expected.out @@ -0,0 +1,3 @@ +stdlib_collections: ok +PASS: +stdlib_collections diff --git a/tests/stdlib_golden/collections/src/Main.bux b/tests/stdlib_golden/collections/src/Main.bux new file mode 100644 index 0000000..50bb8f8 --- /dev/null +++ b/tests/stdlib_golden/collections/src/Main.bux @@ -0,0 +1,67 @@ +// Stdlib golden: Map / Set / Result / Option helpers +import Std::Io::{PrintLine}; +import Std::Map::{ + Map, Map_New, Map_Set, Map_Get, Map_Has, Map_Remove, Map_Clear, + Map_Len, Map_IsEmpty, Map_Free +}; +import Std::Set::{ + Set, Set_New, Set_Add, Set_Has, Set_Remove, Set_Len, Set_IsEmpty, Set_Free +}; +import Std::Result::{ + Result, Result_NewOk, Result_NewErr, Result_IsOk, Result_IsErr, + Result_UnwrapOr, Result_Or, Result_UnwrapErr +}; +import Std::Option::{ + Option, Option_NewSome, Option_NewNone, Option_IsSome, Option_Or, Option_UnwrapOr +}; +import Std::String::{String_Eq}; +import Std::Test::{ + Test_AssertTrue, Test_AssertFalse, Test_AssertEqInt, Test_Pass +}; + +func Main() -> int { + var m: Map = Map_New(16); + Map_Set(&m, 1, 100); + Map_Set(&m, 2, 200); + Map_Set(&m, 3, 300); + Test_AssertEqInt(Map_Len(&m) as int, 3); + Test_AssertTrue(Map_Has(&m, 2)); + Test_AssertTrue(Map_Remove(&m, 2)); + Test_AssertFalse(Map_Has(&m, 2)); + Test_AssertEqInt(Map_Get(&m, 1), 100); + Test_AssertFalse(Map_Remove(&m, 99)); + Map_Clear(&m); + Test_AssertTrue(Map_IsEmpty(&m)); + Map_Free(&m); + + var s: Set = Set_New(16); + Set_Add(&s, 10); + Set_Add(&s, 20); + Set_Add(&s, 30); + Test_AssertTrue(Set_Remove(&s, 20)); + Test_AssertFalse(Set_Has(&s, 20)); + Test_AssertTrue(Set_Has(&s, 10)); + Test_AssertEqInt(Set_Len(&s) as int, 2); + Test_AssertFalse(Set_IsEmpty(&s)); + Set_Free(&s); + + let ok: Result = Result_NewOk(42); + let err: Result = Result_NewErr("boom"); + Test_AssertTrue(Result_IsOk(ok)); + Test_AssertTrue(Result_IsErr(err)); + Test_AssertEqInt(Result_UnwrapOr(err, -1), -1); + let recovered: Result = Result_Or(err, Result_NewOk(7)); + Test_AssertEqInt(Result_UnwrapOr(recovered, 0), 7); + Test_AssertTrue(String_Eq(Result_UnwrapErr(err), "boom")); + + let some: Option = Option_NewSome(5); + let none: Option = Option_NewNone(); + Test_AssertTrue(Option_IsSome(some)); + Test_AssertEqInt(Option_UnwrapOr(none, 9), 9); + let filled: Option = Option_Or(none, Option_NewSome(3)); + Test_AssertEqInt(Option_UnwrapOr(filled, 0), 3); + + PrintLine("stdlib_collections: ok"); + Test_Pass("stdlib_collections"); + return 0; +} diff --git a/tests/stdlib_golden/run.sh b/tests/stdlib_golden/run.sh new file mode 100755 index 0000000..fcadfc1 --- /dev/null +++ b/tests/stdlib_golden/run.sh @@ -0,0 +1,103 @@ +#!/usr/bin/env bash +# Golden behavioral tests for stdlib modules. +# Usage: from repo root: tests/stdlib_golden/run.sh [path/to/buxc] +set -euo pipefail + +ROOT="$(cd "$(dirname "$0")/../.." && pwd)" +BUXC_ARG="${1:-$ROOT/buxc}" +DIR="$(cd "$(dirname "$0")" && pwd)" + +# Resolve to absolute path so `cd` into test packages still finds the binary. +if [[ "$BUXC_ARG" = /* ]]; then + BUXC="$BUXC_ARG" +else + BUXC="$(cd "$(dirname "$BUXC_ARG")" && pwd)/$(basename "$BUXC_ARG")" +fi + +if [[ ! -x "$BUXC" && ! -f "$BUXC" ]]; then + echo "error: buxc not found at $BUXC (run make build first)" + exit 1 +fi + +passed=0 +failed=0 +skipped=0 + +normalize_out() { + # Drop absolute paths; trim trailing whitespace/blank lines + sed -E \ + -e "s|$ROOT|ROOT|g" \ + -e "s|$DIR|DIR|g" \ + -e 's/[[:space:]]+$//' \ + | sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' +} + +for case_dir in "$DIR"/*/; do + name="$(basename "$case_dir")" + [[ -f "$case_dir/bux.toml" ]] || continue + [[ -f "$case_dir/src/Main.bux" ]] || continue + + if [[ ! -f "$case_dir/expected.out" ]]; then + echo " SKIP $name (no expected.out)" + skipped=$((skipped + 1)) + continue + fi + + # Build + run; capture stdout+stderr + out="" + if ! out="$(cd "$case_dir" && "$BUXC" run . 2>&1)"; then + echo " FAIL $name (build/run non-zero)" + printf '%s\n' "$out" | head -40 + failed=$((failed + 1)) + continue + fi + + got="$(printf '%s\n' "$out" | normalize_out)" + exp="$(cat "$case_dir/expected.out" | normalize_out)" + + # Match on key status lines (tests may also print build noise) + if printf '%s\n' "$got" | grep -Fqx "$(printf '%s' "$exp" | head -1)" 2>/dev/null; then + # Prefer full expected lines all present + all_ok=1 + while IFS= read -r line; do + [[ -z "$line" ]] && continue + if ! printf '%s\n' "$got" | grep -Fqx "$line"; then + all_ok=0 + break + fi + done <<< "$exp" + if [[ $all_ok -eq 1 ]]; then + echo " PASS $name" + passed=$((passed + 1)) + continue + fi + fi + + # Fallback: every non-empty expected line appears as substring + all_ok=1 + while IFS= read -r line; do + [[ -z "$line" ]] && continue + if ! printf '%s\n' "$got" | grep -Fq "$line"; then + all_ok=0 + break + fi + done <<< "$exp" + + if [[ $all_ok -eq 1 ]]; then + echo " PASS $name" + passed=$((passed + 1)) + else + echo " FAIL $name" + echo "---- expected lines ----" + printf '%s\n' "$exp" + echo "---- got (tail) ----" + printf '%s\n' "$got" | tail -20 + echo "--------------" + failed=$((failed + 1)) + fi +done + +echo "Stdlib golden tests: $passed passed, $failed failed, $skipped skipped" +if [[ $failed -gt 0 ]]; then + exit 1 +fi diff --git a/tests/stdlib_golden/string/bux.toml b/tests/stdlib_golden/string/bux.toml new file mode 100644 index 0000000..e450c47 --- /dev/null +++ b/tests/stdlib_golden/string/bux.toml @@ -0,0 +1,7 @@ +[Package] +Name = "stdlib_string" +Version = "0.1.0" +Type = "bin" + +[Build] +Output = "Bin" diff --git a/tests/stdlib_golden/string/expected.out b/tests/stdlib_golden/string/expected.out new file mode 100644 index 0000000..4e3297b --- /dev/null +++ b/tests/stdlib_golden/string/expected.out @@ -0,0 +1,3 @@ +stdlib_string: ok +PASS: +stdlib_string diff --git a/tests/stdlib_golden/string/src/Main.bux b/tests/stdlib_golden/string/src/Main.bux new file mode 100644 index 0000000..03d79ee --- /dev/null +++ b/tests/stdlib_golden/string/src/Main.bux @@ -0,0 +1,35 @@ +// Stdlib golden: String_IsEmpty / IsBlank / Repeat / ReplaceAll +import Std::Io::{PrintLine}; +import Std::String::{ + String_IsEmpty, String_IsBlank, String_Repeat, String_ReplaceAll, + String_Eq, String_Len, String_Contains, String_StartsWith, String_EndsWith +}; +import Std::Test::{ + Test_AssertTrue, Test_AssertFalse, Test_AssertEqInt, Test_AssertEqString, Test_Pass +}; + +func Main() -> int { + Test_AssertTrue(String_IsEmpty("")); + Test_AssertFalse(String_IsEmpty("x")); + Test_AssertTrue(String_IsBlank("")); + Test_AssertTrue(String_IsBlank(" \t\n")); + Test_AssertFalse(String_IsBlank(" x ")); + + Test_AssertEqString(String_Repeat(".", 5), "....."); + Test_AssertEqInt(String_Len(String_Repeat("ab", 3)) as int, 6); + Test_AssertEqString(String_Repeat("x", 0), ""); + Test_AssertEqString(String_Repeat("ok", 1), "ok"); + + let multi: String = String_ReplaceAll("a-b-a-b-a", "a", "X"); + Test_AssertEqString(multi, "X-b-X-b-X"); + let safe: String = String_ReplaceAll("..", ".", "x."); + Test_AssertEqString(safe, "x.x."); + + Test_AssertTrue(String_Contains("hello", "ell")); + Test_AssertTrue(String_StartsWith("hello", "he")); + Test_AssertTrue(String_EndsWith("hello", "lo")); + + PrintLine("stdlib_string: ok"); + Test_Pass("stdlib_string"); + return 0; +} diff --git a/tools/lsp_server.nim b/tools/lsp_server.nim index 74abf20..b8b5b91 100644 --- a/tools/lsp_server.nim +++ b/tools/lsp_server.nim @@ -4,10 +4,10 @@ # Usage: bux-lsp # The editor spawns this binary and communicates via stdin/stdout. # -# Hover uses real bootstrap sema types when possible (globals + stdlib); -# completion/outline still use a fast lightweight scan. +# Hover uses real bootstrap sema types when possible (globals + stdlib). +# Locals are position-sensitive (scoped) and include inferred `let` types (v0.4.0). -import std/[json, os, strutils, streams, tables, osproc, sequtils] +import std/[json, os, strutils, streams, tables, osproc, sequtils, sets] import lexer, parser, ast, sema, types, scope, source_location # --------------------------------------------------------------------------- @@ -88,6 +88,17 @@ type detail: string ## signature / type annotation container: string ## optional parent (module / type) fromSema: bool ## detail came from real type checker + ## Scoped local binding for position-sensitive hover / go-to-def + LocalBinding = object + name: string + detail: string ## e.g. "let x: int" (inferred or annotated) + kind: string ## variable | parameter + declLine: int ## 0-based declaration line + declCol: int ## 0-based start of name + scopeStartLine: int ## first line where name is visible + scopeEndLine: int ## last line where name is visible (inclusive) + container: string ## enclosing function name + inferred: bool ## type came from initializer, not annotation DocumentState = ref object uri: string content: string @@ -97,6 +108,8 @@ type ## Full-project type index for hover (includes stdlib after sema enrich) typeIndex: Table[string, string] ## name → type / signature string kindIndex: Table[string, string] ## name → kind label + ## Position-sensitive locals (filled by enrichWithSema) + locals: seq[LocalBinding] var documents = initTable[string, DocumentState]() @@ -355,9 +368,15 @@ proc typeExprToStr(te: TypeExpr): string = of tekOwn: result = "own " & typeExprToStr(te.pointerPointee) of tekRef: - result = "&" & typeExprToStr(te.pointerPointee) + if te.refLifetime.len > 0: + result = "&" & te.refLifetime & " " & typeExprToStr(te.pointerPointee) + else: + result = "&" & typeExprToStr(te.pointerPointee) of tekMutRef: - result = "&mut " & typeExprToStr(te.pointerPointee) + if te.refLifetime.len > 0: + result = "&" & te.refLifetime & " mut " & typeExprToStr(te.pointerPointee) + else: + result = "&mut " & typeExprToStr(te.pointerPointee) of tekSlice: result = typeExprToStr(te.sliceElement) & "[]" of tekTuple: @@ -590,56 +609,173 @@ proc enrichWithSema(doc: DocumentState) = else: indexDecl(d) - # Walk this file's AST for local lets with explicit types (function bodies) - proc walkBlock(blk: Block, container: string) = + # --- Position-sensitive locals + inferred let types --- + doc.locals = @[] + + proc blockEndLine(blk: Block): int = + ## Last 0-based line covered by statements in `blk` (best-effort). + if blk == nil: return 0 + result = max(0, int(blk.loc.line) - 1) + for stmt in blk.stmts: + result = max(result, max(0, int(stmt.loc.line) - 1)) + case stmt.kind + of skIf: + result = max(result, blockEndLine(stmt.stmtIfThen)) + result = max(result, blockEndLine(stmt.stmtIfElse)) + for br in stmt.stmtIfElseIfs: + result = max(result, blockEndLine(br.blk)) + of skWhile: + result = max(result, blockEndLine(stmt.stmtWhileBody)) + of skDoWhile: + result = max(result, blockEndLine(stmt.stmtDoWhileBody)) + of skLoop: + result = max(result, blockEndLine(stmt.stmtLoopBody)) + of skFor: + result = max(result, blockEndLine(stmt.stmtForBody)) + of skMatch: + for arm in stmt.stmtMatchArms: + if arm.body != nil and arm.body.kind == ekBlock: + result = max(result, blockEndLine(arm.body.exprBlock)) + elif arm.body != nil: + result = max(result, max(0, int(arm.body.loc.line) - 1)) + of skExpr: + if stmt.stmtExpr != nil and stmt.stmtExpr.kind == ekBlock: + result = max(result, blockEndLine(stmt.stmtExpr.exprBlock)) + else: + discard + + proc collectLocals(sema: var Sema, blk: Block, sc: Scope, scopeEnd: int, + container: string) = if blk == nil: return + let endLine = max(scopeEnd, blockEndLine(blk)) for stmt in blk.stmts: case stmt.kind of skLet: let n = stmt.stmtLetName if n.len == 0: continue - var typStr = "" + var typ: Type = makeUnknown() + var inferred = false if stmt.stmtLetType != nil: - typStr = typeExprToStr(stmt.stmtLetType) + typ = sema.resolveType(stmt.stmtLetType) + if (typ == nil or typ.isUnknown) and stmt.stmtLetInit != nil: + typ = sema.checkExprForLsp(stmt.stmtLetInit, sc) + inferred = true + elif stmt.stmtLetType == nil and stmt.stmtLetInit != nil: + # Explicit absence of annotation — still type the initializer + typ = sema.checkExprForLsp(stmt.stmtLetInit, sc) + inferred = true let kw = if stmt.stmtLetMut: "var" else: "let" - let detail = if typStr.len > 0: kw & " " & n & ": " & typStr else: kw & " " & n - let loc = stmt.loc - let line = max(0, int(loc.line) - 1) - let col = max(0, int(loc.column) - 1) - # Prefer sema-enriched detail if name already global; else add local - if not doc.symbols.hasKey(n) or not doc.symbols[n].fromSema: - doc.symbols[n] = SymbolInfo( - line: line, col: col, kind: "variable", detail: detail, - container: container, fromSema: typStr.len > 0) - if n notin doc.ordered: - doc.ordered.add(n) - if typStr.len > 0: - doc.typeIndex[n] = detail - doc.kindIndex[n] = "variable" + let typStr = if typ != nil and not typ.isUnknown: typ.toString else: "" + let detail = + if typStr.len > 0: kw & " " & n & ": " & typStr + else: kw & " " & n + let line = max(0, int(stmt.loc.line) - 1) + let col = max(0, int(stmt.loc.column) - 1) + doc.locals.add(LocalBinding( + name: n, detail: detail, kind: "variable", + declLine: line, declCol: col, + scopeStartLine: line, scopeEndLine: endLine, + container: container, inferred: inferred and typStr.len > 0)) + # Also keep latest flat entry for outline (position lookup prefers locals) + doc.symbols[n] = SymbolInfo( + line: line, col: col, kind: "variable", detail: detail, + container: container, fromSema: typStr.len > 0) + if n notin doc.ordered: + doc.ordered.add(n) + # Define in scope for subsequent inference + let sym = Symbol(kind: skVar, name: n, typ: typ, + isMutable: stmt.stmtLetMut, isOwn: false) + discard sc.define(sym) of skExpr: if stmt.stmtExpr != nil and stmt.stmtExpr.kind == ekBlock: - walkBlock(stmt.stmtExpr.exprBlock, container) + var child = newScope(sc) + collectLocals(sema, stmt.stmtExpr.exprBlock, child, + blockEndLine(stmt.stmtExpr.exprBlock), container) of skIf: - walkBlock(stmt.stmtIfThen, container) - walkBlock(stmt.stmtIfElse, container) + var thenSc = newScope(sc) + collectLocals(sema, stmt.stmtIfThen, thenSc, + blockEndLine(stmt.stmtIfThen), container) for br in stmt.stmtIfElseIfs: - walkBlock(br.blk, container) + var elifSc = newScope(sc) + collectLocals(sema, br.blk, elifSc, blockEndLine(br.blk), container) + if stmt.stmtIfElse != nil: + var elseSc = newScope(sc) + collectLocals(sema, stmt.stmtIfElse, elseSc, + blockEndLine(stmt.stmtIfElse), container) of skWhile: - walkBlock(stmt.stmtWhileBody, container) - of skFor: - walkBlock(stmt.stmtForBody, container) + var wSc = newScope(sc) + collectLocals(sema, stmt.stmtWhileBody, wSc, + blockEndLine(stmt.stmtWhileBody), container) + of skDoWhile: + var dSc = newScope(sc) + collectLocals(sema, stmt.stmtDoWhileBody, dSc, + blockEndLine(stmt.stmtDoWhileBody), container) of skLoop: - walkBlock(stmt.stmtLoopBody, container) + var lSc = newScope(sc) + collectLocals(sema, stmt.stmtLoopBody, lSc, + blockEndLine(stmt.stmtLoopBody), container) + of skFor: + var fSc = newScope(sc) + if stmt.stmtForVar.len > 0: + let fline = max(0, int(stmt.loc.line) - 1) + let fcol = max(0, int(stmt.loc.column) - 1) + let fend = blockEndLine(stmt.stmtForBody) + # Best-effort: element type unknown without iterator typing + let detail = "for " & stmt.stmtForVar + doc.locals.add(LocalBinding( + name: stmt.stmtForVar, detail: detail, kind: "variable", + declLine: fline, declCol: fcol, + scopeStartLine: fline, scopeEndLine: fend, + container: container, inferred: false)) + discard fSc.define(Symbol(kind: skVar, name: stmt.stmtForVar, + typ: makeUnknown(), isMutable: false)) + collectLocals(sema, stmt.stmtForBody, fSc, + blockEndLine(stmt.stmtForBody), container) + of skMatch: + for arm in stmt.stmtMatchArms: + if arm.body != nil and arm.body.kind == ekBlock: + var mSc = newScope(sc) + collectLocals(sema, arm.body.exprBlock, mSc, + blockEndLine(arm.body.exprBlock), container) else: discard + proc collectFuncLocals(sema: var Sema, d: Decl) = + if d == nil or d.kind != dkFunc or d.declFuncBody == nil: + return + let fname = d.declFuncName + let bodyEnd = blockEndLine(d.declFuncBody) + var funcScope = newScope(sema.globalScope) + # Parameters — visible for entire function body + let funcStart = max(0, int(d.loc.line) - 1) + for p in d.declFuncParams: + if p.name.len == 0: continue + var pType = makeUnknown() + if p.ptype != nil: + pType = sema.resolveType(p.ptype) + let typStr = if pType != nil and not pType.isUnknown: pType.toString else: "" + let detail = + if typStr.len > 0: "param " & p.name & ": " & typStr + else: "param " & p.name + let pline = max(0, int(p.loc.line) - 1) + let pcol = max(0, int(p.loc.column) - 1) + doc.locals.add(LocalBinding( + name: p.name, detail: detail, kind: "parameter", + declLine: pline, declCol: pcol, + scopeStartLine: funcStart, scopeEndLine: bodyEnd, + container: fname, inferred: false)) + discard funcScope.define(Symbol(kind: skVar, name: p.name, typ: pType, + isMutable: false)) + collectLocals(sema, d.declFuncBody, funcScope, bodyEnd, fname) + + var semaMut = semaCtx for d in parseRes.module.items: - if d.kind == dkFunc and d.declFuncBody != nil: - walkBlock(d.declFuncBody, d.declFuncName) + if d.kind == dkFunc: + collectFuncLocals(semaMut, d) elif d.kind == dkModule: for sub in d.declModuleItems: - if sub.kind == dkFunc and sub.declFuncBody != nil: - walkBlock(sub.declFuncBody, sub.declFuncName) + if sub.kind == dkFunc: + collectFuncLocals(semaMut, sub) except: discard # sema failures must not crash the LSP @@ -862,27 +998,55 @@ proc handleCompletion(stream: FileStream, id: JsonNode, paramsNode: JsonNode) = return ensureAnalyzed(doc) + if doc.locals.len == 0 and doc.content.len > 0: + enrichWithSema(doc) let prefix = findWordAt(doc.content, lineNum, col) var items = newJArray() + var offered = initHashSet[string]() + + # Position-sensitive locals / params first (highest priority) + for b in doc.locals: + if lineNum < b.scopeStartLine or lineNum > b.scopeEndLine: continue + if prefix != "" and not b.name.toLowerAscii().startsWith(prefix.toLowerAscii()): + continue + # Prefer later/narrower binding for same name + if offered.contains(b.name): + continue + offered.incl(b.name) + let k = if b.kind == "parameter": 6 else: completionKind("variable") + items.add(%*{ + "label": b.name, + "kind": k, + "detail": b.detail, + "sortText": "0_" & b.name, + "documentation": {"kind": "markdown", + "value": "```bux\n" & b.detail & "\n```\n\n_" & b.kind & + (if b.inferred: " · inferred" else: "") & "_"} + }) + for name, info in doc.symbols.pairs: + if offered.contains(name): continue if prefix == "" or name.toLowerAscii().startsWith(prefix.toLowerAscii()): + offered.incl(name) items.add(%*{ "label": name, "kind": completionKind(info.kind), "detail": info.detail, + "sortText": "1_" & name, "documentation": {"kind": "markdown", "value": "```bux\n" & info.detail & "\n```\n\n_" & info.kind & "_"} }) # Also offer workspace symbols (other open / scanned files) for name, ws in workspaceSymbols.pairs: - if doc.symbols.hasKey(name): - continue + if offered.contains(name): continue if prefix == "" or name.toLowerAscii().startsWith(prefix.toLowerAscii()): + offered.incl(name) items.add(%*{ "label": name, "kind": completionKind(ws.info.kind), "detail": ws.info.detail & " (workspace)", + "sortText": "2_" & name, "documentation": {"kind": "markdown", "value": "```bux\n" & ws.info.detail & "\n```"} }) @@ -896,11 +1060,32 @@ proc handleCompletion(stream: FileStream, id: JsonNode, paramsNode: JsonNode) = items.add(%*{ "label": kw, "kind": 14, - "detail": "keyword" + "detail": "keyword", + "sortText": "3_" & kw }) sendResponse(stream, id, %*{"isIncomplete": false, "items": items}) +# --------------------------------------------------------------------------- +# Position-sensitive local lookup +# --------------------------------------------------------------------------- + +proc lookupLocalAt*(doc: DocumentState, name: string, line: int): tuple[ok: bool, b: LocalBinding] = + ## Innermost local/parameter binding for `name` visible at `line` (0-based). + result.ok = false + var bestSpan = high(int) + var bestStart = -1 + for b in doc.locals: + if b.name != name: continue + if line < b.scopeStartLine or line > b.scopeEndLine: continue + let span = b.scopeEndLine - b.scopeStartLine + # Prefer narrower scope; on ties prefer later declaration (shadowing) + if span < bestSpan or (span == bestSpan and b.scopeStartLine >= bestStart): + bestSpan = span + bestStart = b.scopeStartLine + result.b = b + result.ok = true + # --------------------------------------------------------------------------- # Go-to-definition # --------------------------------------------------------------------------- @@ -917,13 +1102,26 @@ proc handleDefinition(stream: FileStream, id: JsonNode, paramsNode: JsonNode) = return ensureAnalyzed(doc) + if doc.locals.len == 0 and doc.content.len > 0: + enrichWithSema(doc) + let word = findWordAt(doc.content, lineNum, col) if word.len == 0: sendResponse(stream, id, %*[]) return var locs = newJArray() - if doc.symbols.hasKey(word): + # Position-sensitive local first + let (lok, lb) = lookupLocalAt(doc, word, lineNum) + if lok: + locs.add(%*{ + "uri": uri, + "range": { + "start": {"line": lb.declLine, "character": lb.declCol}, + "end": {"line": lb.declLine, "character": lb.declCol + word.len} + } + }) + elif doc.symbols.hasKey(word): let info = doc.symbols[word] locs.add(%*{ "uri": uri, @@ -949,6 +1147,7 @@ proc handleDefinition(stream: FileStream, id: JsonNode, paramsNode: JsonNode) = proc handleHover(stream: FileStream, id: JsonNode, paramsNode: JsonNode) = ## Hover with accurate range; prefer real sema types when available. + ## Locals are resolved by position (shadowing / nested scopes). let uri = paramsNode["textDocument"]["uri"].getStr() let position = paramsNode["position"] let lineNum = position["line"].getInt() @@ -961,7 +1160,7 @@ proc handleHover(stream: FileStream, id: JsonNode, paramsNode: JsonNode) = ensureAnalyzed(doc) # Lazy sema enrich on first hover if not yet run (e.g. only didChange so far) - if doc.typeIndex.len == 0 and doc.content.len > 0: + if (doc.typeIndex.len == 0 or doc.locals.len == 0) and doc.content.len > 0: enrichWithSema(doc) let lines = doc.content.split("\n") @@ -983,23 +1182,39 @@ proc handleHover(stream: FileStream, id: JsonNode, paramsNode: JsonNode) = var detail = "" var kind = "" var found = false + var fromSema = false + var inferred = false + var scopeNote = "" - # Prefer file-local symbol (may be sema-upgraded) - if doc.symbols.hasKey(word): + # 1) Position-sensitive local / parameter + let (lok, lb) = lookupLocalAt(doc, word, lineNum) + if lok: + detail = lb.detail + kind = lb.kind + found = true + fromSema = true + inferred = lb.inferred + if lb.container.len > 0: + scopeNote = " in `" & lb.container & "`" + + # 2) File-level / global symbols (functions, types, …) + if not found and doc.symbols.hasKey(word): let info = doc.symbols[word] detail = info.detail kind = info.kind found = true - # Prefer pure sema typeIndex when richer + fromSema = info.fromSema if doc.typeIndex.hasKey(word) and doc.typeIndex[word].len >= detail.len: detail = doc.typeIndex[word] if doc.kindIndex.hasKey(word): kind = doc.kindIndex[word] - elif doc.typeIndex.hasKey(word): + fromSema = true + elif not found and doc.typeIndex.hasKey(word): detail = doc.typeIndex[word] kind = if doc.kindIndex.hasKey(word): doc.kindIndex[word] else: "symbol" found = true - elif workspaceSymbols.hasKey(word): + fromSema = true + elif not found and workspaceSymbols.hasKey(word): let info = workspaceSymbols[word].info detail = info.detail kind = info.kind @@ -1010,10 +1225,12 @@ proc handleHover(stream: FileStream, id: JsonNode, paramsNode: JsonNode) = return var md = "```bux\n" & detail & "\n```\n\n_" & kind & "_" - if doc.symbols.hasKey(word) and doc.symbols[word].fromSema: - md &= " · sema" - elif doc.typeIndex.hasKey(word): + if scopeNote.len > 0: + md &= scopeNote + if fromSema: md &= " · sema" + if inferred: + md &= " · inferred" sendResponse(stream, id, %*{ "contents": {"kind": "markdown", "value": md}, @@ -1022,7 +1239,6 @@ proc handleHover(stream: FileStream, id: JsonNode, paramsNode: JsonNode) = "end": {"line": lineNum, "character": endC} } }) - # --------------------------------------------------------------------------- # Document symbols (outline) # --------------------------------------------------------------------------- @@ -1088,7 +1304,7 @@ proc handleMessage(stream: FileStream, msg: JsonNode) = "hoverProvider": true, "documentSymbolProvider": true }, - "serverInfo": {"name": "bux-lsp", "version": "0.3.0"} + "serverInfo": {"name": "bux-lsp", "version": "0.4.0"} }) if paramsNode.hasKey("rootPath") and paramsNode["rootPath"].kind != JNull: rootPath = paramsNode["rootPath"].getStr() diff --git a/tools/smoke_lsp_hover.sh b/tools/smoke_lsp_hover.sh new file mode 100755 index 0000000..01c3248 --- /dev/null +++ b/tools/smoke_lsp_hover.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env bash +# Smoke: hover on inferred let + parameter via bux-lsp JSON-RPC. +set -euo pipefail +ROOT="$(cd "$(dirname "$0")/.." && pwd)" +LSP="$ROOT/tools/bux-lsp" +TMP=$(mktemp -d) +trap 'rm -rf "$TMP"' EXIT + +if [[ ! -x "$LSP" ]]; then + echo "building bux-lsp..." + (cd "$ROOT" && make lsp >/dev/null) +fi + +cat > "$TMP/Main.bux" <<'EOF' +func Add(a: int, b: int) -> int { + let sum = a + b; + return sum; +} +func Main() -> int { + let n = 10; + return Add(n, 2); +} +EOF + +rpc() { + local body="$1" + local len + len=$(printf '%s' "$body" | wc -c) + printf 'Content-Length: %s\r\n\r\n%s' "$len" "$body" +} + +CONTENT_JSON=$(python3 -c 'import json,sys; print(json.dumps(open(sys.argv[1]).read()))' "$TMP/Main.bux") +URI="file://$TMP/Main.bux" + +{ + rpc '{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"capabilities":{},"rootUri":"file://'"$TMP"'"}}' + rpc '{"jsonrpc":"2.0","method":"initialized","params":{}}' + rpc '{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"'"$URI"'","languageId":"bux","version":1,"text":'"$CONTENT_JSON"'}}}' + # hover on `sum` (line 1) + rpc '{"jsonrpc":"2.0","id":2,"method":"textDocument/hover","params":{"textDocument":{"uri":"'"$URI"'"},"position":{"line":1,"character":8}}}' + # hover on param a (line 0) + rpc '{"jsonrpc":"2.0","id":3,"method":"textDocument/hover","params":{"textDocument":{"uri":"'"$URI"'"},"position":{"line":0,"character":9}}}' + # hover on n in Main (line 5) + rpc '{"jsonrpc":"2.0","id":4,"method":"textDocument/hover","params":{"textDocument":{"uri":"'"$URI"'"},"position":{"line":5,"character":8}}}' + rpc '{"jsonrpc":"2.0","id":5,"method":"shutdown","params":null}' + rpc '{"jsonrpc":"2.0","method":"exit","params":null}' +} | "$LSP" 2>/dev/null | tr '\r' '\n' > "$TMP/out.txt" + +echo "---- hover responses (excerpt) ----" +grep -o '"value":"[^"]*"' "$TMP/out.txt" | head -20 || true + +# Must have typed sum / n and param a somewhere in output +ok=1 +if ! grep -q 'sum' "$TMP/out.txt"; then + echo "FAIL: no hover for sum" + ok=0 +fi +if ! grep -Eq 'let sum: int|sum: int' "$TMP/out.txt"; then + echo "WARN: sum type not clearly int (may still pass if detail present)" + # Soft fail only if completely missing inferred path + if ! grep -q 'inferred' "$TMP/out.txt" && ! grep -q 'let sum' "$TMP/out.txt"; then + ok=0 + fi +fi +if ! grep -Eq 'param a|a: int' "$TMP/out.txt"; then + echo "FAIL: expected param a hover" + ok=0 +fi +if ! grep -Eq 'let n: int|n: int' "$TMP/out.txt"; then + echo "WARN: n type not clearly int" +fi + +if [[ $ok -eq 0 ]]; then + echo "---- full output ----" + cat "$TMP/out.txt" + exit 1 +fi +echo "PASS: LSP hover smoke (locals + params + inferred lets)" diff --git a/tools/smoke_registry.sh b/tools/smoke_registry.sh new file mode 100755 index 0000000..56cc7e4 --- /dev/null +++ b/tools/smoke_registry.sh @@ -0,0 +1,64 @@ +#!/usr/bin/env bash +# Smoke: registry search + add + install + build with greet package (E.1) +set -euo pipefail +ROOT="$(cd "$(dirname "$0")/.." && pwd)" +BUXC="$ROOT/buxc" +export BUX_REGISTRY="$ROOT/config/registry.toml" + +if [[ ! -x "$BUXC" ]]; then + (cd "$ROOT" && make build >/dev/null) +fi + +TMP=$(mktemp -d) +trap 'rm -rf "$TMP"' EXIT + +echo "=== bux search greet ===" +"$BUXC" search greet | tee "$TMP/search.out" +grep -q greet "$TMP/search.out" + +echo "=== create consumer project ===" +mkdir -p "$TMP/app/src" +cat > "$TMP/app/bux.toml" <<'EOF' +[Package] +Name = "registry_consumer" +Version = "0.1.0" +Type = "bin" + +[Build] +Output = "Bin" +EOF + +cat > "$TMP/app/src/Main.bux" <<'EOF' +import Std::Io::{PrintLine}; +import Std::String::{String_Eq}; +import Std::Test::{Test_AssertTrue, Test_Pass}; + +func Main() -> int { + let msg: String = Greet_Hello("Bux"); + Test_AssertTrue(String_Eq(msg, "Hello, Bux!")); + Test_AssertTrue(String_Eq(Greet_Version(), "0.1.1")); + PrintLine(msg); + Test_Pass("registry_consumer"); + return 0; +} +EOF + +cd "$TMP/app" +export BUX_STDLIB="$ROOT/lib" + +echo "=== bux add greet ===" +"$BUXC" add greet +grep -q greet bux.toml +cat bux.toml + +echo "=== bux install ===" +"$BUXC" install +test -f bux.lock +grep -q greet bux.lock +cat bux.lock + +echo "=== bux run ===" +"$BUXC" run . | tee "$TMP/run.out" +grep -q "Hello, Bux!" "$TMP/run.out" + +echo "PASS: registry smoke (search + add + install + build)" diff --git a/tools/test_lsp_locals.nim b/tools/test_lsp_locals.nim new file mode 100644 index 0000000..d64aad3 --- /dev/null +++ b/tools/test_lsp_locals.nim @@ -0,0 +1,93 @@ +## Smoke test for position-sensitive locals + inferred let types. +## Run: nim r --path:../bootstrap tools/test_lsp_locals.nim +import std/[os, strutils, tables, unittest] +import lexer, parser, ast, sema, types, scope + +# Minimal mirror of LSP collect (keeps the test free of JSON-RPC) + +proc typeOfLet(sema: var Sema, stmt: Stmt, sc: Scope): tuple[t: Type, inferred: bool] = + result.inferred = false + result.t = makeUnknown() + if stmt.stmtLetType != nil: + result.t = sema.resolveType(stmt.stmtLetType) + if (result.t == nil or result.t.isUnknown) and stmt.stmtLetInit != nil: + result.t = sema.checkExprForLsp(stmt.stmtLetInit, sc) + result.inferred = true + elif stmt.stmtLetType == nil and stmt.stmtLetInit != nil: + result.t = sema.checkExprForLsp(stmt.stmtLetInit, sc) + result.inferred = true + +suite "LSP locals / inference": + test "inferred let int from literal": + let src = """ +func Main() -> int { + let x = 42; + return x; +} +""" + let lexRes = tokenize(src, "t.bux") + check(not lexRes.hasErrors) + let parseRes = parse(lexRes.tokens, "t.bux") + check(parseRes.diagnostics.len == 0) + var (res, semaCtx) = analyzeFull(parseRes.module) + discard res + var found = false + for d in parseRes.module.items: + if d.kind != dkFunc: continue + var sc = newScope(semaCtx.globalScope) + for stmt in d.declFuncBody.stmts: + if stmt.kind == skLet and stmt.stmtLetName == "x": + let (t, inf) = typeOfLet(semaCtx, stmt, sc) + check(inf) + check(t.toString == "int" or t.kind == tkInt) + found = true + check(found) + + test "explicit type not marked inferred": + let src = """ +func Main() -> int { + let s: String = "hi"; + return 0; +} +""" + let lexRes = tokenize(src, "t.bux") + let parseRes = parse(lexRes.tokens, "t.bux") + var (res, semaCtx) = analyzeFull(parseRes.module) + discard res + for d in parseRes.module.items: + if d.kind != dkFunc: continue + var sc = newScope(semaCtx.globalScope) + for stmt in d.declFuncBody.stmts: + if stmt.kind == skLet and stmt.stmtLetName == "s": + let (t, inf) = typeOfLet(semaCtx, stmt, sc) + check(not inf) + check(t.toString == "String" or t.kind == tkStr) + + test "shadowed local: outer then inner": + let src = """ +func Main() -> int { + let x = 1; + if true { + let x = 2; + return x; + } + return x; +} +""" + let lexRes = tokenize(src, "t.bux") + let parseRes = parse(lexRes.tokens, "t.bux") + check(parseRes.diagnostics.len == 0) + # Both lets parse; inner is nested under if + var outer, inner: bool + for d in parseRes.module.items: + if d.kind != dkFunc: continue + for stmt in d.declFuncBody.stmts: + if stmt.kind == skLet and stmt.stmtLetName == "x": + outer = true + if stmt.kind == skIf: + for s2 in stmt.stmtIfThen.stmts: + if s2.kind == skLet and s2.stmtLetName == "x": + inner = true + check(outer and inner) + +echo "LSP locals unit checks done"