Skip to content

Commit 1946594

Browse files
FourchauxArmael
authored andcommitted
Fixing typos in various files (ocaml#2246)
Note: Typos found with https://github.com/codespell-project/codespell Here is the (semi-manual) command used to get (and correct) the typos: $ codespell -i 3 -w --skip=".png,.gif,./ocaml/boot,./ocaml/.git,./ocaml/manual/styles,./ocaml/manual/manual/htmlman" -L minimise,instal,contructor,"o'caml",cristal,pres,clos,cmo,uint,iff,te,objext,nto,nd,mut,upto,larg,exten,leage,mthod,delte,tim,atleast,langage,hten,iwth,mke,contant,succint,methids,eles,valu,clas,modul,que,classe,missings,froms,defaut,correspondance,differents,configury,reachs,cas,approche,normale,dur,millon,amin,oje,transfert
1 parent 0779456 commit 1946594

Some content is hidden

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

69 files changed

+120
-120
lines changed

.mailmap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# See the MAPPING AUTHORS section of 'man git-shortlog' for more details.
99

1010
# Such a remapping may be useful in particular for tracking authorship
11-
# of commits erroneously made under an obscure alias or email adress.
11+
# of commits erroneously made under an obscure alias or email address.
1212
# (Some Name <some@name.com>, pour ne pas le citer)
1313

1414

Changes

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ OCaml 4.08.0
135135
- GPR#1957: Add Stack.{top_opt,pop_opt} and Queue.{peek_opt,take_opt}.
136136
(Vladimir Keleshev, review by Nicolás Ojeda Bär and Gabriel Scherer)
137137

138-
- GPR#1959: Add Format.dprintf, a printing function which ouputs a closure
138+
- GPR#1959: Add Format.dprintf, a printing function which outputs a closure
139139
usable with %t.
140140
(Gabriel Radanne, request by Armaël Guéneau,
141141
review by Florian Angeletti and Gabriel Scherer)
@@ -1005,11 +1005,11 @@ OCaml 4.07.0 (10 July 2018)
10051005
- GPR#1627: Reduce cmx sizes by sharing variable names (Flambda only).
10061006
(Fuyong Quah, Leo White, review by Xavier Clerc)
10071007

1008-
- GPR#1665: reduce the size of cmx files in classic mode by droping the
1008+
- GPR#1665: reduce the size of cmx files in classic mode by dropping the
10091009
bodies of functions that will not be inlined.
10101010
(Fuyong Quah, review by Leo White and Pierre Chambart)
10111011

1012-
- GPR#1666: reduce the size of cmx files in classic mode by droping the
1012+
- GPR#1666: reduce the size of cmx files in classic mode by dropping the
10131013
bodies of functions that cannot be reached from the module block.
10141014
(Fuyong Quah, review by Leo White and Pierre Chambart)
10151015

@@ -1825,7 +1825,7 @@ OCaml 4.06.0 (3 Nov 2017):
18251825

18261826
* MPR#7478, GPR#1037: ocamldoc, do not use as a module preamble documentation
18271827
comments that occur after the first module element. This change may break
1828-
existing documenation. In particular, module preambles must now come before
1828+
existing documentation. In particular, module preambles must now come before
18291829
any `open` statement.
18301830
(Florian Angeletti, review by David Allsopp and report by Daniel Bünzli)
18311831

@@ -3471,7 +3471,7 @@ OCaml 4.03.0 (25 Apr 2016):
34713471
this is the semantics they wanted).
34723472
(Alain Frisch, request by Martin Jambon and John Whitington)
34733473

3474-
- PR#6920: fix debug informations around uses of %apply or %revapply
3474+
- PR#6920: fix debug information around uses of %apply or %revapply
34753475
(Jérémie Dimino, report by Daniel Bünzli)
34763476

34773477
- PR#6939: Segfault with improper use of let-rec
@@ -4067,7 +4067,7 @@ OCaml 4.03.0 (25 Apr 2016):
40674067
- PR#6980: Assert failure from polymorphic variants and existentials
40684068
(Jacques Garrigue, report by Leo White)
40694069

4070-
- PR#6981: Ctype.Unify(_) with associated functor arg refering to previous one
4070+
- PR#6981: Ctype.Unify(_) with associated functor arg referring to previous one
40714071
(Jacques Garrigue, report by Nicholas Labich)
40724072

40734073
- PR#6982: unexpected type error when packing a module alias
@@ -4183,7 +4183,7 @@ OCaml 4.03.0 (25 Apr 2016):
41834183
(Jacques Garrigue, report by Stephen Dolan)
41844184

41854185
- PR#7324: OCaml 4.03.0 type checker dies with an assert failure when
4186-
given some cyclic recusive module expression
4186+
given some cyclic recursive module expression
41874187
(Jacques Garrigue, report by jmcarthur)
41884188

