macroexpand-first analyzer order; one macro path; defmacro/letfn fixes

Browse source

The analyzer checked special forms before expanding macros, the reverse of the
canonical read -> macroexpand -> analyze order (Clojure/CLJS analyze-seq). Move
macroexpansion to the front of analyze-list. Knock-on fixes:

- letfn was both a (broken) macro expanding to let* AND a primitive special
  (analyze-letfn, proper letrec*). Macroexpand-first surfaced the macro, breaking
  mutual recursion; remove the macro, keep letfn a primitive.
- defmacro is now compiled by the analyzer (a :set-var-style :defmacro node that
  defs the expander fn via the fn macro — so destructuring arglists desugar — and
  marks the var a macro), so a non-top-level (when … (defmacro …)) works. The
  runtime spine's separate top-level defmacro interception is removed: one path.

SCI load 162 -> 202/218.

...

This commit is contained in:

Yogthos 2026-06-22 00:54:16 -04:00

parent e6ee17b055

commit f18ae3bd46

8 changed files with 402 additions and 383 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

162

host/chez/seed/image.ss

View file

File diff suppressed because one or more lines are too long

564

host/chez/seed/prelude.ss

View file

File diff suppressed because one or more lines are too long