From: Mark Wooding Date: Wed, 7 Aug 2019 13:25:50 +0000 (+0100) Subject: doc/SYMBOLS: Distinguish c-type and parser (atomic) specifiers and forms. X-Git-Url: https://git.distorted.org.uk/~mdw/sod/commitdiff_plain/6213be581b6fd4836c19af2f7970ecead5f8ae97 doc/SYMBOLS: Distinguish c-type and parser (atomic) specifiers and forms. --- diff --git a/doc/SYMBOLS b/doc/SYMBOLS index 7b801b2..ffa6387 100644 --- a/doc/SYMBOLS +++ b/doc/SYMBOLS @@ -8,19 +8,19 @@ builtin.lisp c-types-class-impl.lisp c-class-type class c-type-class generic setf-generic - cl:class class c-type + cl:class class c-type-form find-class-type function find-sod-class function make-class-type function record-sod-class function c-types-impl.lisp - cl:* variable function c-type + cl:* variable function c-type-form alignas alignas-storage-specifier class - cl:array class c-type - atomic c-type - bool c-type + cl:array class c-type-form + atomic c-type-form + bool c-type-spec c-type-form c-array-dimensions generic c-array-type class c-atomic-type class @@ -61,33 +61,33 @@ c-types-impl.lisp c-type-void variable c-type-wchar-t variable c-union-type class - cl:char function setf-function c-type parser + cl:char function setf-function c-type-spec c-type-form parser-form commentify-argument-names function commentify-function-type function - const-string c-type + const-string c-type-spec define-simple-c-type macro - double c-type - double-complex c-type - double-imaginary c-type - enum c-type + double c-type-spec c-type-form + double-complex c-type-spec c-type-form + double-imaginary c-type-spec c-type-form + enum c-type-form find-simple-c-type function - cl:float function class c-type - float-complex c-type - float-imaginary c-type - fn c-type - fun c-type - func c-type - cl:function function class c-type - sod-utilities:int c-type opthandler + cl:float function class c-type-spec c-type-form + float-complex c-type-spec c-type-form + float-imaginary c-type-spec c-type-form + fn c-type-form + fun c-type-form + func c-type-form + cl:function function class c-type-form + sod-utilities:int c-type-spec c-type-form opthandler kind-c-tagged-type generic - llong c-type - long c-type - long-double c-type - long-double-complex c-type - long-double-imaginary c-type - long-int c-type - long-long c-type - long-long-int c-type + llong c-type-spec + long c-type-spec c-type-form + long-double c-type-spec c-type-form + long-double-complex c-type-spec c-type-form + long-double-imaginary c-type-spec c-type-form + long-int c-type-spec + long-long c-type-spec c-type-form + long-long-int c-type-spec make-array-type function make-atomic-type function make-c-tagged-type function @@ -99,55 +99,55 @@ c-types-impl.lisp make-struct-type function make-union-type function merge-keyword-lists function - cl:nil constant c-type parser - pointer c-type + cl:nil constant c-type-form parser-spec parser-form + pointer c-type-form pprint-argument-list function pprint-c-function-type function - ptr c-type - ptrdiff-t c-type + ptr c-type-form + ptrdiff-t c-type-spec c-type-form reify-variable-argument-tail function - cl:schar function setf-function c-type - short c-type - short-int c-type - signed c-type - signed-char c-type - signed-int c-type - signed-long c-type - signed-long-int c-type - signed-long-long c-type - signed-long-long-int c-type - signed-short c-type - signed-short-int c-type + cl:schar function setf-function c-type-spec + short c-type-spec c-type-form + short-int c-type-spec + signed c-type-spec + signed-char c-type-spec c-type-form + signed-int c-type-spec + signed-long c-type-spec + signed-long-int c-type-spec + signed-long-long c-type-spec + signed-long-long-int c-type-spec + signed-short c-type-spec + signed-short-int c-type-spec simple-c-type class - sint c-type - size-t c-type - sllong c-type - slong c-type - specs c-type - sshort c-type - cl:string function class c-type opthandler - struct c-type + sint c-type-spec + size-t c-type-spec c-type-form + sllong c-type-spec + slong c-type-spec + specs c-type-form + sshort c-type-spec + cl:string function class c-type-spec opthandler + struct c-type-form tagged-c-type class - uchar c-type - uint c-type - ullong c-type - ulong c-type - cl:union function c-type - unsigned c-type - unsigned-char c-type - unsigned-int c-type - unsigned-long c-type - unsigned-long-int c-type - unsigned-long-long c-type - unsigned-long-long-int c-type - unsigned-short c-type - unsigned-short-int c-type - ushort c-type - va-list c-type - vec c-type - void c-type - wchar-t c-type - [] c-type + uchar c-type-spec + uint c-type-spec + ullong c-type-spec + ulong c-type-spec + cl:union function c-type-form + unsigned c-type-spec c-type-form + unsigned-char c-type-spec c-type-form + unsigned-int c-type-spec + unsigned-long c-type-spec c-type-form + unsigned-long-int c-type-spec + unsigned-long-long c-type-spec c-type-form + unsigned-long-long-int c-type-spec + unsigned-short c-type-spec c-type-form + unsigned-short-int c-type-spec + ushort c-type-spec + va-list c-type-spec c-type-form + vec c-type-form + void c-type-spec c-type-form + wchar-t c-type-spec c-type-form + [] c-type-form c-types-parse.lisp parse-c-type function @@ -472,11 +472,11 @@ fragment-parse.lisp lexer-proto.lisp define-indicator function - cl:error function class parser + cl:error function class parser-form lexer-error function class - must parser + must parser-form scan-comment function - skip-until parser + skip-until parser-form sod-token-scanner class syntax-error function class @@ -1663,7 +1663,7 @@ parser-expr-proto.lisp apply-operator generic binop macro close-parenthesis class - expr parser + expr parser-form lparen function open-parenthesis class operator-left-precedence generic @@ -1686,28 +1686,28 @@ parser-impl.lisp string-parser class parser-proto.lisp - ? parser - cl:and macro parser + ? parser-form + cl:and macro parser-form call-pluggable-parser function - cl:char function setf-function c-type parser + cl:char function setf-function c-type-spec c-type-form parser-form character-parser-context class combine-parser-failures function - commit parser + commit parser-form cond-parse macro define-pluggable-parser macro defparse macro expand-parser-form generic expand-parser-spec generic - filter parser - if-char parser + filter parser-form + if-char parser-form if-parse macro sod-utilities:it - label parser - lisp c-type parser - cl:list function class parser opthandler - many parser - cl:not function parser - cl:or macro parser + label parser-form + lisp c-type-form parser-form + cl:list function class parser-form opthandler + many parser-form + cl:not function parser-form + cl:or macro parser-form parse parse-empty function parse-fail function @@ -1721,13 +1721,13 @@ parser-proto.lisp parser-step generic parser-token-type generic parser-token-value generic - peek parser - plug parser + peek parser-form + plug parser-form pluggable-parser-add function - cl:satisfies parser - seq parser - skip-many parser - token parser + cl:satisfies parser-form + seq parser-form + skip-many parser-form + token parser-form token-parser-context class when-parse macro with-parser-context macro @@ -2222,10 +2222,10 @@ optparse.lisp exit function help-options optmacro inc opthandler - sod-utilities:int c-type opthandler + sod-utilities:int c-type-spec c-type-form opthandler invoke-option-handler function cl:keyword opthandler - cl:list function class parser opthandler + cl:list function class parser-form opthandler make-option function make-option-parser function moan function @@ -2260,7 +2260,7 @@ optparse.lisp show-help function show-usage function simple-usage function - cl:string function class c-type opthandler + cl:string function class c-type-spec opthandler with-unix-error-reporting macro Classes: @@ -2317,7 +2317,7 @@ utilities.lisp info function information class instance-initargs generic - int c-type opthandler + int c-type-spec c-type-form opthandler invoke-associated-restart function it lbuild-add function diff --git a/doc/list-exports b/doc/list-exports index a90c0d5..c82100a 100755 --- a/doc/list-exports +++ b/doc/list-exports @@ -334,12 +334,14 @@ (null))) (when (find-class symbol nil) (push :class things)) - (when (or (specialized-on-p #'sod:expand-c-type-spec 0 symbol) - (specialized-on-p #'sod:expand-c-type-form 0 symbol)) - (push :c-type things)) - (when (or (specialized-on-p #'sod-parser:expand-parser-spec 1 symbol) - (specialized-on-p #'sod-parser:expand-parser-form 1 symbol)) - (push :parser things)) + (when (specialized-on-p #'sod:expand-c-type-spec 0 symbol) + (push :c-type-spec things)) + (when (specialized-on-p #'sod:expand-c-type-form 0 symbol) + (push :c-type-form things)) + (when (specialized-on-p #'sod-parser:expand-parser-spec 1 symbol) + (push :parser-spec things)) + (when (specialized-on-p #'sod-parser:expand-parser-form 1 symbol) + (push :parser-form things)) (when (get symbol 'optparse::opthandler) (push :opthandler things)) (when (get symbol 'optparse::optmacro)