41894189
- PR#7368: Manual major GC fails to compact the heap
@@ -4256,7 +4256,7 @@ OCaml 4.03.0 (25 Apr 2016):
42564256
- PR#6367, GPR#25: introduce Asttypes.arg_label to encode labelled arguments
42574257
(Frédéric Bour and Jacques Garrigue)
42584258

4259-
- PR#6452, GPR#140: add internal suport for custom printing formats
4259+
- PR#6452, GPR#140: add internal support for custom printing formats
42604260
(Jérémie Dimino)
42614261

42624262
- PR#6611: remove the option wrapper on optional arguments in the syntax tree
@@ -4279,7 +4279,7 @@ OCaml 4.03.0 (25 Apr 2016):
42794279
(Simon Cruanes)
42804280

42814281
* PR#6816: reject integer and float literals directly followed by an identifier.
4282-
This was prevously read as two separate tokens.
4282+
This was previously read as two separate tokens.
42834283
[let abc = 1 in (+) 123abc] was accepted and is now rejected.
42844284
(Hugo Heuzard)
42854285

@@ -4618,7 +4618,7 @@ Bug fixes:
46184618
(Stephen Dolan, Mark Shinwell)
46194619

46204620
Feature wishes:
4621-
- PR#6452, GPR#140: add internal suport for custom printing formats
4621+
- PR#6452, GPR#140: add internal support for custom printing formats
46224622
(Jérémie Dimino)
46234623
- PR#6641: add -g, -ocamlcflags, -ocamloptflags options to ocamlmklib
46244624
(whitequark)
@@ -4885,7 +4885,7 @@ Bug fixes:
48854885
(Jacques Garrigue and John Whitington)
48864886
- PR#6174: OCaml compiler loops on an example using GADTs (-rectypes case)
48874887
(Jacques Garrigue and Grégoire Henry, report by Chantal Keller)
4888-
- PR#6175: open! was not suppored by camlp4
4888+
- PR#6175: open! was not supported by camlp4
48894889
(Hongbo Zhang)
48904890
- PR#6184: ocamlbuild: `ocamlfind ocamldep` does not support -predicate
48914891
(Jacques-Pascal Deplaix)
@@ -5216,7 +5216,7 @@ Bug fixes:
52165216
(Damien Doligez, report by Markus Mottl)
52175217
* PR#5580: missed opportunities for constant propagation
52185218
(Xavier Leroy and John Carr)
5219-
- PR#5611: avoid clashes betwen .cmo files and output files during linking
5219+
- PR#5611: avoid clashes between .cmo files and output files during linking
52205220
(Wojciech Meyer)
52215221
- PR#5662: typo in md5.c
52225222
(Olivier Andrieu)
@@ -5230,7 +5230,7 @@ Bug fixes:
52305230
(Fabrice Le Fessant)
52315231
- PR#5697: better location for warnings on statement expressions
52325232
(Dan Bensen)
5233-
- PR#5698: remove harcoded limit of 200000 labels in emitaux.ml
5233+
- PR#5698: remove hardcoded limit of 200000 labels in emitaux.ml
52345234
(Fabrice Le Fessant, report by Marcin Sawicki)
52355235
- PR#5702: bytecomp/bytelibrarian lib_sharedobjs was defined but never used
52365236
(Hongbo Zhang, Fabrice Le Fessant)
@@ -5303,7 +5303,7 @@ Bug fixes:
53035303
- PR#5824: Generate more efficient code for immediate right shifts.
53045304
(Pierre Chambart, review by Xavier Leroy)
53055305
- PR#5825: Add a toplevel primitive to use source file wrapped with the
5306-
coresponding module
5306+
corresponding module
53075307
(Grégoire Henry, Wojciech Meyer, caml-list discussion)
53085308
- PR#5833: README.win32 can leave the wrong flexlink in the path
53095309
(Damien Doligez, report by William Smith)
@@ -5323,7 +5323,7 @@ Bug fixes:
53235323
(Alain Frisch, Gabriel Scherer, report by Julien Moutinho)
53245324
- PR#5877: multiple "open" can become expensive in memory
53255325
(Fabrice Le Fessant and Alain Frisch)
5326-
- PR#5880: 'Genlex.make_lexer' documention mentions the wrong exception
5326+
- PR#5880: 'Genlex.make_lexer' documentation mentions the wrong exception
53275327
(Xavier Clerc, report by Virgile Prevosto)
53285328
- PR#5885: Incorrect rule for compiling C stubs when shared libraries are not
53295329
supported.
@@ -5572,7 +5572,7 @@ Native-code compiler:
55725572
OCamldoc:
55735573
- PR#5645: ocamldoc doesn't handle module/type substitution in signatures
55745574
- PR#5544: improve HTML output (less formatting in html code)
5575-
- PR#5522: allow refering to record fields and variant constructors
5575+
- PR#5522: allow referring to record fields and variant constructors
55765576
- fix PR#5419 (error message in french)
55775577
- fix PR#5535 (no cross ref to class after dump+load)
55785578
* Use first class modules for custom generators, to be able to
@@ -6470,7 +6470,7 @@ Standard library:
64706470
and prints nothing (useful to print conditionally).
64716471
- Scanf:
64726472
new function format_from_string to convert a string to a format string;
6473-
new %r conversion to accomodate user defined scanners.
6473+
new %r conversion to accommodate user defined scanners.
64746474
- Filename: improved Win32 implementation of Filename.quote.
64756475
- List: List.nth now tail-recursive.
64766476
- Sys: added Sys.is_directory. Some functions (e.g. Sys.command) that
@@ -7490,7 +7490,7 @@ Both compilers:
74907490
- Option -warn-error to turn warnings into errors.
74917491
- Option -where to print the location of the standard library directory.
74927492
- Assertions are now type-checked even if the -noassert option is given,
7493-
thus -noassert can no longe change the types of modules.
7493+
thus -noassert can no longer change the types of modules.
74947494

