"indicies" -> "indices", as noted by Rodolfo Carvalho.

This commit is contained in:
Eli Barzilay 2012-02-09 13:59:20 -05:00
parent 237f64b265
commit 88da3effc4
5 changed files with 17 additions and 17 deletions

View File

@ -384,7 +384,7 @@
;; add-wrapper-let : syntax ;; add-wrapper-let : syntax
;; (listof arg/res) -- sorted version of the arg/res structs, ordered by evaluation order ;; (listof arg/res) -- sorted version of the arg/res structs, ordered by evaluation order
;; (listof int) -- indicies that give the mapping from the ordered-args to the original order ;; (listof int) -- indices that give the mapping from the ordered-args to the original order
;; (listof identifier) -- arg-proj-vars, bound to projections with ordinary blame ;; (listof identifier) -- arg-proj-vars, bound to projections with ordinary blame
;; (listof identifier) -- indy-arg-proj-args, bound to projections with indy blame ;; (listof identifier) -- indy-arg-proj-args, bound to projections with indy blame
;; (listof identifier) -- wrapper-args, bound to the original, unwrapped values, sorted like original arg/ress ;; (listof identifier) -- wrapper-args, bound to the original, unwrapped values, sorted like original arg/ress
@ -395,7 +395,7 @@
;; also handles adding code to checki to see if usupplied args are present (skipping the contract check, if so) ;; also handles adding code to checki to see if usupplied args are present (skipping the contract check, if so)
;; WRONG: need to rename the variables in this function from "arg" to "arg/res" ;; WRONG: need to rename the variables in this function from "arg" to "arg/res"
(define-for-syntax (add-wrapper-let body swapped-blame? (define-for-syntax (add-wrapper-let body swapped-blame?
ordered-args arg-indicies ordered-args arg-indices
arg-proj-vars indy-arg-proj-vars arg-proj-vars indy-arg-proj-vars
wrapper-args indy-arg-vars wrapper-args indy-arg-vars
arg/res-to-indy-var) arg/res-to-indy-var)
@ -411,7 +411,7 @@
(for/fold ([body body]) (for/fold ([body body])
([indy-arg-var (in-list indy-arg-vars)] ([indy-arg-var (in-list indy-arg-vars)]
[arg (in-list ordered-args)] [arg (in-list ordered-args)]
[arg-index arg-indicies] [arg-index arg-indices]
[i (in-naturals)]) [i (in-naturals)])
(let ([wrapper-arg (vector-ref wrapper-args arg-index)] (let ([wrapper-arg (vector-ref wrapper-args arg-index)]
[arg-proj-var (vector-ref arg-proj-vars arg-index)] [arg-proj-var (vector-ref arg-proj-vars arg-index)]
@ -460,7 +460,7 @@
;; which should be a function from results to projection-applied versions of the same ;; which should be a function from results to projection-applied versions of the same
;; if there are result contracts. ;; if there are result contracts.
(define-for-syntax (result-checkers an-istx (define-for-syntax (result-checkers an-istx
ordered-ress res-indicies ordered-ress res-indices
res-proj-vars indy-res-proj-vars res-proj-vars indy-res-proj-vars
wrapper-ress indy-res-vars wrapper-ress indy-res-vars
arg/res-to-indy-var) arg/res-to-indy-var)
@ -471,7 +471,7 @@
#,(add-wrapper-let #,(add-wrapper-let
(add-post-cond an-istx arg/res-to-indy-var #`(values #,@(vector->list wrapper-ress))) (add-post-cond an-istx arg/res-to-indy-var #`(values #,@(vector->list wrapper-ress)))
#f #f
ordered-ress res-indicies ordered-ress res-indices
res-proj-vars indy-res-proj-vars res-proj-vars indy-res-proj-vars
wrapper-ress indy-res-vars wrapper-ress indy-res-vars
arg/res-to-indy-var)))] arg/res-to-indy-var)))]
@ -496,10 +496,10 @@
(if (istx-rst an-istx) (if (istx-rst an-istx)
(list (istx-rst an-istx)) (list (istx-rst an-istx))
'()))]) '()))])
(let-values ([(ordered-args arg-indicies) (find-ordering args+rst)] (let-values ([(ordered-args arg-indices) (find-ordering args+rst)]
[(ordered-ress res-indicies) (if (istx-ress an-istx) [(ordered-ress res-indices) (if (istx-ress an-istx)
(find-ordering (istx-ress an-istx)) (find-ordering (istx-ress an-istx))
(values '() '()))]) (values '() '()))])
(let ([wrapper-args (list->vector (let ([wrapper-args (list->vector
(append (generate-temporaries (map arg/res-var (istx-args an-istx))) (append (generate-temporaries (map arg/res-var (istx-args an-istx)))
@ -509,7 +509,7 @@
[indy-arg-vars (generate-temporaries (map arg/res-var ordered-args))] [indy-arg-vars (generate-temporaries (map arg/res-var ordered-args))]
[arg-proj-vars (list->vector (generate-temporaries (map arg/res-var args+rst)))] [arg-proj-vars (list->vector (generate-temporaries (map arg/res-var args+rst)))]
;; this list is parallel to arg-proj-vars (so use arg-indicies to find the right ones) ;; this list is parallel to arg-proj-vars (so use arg-indices to find the right ones)
;; but it contains #fs in places where we don't need the indy projections (because the corresponding ;; but it contains #fs in places where we don't need the indy projections (because the corresponding
;; argument is not dependened on by anything) ;; argument is not dependened on by anything)
[indy-arg-proj-vars (list->vector (map (λ (x) (maybe-generate-temporary [indy-arg-proj-vars (list->vector (map (λ (x) (maybe-generate-temporary
@ -524,7 +524,7 @@
[indy-res-vars (generate-temporaries (map arg/res-var ordered-ress))] [indy-res-vars (generate-temporaries (map arg/res-var ordered-ress))]
[res-proj-vars (list->vector (generate-temporaries (map arg/res-var (or (istx-ress an-istx) '()))))] [res-proj-vars (list->vector (generate-temporaries (map arg/res-var (or (istx-ress an-istx) '()))))]
;; this list is parallel to res-proj-vars (so use res-indicies to find the right ones) ;; this list is parallel to res-proj-vars (so use res-indices to find the right ones)
;; but it contains #fs in places where we don't need the indy projections (because the corresponding ;; but it contains #fs in places where we don't need the indy projections (because the corresponding
;; result is not dependened on by anything) ;; result is not dependened on by anything)
[indy-res-proj-vars (list->vector (map (λ (x) (maybe-generate-temporary [indy-res-proj-vars (list->vector (map (λ (x) (maybe-generate-temporary
@ -602,7 +602,7 @@
(args/vars->arg-checker (args/vars->arg-checker
(result-checkers (result-checkers
an-istx an-istx
ordered-ress res-indicies ordered-ress res-indices
res-proj-vars indy-res-proj-vars res-proj-vars indy-res-proj-vars
wrapper-ress indy-res-vars wrapper-ress indy-res-vars
arg/res-to-indy-var) arg/res-to-indy-var)
@ -611,7 +611,7 @@
wrapper-args wrapper-args
this-param))) this-param)))
#t #t
ordered-args arg-indicies ordered-args arg-indices
arg-proj-vars indy-arg-proj-vars arg-proj-vars indy-arg-proj-vars
wrapper-args indy-arg-vars wrapper-args indy-arg-vars
arg/res-to-indy-var))]) arg/res-to-indy-var))])

View File

@ -170,7 +170,7 @@ Several environment variables can affect DrRacket's behavior:
@item{@indexed-envvar{PLTDRXREFDELAY} : When this environment variable @item{@indexed-envvar{PLTDRXREFDELAY} : When this environment variable
is set, DrRacket uses an ordinary @racket[delay] (instead of is set, DrRacket uses an ordinary @racket[delay] (instead of
@racket[delay/idle]) to delay the computation of the searching @racket[delay/idle]) to delay the computation of the searching
indicies. This means that Check Syntax will start more slowly indices. This means that Check Syntax will start more slowly
the first time, but that the startup performance is more the first time, but that the startup performance is more
predictable. In addition, when the environment variable is predictable. In addition, when the environment variable is
set, DrRacket will print out that it is set, and will print set, DrRacket will print out that it is set, and will print

View File

@ -310,7 +310,7 @@ please adhere to these guidelines:
(plt:hd:refresh-downloading... "Загрузить ~a...") (plt:hd:refresh-downloading... "Загрузить ~a...")
(plt:hd:refresh-deleting... "Удалить старую версию ~a...") (plt:hd:refresh-deleting... "Удалить старую версию ~a...")
(plt:hd:refresh-installing... "Инсталировать новую версию ~a...") (plt:hd:refresh-installing... "Инсталировать новую версию ~a...")
(plt:hd:refresh-clearing-indicies "Очистить кешированные индексы") (plt:hd:refresh-clearing-indices "Очистить кешированные индексы")
(plt:hd:refreshing-manuals-finished "Готово.") (plt:hd:refreshing-manuals-finished "Готово.")
(plt:hd:about-help-desk "О помощи") (plt:hd:about-help-desk "О помощи")
(plt:hd:help-desk-about-string (plt:hd:help-desk-about-string

View File

@ -310,7 +310,7 @@ please adhere to these guidelines:
(plt:hd:refresh-downloading... "Завантажити ~a...") (plt:hd:refresh-downloading... "Завантажити ~a...")
(plt:hd:refresh-deleting... "Видалити стару версію ~a...") (plt:hd:refresh-deleting... "Видалити стару версію ~a...")
(plt:hd:refresh-installing... "Інсталювати нову версію ~a...") (plt:hd:refresh-installing... "Інсталювати нову версію ~a...")
(plt:hd:refresh-clearing-indicies "Очистити кешовані індекси") (plt:hd:refresh-clearing-indices "Очистити кешовані індекси")
(plt:hd:refreshing-manuals-finished "Готово.") (plt:hd:refreshing-manuals-finished "Готово.")
(plt:hd:about-help-desk "Про допомогу") (plt:hd:about-help-desk "Про допомогу")
(plt:hd:help-desk-about-string (plt:hd:help-desk-about-string

View File

@ -54,7 +54,7 @@
(remove-hard-link "planet" "docs-test.plt" 1 0) (remove-hard-link "planet" "docs-test.plt" 1 0)
;; run raco setup a second time to clear out the ;; run raco setup a second time to clear out the
;; indicies that were added by running docs-test.plt. ;; indices that were added by running docs-test.plt.
(define res2 (define res2
(parameterize ([current-output-port out] (parameterize ([current-output-port out]
[current-error-port out]) [current-error-port out])