Skip to content

Commit b8c3631

Browse files
committed
fix typos found by Eric Lindblad
1 parent dfe9f43 commit b8c3631

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+97
-88
lines changed

LOG

+9
Original file line numberDiff line numberDiff line change
@@ -2321,3 +2321,12 @@
23212321
s/cpnanopass.ss
23222322
- corrected signature of multibyte->string and string->multibyte
23232323
s/primdata.ss
2324+
- fix typos found by Eric Lindblad
2325+
c/alloc.c c/compress-io.c c/gc.c c/gcwrapper.c c/new-io.c c/prim5.c
2326+
c/schsig.c csug/csug.stex csug/syntax.stex examples/template.ss
2327+
mats/4.ms mats/6.ms mats/7.ms mats/8.ms mats/bytevector.ms mats/foreign.ms
2328+
mats/io.ms mats/mat.ss mats/misc.ms mats/oop.ms mats/oop.ss mats/profile.ms
2329+
mats/record.ms mats/unix.ms s/5_3.ss s/7.ss s/arm32.ss s/base-lang.ss
2330+
s/cmacros.ss s/cp0.ss s/cpnanopass.ss s/date.ss s/format.ss s/io.ss
2331+
s/mkheader.ss s/np-languages.ss s/pdhtml.ss s/ppc32.ss s/print.ss
2332+
s/syntax.ss s/x86.ss s/x86_64.ss

