suzanne.soy/typed-racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only show OC button in DrR when the tool is actually loaded.

Browse Source 
Closes PR13344.
This commit is contained in:
Vincent St-Amour 2015-12-18 15:58:40 -06:00
parent 519dfb6fdc
commit f9e3418d8a
7 changed files with 34 additions and 31 deletions
typed-racket-compatibility
typed-scheme/lang
reader.rkt
typed/scheme
base/lang
reader.rkt
lang
reader.rkt
typed-racket-lib
typed-racket/private
oc-button.rkt
typed/racket
base/lang
reader.rkt
lang
reader.rkt
typed-racket-more/typed/racket
gui.rkt

9
typed-racket-compatibility/typed-scheme/lang/reader.rkt
View File

@ -6,14 +6,11 @@ typed-scheme
#:read-syntax r:read-syntax
#:info make-info
(require (prefix-in r: typed-racket/typed-reader))
(require (prefix-in r: typed-racket/typed-reader)
typed-racket/private/oc-button)
(define (make-info key default use-default)
(case key
[(drscheme:toolbar-buttons)
;; If Optimization Coach is installed, load it.
(with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
(collection-path "optimization-coach")
(list (dynamic-require 'optimization-coach/tool
'optimization-coach-drracket-button)))]
(maybe-show-OC)]
[else (use-default key default)]))

8
typed-racket-compatibility/typed/scheme/base/lang/reader.rkt
View File

@ -7,14 +7,12 @@ typed/scheme/base
#:info make-info
#:language-info make-language-info
(require typed-racket/private/oc-button)
(define (make-info key default use-default)
(case key
[(drscheme:toolbar-buttons)
;; If Optimization Coach is installed, load it.
(with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
(collection-path "optimization-coach")
(list (dynamic-require 'optimization-coach/tool
'optimization-coach-drracket-button)))]
(maybe-show-OC)]
[else (use-default key default)]))
(define make-language-info

8
typed-racket-compatibility/typed/scheme/lang/reader.rkt
View File

@ -7,14 +7,12 @@ typed/scheme
#:info make-info
#:language-info make-language-info
(requie typed-racket/private/oc-button)
(define (make-info key default use-default)
(case key
[(drscheme:toolbar-buttons)
;; If Optimization Coach is installed, load it.
(with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
(collection-path "optimization-coach")
(list (dynamic-require 'optimization-coach/tool
'optimization-coach-drracket-button)))]
(maybe-show-OC)]
[else (use-default key default)]))
(define make-language-info

16
typed-racket-lib/typed-racket/private/oc-button.rkt Normal file
View File

@ -0,0 +1,16 @@
#lang racket/base
;; Control whether the OC button show up for TR files in DrR.
(provide maybe-show-OC)
(define (maybe-show-OC)
;; If Optimization Coach is installed, load it.
(with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
(collection-path "optimization-coach")
(if (dynamic-require 'optimization-coach/tool
'optimization-coach-loaded?)
;; OC is loaded, show button
(list (dynamic-require 'optimization-coach/tool
'optimization-coach-drracket-button))
'())))

8
typed-racket-lib/typed/racket/base/lang/reader.rkt
View File

@ -7,14 +7,12 @@ typed/racket/base
#:info make-info
#:language-info make-language-info
(require typed-racket/private/oc-button)
(define (make-info key default use-default)
(case key
[(drscheme:toolbar-buttons)
;; If Optimization Coach is installed, load it.
(with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
(collection-path "optimization-coach")
(list (dynamic-require 'optimization-coach/tool
'optimization-coach-drracket-button)))]
(maybe-show-OC)]
[else (use-default key default)]))
(define make-language-info

8
typed-racket-lib/typed/racket/lang/reader.rkt
View File

@ -7,14 +7,12 @@ typed/racket
#:info make-info
#:language-info make-language-info
(require typed-racket/private/oc-button)
(define (make-info key default use-default)
(case key
[(drscheme:toolbar-buttons)
;; If Optimization Coach is installed, load it.
(with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
(collection-path "optimization-coach")
(list (dynamic-require 'optimization-coach/tool
'optimization-coach-drracket-button)))]
(maybe-show-OC)]
[else (use-default key default)]))
(define make-language-info

8
typed-racket-more/typed/racket/gui.rkt
View File

@ -3,7 +3,8 @@
;; Defines a language analogous to #lang racket/gui but typed
(require "gui/base.rkt"
typed/racket)
typed/racket
typed-racket/private/oc-button)
(provide (all-from-out "gui/base.rkt")
(all-from-out typed/racket))
@ -20,10 +21,7 @@
(define (make-info key default use-default)
(case key
[(drscheme:toolbar-buttons)
(with-handlers ([exn:fail:filesystem? (lambda _ '())])
(collection-path "optimization-coach")
(list (dynamic-require 'optimization-coach/tool
'optimization-coach-drracket-button)))]
(maybe-show-OC)]
[else (use-default key default)]))
(require typed-racket/typed-reader))