From 8d82aa005649e63b9bdb820abc9dcce1a88da18f Mon Sep 17 00:00:00 2001 From: Greg Cooper Date: Fri, 12 Aug 2005 16:07:40 +0000 Subject: [PATCH] - changes to support integration with texpict and slideshow svn: r587 --- collects/frtime/animation.ss | 1 + collects/frtime/frtime.ss | 2 +- collects/frtime/lang-ext.ss | 7 +------ collects/frtime/mzscheme-utils.ss | 28 ++++++++++++++++++++++++++-- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/collects/frtime/animation.ss b/collects/frtime/animation.ss index 9b6c28ffa5..83a9c84179 100644 --- a/collects/frtime/animation.ss +++ b/collects/frtime/animation.ss @@ -3,6 +3,7 @@ (require (all-except "graphics.ss" make-posn posn-x posn-y make-rgb) (lifted "graphics.ss" posn-x posn-y make-posn make-rgb) (lib "match.ss") + (as-is:unchecked (lib "lang-ext.ss" "frtime") lift) (lib "class.ss") (lib "list.ss" "frtime") (lib "etc.ss" "frtime") diff --git a/collects/frtime/frtime.ss b/collects/frtime/frtime.ss index 666141272c..836c82e4ca 100644 --- a/collects/frtime/frtime.ss +++ b/collects/frtime/frtime.ss @@ -16,6 +16,6 @@ (provide value-nowable? behaviorof (all-from (lib "mzscheme-utils.ss" "frtime")) - (all-from (lib "lang-ext.ss" "frtime")) + (all-from-except (lib "lang-ext.ss" "frtime") lift) (all-from (lib "frp-snip.ss" "frtime")) (all-from (lib "ft-qq.ss" "frtime")))) diff --git a/collects/frtime/lang-ext.ss b/collects/frtime/lang-ext.ss index 7b5b9397f4..d22816bf69 100644 --- a/collects/frtime/lang-ext.ss +++ b/collects/frtime/lang-ext.ss @@ -670,12 +670,7 @@ (exceptions . ==> . (lambda (p) (when (value-now raise-exceptions) (thread (lambda () (raise (car p)))))))) - - - - - - + diff --git a/collects/frtime/mzscheme-utils.ss b/collects/frtime/mzscheme-utils.ss index 35d8156724..747c805c44 100644 --- a/collects/frtime/mzscheme-utils.ss +++ b/collects/frtime/mzscheme-utils.ss @@ -40,9 +40,20 @@ (rename (lib "frp-core.ss" "frtime") super-lift super-lift) (rename (lib "frp-core.ss" "frtime") behavior? behavior?) (rename (lib "lang-ext.ss" "frtime") undefined undefined) - (rename (lib "lang-ext.ss" "frtime") undefined? undefined?)) + (rename (lib "lang-ext.ss" "frtime") undefined? undefined?) + (lib "class.ss")) + (define-syntax (lifted-send stx) + (syntax-case stx () + [(_ obj meth arg ...) + (with-syntax ([(obj-tmp) (generate-temporaries '(obj))] + [(arg-tmp ...) (generate-temporaries (syntax->list +#'(arg ...)))]) + #'(lift #t + (lambda (obj-tmp arg-tmp ...) + (send obj-tmp meth arg-tmp ...)) + obj arg ...))])) (define (list-ref lst idx) @@ -305,7 +316,7 @@ ;length seconds->date expand syntax-object->datum exn-message continuation-mark-set->list exn-continuation-marks - exn:fail? + exn:fail? regexp-match list->vector make-vector) (rename eq? mzscheme:eq?) @@ -342,6 +353,19 @@ syntax let/ec with-handlers + unsyntax + current-security-guard + make-security-guard + dynamic-require + path->complete-path + string->path + split-path + current-directory + exit + system-type + lifted-send + unsyntax-splicing + delay force random