Skip to content

Commit dc7a3f0

Browse files
Fix 3 occurrences of define-values-values-to-define
This use of `define-values` is unnecessary.
1 parent 41e4903 commit dc7a3f0

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -712,18 +712,12 @@
712712
(localize local-augment-table 'augment-internals)
713713
(localize local-inner-table '(pubment-internals augment-internals))
714714
(localize local-init-table 'only-init-internals)))
715-
(define-values (localized-field-get-names
716-
localized-field-set-names
717-
localized-private-field-get-names
718-
localized-private-field-set-names
719-
localized-inherit-field-get-names
720-
localized-inherit-field-set-names)
721-
(values (map car localized-field-pairs)
722-
(map cadr localized-field-pairs)
723-
(map car localized-private-field-pairs)
724-
(map cadr localized-private-field-pairs)
725-
(map car localized-inherit-field-pairs)
726-
(map cadr localized-inherit-field-pairs)))
715+
(define localized-field-get-names (map car localized-field-pairs))
716+
(define localized-field-set-names (map cadr localized-field-pairs))
717+
(define localized-private-field-get-names (map car localized-private-field-pairs))
718+
(define localized-private-field-set-names (map cadr localized-private-field-pairs))
719+
(define localized-inherit-field-get-names (map car localized-inherit-field-pairs))
720+
(define localized-inherit-field-set-names (map cadr localized-inherit-field-pairs))
727721

728722
;; construct the types for method accessors
729723
(define (make-method-types method-names type-map
@@ -1428,13 +1422,12 @@
14281422
[(Class: _ inits fields publics augments init-rest)
14291423
(values inits fields publics augments init-rest)]
14301424
[_ (values #f #f #f #f #f)]))
1431-
(define-values (inits fields publics pubments overrides init-rest-name)
1432-
(values (hash-ref parse-info 'init-internals)
1433-
(hash-ref parse-info 'field-internals)
1434-
(hash-ref parse-info 'public-internals)
1435-
(hash-ref parse-info 'pubment-internals)
1436-
(hash-ref parse-info 'override-internals)
1437-
(hash-ref parse-info 'init-rest-name)))
1425+
(define inits (hash-ref parse-info 'init-internals))
1426+
(define fields (hash-ref parse-info 'field-internals))
1427+
(define publics (hash-ref parse-info 'public-internals))
1428+
(define pubments (hash-ref parse-info 'pubment-internals))
1429+
(define overrides (hash-ref parse-info 'override-internals))
1430+
(define init-rest-name (hash-ref parse-info 'init-rest-name))
14381431
(define init-types (make-inits inits super-inits expected-inits))
14391432
(define field-types (make-type-dict fields super-fields expected-fields Univ))
14401433

typed-racket-lib/typed-racket/typecheck/tc-let-unit.rkt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@
284284
(if (null? names)
285285
(values (cons clause non-binding) other-clauses)
286286
(values non-binding (cons clause other-clauses)))))
287-
(define-values (non-binding other-clauses)
288-
(values (reverse *non-binding) (reverse *other-clauses)))
287+
(define non-binding (reverse *non-binding))
288+
(define other-clauses (reverse *other-clauses))
289289

290290
;; Set up vertices for Tarjan's algorithm, where each letrec-values
291291
;; clause is a vertex but mapped in the table for each of the clause names

0 commit comments

Comments
 (0)