Changeset 34947 in project


Ignore:
Timestamp:
12/17/17 05:02:01 (12 months ago)
Author:
kon
Message:

yelp

Location:
release/4/apropos/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/4/apropos/trunk/apropos.scm

    r34943 r34947  
    262262
    263263(: search-interaction-environment-symbols (* procedure --> list))
    264 (define (search-interaction-environment-symbols env accept?)
     264(define (search-interaction-environment-symbols env optarg?)
    265265  (let loop ((cursor (initial-symbol-table-cursor)) (syms '()))
    266266    (let ((sym (root-symbol cursor)))
    267267      (if (not sym)
    268268        syms
    269         (let ((syms (if (accept? sym) (cons sym syms) syms)))
     269        (let ((syms (if (optarg? sym) (cons sym syms) syms)))
    270270          (loop (next-root-symbol cursor) syms) ) ) ) ) )
    271271
    272272(: search-list-environment-symbols (list procedure --> list))
    273 (define (search-list-environment-symbols env accept?)
     273(define (search-list-environment-symbols env optarg?)
    274274  (fold
    275275    (lambda (cell syms)
    276276      (let ((sym (car cell)))
    277         (if (accept? sym)
     277        (if (optarg? sym)
    278278          (cons sym syms)
    279279          syms ) ) )
     
    282282
    283283(: search-macro-environment-symbols (list procedure --> list))
    284 (define (search-macro-environment-symbols env accept?)
    285   (search-list-environment-symbols env accept?) )
     284(define (search-macro-environment-symbols env optarg?)
     285  (search-list-environment-symbols env optarg?) )
    286286
    287287(: search-system-environment-symbols (list procedure --> list))
    288 (define (search-system-environment-symbols env accept?)
     288(define (search-system-environment-symbols env optarg?)
    289289  (if env
    290     (search-list-environment-symbols env accept?)
    291     (search-interaction-environment-symbols env accept?) ) )
     290    (search-list-environment-symbols env optarg?)
     291    (search-interaction-environment-symbols env optarg?) ) )
    292292
    293293;;
     
    340340(define (*apropos-list/macro-environment loc symbol-match? macenv qualified?)
    341341  (let (
    342     (accept?
     342    (optarg?
    343343      (if qualified?
    344344        any?
     
    349349        (and
    350350          (symbol-match? sym)
    351           (accept? sym)))) ) )
     351          (optarg? sym)))) ) )
    352352
    353353(define (*apropos-list/environment loc symbol-match? env qualified?)
    354354  (let (
    355     (accept?
     355    (optarg?
    356356      (if qualified?
    357357        global-symbol-bound?
     
    364364        (and
    365365          (symbol-match? sym)
    366           (accept? sym)))) ) )
     366          (optarg? sym)))) ) )
    367367
    368368;;
     
    981981  (let loop ((args iargs) (oargs '()))
    982982    ;
    983     (define (restargs next accept?)
     983    (define (thisargs next kwd init optarg?)
     984      (cond
     985        ((null? next)
     986          (cons* init kwd oargs) )
     987        (optarg?
     988          (cons* (optarg? (car next)) kwd oargs) )
     989        (else
     990          (cons* init kwd oargs) ) ) )
     991    ;
     992    (define (restargs next optarg?)
    984993      (cond
    985994        ((null? next)
    986995          '() )
    987         (accept?
     996        (optarg?
    988997          (cdr next) )
    989998        (else
    990999          next ) ) )
    9911000    ;
    992     (define (addarg kwd init #!optional accept?)
    993       (let* ((next (cdr args) )
    994              (args (restargs next accept?) ) )
    995         (cond
    996           ((null? next)
    997             (loop args (cons* init kwd oargs)) )
    998           (accept?
    999             (loop args (cons* (accept? (car next)) kwd oargs)) )
    1000           (else
    1001             (loop args (cons* init kwd oargs) ) ) ) ) )
     1001    (define (addarg kwd init #!optional optarg?)
     1002      (let* (
     1003        (next (cdr args) )
     1004        (args (restargs next optarg?) )
     1005        (oargs (thisargs next kwd init optarg?) ) )
     1006        ;
     1007        (loop args oargs) ) )
    10021008    ;
    10031009    (if (null? args)
  • release/4/apropos/trunk/apropos.setup

    r34943 r34947  
    99  (exit 1) )
    1010
    11 (setup-shared-extension-module 'apropos (extension-version "2.6.1")
     11(setup-shared-extension-module 'apropos (extension-version "2.6.2")
    1212  #:types? #t
    1313  #:inline? #t
Note: See TracChangeset for help on using the changeset viewer.