From ceed01afc84505ed0d116ee7a00e8b4a1a4bed6c Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Thu, 26 May 2016 09:26:09 +0100 Subject: [PATCH] src/module-parse.lisp: Use newer syntax notation in the commentary. Organization: Straylight/Edgeware From: Mark Wooding --- src/module-parse.lisp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/module-parse.lisp b/src/module-parse.lisp index a339682..4d4d818 100644 --- a/src/module-parse.lisp +++ b/src/module-parse.lisp @@ -31,7 +31,7 @@ (in-package #:sod) ;;; Type names. (define-pluggable-parser module typename (scanner pset) - ;; `typename' id ( `,' id )* `;' + ;; `typename' list[id] `;' (declare (ignore pset)) (with-parser-context (token-scanner-context :scanner scanner) (parse (and "typename" @@ -50,7 +50,7 @@ (define-pluggable-parser module typename (scanner pset) (define-pluggable-parser module code (scanner pset) ;; `code' id `:' item-name [constraints] `{' c-fragment `}' ;; - ;; constrains ::= `[' constraint-list `]' + ;; constraints ::= `[' list[constraint] `]' ;; constraint ::= item-name+ ;; item-name ::= id | `(' id+ `)' (declare (ignore pset)) @@ -162,7 +162,7 @@ (define-pluggable-parser module file (scanner pset) ;;; Setting properties. (define-pluggable-parser module set (scanner pset) - ;; `set' property-list `;' + ;; `set' list[property] `;' (with-parser-context (token-scanner-context :scanner scanner) (parse (and "set" (lisp (let ((module-pset (module-pset *module*))) @@ -213,7 +213,7 @@ (define-pluggable-parser class-item initfrags (scanner class pset) (funcall make class frag pset scanner))))) (define-pluggable-parser class-item initargs (scanner class pset) - ;; initarg-item ::= `initarg' declspec+ init-declarator-list + ;; initarg-item ::= `initarg' declspec+ list[init-declarator] ;; init-declarator ::= declarator [`=' initializer] (with-parser-context (token-scanner-context :scanner scanner) (parse (seq ("initarg" @@ -301,10 +301,9 @@ (defun parse-class-body (scanner pset name supers) (parse-slot-item (sub-pset base-type type name) ;; slot-item ::= ;; declspec+ declarator -!- [initializer] - ;; [`,' init-declarator-list] `;' + ;; [`,' list[init-declarator]] `;' ;; - ;; init-declarator-list ::= - ;; declarator [initializer] [`,' init-declarator-list] + ;; init-declarator ::= declarator [initializer] (parse (and (seq ((init (? (parse-initializer)))) (make-sod-slot class name type sub-pset scanner) @@ -326,7 +325,7 @@ (defun parse-class-body (scanner pset name supers) (parse-initializer-item (sub-pset must-init-p constructor) ;; initializer-item ::= - ;; [`class'] -!- slot-initializer-list `;' + ;; [`class'] -!- list[slot-initializer] `;' ;; ;; slot-initializer ::= id `.' id [initializer] (let ((parse-init (if must-init-p #'parse-initializer @@ -401,7 +400,7 @@ (defun parse-class-body (scanner pset name supers) (add-to-module *module* class)))))))) (define-pluggable-parser module class (scanner pset) - ;; `class' id `:' id-list class-body + ;; `class' id `:' list[id] class-body ;; `class' id `;' (with-parser-context (token-scanner-context :scanner scanner) (parse (seq ("class" -- [mdw]