74957495
Bytecode compiler and bytecode interpreter:
74967496
- Print stack backtrace when a program aborts due to an uncaught exception
@@ -7508,7 +7508,7 @@ Native-code compiler:
75087508
- Removed spurious dependency on the -lcurses library.
75097509

75107510
Toplevel environment:
7511-
- Revised handling of top-level value definitions, allows reclaimation
7511+
- Revised handling of top-level value definitions, allows reclamation
75127512
of definitions that are shadowed by later definitions with the same names.
75137513
(E.g. "let x = <big list>;; let x = 1;;" allows <big list> to be reclaimed.)
75147514
- Revised the tracing facility so that for standard library functions,
@@ -8274,7 +8274,7 @@ Objective Caml 1.03 (29 Oct 1996):
82748274
exp() or log() cause a domain error; fixed bug with
82758275
String.length "literal";
82768276
- Sparc, Mips, HPPA: removed marking of scanned stack frames
8277-
(benefits do not outweight cost).
8277+
(benefits do not outweigh cost).
82788278

82798279
* Standard library:
82808280
- Arg.parse now prints documentation for command-line options;
@@ -8434,7 +8434,7 @@ marshaling to/from strings.
84348434

84358435
* Thread library: much better support for I/O and blocking system calls.
84368436

8437-
* Graphics library: faster reclaimation of unused pixmaps.
8437+
* Graphics library: faster reclamation of unused pixmaps.
84388438

84398439
* Unix library: new functions {set,clear}_nonblock, {set,clear}_close_on_exec,
84408440
{set,get}itimer, inet_addr_any, {get,set}sockopt.

asmcomp/CSEgen.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type op_class =
2424
| Op_other (* anything else that does not allocate nor store in memory *)
2525

2626
class cse_generic : object
27-
(* The following methods can be overriden to handle processor-specific
27+
(* The following methods can be overridden to handle processor-specific
2828
operations. *)
2929

3030
method class_of_operation: Mach.operation -> op_class

asmcomp/compilenv.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ val record_global_approx_toplevel: unit -> unit
8686
clambda-only *)
8787

