From 415910fe80220aa9c1166421415d3eac95b7aa18 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sat, 25 Oct 2008 07:50:05 +0000 Subject: [PATCH 01/11] Welcome to a new PLT day. svn: r12124 --- collects/repos-time-stamp/stamp.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collects/repos-time-stamp/stamp.ss b/collects/repos-time-stamp/stamp.ss index 1b5ca406c8..bd29acb607 100644 --- a/collects/repos-time-stamp/stamp.ss +++ b/collects/repos-time-stamp/stamp.ss @@ -1 +1 @@ -#lang scheme/base (provide stamp) (define stamp "24oct2008") +#lang scheme/base (provide stamp) (define stamp "25oct2008") From 7fa7465280edb8e24f9de4569dd9472ccaddfaf8 Mon Sep 17 00:00:00 2001 From: Matthias Felleisen Date: Sat, 25 Oct 2008 14:31:58 +0000 Subject: [PATCH 02/11] nothing new to report for HISTORY svn: r12125 --- doc/release-notes/teachpack/HISTORY.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/release-notes/teachpack/HISTORY.txt b/doc/release-notes/teachpack/HISTORY.txt index e50f737849..9e267c9f5b 100644 --- a/doc/release-notes/teachpack/HISTORY.txt +++ b/doc/release-notes/teachpack/HISTORY.txt @@ -1,3 +1,8 @@ +------------------------------------------------------------------------ +Version 4.1.2 [Sat Oct 25 10:31:05 EDT 2008] + +nothing new to report + ------------------------------------------------------------------------ Version 4.1.1 [Tue Sep 30 10:17:26 EDT 2008] From 4ae0c12a1e174000a5487b60573fc033fd049677 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 25 Oct 2008 17:41:00 +0000 Subject: [PATCH 03/11] fix self-reference on an order-finalized object (Windows) svn: r12126 --- src/wxwindow/src/msw/wx_win.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wxwindow/src/msw/wx_win.cxx b/src/wxwindow/src/msw/wx_win.cxx index 87b92d0f07..1e24582585 100644 --- a/src/wxwindow/src/msw/wx_win.cxx +++ b/src/wxwindow/src/msw/wx_win.cxx @@ -172,6 +172,8 @@ wxWindow::wxWindow(void) winEnabled = TRUE; focusWindow = NULL; + + WXGC_IGNORE(this, focusWindow); // can be a self pointer in a frame } // Destructor From f902850a52187103f3bcf55875feb2f2ce1573f4 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 25 Oct 2008 17:42:15 +0000 Subject: [PATCH 04/11] adjust 3m backtrace build to work under Windows svn: r12127 --- src/mzscheme/gc2/newgc.c | 2 +- src/mzscheme/src/salloc.c | 4 ++-- src/worksp/gc2/make.ss | 12 +++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/mzscheme/gc2/newgc.c b/src/mzscheme/gc2/newgc.c index 853f295e1c..95301fbbac 100644 --- a/src/mzscheme/gc2/newgc.c +++ b/src/mzscheme/gc2/newgc.c @@ -943,7 +943,7 @@ static void *get_backtrace(struct mpage *page, void *ptr) unsigned long delta; if (page->big_page) - ptr = PTR(page->addr + PREFIX_SIZE + WORD_SIZE); + ptr = PTR((char *)page->addr + PREFIX_SIZE + WORD_SIZE); delta = PPTR(ptr) - PPTR(page->addr); return page->backtrace[delta - 1]; diff --git a/src/mzscheme/src/salloc.c b/src/mzscheme/src/salloc.c index 1f17ee6399..07691b4b63 100644 --- a/src/mzscheme/src/salloc.c +++ b/src/mzscheme/src/salloc.c @@ -1462,7 +1462,7 @@ static void cons_onto_list(void *p) # ifdef MZ_PRECISE_GC START_XFORM_SKIP; # ifdef DOS_FILE_SYSTEM -extern void gc_fprintf(int ignored, const char *c, ...); +extern void gc_fprintf(FILE *ignored, const char *c, ...); # define object_console_printf gc_fprintf # endif # endif @@ -2039,7 +2039,7 @@ Scheme_Object *scheme_dump_gc_stats(int c, Scheme_Object *p[]) var_stack = (void **)t->jmpup_buf.gc_var_stack; delta = (long)t->jmpup_buf.stack_copy - (long)t->jmpup_buf.stack_from; /* FIXME: stack direction */ - limit = (void *)t->jmpup_buf.stack_copy + t->jmpup_buf.stack_size; + limit = (char *)t->jmpup_buf.stack_copy + t->jmpup_buf.stack_size; } GC_dump_variable_stack(var_stack, delta, limit, NULL, scheme_get_type_name, diff --git a/src/worksp/gc2/make.ss b/src/worksp/gc2/make.ss index f7635ae83d..6d271ce1bb 100644 --- a/src/worksp/gc2/make.ss +++ b/src/worksp/gc2/make.ss @@ -11,6 +11,7 @@ (system s)) (define accounting-gc? #t) +(define backtrace-gc? #f) (define opt-flags "/O2 /Oy-") (define re:only #f) @@ -169,6 +170,9 @@ (string-append "/D LIBMZ_EXPORTS " (if accounting-gc? "/D NEWGC_BTC_ACCOUNT " + "") + (if backtrace-gc? + "/D MZ_GC_BACKTRACE " "")) "mz.pch" #f)) @@ -214,6 +218,9 @@ (if accounting-gc? "/D NEWGC_BTC_ACCOUNT " "/D USE_COMPACT_3M_GC ") + (if backtrace-gc? + "/D MZ_GC_BACKTRACE " + "") mz-inc)) (c-compile "../../mzscheme/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc) @@ -323,7 +330,10 @@ wx-inc (and use-precomp? "xsrc/wxprecomp.h") "-DGC2_JUST_MACROS /FI../../../mzscheme/gc2/gc2.h" - "-DGC2_AS_IMPORT" + (string-append "-DGC2_AS_IMPORT" + (if backtrace-gc? + " /D MZ_GC_BACKTRACE" + "")) "wx.pch" indirect?))) From e7aef55f745a355d4eb751faf94a8b3f8e99a066 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sat, 25 Oct 2008 20:35:09 +0000 Subject: [PATCH 05/11] fixed up some of the platform inconsistencies svn: r12129 --- .../tests/drscheme/module-lang-test-utils.ss | 28 +++++++++++++------ collects/tests/drscheme/module-lang-test.ss | 12 ++++---- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/collects/tests/drscheme/module-lang-test-utils.ss b/collects/tests/drscheme/module-lang-test-utils.ss index 6f24908dc1..3fd5c12c65 100644 --- a/collects/tests/drscheme/module-lang-test-utils.ss +++ b/collects/tests/drscheme/module-lang-test-utils.ss @@ -12,32 +12,39 @@ interactions ; (union #f string) result ; string all? ; boolean (#t => compare all of the text between the 3rd and n-1-st line) - error-ranges) ; (or/c 'dont-test + error-ranges ; (or/c 'dont-test ; (-> (is-a?/c text) ; (is-a?/c text) ; (or/c #f (listof ...)))) ; fn => called with defs & ints, result must match get-error-ranges method's result - + line) ; number or #f: the line number of the test case + #:omit-define-syntaxes) (define in-here (let ([here (this-expression-source-directory)]) - (lambda (file) (path->string (build-path here file))))) + (lambda (file) (format "~s" (path->string (build-path here file)))))) (define tests '()) -(define (test definitions interactions results [all? #f] #:error-ranges [error-ranges 'dont-test]) +(define-syntax (test stx) + (syntax-case stx () + [(_ args ...) + (with-syntax ([line (syntax-line stx)]) + #'(test/proc line args ...))])) +(define (test/proc line definitions interactions results [all? #f] #:error-ranges [error-ranges 'dont-test]) (set! tests (cons (make-test (if (string? definitions) definitions (format "~s" definitions)) interactions results all? - error-ranges) + error-ranges + line) tests))) (define temp-files '()) (define (write-test-modules* name code) - (let ([file (in-here (format "~a.ss" name))]) + (let ([file (build-path (this-expression-source-directory) (format "~a.ss" name))]) (set! temp-files (cons file temp-files)) (with-output-to-file file #:exists 'truncate (lambda () (printf "~s\n" code))))) @@ -65,7 +72,8 @@ (send interactions-text paragraph-start-position 2) (send interactions-text paragraph-end-position 2))]) (unless (or (test-all? test) (string=? "> " after-execute-output)) - (printf "FAILED: ~a\n ~a\n expected no output after execution, got: ~s\n" + (printf "FAILED (line ~a): ~a\n ~a\n expected no output after execution, got: ~s\n" + (test-line test) (test-definitions test) (or (test-interactions test) 'no-interactions) after-execute-output) @@ -96,7 +104,8 @@ [else 'module-lang-test "bad test value: ~e" r]) r text))]) (unless output-passed? - (printf "FAILED: ~a\n ~a\n expected: ~s\n got: ~s\n" + (printf "FAILED (line ~a): ~a\n ~a\n expected: ~s\n got: ~s\n" + (test-line test) (test-definitions test) (or (test-interactions test) 'no-interactions) (test-result test) @@ -108,7 +117,8 @@ (let ([error-ranges-expected ((test-error-ranges test) definitions-text interactions-text)]) (unless (equal? error-ranges-expected (send interactions-text get-error-ranges)) - (printf "FAILED (ranges): ~a\n expected: ~s\n got: ~s\n" + (printf "FAILED (line ~a; ranges): ~a\n expected: ~s\n got: ~s\n" + (test-line test) (test-definitions test) error-ranges-expected (send interactions-text get-error-ranges))))]))))) diff --git a/collects/tests/drscheme/module-lang-test.ss b/collects/tests/drscheme/module-lang-test.ss index 3925b69dbf..ba0db50f6f 100644 --- a/collects/tests/drscheme/module-lang-test.ss +++ b/collects/tests/drscheme/module-lang-test.ss @@ -98,11 +98,11 @@ (require (prefix x: (lib "list.ss")) (lib "list.ss")))} @t{x:foldl} #rx"foldl>") -(test @t{(module m (file "@in-here{module-lang-test-tmp1.ss}") x)} +(test @t{(module m (file @in-here{module-lang-test-tmp1.ss}) x)} @t{x} "1") ;; + shouldn't be bound in the REPL because it isn't bound in the module. -(test @t{(module m (file "@in-here{module-lang-test-tmp1.ss}") x)} +(test @t{(module m (file @in-here{module-lang-test-tmp1.ss}) x)} @t{+} ". . reference to an identifier before its definition: +") (test @t{(module m mzscheme (provide lambda))} @@ -138,7 +138,7 @@ @t{a} "78") (test @t{(module m mzscheme - (require-for-syntax (file "@in-here{module-lang-test-tmp2.ss}")) + (require-for-syntax (file @in-here{module-lang-test-tmp2.ss})) (provide s) (define-syntax (s stx) e))} @t{(require m) s} @@ -160,7 +160,7 @@ #f @rx{. compile: bad syntax; reference to top-level identifier is not allowed, because no #%top syntax transformer is bound in: cons}) -(test @t{(module m (file "@in-here{module-lang-test-tmp1.ss}") 1 2 3)} +(test @t{(module m (file @in-here{module-lang-test-tmp1.ss}) 1 2 3)} @t{1} ;; just make sure no errors. "1") @@ -195,7 +195,7 @@ Interactions disabled: does not support a REPL \(no #%top-interaction\)} #t) -(test @t{(module xx (file "@in-here{module-lang-test-tmp4.ss}") +(test @t{(module xx (file @in-here{module-lang-test-tmp4.ss}) (define x 1) (* x 123))} #f @@ -205,7 +205,7 @@ does not support a REPL \(no #%top-interaction\) } #t) -(test @t{(module xx (file "@in-here{this-file-does-not-exist}") +(test @t{(module xx (file @in-here{this-file-does-not-exist}) (define x 1) (* x 123))} #f From 38aac549e60fa6da5f11f7e29904cb9d2889f6b7 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 26 Oct 2008 18:41:16 +0000 Subject: [PATCH 06/11] release-ote updates for 4.1.2 svn: r12131 --- doc/release-notes/mred/HISTORY.txt | 2 +- doc/release-notes/mzscheme/HISTORY.txt | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/release-notes/mred/HISTORY.txt b/doc/release-notes/mred/HISTORY.txt index 7e0ec1b3d1..6b682db1ab 100644 --- a/doc/release-notes/mred/HISTORY.txt +++ b/doc/release-notes/mred/HISTORY.txt @@ -1,4 +1,4 @@ -Version 4.1.1.1 +Version 4.1.2, October 2008 Changed -z/--text-repl to a configuration option diff --git a/doc/release-notes/mzscheme/HISTORY.txt b/doc/release-notes/mzscheme/HISTORY.txt index d6feea1e7f..54e103bb4d 100644 --- a/doc/release-notes/mzscheme/HISTORY.txt +++ b/doc/release-notes/mzscheme/HISTORY.txt @@ -1,14 +1,10 @@ -Version 4.1.1.3 +Version 4.1.2, October 2008 Changed binding of identifiers introduced by unit signatures to take into account the signature use's context Added make-syntax-delta-introducer Changed continuation-marks to accept a thread argument - -Version 4.1.1.2 Added eqv-based hash tables Added hash-update and hash-update! - -Version 4.1.1.1 Changed -X and -S to complete directory relative to pwd, and changed -S to add after main collects From e7b71e0a085391ec5461a1a44edd3044fccb6bde Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 26 Oct 2008 18:42:45 +0000 Subject: [PATCH 07/11] release-note updates for 4.1.2.1 svn: r12132 --- doc/release-notes/mzscheme/HISTORY.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/release-notes/mzscheme/HISTORY.txt b/doc/release-notes/mzscheme/HISTORY.txt index 54e103bb4d..d91f99babd 100644 --- a/doc/release-notes/mzscheme/HISTORY.txt +++ b/doc/release-notes/mzscheme/HISTORY.txt @@ -1,3 +1,6 @@ +Version 4.1.2.1 +Extended continuation-marks to work on a thread argument + Version 4.1.2, October 2008 Changed binding of identifiers introduced by unit signatures to take into account the signature use's context From c8dbc9b7987d7b2466f32afa31503a736b375af8 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Sun, 26 Oct 2008 23:03:53 +0000 Subject: [PATCH 08/11] macro stepper: tidied up menus svn: r12133 --- collects/macro-debugger/view/frame.ss | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/collects/macro-debugger/view/frame.ss b/collects/macro-debugger/view/frame.ss index c5fce76621..7c4b95e43a 100644 --- a/collects/macro-debugger/view/frame.ss +++ b/collects/macro-debugger/view/frame.ss @@ -200,6 +200,31 @@ "(Debug) Catch internal errors?" (get-field debug-catch-errors? config))) + ;; fixup-menu : menu -> void + ;; Delete separators at beginning/end and duplicates in middle + (define/private (fixup-menu menu) + (define items + (filter (lambda (i) (not (send i is-deleted?))) + (send menu get-items))) + (define (delete-seps-loop items) + (if (and (pair? items) (is-a? (car items) separator-menu-item%)) + (begin (send (car items) delete) + (delete-seps-loop (cdr items))) + items)) + (define (middle-loop items) + (cond + [(and (pair? items) (is-a? (car items) separator-menu-item%)) + (middle-loop (delete-seps-loop (cdr items)))] + [(pair? items) + (middle-loop (cdr items))] + [else null])) + (middle-loop (delete-seps-loop items)) + (delete-seps-loop (reverse items)) + (void)) + + (for ([menu (send (get-menu-bar) get-items)]) + (fixup-menu menu)) + (frame:remove-empty-menus this) (frame:reorder-menus this))) ;; Stolen from stepper From 706a175e07174b9290d0f781802859933e7e9e91 Mon Sep 17 00:00:00 2001 From: John Clements Date: Sun, 26 Oct 2008 23:38:09 +0000 Subject: [PATCH 09/11] updated history svn: r12134 --- doc/release-notes/stepper/HISTORY.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/release-notes/stepper/HISTORY.txt b/doc/release-notes/stepper/HISTORY.txt index 6fd01607ee..b80dff5077 100644 --- a/doc/release-notes/stepper/HISTORY.txt +++ b/doc/release-notes/stepper/HISTORY.txt @@ -1,6 +1,10 @@ Stepper ------- +Changes for v4.1.2: + +None. + Changes for v4.1.1: Check-expect now reduces to a boolean in the stepper. Also, this history file From 6be0f8f4dfdbd92cf3c057ffa1bcac9ef09e1aa6 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 27 Oct 2008 13:06:01 +0000 Subject: [PATCH 10/11] put search-box input inside form in Scribbled HTML svn: r12137 --- collects/scribble/html-render.ss | 34 +++++++++++++++++--------------- collects/scribble/scribble.css | 6 ++++++ 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/collects/scribble/html-render.ss b/collects/scribble/html-render.ss index 04fcd0aaae..92352f26af 100644 --- a/collects/scribble/html-render.ss +++ b/collects/scribble/html-render.ss @@ -191,7 +191,7 @@ (define search-field @`p{Search: @(input ([type "text"] [id "search_box"] [onchange "delayed_search(this.value,event);"] - [onkeyup "delayed_search(this.value,event);"]))}) + [onkeyup "delayed_search(this.value,event);"])))}) ) @@ -199,21 +199,23 @@ (let ([sa string-append] [emptylabel "...search manuals..."] [dimcolor "#888"]) - `(input - ([class "searchbox"] - [style ,(sa "color: "dimcolor";")] - [type "text"] - [value ,emptylabel] - [title "Enter a search string to search the manuals"] - [onkeypress ,(format "return DoSearchKey(event, this, ~s, ~s);" - (version) top-path)] - [onfocus ,(sa "this.style.color=\"black\"; " - "this.style.textAlign=\"left\"; " - "if (this.value == \""emptylabel"\") this.value=\"\";")] - [onblur ,(sa "if (this.value.match(/^ *$/)) {" - " this.style.color=\""dimcolor"\";" - " this.style.textAlign=\"center\";" - " this.value=\""emptylabel"\"; }")])))) + `(form + ([class "searchform"]) + (input + ([class "searchbox"] + [style ,(sa "color: "dimcolor";")] + [type "text"] + [value ,emptylabel] + [title "Enter a search string to search the manuals"] + [onkeypress ,(format "return DoSearchKey(event, this, ~s, ~s);" + (version) top-path)] + [onfocus ,(sa "this.style.color=\"black\"; " + "this.style.textAlign=\"left\"; " + "if (this.value == \""emptylabel"\") this.value=\"\";")] + [onblur ,(sa "if (this.value.match(/^ *$/)) {" + " this.style.color=\""dimcolor"\";" + " this.style.textAlign=\"center\";" + " this.value=\""emptylabel"\"; }")]))))) (define search-box (make-search-box "../")) (define top-search-box (make-search-box "")) diff --git a/collects/scribble/scribble.css b/collects/scribble/scribble.css index 9e8d516ce9..9e106afdab 100644 --- a/collects/scribble/scribble.css +++ b/collects/scribble/scribble.css @@ -101,6 +101,12 @@ table td { color: #e0e0e0; } +.searchform { + display: inline; + margin: 0; + padding: 0; +} + .searchbox { width: 16em; margin: 0px; From 7d72dc43c4ea5159d183f0512c6ce81a8f5181e1 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Mon, 27 Oct 2008 13:37:47 +0000 Subject: [PATCH 11/11] fix typo; layout svn: r12138 --- collects/scribble/html-render.ss | 35 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/collects/scribble/html-render.ss b/collects/scribble/html-render.ss index 92352f26af..756ec4a170 100644 --- a/collects/scribble/html-render.ss +++ b/collects/scribble/html-render.ss @@ -191,7 +191,7 @@ (define search-field @`p{Search: @(input ([type "text"] [id "search_box"] [onchange "delayed_search(this.value,event);"] - [onkeyup "delayed_search(this.value,event);"])))}) + [onkeyup "delayed_search(this.value,event);"]))}) ) @@ -199,23 +199,22 @@ (let ([sa string-append] [emptylabel "...search manuals..."] [dimcolor "#888"]) - `(form - ([class "searchform"]) - (input - ([class "searchbox"] - [style ,(sa "color: "dimcolor";")] - [type "text"] - [value ,emptylabel] - [title "Enter a search string to search the manuals"] - [onkeypress ,(format "return DoSearchKey(event, this, ~s, ~s);" - (version) top-path)] - [onfocus ,(sa "this.style.color=\"black\"; " - "this.style.textAlign=\"left\"; " - "if (this.value == \""emptylabel"\") this.value=\"\";")] - [onblur ,(sa "if (this.value.match(/^ *$/)) {" - " this.style.color=\""dimcolor"\";" - " this.style.textAlign=\"center\";" - " this.value=\""emptylabel"\"; }")]))))) + `(form ([class "searchform"]) + (input + ([class "searchbox"] + [style ,(sa "color: "dimcolor";")] + [type "text"] + [value ,emptylabel] + [title "Enter a search string to search the manuals"] + [onkeypress ,(format "return DoSearchKey(event, this, ~s, ~s);" + (version) top-path)] + [onfocus ,(sa "this.style.color=\"black\"; " + "this.style.textAlign=\"left\"; " + "if (this.value == \""emptylabel"\") this.value=\"\";")] + [onblur ,(sa "if (this.value.match(/^ *$/)) {" + " this.style.color=\""dimcolor"\";" + " this.style.textAlign=\"center\";" + " this.value=\""emptylabel"\"; }")]))))) (define search-box (make-search-box "../")) (define top-search-box (make-search-box ""))