From: Mark Wooding Date: Fri, 8 Jun 2018 19:09:02 +0000 (+0100) Subject: Merge branches 'mdw/doc-reorg' and 'mdw/parser-fixes' X-Git-Url: https://git.distorted.org.uk/~mdw/sod/commitdiff_plain/3a774b55edfea441c1715994924c2999e9202143 Merge branches 'mdw/doc-reorg' and 'mdw/parser-fixes' * mdw/doc-reorg: (34 commits) doc/refintro.tex, src/sod-module.5: Fix slightly garbled text. doc/syntax.tex: Delete (wrong) duplicate rule for . doc/syntax.tex: Consistently use baseline-level ellipses in syntax. doc/concepts.tex: Fix a rather distant demonstrative. test/: Add a simple rational-number class. src/method-impl.lisp: Initialize `suppliedp' flags properly. src/class-output.lisp: Fix missing parentheses around `me' in message macros. doc/concepts.tex: Fix garbled fragment ordering rules. doc/runtime.tex: Fix name of `SOD_XCHAIN' macro. doc/structures.tex, lib/sod-structs.3: Fix in-chain ichain exemplar. src/optparse.lisp: Indent a line correctly. test/test.sod: Abbreviate the T1 class nicknames. src/method-impl.lisp: Mark `sod__obj' as ignorable in effective methods. src/method-aggregate.lisp: Allow useful behaviour if no primary methods. doc/intro.tex: Begin a (rather extensive) comparison with C++. doc/Makefile.am, doc/sod.tex: Actually include the stub intro. doc/intro.tex: Fix erroneous `\manpage' to correct `\man'. doc/concepts.tex: Include diagram of standard method combination. doc/Makefile.am: Enable `\nonstopmode' in TeX processing. doc/Makefile.am: Abstract out repeated TeX arguments into a variable. ... * mdw/parser-fixes: (97 commits) src/class-finalize.lisp: Improve reporting of CPL construction errors. src/class-finalize-impl.lisp: Move error reporting to `merge-class-lists'. src/class-finalize-impl.lisp (clos-cpl, dylan-cpl): Improve formatting. src/class-finalize-impl.lisp (clos-tiebreaker): Refactor. src/class-finalize.lisp (merge-class-lists): Zap pointless `:present' arg. src/module-impl.lisp (c-fragment): Fix docstring formatting. src/module-parse.lisp: Improve error recovery for core class items. src/module-parse.lisp: Abstract out `parse-maybe-dotted-name'. src/module-parse.lisp: Use `quote', not `list', to make constant lists. src/module-parse.lisp: Use `dotted-name', not `dotted-identifier'. src/module-parse.lisp: Catch errors during class-item construction. src/module-parse.lisp: Factor out slot and maybe-initializer creation. src/module-parse.lisp: Improve error recovery for `class' item framing. src/class-utilities.lisp: Permit `temporary-name' objects as class names. src/class-utilities.lisp: Improve reporting of multiple root classes. src/module-parse.lisp: Improve error recovery for `initarg' class-items. src/module-parse.lisp: Improve error recovery for `lisp' items. src/module-parse.lisp: Improve error recovery for `load' and `import' items. src/module-parse.lisp: Improve error recovery for `test' items. src/module-parse.lisp: Improve error recovery for `code' items. ... --- 3a774b55edfea441c1715994924c2999e9202143 diff --cc src/optparse.lisp index 2234595,6460c54..367fc50 --- a/src/optparse.lisp +++ b/src/optparse.lisp @@@ -83,9 -83,9 +83,9 @@@ #+ecl (loop for i from 1 below (ext:argc) collect (ext:argv i)))) - (error "Unsupported Lisp.")))))) + (error "Unsupported Lisp")))))) - *program-name* (pathname-name (car *command-line*)))) + *program-name* (pathname-name (car *command-line*)))) ;;;-------------------------------------------------------------------------- ;;; Fancy conditionals.