Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: aryx/fork-mmm
base: 52a0da75a4
...
head fork: aryx/fork-mmm
compare: f500b421e1
  • 6 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
View
4 crcs/crcs.ml
@@ -1,6 +1,6 @@
let crc_unit_list = [
"Oo",
- "\064\167\234\226\218\249\234\125\003\196\237\119\240\072\033\236";
+ "\058\163\169\176\174\065\166\055\250\072\193\070\156\242\233\166";
"Safe418",
- "\127\190\207\194\159\056\197\013\021\041\232\186\174\102\128\229"
+ "\142\053\149\071\028\121\230\183\008\115\178\082\227\157\199\000"
]
View
2  crcs/crcsmmm.ml
@@ -1,4 +1,4 @@
let crc_unit_list = [
"Safe418mmm",
- "\035\247\171\072\159\122\187\126\027\243\046\049\125\051\172\186"
+ "\007\075\155\038\174\046\090\068\032\061\102\213\217\235\189\226"
]
View
174 external/ocamltk/lib/.depend
@@ -1,174 +0,0 @@
-bell.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-button.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-canvas.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-checkbutton.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-clipboard.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-dialog.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-entry.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-focus.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-frame.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-grab.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-grid.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-imagebitmap.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-imagephoto.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-label.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-listbox.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-menu.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-menubutton.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-message.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-optionmenu.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-pack.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-palette.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-pixmap.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-place.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-radiobutton.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-resource.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-scale.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-scrollbar.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-selection.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-text.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-tk.cmi: ../support/widget.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi
-tkgen.cmi:
-tkwait.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-toplevel.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-winfo.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-wm.cmi: ../support/widget.cmi tk.cmi ../support/textvariable.cmi
-bell.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi bell.cmi
-bell.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx bell.cmi
-button.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi button.cmi
-button.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx button.cmi
-canvas.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi canvas.cmi
-canvas.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx canvas.cmi
-checkbutton.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi checkbutton.cmi
-checkbutton.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx checkbutton.cmi
-clipboard.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi clipboard.cmi
-clipboard.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx clipboard.cmi
-dialog.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi dialog.cmi
-dialog.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx dialog.cmi
-entry.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi entry.cmi
-entry.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx entry.cmi
-focus.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi focus.cmi
-focus.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx focus.cmi
-frame.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi frame.cmi
-frame.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx frame.cmi
-grab.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi grab.cmi
-grab.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx grab.cmi
-grid.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi grid.cmi
-grid.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx grid.cmi
-imagebitmap.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi imagebitmap.cmi
-imagebitmap.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx imagebitmap.cmi
-imagephoto.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi imagephoto.cmi
-imagephoto.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx imagephoto.cmi
-label.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi label.cmi
-label.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx label.cmi
-listbox.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi listbox.cmi
-listbox.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx listbox.cmi
-menu.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi menu.cmi
-menu.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx menu.cmi
-menubutton.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi menubutton.cmi
-menubutton.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx menubutton.cmi
-message.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi message.cmi
-message.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx message.cmi
-optionmenu.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi optionmenu.cmi
-optionmenu.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx optionmenu.cmi
-pack.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi pack.cmi
-pack.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx pack.cmi
-palette.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi palette.cmi
-palette.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx palette.cmi
-pixmap.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi imagephoto.cmi pixmap.cmi
-pixmap.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx imagephoto.cmx pixmap.cmi
-place.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi place.cmi
-place.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx place.cmi
-radiobutton.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi radiobutton.cmi
-radiobutton.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx radiobutton.cmi
-resource.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi resource.cmi
-resource.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx resource.cmi
-scale.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi scale.cmi
-scale.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx scale.cmi
-scrollbar.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi scrollbar.cmi
-scrollbar.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx scrollbar.cmi
-selection.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi selection.cmi
-selection.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx selection.cmi
-text.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi text.cmi
-text.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx text.cmi
-tk.cmo: ../support/widget.cmi ../support/textvariable.cmi \
- ../support/support.cmi ../support/protocol.cmi tk.cmi
-tk.cmx: ../support/widget.cmx ../support/textvariable.cmx \
- ../support/support.cmx ../support/protocol.cmx tk.cmi
-tkgen.cmo: ../support/widget.cmi tkgen.cmi
-tkgen.cmx: ../support/widget.cmx tkgen.cmi
-tkwait.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi tkwait.cmi
-tkwait.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx tkwait.cmi
-toplevel.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi toplevel.cmi
-toplevel.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx toplevel.cmi
-winfo.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi winfo.cmi
-winfo.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx winfo.cmi
-wm.cmo: ../support/widget.cmi tk.cmi ../support/textvariable.cmi \
- ../support/protocol.cmi wm.cmi
-wm.cmx: ../support/widget.cmx tk.cmx ../support/textvariable.cmx \
- ../support/protocol.cmx wm.cmi
View
2  external/ocamltk/lib/modules
@@ -1 +1 @@
-WIDGETOBJS=place.cmo resource.cmo wm.cmo imagephoto.cmo canvas.cmo button.cmo text.cmo label.cmo scrollbar.cmo pixmap.cmo palette.cmo message.cmo menu.cmo entry.cmo listbox.cmo focus.cmo menubutton.cmo pack.cmo toplevel.cmo frame.cmo dialog.cmo imagebitmap.cmo clipboard.cmo radiobutton.cmo tkwait.cmo grab.cmo selection.cmo scale.cmo optionmenu.cmo winfo.cmo grid.cmo checkbutton.cmo bell.cmo
+WIDGETOBJS=bell.cmo scale.cmo winfo.cmo scrollbar.cmo entry.cmo listbox.cmo wm.cmo tkwait.cmo grab.cmo canvas.cmo clipboard.cmo label.cmo resource.cmo message.cmo text.cmo imagephoto.cmo frame.cmo selection.cmo dialog.cmo place.cmo pixmap.cmo menubutton.cmo radiobutton.cmo focus.cmo pack.cmo imagebitmap.cmo optionmenu.cmo checkbutton.cmo palette.cmo menu.cmo button.cmo toplevel.cmo grid.cmo
View
10 modif-orig.txt
@@ -1,9 +1,15 @@
-was mmm418, ported to use camltk418 and ocaml 3.12 and Mac. It works!
+The original code was called 'mmm418' and was ported to use camltk418.
+Then I ported it to ocaml 3.12 and Mac. It now works!
+Ported to ocaml 4.00.1.
Moved arount lots of stuff. Simplified the Makefiles.
-have first to:
+Have first to:
$ cd external/ocamltk
$ ./configure
$ make
$ make install
+
+Then:
+ $ make depend # adjust path to ocamltk in some .depend
+ $ make
View
9 sandbox/safestd.mli
@@ -608,7 +608,7 @@ module Hashtbl : sig
type ('a, 'b) t
(* The type of hash tables from type ['a] to type ['b]. *)
-val create : int -> ('a,'b) t
+val create : ?random:bool -> int -> ('a,'b) t
(* [Hashtbl.create n] creates a new, empty hash table, with
initial size [n]. For best results, [n] should be on the
order of the expected number of elements that will be in
@@ -692,12 +692,15 @@ module type HashedType =
([(==)], [Hashtbl.hash]) for comparing objects by addresses
(e.g. for mutable or cyclic keys). *)
+type statistics
+
module type S =
sig
type key
type 'a t
val create : int -> 'a t
val clear : 'a t -> unit
+ val reset : 'a t -> unit
val copy : 'a t -> 'a t
val add : 'a t -> key -> 'a -> unit
val remove : 'a t -> key -> unit
@@ -708,6 +711,8 @@ module type S =
val iter : (key -> 'a -> unit) -> 'a t -> unit
val fold : (key -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
val length : 'a t -> int
+
+ val stats: 'a t -> statistics
end
module Make(H : HashedType) : (S with type key = H.t)
@@ -729,7 +734,7 @@ val hash : 'a -> int
Moreover, [hash] always terminates, even on cyclic
structures. *)
-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
+val hash_param : int -> int -> 'a -> int
(* [Hashtbl.hash_param n m x] computes a hash value for [x], with the
same properties as for [hash]. The two extra parameters [n] and
[m] give more precise control over hashing. Hashing performs a
View
1  sandbox/safeunix.ml
@@ -121,6 +121,7 @@ type open_flag = Unix.open_flag =
| O_DSYNC (** Writes complete as `Synchronised I/O data integrity completion' *)
| O_SYNC (** Writes complete as `Synchronised I/O file integrity completion' *)
| O_RSYNC (** Reads complete as writes (depending on O_SYNC/O_DSYNC) *)
+ | O_SHARE_DELETE
(* The flags to [open]. *)
View
1  sandbox/safeunix.mli
@@ -113,6 +113,7 @@ type open_flag =
| O_DSYNC (** Writes complete as `Synchronised I/O data integrity completion' *)
| O_SYNC (** Writes complete as `Synchronised I/O file integrity completion' *)
| O_RSYNC (** Reads complete as writes (depending on O_SYNC/O_DSYNC) *)
+ | O_SHARE_DELETE
(* The flags to [open]. *)

No commit comments for this range

Something went wrong with that request. Please try again.