From 0be362e1122ccb8786b3afa3a5bda24b2156bc90 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Fri, 14 Aug 2015 16:08:26 -0400 Subject: [PATCH 1/3] Fix for new expander. --- sugar/test.rkt | 21 +++++++++++---------- sugar/test/main.rkt | 38 +++++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/sugar/test.rkt b/sugar/test.rkt index d8f1265..e98b52f 100644 --- a/sugar/test.rkt +++ b/sugar/test.rkt @@ -7,15 +7,16 @@ (define-syntax (module-test-external stx) (syntax-case stx () [(_ expr ...) - (with-syntax ([mod-name (generate-temporary)]) - #'(begin - (module* mod-name racket/base - (require (submod "..")) - (require rackunit) - expr ...) - (module+ test - (require (submod ".." mod-name)))))])) - + (let ([mod-name (syntax-e (generate-temporary))]) + (datum->syntax stx + `(begin + (module* ,mod-name racket/base + (require (submod "..")) + (require rackunit) + ,@(syntax->datum #'(expr ...))) + (module+ test + (require (submod ".." ,mod-name)))) + stx))])) (define-syntax (module-test-internal stx) (syntax-case stx () @@ -36,4 +37,4 @@ (let ([exprs (syntax->datum #'(expr ...))]) (datum->syntax stx `(begin (module-test-internal ,@exprs) - (module-test-external ,@exprs)) stx))])) \ No newline at end of file + (module-test-external ,@exprs)) stx))])) diff --git a/sugar/test/main.rkt b/sugar/test/main.rkt index 6f81805..1ee26b1 100644 --- a/sugar/test/main.rkt +++ b/sugar/test/main.rkt @@ -4,27 +4,31 @@ (define-syntax (eval-as-untyped stx) (syntax-case stx () [(_ exprs ...) - (with-syntax ([sym (generate-temporary)] - [sym2 (generate-temporary)]) - #'(begin - (module sym racket - (require rackunit "../main.rkt" net/url) - exprs ...) - (require 'sym) - (module sym2 racket - (require rackunit (submod "../main.rkt" safe) net/url) - exprs ...) - (require 'sym2)))])) + (let ([sym (generate-temporary)] + [sym2 (generate-temporary)]) + (datum->syntax + stx + `(begin + (module ,sym racket + (require rackunit "../main.rkt" net/url) + ,@(syntax->datum #'(exprs ...))) + (require ',sym) + (module ,sym2 racket + (require rackunit (submod "../main.rkt" safe) net/url) + ,@(syntax->datum #'(exprs ...))) + (require ',sym2))))])) (define-syntax (eval-as-typed stx) (syntax-case stx () [(_ exprs ...) - (with-syntax ([sym (generate-temporary)]) - #'(begin - (module sym typed/racket - (require typed/rackunit "../../typed/sugar.rkt" typed/net/url) - exprs ...) - (require 'sym)))])) + (let ([sym (syntax-e (generate-temporary))]) + (datum->syntax stx + `(begin + (module ,sym typed/racket + (require typed/rackunit "../../typed/sugar.rkt" typed/net/url) + ,@(syntax->datum #'(exprs ...))) + (require ',sym)) + stx))])) (define-syntax-rule (eval-as-typed-and-untyped exprs ...) (begin From 07e98cd6a9d2a3059a87ee348e729d61b10395c8 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Fri, 14 Aug 2015 17:34:48 -0400 Subject: [PATCH 2/3] Fix for new set output order. This test really ought to be changed somehow. --- sugar/test/main.rkt | 88 ++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/sugar/test/main.rkt b/sugar/test/main.rkt index 1ee26b1..289ae0a 100644 --- a/sugar/test/main.rkt +++ b/sugar/test/main.rkt @@ -45,7 +45,7 @@ (check-equal? (->int (string->path "42")) 42) (check-equal? (->int #\A) 65) (check-equal? (->int (make-list 42 null)) 42) - + (check-equal? (->string "foo") "foo") (check-equal? (->string '()) "") (check-equal? (->string (void)) "") @@ -55,24 +55,24 @@ (define file-name-as-text "foo.txt") (check-equal? (->string (string->path file-name-as-text)) file-name-as-text) (check-equal? (->string #\¶) "¶") - + (check-equal? (->path "foo") (string->path "foo")) (check-equal? (->path 'foo) (string->path "foo")) (check-equal? (->path 123) (string->path "123")) (check-equal? (->path (string->url "foo/bar.html")) (string->path "foo/bar.html")) - + (check-equal? (->list '(1 2 3)) '(1 2 3)) (check-equal? (->list (list->vector '(1 2 3))) '(1 2 3)) - (check-equal? (->list (set 1 2 3)) '(3 2 1)) + (check-equal? (->list (set 1 2 3)) '(2 3 1)) (check-equal? (->list "foo") (list "foo")) - + (check-true (->boolean #t)) (check-false (->boolean #f)) - (check-true (->boolean "#f")) + (check-true (->boolean "#f")) (check-true (->boolean "foo")) (check-true (->boolean '())) (check-true (->boolean '(1 2 3))) - + (check-equal? (len '(1 2 3)) 3) (check-not-equal? (len '(1 2)) 3) ; len 2 (check-equal? (len "foo") 3) @@ -85,7 +85,7 @@ (check-not-equal? (len (set 1 2)) 3) ; len 2 (check-equal? (len (make-hash '((a . 1) (b . 2) (c . 3)))) 3) (check-not-equal? (len (make-hash '((a . 1) (b . 2)))) 3) ; len 2 - + (check-true ("foobar" . starts-with? . "foo")) (check-true ("foobar" . starts-with? . "f")) (check-true ("foobar" . starts-with? . "foobar")) @@ -95,50 +95,50 @@ (check-true ("foobar" . ends-with? . "r")) (check-true ("foobar" . ends-with? . "foobar")) (check-false ("foobar" . ends-with? . "foo")) - + (check-true (members-unique? '(a b c))) (check-false (members-unique? '(a b c c))) (check-true (members-unique? "zoey")) (check-false (members-unique? "zooey")) - + (check-equal? (trimf (list 4 1 2 3 4) even?) '(1 2 3)) (check-equal? (trimf (list 1 3 2 4 5 6 8 9 13) odd?) '(2 4 5 6 8)) (check-equal? (filter-split '(1 2 3 4 5 6) even?) '((1)(3)(5))) - + (define foo-path-strings '("foo" "foo.txt" "foo.bar" "foo.bar.txt")) (match-define (list foo-path foo.txt-path foo.bar-path foo.bar.txt-path) (map ->path foo-path-strings)) ;; test the sample paths before using them for other tests (define foo-paths (list foo-path foo.txt-path foo.bar-path foo.bar.txt-path)) (for-each check-equal? (map ->string foo-paths) foo-path-strings) - - (check-false (has-ext? foo-path 'txt)) + + (check-false (has-ext? foo-path 'txt)) (check-true (foo.txt-path . has-ext? . 'txt)) (check-true ((->path "foo.TXT") . has-ext? . 'txt)) (check-true (has-ext? foo.bar.txt-path 'txt)) (check-false (foo.bar.txt-path . has-ext? . 'doc)) ; wrong extension - + (check-equal? (get-ext (->path "foo.txt")) "txt") (check-false (get-ext "foo")) - + (check-equal? (add-ext (string->path "foo") "txt") (string->path "foo.txt")) (check-equal? (remove-ext foo-path) foo-path) (check-equal? (remove-ext (->path ".foo.txt")) (->path ".foo.txt")) (check-equal? (remove-ext foo.txt-path) foo-path) (check-equal? (remove-ext foo.bar.txt-path) foo.bar-path) (check-not-equal? (remove-ext foo.bar.txt-path) foo-path) ; does not remove all extensions - + (check-equal? (remove-ext* foo-path) foo-path) (check-equal? (remove-ext* foo.txt-path) foo-path) (check-equal? (remove-ext* (->path ".foo.txt")) (->path ".foo.txt")) (check-not-equal? (remove-ext* foo.bar.txt-path) foo.bar-path) ; removes more than one ext (check-equal? (remove-ext* foo.bar.txt-path) foo-path) - + (check-equal? (get-enclosing-dir "/Users/MB/foo.txt") (->path "/Users/MB/")) (check-equal? (get-enclosing-dir "/Users/MB/foo/") (->path "/Users/MB/")) - + (check-true (has-binary-ext? "foo.MP3")) (check-false (has-binary-ext? "foo.py")) - + (check-true (starts-with? "foobar" "foo")) (check-true (starts-with? "foobar" "foobar")) (check-false (starts-with? "foobar" "zam")) @@ -149,36 +149,36 @@ (check-false (ends-with? "foobar" "foobars")) (check-true (capitalized? "Brennan")) (check-false (capitalized? "foobar")) - + (check-equal? (slice-at (range 5) 1) '((0) (1) (2) (3) (4))) (check-equal? (slice-at (range 5) 2) '((0 1) (2 3) (4))) (check-equal? (slice-at (range 5) 2 #t) '((0 1) (2 3))) (check-equal? (slice-at (range 5) 3) '((0 1 2) (3 4))) (check-equal? (slice-at (range 5) 3 #t) '((0 1 2))) - + (check-equal? (slicef '(0 1 2 0 0 0 3) positive?) '((0) (1 2) (0 0 0) (3))) (check-equal? (slicef '(0 1 2 0 0 0 3) positive?) (slicef '(0 1 2 0 0 0 3) zero?)) (check-equal? (slicef '(1 (1) (1) 1 1 1 (1)) list?) '((1) ((1) (1)) (1 1 1) ((1)))) (check-equal? (slicef '(1 2 3 4 5) list?) '((1 2 3 4 5))) - + (check-equal? (slicef-at (range 5) even?) '((0 1) (2 3) (4))) (check-equal? (slicef-at (range 5) odd?) '((0) (1 2) (3 4))) (check-equal? (slicef-at (range 5) odd? #t) '((1 2) (3 4))) (check-equal? (slicef-at (range 5) procedure?) '((0 1 2 3 4))) - + (check-equal? (slicef-at '(1 2 2 1 2) even?) '((1) (2) (2 1) (2))) (check-equal? (slicef-at '(1 2 2 1 2) even? #t) '((2) (2 1) (2))) - + (check-equal? (sublist (range 5) 0 0) '()) (check-equal? (sublist (range 5) 0 1) '(0)) (check-equal? (sublist (range 5) 0 5) '(0 1 2 3 4)) - + (check-equal? (break-at '(5 6 7 8) '()) '((5 6 7 8))) (check-equal? (break-at '(5 6 7 8) '(0)) '((5 6 7 8))) (check-equal? (break-at '(5 6 7 8) '(1 2 3)) '((5) (6) (7) (8))) (check-equal? (break-at '(5 6 7 8) '(1 3)) '((5) (6 7) (8))) (check-equal? (break-at '(5 6 7 8) '(1)) (break-at '(5 6 7 8) 1)) - + (define xs (range 5)) (check-equal? (map (λ(a b c) (list a b c)) (shift xs -1) (shift xs 0) (shift xs 1)) '((1 0 #f) (2 1 0) (3 2 1) (4 3 2) (#f 4 3))) (check-equal? (map (λ(a b c) (list a b c)) (shift xs -1 'ignored #t) (shift xs 0 'ignored #t) (shift xs 1 'ignored #t)) '((1 0 4) (2 1 0) (3 2 1) (4 3 2) (0 4 3))) @@ -191,20 +191,20 @@ (eval-as-untyped - + (check-true (urlish? (->path "/Users/MB/home.html"))) (check-true (urlish? "/Users/MB/home.html?foo=bar")) (check-true (urlish? (->symbol "/Users/MB/home"))) - + (check-true (pathish? (->path "/Users/MB/home"))) (check-true (pathish? "/Users/MB/home")) (check-true (pathish? (->symbol "/Users/MB/home"))) - + (check-equal? (filter-split '("foo" " " "bar" "\n" "\n" "ino") (λ(x) (< (string-length x) 3))) '(("foo")("bar")("ino"))) - + (check-exn exn:fail? (λ _ (slice-at (range 5) 0))) ; needs a positive integer as second arg (check-exn exn:fail? (λ _ (slicef-at (range 5) 3))) ; needs a procedure as second arg - + (check-equal? (get '(0 1 2 3 4 5) 2) 2) (check-exn exn:fail? (λ() (get '(0 1 2 3 4 5) 100))) ; index too big (check-equal? (get `(0 1 ,(list 2) 3 4 5) 2) (list 2)) @@ -219,13 +219,13 @@ (check-equal? (get (string->path "/root/foo/bar/file.txt") 0 2) (list (string->path "/") (string->path "root"))) (check-equal? (get (make-hash `((a . ,(list 1)) (b . ,(list 2)) (c . ,(list 3)))) 'a) (list 1)) (check-exn exn:fail? (λ() (get (make-hash `((a . ,(list 1)) (b . ,(list 2)) (c . ,(list 3)))) 'z))) ; nonexistent key - + (check-equal? (get (string->path "/root/foo/bar/file.txt") 1) (string->path "root")) (check-equal? (get (string->path "/root/foo/bar/file.txt") 0 3) (map string->path '("/" "root" "foo"))) - + (check-equal? (get (make-hash '((a . 1) (b . 2) (c . 3))) 'b) 2) - + (check-true (2 . in? . '(1 2 3))) (check-false (4 . in? . '(1 2 3))) (check-true (2 . in? . (list->vector '(1 2 3)))) @@ -237,35 +237,35 @@ (check-true ('o . in? . 'foobar)) (check-false ('z . in? . 'foobar)) (check-true ("F" . in? . #\F)) - + (check-true (in? "foo" (string->path "/root/foo/bar/file.txt"))) (check-false (in? "zam" (string->path "/root/foo/bar/file.txt"))) - + (define xs (range 5)) (define ys (range 5)) - (check-equal? (values->list (shift/values ys -1 'boing)) '(1 2 3 4 boing)) - (check-equal? (values->list (shift/values ys '(-1 0 1) 'boing)) `((1 2 3 4 boing) ,xs (boing 0 1 2 3))) - + (check-equal? (values->list (shift/values ys -1 'boing)) '(1 2 3 4 boing)) + (check-equal? (values->list (shift/values ys '(-1 0 1) 'boing)) `((1 2 3 4 boing) ,xs (boing 0 1 2 3))) + (require xml) (define str "\nhello world") (define-values (str-prolog str-doc) (xml-string->xexprs str)) (check-equal? str-prolog (prolog (list (p-i (location 1 0 1) (location 1 38 39) 'xml "version=\"1.0\" encoding=\"utf-8\"")) #f null)) (check-equal? str-doc '(root () "hello world")) (check-equal? (xexprs->xml-string str-prolog str-doc) str) - + (module include-test racket/base (require sugar/include) (include-without-lang-line "source.rkt") (provide included-symbol)) - + (require 'include-test) (check-equal? included-symbol 'bar) - + (module no-lang-line-include-test racket/base (require sugar/include) (include-without-lang-line "no-lang-line-source.txt") (provide no-lang-symbol)) - + (require 'no-lang-line-include-test) (check-equal? no-lang-symbol 'bar)) @@ -275,4 +275,4 @@ ;; todo: revise `check-typing-fails` to make it compatible with 6.0 (check-typing-fails (slice-at (range 5) 0)) ; needs a positive integer as second arg (check-typing-fails (slicef-at (range 5) 3)) ; needs a procedure as second arg -|# \ No newline at end of file +|# From 351346054c0f253f9a3a9527d4100e779de3ab90 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Fri, 14 Aug 2015 17:58:01 -0400 Subject: [PATCH 3/3] Minor fixes, should now work on 6.2. --- sugar/test/main.rkt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sugar/test/main.rkt b/sugar/test/main.rkt index 289ae0a..cf2fe15 100644 --- a/sugar/test/main.rkt +++ b/sugar/test/main.rkt @@ -21,7 +21,7 @@ (define-syntax (eval-as-typed stx) (syntax-case stx () [(_ exprs ...) - (let ([sym (syntax-e (generate-temporary))]) + (let ([sym (generate-temporary)]) (datum->syntax stx `(begin (module ,sym typed/racket @@ -63,7 +63,7 @@ (check-equal? (->list '(1 2 3)) '(1 2 3)) (check-equal? (->list (list->vector '(1 2 3))) '(1 2 3)) - (check-equal? (->list (set 1 2 3)) '(2 3 1)) + (check-not-false (andmap (lambda (e) (member e '(1 2 3))) (->list (set 1 2 3)))) (check-equal? (->list "foo") (list "foo")) (check-true (->boolean #t))