Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PATCH] Typos in 3.08 branch #2890

Closed
vicuna opened this issue Jul 1, 2004 · 1 comment
Closed

[PATCH] Typos in 3.08 branch #2890

vicuna opened this issue Jul 1, 2004 · 1 comment
Labels

Comments

@vicuna
Copy link

vicuna commented Jul 1, 2004

Original bug ID: 2890
Reporter: administrator
Status: closed
Resolution: fixed
Priority: normal
Severity: minor
Category: ~DO NOT USE (was: OCaml general)

Bug description

Full_Name: Blair Zajac
Version: 3.08+alpha0 (2004-06-22)
OS: Linux
Submission from: www.amthinking.net (65.104.119.37)

I was looking at the diffs between CVS HEAD and the new branch and noticed a
number
of typos.

Patch here.

Blair

Index: Changes

RCS file: /caml/ocaml/Changes,v
retrieving revision 1.140.2.1
diff -u -r1.140.2.1 Changes
--- Changes 2004/06/22 17:38:07 1.140.2.1
+++ Changes 2004/07/01 21:35:21
@@ -16,7 +16,7 @@

  • More compact compilation of classes.
  • Much more efficient handling of class definitions inside functors
    or local modules.
    -- Simpler represention for method tables. Objects can now be marshalled
    +- Simpler representation for method tables. Objects can now be marshaled
    between identical programs with the flag Marshal.Closures.
  • Improved error messages for objects and variants.
  • Improved printing of inferred module signatures (toplevel and ocamlc -i).
    @@ -131,7 +131,7 @@
    type of any subexpression in the source file. Works even in the case
    of a type error (all the types computed up to the error are available).
    This new feature is also supported by ocamlbrowser.
    -- Disable "method is overriden" warning when the method was explicitely
    +- Disable "method is overriden" warning when the method was explicitly
    redefined as virtual beforehand (i.e. not through inheritance). Typing
    and semantics are unchanged.

Index: README.win32

RCS file: /caml/ocaml/README.win32,v
retrieving revision 1.34
diff -u -r1.34 README.win32
--- README.win32 2004/06/17 07:48:05 1.34
+++ README.win32 2004/07/01 21:35:22
@@ -103,7 +103,7 @@

  • Windows NT, 2000, or XP (we advise against compiling under Windows 95/98/ME)
  • Visual C++ version 6 or 7
  • MASM version 6.11 (see above)
    -- The CygWin port of GNU tools, available from
    +- The Cygwin port of GNU tools, available from
    http://sourceware.cygnus.com/cygwin/
  • TCL/TK version 8.3 (for the LablTK GUI) (see above).

Index: Upgrading

RCS file: /caml/ocaml/Upgrading,v
retrieving revision 1.3
diff -u -r1.3 Upgrading
--- Upgrading 2001/11/07 07:55:08 1.3
+++ Upgrading 2004/07/01 21:35:22
@@ -4,7 +4,7 @@
I Installation

Q1: When compiling the distribution, I am getting strange linking

  • errors in otherlibraries.
  • errors in other libraries.

A1: This is probably a problem with dynamic linking. You can disable
it with ./configure -no-shared-libs. If you really want to use
@@ -91,7 +91,7 @@
mode, so that you shouldn't see too much differences when using
labeled libraries. Labels are only compulsory in partial
applications (including the special case of function with an

  • unkwnown return type), or if you wrote some of them.
  • unknown return type), or if you wrote some of them.

    On the other hand, for definitions, labels present in the
    interface must also be present in the implementation.
    Index: camlp4/meta/pa_macro.ml
    ===================================================================
    RCS file: /caml/ocaml/camlp4/meta/pa_macro.ml,v
    retrieving revision 1.2.4.5
    diff -u -r1.2.4.5 pa_macro.ml
    --- camlp4/meta/pa_macro.ml 2004/06/29 20:41:00 1.2.4.5
    +++ camlp4/meta/pa_macro.ml 2004/07/01 21:35:26
    @@ -257,7 +257,7 @@

and execute_macro_list = fun
[ [] -> []
-| [hd::tl] -> (* The eveluation order is important here )
+| [hd::tl] -> (
The evaluation order is important here *)
let il1 = execute_macro hd in
let il2 = execute_macro_list tl in
il1 @ il2 ]
Index: man/ocamldoc.m

RCS file: /caml/ocaml/man/ocamldoc.m,v
retrieving revision 1.1
diff -u -r1.1 ocamldoc.m
--- man/ocamldoc.m 2004/03/22 15:23:22 1.1
+++ man/ocamldoc.m 2004/07/01 21:35:30
@@ -490,7 +490,7 @@

