From b6362e7eb3a7b62d22f0823856b0a2a9d40c8eaf Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Fri, 7 Aug 2015 17:31:01 -0500 Subject: [PATCH] unstable/sequence -> racket/sequence And move to TR one of the functions that didn't make it. --- .../typed-racket/base-env/base-env-numeric.rkt | 2 +- .../typed-racket/infer/constraints.rkt | 2 +- typed-racket-lib/typed-racket/infer/dmap.rkt | 2 +- typed-racket-lib/typed-racket/infer/infer-unit.rkt | 2 +- .../typed-racket/optimizer/dead-code.rkt | 2 +- .../typed-racket/optimizer/float-complex.rkt | 2 +- typed-racket-lib/typed-racket/optimizer/float.rkt | 2 +- .../typed-racket/optimizer/hidden-costs.rkt | 2 +- .../typed-racket/optimizer/unboxed-let.rkt | 2 +- typed-racket-lib/typed-racket/optimizer/utils.rkt | 2 +- .../typed-racket/private/parse-type.rkt | 2 +- .../typed-racket/private/with-types.rkt | 2 +- .../typed-racket/typecheck/provide-handling.rkt | 2 +- .../typed-racket/typecheck/tc-app-helper.rkt | 2 +- .../typecheck/tc-app/tc-app-hetero.rkt | 2 +- .../typecheck/tc-app/tc-app-lambda.rkt | 2 +- .../typed-racket/typecheck/tc-app/tc-app-list.rkt | 2 +- .../typecheck/tc-app/tc-app-objects.rkt | 2 +- .../typecheck/tc-app/tc-app-special.rkt | 2 +- .../typecheck/tc-app/tc-app-values.rkt | 2 +- .../typed-racket/typecheck/tc-expr-unit.rkt | 2 +- .../typed-racket/typecheck/tc-lambda-unit.rkt | 2 +- .../typed-racket/typecheck/tc-literal.rkt | 2 +- .../typed-racket/typecheck/tc-toplevel.rkt | 2 +- typed-racket-lib/typed-racket/types/classes.rkt | 2 +- typed-racket-lib/typed-racket/types/printer.rkt | 2 +- typed-racket-lib/typed-racket/types/subtype.rkt | 2 +- .../typed-racket/utils/mutated-vars.rkt | 2 +- typed-racket-lib/typed-racket/utils/tc-utils.rkt | 2 +- typed-racket-lib/typed-racket/utils/utils.rkt | 14 +++++++++++++- 30 files changed, 42 insertions(+), 30 deletions(-) diff --git a/typed-racket-lib/typed-racket/base-env/base-env-numeric.rkt b/typed-racket-lib/typed-racket/base-env/base-env-numeric.rkt index bf5817c3..0f17d500 100644 --- a/typed-racket-lib/typed-racket/base-env/base-env-numeric.rkt +++ b/typed-racket-lib/typed-racket/base-env/base-env-numeric.rkt @@ -4,7 +4,7 @@ (require (for-syntax racket/base racket/syntax syntax/parse) (only-in (rep type-rep) Type/c? make-Values) - racket/list racket/math racket/flonum racket/extflonum racket/unsafe/ops unstable/sequence racket/match + racket/list racket/math racket/flonum racket/extflonum racket/unsafe/ops racket/sequence racket/match (for-template racket/flonum racket/extflonum racket/fixnum racket/math racket/unsafe/ops racket/base (only-in "../types/numeric-predicates.rkt" index?)) (only-in (types abbrev numeric-tower) [-Number N] [-Boolean B] [-Symbol Sym] [-Real R] [-PosInt -Pos])) diff --git a/typed-racket-lib/typed-racket/infer/constraints.rkt b/typed-racket-lib/typed-racket/infer/constraints.rkt index 939207c1..d382cd69 100644 --- a/typed-racket-lib/typed-racket/infer/constraints.rkt +++ b/typed-racket-lib/typed-racket/infer/constraints.rkt @@ -2,7 +2,7 @@ (require "../utils/utils.rkt" (types abbrev union subtype) - unstable/sequence + racket/sequence "fail.rkt" "signatures.rkt" "constraint-structs.rkt" racket/match racket/list) diff --git a/typed-racket-lib/typed-racket/infer/dmap.rkt b/typed-racket-lib/typed-racket/infer/dmap.rkt index 3f2001e6..21f9bdc5 100644 --- a/typed-racket-lib/typed-racket/infer/dmap.rkt +++ b/typed-racket-lib/typed-racket/infer/dmap.rkt @@ -4,7 +4,7 @@ "signatures.rkt" "constraint-structs.rkt" (utils tc-utils) (contract-req) - unstable/sequence) + racket/sequence) (import constraints^) (export dmap^) diff --git a/typed-racket-lib/typed-racket/infer/infer-unit.rkt b/typed-racket-lib/typed-racket/infer/infer-unit.rkt index d6896dc4..11d9f9f6 100644 --- a/typed-racket-lib/typed-racket/infer/infer-unit.rkt +++ b/typed-racket-lib/typed-racket/infer/infer-unit.rkt @@ -25,7 +25,7 @@ (for-syntax racket/base syntax/parse) - unstable/sequence + racket/sequence racket/hash racket/list) (import dmap^ constraints^) diff --git a/typed-racket-lib/typed-racket/optimizer/dead-code.rkt b/typed-racket-lib/typed-racket/optimizer/dead-code.rkt index a292ce99..57fdd3f7 100644 --- a/typed-racket-lib/typed-racket/optimizer/dead-code.rkt +++ b/typed-racket-lib/typed-racket/optimizer/dead-code.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require syntax/parse syntax/stx unstable/sequence +(require syntax/parse syntax/stx racket/sequence racket/syntax (for-template racket/base) "../utils/utils.rkt" diff --git a/typed-racket-lib/typed-racket/optimizer/float-complex.rkt b/typed-racket-lib/typed-racket/optimizer/float-complex.rkt index 74944d63..1714b18f 100644 --- a/typed-racket-lib/typed-racket/optimizer/float-complex.rkt +++ b/typed-racket-lib/typed-racket/optimizer/float-complex.rkt @@ -2,7 +2,7 @@ (require syntax/parse syntax/stx racket/promise racket/syntax racket/match syntax/parse/experimental/specialize - "../utils/utils.rkt" racket/unsafe/ops unstable/sequence + "../utils/utils.rkt" racket/unsafe/ops racket/sequence (for-template racket/base racket/math racket/flonum racket/unsafe/ops) (types numeric-tower subtype type-table utils) (optimizer utils numeric-utils logging float unboxed-tables)) diff --git a/typed-racket-lib/typed-racket/optimizer/float.rkt b/typed-racket-lib/typed-racket/optimizer/float.rkt index 2a640084..599c210b 100644 --- a/typed-racket-lib/typed-racket/optimizer/float.rkt +++ b/typed-racket-lib/typed-racket/optimizer/float.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require syntax/parse unstable/sequence racket/dict racket/flonum racket/promise +(require syntax/parse racket/sequence racket/dict racket/flonum racket/promise syntax/parse/experimental/specialize (for-template racket/base racket/flonum racket/unsafe/ops racket/math) "../utils/utils.rkt" diff --git a/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt b/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt index 1213b4e4..1fc6f100 100644 --- a/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt +++ b/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require syntax/parse unstable/sequence +(require syntax/parse racket/sequence (for-template racket/base) "../utils/utils.rkt" (optimizer utils logging) diff --git a/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt b/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt index 3663cd74..80d3d105 100644 --- a/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt +++ b/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require syntax/parse syntax/stx unstable/sequence +(require syntax/parse syntax/stx racket/sequence syntax/parse/experimental/template racket/match racket/syntax racket/promise diff --git a/typed-racket-lib/typed-racket/optimizer/utils.rkt b/typed-racket-lib/typed-racket/optimizer/utils.rkt index 41b1dd26..ed7e47fb 100644 --- a/typed-racket-lib/typed-racket/optimizer/utils.rkt +++ b/typed-racket-lib/typed-racket/optimizer/utils.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/match unstable/sequence +(require racket/match racket/sequence racket/dict syntax/id-table racket/syntax syntax/stx syntax/parse syntax/parse/experimental/specialize diff --git a/typed-racket-lib/typed-racket/private/parse-type.rkt b/typed-racket-lib/typed-racket/private/parse-type.rkt index 44ca5fdf..45297811 100644 --- a/typed-racket-lib/typed-racket/private/parse-type.rkt +++ b/typed-racket-lib/typed-racket/private/parse-type.rkt @@ -9,7 +9,7 @@ [make-arr* make-arr]) (utils tc-utils stxclass-util literal-syntax-class) syntax/stx (prefix-in c: (contract-req)) - syntax/parse unstable/sequence + syntax/parse racket/sequence (env tvar-env type-alias-env mvar-env lexical-env index-env row-constraint-env) racket/dict diff --git a/typed-racket-lib/typed-racket/private/with-types.rkt b/typed-racket-lib/typed-racket/private/with-types.rkt index 1c86a37b..21b904f0 100644 --- a/typed-racket-lib/typed-racket/private/with-types.rkt +++ b/typed-racket-lib/typed-racket/private/with-types.rkt @@ -12,7 +12,7 @@ racket/syntax syntax/flatten-begin syntax/parse - unstable/sequence + racket/sequence "../tc-setup.rkt" "../standard-inits.rkt" (for-template diff --git a/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt b/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt index d8becf92..ae7e93af 100644 --- a/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt +++ b/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt @@ -1,7 +1,7 @@ #lang racket/base (require "../utils/utils.rkt" - unstable/sequence syntax/id-table racket/dict racket/syntax + racket/sequence syntax/id-table racket/dict racket/syntax racket/struct-info racket/match syntax/parse (only-in (private type-contract) include-extra-requires?) (private syntax-properties) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt b/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt index 1ce764c7..2f774ea2 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt @@ -1,7 +1,7 @@ #lang racket/base (require "../utils/utils.rkt" - racket/match unstable/sequence racket/set racket/list + racket/match racket/sequence racket/set racket/list (only-in racket/list make-list) (contract-req) (typecheck check-below tc-subst tc-metafunctions) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt index 38216dfa..7acddf92 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt @@ -1,7 +1,7 @@ #lang racket/unit (require "../../utils/utils.rkt" - syntax/parse syntax/stx racket/match unstable/sequence + syntax/parse syntax/stx racket/match racket/sequence "signatures.rkt" "utils.rkt" (types utils abbrev numeric-tower union resolve type-table generalize) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt index 8accd250..dadc874a 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt @@ -5,7 +5,7 @@ "utils.rkt" (prefix-in - (contract-req)) syntax/parse racket/match racket/list - unstable/sequence + racket/sequence (typecheck signatures find-annotation) (types abbrev utils generalize type-table) (private type-annotation syntax-properties) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt index 6d7f26e8..89a4969b 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt @@ -4,7 +4,7 @@ (require "../../utils/utils.rkt" "signatures.rkt" "utils.rkt" - syntax/parse syntax/stx racket/match unstable/sequence + syntax/parse syntax/stx racket/match racket/sequence (typecheck signatures tc-funapp) (types abbrev utils union substitute) (rep type-rep) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt index 86749b8e..243a4dd9 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt @@ -3,7 +3,7 @@ (require "../../utils/utils.rkt" "signatures.rkt" "utils.rkt" - syntax/parse syntax/stx racket/match unstable/sequence + syntax/parse syntax/stx racket/match racket/sequence racket/format racket/list (typecheck signatures) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt index 6cb928f2..1fee64ce 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt @@ -5,7 +5,7 @@ "utils.rkt" syntax/parse racket/match syntax/stx - unstable/sequence + racket/sequence (typecheck signatures tc-funapp) (types abbrev utils) (private type-annotation) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt index 6247bcd4..932bf486 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt @@ -3,7 +3,7 @@ (require "../../utils/utils.rkt" "signatures.rkt" "utils.rkt" - syntax/parse racket/match unstable/sequence + syntax/parse racket/match racket/sequence (typecheck signatures tc-funapp) (types utils) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt b/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt index b34fdcd5..365218a3 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt @@ -17,7 +17,7 @@ syntax/parse (only-in racket/list split-at) (typecheck internal-forms tc-envops) - unstable/sequence + racket/sequence racket/extflonum ;; Needed for current implementation of typechecking letrec-syntax+values (for-template (only-in racket/base letrec-values) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt b/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt index 40e97034..1696cef3 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt @@ -3,7 +3,7 @@ (require "../utils/utils.rkt" racket/dict racket/list syntax/parse syntax/stx racket/match syntax/id-table racket/set - unstable/sequence + racket/sequence (contract-req) (rep type-rep object-rep rep-utils) (rename-in (types abbrev utils union) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt b/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt index 6e96d5aa..58142990 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt @@ -10,7 +10,7 @@ (utils stxclass-util) syntax/parse racket/function - unstable/sequence + racket/sequence racket/extflonum) (import) diff --git a/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt b/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt index 5985a79c..d69447bf 100644 --- a/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt +++ b/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt @@ -2,7 +2,7 @@ (require (rename-in "../utils/utils.rkt" [infer r:infer]) racket/syntax syntax/parse syntax/stx syntax/id-table - racket/list racket/dict racket/match unstable/sequence + racket/list racket/dict racket/match racket/sequence (prefix-in c: (contract-req)) (rep type-rep) (types utils abbrev type-table struct-table) diff --git a/typed-racket-lib/typed-racket/types/classes.rkt b/typed-racket-lib/typed-racket/types/classes.rkt index e0f0fa8a..a063ef0e 100644 --- a/typed-racket-lib/typed-racket/types/classes.rkt +++ b/typed-racket-lib/typed-racket/types/classes.rkt @@ -14,7 +14,7 @@ racket/match syntax/parse syntax/stx - (only-in unstable/sequence in-syntax) + (only-in racket/sequence in-syntax) (for-template (base-env class-clauses))) (provide Class: diff --git a/typed-racket-lib/typed-racket/types/printer.rkt b/typed-racket-lib/typed-racket/types/printer.rkt index c91c09be..7b89357f 100644 --- a/typed-racket-lib/typed-racket/types/printer.rkt +++ b/typed-racket-lib/typed-racket/types/printer.rkt @@ -3,7 +3,7 @@ ;; This module provides functions for printing types and related ;; data structures such as filters and objects -(require racket/require racket/match unstable/sequence racket/string racket/promise +(require racket/require racket/match racket/sequence racket/string racket/promise racket/pretty racket/list racket/set diff --git a/typed-racket-lib/typed-racket/types/subtype.rkt b/typed-racket-lib/typed-racket/types/subtype.rkt index e6f24906..1e5412fa 100644 --- a/typed-racket-lib/typed-racket/types/subtype.rkt +++ b/typed-racket-lib/typed-racket/types/subtype.rkt @@ -6,7 +6,7 @@ (utils tc-utils early-return) (types utils resolve base-abbrev match-expanders numeric-tower substitute current-seen prefab) - (for-syntax racket/base syntax/parse unstable/sequence)) + (for-syntax racket/base syntax/parse racket/sequence)) (lazy-require ("union.rkt" (Un)) diff --git a/typed-racket-lib/typed-racket/utils/mutated-vars.rkt b/typed-racket-lib/typed-racket/utils/mutated-vars.rkt index 331a50d3..2725c2c1 100644 --- a/typed-racket-lib/typed-racket/utils/mutated-vars.rkt +++ b/typed-racket-lib/typed-racket/utils/mutated-vars.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/dict syntax/parse syntax/id-table unstable/sequence) +(require racket/dict syntax/parse syntax/id-table racket/sequence) ;; find and add to mapping all the set!'ed variables in form ;; if the supplied mapping is mutable, mutates it diff --git a/typed-racket-lib/typed-racket/utils/tc-utils.rkt b/typed-racket-lib/typed-racket/utils/tc-utils.rkt index 8b8f2323..9e4155e4 100644 --- a/typed-racket-lib/typed-racket/utils/tc-utils.rkt +++ b/typed-racket-lib/typed-racket/utils/tc-utils.rkt @@ -9,7 +9,7 @@ don't depend on any other portion of the system racket/promise racket/string racket/lazy-require syntax/parse/pre (for-syntax racket/base syntax/parse/pre)) -(lazy-require [unstable/sequence (in-slice)]) +(lazy-require [racket/sequence (in-slice)]) (provide ;; parameters current-orig-stx diff --git a/typed-racket-lib/typed-racket/utils/utils.rkt b/typed-racket-lib/typed-racket/utils/utils.rkt index 7e037ffe..1a560dbe 100644 --- a/typed-racket-lib/typed-racket/utils/utils.rkt +++ b/typed-racket-lib/typed-racket/utils/utils.rkt @@ -19,7 +19,8 @@ at least theoretically. ;; misc list-extend filter-multiple - syntax-length) + syntax-length + in-sequence-forever) (define optimize? (make-parameter #t)) (define-for-syntax enable-contracts? (and (getenv "PLT_TR_CONTRACTS") #t)) @@ -213,3 +214,14 @@ at least theoretically. (define (syntax-length stx) (let ((list (syntax->list stx))) (and list (length list)))) + +(define (in-sequence-forever seq val) + (make-do-sequence + (λ () + (let-values ([(more? gen) (sequence-generate seq)]) + (values (λ (e) (if (more?) (gen) val)) + (λ (_) #t) + #t + (λ (_) #t) + (λ _ #t) + (λ _ #t))))))