diff --git a/collects/tests/typed-scheme/main.rkt b/collects/tests/typed-scheme/main.rkt index b3a7a322..596e285b 100644 --- a/collects/tests/typed-scheme/main.rkt +++ b/collects/tests/typed-scheme/main.rkt @@ -4,8 +4,8 @@ mzlib/etc scheme/port compiler/compiler scheme/match mzlib/compile - "unit-tests/all-tests.ss" - "unit-tests/test-utils.ss" + "unit-tests/all-tests.rkt" + "unit-tests/test-utils.rkt" "optimizer/run.rkt") (define (scheme-file? s) diff --git a/collects/tests/typed-scheme/nightly-run.rkt b/collects/tests/typed-scheme/nightly-run.rkt index cc2059d7..d4798e5a 100644 --- a/collects/tests/typed-scheme/nightly-run.rkt +++ b/collects/tests/typed-scheme/nightly-run.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require scheme/runtime-path) -(define-runtime-path run "run.ss") +(define-runtime-path run "run.rkt") (if (eq? 'cgc (system-type 'gc)) (printf "Running under CGC => skipping tests\n") (parameterize ([current-command-line-arguments '#("--nightly")]) diff --git a/collects/tests/typed-scheme/run.rkt b/collects/tests/typed-scheme/run.rkt index a6123e4f..84d94c6f 100644 --- a/collects/tests/typed-scheme/run.rkt +++ b/collects/tests/typed-scheme/run.rkt @@ -1,7 +1,7 @@ #lang racket (require racket/vector racket/gui/dynamic rackunit) -(require "main.ss") +(require "main.rkt") (define exec (make-parameter go/text)) (define nightly? (make-parameter #f)) diff --git a/collects/tests/typed-scheme/succeed/foldo.rkt b/collects/tests/typed-scheme/succeed/foldo.rkt index c2c2b33f..9450b9d4 100644 --- a/collects/tests/typed-scheme/succeed/foldo.rkt +++ b/collects/tests/typed-scheme/succeed/foldo.rkt @@ -1,5 +1,5 @@ (module foldo mzscheme - (require (lib "file.ss")(lib "match.ss")) + (require (lib "file.rkt") (lib "match.rkt")) (provide apply-to-scheme-files) (define-syntax (define-excluder stx) @@ -27,8 +27,8 @@ ;; ---------------------------------------- ;; apply-to-scheme-files: (path[file] -> X) path[directory] -> (listof X) - ;; applies the given function to each .ss or .scm file in the given directory - ;; hierarchy; returns all results in a list + ;; applies the given function to each .rkt or .ss or .scm file in the given + ;; directory hierarchy; returns all results in a list (define (apply-to-scheme-files f root ) ;;FOLD-FILES diff --git a/collects/tests/typed-scheme/succeed/leftist-heap.rkt b/collects/tests/typed-scheme/succeed/leftist-heap.rkt index ef351664..4d87e6c3 100644 --- a/collects/tests/typed-scheme/succeed/leftist-heap.rkt +++ b/collects/tests/typed-scheme/succeed/leftist-heap.rkt @@ -23,8 +23,8 @@ ;; need rest args ;; didn't attempt generators -;#reader (planet "typed-reader.ss" ("plt" "typed-scheme.plt")) -;(module leftist-heap (planet "typed-scheme.ss" ("plt" "typed-scheme.plt" 3 0)) +;#reader (planet "typed-reader.rkt" ("plt" "typed-scheme.plt")) +;(module leftist-heap (planet "typed-scheme.rkt" ("plt" "typed-scheme.plt" 3 0)) ;(module leftist-heap mzscheme #lang typed-scheme @@ -35,7 +35,7 @@ (define-type-alias list-of Listof) (require (except-in srfi/67 current-compare =? (Listof (Listof (U #f (Listof (U Real #f)))))) Path @@ -11,18 +11,18 @@ (define-type-alias top Any) (define-type-alias str String) -(require/typed filename-extension (Path -> (U #f Bytes)) (lib "file.ss")) -(require/typed normalize-path (Path Path -> Path) (lib "file.ss")) -(require/typed explode-path (Path -> (Listof Path)) (lib "file.ss")) -(require/typed srfi48::format (Port String String top * -> top) "patch.ss") +(require/typed filename-extension (Path -> (U #f Bytes)) (lib "file.rkt")) +(require/typed normalize-path (Path Path -> Path) (lib "file.rkt")) +(require/typed explode-path (Path -> (Listof Path)) (lib "file.rkt")) +(require/typed srfi48::format (Port String String top * -> top) "patch.rkt") ;; FIXME - prefix -#;(require/typed srfi48:format ( Port String String top * -> top) (prefix-in srfi48: (lib "48.ss" "srfi"))) -(require (lib "match.ss") - ;(lib "file.ss") - ;(lib "list.ss") - ;(lib "etc.ss") - (prefix-in srfi13: (lib "13.ss" "srfi")) - ;(prefix srfi48: (lib "48.ss" "srfi")) +#;(require/typed srfi48:format ( Port String String top * -> top) (prefix-in srfi48: (lib "48.rkt" "srfi"))) +(require (lib "match.rkt") + ;(lib "file.rkt") + ;(lib "list.rkt") + ;(lib "etc.rkt") + (prefix-in srfi13: (lib "13.rkt" "srfi")) + ;(prefix srfi48: (lib "48.rkt" "srfi")) ) (define-type-alias Sexpr Any) @@ -367,7 +367,7 @@ ;; ============================================================ ;; EXPERIMENT RUNNING -;; FIXME - everything in untyped file (foldo.ss) b/c fold-files has terrible api +;; FIXME - everything in untyped file (foldo.rkt) b/c fold-files has terrible api #;(define-syntax (define-excluder stx) (define (path->clause c) @@ -393,8 +393,8 @@ ;; ---------------------------------------- ;; apply-to-scheme-files: (path[file] -> X) path[directory] -> (listof X) -;; applies the given function to each .ss or .scm file in the given directory -;; hierarchy; returns all results in a list +;; applies the given function to each .rkt or .ss or .scm file in the given +;; directory hierarchy; returns all results in a list #;(define: (apply-to-scheme-files [f : (Path -> (Listof(Listof(Listof NumF))))] [root : Path]) : (Listof (Listof(Listof(Listof NumF)))) ;;FOLD-FILES diff --git a/collects/tests/typed-scheme/succeed/new-metrics.rkt b/collects/tests/typed-scheme/succeed/new-metrics.rkt index a812d0c4..da284ac8 100644 --- a/collects/tests/typed-scheme/succeed/new-metrics.rkt +++ b/collects/tests/typed-scheme/succeed/new-metrics.rkt @@ -343,8 +343,8 @@ ;; ---------------------------------------- ;; apply-to-scheme-files: (path[file] -> X) path[directory] -> (listof X) -;; applies the given function to each .ss or .scm file in the given directory -;; hierarchy; returns all results in a list +;; applies the given function to each .rkt or .ss or .scm file in the given +;; directory hierarchy; returns all results in a list (: apply-to-scheme-files (All (X) ((Path -> X) Path -> (Listof X)))) (define (apply-to-scheme-files f root) (fold-files diff --git a/collects/tests/typed-scheme/succeed/poly-tests.rkt b/collects/tests/typed-scheme/succeed/poly-tests.rkt index 163cd366..6458bf98 100644 --- a/collects/tests/typed-scheme/succeed/poly-tests.rkt +++ b/collects/tests/typed-scheme/succeed/poly-tests.rkt @@ -4,7 +4,7 @@ (define-type-alias symbol Symbol) (define-type-alias top Any) (define-type-alias list-of Listof) -#;(require "prims.ss") +#;(require "prims.rkt") (define: mymap : (All (a b) ((a -> b) (list-of a) -> (list-of b))) (plambda: (a b) ([f : (a -> b)] [l : (list-of a)]) (cond [(null? l) '()] diff --git a/collects/tests/typed-scheme/succeed/require-poly.rkt b/collects/tests/typed-scheme/succeed/require-poly.rkt index 68f90fc9..28b6ef2e 100644 --- a/collects/tests/typed-scheme/succeed/require-poly.rkt +++ b/collects/tests/typed-scheme/succeed/require-poly.rkt @@ -1,3 +1,3 @@ #lang typed-scheme -(require "simple-poly.ss") +(require "simple-poly.rkt") diff --git a/collects/tests/typed-scheme/succeed/seasoned-schemer.rkt b/collects/tests/typed-scheme/succeed/seasoned-schemer.rkt index bae63bb5..3aa746f3 100644 --- a/collects/tests/typed-scheme/succeed/seasoned-schemer.rkt +++ b/collects/tests/typed-scheme/succeed/seasoned-schemer.rkt @@ -1,6 +1,6 @@ #lang typed-scheme #;(require mzlib/etc) -#;(require "prims.ss") +#;(require "prims.rkt") (require mzlib/match) (define-type-alias number Number) diff --git a/collects/tests/typed-scheme/unit-tests/all-tests.rkt b/collects/tests/typed-scheme/unit-tests/all-tests.rkt index 53e17b4f..19ed558a 100644 --- a/collects/tests/typed-scheme/unit-tests/all-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/all-tests.rkt @@ -1,19 +1,19 @@ #lang scheme/base (require - "test-utils.ss" - "typecheck-tests.ss" ;;fail + "test-utils.rkt" + "typecheck-tests.rkt" ;;fail - "subtype-tests.ss" ;; pass - "type-equal-tests.ss" ;; pass - "remove-intersect-tests.ss" ;; pass - "parse-type-tests.ss" ;; pass - "subst-tests.ss" ;; pass - "infer-tests.ss" ;; pass - "type-annotation-test.ss" ;; pass + "subtype-tests.rkt" ;; pass + "type-equal-tests.rkt" ;; pass + "remove-intersect-tests.rkt" ;; pass + "parse-type-tests.rkt" ;; pass + "subst-tests.rkt" ;; pass + "infer-tests.rkt" ;; pass + "type-annotation-test.rkt" ;; pass - "module-tests.ss" ;; pass - "contract-tests.ss" + "module-tests.rkt" ;; pass + "contract-tests.rkt" (r:infer infer infer-dummy) rackunit rackunit/text-ui) diff --git a/collects/tests/typed-scheme/unit-tests/contract-tests.rkt b/collects/tests/typed-scheme/unit-tests/contract-tests.rkt index c11c80df..8272dea4 100644 --- a/collects/tests/typed-scheme/unit-tests/contract-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/contract-tests.rkt @@ -1,10 +1,10 @@ #lang scheme/base -(require "test-utils.ss" +(require "test-utils.rkt" (for-syntax scheme/base) (for-template scheme/base) (private type-contract) - (rep type-rep filter-rep object-rep) + (rep type-rep filter-rep object-rep) (types utils union convenience) (utils tc-utils) rackunit) diff --git a/collects/tests/typed-scheme/unit-tests/infer-tests.rkt b/collects/tests/typed-scheme/unit-tests/infer-tests.rkt index 9f34e832..f37b2aee 100644 --- a/collects/tests/typed-scheme/unit-tests/infer-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/infer-tests.rkt @@ -1,8 +1,8 @@ #lang scheme/base -(require "test-utils.ss" (for-syntax scheme/base)) +(require "test-utils.rkt" (for-syntax scheme/base)) (require (rep type-rep) - (r:infer infer) - (types convenience union utils abbrev) + (r:infer infer) + (types convenience union utils abbrev) rackunit) diff --git a/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt b/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt index 9bdcecbe..7c345193 100644 --- a/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/parse-type-tests.rkt @@ -1,10 +1,10 @@ #lang scheme/base -(require "test-utils.ss" (for-syntax scheme/base) +(require "test-utils.rkt" (for-syntax scheme/base) racket/set (utils tc-utils) - (env type-alias-env type-env-structs tvar-env type-name-env init-envs) - (rep type-rep) - (rename-in (types comparison subtype union utils convenience) + (env type-alias-env type-env-structs tvar-env type-name-env init-envs) + (rep type-rep) + (rename-in (types comparison subtype union utils convenience) [Un t:Un] [-> t:->] [->* t:->*]) (base-env base-types base-types-extra colon) (for-template (base-env base-types base-types-extra base-env colon)) @@ -15,7 +15,7 @@ ;; HORRIBLE HACK! ;; We are solving the following problem: -;; when we require "base-env.ss" for template, it constructs the type-alias-env +;; when we require "base-env.rkt" for template, it constructs the type-alias-env ;; in phase 0 (relative to this module), but populates it with phase -1 identifiers ;; The identifiers are also bound in this module at phase -1, but the comparison for ;; the table is phase 0, so they don't compare correctly @@ -24,7 +24,7 @@ ;; We do this by going through the table, constructing new identifiers based on the symbol ;; of the old identifier. ;; This relies on the identifiers being bound at phase 0 in this module (which they are, -;; because we have a phase 0 require of "base-env.ss"). +;; because we have a phase 0 require of "base-env.rkt"). (for ([pr (type-alias-env-map cons)]) (let ([nm (car pr)] [ty (cdr pr)]) diff --git a/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.rkt b/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.rkt index 489e941d..f13e8a6d 100644 --- a/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/remove-intersect-tests.rkt @@ -1,7 +1,7 @@ #lang scheme/base -(require "test-utils.ss" (for-syntax scheme/base) +(require "test-utils.rkt" (for-syntax scheme/base) (rep type-rep) - (r:infer infer infer-dummy) + (r:infer infer infer-dummy) (types convenience subtype union remove-intersect) rackunit) diff --git a/collects/tests/typed-scheme/unit-tests/subst-tests.rkt b/collects/tests/typed-scheme/unit-tests/subst-tests.rkt index 5a5efe2d..3cb49a41 100644 --- a/collects/tests/typed-scheme/unit-tests/subst-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/subst-tests.rkt @@ -1,8 +1,8 @@ #lang scheme/base -(require "test-utils.ss" (for-syntax scheme/base) +(require "test-utils.rkt" (for-syntax scheme/base) (rep type-rep) - (types utils abbrev numeric-tower substitute) + (types utils abbrev numeric-tower substitute) rackunit) (define-syntax-rule (s img var tgt result) diff --git a/collects/tests/typed-scheme/unit-tests/subtype-tests.rkt b/collects/tests/typed-scheme/unit-tests/subtype-tests.rkt index a69e68ca..898db32a 100644 --- a/collects/tests/typed-scheme/unit-tests/subtype-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/subtype-tests.rkt @@ -1,10 +1,10 @@ #lang scheme/base -(require "test-utils.ss" +(require "test-utils.rkt" (types subtype convenience union) - (rep type-rep) - (env init-envs type-env-structs) - (r:infer infer infer-dummy) + (rep type-rep) + (env init-envs type-env-structs) + (r:infer infer infer-dummy) rackunit (for-syntax scheme/base)) diff --git a/collects/tests/typed-scheme/unit-tests/type-equal-tests.rkt b/collects/tests/typed-scheme/unit-tests/type-equal-tests.rkt index e183117e..c57bf727 100644 --- a/collects/tests/typed-scheme/unit-tests/type-equal-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/type-equal-tests.rkt @@ -1,8 +1,8 @@ #lang scheme/base -(require "test-utils.ss" (for-syntax scheme/base) +(require "test-utils.rkt" (for-syntax scheme/base) (rep type-rep) - (types comparison abbrev numeric-tower union) + (types comparison abbrev numeric-tower union) rackunit) (provide type-equal-tests) diff --git a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt index 1ef3656e..ef386115 100644 --- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt @@ -1,14 +1,14 @@ #lang racket/base -(require "test-utils.ss" +(require "test-utils.rkt" (for-syntax scheme/base) (for-template scheme/base)) (require (private type-annotation parse-type) (base-env prims base-types-extra base-special-env base-env-indexing base-structs) - (typecheck typechecker) - (rep type-rep filter-rep object-rep) + (typecheck typechecker) + (rep type-rep filter-rep object-rep) (rename-in (types utils union convenience abbrev filter-ops) [Un t:Un] [true-lfilter -true-lfilter] diff --git a/collects/typed-scheme/private/parse-type.rkt b/collects/typed-scheme/private/parse-type.rkt index 40c8dc7a..be2f4d1b 100644 --- a/collects/typed-scheme/private/parse-type.rkt +++ b/collects/typed-scheme/private/parse-type.rkt @@ -8,10 +8,10 @@ syntax/parse (env type-env-structs tvar-env type-name-env type-alias-env lexical-env index-env) racket/match - (for-template scheme/base "../base-env/colon.ss") + (for-template scheme/base "../base-env/colon.rkt") ;; needed at this phase for tests - (combine-in (prefix-in t: "../base-env/base-types-extra.ss") "../base-env/colon.ss") - (for-template (prefix-in t: "../base-env/base-types-extra.ss"))) + (combine-in (prefix-in t: "../base-env/base-types-extra.rkt") "../base-env/colon.rkt") + (for-template (prefix-in t: "../base-env/base-types-extra.rkt"))) (define-struct poly (name vars) #:prefab)