Skip to content

Extra macro refactoring #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soareschen merged 15 commits into from
Oct 4, 2026
Merged

Extra macro refactoring #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e154c7f
Move the `#[cgp_auto_dispatch]` tests into their own `auto_dispatch` …
soareschen Oct 4, 2026
072b181
Pin the extra macros' behavior and expansions before refactoring them
soareschen Oct 4, 2026
e1e1bb3
Rename `cgp-extra-macro{,-lib}` to `cgp-macro-extra{,-lib}`
soareschen Oct 4, 2026
20a33dc
Add `cgp-macro-extra-core` for the extra macros' parsing and codegen
soareschen Oct 4, 2026
65697cd
Lower `#[cgp_producer]` through `cgp-macro-core`'s AST types
soareschen Oct 4, 2026
a2e4176
Lower `#[cgp_computer]` through `cgp-macro-core`'s AST types
soareschen Oct 4, 2026
4fc5bff
Lower `#[cgp_auto_dispatch]` through the computer pipeline
soareschen Oct 4, 2026
efd7378
Span the extra macros' generated impls on the names they derive from
soareschen Oct 4, 2026
45612b0
Test the extra macros in a module without the CGP prelude
soareschen Oct 4, 2026
a391c0a
Name a dispatch method's elided lifetimes by the elision rules
soareschen Oct 4, 2026
65479de
Require a dispatch trait's supertraits in its blanket impl
soareschen Oct 4, 2026
45896b8
Reject a typed receiver and attribute arguments in `#[cgp_auto_dispat…
soareschen Oct 4, 2026
8f9345e
Fix raw names, `impl Trait`, and the `Result<T>` error in the functio…
soareschen Oct 4, 2026
db05a12
Document the extra-macro entry points and the new core crate's modules
soareschen Oct 4, 2026
703643d
Pin the `#[cgp_fn]` raw-identifier panic as a known issue
soareschen Oct 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ inward (core/macros) when changing fundamentals, outward (main) only to adjust t
**`cgp-macro-core`** — this is where the real parsing, AST types, and codegen live (see
`cgp-macro-core/src/{types,functions,visitors,macros}/`). When a macro misbehaves, the logic to
fix is almost always in `cgp-macro-core`, not the entrypoint crate. `cgp-async-macro` provides
`#[async_trait]`; `cgp-extra-macro{,-lib}` host the extra-feature macros.
`#[async_trait]`. The extra-feature macros (`#[cgp_computer]`, `#[cgp_producer]`,
`#[cgp_auto_dispatch]`) mirror the same split: `cgp-macro-extra` forwards to
`cgp-macro-extra-lib`, which builds on **`cgp-macro-extra-core`**, which in turn builds on
`cgp-macro-core`, lowering through its AST types.

- **`crates/core/`** — the foundational runtime traits the macros expand into:
- `cgp-component` — the wiring machinery: `DelegateComponent`, `IsProviderFor`,
Expand Down
52 changes: 32 additions & 20 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ members = [
"crates/macros/cgp-macro",
"crates/macros/cgp-macro-core",
"crates/macros/cgp-macro-lib",
"crates/macros/cgp-macro-extra",
"crates/macros/cgp-macro-extra-core",
"crates/macros/cgp-macro-extra-lib",
"crates/macros/cgp-macro-test-util",
"crates/macros/cgp-macro-test-util-lib",
"crates/macros/cgp-extra-macro",
"crates/macros/cgp-extra-macro-lib",

"crates/standalone/error/cgp-error-anyhow",
"crates/standalone/error/cgp-error-eyre",
Expand Down Expand Up @@ -80,8 +81,9 @@ cgp-async-macro = { version = "0.8.0-alpha", path = "./crates/macros
cgp-macro = { version = "0.8.0-alpha", path = "./crates/macros/cgp-macro" }
cgp-macro-core = { version = "0.8.0-alpha", path = "./crates/macros/cgp-macro-core" }
cgp-macro-lib = { version = "0.8.0-alpha", path = "./crates/macros/cgp-macro-lib" }
cgp-macro-extra = { version = "0.8.0-alpha", path = "./crates/macros/cgp-macro-extra" }
cgp-macro-extra-core = { version = "0.8.0-alpha", path = "./crates/macros/cgp-macro-extra-core" }
cgp-macro-extra-lib = { version = "0.8.0-alpha", path = "./crates/macros/cgp-macro-extra-lib" }
cgp-macro-test-util = { version = "0.8.0-alpha", path = "./crates/macros/cgp-macro-test-util" }

cgp-macro-test-util-lib = { version = "0.8.0-alpha", path = "./crates/macros/cgp-macro-test-util-lib" }
cgp-extra-macro = { version = "0.8.0-alpha", path = "./crates/macros/cgp-extra-macro" }
cgp-extra-macro-lib = { version = "0.8.0-alpha", path = "./crates/macros/cgp-extra-macro-lib" }
Loading
Loading