.TP
.B -man-mini
-Generate man pages only for modules, module types, clases and class types,
+Generate man pages only for modules, module types, classes and class types,
instead of pages for all elements.

.TP
Index: man/ocamlprof.m

RCS file: /caml/ocaml/man/ocamlprof.m,v
retrieving revision 1.2
diff -u -r1.2 ocamlprof.m
--- man/ocamlprof.m 1996/05/10 13:27:23 1.2
+++ man/ocamlprof.m 2004/07/01 21:35:30
@@ -41,7 +41,7 @@
Specifies an additional string to be output with profiling information.
By default,
.B ocamlprof
-will annotate progams with comments of the form
+will annotate programs with comments of the form
.BI (* \ n \ *)
where
.I n
Index: otherlibs/unix/unix.ml

RCS file: /caml/ocaml/otherlibs/unix/unix.ml,v
retrieving revision 1.60.2.1
diff -u -r1.60.2.1 unix.ml
--- otherlibs/unix/unix.ml 2004/06/22 17:18:50 1.60.2.1
+++ otherlibs/unix/unix.ml 2004/07/01 21:35:37
@@ -171,7 +171,7 @@
if ofs < 0 || len < 0 || ofs > String.length buf - len
then invalid_arg "Unix.write"
else unsafe_write fd buf ofs len
-(* write missbehaves because it attempts to write all data by making repeated
+(* write misbehaves because it attempts to write all data by making repeated
calls to the Unix write function (see comment in write.c and unix.mli).
partial_write fixes this by never calling write twice. *)
let single_write fd buf ofs len =
Index: otherlibs/unix/unix.mli

RCS file: /caml/ocaml/otherlibs/unix/unix.mli,v
retrieving revision 1.79.2.1
diff -u -r1.79.2.1 unix.mli
--- otherlibs/unix/unix.mli 2004/06/22 17:18:50 1.79.2.1
+++ otherlibs/unix/unix.mli 2004/07/01 21:35:40
@@ -262,13 +262,13 @@
in string [buff]. Return the number of characters actually
written.

  • When an error is repported some characters might have already been
  • When an error is reported some characters might have already been
    written. Use [single_write] instead to ensure that this is not the
    case. *)

val single_write : file_descr -> string -> int -> int -> int
(** Same as [write] but ensures that all errors are reported and

  • that no character has ever been written when an error is repported. *)
  • that no character has ever been written when an error is reported. *)

(** {6 Interfacing with the standard input/output library} *)
Index: otherlibs/unix/unixLabels.mli

RCS file: /caml/ocaml/otherlibs/unix/unixLabels.mli,v
retrieving revision 1.12.2.1
diff -u -r1.12.2.1 unixLabels.mli
--- otherlibs/unix/unixLabels.mli 2004/06/22 17:18:50 1.12.2.1
+++ otherlibs/unix/unixLabels.mli 2004/07/01 21:35:44
@@ -265,13 +265,13 @@
in string [buff]. Return the number of characters actually
written.

  • When an error is repported some characters might have already been
  • When an error is reported some characters might have already been
    written. Use [single_write] instead to ensure that this is not the
    case. *)

val single_write : file_descr -> buf:string -> pos:int -> len:int -> int
(** Same as [write] but ensures that all errors are reported and

  • that no character has ever been written when an error is repported. *)
  • that no character has ever been written when an error is reported. *)

(** {6 Interfacing with the standard input/output library} *)
Index: otherlibs/unix/write.c

RCS file: /caml/ocaml/otherlibs/unix/write.c,v
retrieving revision 1.13.6.1
diff -u -r1.13.6.1 write.c
--- otherlibs/unix/write.c 2004/06/22 17:18:50 1.13.6.1
+++ otherlibs/unix/write.c 2004/07/01 21:35:44
@@ -55,8 +55,8 @@
return Val_long(written);
}

-/* When an error occurs after the first loop, it unix_write repports the

  • error and discard the number of already written caracters.
    +/* When an error occurs after the first loop, unix_write reports the
  • error and discard the number of already written characters.
    In this case, it would be better to discard the error and return the
    number of bytes written, since most likely, unix_write will be call again,
    and the error will be reproduced and this time will be reported.
    orcaware%
@vicuna
Copy link
Author

vicuna commented Jul 2, 2004

Comment author: administrator

fixed --DD 2004-07-02

@vicuna vicuna closed this as completed Jul 2, 2004
@vicuna vicuna added the bug label Mar 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

1 participant