Fixed linking bug

svn: r4532
This commit is contained in:
Ryan Culpepper 2006-10-09 15:38:20 +00:00
parent 7e9cb94ce3
commit a930138643
3 changed files with 24 additions and 20 deletions

View File

@ -23,17 +23,9 @@
(define stepper@ (define stepper@
(compound-unit/sig (compound-unit/sig
(import) (import)
(link [PREFS : view:prefs^ (view:prefs@)] (link [BASE : view:view-base^ (view-base/tool@)]
[SBKEYMAP : sb:keymap^ (sb:keymap@)] [STEPPER : view:view^ (view:pre-stepper@ BASE)])
[SBMENU : sb:context-menu^ (sb:context-menu@ SBSNIP)] (export (open STEPPER))))
[SBSNIP : sb:snip^ (sb:global-snip@)]
[SBWMENU : sb:context-menu^ (sb:widget-context-menu-extension@ SBMENU)]
[VMENU : sb:context-menu^ (view:context-menu-extension@ SBWMENU)]
[SBWIDGET : sb:widget^ (sb:widget@ SBKEYMAP SBWMENU)]
[VWIDGET : sb:widget^ (view:browser-extension@ SBWIDGET VMENU)]
[BASE : view:view-base^ (view-base/tool@)]
[VIEW : view:view^ (view:view@ PREFS BASE VWIDGET)])
(export (open VIEW))))
#;(define stepper@ #;(define stepper@
(compound-unit/sig (compound-unit/sig

View File

@ -7,10 +7,10 @@
(lib "framework.ss" "framework") (lib "framework.ss" "framework")
(lib "boundmap.ss" "syntax") (lib "boundmap.ss" "syntax")
"interfaces.ss" "interfaces.ss"
"prefs.ss"
"warning.ss" "warning.ss"
"hiding-panel.ss" "hiding-panel.ss"
(prefix sb: "../syntax-browser/embed.ss") (prefix sb: "../syntax-browser/embed.ss")
"../syntax-browser/util.ss"
"../model/deriv-util.ss" "../model/deriv-util.ss"
"../model/trace.ss" "../model/trace.ss"
"../model/hide.ss" "../model/hide.ss"
@ -20,6 +20,7 @@
"util.ss") "util.ss")
(provide catch-errors? (provide catch-errors?
pre-stepper@
view@ view@
context-menu-extension@ context-menu-extension@
browser-extension@) browser-extension@)
@ -575,4 +576,20 @@
(widget this) (widget this)
(macro-stepper macro-stepper))) (macro-stepper macro-stepper)))
(super-new))))) (super-new)))))
(define pre-stepper@
(compound-unit/sig
(import [BASE : view-base^])
(link [PREFS : prefs^ (prefs@)]
[SBKEYMAP : sb:keymap^ (sb:keymap@)]
[SBMENU : sb:context-menu^ (sb:context-menu@ SBSNIP)]
[SBSNIP : sb:snip^ (sb:global-snip@)]
[SBWMENU : sb:context-menu^ (sb:widget-context-menu-extension@ SBMENU)]
[VMENU : sb:context-menu^ (context-menu-extension@ SBWMENU)]
[SBWIDGET : sb:widget^ (sb:widget@ SBKEYMAP SBWMENU)]
[VWIDGET : sb:widget^ (browser-extension@ SBWIDGET VMENU)]
[VIEW : view^ (view@ PREFS BASE VWIDGET)])
(export (open VIEW))))
) )

View File

@ -1,12 +1,9 @@
(module view mzscheme (module view mzscheme
(require (lib "unitsig.ss") (require (lib "unitsig.ss")
(lib "class.ss")
(lib "mred.ss" "mred") (lib "mred.ss" "mred")
(lib "framework.ss" "framework") (lib "framework.ss" "framework")
(prefix sb: "../syntax-browser/embed.ss")
"interfaces.ss" "interfaces.ss"
"prefs.ss"
"gui.ss") "gui.ss")
(provide (all-defined)) (provide (all-defined))
@ -19,9 +16,7 @@
(define-values/invoke-unit/sig view^ (define-values/invoke-unit/sig view^
(compound-unit/sig (compound-unit/sig
(import) (import)
(link (PREFS : prefs^ (prefs@)) (link [BASE : view-base^ (view-base@)]
(SB : sb:implementation^ (sb:implementation@)) [STEPPER : view^ (pre-stepper@ BASE)])
(BASE : view-base^ (view-base@)) (export (open STEPPER))))
(VIEW : view^ (view@ BASE SB)))
(export (open VIEW))))
) )