Changeset 34939 in project

Timestamp:

12/17/17 03:49:41 (9 months ago)

Author:

kon

Message:

add egg

Location:

release/4/apropos/trunk

Files:

• apropos.scm (modified) (5 diffs)
• apropos.setup (modified) (1 diff)

release/4/apropos/trunk/apropos.scm

@@ -139 +139 @@
     (not obj)
     (eq? #:name obj)
-    (eq? #:module obj)
+    (eq? #:mod obj) (eq? #:module obj)
     (eq? #:type obj)) )
 
@@ -795 +795 @@
         ((#:name)
           (cut information-identifier<? <> <> #:name) )
-        ((#:module)
+        ((#:mod #:module)
           (cut information-identifier<? <> <> #:module) )
         ((#:type)
@@ -981 +981 @@
   (let loop ((args iargs) (oargs '()))
     ;
+    (define (restargs next accept?)
+      (cond
+        ((null? next)
+          '() )
+        (accept?
+          (cdr next) )
+        (else
+          next ) ) )
+    ;
     (define (addarg kwd init #!optional accept?)
-      (let ((next (cdr args)))
+      (let* ((next (cdr args) )
+             (args (restargs next accept?) ) )
         (cond
           ((null? next)
-            (loop '() (cons* init kwd oargs)) )
+            (loop args (cons* init kwd oargs)) )
           (accept?
-            (loop (cdr next) (cons* (accept? (car next)) kwd oargs)) )
+            (loop args (cons* (accept? (car next)) kwd oargs)) )
           (else
-            (loop next (cons* init kwd oargs) ) ) ) ) )
+            (loop args (cons* init kwd oargs) ) ) ) ) )
     ;
     (if (null? args)
@@ -995 +1005 @@
       (let ((arg (car args)))
         (case arg
+          ;
+          ((krl)
+            (loop
+              (restargs (cdr args) #f)
+              (cons* #:module #:sort #t #:case-insensitive? #t #:qualified? #t #:macros? oargs)) )
+          ;
+          ((all)
+            (loop
+              (restargs (cdr args) #f)
+              (cons* #t #:case-insensitive? #t #:qualified? #t #:macros? oargs)) )
           ;
           ((mac macros)
@@ -1026 +1046 @@
         (unless (null? args)
           (apply apropos args) ) ) )
-    ",a PATT ARG...    Apropos of PATT with ARG from mac[ros], qual[ified], sort [name|module|type|#f], ci|case-insensitve, base [#]") )
+    ",a PATT ARG...    Apropos of PATT with ARG from mac[ros], qual[ified], ci|c13e, all, sort [name|mod[ule]|type|#f], base [#]") )
 
 ) ;module apropos

release/4/apropos/trunk/apropos.setup

@@ -9 +9 @@
   (exit 1) )
 
-(setup-shared-extension-module 'apropos (extension-version "2.5.2")
+(setup-shared-extension-module 'apropos (extension-version "2.6.0")
   #:types? #t
   #:inline? #t