Changeset 33417 in project


Ignore:
Timestamp:
06/12/16 19:16:56 (3 years ago)
Author:
Kon Lovett
Message:

use setup-helper-mode. remove % forms (segfault).

Location:
release/4/F-operator
Files:
12 edited
1 copied

Legend:

Unmodified
Added
Removed
  • release/4/F-operator/tags/3.0.0/F-operator.setup

    r24154 r33417  
    11;;;; F-operator.setup  -*- Hen -*-
    22
    3 (include "setup-helper")
     3(use setup-helper-mod)
    44
    55(verify-extension-name "F-operator")
    66
    7 (setup-shared-extension-module 'shift-reset (extension-version "2.0.4")
     7(setup-shared-extension-module 'shift-reset (extension-version "3.0.0")
    88  #:compile-options '(
    99    -scrutinize
     
    1313    -no-procedure-checks -no-bound-checks #;-no-argc-checks))
    1414
    15 (setup-shared-extension-module 'bshift-breset (extension-version "2.0.4")
     15(setup-shared-extension-module 'bshift-breset (extension-version "3.0.0")
    1616  #:compile-options '(
    1717    -scrutinize
     
    2121    -no-procedure-checks -no-bound-checks #;-no-argc-checks))
    2222
    23 (setup-shared-extension-module 'delimited-control (extension-version "2.0.4")
     23(setup-shared-extension-module 'delimited-control (extension-version "3.0.0")
    2424  #:compile-options '(
    2525    -scrutinize
     
    3030    -no-procedure-checks -no-bound-checks #;-no-argc-checks))
    3131
    32 (setup-shared-extension-module 'range (extension-version "2.0.4"))
     32(setup-shared-extension-module 'range (extension-version "3.0.0"))
    3333
    34 (setup-shared-extension-module 'reflect-reify (extension-version "2.0.4"))
     34(setup-shared-extension-module 'reflect-reify (extension-version "3.0.0"))
    3535
    36 (setup-shared-extension-module 'gshift-greset (extension-version "2.0.4")
     36(setup-shared-extension-module 'gshift-greset (extension-version "3.0.0")
    3737  #:compile-options '(
    3838    -scrutinize
     
    4343    -no-procedure-checks -no-bound-checks #;-no-argc-checks))
    4444
    45 (install-extension-tag (extension-name) (extension-version "2.0.4"))
     45(install-extension-tag (extension-name) (extension-version "3.0.0"))
  • release/4/F-operator/tags/3.0.0/bshift-breset.scm

    r15941 r33417  
    66(module bshift-breset (;export
    77  ;;
    8   (%breset *%breset) (%bshift *%bshift)
     8  ;(%breset *%breset) (%bshift *%bshift)
    99  (breset *breset) (bshift *bshift)
    10   (%breset-values *%breset-values) (%bshift-values *%bshift-values)
     10  ;(%breset-values *%breset-values) (%bshift-values *%bshift-values)
    1111  (breset-values *breset-values) (bshift-values *bshift-values)
    1212  ;;
    13   *%breset *%bshift
     13  ;*%breset *%bshift
    1414  *breset *bshift
    15   *%breset-values *%bshift-values
     15  ;*%breset-values *%bshift-values
    1616  *breset-values *bshift-values
    1717  ;;
     
    2424  (require-library miscmacros box)
    2525
     26#; ;REMOVED
    2627(define-syntax %breset
    2728  (syntax-rules ()
    2829    ((_ RC BODY ...) (*%breset (lambda (RC) BODY ...) 'RC) ) ) )
    2930
     31#; ;REMOVED
    3032(define-syntax %bshift
    3133  (syntax-rules ()
     
    4042    ((_ RC SP BODY ...) (*bshift RC (lambda (SP) BODY ...) 'RC) ) ) )
    4143
     44#; ;REMOVED
    4245(define-syntax %breset-values
    4346  (syntax-rules ()
    4447    ((_ RC BODY ...) (*%breset-values (lambda (RC) BODY ...) 'RC) ) ) )
    4548
     49#; ;REMOVED
    4650(define-syntax %bshift-values
    4751  (syntax-rules ()
     
    6064;;
    6165
     66#; ;REMOVED
    6267(define-syntax let/scc
    6368  (syntax-rules ()
    6469    ((_ K BODY ...) (##sys#call-with-current-continuation (lambda (K) BODY ...)) ) ) )
    6570
     71#; ;REMOVED
    6672(define-syntax let/cdc
    6773  (syntax-rules ()
     
    8894;;
    8995
     96#; ;REMOVED
    9097(define-syntax *%breturn
    9198        (syntax-rules ()
     
    97104                (##sys#direct-return rc-k val) ) ) ) ) ) ) )
    98105
     106#; ;REMOVED
    99107(define (*%breset proc rc-sym)
    100108  (let/cdc rc-k
    101109    (let ((rc (make-box rc-k)))
    102       (*%breturn rc (proc rc) rc-sym '%breset) ) ) )
    103 
     110      (*%breturn rc (proc rc) rc-sym '%breset) ) ) )
     111
     112#; ;REMOVED
    104113(define (*%bshift rc proc rc-sym)
    105114  (let/cdc s-k
     
    154163;;
    155164
     165#; ;REMOVED
    156166(define-syntax *%breturn-values
    157167        (syntax-rules ()
     
    166176                    (apply rc-k vals)))))) ) ) ) )
    167177
     178#; ;REMOVED
    168179(define (*%breset-values proc rc-sym)
    169180  (let/scc rc-k
     
    171182      (*%breturn-values rc (proc rc) rc-sym '%breset-values) ) ) )
    172183
     184#; ;REMOVED
    173185(define (*%bshift-values rc proc rc-sym)
    174186  (let/scc s-k
  • release/4/F-operator/tags/3.0.0/range.scm

    r15941 r33417  
    88  (range-empty? $range-empty-tag)
    99  (range $range-empty-tag)
    10   (%range $range-empty-tag)
     10  ;(%range $range-empty-tag)
    1111  ;;
    12   (%bshift *%bshift)
     12  ;(%bshift *%bshift)
    1313  (bshift *bshift))
    1414
     
    4242      (range RC FROM 1 TO)) ) )
    4343
     44#; ;REMOVED
    4445(define-syntax %range
    4546  (syntax-rules ()
  • release/4/F-operator/tags/3.0.0/reflect-reify.scm

    r16205 r33417  
    77  ;;
    88  define-bind define-unit
    9   reflect reflect-values %reflect
    10   reify reify-values %reify
     9  reflect reify
     10  reflect-values reify-values
     11  ;%reflect %reify
    1112  ;;
    1213  shift reset)
     
    5960          `(,_shift-values k (,(bind-identifier kind) ,meaning k)) ) ) ) ) )
    6061
     62#; ;REMOVED
    6163(define-syntax %reflect
    6264  (er-macro-transformer
     
    8688          `(,_reset-values (,(unit-identifier kind) ,expr)) ) ) ) ) )
    8789
     90#; ;REMOVED
    8891(define-syntax %reify
    8992  (er-macro-transformer
  • release/4/F-operator/tags/3.0.0/shift-reset.scm

    r15941 r33417  
    66(module shift-reset (;export
    77  ;;
    8   (%reset *%reset) (%shift *%shift)
     8  ;(%reset *%reset) (%shift *%shift)
    99  (reset *reset) (shift *shift)
    10   (%reset-values *%reset-values) (%shift-values *%shift-values)
     10  ;(%reset-values *%reset-values) (%shift-values *%shift-values)
    1111  (reset-values *reset-values) (shift-values *shift-values)
    1212  ;;
    13   *%reset *%shift
     13  ;*%reset *%shift
    1414  *reset *shift
    15   *%reset-values *%shift-values
     15  ;*%reset-values *%shift-values
    1616  *reset-values *shift-values)
    1717
     
    2929                        *meta-kv*))
    3030
     31#; ;REMOVED
    3132(define-syntax %reset
    3233  (syntax-rules ()
    3334    ((_ BODY ...) (*%reset (lambda () BODY ...)) ) ) )
    3435
     36#; ;REMOVED
    3537(define-syntax %shift
    3638  (syntax-rules ()
     
    4547    ((_ SP BODY ...) (*shift (lambda (SP) BODY ...)) ) ) )
    4648
     49#; ;REMOVED
    4750(define-syntax %reset-values
    4851  (syntax-rules ()
    4952    ((_ BODY ...) (*%reset-values (lambda () BODY ...)) ) ) )
    5053
     54#; ;REMOVED
    5155(define-syntax %shift-values
    5256  (syntax-rules ()
     
    6569;;
    6670
     71#; ;REMOVED
    6772(define-syntax let/scc
    6873  (syntax-rules ()
    6974    ((_ K BODY ...) (##sys#call-with-current-continuation (lambda (K) BODY ...)) ) ) )
    7075
     76#; ;REMOVED
    7177(define-syntax let/cdc
    7278  (syntax-rules ()
     
    8793;;
    8894
     95#; ;REMOVED
    8996(define *meta-dk* (lambda (val) (bad-k '%shift '%reset)))
    9097
     98#; ;REMOVED
    9199(define (*%return EXPR) (##sys#direct-return *meta-dk* EXPR))
    92100
     101#; ;REMOVED
    93102(define (*%reset thunk)
    94103  (let ((meta-dk *meta-dk*))
     
    99108      val) ) )
    100109
     110#; ;REMOVED
    101111(define (*%shift proc)
    102112  (let/cdc k
     
    135145;;
    136146
     147#; ;REMOVED
    137148(define *meta-dkv* (lambda vals (bad-k '%shift-values '%reset-values)))
    138149
     150#; ;REMOVED
    139151(define-syntax *%return-values
    140152  (syntax-rules ()
     
    144156        (lambda vals (apply *meta-dkv* vals))) ) ) )
    145157
     158#; ;REMOVED
    146159(define (*%reset-values thunk)
    147160  (let ((meta-dkv *meta-dkv*))
     
    155168        (apply values vals))) ) )
    156169
     170#; ;REMOVED
    157171(define (*%shift-values proc)
    158172  (let/scc k
  • release/4/F-operator/tags/3.0.0/tests/run.scm

    r26757 r33417  
    5555(test-group "Shift/Reset Family"
    5656
     57  #; ;REMOVED
    5758  (test-group "%shift/%reset"
    5859
     
    107108  )
    108109
     110  #; ;REMOVED
    109111  (test-group "%shift-values/%reset-values"
    110112
     
    173175  )
    174176
     177  #; ;REMOVED
    175178  (test-group "%bshift/%breset"
    176179
     
    335338  )
    336339
     340  #; ;REMOVED
    337341  (test-group "%bshift-values/%breset-values"
    338342
  • release/4/F-operator/trunk/F-operator.setup

    r24154 r33417  
    11;;;; F-operator.setup  -*- Hen -*-
    22
    3 (include "setup-helper")
     3(use setup-helper-mod)
    44
    55(verify-extension-name "F-operator")
    66
    7 (setup-shared-extension-module 'shift-reset (extension-version "2.0.4")
     7(setup-shared-extension-module 'shift-reset (extension-version "3.0.0")
    88  #:compile-options '(
    99    -scrutinize
     
    1313    -no-procedure-checks -no-bound-checks #;-no-argc-checks))
    1414
    15 (setup-shared-extension-module 'bshift-breset (extension-version "2.0.4")
     15(setup-shared-extension-module 'bshift-breset (extension-version "3.0.0")
    1616  #:compile-options '(
    1717    -scrutinize
     
    2121    -no-procedure-checks -no-bound-checks #;-no-argc-checks))
    2222
    23 (setup-shared-extension-module 'delimited-control (extension-version "2.0.4")
     23(setup-shared-extension-module 'delimited-control (extension-version "3.0.0")
    2424  #:compile-options '(
    2525    -scrutinize
     
    3030    -no-procedure-checks -no-bound-checks #;-no-argc-checks))
    3131
    32 (setup-shared-extension-module 'range (extension-version "2.0.4"))
     32(setup-shared-extension-module 'range (extension-version "3.0.0"))
    3333
    34 (setup-shared-extension-module 'reflect-reify (extension-version "2.0.4"))
     34(setup-shared-extension-module 'reflect-reify (extension-version "3.0.0"))
    3535
    36 (setup-shared-extension-module 'gshift-greset (extension-version "2.0.4")
     36(setup-shared-extension-module 'gshift-greset (extension-version "3.0.0")
    3737  #:compile-options '(
    3838    -scrutinize
     
    4343    -no-procedure-checks -no-bound-checks #;-no-argc-checks))
    4444
    45 (install-extension-tag (extension-name) (extension-version "2.0.4"))
     45(install-extension-tag (extension-name) (extension-version "3.0.0"))
  • release/4/F-operator/trunk/bshift-breset.scm

    r15941 r33417  
    66(module bshift-breset (;export
    77  ;;
    8   (%breset *%breset) (%bshift *%bshift)
     8  ;(%breset *%breset) (%bshift *%bshift)
    99  (breset *breset) (bshift *bshift)
    10   (%breset-values *%breset-values) (%bshift-values *%bshift-values)
     10  ;(%breset-values *%breset-values) (%bshift-values *%bshift-values)
    1111  (breset-values *breset-values) (bshift-values *bshift-values)
    1212  ;;
    13   *%breset *%bshift
     13  ;*%breset *%bshift
    1414  *breset *bshift
    15   *%breset-values *%bshift-values
     15  ;*%breset-values *%bshift-values
    1616  *breset-values *bshift-values
    1717  ;;
     
    2424  (require-library miscmacros box)
    2525
     26#; ;REMOVED
    2627(define-syntax %breset
    2728  (syntax-rules ()
    2829    ((_ RC BODY ...) (*%breset (lambda (RC) BODY ...) 'RC) ) ) )
    2930
     31#; ;REMOVED
    3032(define-syntax %bshift
    3133  (syntax-rules ()
     
    4042    ((_ RC SP BODY ...) (*bshift RC (lambda (SP) BODY ...) 'RC) ) ) )
    4143
     44#; ;REMOVED
    4245(define-syntax %breset-values
    4346  (syntax-rules ()
    4447    ((_ RC BODY ...) (*%breset-values (lambda (RC) BODY ...) 'RC) ) ) )
    4548
     49#; ;REMOVED
    4650(define-syntax %bshift-values
    4751  (syntax-rules ()
     
    6064;;
    6165
     66#; ;REMOVED
    6267(define-syntax let/scc
    6368  (syntax-rules ()
    6469    ((_ K BODY ...) (##sys#call-with-current-continuation (lambda (K) BODY ...)) ) ) )
    6570
     71#; ;REMOVED
    6672(define-syntax let/cdc
    6773  (syntax-rules ()
     
    8894;;
    8995
     96#; ;REMOVED
    9097(define-syntax *%breturn
    9198        (syntax-rules ()
     
    97104                (##sys#direct-return rc-k val) ) ) ) ) ) ) )
    98105
     106#; ;REMOVED
    99107(define (*%breset proc rc-sym)
    100108  (let/cdc rc-k
    101109    (let ((rc (make-box rc-k)))
    102       (*%breturn rc (proc rc) rc-sym '%breset) ) ) )
    103 
     110      (*%breturn rc (proc rc) rc-sym '%breset) ) ) )
     111
     112#; ;REMOVED
    104113(define (*%bshift rc proc rc-sym)
    105114  (let/cdc s-k
     
    154163;;
    155164
     165#; ;REMOVED
    156166(define-syntax *%breturn-values
    157167        (syntax-rules ()
     
    166176                    (apply rc-k vals)))))) ) ) ) )
    167177
     178#; ;REMOVED
    168179(define (*%breset-values proc rc-sym)
    169180  (let/scc rc-k
     
    171182      (*%breturn-values rc (proc rc) rc-sym '%breset-values) ) ) )
    172183
     184#; ;REMOVED
    173185(define (*%bshift-values rc proc rc-sym)
    174186  (let/scc s-k
  • release/4/F-operator/trunk/range.scm

    r15941 r33417  
    88  (range-empty? $range-empty-tag)
    99  (range $range-empty-tag)
    10   (%range $range-empty-tag)
     10  ;(%range $range-empty-tag)
    1111  ;;
    12   (%bshift *%bshift)
     12  ;(%bshift *%bshift)
    1313  (bshift *bshift))
    1414
     
    4242      (range RC FROM 1 TO)) ) )
    4343
     44#; ;REMOVED
    4445(define-syntax %range
    4546  (syntax-rules ()
  • release/4/F-operator/trunk/reflect-reify.scm

    r16205 r33417  
    77  ;;
    88  define-bind define-unit
    9   reflect reflect-values %reflect
    10   reify reify-values %reify
     9  reflect reify
     10  reflect-values reify-values
     11  ;%reflect %reify
    1112  ;;
    1213  shift reset)
     
    5960          `(,_shift-values k (,(bind-identifier kind) ,meaning k)) ) ) ) ) )
    6061
     62#; ;REMOVED
    6163(define-syntax %reflect
    6264  (er-macro-transformer
     
    8688          `(,_reset-values (,(unit-identifier kind) ,expr)) ) ) ) ) )
    8789
     90#; ;REMOVED
    8891(define-syntax %reify
    8992  (er-macro-transformer
  • release/4/F-operator/trunk/shift-reset.scm

    r15941 r33417  
    66(module shift-reset (;export
    77  ;;
    8   (%reset *%reset) (%shift *%shift)
     8  ;(%reset *%reset) (%shift *%shift)
    99  (reset *reset) (shift *shift)
    10   (%reset-values *%reset-values) (%shift-values *%shift-values)
     10  ;(%reset-values *%reset-values) (%shift-values *%shift-values)
    1111  (reset-values *reset-values) (shift-values *shift-values)
    1212  ;;
    13   *%reset *%shift
     13  ;*%reset *%shift
    1414  *reset *shift
    15   *%reset-values *%shift-values
     15  ;*%reset-values *%shift-values
    1616  *reset-values *shift-values)
    1717
     
    2929                        *meta-kv*))
    3030
     31#; ;REMOVED
    3132(define-syntax %reset
    3233  (syntax-rules ()
    3334    ((_ BODY ...) (*%reset (lambda () BODY ...)) ) ) )
    3435
     36#; ;REMOVED
    3537(define-syntax %shift
    3638  (syntax-rules ()
     
    4547    ((_ SP BODY ...) (*shift (lambda (SP) BODY ...)) ) ) )
    4648
     49#; ;REMOVED
    4750(define-syntax %reset-values
    4851  (syntax-rules ()
    4952    ((_ BODY ...) (*%reset-values (lambda () BODY ...)) ) ) )
    5053
     54#; ;REMOVED
    5155(define-syntax %shift-values
    5256  (syntax-rules ()
     
    6569;;
    6670
     71#; ;REMOVED
    6772(define-syntax let/scc
    6873  (syntax-rules ()
    6974    ((_ K BODY ...) (##sys#call-with-current-continuation (lambda (K) BODY ...)) ) ) )
    7075
     76#; ;REMOVED
    7177(define-syntax let/cdc
    7278  (syntax-rules ()
     
    8793;;
    8894
     95#; ;REMOVED
    8996(define *meta-dk* (lambda (val) (bad-k '%shift '%reset)))
    9097
     98#; ;REMOVED
    9199(define (*%return EXPR) (##sys#direct-return *meta-dk* EXPR))
    92100
     101#; ;REMOVED
    93102(define (*%reset thunk)
    94103  (let ((meta-dk *meta-dk*))
     
    99108      val) ) )
    100109
     110#; ;REMOVED
    101111(define (*%shift proc)
    102112  (let/cdc k
     
    135145;;
    136146
     147#; ;REMOVED
    137148(define *meta-dkv* (lambda vals (bad-k '%shift-values '%reset-values)))
    138149
     150#; ;REMOVED
    139151(define-syntax *%return-values
    140152  (syntax-rules ()
     
    144156        (lambda vals (apply *meta-dkv* vals))) ) ) )
    145157
     158#; ;REMOVED
    146159(define (*%reset-values thunk)
    147160  (let ((meta-dkv *meta-dkv*))
     
    155168        (apply values vals))) ) )
    156169
     170#; ;REMOVED
    157171(define (*%shift-values proc)
    158172  (let/scc k
  • release/4/F-operator/trunk/tests/run.scm

    r26757 r33417  
    5555(test-group "Shift/Reset Family"
    5656
     57  #; ;REMOVED
    5758  (test-group "%shift/%reset"
    5859
     
    107108  )
    108109
     110  #; ;REMOVED
    109111  (test-group "%shift-values/%reset-values"
    110112
     
    173175  )
    174176
     177  #; ;REMOVED
    175178  (test-group "%bshift/%breset"
    176179
     
    335338  )
    336339
     340  #; ;REMOVED
    337341  (test-group "%bshift-values/%breset-values"
    338342
Note: See TracChangeset for help on using the changeset viewer.