c/alloc.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void S_protect(ptr *p) {
7676
void S_reset_scheme_stack(ptr tc, iptr n) {
7777
ptr *x; iptr m;
7878

79-
/* we allow less than one_shot_headroom here for no truly justifyable
79+
/* we allow less than one_shot_headroom here for no truly justifiable
8080
reason */
8181
n = ptr_align(n + (one_shot_headroom >> 1));
8282

@@ -289,7 +289,7 @@ void S_mark_card_dirty(uptr card, IGEN to_g) {
289289
}
290290
}
291291

292-
/* scan remembered set from P to ENDP, transfering to dirty vector */
292+
/* scan remembered set from P to ENDP, transferring to dirty vector */
293293
void S_scan_dirty(ptr **p, ptr **endp) {
294294
uptr this, last;
295295

@@ -349,7 +349,7 @@ void S_scan_remembered_set(void) {
349349
tc_mutex_release()
350350
}
351351

352-
/* S_get_more_room is called from genereated machine code when there is
352+
/* S_get_more_room is called from generated machine code when there is
353353
* insufficient room for an allocation. ap has already been incremented
354354
* by the size of the object and xp is a (typed) pointer to the value of
355355
* ap before the allocation attempt. xp must be set to a new object of

c/compress-io.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
don't increase the output-port in-buffer size unless you're sure
4141
it reduces object-file size or reduces compression time
4242
significantly. don't decrease it unless you're sure it doesn't
43-
increase object-file size significnatly. one buffer of size
43+
increase object-file size significantly. one buffer of size
4444
LZ4_OUTPUT_PORT_IN_BUFFER_SIZE is allocated per lz4-compressed
4545
output port. another buffer of a closely related size is allocated
4646
per thread. */

c/gc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ static void sweep_generation(ptr tc FORMAL_CTGS) {
14801480
}
14811481

14821482
/* Waiting until sweeping doesn't trigger a change reduces the
1483-
chance that an ephemeron must be reigistered as a
1483+
chance that an ephemeron must be registered as a
14841484
segment-specific trigger or gets triggered for recheck, but
14851485
it doesn't change the worst-case complexity. */
14861486
if (!change)

c/gcwrapper.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ void S_check_heap(IBOOL aftergc) {
607607
if (checkheap_noisy && si->dirty_bytes[d] < dirty) {
608608
/* sweep_dirty won't sweep, and update dirty byte, for
609609
cards with dirty pointers to segments older than the
610-
maximum copyied generation, so we can get legitimate
610+
maximum copied generation, so we can get legitimate
611611
conservative dirty bytes even after gc */
612612
printf("... Conservative dirty byte %x (%x) %sfor segment %#tx card %d ",
613613
si->dirty_bytes[d], dirty,

c/new-io.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ ptr S_bytevector_read(ptr file, ptr bv, iptr start, iptr count, IBOOL gzflag) {
457457
/* If we are running on Apple Silicon under Rosetta 2 translation, work around
458458
a bug (present in 11.2.3 at least) in its handling of memory page protection
459459
bits. One of the tasks that Rosetta handles is to appropriately twiddle the
460-
execute and write bits based on what's happinging to the memory in order to
460+
execute and write bits based on what's happening to the memory in order to
461461
preserve the illusion that the pages have RWX permissions, whereas Apple
462462
Silicon enforces a W^X (write XOR execute) model. For some reason, this
463463
bit-twiddling sometimes fails when the bytevector passed to `read` extends
@@ -965,6 +965,6 @@ ptr S_bytevector_uncompress(ptr dest_bv, iptr d_start, iptr d_count,
965965
return Sstring("internal error uncompressing ~s");
966966
}
967967
default:
968-
return Sstring("unepxected compress format ~s");
968+
return Sstring("unexpected compress format ~s");
969969
}
970970
}

c/prim5.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ static s_thread_rv_t s_backdoor_thread_start(void *p) {
13581358
(void) Sdeactivate_thread();
13591359
display("thread deactivated\n")
13601360
(void) Sactivate_thread();
1361-
display("thread reeactivated\n")
1361+
display("thread reactivated\n")
13621362
Scall0((ptr)p);
13631363
Sdestroy_thread();
13641364
display("thread destroyed\n")

c/schsig.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static void split(ptr k, ptr *s) {
7272
tc_mutex_release()
7373
}
7474

75-
/* We may come in to S_split_and_resize with a multi-shot contination whose
75+
/* We may come in to S_split_and_resize with a multi-shot continuation whose
7676
* stack segment exceeds the copy bound or is too large to fit along
7777
* with the return values in the current stack. We may also come in to
7878
* S_split_and_resize with a one-shot continuation for which all of the

csug/csug.stex

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
\def\revisiondate{April 2022}
2626

27-
% Just don't care amout small overflows, most of the time:
27+
% Just don't care about small overflows, most of the time:
2828
\iflatex
2929
\hfuzz=16.0pt
3030
\fi

csug/syntax.stex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,7 @@ should not be greater than \var{efp}.
18281828
\scheme{current-make-source-object} is used by the reader to construct
18291829
a source object for an annotation. \scheme{current-make-source-object}
18301830
is initially bound to \scheme{make-source-object}, and the reader always
1831-
calls the function bound to the paramater with three arguments.
1831+
calls the function bound to the parameter with three arguments.
18321832

18331833
Adjust this parameter to, for example, eagerly convert a position integer
18341834
to a file-position object, instead of delaying the conversion to

examples/template.ss

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
;;; | <keyword> <template-id>
3737
;;; <additional-pattern> -> <initial-pattern>
3838
;;; | (<keyword> (<syntax-pattern>*) <template-id>) ...
39-
;;; | (<keyword> <tempalte-id>) ...
39+
;;; | (<keyword> <template-id>) ...
4040
;;; | (optional <keyword> (<syntax-pattern>*)
4141
;;; <template-id>)
4242
;;; | (optional <keyword> <template-id>)
@@ -196,7 +196,7 @@
196196
(define (p) (flush-output-port op) (extract-string-and-reset! tb))
197197
(values op p line column))))
198198

199-
;; scan foward for blanks, and if it leads you to a new-line, strip
199+
;; scan forward for blanks, and if it leads you to a new-line, strip
200200
;; the previous blanks back to the new line.
201201
(define (finish-strip ip stack bfp start-bfp)
202202
(let ([node-to-strip (car stack)])
@@ -687,7 +687,7 @@ cat >> /tmp/rockets <<END
687687
@if((= y 0))
688688
Again!
689689
@elif((= y 1))
690-
Rockets are awseome!
690+
Rockets are awesome!
691691
@elif((= y 2))
692692
Explosions!
693693
@else
@@ -703,7 +703,7 @@ END
703703
scheme -q << END
704704
(import (template))
705705
(unless (equal? (let ([xs '(3 2 1)] [y 1]) (include-template "/tmp/rockets"))
706-
"Test\n3 ...\n2 ...\n1 ...\nBlast off!\nRockets are awseome!\n")
706+
"Test\n3 ...\n2 ...\n1 ...\nBlast off!\nRockets are awesome!\n")
707707
(error #f "test 10 failed"))
708708
END
709709
scheme -q << END

mats/4.ms

+1-1
Original file line numberDiff line numberDiff line change
@@ -3907,7 +3907,7 @@
39073907
;; ----------------------------------------
39083908
;; Check interaction of mutation and generations
39093909
3910-
;; This check disables interrups so that a garbage collection
3910+
;; This check disables interrupts so that a garbage collection
39113911
;; happens only for the explicit `collect` request.
39123912
(with-interrupts-disabled
39133913
(let ([e (ephemeron-cons (gensym) 'ok)])

mats/6.ms

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
(begin (current-input-port (console-input-port)) #t)
195195
196196
; the following tests open-input-string, open-output-string, read-char,
197-
; eof-object?, unread-char, write-char, and get-ouptut-string
197+
; eof-object?, unread-char, write-char, and get-output-string
198198
(let ([s "hi there, mom!"])
199199
(let ([ip (open-input-string s)] [op (open-output-string)])
200200
(do ([c (read-char ip) (read-char ip)])

mats/7.ms

+1-1
Original file line numberDiff line numberDiff line change
@@ -4961,7 +4961,7 @@ evaluating module init
49614961
(error?
49624962
(verify-loadability 'load "testfile-clI1.so"))
49634963

4964-
; make sure compile-whole-program perserves the information verify-loadability needs
4964+
; make sure compile-whole-program preserves the information verify-loadability needs
49654965
(begin
49664966
(mkfile "testfile-clJ0.ss"
49674967
'(library (testfile-clJ0) (export x0) (import (chezscheme)) (define x0 'eat) (printf "invoking J0\n")))

mats/8.ms

+5-5
Original file line numberDiff line numberDiff line change
@@ -4241,7 +4241,7 @@
42414241
(define x 77))
42424242
#t)
42434243
; this works because the indirect export of x for b
4244-
; counts as an indrect export of x for a. perhaps it
4244+
; counts as an indirect export of x for a. perhaps it
42454245
; shouldn't work.
42464246
(eqv?
42474247
(let () (import $ie-E) a)
@@ -5901,7 +5901,7 @@
59015901
(equal?
59025902
(qs-foo 3 2 1)
59035903
'(a 1 2 3))
5904-
; tests adpated from Andre van Tonder posts to srfi 93 discussion
5904+
; tests adapted from Andre van Tonder posts to srfi 93 discussion
59055905
(equal?
59065906
(let ()
59075907
(define-syntax swap!
@@ -8441,7 +8441,7 @@
84418441
(import (a3-6 foo))
84428442
(cons x a))
84438443
'("hello" . "boo"))
8444-
; import a library in subset-mode system, then outsied of subset-mode system
8444+
; import a library in subset-mode system, then outside of subset-mode system
84458445
(begin
84468446
(with-output-to-file "testfile-a3-7.ss"
84478447
(lambda ()
@@ -11369,7 +11369,7 @@
1136911369
(make-source-file-descriptor "foo" 17))
1137011370
(error? ; #<input port stdin> is not a binary-input port
1137111371
(make-source-file-descriptor "foo" (open-string-input-port "oops")))
11372-
(error? ; #<binary input port> does not supoprt port-position and set-port-position!
11372+
(error? ; #<binary input port> does not support port-position and set-port-position!
1137311373
(make-source-file-descriptor "foo"
1137411374
(make-custom-binary-input-port "foo" (lambda (bv s c) 0) #f #f #f)
1137511375
#t))
@@ -11814,7 +11814,7 @@
1181411814
(begin
1181511815
(collect (collect-maximum-generation))
1181611816
;; After collecting the maximum generation, the
11817-
;; cached information shoould definitely be gone:
11817+
;; cached information should definitely be gone:
1181811818
(equal? (call-with-values
1181911819
(lambda () (locate-source sfd-to-cache 8 #t))
1182011820
(lambda () 'gone))

mats/bytevector.ms

+3-3
Original file line numberDiff line numberDiff line change
@@ -10408,7 +10408,7 @@
1040810408
#x01 #x00 #x00 #x65
1040910409
#x00 #x00 #x00 #x65)
1041010410
'big
10411-
; rkd: added endianness-manditory? flag
10411+
; rkd: added endianness-mandatory? flag
1041210412
#t))
1041310413
=> #t)
1041410414
@@ -10454,7 +10454,7 @@
1045410454
#x65 #x00 #x00 #x01
1045510455
#x65 #x00 #x00 #x00)
1045610456
'little
10457-
; rkd: added endianness-manditory? flag
10457+
; rkd: added endianness-mandatory? flag
1045810458
#t))
1045910459
=> #t)
1046010460

@@ -10920,7 +10920,7 @@
1092010920

1092110921
#t)
1092210922

10923-
; Currently the reference implementation is the only implemenation,
10923+
; Currently the reference implementation is the only implementation,
1092410924
; so go ahead and use it for the tests and the random tests below.
1092510925
(define bytevector-and $bytevector-and)
1092610926
(define bytevector-ior $bytevector-ior)

mats/foreign.ms

+2-2
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,7 @@
17481748
(let ([bv1 (string->utf8 "hello")] [bv2 (make-bytevector 5)])
17491749
($fp-bvcopy bv2 bv1 5)
17501750
(and (bytevector=? bv1 bv2) (bytevector=? bv1 (string->utf8 "hello"))))
1751-
;; No longer an error since make-ftype-pointer also serves to make foriegn-pointers
1751+
;; No longer an error since make-ftype-pointer also serves to make foreign-pointers
17521752
#;(error? ; "memcpy" is not a procedure
17531753
(make-ftype-pointer memcpy_t "memcpy"))
17541754
(error? ; unrecognized ftype
@@ -2422,7 +2422,7 @@
24222422
(+ $stack-depth $base-value)))
24232423
(or (= (optimize-level) 3)
24242424
; similarly, but with a ptr return value so the values error is signaled
2425-
; by S_call_help wrather than the foreign-procedure wrapper
2425+
; by S_call_help rather than the foreign-procedure wrapper
24262426
(eqv?
24272427
($with-exit-proc
24282428
(lambda (ignore)

mats/io.ms

+1-1
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@
10471047
(newline op)
10481048
(close-port op)))
10491049
; NB: keep this last among the iconv-codec mats
1050-
; close any files left open by failing iconv tests. this is particulary
1050+
; close any files left open by failing iconv tests. this is particularly
10511051
; important on windows when the iconv dll isn't available and where keeping
10521052
; file open can prevent it from being reopened.
10531053
(begin (collect (collect-maximum-generation)) #t)

mats/mat.ss

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@
462462
(let* ([stdout-stuff (slurp from-stdout)]
463463
[stderr-stuff (slurp from-stderr)])
464464
(when (string=? stderr-stuff "")
465-
(printf "$separate-eval command succeeeded with\nSTDERR:\n~a\nSTDOUT:\n~a\nEND\n" stderr-stuff stdout-stuff))
465+
(printf "$separate-eval command succeeded with\nSTDERR:\n~a\nSTDOUT:\n~a\nEND\n" stderr-stuff stdout-stuff))
466466
(unless (string=? stderr-stuff "")
467467
(printf "$separate-eval command failed with\nSTDERR:\n~a\nSTDOUT:\n~a\nEND\n" stderr-stuff stdout-stuff)
468468
(errorf who "~a" stderr-stuff))

mats/misc.ms

+1-1
Original file line numberDiff line numberDiff line change
@@ -2284,7 +2284,7 @@
22842284
(cost-center-allocation-count cc)))
22852285

22862286
(let ([x (fx+ 3 (random 10))])
2287-
((lambda (count) ; range for padding on 32-bit and to accomadate 64-bit words
2287+
((lambda (count) ; range for padding on 32-bit and to accommodate 64-bit words
22882288
(<= (fxsll (fx+ x 1) 2) count (fxsll (fx+ x 2) 3)))
22892289
(let ([cc (make-cost-center)])
22902290
(with-cost-center cc

mats/oop.ms

+3-3
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@
704704
;; "method-3" and "method-4" because they're used by
705705
;; <test-2>. Chez OOP produces a "generic function"
706706
;; for each method, and it looks like those functions
707-
;; all have to belong to one line of the class inheritence
707+
;; all have to belong to one line of the class inheritance
708708
;; tree.
709709
710710
;; sub-class w/ overload
@@ -1103,7 +1103,7 @@
11031103
; compiler will catch. A few might not fail given the proper compiler
11041104
; extension (i.e. do classes and variables share the same namespace...)
11051105
1106-
(error? ; duplicate definition repeat, repeat?, and make-repeate
1106+
(error? ; duplicate definition repeat, repeat?, and make-repeat
11071107
(letrec-classes ([Repeat () (<root>) ()]
11081108
[Repeat () (<root>) ()])
11091109
0))
@@ -1244,7 +1244,7 @@
12441244
0)
12451245

12461246
(eq?
1247-
;; naive inheritence example
1247+
;; naive inheritance example
12481248
(letrec-classes ([One () (<root>) ()])
12491249
(letrec-classes ([Two () (One) ()])
12501250
0))

mats/oop.ss

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ products:
107107
- consider exposing query-interface somehow
108108
- (interface I x) => version of x to which I's methods are applicable
109109
- (interface->instance (interface I x)) => x
110-
- interfaces and inheritence
110+
- interfaces and inheritance
111111
- either require parent for define-interface or hide <root-interface>
112-
- consider allowing multiple inheritence (including zero parents) for interfaces
112+
- consider allowing multiple inheritance (including zero parents) for interfaces
113113
|#
114114

115115
#|

mats/profile.ms

+1-1
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@
962962
(file-found? "testfile-coverage1b.ss")
963963
(file-found? "testfile-coverage1c.ss")
964964
(not (file-found? "testfile-coverage1d.ss"))))
965-
; the coverage table retreived should include counts for both sets of load-program calls
965+
; the coverage table retrieved should include counts for both sets of load-program calls
966966
(and
967967
(andmap
968968
(lambda (dumpit)

mats/record.ms

+1-1
Original file line numberDiff line numberDiff line change
@@ -9099,7 +9099,7 @@
90999099
(and (member o l) #t))
91009100
91019101
(mat cp0-kar-kons-optimizations
9102-
; for now, it's necesary to run cp0 three times to complete the reduction
9102+
; for now, it's necessary to run cp0 three times to complete the reduction
91039103
(equal?
91049104
(with-output-to-string
91059105
(lambda ()

mats/unix.ms

+1-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@
363363
(eq? (sleep (make-time 'time-duration 0 2)) (void))
364364
(symbol? (with-input-from-file "testfile.ss" read))
365365
; following should be time<?, but access times are not updated on some
366-
; file systems, particulary nfs file systems. but we wouldn't expect
366+
; file systems, particularly nfs file systems. but we wouldn't expect
367367
; time to run backwards (except for one hour for DST)
368368
(time<=? $taccess (file-access-time "testfile.ss"))
369369
(begin

s/5_3.ss

+3-3
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
(define flatanh
199199
(or (op-if-entry? cflop1 "(cs)atanh")
200200
; |x| <= 1
201-
; principle expression:
201+
; principal expression:
202202
; (log(1+x)-log(1-x))/2
203203
; should use "log1p" but it doesn't exist on the 88k
204204
(let ([f (lambda (x)
@@ -219,7 +219,7 @@
219219
(define flasinh
220220
; scheme-coded version needs "log2"
221221
(or (op-if-entry? cflop1 "(cs)asinh")
222-
; prinicple expression:
222+
; principal expression:
223223
; log(x + sqrt(xx + 1))
224224
; avoids spurious overflows
225225
; avoids underflow problems from negative x by using identity
@@ -236,7 +236,7 @@
236236
; scheme-coded version needs "log2"
237237
(or (op-if-entry? cflop1 "(cs)acosh")
238238
; x >= 1
239-
; prinicple expression:
239+
; principal expression:
240240
; log(x + sqrt(xx - 1))
241241
; avoids spurious overflows
242242
(lambda (x)

0 commit comments

Comments
 (0)