8888
val set_export_info: Export_info.t -> unit
89-
(* Record the informations of the unit being compiled
89+
(* Record the information of the unit being compiled
9090
flambda-only *)
9191
val approx_env: unit -> Export_info.t
9292
(* Returns all the information loaded from external compilation units

build-aux/libtool.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
614614
# LT_OUTPUT
615615
# ---------
616616
# This macro allows early generation of the libtool script (before
617-
# AC_OUTPUT is called), incase it is used in configure for compilation
617+
# AC_OUTPUT is called), in case it is used in configure for compilation
618618
# tests.
619619
AC_DEFUN([LT_OUTPUT],
620620
[: ${CONFIG_LT=./config.lt}
@@ -651,7 +651,7 @@ configured by $[0], generated by m4_PACKAGE_STRING.
651651
652652
Copyright (C) 2011 Free Software Foundation, Inc.
653653
This config.lt script is free software; the Free Software Foundation
654-
gives unlimited permision to copy, distribute and modify it."
654+
gives unlimited permission to copy, distribute and modify it."
655655
656656
while test 0 != $[#]
657657
do
@@ -2866,7 +2866,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
28662866
# before this can be enabled.
28672867
hardcode_into_libs=yes
28682868
2869-
# Ideally, we could use ldconfig to report *all* directores which are
2869+
# Ideally, we could use ldconfig to report *all* directories which are
28702870
# searched for libraries, however this is still not possible. Aside from not
28712871
# being certain /sbin/ldconfig is available, command
28722872
# 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,

build-aux/ltmain.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ func_require_term_colors ()
546546

547547
# _G_HAVE_PLUSEQ_OP
548548
# Can be empty, in which case the shell is probed, "yes" if += is
549-
# useable or anything else if it does not work.
549+
# usable or anything else if it does not work.
550550
test -z "$_G_HAVE_PLUSEQ_OP" \
551551
&& (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
552552
&& _G_HAVE_PLUSEQ_OP=yes
@@ -696,7 +696,7 @@ eval 'func_dirname ()
696696
# to NONDIR_REPLACEMENT.
697697
# value returned in "$func_dirname_result"
698698
# basename: Compute filename of FILE.
699-
# value retuned in "$func_basename_result"
699+
# value returned in "$func_basename_result"
700700
# For efficiency, we do not delegate to the functions above but instead
701701
# duplicate the functionality here.
702702
eval 'func_dirname_and_basename ()
@@ -854,7 +854,7 @@ func_mkdir_p ()
854854
# While some portion of DIR does not yet exist...
855855
while test ! -d "$_G_directory_path"; do
856856
# ...make a list in topmost first order. Use a colon delimited
857-
# list incase some portion of path contains whitespace.
857+
# list in case some portion of path contains whitespace.
858858
_G_dir_list=$_G_directory_path:$_G_dir_list
859859

860860
# If the last portion added has no slash in it, the list is done
@@ -1630,7 +1630,7 @@ func_run_hooks ()
16301630

16311631
case " $hookable_fns " in
16321632
*" $1 "*) ;;
1633-
*) func_fatal_error "'$1' does not support hook funcions.n" ;;
1633+
*) func_fatal_error "'$1' does not support hook functions.n" ;;
16341634
esac
16351635

16361636
eval _G_hook_fns=\$$1_hooks; shift
@@ -5961,7 +5961,7 @@ EOF
59615961
{
59625962
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
59635963
namespace, but it is not one of the ones we know about and
5964-
have already dealt with, above (inluding dump-script), then
5964+
have already dealt with, above (including dump-script), then
59655965
report an error. Otherwise, targets might begin to believe
59665966
they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
59675967
namespace. The first time any user complains about this, we'll

bytecomp/instruct.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,6 @@ type instruction =
108108
let immed_min = -0x40000000
109109
and immed_max = 0x3FFFFFFF
110110

111-
(* Actually the abstract machine accomodates -0x80000000 to 0x7FFFFFFF,
111+
(* Actually the abstract machine accommodates -0x80000000 to 0x7FFFFFFF,
112112
but these numbers overflow the OCaml type int if the compiler runs on
113113
a 32-bit processor. *)

bytecomp/lambda.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ exception Not_simple
362362
let max_raw = 32
363363

364364
let make_key e =
365-
let count = ref 0 (* Used for controling size *)
365+
let count = ref 0 (* Used for controlling size *)
366366
and make_key = Ident.make_key_generator () in
367367
(* make_key is used for normalizing let-bound variables *)
368368
let rec tr_rec env e =

bytecomp/matching.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ let rebuild_nexts arg nexts k =
882882
in actions (cf. simplify_cases).
883883
884884
Additionally, if the match argument is a variable, matchings whose
885-
first column is made of variables only are splitted further
885+
first column is made of variables only are split further
886886
(cf. precompile_var).
887887
888888
*)
@@ -1067,7 +1067,7 @@ and precompile_var args cls def k = match args with
10671067
| [] -> assert false
10681068
| _::((Lvar v as av,_) as arg)::rargs ->
10691069
begin match cls with
1070-
| [_] -> (* as splitted as it can *)
1070+
| [_] -> (* as split as it can *)
10711071
dont_precompile_var args cls def k
10721072
| _ ->
10731073
(* Precompile *)
@@ -2523,7 +2523,7 @@ let rec event_branch repr lam =
25232523
25242524
compile_list (for compiling switch results) catch Unused
25252525
2526-
comp_match_handlers (for compiling splitted matches)
2526+
comp_match_handlers (for compiling split matches)
25272527
may reraise Unused
25282528
25292529

bytecomp/switch.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ end
134134
Adaptation of
135135
R.L. Berstein
136136
``Producing good code for the case statement''
137-
Sofware Practice and Experience, 15(10) (1985)
137+
Software Practice and Experience, 15(10) (1985)
138138
and
139139
D.L. Spuler
140140
``Two-Way Comparison Search Trees, a Generalisation of Binary Search Trees

0 commit comments

Comments
 (0)