From 0fab33da360afba6bfdcf97fc27a9411c175d0fe Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 7 Jan 2018 14:52:09 +0100
Subject: [PATCH] Revert "mes: un-defmacro optargs.  WIP"

This reverts commit 5da527c540dc0e1481a010899233b4e806fe37da.
---
 module/mes/optargs.mes |  3 +++
 module/mes/optargs.scm | 26 ++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/module/mes/optargs.mes b/module/mes/optargs.mes
index 034719d9..94b0c39b 100644
--- a/module/mes/optargs.mes
+++ b/module/mes/optargs.mes
@@ -26,6 +26,9 @@
 
 (mes-use-module (mes scm))
 
+(define-macro (defmacro name args . body)
+  `(define-macro ,(cons name args) ,@body))
+
 (define-macro (set-procedure-property! proc key value)
   proc)
 
diff --git a/module/mes/optargs.scm b/module/mes/optargs.scm
index 8a873fe0..943e21fa 100644
--- a/module/mes/optargs.scm
+++ b/module/mes/optargs.scm
@@ -85,12 +85,14 @@
 ;; bound to whatever may have been left of rest-arg.
 ;;
 
-(define-macro (let-optional REST-ARG BINDINGS . BODY)
+(defmacro let-optional (REST-ARG BINDINGS . BODY)
   (let-optional-template REST-ARG BINDINGS BODY 'let))
 
-(define-macro (let-optional* REST-ARG BINDINGS . BODY)
+(defmacro let-optional* (REST-ARG BINDINGS . BODY)
   (let-optional-template REST-ARG BINDINGS BODY 'let*))
 
+
+
 ;; let-keywords rest-arg allow-other-keys? (binding ...) . body
 ;; let-keywords* rest-arg allow-other-keys? (binding ...) . body
 ;;   macros used to bind keyword arguments
@@ -106,10 +108,10 @@
 ;;
 
 
-(define-macro (let-keywords REST-ARG ALLOW-OTHER-KEYS? BINDINGS . BODY)
+(defmacro let-keywords (REST-ARG ALLOW-OTHER-KEYS? BINDINGS . BODY)
   (let-keywords-template REST-ARG ALLOW-OTHER-KEYS? BINDINGS BODY 'let))
 
-(define-macro (let-keywords* REST-ARG ALLOW-OTHER-KEYS? BINDINGS . BODY)
+(defmacro let-keywords* (REST-ARG ALLOW-OTHER-KEYS? BINDINGS . BODY)
   (let-keywords-template REST-ARG ALLOW-OTHER-KEYS? BINDINGS BODY 'let*))
 
 
@@ -231,7 +233,7 @@
 ;; Lisp dialects.
 
 
-(define-macro (lambda* ARGLIST . BODY)
+(defmacro lambda* (ARGLIST . BODY)
   (parse-arglist
    ARGLIST
    (lambda (non-optional-args optionals keys aok? rest-arg)
@@ -376,10 +378,10 @@
 ;; Of course, define*[-public] also supports #:rest and #:allow-other-keys
 ;; in the same way as lambda*.
 
-(define-macro (define* ARGLIST . BODY)
+(defmacro define* (ARGLIST . BODY)
   (define*-guts 'define ARGLIST BODY))
 
-(define-macro (define*-public ARGLIST . BODY)
+(defmacro define*-public (ARGLIST . BODY)
   (define*-guts 'define-public ARGLIST BODY))
 
 ;; The guts of define* and define*-public.
@@ -410,13 +412,13 @@
 ;; semantics. Here is an example of a macro with an optional argument:
 ;;   (defmacro* transmorgify (a #:optional b)
 
-(define-macro (define-macro* NAME+ARGLIST . BODY)
-  `(define-macro ,(car NAME+ARGLIST) #f (lambda* ,(cdr NAME+ARGLIST) ,@BODY)))
+(defmacro defmacro* (NAME ARGLIST . BODY)
+  `(define-macro ,NAME #f (lambda* ,ARGLIST ,@BODY)))
 
-(define-macro (define-macro*-public NAME+ARGLIST . BODY)
+(defmacro defmacro*-public (NAME ARGLIST . BODY)
   `(begin
-     (define-macro* ,NAME+ARGLIST ,@BODY)
-     (export-syntax ,(car NAME+ARGLIST))))
+     (defmacro* ,NAME ,ARGLIST ,@BODY)
+     (export-syntax ,NAME)))
 
 ;;; Support for optional & keyword args with the interpreter.
 (define *uninitialized* (list 'uninitialized))