From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 30 Aug 2015 09:58:38 +0000 (+0100)
Subject: Merge branch 'master' into doc
X-Git-Url: https://git.distorted.org.uk/~mdw/sod/commitdiff_plain/bb80145308ea388d7c6ed5336c061340e78f66e8

Merge branch 'master' into doc

* master:
  src/utilities.lisp, src/optparse.lisp: Move locatives to `utilities'.
  src/c-types-proto.lisp: Fix docstring.
  src/parser/parser-proto.lisp: Export `combine-parser-failures'.
  src/utilities.lisp: Move `define-on-demand-slot' to the right section.
  src/codegen-impl.lisp: Rename some `inst' slots.
  src/codegen-{proto,impl}.lisp: Make *temporary-index* be a module var.
  src/class-make-proto.lisp: Choose Lisp metaclass more cleverly.
  src/class-make-impl.lisp: Abstract out the guts of `guess-metaclass'.
  src/c-types-impl.lisp: Fix arg list in `c-function-type' instance init.
  src/lexer-bits.lisp: Delete crufty old file.
---

bb80145308ea388d7c6ed5336c061340e78f66e8