summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes2
-rw-r--r--Makefile2
-rw-r--r--Makefile.nt2
-rw-r--r--_tags12
-rw-r--r--asmcomp/alpha/arch.ml2
-rw-r--r--asmcomp/alpha/emit.mlp2
-rw-r--r--asmcomp/alpha/proc.ml2
-rw-r--r--asmcomp/alpha/reload.ml2
-rw-r--r--asmcomp/alpha/scheduling.ml2
-rw-r--r--asmcomp/alpha/selection.ml2
-rw-r--r--asmcomp/amd64/arch.ml2
-rw-r--r--asmcomp/amd64/emit.mlp2
-rw-r--r--asmcomp/amd64/emit_nt.mlp2
-rw-r--r--asmcomp/amd64/proc.ml2
-rw-r--r--asmcomp/amd64/proc_nt.ml2
-rw-r--r--asmcomp/amd64/reload.ml2
-rw-r--r--asmcomp/amd64/scheduling.ml2
-rw-r--r--asmcomp/amd64/selection.ml2
-rw-r--r--asmcomp/arm/arch.ml2
-rw-r--r--asmcomp/arm/emit.mlp2
-rw-r--r--asmcomp/arm/proc.ml2
-rw-r--r--asmcomp/arm/reload.ml2
-rw-r--r--asmcomp/arm/scheduling.ml2
-rw-r--r--asmcomp/arm/selection.ml2
-rw-r--r--asmcomp/asmgen.ml2
-rw-r--r--asmcomp/asmgen.mli2
-rw-r--r--asmcomp/asmlibrarian.ml2
-rw-r--r--asmcomp/asmlibrarian.mli2
-rw-r--r--asmcomp/asmlink.ml2
-rw-r--r--asmcomp/asmlink.mli2
-rw-r--r--asmcomp/asmpackager.ml2
-rw-r--r--asmcomp/asmpackager.mli2
-rw-r--r--asmcomp/clambda.ml2
-rw-r--r--asmcomp/clambda.mli2
-rw-r--r--asmcomp/closure.ml2
-rw-r--r--asmcomp/closure.mli2
-rw-r--r--asmcomp/cmm.ml2
-rw-r--r--asmcomp/cmm.mli2
-rw-r--r--asmcomp/cmmgen.ml2
-rw-r--r--asmcomp/cmmgen.mli2
-rw-r--r--asmcomp/cmx_format.mli2
-rw-r--r--asmcomp/codegen.ml2
-rw-r--r--asmcomp/codegen.mli2
-rw-r--r--asmcomp/coloring.ml2
-rw-r--r--asmcomp/coloring.mli2
-rw-r--r--asmcomp/comballoc.ml2
-rw-r--r--asmcomp/comballoc.mli2
-rw-r--r--asmcomp/compilenv.ml2
-rw-r--r--asmcomp/compilenv.mli2
-rw-r--r--asmcomp/debuginfo.ml2
-rw-r--r--asmcomp/debuginfo.mli2
-rw-r--r--asmcomp/emit.mli2
-rw-r--r--asmcomp/emitaux.ml2
-rw-r--r--asmcomp/emitaux.mli2
-rw-r--r--asmcomp/hppa/arch.ml2
-rw-r--r--asmcomp/hppa/emit.mlp2
-rw-r--r--asmcomp/hppa/proc.ml2
-rw-r--r--asmcomp/hppa/reload.ml2
-rw-r--r--asmcomp/hppa/scheduling.ml2
-rw-r--r--asmcomp/hppa/selection.ml2
-rw-r--r--asmcomp/i386/arch.ml2
-rw-r--r--asmcomp/i386/emit.mlp2
-rw-r--r--asmcomp/i386/emit_nt.mlp2
-rw-r--r--asmcomp/i386/proc.ml2
-rw-r--r--asmcomp/i386/proc_nt.ml2
-rw-r--r--asmcomp/i386/reload.ml2
-rw-r--r--asmcomp/i386/scheduling.ml2
-rw-r--r--asmcomp/i386/selection.ml2
-rw-r--r--asmcomp/ia64/arch.ml2
-rw-r--r--asmcomp/ia64/emit.mlp2
-rw-r--r--asmcomp/ia64/proc.ml2
-rw-r--r--asmcomp/ia64/reload.ml2
-rw-r--r--asmcomp/ia64/scheduling.ml2
-rw-r--r--asmcomp/ia64/selection.ml2
-rw-r--r--asmcomp/interf.ml2
-rw-r--r--asmcomp/interf.mli2
-rw-r--r--asmcomp/linearize.ml2
-rw-r--r--asmcomp/linearize.mli2
-rw-r--r--asmcomp/liveness.ml2
-rw-r--r--asmcomp/liveness.mli2
-rw-r--r--asmcomp/mach.ml2
-rw-r--r--asmcomp/mach.mli2
-rw-r--r--asmcomp/mips/arch.ml2
-rw-r--r--asmcomp/mips/emit.mlp2
-rw-r--r--asmcomp/mips/proc.ml2
-rw-r--r--asmcomp/mips/reload.ml2
-rw-r--r--asmcomp/mips/scheduling.ml2
-rw-r--r--asmcomp/mips/selection.ml2
-rw-r--r--asmcomp/power/arch.ml2
-rw-r--r--asmcomp/power/emit.mlp2
-rw-r--r--asmcomp/power/proc.ml2
-rw-r--r--asmcomp/power/reload.ml2
-rw-r--r--asmcomp/power/scheduling.ml2
-rw-r--r--asmcomp/power/selection.ml2
-rw-r--r--asmcomp/printcmm.ml2
-rw-r--r--asmcomp/printcmm.mli2
-rw-r--r--asmcomp/printlinear.ml2
-rw-r--r--asmcomp/printlinear.mli2
-rw-r--r--asmcomp/printmach.ml2
-rw-r--r--asmcomp/printmach.mli2
-rw-r--r--asmcomp/proc.mli2
-rw-r--r--asmcomp/reg.ml2
-rw-r--r--asmcomp/reg.mli2
-rw-r--r--asmcomp/reload.mli2
-rw-r--r--asmcomp/reloadgen.ml2
-rw-r--r--asmcomp/reloadgen.mli2
-rw-r--r--asmcomp/schedgen.ml2
-rw-r--r--asmcomp/schedgen.mli2
-rw-r--r--asmcomp/scheduling.mli2
-rw-r--r--asmcomp/selectgen.ml2
-rw-r--r--asmcomp/selectgen.mli2
-rw-r--r--asmcomp/selection.mli2
-rw-r--r--asmcomp/sparc/arch.ml2
-rw-r--r--asmcomp/sparc/emit.mlp2
-rw-r--r--asmcomp/sparc/proc.ml2
-rw-r--r--asmcomp/sparc/reload.ml2
-rw-r--r--asmcomp/sparc/scheduling.ml2
-rw-r--r--asmcomp/sparc/selection.ml2
-rw-r--r--asmcomp/spill.ml2
-rw-r--r--asmcomp/spill.mli2
-rw-r--r--asmcomp/split.ml2
-rw-r--r--asmcomp/split.mli2
-rw-r--r--asmrun/Makefile2
-rw-r--r--asmrun/Makefile.nt2
-rw-r--r--asmrun/alpha.S2
-rw-r--r--asmrun/amd64.S2
-rw-r--r--asmrun/amd64nt.asm24
-rw-r--r--asmrun/arm.S2
-rw-r--r--asmrun/backtrace.c2
-rw-r--r--asmrun/fail.c2
-rw-r--r--asmrun/hppa.S24
-rw-r--r--asmrun/i386.S2
-rw-r--r--asmrun/i386nt.asm24
-rw-r--r--asmrun/ia64.S5
-rw-r--r--asmrun/m68k.S2
-rw-r--r--asmrun/mips.s2
-rw-r--r--asmrun/natdynlink.c13
-rw-r--r--asmrun/power-aix.S24
-rw-r--r--asmrun/power-elf.S24
-rw-r--r--asmrun/power-rhapsody.S24
-rw-r--r--asmrun/roots.c2
-rw-r--r--asmrun/signals_asm.c2
-rw-r--r--asmrun/signals_osdep.h2
-rw-r--r--asmrun/sparc.S2
-rw-r--r--asmrun/stack.h2
-rw-r--r--asmrun/startup.c2
-rwxr-xr-xboot/ocamlcbin1110561 -> 1110753 bytes
-rwxr-xr-xboot/ocamldepbin311117 -> 311117 bytes
-rwxr-xr-xboot/ocamllexbin171200 -> 171200 bytes
-rwxr-xr-xbuild/boot-c-parts.sh13
-rwxr-xr-xbuild/boot.sh13
-rwxr-xr-xbuild/buildbot12
-rwxr-xr-xbuild/camlp4-bootstrap.sh12
-rwxr-xr-xbuild/camlp4-byte-only.sh2
-rwxr-xr-xbuild/camlp4-mkCamlp4Ast.sh13
-rwxr-xr-xbuild/camlp4-native-only.sh2
-rw-r--r--build/camlp4-targets.sh13
-rwxr-xr-xbuild/distclean.sh2
-rwxr-xr-xbuild/fastworld.sh2
-rwxr-xr-xbuild/install.sh2
-rwxr-xr-xbuild/mixed-boot.sh2
-rwxr-xr-xbuild/mkconfig.sh12
-rwxr-xr-xbuild/mkmyocamlbuild_config.sh2
-rwxr-xr-xbuild/mkruntimedef.sh13
-rwxr-xr-xbuild/myocamlbuild.sh2
-rwxr-xr-xbuild/ocamlbuild-byte-only.sh2
-rwxr-xr-xbuild/ocamlbuild-native-only.sh2
-rwxr-xr-xbuild/ocamlbuildlib-native-only.sh2
-rw-r--r--build/otherlibs-targets.sh2
-rwxr-xr-xbuild/partial-install.sh2
-rw-r--r--build/targets.sh2
-rw-r--r--build/tolower.sed12
-rwxr-xr-xbuild/world.all.sh13
-rwxr-xr-xbuild/world.byte.sh13
-rwxr-xr-xbuild/world.native.sh13
-rwxr-xr-xbuild/world.sh2
-rw-r--r--bytecomp/bytegen.ml2
-rw-r--r--bytecomp/bytegen.mli2
-rw-r--r--bytecomp/bytelibrarian.ml2
-rw-r--r--bytecomp/bytelibrarian.mli2
-rw-r--r--bytecomp/bytelink.ml2
-rw-r--r--bytecomp/bytelink.mli2
-rw-r--r--bytecomp/bytepackager.ml2
-rw-r--r--bytecomp/bytepackager.mli2
-rw-r--r--bytecomp/bytesections.ml2
-rw-r--r--bytecomp/bytesections.mli2
-rw-r--r--bytecomp/cmo_format.mli2
-rw-r--r--bytecomp/dll.ml2
-rw-r--r--bytecomp/dll.mli2
-rw-r--r--bytecomp/emitcode.ml2
-rw-r--r--bytecomp/emitcode.mli2
-rw-r--r--bytecomp/instruct.ml2
-rw-r--r--bytecomp/instruct.mli2
-rw-r--r--bytecomp/lambda.ml2
-rw-r--r--bytecomp/lambda.mli2
-rw-r--r--bytecomp/matching.ml2
-rw-r--r--bytecomp/matching.mli2
-rw-r--r--bytecomp/meta.ml2
-rw-r--r--bytecomp/meta.mli2
-rw-r--r--bytecomp/printinstr.ml2
-rw-r--r--bytecomp/printinstr.mli2
-rw-r--r--bytecomp/printlambda.ml2
-rw-r--r--bytecomp/printlambda.mli2
-rw-r--r--bytecomp/runtimedef.mli2
-rw-r--r--bytecomp/simplif.ml2
-rw-r--r--bytecomp/simplif.mli2
-rw-r--r--bytecomp/switch.ml2
-rw-r--r--bytecomp/switch.mli2
-rw-r--r--bytecomp/symtable.ml2
-rw-r--r--bytecomp/symtable.mli2
-rw-r--r--bytecomp/translclass.ml2
-rw-r--r--bytecomp/translclass.mli2
-rw-r--r--bytecomp/translcore.ml2
-rw-r--r--bytecomp/translcore.mli2
-rw-r--r--bytecomp/translmod.ml2
-rw-r--r--bytecomp/translmod.mli2
-rw-r--r--bytecomp/translobj.ml2
-rw-r--r--bytecomp/translobj.mli2
-rw-r--r--bytecomp/typeopt.ml2
-rw-r--r--bytecomp/typeopt.mli2
-rw-r--r--byterun/Makefile2
-rwxr-xr-xbyterun/Makefile.common2
-rw-r--r--byterun/Makefile.nt2
-rw-r--r--byterun/alloc.c2
-rw-r--r--byterun/alloc.h2
-rw-r--r--byterun/array.c2
-rw-r--r--byterun/backtrace.c2
-rw-r--r--byterun/backtrace.h2
-rw-r--r--byterun/callback.c2
-rw-r--r--byterun/callback.h2
-rw-r--r--byterun/compact.c2
-rw-r--r--byterun/compact.h2
-rw-r--r--byterun/compare.c2
-rw-r--r--byterun/compare.h2
-rw-r--r--byterun/compatibility.h2
-rw-r--r--byterun/config.h2
-rw-r--r--byterun/custom.c2
-rw-r--r--byterun/custom.h2
-rw-r--r--byterun/debugger.c2
-rw-r--r--byterun/debugger.h2
-rw-r--r--byterun/dynlink.c2
-rw-r--r--byterun/dynlink.h2
-rw-r--r--byterun/exec.h2
-rw-r--r--byterun/extern.c2
-rw-r--r--byterun/fail.c2
-rw-r--r--byterun/fail.h2
-rw-r--r--byterun/finalise.c2
-rw-r--r--byterun/finalise.h2
-rw-r--r--byterun/fix_code.c2
-rw-r--r--byterun/fix_code.h2
-rw-r--r--byterun/floats.c2
-rw-r--r--byterun/freelist.c2
-rw-r--r--byterun/freelist.h2
-rw-r--r--byterun/gc.h2
-rw-r--r--byterun/gc_ctrl.c2
-rw-r--r--byterun/gc_ctrl.h2
-rw-r--r--byterun/globroots.c2
-rw-r--r--byterun/globroots.h2
-rw-r--r--byterun/hash.c2
-rw-r--r--byterun/hash.h2
-rw-r--r--byterun/instrtrace.c2
-rw-r--r--byterun/instrtrace.h2
-rw-r--r--byterun/instruct.h2
-rw-r--r--byterun/int64_emul.h2
-rw-r--r--byterun/int64_format.h2
-rw-r--r--byterun/int64_native.h2
-rw-r--r--byterun/intern.c2
-rw-r--r--byterun/interp.c2
-rw-r--r--byterun/interp.h2
-rw-r--r--byterun/intext.h2
-rw-r--r--byterun/ints.c2
-rw-r--r--byterun/io.c2
-rw-r--r--byterun/io.h2
-rw-r--r--byterun/lexing.c2
-rw-r--r--byterun/main.c2
-rw-r--r--byterun/major_gc.c2
-rw-r--r--byterun/major_gc.h2
-rw-r--r--byterun/md5.c2
-rw-r--r--byterun/md5.h2
-rw-r--r--byterun/memory.c2
-rw-r--r--byterun/memory.h2
-rw-r--r--byterun/meta.c2
-rw-r--r--byterun/minor_gc.c2
-rw-r--r--byterun/minor_gc.h2
-rw-r--r--byterun/misc.c2
-rw-r--r--byterun/misc.h2
-rw-r--r--byterun/mlvalues.h2
-rw-r--r--byterun/obj.c2
-rw-r--r--byterun/osdeps.h2
-rw-r--r--byterun/parsing.c2
-rw-r--r--byterun/prims.h2
-rw-r--r--byterun/printexc.c2
-rw-r--r--byterun/printexc.h2
-rw-r--r--byterun/reverse.h2
-rw-r--r--byterun/roots.c2
-rw-r--r--byterun/roots.h2
-rw-r--r--byterun/signals.c2
-rw-r--r--byterun/signals.h2
-rw-r--r--byterun/signals_byt.c2
-rw-r--r--byterun/signals_machdep.h2
-rw-r--r--byterun/stacks.c2
-rw-r--r--byterun/stacks.h2
-rw-r--r--byterun/startup.c6
-rw-r--r--byterun/startup.h2
-rw-r--r--byterun/str.c2
-rw-r--r--byterun/sys.c2
-rw-r--r--byterun/sys.h2
-rw-r--r--byterun/terminfo.c2
-rw-r--r--byterun/ui.h2
-rw-r--r--byterun/unix.c2
-rw-r--r--byterun/weak.c2
-rw-r--r--byterun/weak.h2
-rw-r--r--byterun/win32.c2
-rw-r--r--camlp4/Camlp4/Camlp4Ast.partial.ml14
-rw-r--r--camlp4/Camlp4/Debug.ml6
-rw-r--r--camlp4/Camlp4/Debug.mli6
-rw-r--r--camlp4/Camlp4/ErrorHandler.ml6
-rw-r--r--camlp4/Camlp4/ErrorHandler.mli6
-rw-r--r--camlp4/Camlp4/OCamlInitSyntax.ml6
-rw-r--r--camlp4/Camlp4/Options.ml6
-rw-r--r--camlp4/Camlp4/Options.mli6
-rw-r--r--camlp4/Camlp4/PreCast.ml6
-rw-r--r--camlp4/Camlp4/PreCast.mli6
-rw-r--r--camlp4/Camlp4/Printers/DumpCamlp4Ast.ml6
-rw-r--r--camlp4/Camlp4/Printers/DumpCamlp4Ast.mli6
-rw-r--r--camlp4/Camlp4/Printers/DumpOCamlAst.ml6
-rw-r--r--camlp4/Camlp4/Printers/DumpOCamlAst.mli6
-rw-r--r--camlp4/Camlp4/Printers/Null.ml6
-rw-r--r--camlp4/Camlp4/Printers/Null.mli6
-rw-r--r--camlp4/Camlp4/Printers/OCaml.ml6
-rw-r--r--camlp4/Camlp4/Printers/OCaml.mli6
-rw-r--r--camlp4/Camlp4/Printers/OCamlr.ml6
-rw-r--r--camlp4/Camlp4/Printers/OCamlr.mli6
-rw-r--r--camlp4/Camlp4/Register.ml6
-rw-r--r--camlp4/Camlp4/Register.mli6
-rw-r--r--camlp4/Camlp4/Sig.ml8
-rw-r--r--camlp4/Camlp4/Struct/AstFilters.ml6
-rw-r--r--camlp4/Camlp4/Struct/Camlp4Ast.mlast6
-rw-r--r--camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml6
-rw-r--r--camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.mli6
-rw-r--r--camlp4/Camlp4/Struct/CleanAst.ml6
-rw-r--r--camlp4/Camlp4/Struct/CommentFilter.ml6
-rw-r--r--camlp4/Camlp4/Struct/CommentFilter.mli6
-rw-r--r--camlp4/Camlp4/Struct/DynAst.ml6
-rw-r--r--camlp4/Camlp4/Struct/DynLoader.ml6
-rw-r--r--camlp4/Camlp4/Struct/DynLoader.mli6
-rw-r--r--camlp4/Camlp4/Struct/EmptyError.ml8
-rw-r--r--camlp4/Camlp4/Struct/EmptyError.mli8
-rw-r--r--camlp4/Camlp4/Struct/EmptyPrinter.ml6
-rw-r--r--camlp4/Camlp4/Struct/EmptyPrinter.mli6
-rw-r--r--camlp4/Camlp4/Struct/FreeVars.ml6
-rw-r--r--camlp4/Camlp4/Struct/FreeVars.mli6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Delete.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Dynamic.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Entry.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Failed.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Find.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Fold.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Fold.mli6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Insert.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Parser.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Parser.mli6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Print.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Print.mli6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Search.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Static.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Structure.ml6
-rw-r--r--camlp4/Camlp4/Struct/Grammar/Tools.ml6
-rw-r--r--camlp4/Camlp4/Struct/Lexer.mll6
-rw-r--r--camlp4/Camlp4/Struct/Loc.ml6
-rw-r--r--camlp4/Camlp4/Struct/Loc.mli6
-rw-r--r--camlp4/Camlp4/Struct/Quotation.ml6
-rw-r--r--camlp4/Camlp4/Struct/Token.ml6
-rw-r--r--camlp4/Camlp4/Struct/Token.mli6
-rw-r--r--camlp4/Camlp4Bin.ml6
-rw-r--r--camlp4/Camlp4Filters/Camlp4AstLifter.ml6
-rw-r--r--camlp4/Camlp4Filters/Camlp4ExceptionTracer.ml6
-rw-r--r--camlp4/Camlp4Filters/Camlp4FoldGenerator.ml8
-rw-r--r--camlp4/Camlp4Filters/Camlp4LocationStripper.ml6
-rw-r--r--camlp4/Camlp4Filters/Camlp4MapGenerator.ml14
-rw-r--r--camlp4/Camlp4Filters/Camlp4MetaGenerator.ml14
-rw-r--r--camlp4/Camlp4Filters/Camlp4Profiler.ml6
-rw-r--r--camlp4/Camlp4Filters/Camlp4TrashRemover.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4AstLoader.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4DebugParser.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4GrammarParser.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4ListComprehension.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4MacroParser.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4OCamlParser.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4OCamlParserParser.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4QuotationCommon.ml6
-rw-r--r--camlp4/Camlp4Parsers/Camlp4QuotationExpander.ml6
-rw-r--r--camlp4/Camlp4Printers/Camlp4AstDumper.ml6
-rw-r--r--camlp4/Camlp4Printers/Camlp4AutoPrinter.ml6
-rw-r--r--camlp4/Camlp4Printers/Camlp4NullDumper.ml6
-rw-r--r--camlp4/Camlp4Printers/Camlp4OCamlAstDumper.ml6
-rw-r--r--camlp4/Camlp4Printers/Camlp4OCamlPrinter.ml6
-rw-r--r--camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.ml6
-rw-r--r--camlp4/Camlp4Top/Rprint.ml6
-rw-r--r--camlp4/Camlp4Top/Top.ml6
-rw-r--r--camlp4/Camlp4_config.ml6
-rw-r--r--camlp4/Camlp4_config.mli6
-rw-r--r--camlp4/boot/Camlp4.ml56
-rw-r--r--camlp4/boot/Camlp4.ml414
-rw-r--r--camlp4/boot/Camlp4Ast.ml21
-rw-r--r--camlp4/boot/camlp4boot.ml73
-rw-r--r--camlp4/boot/camlp4boot.ml414
-rw-r--r--camlp4/camlp4prof.ml14
-rw-r--r--camlp4/camlp4prof.mli14
-rw-r--r--camlp4/examples/_tags13
-rw-r--r--camlp4/examples/apply_operator.ml14
-rw-r--r--camlp4/examples/apply_operator_test.ml14
-rw-r--r--camlp4/examples/arith.ml14
-rw-r--r--camlp4/examples/debug_extension.ml14
-rw-r--r--camlp4/examples/ex_str.ml14
-rw-r--r--camlp4/examples/ex_str_test.ml14
-rw-r--r--camlp4/examples/expression_closure.ml14
-rw-r--r--camlp4/examples/expression_closure_filter.ml14
-rw-r--r--camlp4/examples/expression_closure_test.ml14
-rw-r--r--camlp4/examples/fancy_lambda_quot.ml14
-rw-r--r--camlp4/examples/fancy_lambda_quot_test.ml14
-rw-r--r--camlp4/examples/free_vars_test.ml14
-rw-r--r--camlp4/examples/gen_match_case.ml14
-rw-r--r--camlp4/examples/gen_type_N.ml14
-rw-r--r--camlp4/examples/gettext_test.ml14
-rw-r--r--camlp4/examples/global_handler.ml14
-rw-r--r--camlp4/examples/global_handler_test.ml14
-rw-r--r--camlp4/examples/lambda_parser.ml14
-rw-r--r--camlp4/examples/lambda_quot.ml14
-rw-r--r--camlp4/examples/lambda_quot_expr.ml14
-rw-r--r--camlp4/examples/lambda_quot_patt.ml14
-rw-r--r--camlp4/examples/lambda_test.ml14
-rw-r--r--camlp4/examples/macros.ml14
-rw-r--r--camlp4/examples/parse_files.ml14
-rw-r--r--camlp4/examples/syb_fold.ml14
-rw-r--r--camlp4/examples/syb_map.ml14
-rw-r--r--camlp4/examples/test_macros.ml14
-rw-r--r--camlp4/examples/test_type_quotation.ml14
-rw-r--r--camlp4/examples/type_quotation.ml14
-rw-r--r--camlp4/man/Makefile13
-rw-r--r--camlp4/man/camlp4.1.tpl15
-rw-r--r--camlp4/mkcamlp4.ml6
-rw-r--r--camlp4/unmaintained/Makefile5
-rw-r--r--camlp4/unmaintained/extfold/README4
-rw-r--r--camlp4/unmaintained/format/Makefile5
-rw-r--r--camlp4/unmaintained/format/README4
-rw-r--r--camlp4/unmaintained/lefteval/Makefile5
-rw-r--r--camlp4/unmaintained/lefteval/README4
-rw-r--r--camlp4/unmaintained/ocamllex/Makefile5
-rw-r--r--camlp4/unmaintained/ocamllex/README4
-rw-r--r--camlp4/unmaintained/olabl/Makefile5
-rw-r--r--camlp4/unmaintained/olabl/README4
-rw-r--r--camlp4/unmaintained/scheme/Makefile7
-rw-r--r--camlp4/unmaintained/scheme/README4
-rw-r--r--camlp4/unmaintained/sml/Makefile5
-rw-r--r--camlp4/unmaintained/sml/README4
-rw-r--r--config/Makefile-templ2
-rw-r--r--config/Makefile.mingw2
-rw-r--r--config/Makefile.msvc2
-rw-r--r--config/Makefile.msvc642
-rw-r--r--config/auto-aux/align.c2
-rw-r--r--config/auto-aux/ansi.c2
-rw-r--r--config/auto-aux/async_io.c2
-rw-r--r--config/auto-aux/bytecopy.c2
-rw-r--r--config/auto-aux/dblalign.c2
-rw-r--r--config/auto-aux/divmod.c2
-rw-r--r--config/auto-aux/elf.c2
-rw-r--r--config/auto-aux/endian.c2
-rw-r--r--config/auto-aux/expm1.c2
-rw-r--r--config/auto-aux/getgroups.c2
-rw-r--r--config/auto-aux/gethostbyaddr.c2
-rw-r--r--config/auto-aux/gethostbyname.c2
-rwxr-xr-xconfig/auto-aux/hasgot13
-rw-r--r--config/auto-aux/hasgot213
-rw-r--r--config/auto-aux/ia32sse2.c2
-rw-r--r--config/auto-aux/initgroups.c6
-rw-r--r--config/auto-aux/int64align.c2
-rw-r--r--config/auto-aux/longlong.c2
-rwxr-xr-xconfig/auto-aux/runtest14
-rw-r--r--config/auto-aux/schar.c2
-rw-r--r--config/auto-aux/schar2.c2
-rwxr-xr-xconfig/auto-aux/searchpath14
-rw-r--r--config/auto-aux/setgroups.c6
-rw-r--r--config/auto-aux/sighandler.c2
-rw-r--r--config/auto-aux/signals.c2
-rw-r--r--config/auto-aux/sizes.c2
-rw-r--r--config/auto-aux/solaris-ld14
-rw-r--r--config/auto-aux/stackov.c2
-rw-r--r--config/auto-aux/tclversion.c18
-rwxr-xr-xconfig/auto-aux/trycompile14
-rw-r--r--config/m-nt.h2
-rw-r--r--config/m-templ.h2
-rw-r--r--config/s-nt.h2
-rw-r--r--config/s-templ.h2
-rwxr-xr-xconfigure2
-rw-r--r--debugger/Makefile2
-rw-r--r--debugger/Makefile.nt2
-rw-r--r--debugger/Makefile.shared2
-rw-r--r--debugger/breakpoints.ml4
-rw-r--r--debugger/breakpoints.mli4
-rw-r--r--debugger/checkpoints.ml4
-rw-r--r--debugger/checkpoints.mli4
-rw-r--r--debugger/command_line.ml4
-rw-r--r--debugger/command_line.mli4
-rw-r--r--debugger/debugcom.ml4
-rw-r--r--debugger/debugcom.mli4
-rw-r--r--debugger/debugger_config.ml6
-rw-r--r--debugger/debugger_config.mli4
-rw-r--r--debugger/envaux.ml4
-rw-r--r--debugger/envaux.mli4
-rw-r--r--debugger/eval.ml4
-rw-r--r--debugger/eval.mli4
-rw-r--r--debugger/events.ml4
-rw-r--r--debugger/events.mli4
-rw-r--r--debugger/exec.ml4
-rw-r--r--debugger/exec.mli4
-rw-r--r--debugger/frames.ml4
-rw-r--r--debugger/frames.mli4
-rw-r--r--debugger/history.ml4
-rw-r--r--debugger/history.mli4
-rw-r--r--debugger/input_handling.ml4
-rw-r--r--debugger/input_handling.mli4
-rw-r--r--debugger/int64ops.ml2
-rw-r--r--debugger/int64ops.mli2
-rw-r--r--debugger/lexer.mli4
-rw-r--r--debugger/lexer.mll4
-rw-r--r--debugger/loadprinter.ml2
-rw-r--r--debugger/loadprinter.mli2
-rw-r--r--debugger/main.ml4
-rw-r--r--debugger/parameters.ml4
-rw-r--r--debugger/parameters.mli4
-rw-r--r--debugger/parser.mly4
-rw-r--r--debugger/parser_aux.mli4
-rw-r--r--debugger/pattern_matching.ml4
-rw-r--r--debugger/pattern_matching.mli4
-rw-r--r--debugger/pos.ml2
-rw-r--r--debugger/pos.mli2
-rw-r--r--debugger/primitives.ml4
-rw-r--r--debugger/primitives.mli4
-rw-r--r--debugger/printval.ml4
-rw-r--r--debugger/printval.mli4
-rw-r--r--debugger/program_loading.ml4
-rw-r--r--debugger/program_loading.mli4
-rw-r--r--debugger/program_management.ml4
-rw-r--r--debugger/program_management.mli4
-rw-r--r--debugger/question.ml12
-rw-r--r--debugger/question.mli12
-rw-r--r--debugger/show_information.ml4
-rw-r--r--debugger/show_information.mli4
-rw-r--r--debugger/show_source.ml4
-rw-r--r--debugger/show_source.mli4
-rw-r--r--debugger/source.ml4
-rw-r--r--debugger/source.mli4
-rw-r--r--debugger/symbols.ml4
-rw-r--r--debugger/symbols.mli4
-rw-r--r--debugger/time_travel.ml4
-rw-r--r--debugger/time_travel.mli4
-rw-r--r--debugger/trap_barrier.ml4
-rw-r--r--debugger/trap_barrier.mli4
-rw-r--r--debugger/unix_tools.ml4
-rw-r--r--debugger/unix_tools.mli4
-rw-r--r--driver/compile.ml2
-rw-r--r--driver/compile.mli2
-rw-r--r--driver/errors.ml2
-rw-r--r--driver/errors.mli2
-rw-r--r--driver/main.ml2
-rw-r--r--driver/main.mli2
-rw-r--r--driver/main_args.ml2
-rw-r--r--driver/main_args.mli2
-rw-r--r--driver/ocamlcomp.sh.in12
-rw-r--r--driver/optcompile.ml2
-rw-r--r--driver/optcompile.mli2
-rw-r--r--driver/opterrors.ml2
-rw-r--r--driver/opterrors.mli2
-rw-r--r--driver/optmain.ml2
-rw-r--r--driver/optmain.mli2
-rw-r--r--driver/pparse.ml2
-rw-r--r--driver/pparse.mli2
-rw-r--r--emacs/Makefile2
-rw-r--r--emacs/README4
-rw-r--r--emacs/caml-compat.el2
-rw-r--r--emacs/caml-emacs.el2
-rw-r--r--emacs/caml-font-old.el4
-rw-r--r--emacs/caml-font.el12
-rw-r--r--emacs/caml-help.el2
-rw-r--r--emacs/caml-hilit.el4
-rw-r--r--emacs/caml-types.el2
-rw-r--r--emacs/caml-xemacs.el2
-rw-r--r--emacs/caml.el6
-rw-r--r--emacs/camldebug.el2
-rw-r--r--emacs/inf-caml.el2
-rw-r--r--emacs/ocamltags.in2
-rwxr-xr-xexperimental/doligez/checkheaders157
-rw-r--r--lex/Makefile2
-rw-r--r--lex/Makefile.nt2
-rw-r--r--lex/common.ml2
-rw-r--r--lex/common.mli2
-rw-r--r--lex/compact.ml2
-rw-r--r--lex/compact.mli2
-rw-r--r--lex/cset.ml2
-rw-r--r--lex/cset.mli2
-rw-r--r--lex/lexer.mli2
-rw-r--r--lex/lexer.mll2
-rw-r--r--lex/lexgen.ml2
-rw-r--r--lex/lexgen.mli2
-rw-r--r--lex/main.ml2
-rw-r--r--lex/output.ml2
-rw-r--r--lex/output.mli2
-rw-r--r--lex/outputbis.ml2
-rw-r--r--lex/outputbis.mli2
-rw-r--r--lex/parser.mly2
-rw-r--r--lex/syntax.ml2
-rw-r--r--lex/syntax.mli2
-rw-r--r--lex/table.ml2
-rw-r--r--lex/table.mli2
-rw-r--r--man/Makefile2
-rw-r--r--man/ocaml.m16
-rw-r--r--man/ocamlc.m16
-rw-r--r--man/ocamlcp.m16
-rw-r--r--man/ocamldebug.m16
-rw-r--r--man/ocamldep.m16
-rw-r--r--man/ocamldoc.m16
-rw-r--r--man/ocamllex.m15
-rw-r--r--man/ocamlmktop.m15
-rw-r--r--man/ocamlopt.m16
-rw-r--r--man/ocamlprof.m15
-rw-r--r--man/ocamlrun.m17
-rw-r--r--man/ocamlyacc.m15
-rw-r--r--myocamlbuild.ml2
-rw-r--r--myocamlbuild_config.mli12
-rw-r--r--ocamlbuild/Makefile2
-rw-r--r--ocamlbuild/_tags12
-rw-r--r--ocamlbuild/exit_codes.ml11
-rw-r--r--ocamlbuild/exit_codes.mli11
-rw-r--r--ocamlbuild/man/ocamlbuild.115
-rw-r--r--ocamlbuild/manual/Makefile11
-rw-r--r--ocamlbuild/manual/manual.tex11
-rw-r--r--ocamlbuild/ocamlbuild-presentation.rslide12
-rw-r--r--ocamlbuild/ocamlbuild_plugin.mli11
-rw-r--r--ocamlbuild/ocamlbuild_where.ml11
-rwxr-xr-xocamlbuild/start.sh2
-rw-r--r--ocamldoc/Makefile3
-rw-r--r--ocamldoc/Makefile.nt2
-rw-r--r--ocamldoc/odoc_dep.ml2
-rw-r--r--ocamldoc/odoc_dot.ml2
-rw-r--r--ocamldoc/odoc_gen.ml13
-rw-r--r--ocamldoc/odoc_gen.mli13
-rw-r--r--ocamldoc/odoc_global.ml2
-rw-r--r--ocamldoc/odoc_global.mli2
-rw-r--r--ocamldoc/odoc_texi.ml3
-rwxr-xr-xocamldoc/remove_DEBUG2
-rw-r--r--ocamldoc/runocamldoc13
-rw-r--r--otherlibs/Makefile2
-rw-r--r--otherlibs/Makefile.nt2
-rw-r--r--otherlibs/Makefile.shared2
-rw-r--r--otherlibs/bigarray/Makefile2
-rw-r--r--otherlibs/bigarray/Makefile.nt2
-rw-r--r--otherlibs/bigarray/bigarray.h2
-rw-r--r--otherlibs/bigarray/bigarray.ml2
-rw-r--r--otherlibs/bigarray/bigarray.mli2
-rw-r--r--otherlibs/bigarray/bigarray_stubs.c2
-rw-r--r--otherlibs/bigarray/mmap_unix.c2
-rw-r--r--otherlibs/bigarray/mmap_win32.c2
-rw-r--r--otherlibs/dbm/Makefile2
-rw-r--r--otherlibs/dbm/cldbm.c2
-rw-r--r--otherlibs/dbm/dbm.ml2
-rw-r--r--otherlibs/dbm/dbm.mli2
-rw-r--r--otherlibs/dynlink/Makefile2
-rw-r--r--otherlibs/dynlink/Makefile.nt2
-rw-r--r--otherlibs/dynlink/dynlink.ml2
-rw-r--r--otherlibs/dynlink/dynlink.mli4
-rw-r--r--otherlibs/dynlink/extract_crc.ml2
-rw-r--r--otherlibs/dynlink/natdynlink.ml2
-rw-r--r--otherlibs/graph/Makefile2
-rw-r--r--otherlibs/graph/color.c2
-rw-r--r--otherlibs/graph/draw.c2
-rw-r--r--otherlibs/graph/dump_img.c2
-rw-r--r--otherlibs/graph/events.c2
-rw-r--r--otherlibs/graph/fill.c2
-rw-r--r--otherlibs/graph/graphics.ml2
-rw-r--r--otherlibs/graph/graphics.mli2
-rw-r--r--otherlibs/graph/graphicsX11.ml2
-rw-r--r--otherlibs/graph/graphicsX11.mli2
-rw-r--r--otherlibs/graph/image.c2
-rw-r--r--otherlibs/graph/image.h2
-rw-r--r--otherlibs/graph/libgraph.h2
-rw-r--r--otherlibs/graph/make_img.c2
-rw-r--r--otherlibs/graph/open.c2
-rw-r--r--otherlibs/graph/point_col.c2
-rw-r--r--otherlibs/graph/sound.c2
-rw-r--r--otherlibs/graph/subwindow.c2
-rw-r--r--otherlibs/graph/text.c2
-rw-r--r--otherlibs/labltk/Makefile16
-rw-r--r--otherlibs/labltk/Makefile.nt16
-rw-r--r--otherlibs/labltk/README4
-rw-r--r--otherlibs/labltk/Widgets.src16
-rw-r--r--otherlibs/labltk/browser/Makefile14
-rw-r--r--otherlibs/labltk/browser/Makefile.nt14
-rw-r--r--otherlibs/labltk/browser/Makefile.shared16
-rw-r--r--otherlibs/labltk/browser/dummyUnix.mli2
-rw-r--r--otherlibs/labltk/browser/dummyWin.mli2
-rw-r--r--otherlibs/labltk/browser/editor.ml2
-rw-r--r--otherlibs/labltk/browser/editor.mli2
-rw-r--r--otherlibs/labltk/browser/fileselect.ml2
-rw-r--r--otherlibs/labltk/browser/fileselect.mli2
-rw-r--r--otherlibs/labltk/browser/jg_bind.ml2
-rw-r--r--otherlibs/labltk/browser/jg_bind.mli2
-rw-r--r--otherlibs/labltk/browser/jg_box.ml2
-rw-r--r--otherlibs/labltk/browser/jg_button.ml2
-rw-r--r--otherlibs/labltk/browser/jg_completion.ml2
-rw-r--r--otherlibs/labltk/browser/jg_completion.mli2
-rw-r--r--otherlibs/labltk/browser/jg_config.ml2
-rw-r--r--otherlibs/labltk/browser/jg_config.mli2
-rw-r--r--otherlibs/labltk/browser/jg_entry.ml2
-rw-r--r--otherlibs/labltk/browser/jg_memo.ml2
-rw-r--r--otherlibs/labltk/browser/jg_memo.mli2
-rw-r--r--otherlibs/labltk/browser/jg_menu.ml2
-rw-r--r--otherlibs/labltk/browser/jg_message.ml2
-rw-r--r--otherlibs/labltk/browser/jg_message.mli2
-rw-r--r--otherlibs/labltk/browser/jg_multibox.ml2
-rw-r--r--otherlibs/labltk/browser/jg_multibox.mli2
-rw-r--r--otherlibs/labltk/browser/jg_text.ml2
-rw-r--r--otherlibs/labltk/browser/jg_text.mli2
-rw-r--r--otherlibs/labltk/browser/jg_tk.ml2
-rw-r--r--otherlibs/labltk/browser/jg_toplevel.ml2
-rw-r--r--otherlibs/labltk/browser/lexical.ml2
-rw-r--r--otherlibs/labltk/browser/lexical.mli2
-rw-r--r--otherlibs/labltk/browser/list2.ml2
-rw-r--r--otherlibs/labltk/browser/main.ml6
-rw-r--r--otherlibs/labltk/browser/mytypes.mli2
-rw-r--r--otherlibs/labltk/browser/searchid.ml2
-rw-r--r--otherlibs/labltk/browser/searchid.mli2
-rw-r--r--otherlibs/labltk/browser/searchpos.ml2
-rw-r--r--otherlibs/labltk/browser/searchpos.mli2
-rw-r--r--otherlibs/labltk/browser/setpath.ml2
-rw-r--r--otherlibs/labltk/browser/setpath.mli2
-rw-r--r--otherlibs/labltk/browser/shell.ml2
-rw-r--r--otherlibs/labltk/browser/shell.mli2
-rw-r--r--otherlibs/labltk/browser/typecheck.ml2
-rw-r--r--otherlibs/labltk/browser/typecheck.mli2
-rw-r--r--otherlibs/labltk/browser/useunix.ml2
-rw-r--r--otherlibs/labltk/browser/useunix.mli2
-rw-r--r--otherlibs/labltk/browser/viewer.ml2
-rw-r--r--otherlibs/labltk/browser/viewer.mli2
-rw-r--r--otherlibs/labltk/browser/winmain.c14
-rw-r--r--otherlibs/labltk/builtin/LICENSE4
-rw-r--r--otherlibs/labltk/camltk/Makefile16
-rw-r--r--otherlibs/labltk/camltk/Makefile.gen16
-rw-r--r--otherlibs/labltk/compiler/Makefile16
-rw-r--r--otherlibs/labltk/compiler/code.mli4
-rw-r--r--otherlibs/labltk/compiler/compile.ml4
-rw-r--r--otherlibs/labltk/compiler/copyright4
-rw-r--r--otherlibs/labltk/compiler/flags.ml4
-rw-r--r--otherlibs/labltk/compiler/intf.ml4
-rw-r--r--otherlibs/labltk/compiler/lexer.mll2
-rw-r--r--otherlibs/labltk/compiler/maincompile.ml4
-rw-r--r--otherlibs/labltk/compiler/parser.mly4
-rw-r--r--otherlibs/labltk/compiler/pp.ml4
-rw-r--r--otherlibs/labltk/compiler/ppexec.ml4
-rw-r--r--otherlibs/labltk/compiler/pplex.mli4
-rw-r--r--otherlibs/labltk/compiler/pplex.mll4
-rw-r--r--otherlibs/labltk/compiler/ppparse.ml4
-rw-r--r--otherlibs/labltk/compiler/ppyac.mly4
-rw-r--r--otherlibs/labltk/compiler/printer.ml4
-rw-r--r--otherlibs/labltk/compiler/tables.ml4
-rw-r--r--otherlibs/labltk/compiler/tsort.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/addition.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/eyes.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/fileinput.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/fileopen.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/helloworld.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/jptest.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/mytext.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/socketinput.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/taddition.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/tetris.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/text.ml4
-rw-r--r--otherlibs/labltk/examples_camltk/winskel.ml4
-rw-r--r--otherlibs/labltk/examples_labltk/calc.ml4
-rw-r--r--otherlibs/labltk/examples_labltk/clock.ml4
-rw-r--r--otherlibs/labltk/examples_labltk/demo.ml4
-rw-r--r--otherlibs/labltk/examples_labltk/eyes.ml4
-rw-r--r--otherlibs/labltk/examples_labltk/hello.ml4
-rw-r--r--otherlibs/labltk/examples_labltk/lang.ml4
-rw-r--r--otherlibs/labltk/examples_labltk/taquin.ml4
-rw-r--r--otherlibs/labltk/examples_labltk/tetris.ml4
-rw-r--r--otherlibs/labltk/frx/Makefile16
-rw-r--r--otherlibs/labltk/frx/frx_after.ml4
-rw-r--r--otherlibs/labltk/frx/frx_after.mli4
-rw-r--r--otherlibs/labltk/frx/frx_color.ml4
-rw-r--r--otherlibs/labltk/frx/frx_color.mli4
-rw-r--r--otherlibs/labltk/frx/frx_ctext.ml4
-rw-r--r--otherlibs/labltk/frx/frx_ctext.mli4
-rw-r--r--otherlibs/labltk/frx/frx_dialog.ml4
-rw-r--r--otherlibs/labltk/frx/frx_dialog.mli4
-rw-r--r--otherlibs/labltk/frx/frx_entry.ml4
-rw-r--r--otherlibs/labltk/frx/frx_entry.mli4
-rw-r--r--otherlibs/labltk/frx/frx_fileinput.ml4
-rw-r--r--otherlibs/labltk/frx/frx_fillbox.ml4
-rw-r--r--otherlibs/labltk/frx/frx_fillbox.mli4
-rw-r--r--otherlibs/labltk/frx/frx_fit.ml4
-rw-r--r--otherlibs/labltk/frx/frx_fit.mli4
-rw-r--r--otherlibs/labltk/frx/frx_focus.ml4
-rw-r--r--otherlibs/labltk/frx/frx_focus.mli4
-rw-r--r--otherlibs/labltk/frx/frx_font.ml4
-rw-r--r--otherlibs/labltk/frx/frx_font.mli4
-rw-r--r--otherlibs/labltk/frx/frx_group.ml4
-rw-r--r--otherlibs/labltk/frx/frx_lbutton.ml4
-rw-r--r--otherlibs/labltk/frx/frx_lbutton.mli4
-rw-r--r--otherlibs/labltk/frx/frx_listbox.ml4
-rw-r--r--otherlibs/labltk/frx/frx_listbox.mli4
-rw-r--r--otherlibs/labltk/frx/frx_mem.ml4
-rw-r--r--otherlibs/labltk/frx/frx_mem.mli4
-rw-r--r--otherlibs/labltk/frx/frx_misc.ml4
-rw-r--r--otherlibs/labltk/frx/frx_misc.mli4
-rw-r--r--otherlibs/labltk/frx/frx_req.ml4
-rw-r--r--otherlibs/labltk/frx/frx_req.mli4
-rw-r--r--otherlibs/labltk/frx/frx_rpc.ml4
-rw-r--r--otherlibs/labltk/frx/frx_rpc.mli4
-rw-r--r--otherlibs/labltk/frx/frx_selection.ml4
-rw-r--r--otherlibs/labltk/frx/frx_selection.mli4
-rw-r--r--otherlibs/labltk/frx/frx_synth.ml4
-rw-r--r--otherlibs/labltk/frx/frx_synth.mli4
-rw-r--r--otherlibs/labltk/frx/frx_text.ml4
-rw-r--r--otherlibs/labltk/frx/frx_text.mli4
-rw-r--r--otherlibs/labltk/frx/frx_toplevel.mli4
-rw-r--r--otherlibs/labltk/frx/frx_widget.ml4
-rw-r--r--otherlibs/labltk/frx/frx_widget.mli4
-rw-r--r--otherlibs/labltk/jpf/Makefile16
-rw-r--r--otherlibs/labltk/jpf/balloon.ml4
-rw-r--r--otherlibs/labltk/jpf/balloon.mli4
-rw-r--r--otherlibs/labltk/jpf/balloontest.ml4
-rw-r--r--otherlibs/labltk/jpf/fileselect.ml4
-rw-r--r--otherlibs/labltk/jpf/fileselect.mli4
-rw-r--r--otherlibs/labltk/jpf/jpf_font.ml4
-rw-r--r--otherlibs/labltk/jpf/jpf_font.mli4
-rw-r--r--otherlibs/labltk/jpf/shell.ml4
-rw-r--r--otherlibs/labltk/jpf/shell.mli4
-rw-r--r--otherlibs/labltk/labltk/Makefile16
-rw-r--r--otherlibs/labltk/labltk/Makefile.gen16
-rw-r--r--otherlibs/labltk/lib/Makefile16
-rw-r--r--otherlibs/labltk/support/Makefile16
-rw-r--r--otherlibs/labltk/support/Makefile.common20
-rw-r--r--otherlibs/labltk/support/camltk.h2
-rw-r--r--otherlibs/labltk/support/camltkwrap.ml4
-rw-r--r--otherlibs/labltk/support/camltkwrap.mli4
-rw-r--r--otherlibs/labltk/support/cltkCaml.c4
-rw-r--r--otherlibs/labltk/support/cltkDMain.c2
-rw-r--r--otherlibs/labltk/support/cltkEval.c4
-rw-r--r--otherlibs/labltk/support/cltkEvent.c4
-rw-r--r--otherlibs/labltk/support/cltkFile.c4
-rw-r--r--otherlibs/labltk/support/cltkImg.c4
-rw-r--r--otherlibs/labltk/support/cltkMain.c4
-rw-r--r--otherlibs/labltk/support/cltkMisc.c4
-rw-r--r--otherlibs/labltk/support/cltkTimer.c4
-rw-r--r--otherlibs/labltk/support/cltkUtf.c4
-rw-r--r--otherlibs/labltk/support/cltkVar.c4
-rw-r--r--otherlibs/labltk/support/cltkWait.c4
-rw-r--r--otherlibs/labltk/support/fileevent.ml4
-rw-r--r--otherlibs/labltk/support/fileevent.mli4
-rw-r--r--otherlibs/labltk/support/protocol.ml4
-rw-r--r--otherlibs/labltk/support/protocol.mli4
-rw-r--r--otherlibs/labltk/support/rawwidget.ml4
-rw-r--r--otherlibs/labltk/support/rawwidget.mli4
-rw-r--r--otherlibs/labltk/support/slave.ml4
-rw-r--r--otherlibs/labltk/support/support.ml4
-rw-r--r--otherlibs/labltk/support/support.mli4
-rw-r--r--otherlibs/labltk/support/textvariable.ml4
-rw-r--r--otherlibs/labltk/support/textvariable.mli4
-rw-r--r--otherlibs/labltk/support/timer.ml4
-rw-r--r--otherlibs/labltk/support/timer.mli4
-rw-r--r--otherlibs/labltk/support/tkthread.ml4
-rw-r--r--otherlibs/labltk/support/tkthread.mli4
-rw-r--r--otherlibs/labltk/support/tkwait.ml4
-rw-r--r--otherlibs/labltk/support/widget.ml4
-rw-r--r--otherlibs/labltk/support/widget.mli4
-rw-r--r--otherlibs/num/Makefile2
-rw-r--r--otherlibs/num/Makefile.nt2
-rw-r--r--otherlibs/num/arith_flags.ml2
-rw-r--r--otherlibs/num/arith_flags.mli2
-rw-r--r--otherlibs/num/arith_status.ml2
-rw-r--r--otherlibs/num/arith_status.mli2
-rw-r--r--otherlibs/num/big_int.ml2
-rw-r--r--otherlibs/num/big_int.mli2
-rw-r--r--otherlibs/num/bng.c2
-rw-r--r--otherlibs/num/bng.h2
-rw-r--r--otherlibs/num/bng_alpha.c2
-rw-r--r--otherlibs/num/bng_amd64.c2
-rw-r--r--otherlibs/num/bng_digit.c2
-rw-r--r--otherlibs/num/bng_ia32.c2
-rw-r--r--otherlibs/num/bng_mips.c2
-rw-r--r--otherlibs/num/bng_ppc.c4
-rw-r--r--otherlibs/num/bng_sparc.c2
-rw-r--r--otherlibs/num/int_misc.ml2
-rw-r--r--otherlibs/num/int_misc.mli2
-rw-r--r--otherlibs/num/nat.h2
-rw-r--r--otherlibs/num/nat.ml2
-rw-r--r--otherlibs/num/nat.mli2
-rw-r--r--otherlibs/num/nat_stubs.c2
-rw-r--r--otherlibs/num/num.ml2
-rw-r--r--otherlibs/num/num.mli2
-rw-r--r--otherlibs/num/ratio.ml2
-rw-r--r--otherlibs/num/ratio.mli2
-rw-r--r--otherlibs/str/Makefile2
-rw-r--r--otherlibs/str/Makefile.nt2
-rw-r--r--otherlibs/str/str.ml2
-rw-r--r--otherlibs/str/str.mli2
-rw-r--r--otherlibs/str/strstubs.c2
-rw-r--r--otherlibs/systhreads/Makefile2
-rw-r--r--otherlibs/systhreads/Makefile.nt2
-rw-r--r--otherlibs/systhreads/condition.ml2
-rw-r--r--otherlibs/systhreads/condition.mli2
-rw-r--r--otherlibs/systhreads/event.ml2
-rw-r--r--otherlibs/systhreads/event.mli2
-rw-r--r--otherlibs/systhreads/mutex.ml2
-rw-r--r--otherlibs/systhreads/mutex.mli2
-rw-r--r--otherlibs/systhreads/st_posix.h2
-rw-r--r--otherlibs/systhreads/st_stubs.c2
-rw-r--r--otherlibs/systhreads/st_win32.h2
-rw-r--r--otherlibs/systhreads/thread.ml2
-rw-r--r--otherlibs/systhreads/thread.mli2
-rw-r--r--otherlibs/systhreads/threadUnix.ml2
-rw-r--r--otherlibs/systhreads/threadUnix.mli2
-rw-r--r--otherlibs/systhreads/threads.h2
-rw-r--r--otherlibs/threads/Makefile2
-rw-r--r--otherlibs/threads/condition.ml2
-rw-r--r--otherlibs/threads/condition.mli2
-rw-r--r--otherlibs/threads/event.ml2
-rw-r--r--otherlibs/threads/event.mli2
-rw-r--r--otherlibs/threads/marshal.ml2
-rw-r--r--otherlibs/threads/mutex.ml2
-rw-r--r--otherlibs/threads/mutex.mli2
-rw-r--r--otherlibs/threads/pervasives.ml2
-rw-r--r--otherlibs/threads/scheduler.c2
-rw-r--r--otherlibs/threads/thread.ml2
-rw-r--r--otherlibs/threads/thread.mli2
-rw-r--r--otherlibs/threads/threadUnix.ml2
-rw-r--r--otherlibs/threads/threadUnix.mli2
-rw-r--r--otherlibs/threads/unix.ml2
-rw-r--r--otherlibs/unix/Makefile2
-rw-r--r--otherlibs/unix/accept.c2
-rw-r--r--otherlibs/unix/access.c2
-rw-r--r--otherlibs/unix/addrofstr.c2
-rw-r--r--otherlibs/unix/alarm.c2
-rw-r--r--otherlibs/unix/bind.c2
-rw-r--r--otherlibs/unix/chdir.c2
-rw-r--r--otherlibs/unix/chmod.c2
-rw-r--r--otherlibs/unix/chown.c2
-rw-r--r--otherlibs/unix/chroot.c2
-rw-r--r--otherlibs/unix/close.c2
-rw-r--r--otherlibs/unix/closedir.c2
-rw-r--r--otherlibs/unix/connect.c2
-rw-r--r--otherlibs/unix/cst2constr.c2
-rw-r--r--otherlibs/unix/cst2constr.h2
-rw-r--r--otherlibs/unix/cstringv.c2
-rw-r--r--otherlibs/unix/dup.c2
-rw-r--r--otherlibs/unix/dup2.c2
-rw-r--r--otherlibs/unix/envir.c2
-rw-r--r--otherlibs/unix/errmsg.c2
-rw-r--r--otherlibs/unix/execv.c2
-rw-r--r--otherlibs/unix/execve.c2
-rw-r--r--otherlibs/unix/execvp.c2
-rw-r--r--otherlibs/unix/exit.c2
-rw-r--r--otherlibs/unix/fchmod.c2
-rw-r--r--otherlibs/unix/fchown.c2
-rw-r--r--otherlibs/unix/fcntl.c2
-rw-r--r--otherlibs/unix/fork.c2
-rw-r--r--otherlibs/unix/ftruncate.c2
-rw-r--r--otherlibs/unix/getaddrinfo.c2
-rw-r--r--otherlibs/unix/getcwd.c2
-rw-r--r--otherlibs/unix/getegid.c2
-rw-r--r--otherlibs/unix/geteuid.c2
-rw-r--r--otherlibs/unix/getgid.c2
-rw-r--r--otherlibs/unix/getgr.c2
-rw-r--r--otherlibs/unix/getgroups.c2
-rw-r--r--otherlibs/unix/gethost.c2
-rw-r--r--otherlibs/unix/gethostname.c2
-rw-r--r--otherlibs/unix/getlogin.c2
-rw-r--r--otherlibs/unix/getnameinfo.c2
-rw-r--r--otherlibs/unix/getpeername.c2
-rw-r--r--otherlibs/unix/getpid.c2
-rw-r--r--otherlibs/unix/getppid.c2
-rw-r--r--otherlibs/unix/getproto.c2
-rw-r--r--otherlibs/unix/getpw.c2
-rw-r--r--otherlibs/unix/getserv.c2
-rw-r--r--otherlibs/unix/getsockname.c2
-rw-r--r--otherlibs/unix/gettimeofday.c2
-rw-r--r--otherlibs/unix/getuid.c2
-rw-r--r--otherlibs/unix/gmtime.c2
-rw-r--r--otherlibs/unix/initgroups.c6
-rw-r--r--otherlibs/unix/isatty.c2
-rw-r--r--otherlibs/unix/itimer.c2
-rw-r--r--otherlibs/unix/kill.c2
-rw-r--r--otherlibs/unix/link.c2
-rw-r--r--otherlibs/unix/listen.c2
-rw-r--r--otherlibs/unix/lockf.c2
-rw-r--r--otherlibs/unix/lseek.c2
-rw-r--r--otherlibs/unix/mkdir.c2
-rw-r--r--otherlibs/unix/mkfifo.c2
-rw-r--r--otherlibs/unix/nice.c2
-rw-r--r--otherlibs/unix/open.c2
-rw-r--r--otherlibs/unix/opendir.c2
-rw-r--r--otherlibs/unix/pipe.c2
-rw-r--r--otherlibs/unix/putenv.c2
-rw-r--r--otherlibs/unix/read.c2
-rw-r--r--otherlibs/unix/readdir.c2
-rw-r--r--otherlibs/unix/readlink.c2
-rw-r--r--otherlibs/unix/rename.c2
-rw-r--r--otherlibs/unix/rewinddir.c2
-rw-r--r--otherlibs/unix/rmdir.c2
-rw-r--r--otherlibs/unix/select.c2
-rw-r--r--otherlibs/unix/sendrecv.c2
-rw-r--r--otherlibs/unix/setgid.c2
-rw-r--r--otherlibs/unix/setgroups.c6
-rw-r--r--otherlibs/unix/setsid.c2
-rw-r--r--otherlibs/unix/setuid.c2
-rw-r--r--otherlibs/unix/shutdown.c2
-rw-r--r--otherlibs/unix/signals.c2
-rw-r--r--otherlibs/unix/sleep.c2
-rw-r--r--otherlibs/unix/socket.c2
-rw-r--r--otherlibs/unix/socketaddr.c2
-rw-r--r--otherlibs/unix/socketaddr.h2
-rw-r--r--otherlibs/unix/socketpair.c2
-rw-r--r--otherlibs/unix/sockopt.c2
-rw-r--r--otherlibs/unix/stat.c2
-rw-r--r--otherlibs/unix/strofaddr.c2
-rw-r--r--otherlibs/unix/symlink.c2
-rw-r--r--otherlibs/unix/termios.c2
-rw-r--r--otherlibs/unix/time.c2
-rw-r--r--otherlibs/unix/times.c2
-rw-r--r--otherlibs/unix/truncate.c2
-rw-r--r--otherlibs/unix/umask.c2
-rw-r--r--otherlibs/unix/unix.ml2
-rw-r--r--otherlibs/unix/unix.mli2
-rw-r--r--otherlibs/unix/unixLabels.ml2
-rw-r--r--otherlibs/unix/unixLabels.mli2
-rw-r--r--otherlibs/unix/unixsupport.c2
-rw-r--r--otherlibs/unix/unixsupport.h2
-rw-r--r--otherlibs/unix/unlink.c2
-rw-r--r--otherlibs/unix/utimes.c2
-rw-r--r--otherlibs/unix/wait.c2
-rw-r--r--otherlibs/unix/write.c2
-rw-r--r--otherlibs/win32graph/Makefile.nt2
-rw-r--r--otherlibs/win32graph/dib.c3
-rw-r--r--otherlibs/win32graph/draw.c3
-rwxr-xr-xotherlibs/win32graph/events.c2
-rw-r--r--otherlibs/win32graph/libgraph.h2
-rw-r--r--otherlibs/win32graph/open.c3
-rw-r--r--otherlibs/win32unix/Makefile.nt2
-rw-r--r--otherlibs/win32unix/accept.c2
-rw-r--r--otherlibs/win32unix/bind.c2
-rw-r--r--otherlibs/win32unix/channels.c2
-rw-r--r--otherlibs/win32unix/close.c2
-rw-r--r--otherlibs/win32unix/close_on.c2
-rw-r--r--otherlibs/win32unix/connect.c2
-rw-r--r--otherlibs/win32unix/createprocess.c2
-rw-r--r--otherlibs/win32unix/dup.c2
-rw-r--r--otherlibs/win32unix/dup2.c2
-rw-r--r--otherlibs/win32unix/errmsg.c2
-rw-r--r--otherlibs/win32unix/getpeername.c2
-rw-r--r--otherlibs/win32unix/getpid.c2
-rw-r--r--otherlibs/win32unix/getsockname.c2
-rw-r--r--otherlibs/win32unix/gettimeofday.c2
-rw-r--r--otherlibs/win32unix/link.c2
-rw-r--r--otherlibs/win32unix/listen.c2
-rw-r--r--otherlibs/win32unix/lockf.c2
-rw-r--r--otherlibs/win32unix/lseek.c2
-rw-r--r--otherlibs/win32unix/mkdir.c2
-rwxr-xr-xotherlibs/win32unix/nonblock.c2
-rw-r--r--otherlibs/win32unix/open.c2
-rw-r--r--otherlibs/win32unix/pipe.c2
-rw-r--r--otherlibs/win32unix/read.c2
-rw-r--r--otherlibs/win32unix/rename.c2
-rw-r--r--otherlibs/win32unix/select.c2
-rw-r--r--otherlibs/win32unix/sendrecv.c2
-rw-r--r--otherlibs/win32unix/shutdown.c2
-rw-r--r--otherlibs/win32unix/sleep.c2
-rw-r--r--otherlibs/win32unix/socket.c2
-rw-r--r--otherlibs/win32unix/socketaddr.h2
-rw-r--r--otherlibs/win32unix/sockopt.c2
-rw-r--r--otherlibs/win32unix/startup.c2
-rw-r--r--otherlibs/win32unix/stat.c2
-rw-r--r--otherlibs/win32unix/system.c2
-rw-r--r--otherlibs/win32unix/unix.ml2
-rw-r--r--otherlibs/win32unix/unixsupport.c2
-rw-r--r--otherlibs/win32unix/unixsupport.h2
-rw-r--r--otherlibs/win32unix/windbug.c2
-rw-r--r--otherlibs/win32unix/windbug.h2
-rw-r--r--otherlibs/win32unix/windir.c2
-rw-r--r--otherlibs/win32unix/winlist.c2
-rw-r--r--otherlibs/win32unix/winlist.h2
-rw-r--r--otherlibs/win32unix/winwait.c2
-rw-r--r--otherlibs/win32unix/winworker.c2
-rw-r--r--otherlibs/win32unix/winworker.h2
-rw-r--r--otherlibs/win32unix/write.c2
-rw-r--r--parsing/asttypes.mli2
-rw-r--r--parsing/lexer.mli2
-rw-r--r--parsing/lexer.mll2
-rw-r--r--parsing/linenum.mli2
-rw-r--r--parsing/linenum.mll2
-rw-r--r--parsing/location.ml2
-rw-r--r--parsing/location.mli2
-rw-r--r--parsing/longident.ml2
-rw-r--r--parsing/longident.mli2
-rw-r--r--parsing/parse.ml2
-rw-r--r--parsing/parse.mli2
-rw-r--r--parsing/parser.mly2
-rw-r--r--parsing/parsetree.mli2
-rw-r--r--parsing/printast.ml2
-rw-r--r--parsing/printast.mli2
-rw-r--r--parsing/syntaxerr.ml2
-rw-r--r--parsing/syntaxerr.mli2
-rwxr-xr-xstdlib/Compflags2
-rw-r--r--stdlib/Makefile2
-rw-r--r--stdlib/Makefile.nt2
-rwxr-xr-xstdlib/Makefile.shared2
-rw-r--r--stdlib/StdlibModules20
-rw-r--r--stdlib/arg.ml2
-rw-r--r--stdlib/arg.mli2
-rw-r--r--stdlib/array.ml2
-rw-r--r--stdlib/array.mli2
-rw-r--r--stdlib/arrayLabels.ml2
-rw-r--r--stdlib/arrayLabels.mli2
-rw-r--r--stdlib/buffer.ml2
-rw-r--r--stdlib/buffer.mli2
-rw-r--r--stdlib/callback.ml2
-rw-r--r--stdlib/callback.mli2
-rw-r--r--stdlib/camlinternalLazy.ml2
-rw-r--r--stdlib/camlinternalLazy.mli2
-rw-r--r--stdlib/camlinternalMod.ml2
-rw-r--r--stdlib/camlinternalMod.mli2
-rw-r--r--stdlib/camlinternalOO.ml2
-rw-r--r--stdlib/camlinternalOO.mli2
-rw-r--r--stdlib/char.ml2
-rw-r--r--stdlib/char.mli4
-rw-r--r--stdlib/complex.ml2
-rw-r--r--stdlib/complex.mli2
-rw-r--r--stdlib/digest.ml2
-rw-r--r--stdlib/digest.mli2
-rw-r--r--stdlib/filename.ml2
-rw-r--r--stdlib/filename.mli2
-rw-r--r--stdlib/format.ml2
-rw-r--r--stdlib/format.mli2
-rw-r--r--stdlib/gc.ml2
-rw-r--r--stdlib/gc.mli2
-rw-r--r--stdlib/genlex.ml2
-rw-r--r--stdlib/genlex.mli2
-rw-r--r--stdlib/hashtbl.ml2
-rw-r--r--stdlib/hashtbl.mli2
-rw-r--r--stdlib/header.c2
-rw-r--r--stdlib/headernt.c2
-rw-r--r--stdlib/int32.ml2
-rw-r--r--stdlib/int32.mli2
-rw-r--r--stdlib/int64.ml2
-rw-r--r--stdlib/int64.mli2
-rw-r--r--stdlib/lazy.ml4
-rw-r--r--stdlib/lazy.mli2
-rw-r--r--stdlib/lexing.ml2
-rw-r--r--stdlib/lexing.mli2
-rw-r--r--stdlib/list.ml2
-rw-r--r--stdlib/list.mli2
-rw-r--r--stdlib/listLabels.ml2
-rw-r--r--stdlib/listLabels.mli2
-rw-r--r--stdlib/map.ml2
-rw-r--r--stdlib/map.mli2
-rw-r--r--stdlib/marshal.ml2
-rw-r--r--stdlib/marshal.mli4
-rw-r--r--stdlib/moreLabels.ml2
-rw-r--r--stdlib/moreLabels.mli4
-rw-r--r--stdlib/nativeint.ml2
-rw-r--r--stdlib/nativeint.mli2
-rw-r--r--stdlib/obj.ml2
-rw-r--r--stdlib/obj.mli2
-rw-r--r--stdlib/oo.ml2
-rw-r--r--stdlib/oo.mli2
-rw-r--r--stdlib/parsing.ml2
-rw-r--r--stdlib/parsing.mli2
-rw-r--r--stdlib/pervasives.ml2
-rw-r--r--stdlib/pervasives.mli7
-rw-r--r--stdlib/printexc.ml2
-rw-r--r--stdlib/printexc.mli2
-rw-r--r--stdlib/printf.ml2
-rw-r--r--stdlib/printf.mli2
-rw-r--r--stdlib/queue.ml2
-rw-r--r--stdlib/queue.mli2
-rw-r--r--stdlib/random.ml2
-rw-r--r--stdlib/random.mli2
-rw-r--r--stdlib/scanf.ml2
-rw-r--r--stdlib/scanf.mli2
-rw-r--r--stdlib/set.ml2
-rw-r--r--stdlib/set.mli2
-rw-r--r--stdlib/sort.ml2
-rw-r--r--stdlib/sort.mli2
-rw-r--r--stdlib/stack.ml2
-rw-r--r--stdlib/stack.mli2
-rw-r--r--stdlib/stdLabels.ml2
-rw-r--r--stdlib/stdLabels.mli2
-rw-r--r--stdlib/std_exit.ml2
-rw-r--r--stdlib/stream.ml2
-rw-r--r--stdlib/stream.mli2
-rw-r--r--stdlib/string.ml2
-rw-r--r--stdlib/string.mli4
-rw-r--r--stdlib/stringLabels.ml2
-rw-r--r--stdlib/stringLabels.mli4
-rw-r--r--stdlib/sys.mli4
-rw-r--r--stdlib/sys.mlp2
-rw-r--r--stdlib/weak.ml2
-rw-r--r--stdlib/weak.mli2
-rw-r--r--testsuite/interactive/lib-gc/alloc.ml2
-rw-r--r--testsuite/interactive/lib-graph-2/graph_test.ml5
-rw-r--r--testsuite/lib/testing.ml2
-rw-r--r--testsuite/lib/testing.mli2
-rw-r--r--testsuite/tests/asmcomp/alpha.S2
-rw-r--r--testsuite/tests/asmcomp/amd64.S2
-rw-r--r--testsuite/tests/asmcomp/arith.cmm2
-rw-r--r--testsuite/tests/asmcomp/arm.S2
-rw-r--r--testsuite/tests/asmcomp/checkbound.cmm2
-rw-r--r--testsuite/tests/asmcomp/fib.cmm2
-rw-r--r--testsuite/tests/asmcomp/hppa.S2
-rw-r--r--testsuite/tests/asmcomp/i386.S2
-rw-r--r--testsuite/tests/asmcomp/i386nt.asm2
-rw-r--r--testsuite/tests/asmcomp/ia64.S2
-rw-r--r--testsuite/tests/asmcomp/integr.cmm2
-rw-r--r--testsuite/tests/asmcomp/lexcmm.mli2
-rw-r--r--testsuite/tests/asmcomp/lexcmm.mll2
-rw-r--r--testsuite/tests/asmcomp/m68k.S2
-rw-r--r--testsuite/tests/asmcomp/main.c2
-rw-r--r--testsuite/tests/asmcomp/main.ml2
-rw-r--r--testsuite/tests/asmcomp/mainarith.c2
-rw-r--r--testsuite/tests/asmcomp/mips.s2
-rw-r--r--testsuite/tests/asmcomp/parsecmm.mly2
-rw-r--r--testsuite/tests/asmcomp/parsecmmaux.ml2
-rw-r--r--testsuite/tests/asmcomp/parsecmmaux.mli2
-rw-r--r--testsuite/tests/asmcomp/power-aix.S2
-rw-r--r--testsuite/tests/asmcomp/power-elf.S2
-rw-r--r--testsuite/tests/asmcomp/power-rhapsody.S2
-rw-r--r--testsuite/tests/asmcomp/quicksort.cmm2
-rw-r--r--testsuite/tests/asmcomp/quicksort2.cmm2
-rw-r--r--testsuite/tests/asmcomp/soli.cmm2
-rw-r--r--testsuite/tests/asmcomp/sparc.S2
-rw-r--r--testsuite/tests/asmcomp/tagged-fib.cmm2
-rw-r--r--testsuite/tests/asmcomp/tagged-integr.cmm2
-rw-r--r--testsuite/tests/asmcomp/tagged-quicksort.cmm2
-rw-r--r--testsuite/tests/asmcomp/tagged-tak.cmm2
-rw-r--r--testsuite/tests/asmcomp/tak.cmm2
-rw-r--r--testsuite/tests/basic-more/tformat.ml2
-rw-r--r--testsuite/tests/basic/maps.ml2
-rw-r--r--testsuite/tests/basic/sets.ml2
-rw-r--r--testsuite/tests/lib-bigarray/fftba.ml2
-rw-r--r--testsuite/tests/lib-scanf/tscanf.ml2
-rw-r--r--testsuite/tests/misc-kb/equations.ml2
-rw-r--r--testsuite/tests/misc-kb/equations.mli2
-rw-r--r--testsuite/tests/misc-kb/kb.ml2
-rw-r--r--testsuite/tests/misc-kb/kb.mli2
-rw-r--r--testsuite/tests/misc-kb/kbmain.ml2
-rw-r--r--testsuite/tests/misc-kb/orderings.ml2
-rw-r--r--testsuite/tests/misc-kb/orderings.mli2
-rw-r--r--testsuite/tests/misc-kb/terms.ml2
-rw-r--r--testsuite/tests/misc-kb/terms.mli2
-rw-r--r--testsuite/tests/misc-unsafe/almabench.ml2
-rw-r--r--testsuite/tests/misc-unsafe/fft.ml2
-rw-r--r--testsuite/tests/misc-unsafe/quicksort.ml2
-rw-r--r--testsuite/tests/misc-unsafe/soli.ml2
-rw-r--r--testsuite/tests/misc/bdd.ml2
-rw-r--r--testsuite/tests/misc/boyer.ml2
-rw-r--r--testsuite/tests/misc/fib.ml2
-rw-r--r--testsuite/tests/misc/hamming.ml2
-rw-r--r--testsuite/tests/misc/nucleic.ml2
-rw-r--r--testsuite/tests/misc/sieve.ml2
-rw-r--r--testsuite/tests/misc/takc.ml2
-rw-r--r--testsuite/tests/misc/taku.ml2
-rw-r--r--testsuite/tests/tool-lexyacc/gram_aux.ml2
-rw-r--r--testsuite/tests/tool-lexyacc/grammar.mly2
-rw-r--r--testsuite/tests/tool-lexyacc/input2
-rw-r--r--testsuite/tests/tool-lexyacc/lexgen.ml2
-rw-r--r--testsuite/tests/tool-lexyacc/main.ml2
-rw-r--r--testsuite/tests/tool-lexyacc/output.ml2
-rw-r--r--testsuite/tests/tool-lexyacc/scan_aux.ml2
-rw-r--r--testsuite/tests/tool-lexyacc/scanner.mll2
-rw-r--r--testsuite/tests/tool-lexyacc/syntax.ml2
-rw-r--r--tools/Makefile2
-rw-r--r--tools/Makefile.nt2
-rw-r--r--tools/Makefile.shared2
-rw-r--r--tools/addlabels.ml13
-rw-r--r--tools/checkstack.c5
-rw-r--r--tools/cleanup-header13
-rw-r--r--tools/cvt_emit.mll2
-rw-r--r--tools/depend.ml2
-rw-r--r--tools/depend.mli2
-rw-r--r--tools/dumpobj.ml2
-rw-r--r--tools/lexer299.mll2
-rw-r--r--tools/lexer301.mll2
-rw-r--r--tools/magic2
-rwxr-xr-xtools/make-package-macosx14
-rw-r--r--tools/objinfo.ml4
-rw-r--r--tools/objinfo_helper.c4
-rwxr-xr-xtools/ocaml-objcopy-macosx2
-rw-r--r--tools/ocaml299to3.ml2
-rw-r--r--tools/ocamlcp.ml2
-rw-r--r--tools/ocamldep.ml2
-rw-r--r--tools/ocamlmklib.mlp2
-rw-r--r--tools/ocamlmktop.ml2
-rw-r--r--tools/ocamlmktop.tpl2
-rw-r--r--tools/ocamlprof.ml2
-rwxr-xr-xtools/ocamlsize12
-rw-r--r--tools/primreq.ml2
-rw-r--r--tools/profiling.ml2
-rw-r--r--tools/profiling.mli4
-rw-r--r--tools/scrapelabels.ml2
-rwxr-xr-xtools/setignore12
-rw-r--r--toplevel/expunge.ml2
-rw-r--r--toplevel/genprintval.ml2
-rw-r--r--toplevel/genprintval.mli2
-rw-r--r--toplevel/opttopdirs.ml2
-rw-r--r--toplevel/opttopdirs.mli2
-rw-r--r--toplevel/opttoploop.ml2
-rw-r--r--toplevel/opttoploop.mli2
-rw-r--r--toplevel/opttopmain.ml2
-rw-r--r--toplevel/opttopmain.mli2
-rw-r--r--toplevel/opttopstart.ml2
-rw-r--r--toplevel/topdirs.ml2
-rw-r--r--toplevel/topdirs.mli2
-rw-r--r--toplevel/toploop.ml2
-rw-r--r--toplevel/toploop.mli2
-rw-r--r--toplevel/topmain.ml2
-rw-r--r--toplevel/topmain.mli2
-rw-r--r--toplevel/topstart.ml2
-rw-r--r--toplevel/trace.ml2
-rw-r--r--toplevel/trace.mli2
-rw-r--r--typing/annot.mli2
-rw-r--r--typing/btype.ml2
-rw-r--r--typing/btype.mli2
-rw-r--r--typing/ctype.ml2
-rw-r--r--typing/ctype.mli2
-rw-r--r--typing/datarepr.ml2
-rw-r--r--typing/datarepr.mli2
-rw-r--r--typing/env.ml2
-rw-r--r--typing/env.mli2
-rw-r--r--typing/ident.ml2
-rw-r--r--typing/ident.mli2
-rw-r--r--typing/includeclass.ml2
-rw-r--r--typing/includeclass.mli2
-rw-r--r--typing/includecore.ml2
-rw-r--r--typing/includecore.mli2
-rw-r--r--typing/includemod.ml2
-rw-r--r--typing/includemod.mli2
-rw-r--r--typing/mtype.ml2
-rw-r--r--typing/mtype.mli2
-rw-r--r--typing/oprint.ml2
-rw-r--r--typing/oprint.mli2
-rw-r--r--typing/outcometree.mli2
-rw-r--r--typing/parmatch.ml2
-rw-r--r--typing/parmatch.mli2
-rw-r--r--typing/path.ml2
-rw-r--r--typing/path.mli2
-rw-r--r--typing/predef.ml2
-rw-r--r--typing/predef.mli2
-rw-r--r--typing/primitive.ml2
-rw-r--r--typing/primitive.mli2
-rw-r--r--typing/printtyp.ml2
-rw-r--r--typing/printtyp.mli2
-rw-r--r--typing/stypes.ml2
-rw-r--r--typing/stypes.mli2
-rw-r--r--typing/subst.ml2
-rw-r--r--typing/subst.mli2
-rw-r--r--typing/typeclass.ml2
-rw-r--r--typing/typeclass.mli2
-rw-r--r--typing/typecore.ml2
-rw-r--r--typing/typecore.mli2
-rw-r--r--typing/typedecl.ml2
-rw-r--r--typing/typedecl.mli2
-rw-r--r--typing/typedtree.ml2
-rw-r--r--typing/typedtree.mli2
-rw-r--r--typing/typemod.ml2
-rw-r--r--typing/typemod.mli2
-rw-r--r--typing/types.ml2
-rw-r--r--typing/types.mli2
-rw-r--r--typing/typetexp.ml2
-rw-r--r--typing/typetexp.mli2
-rw-r--r--typing/unused_var.ml2
-rw-r--r--typing/unused_var.mli2
-rw-r--r--utils/ccomp.ml2
-rw-r--r--utils/ccomp.mli2
-rw-r--r--utils/clflags.ml2
-rw-r--r--utils/clflags.mli2
-rw-r--r--utils/config.mlbuild2
-rw-r--r--utils/config.mli2
-rw-r--r--utils/config.mlp2
-rw-r--r--utils/consistbl.ml2
-rw-r--r--utils/consistbl.mli2
-rw-r--r--utils/misc.ml2
-rw-r--r--utils/misc.mli2
-rw-r--r--utils/tbl.ml2
-rw-r--r--utils/tbl.mli2
-rw-r--r--utils/terminfo.ml2
-rw-r--r--utils/terminfo.mli2
-rw-r--r--utils/warnings.ml2
-rw-r--r--utils/warnings.mli2
-rw-r--r--win32caml/Makefile2
-rw-r--r--win32caml/editbuffer.c767
-rw-r--r--win32caml/editbuffer.h34
-rw-r--r--win32caml/history.c98
-rw-r--r--win32caml/history.h12
-rw-r--r--win32caml/inria.h15
-rw-r--r--win32caml/libgraph.h2
-rw-r--r--win32caml/menu.c161
-rw-r--r--win32caml/ocaml.c2308
-rw-r--r--win32caml/ocaml.rc2
-rw-r--r--win32caml/startocaml.c311
-rw-r--r--yacc/Makefile2
-rw-r--r--yacc/Makefile.nt2
-rw-r--r--yacc/closure.c2
-rw-r--r--yacc/defs.h2
-rw-r--r--yacc/error.c2
-rw-r--r--yacc/lalr.c2
-rw-r--r--yacc/lr0.c2
-rw-r--r--yacc/main.c4
-rw-r--r--yacc/mkpar.c2
-rw-r--r--yacc/output.c2
-rw-r--r--yacc/reader.c2
-rw-r--r--yacc/skeleton.c2
-rw-r--r--yacc/symtab.c2
-rw-r--r--yacc/verbose.c2
-rw-r--r--yacc/warshall.c2
1429 files changed, 5440 insertions, 3720 deletions
diff --git a/Changes b/Changes
index dec58f4adb..c6eee36aff 100644
--- a/Changes
+++ b/Changes
@@ -23,7 +23,7 @@ Bug Fixes:
- type abbreviations expanding to a universal type variable were not working
correctly during unification
-Objective Caml 3.12.1:
+OCaml 3.12.1:
----------------------
Bug fixes:
diff --git a/Makefile b/Makefile
index e83e881fc6..246f786aac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/Makefile.nt b/Makefile.nt
index a7e34f5993..8d04735a69 100644
--- a/Makefile.nt
+++ b/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/_tags b/_tags
index 052d8aee19..82c7c649e8 100644
--- a/_tags
+++ b/_tags
@@ -1,3 +1,15 @@
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# Ocamlbuild tags file
true: -traverse
diff --git a/asmcomp/alpha/arch.ml b/asmcomp/alpha/arch.ml
index 52d1f11b1b..76574d66fb 100644
--- a/asmcomp/alpha/arch.ml
+++ b/asmcomp/alpha/arch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/alpha/emit.mlp b/asmcomp/alpha/emit.mlp
index 6857da04ef..c596e989b2 100644
--- a/asmcomp/alpha/emit.mlp
+++ b/asmcomp/alpha/emit.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/alpha/proc.ml b/asmcomp/alpha/proc.ml
index 93c2422f61..7c126ca158 100644
--- a/asmcomp/alpha/proc.ml
+++ b/asmcomp/alpha/proc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/alpha/reload.ml b/asmcomp/alpha/reload.ml
index 53f7b183c9..095767ebbd 100644
--- a/asmcomp/alpha/reload.ml
+++ b/asmcomp/alpha/reload.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/alpha/scheduling.ml b/asmcomp/alpha/scheduling.ml
index f59c26ed58..e1fd603dbf 100644
--- a/asmcomp/alpha/scheduling.ml
+++ b/asmcomp/alpha/scheduling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/alpha/selection.ml b/asmcomp/alpha/selection.ml
index d91ec5bdf8..c86e931bed 100644
--- a/asmcomp/alpha/selection.ml
+++ b/asmcomp/alpha/selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/amd64/arch.ml b/asmcomp/amd64/arch.ml
index 3e8f4b1113..dfacdad9e4 100644
--- a/asmcomp/amd64/arch.ml
+++ b/asmcomp/amd64/arch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
index a33a0fa9cd..473c63432e 100644
--- a/asmcomp/amd64/emit.mlp
+++ b/asmcomp/amd64/emit.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/amd64/emit_nt.mlp b/asmcomp/amd64/emit_nt.mlp
index 724d6ee016..38ac00f903 100644
--- a/asmcomp/amd64/emit_nt.mlp
+++ b/asmcomp/amd64/emit_nt.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/amd64/proc.ml b/asmcomp/amd64/proc.ml
index 4ba0d5c3ec..864c22e185 100644
--- a/asmcomp/amd64/proc.ml
+++ b/asmcomp/amd64/proc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/amd64/proc_nt.ml b/asmcomp/amd64/proc_nt.ml
index 5c90e4f52e..b417173946 100644
--- a/asmcomp/amd64/proc_nt.ml
+++ b/asmcomp/amd64/proc_nt.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/amd64/reload.ml b/asmcomp/amd64/reload.ml
index 66772de97a..e7d5e23b02 100644
--- a/asmcomp/amd64/reload.ml
+++ b/asmcomp/amd64/reload.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/amd64/scheduling.ml b/asmcomp/amd64/scheduling.ml
index faf0353ed6..8ba88f4a79 100644
--- a/asmcomp/amd64/scheduling.ml
+++ b/asmcomp/amd64/scheduling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/amd64/selection.ml b/asmcomp/amd64/selection.ml
index 4921e5110a..86c4a9b58a 100644
--- a/asmcomp/amd64/selection.ml
+++ b/asmcomp/amd64/selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/arm/arch.ml b/asmcomp/arm/arch.ml
index aafb094b72..845ea97333 100644
--- a/asmcomp/arm/arch.ml
+++ b/asmcomp/arm/arch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp
index cfcb0c94fb..9da7beab8e 100644
--- a/asmcomp/arm/emit.mlp
+++ b/asmcomp/arm/emit.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/arm/proc.ml b/asmcomp/arm/proc.ml
index 06b085b4df..705f8c6fe8 100644
--- a/asmcomp/arm/proc.ml
+++ b/asmcomp/arm/proc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/arm/reload.ml b/asmcomp/arm/reload.ml
index 65d8118179..c5b137abcf 100644
--- a/asmcomp/arm/reload.ml
+++ b/asmcomp/arm/reload.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/arm/scheduling.ml b/asmcomp/arm/scheduling.ml
index 8f49ad1eef..4b037289b9 100644
--- a/asmcomp/arm/scheduling.ml
+++ b/asmcomp/arm/scheduling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/arm/selection.ml b/asmcomp/arm/selection.ml
index 1574bf01e7..bd165898cd 100644
--- a/asmcomp/arm/selection.ml
+++ b/asmcomp/arm/selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/asmgen.ml b/asmcomp/asmgen.ml
index 9cdf61f40c..c14c0006db 100644
--- a/asmcomp/asmgen.ml
+++ b/asmcomp/asmgen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/asmgen.mli b/asmcomp/asmgen.mli
index fe578bd4f5..f71cba8f7c 100644
--- a/asmcomp/asmgen.mli
+++ b/asmcomp/asmgen.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/asmlibrarian.ml b/asmcomp/asmlibrarian.ml
index 1fddb81279..e0d2170b5a 100644
--- a/asmcomp/asmlibrarian.ml
+++ b/asmcomp/asmlibrarian.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/asmlibrarian.mli b/asmcomp/asmlibrarian.mli
index 66f6a127fd..20a0380c9c 100644
--- a/asmcomp/asmlibrarian.mli
+++ b/asmcomp/asmlibrarian.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml
index dcec75ccbd..8a1109fd68 100644
--- a/asmcomp/asmlink.ml
+++ b/asmcomp/asmlink.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/asmlink.mli b/asmcomp/asmlink.mli
index dbebb7beda..b9465f8090 100644
--- a/asmcomp/asmlink.mli
+++ b/asmcomp/asmlink.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/asmpackager.ml b/asmcomp/asmpackager.ml
index fadfa49f7a..548a0a3d5e 100644
--- a/asmcomp/asmpackager.ml
+++ b/asmcomp/asmpackager.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/asmpackager.mli b/asmcomp/asmpackager.mli
index 7d0bb588b5..fafccfea3b 100644
--- a/asmcomp/asmpackager.mli
+++ b/asmcomp/asmpackager.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/clambda.ml b/asmcomp/clambda.ml
index 1d25b555f2..9bcb36fd16 100644
--- a/asmcomp/clambda.ml
+++ b/asmcomp/clambda.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/clambda.mli b/asmcomp/clambda.mli
index a1efd644e9..72ab85769f 100644
--- a/asmcomp/clambda.mli
+++ b/asmcomp/clambda.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/closure.ml b/asmcomp/closure.ml
index 8f2a034c22..f37908f031 100644
--- a/asmcomp/closure.ml
+++ b/asmcomp/closure.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/closure.mli b/asmcomp/closure.mli
index f16379068d..f406603c2c 100644
--- a/asmcomp/closure.mli
+++ b/asmcomp/closure.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/cmm.ml b/asmcomp/cmm.ml
index 68625e24c8..671ce5d789 100644
--- a/asmcomp/cmm.ml
+++ b/asmcomp/cmm.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/cmm.mli b/asmcomp/cmm.mli
index 1b09071657..76c50859fe 100644
--- a/asmcomp/cmm.mli
+++ b/asmcomp/cmm.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/cmmgen.ml b/asmcomp/cmmgen.ml
index 87a77c6230..61fef31b80 100644
--- a/asmcomp/cmmgen.ml
+++ b/asmcomp/cmmgen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/cmmgen.mli b/asmcomp/cmmgen.mli
index ba7e5ad00f..a192b985e1 100644
--- a/asmcomp/cmmgen.mli
+++ b/asmcomp/cmmgen.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/cmx_format.mli b/asmcomp/cmx_format.mli
index 9abfaf02e7..78de321d9b 100644
--- a/asmcomp/cmx_format.mli
+++ b/asmcomp/cmx_format.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Gallium, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/codegen.ml b/asmcomp/codegen.ml
index 280f139408..4b71503f9d 100644
--- a/asmcomp/codegen.ml
+++ b/asmcomp/codegen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/codegen.mli b/asmcomp/codegen.mli
index b6d8caa611..43f98e50b2 100644
--- a/asmcomp/codegen.mli
+++ b/asmcomp/codegen.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/coloring.ml b/asmcomp/coloring.ml
index 37c03a05b2..06c1eb8246 100644
--- a/asmcomp/coloring.ml
+++ b/asmcomp/coloring.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/coloring.mli b/asmcomp/coloring.mli
index cbfb2d6cd1..72576fa10a 100644
--- a/asmcomp/coloring.mli
+++ b/asmcomp/coloring.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/comballoc.ml b/asmcomp/comballoc.ml
index 13dbcaffe2..9767d2638a 100644
--- a/asmcomp/comballoc.ml
+++ b/asmcomp/comballoc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/comballoc.mli b/asmcomp/comballoc.mli
index 329e927644..20be980544 100644
--- a/asmcomp/comballoc.mli
+++ b/asmcomp/comballoc.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/compilenv.ml b/asmcomp/compilenv.ml
index 27839311c5..0b87efecf9 100644
--- a/asmcomp/compilenv.ml
+++ b/asmcomp/compilenv.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/compilenv.mli b/asmcomp/compilenv.mli
index 664dab9337..ca03724efe 100644
--- a/asmcomp/compilenv.mli
+++ b/asmcomp/compilenv.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/debuginfo.ml b/asmcomp/debuginfo.ml
index a7124e171b..ad676d6745 100644
--- a/asmcomp/debuginfo.ml
+++ b/asmcomp/debuginfo.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Gallium, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/debuginfo.mli b/asmcomp/debuginfo.mli
index c3c9c406e4..c6e36041cf 100644
--- a/asmcomp/debuginfo.mli
+++ b/asmcomp/debuginfo.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Gallium, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/emit.mli b/asmcomp/emit.mli
index ab7657af9a..e2ff68ffcd 100644
--- a/asmcomp/emit.mli
+++ b/asmcomp/emit.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/emitaux.ml b/asmcomp/emitaux.ml
index d4db78ad75..92bda9e298 100644
--- a/asmcomp/emitaux.ml
+++ b/asmcomp/emitaux.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/emitaux.mli b/asmcomp/emitaux.mli
index 4f666be736..c18d8e80c3 100644
--- a/asmcomp/emitaux.mli
+++ b/asmcomp/emitaux.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/hppa/arch.ml b/asmcomp/hppa/arch.ml
index eb2e1938dd..195c28e6f2 100644
--- a/asmcomp/hppa/arch.ml
+++ b/asmcomp/hppa/arch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/hppa/emit.mlp b/asmcomp/hppa/emit.mlp
index b697a335a2..d355441090 100644
--- a/asmcomp/hppa/emit.mlp
+++ b/asmcomp/hppa/emit.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/hppa/proc.ml b/asmcomp/hppa/proc.ml
index c0b40adbea..7ee20040f7 100644
--- a/asmcomp/hppa/proc.ml
+++ b/asmcomp/hppa/proc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/hppa/reload.ml b/asmcomp/hppa/reload.ml
index 54208fcc33..b6fe659803 100644
--- a/asmcomp/hppa/reload.ml
+++ b/asmcomp/hppa/reload.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/hppa/scheduling.ml b/asmcomp/hppa/scheduling.ml
index 0cdd0998c1..b669aec21c 100644
--- a/asmcomp/hppa/scheduling.ml
+++ b/asmcomp/hppa/scheduling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/hppa/selection.ml b/asmcomp/hppa/selection.ml
index 74c546b08b..72792e2b00 100644
--- a/asmcomp/hppa/selection.ml
+++ b/asmcomp/hppa/selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/i386/arch.ml b/asmcomp/i386/arch.ml
index 04d673d91d..5ffbeeb237 100644
--- a/asmcomp/i386/arch.ml
+++ b/asmcomp/i386/arch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
index 881a936a14..7ac0e4e7d9 100644
--- a/asmcomp/i386/emit.mlp
+++ b/asmcomp/i386/emit.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/i386/emit_nt.mlp b/asmcomp/i386/emit_nt.mlp
index 7091b3df8f..e010cf8cc9 100644
--- a/asmcomp/i386/emit_nt.mlp
+++ b/asmcomp/i386/emit_nt.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/i386/proc.ml b/asmcomp/i386/proc.ml
index d2e3cdda96..55cb32c9b6 100644
--- a/asmcomp/i386/proc.ml
+++ b/asmcomp/i386/proc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/i386/proc_nt.ml b/asmcomp/i386/proc_nt.ml
index 5e617ff1a9..ebed8f647a 100644
--- a/asmcomp/i386/proc_nt.ml
+++ b/asmcomp/i386/proc_nt.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/i386/reload.ml b/asmcomp/i386/reload.ml
index 539d45daea..66ad6a1407 100644
--- a/asmcomp/i386/reload.ml
+++ b/asmcomp/i386/reload.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/i386/scheduling.ml b/asmcomp/i386/scheduling.ml
index 6f018cc870..cbfaa21110 100644
--- a/asmcomp/i386/scheduling.ml
+++ b/asmcomp/i386/scheduling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/i386/selection.ml b/asmcomp/i386/selection.ml
index 5a8720fbeb..2e0f5a737a 100644
--- a/asmcomp/i386/selection.ml
+++ b/asmcomp/i386/selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/ia64/arch.ml b/asmcomp/ia64/arch.ml
index 77dddaca2c..006660d4ac 100644
--- a/asmcomp/ia64/arch.ml
+++ b/asmcomp/ia64/arch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/ia64/emit.mlp b/asmcomp/ia64/emit.mlp
index 3d8eeb974f..b722af0159 100644
--- a/asmcomp/ia64/emit.mlp
+++ b/asmcomp/ia64/emit.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/ia64/proc.ml b/asmcomp/ia64/proc.ml
index 15311aa024..97ee3f3ccc 100644
--- a/asmcomp/ia64/proc.ml
+++ b/asmcomp/ia64/proc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/ia64/reload.ml b/asmcomp/ia64/reload.ml
index 338c08844f..09210b164a 100644
--- a/asmcomp/ia64/reload.ml
+++ b/asmcomp/ia64/reload.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/ia64/scheduling.ml b/asmcomp/ia64/scheduling.ml
index 9bed03a6c7..6c696aca20 100644
--- a/asmcomp/ia64/scheduling.ml
+++ b/asmcomp/ia64/scheduling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/ia64/selection.ml b/asmcomp/ia64/selection.ml
index 6be4a18cdb..0c16c346a6 100644
--- a/asmcomp/ia64/selection.ml
+++ b/asmcomp/ia64/selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/interf.ml b/asmcomp/interf.ml
index 30f17b7250..f22672b55d 100644
--- a/asmcomp/interf.ml
+++ b/asmcomp/interf.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/interf.mli b/asmcomp/interf.mli
index 00f4df4981..9e16f83641 100644
--- a/asmcomp/interf.mli
+++ b/asmcomp/interf.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/linearize.ml b/asmcomp/linearize.ml
index 5833595ae6..a5c758823a 100644
--- a/asmcomp/linearize.ml
+++ b/asmcomp/linearize.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/linearize.mli b/asmcomp/linearize.mli
index aaf03184c2..ca11006b5a 100644
--- a/asmcomp/linearize.mli
+++ b/asmcomp/linearize.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/liveness.ml b/asmcomp/liveness.ml
index 4e743d646f..74a034fb39 100644
--- a/asmcomp/liveness.ml
+++ b/asmcomp/liveness.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/liveness.mli b/asmcomp/liveness.mli
index 3353b44439..8a25a27bc6 100644
--- a/asmcomp/liveness.mli
+++ b/asmcomp/liveness.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/mach.ml b/asmcomp/mach.ml
index 027550ab12..b628f76ca0 100644
--- a/asmcomp/mach.ml
+++ b/asmcomp/mach.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/mach.mli b/asmcomp/mach.mli
index 438d15d2fc..dd58b8a024 100644
--- a/asmcomp/mach.mli
+++ b/asmcomp/mach.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/mips/arch.ml b/asmcomp/mips/arch.ml
index c174ef6c9b..af36f6f27b 100644
--- a/asmcomp/mips/arch.ml
+++ b/asmcomp/mips/arch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/mips/emit.mlp b/asmcomp/mips/emit.mlp
index 06915fd34f..1abf9d5992 100644
--- a/asmcomp/mips/emit.mlp
+++ b/asmcomp/mips/emit.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/mips/proc.ml b/asmcomp/mips/proc.ml
index 53971890ee..9b2d84ae11 100644
--- a/asmcomp/mips/proc.ml
+++ b/asmcomp/mips/proc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/mips/reload.ml b/asmcomp/mips/reload.ml
index 0bdd208d60..2e9838bc9c 100644
--- a/asmcomp/mips/reload.ml
+++ b/asmcomp/mips/reload.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/mips/scheduling.ml b/asmcomp/mips/scheduling.ml
index 062529ad55..17b7e3883c 100644
--- a/asmcomp/mips/scheduling.ml
+++ b/asmcomp/mips/scheduling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/mips/selection.ml b/asmcomp/mips/selection.ml
index 4dbaa86ea8..791fe296d2 100644
--- a/asmcomp/mips/selection.ml
+++ b/asmcomp/mips/selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/power/arch.ml b/asmcomp/power/arch.ml
index 8828de7c03..5da85099eb 100644
--- a/asmcomp/power/arch.ml
+++ b/asmcomp/power/arch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/power/emit.mlp b/asmcomp/power/emit.mlp
index b6496f9870..efa215baa2 100644
--- a/asmcomp/power/emit.mlp
+++ b/asmcomp/power/emit.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/power/proc.ml b/asmcomp/power/proc.ml
index ab8e5a5d5a..6eaacbbad0 100644
--- a/asmcomp/power/proc.ml
+++ b/asmcomp/power/proc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/power/reload.ml b/asmcomp/power/reload.ml
index 3f74c3f5e5..ef0ab79df6 100644
--- a/asmcomp/power/reload.ml
+++ b/asmcomp/power/reload.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/power/scheduling.ml b/asmcomp/power/scheduling.ml
index aac37c8790..90d08831d5 100644
--- a/asmcomp/power/scheduling.ml
+++ b/asmcomp/power/scheduling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/power/selection.ml b/asmcomp/power/selection.ml
index d87b300ccb..7c37f53ba4 100644
--- a/asmcomp/power/selection.ml
+++ b/asmcomp/power/selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/printcmm.ml b/asmcomp/printcmm.ml
index 364d9ea88a..996eaa21c1 100644
--- a/asmcomp/printcmm.ml
+++ b/asmcomp/printcmm.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/printcmm.mli b/asmcomp/printcmm.mli
index d498ddb72b..c646576531 100644
--- a/asmcomp/printcmm.mli
+++ b/asmcomp/printcmm.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/printlinear.ml b/asmcomp/printlinear.ml
index 3737e72c13..0e6f37b699 100644
--- a/asmcomp/printlinear.ml
+++ b/asmcomp/printlinear.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/printlinear.mli b/asmcomp/printlinear.mli
index 5e90c11c68..bb179c94c1 100644
--- a/asmcomp/printlinear.mli
+++ b/asmcomp/printlinear.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/printmach.ml b/asmcomp/printmach.ml
index d7d538df31..339deb7eed 100644
--- a/asmcomp/printmach.ml
+++ b/asmcomp/printmach.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/printmach.mli b/asmcomp/printmach.mli
index 28328707c7..509018d54c 100644
--- a/asmcomp/printmach.mli
+++ b/asmcomp/printmach.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/proc.mli b/asmcomp/proc.mli
index ba593592bb..7d0a5e485b 100644
--- a/asmcomp/proc.mli
+++ b/asmcomp/proc.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/reg.ml b/asmcomp/reg.ml
index f9bef49677..30c0ab5ab0 100644
--- a/asmcomp/reg.ml
+++ b/asmcomp/reg.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/reg.mli b/asmcomp/reg.mli
index b802344ded..11e314f613 100644
--- a/asmcomp/reg.mli
+++ b/asmcomp/reg.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/reload.mli b/asmcomp/reload.mli
index fc72446e7d..ff4b1637a5 100644
--- a/asmcomp/reload.mli
+++ b/asmcomp/reload.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/reloadgen.ml b/asmcomp/reloadgen.ml
index 898c65c989..fc28acde4f 100644
--- a/asmcomp/reloadgen.ml
+++ b/asmcomp/reloadgen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/reloadgen.mli b/asmcomp/reloadgen.mli
index f0d1c78c0a..9f0b2b4e1d 100644
--- a/asmcomp/reloadgen.mli
+++ b/asmcomp/reloadgen.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/schedgen.ml b/asmcomp/schedgen.ml
index 00762fa36a..a5dfcfdbf3 100644
--- a/asmcomp/schedgen.ml
+++ b/asmcomp/schedgen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/schedgen.mli b/asmcomp/schedgen.mli
index ab5f072b79..e2c046d229 100644
--- a/asmcomp/schedgen.mli
+++ b/asmcomp/schedgen.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/scheduling.mli b/asmcomp/scheduling.mli
index dd24354ad2..a006d1f13f 100644
--- a/asmcomp/scheduling.mli
+++ b/asmcomp/scheduling.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/selectgen.ml b/asmcomp/selectgen.ml
index 50f949a77f..106d42bc2b 100644
--- a/asmcomp/selectgen.ml
+++ b/asmcomp/selectgen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/selectgen.mli b/asmcomp/selectgen.mli
index 7c30f9f540..73309bf7b8 100644
--- a/asmcomp/selectgen.mli
+++ b/asmcomp/selectgen.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/selection.mli b/asmcomp/selection.mli
index ab17b557d5..a78cb1daec 100644
--- a/asmcomp/selection.mli
+++ b/asmcomp/selection.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/sparc/arch.ml b/asmcomp/sparc/arch.ml
index 61ba35b9a5..b42557c97d 100644
--- a/asmcomp/sparc/arch.ml
+++ b/asmcomp/sparc/arch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/sparc/emit.mlp b/asmcomp/sparc/emit.mlp
index f44f813e53..52a8bc60a8 100644
--- a/asmcomp/sparc/emit.mlp
+++ b/asmcomp/sparc/emit.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/sparc/proc.ml b/asmcomp/sparc/proc.ml
index 2fd147bfc7..f7b204db5a 100644
--- a/asmcomp/sparc/proc.ml
+++ b/asmcomp/sparc/proc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/sparc/reload.ml b/asmcomp/sparc/reload.ml
index a590ba3ffc..6b1d8aea96 100644
--- a/asmcomp/sparc/reload.ml
+++ b/asmcomp/sparc/reload.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/sparc/scheduling.ml b/asmcomp/sparc/scheduling.ml
index efe9a1f4cc..180af4b193 100644
--- a/asmcomp/sparc/scheduling.ml
+++ b/asmcomp/sparc/scheduling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/sparc/selection.ml b/asmcomp/sparc/selection.ml
index 965680b65e..1dfc06f273 100644
--- a/asmcomp/sparc/selection.ml
+++ b/asmcomp/sparc/selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/spill.ml b/asmcomp/spill.ml
index 968987d480..874f73579b 100644
--- a/asmcomp/spill.ml
+++ b/asmcomp/spill.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/spill.mli b/asmcomp/spill.mli
index 16a8c01add..4db4222272 100644
--- a/asmcomp/spill.mli
+++ b/asmcomp/spill.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/split.ml b/asmcomp/split.ml
index 9e6130d218..8c5e22703d 100644
--- a/asmcomp/split.ml
+++ b/asmcomp/split.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmcomp/split.mli b/asmcomp/split.mli
index 67e0956e88..baf350d50b 100644
--- a/asmcomp/split.mli
+++ b/asmcomp/split.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/asmrun/Makefile b/asmrun/Makefile
index 81c0120a4b..2ccfa880dc 100644
--- a/asmrun/Makefile
+++ b/asmrun/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/asmrun/Makefile.nt b/asmrun/Makefile.nt
index 75fe261415..67f94d6587 100644
--- a/asmrun/Makefile.nt
+++ b/asmrun/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/asmrun/alpha.S b/asmrun/alpha.S
index c5251b73a5..c726d4592c 100644
--- a/asmrun/alpha.S
+++ b/asmrun/alpha.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/amd64.S b/asmrun/amd64.S
index 645c2e616d..b960ea8026 100644
--- a/asmrun/amd64.S
+++ b/asmrun/amd64.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/amd64nt.asm b/asmrun/amd64nt.asm
index 4c31bc8731..2a38fd9f38 100644
--- a/asmrun/amd64nt.asm
+++ b/asmrun/amd64nt.asm
@@ -1,15 +1,15 @@
-;*********************************************************************
-;
-; Objective Caml
-;
-; Xavier Leroy, projet Gallium, INRIA Rocquencourt
-;
-; Copyright 2006 Institut National de Recherche en Informatique et
-; en Automatique. All rights reserved. This file is distributed
-; under the terms of the GNU Library General Public License, with
-; the special exception on linking described in file ../LICENSE.
-;
-;*********************************************************************
+;***********************************************************************
+;* *
+;* OCaml *
+;* *
+;* Xavier Leroy, projet Gallium, INRIA Rocquencourt *
+;* *
+;* Copyright 2006 Institut National de Recherche en Informatique et *
+;* en Automatique. All rights reserved. This file is distributed *
+;* under the terms of the GNU Library General Public License, with *
+;* the special exception on linking described in file ../LICENSE. *
+;* *
+;***********************************************************************
; $Id$
diff --git a/asmrun/arm.S b/asmrun/arm.S
index 8a47d182c9..b7c64243a4 100644
--- a/asmrun/arm.S
+++ b/asmrun/arm.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/backtrace.c b/asmrun/backtrace.c
index 0825cade53..c9581dd27f 100644
--- a/asmrun/backtrace.c
+++ b/asmrun/backtrace.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Gallium, INRIA Rocquencourt */
/* */
diff --git a/asmrun/fail.c b/asmrun/fail.c
index a1ec0fb070..45a4b8fa87 100644
--- a/asmrun/fail.c
+++ b/asmrun/fail.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/hppa.S b/asmrun/hppa.S
index abdd4554b8..1f367e827f 100644
--- a/asmrun/hppa.S
+++ b/asmrun/hppa.S
@@ -1,15 +1,15 @@
-;*********************************************************************
-;* *
-;* Objective Caml *
-;* *
-;* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
-;* *
-;* Copyright 1996 Institut National de Recherche en Informatique et *
-;* en Automatique. All rights reserved. This file is distributed *
-;* under the terms of the GNU Library General Public License, with *
-;* the special exception on linking described in file ../LICENSE. *
-;* *
-;*********************************************************************
+;***********************************************************************
+;* *
+;* OCaml *
+;* *
+;* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+;* *
+;* Copyright 1996 Institut National de Recherche en Informatique et *
+;* en Automatique. All rights reserved. This file is distributed *
+;* under the terms of the GNU Library General Public License, with *
+;* the special exception on linking described in file ../LICENSE. *
+;* *
+;***********************************************************************
; $Id$
diff --git a/asmrun/i386.S b/asmrun/i386.S
index 73ac46741d..fc91d393fc 100644
--- a/asmrun/i386.S
+++ b/asmrun/i386.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/i386nt.asm b/asmrun/i386nt.asm
index 711449cfbb..02c6ff564d 100644
--- a/asmrun/i386nt.asm
+++ b/asmrun/i386nt.asm
@@ -1,15 +1,15 @@
-;*********************************************************************
-;
-; Objective Caml
-;
-; Xavier Leroy, projet Cristal, INRIA Rocquencourt
-;
-; Copyright 1996 Institut National de Recherche en Informatique et
-; en Automatique. All rights reserved. This file is distributed
-; under the terms of the GNU Library General Public License, with
-; the special exception on linking described in file ../LICENSE.
-;
-;*********************************************************************
+;***********************************************************************
+;* *
+;* OCaml *
+;* *
+;* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+;* *
+;* Copyright 1996 Institut National de Recherche en Informatique et *
+;* en Automatique. All rights reserved. This file is distributed *
+;* under the terms of the GNU Library General Public License, with *
+;* the special exception on linking described in file ../LICENSE. *
+;* *
+;***********************************************************************
; $Id$
diff --git a/asmrun/ia64.S b/asmrun/ia64.S
index d4296fa4a4..4680aa932b 100644
--- a/asmrun/ia64.S
+++ b/asmrun/ia64.S
@@ -1,12 +1,13 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License, with */
+/* the special exception on linking described in file ../LICENSE. */
/* */
/***********************************************************************/
diff --git a/asmrun/m68k.S b/asmrun/m68k.S
index 559eacbeb8..e456f3c352 100644
--- a/asmrun/m68k.S
+++ b/asmrun/m68k.S
@@ -1,6 +1,6 @@
|***********************************************************************
|* *
-|* Objective Caml *
+|* OCaml *
|* *
|* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
|* *
diff --git a/asmrun/mips.s b/asmrun/mips.s
index 03fd623435..5f63c3f3f7 100644
--- a/asmrun/mips.s
+++ b/asmrun/mips.s
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/natdynlink.c b/asmrun/natdynlink.c
index 84cfb590c9..9de81b018f 100644
--- a/asmrun/natdynlink.c
+++ b/asmrun/natdynlink.c
@@ -1,3 +1,16 @@
+/***********************************************************************/
+/* */
+/* OCaml */
+/* */
+/* Alain Frisch, projet Gallium, INRIA Rocquencourt */
+/* */
+/* Copyright 2007 Institut National de Recherche en Informatique et */
+/* en Automatique. All rights reserved. This file is distributed */
+/* under the terms of the GNU Library General Public License, with */
+/* the special exception on linking described in file ../LICENSE. */
+/* */
+/***********************************************************************/
+
#include "misc.h"
#include "mlvalues.h"
#include "memory.h"
diff --git a/asmrun/power-aix.S b/asmrun/power-aix.S
index d63cdae866..21e1c7e281 100644
--- a/asmrun/power-aix.S
+++ b/asmrun/power-aix.S
@@ -1,15 +1,15 @@
-#*********************************************************************
-#* *
-#* Objective Caml *
-#* *
-#* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
-#* *
-#* Copyright 1996 Institut National de Recherche en Informatique et *
-#* en Automatique. All rights reserved. This file is distributed *
-#* under the terms of the GNU Library General Public License, with *
-#* the special exception on linking described in file ../LICENSE. *
-#* *
-#*********************************************************************
+#***********************************************************************
+#* *
+#* OCaml *
+#* *
+#* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+#* *
+#* Copyright 1996 Institut National de Recherche en Informatique et *
+#* en Automatique. All rights reserved. This file is distributed *
+#* under the terms of the GNU Library General Public License, with *
+#* the special exception on linking described in file ../LICENSE. *
+#* *
+#***********************************************************************
# $Id$
diff --git a/asmrun/power-elf.S b/asmrun/power-elf.S
index 968e3aeb88..34ef6cc21f 100644
--- a/asmrun/power-elf.S
+++ b/asmrun/power-elf.S
@@ -1,15 +1,15 @@
-/*********************************************************************/
-/* */
-/* Objective Caml */
-/* */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/* */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/* */
-/*********************************************************************/
+/***********************************************************************/
+/* */
+/* OCaml */
+/* */
+/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
+/* */
+/* Copyright 1996 Institut National de Recherche en Informatique et */
+/* en Automatique. All rights reserved. This file is distributed */
+/* under the terms of the GNU Library General Public License, with */
+/* the special exception on linking described in file ../LICENSE. */
+/* */
+/***********************************************************************/
/* $Id$ */
diff --git a/asmrun/power-rhapsody.S b/asmrun/power-rhapsody.S
index 765de9c8cc..ab7f5384cd 100644
--- a/asmrun/power-rhapsody.S
+++ b/asmrun/power-rhapsody.S
@@ -1,15 +1,15 @@
-/*********************************************************************/
-/* */
-/* Objective Caml */
-/* */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/* */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/* */
-/*********************************************************************/
+/***********************************************************************/
+/* */
+/* OCaml */
+/* */
+/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
+/* */
+/* Copyright 1996 Institut National de Recherche en Informatique et */
+/* en Automatique. All rights reserved. This file is distributed */
+/* under the terms of the GNU Library General Public License, with */
+/* the special exception on linking described in file ../LICENSE. */
+/* */
+/***********************************************************************/
/* $Id$ */
diff --git a/asmrun/roots.c b/asmrun/roots.c
index cb75a099ca..4a495e2c14 100644
--- a/asmrun/roots.c
+++ b/asmrun/roots.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/signals_asm.c b/asmrun/signals_asm.c
index f8f542ada9..5b3f9955ef 100644
--- a/asmrun/signals_asm.c
+++ b/asmrun/signals_asm.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Gallium, INRIA Rocquencourt */
/* */
diff --git a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h
index 76552e5ee2..85e9b750a5 100644
--- a/asmrun/signals_osdep.h
+++ b/asmrun/signals_osdep.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/sparc.S b/asmrun/sparc.S
index 38d0be0c16..dd1e5844ac 100644
--- a/asmrun/sparc.S
+++ b/asmrun/sparc.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/stack.h b/asmrun/stack.h
index 62a33e71fc..2609d391c2 100644
--- a/asmrun/stack.h
+++ b/asmrun/stack.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/asmrun/startup.c b/asmrun/startup.c
index 8bfe762119..0f8ed10f70 100644
--- a/asmrun/startup.c
+++ b/asmrun/startup.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/boot/ocamlc b/boot/ocamlc
index 8b5982d7c4..beb85c70da 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
Binary files differ
diff --git a/boot/ocamldep b/boot/ocamldep
index 143c6a27c1..efc73e1d9b 100755
--- a/boot/ocamldep
+++ b/boot/ocamldep
Binary files differ
diff --git a/boot/ocamllex b/boot/ocamllex
index 50e5cc5f15..1f351993fb 100755
--- a/boot/ocamllex
+++ b/boot/ocamllex
Binary files differ
diff --git a/build/boot-c-parts.sh b/build/boot-c-parts.sh
index 9999392e37..fd5a35c72b 100755
--- a/build/boot-c-parts.sh
+++ b/build/boot-c-parts.sh
@@ -1,4 +1,17 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
cd `dirname $0`/..
set -ex
diff --git a/build/boot.sh b/build/boot.sh
index 3de6006abf..79d5d20ba9 100755
--- a/build/boot.sh
+++ b/build/boot.sh
@@ -1,4 +1,17 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# $Id$
cd `dirname $0`/..
set -ex
diff --git a/build/buildbot b/build/buildbot
index 82cc26b164..5d3cffbacc 100755
--- a/build/buildbot
+++ b/build/buildbot
@@ -1,5 +1,17 @@
#!/bin/sh
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# If you want to help me by participating to the build/test effort:
# http://gallium.inria.fr/~pouillar/ocaml-testing.html
# -- Nicolas Pouillard
diff --git a/build/camlp4-bootstrap.sh b/build/camlp4-bootstrap.sh
index ef9a93c01b..612e060e9a 100755
--- a/build/camlp4-bootstrap.sh
+++ b/build/camlp4-bootstrap.sh
@@ -1,5 +1,17 @@
#!/bin/sh
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# README: to bootstrap camlp4 have a look at build/camlp4-bootstrap-recipe.txt
set -e
diff --git a/build/camlp4-byte-only.sh b/build/camlp4-byte-only.sh
index 39b346172d..442284d9d5 100755
--- a/build/camlp4-byte-only.sh
+++ b/build/camlp4-byte-only.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/camlp4-mkCamlp4Ast.sh b/build/camlp4-mkCamlp4Ast.sh
index 2a30b9ab22..45311065c9 100755
--- a/build/camlp4-mkCamlp4Ast.sh
+++ b/build/camlp4-mkCamlp4Ast.sh
@@ -1,4 +1,17 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2010 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# $Id$
set -e
cd `dirname $0`/..
diff --git a/build/camlp4-native-only.sh b/build/camlp4-native-only.sh
index 629684b7b2..d05932e2a6 100755
--- a/build/camlp4-native-only.sh
+++ b/build/camlp4-native-only.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/camlp4-targets.sh b/build/camlp4-targets.sh
index 7c68906a48..4f4f51979e 100644
--- a/build/camlp4-targets.sh
+++ b/build/camlp4-targets.sh
@@ -1,4 +1,17 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# $Id$
CAMLP4_COMMON="\
camlp4/Camlp4/Camlp4Ast.partial.ml \
diff --git a/build/distclean.sh b/build/distclean.sh
index b3efb3ab93..b336f9bb4b 100755
--- a/build/distclean.sh
+++ b/build/distclean.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/fastworld.sh b/build/fastworld.sh
index 8263908057..bbe42870ab 100755
--- a/build/fastworld.sh
+++ b/build/fastworld.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/install.sh b/build/install.sh
index 264d598312..c0ad62f8ba 100755
--- a/build/install.sh
+++ b/build/install.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/mixed-boot.sh b/build/mixed-boot.sh
index 122ff412f7..133f8cff85 100755
--- a/build/mixed-boot.sh
+++ b/build/mixed-boot.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/mkconfig.sh b/build/mkconfig.sh
index d7c2d91ebc..8cf1773dd9 100755
--- a/build/mkconfig.sh
+++ b/build/mkconfig.sh
@@ -1,5 +1,17 @@
#!/bin/sh
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
cd `dirname $0`/..
sed -e 's/^\(.*\$([0-9]).*\)$/# \1/' \
diff --git a/build/mkmyocamlbuild_config.sh b/build/mkmyocamlbuild_config.sh
index 9c7eebd3c3..600878d8a8 100755
--- a/build/mkmyocamlbuild_config.sh
+++ b/build/mkmyocamlbuild_config.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/mkruntimedef.sh b/build/mkruntimedef.sh
index 54f7cc5c72..6cfd0749ce 100755
--- a/build/mkruntimedef.sh
+++ b/build/mkruntimedef.sh
@@ -1,4 +1,17 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# $Id$
echo 'let builtin_exceptions = [|'; \
sed -n -e 's|.*/\* \("[A-Za-z_]*"\) \*/$| \1;|p' byterun/fail.h | \
diff --git a/build/myocamlbuild.sh b/build/myocamlbuild.sh
index ad8b71a5f3..7a029a6a12 100755
--- a/build/myocamlbuild.sh
+++ b/build/myocamlbuild.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/ocamlbuild-byte-only.sh b/build/ocamlbuild-byte-only.sh
index 2f226d422c..f669e8e685 100755
--- a/build/ocamlbuild-byte-only.sh
+++ b/build/ocamlbuild-byte-only.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/ocamlbuild-native-only.sh b/build/ocamlbuild-native-only.sh
index c61f6a1ab9..f092a78928 100755
--- a/build/ocamlbuild-native-only.sh
+++ b/build/ocamlbuild-native-only.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/ocamlbuildlib-native-only.sh b/build/ocamlbuildlib-native-only.sh
index 52bfb8fe24..9d6660803d 100755
--- a/build/ocamlbuildlib-native-only.sh
+++ b/build/ocamlbuildlib-native-only.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/otherlibs-targets.sh b/build/otherlibs-targets.sh
index e3d9fedf27..a3890d038a 100644
--- a/build/otherlibs-targets.sh
+++ b/build/otherlibs-targets.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/partial-install.sh b/build/partial-install.sh
index 6199762890..1573fa94d5 100755
--- a/build/partial-install.sh
+++ b/build/partial-install.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/targets.sh b/build/targets.sh
index 8d698423f7..d4e5a6a939 100644
--- a/build/targets.sh
+++ b/build/targets.sh
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/build/tolower.sed b/build/tolower.sed
index ccd55fca4c..ce0eb1651b 100644
--- a/build/tolower.sed
+++ b/build/tolower.sed
@@ -1,3 +1,15 @@
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# tolower.sed expands one ...<:lower<FOO>>... to ...foo... per line
h
s/.*<:lower<\(.*\)>>.*/\1/
diff --git a/build/world.all.sh b/build/world.all.sh
index d8a18abb97..bf456fc278 100755
--- a/build/world.all.sh
+++ b/build/world.all.sh
@@ -1,4 +1,17 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# $Id$
set -e
cd `dirname $0`/..
diff --git a/build/world.byte.sh b/build/world.byte.sh
index d3e96dc4b6..a30cda2ffe 100755
--- a/build/world.byte.sh
+++ b/build/world.byte.sh
@@ -1,4 +1,17 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# $Id$
set -e
cd `dirname $0`/..
diff --git a/build/world.native.sh b/build/world.native.sh
index ac4a183237..19526805e0 100755
--- a/build/world.native.sh
+++ b/build/world.native.sh
@@ -1,4 +1,17 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# $Id$
set -e
cd `dirname $0`/..
diff --git a/build/world.sh b/build/world.sh
index 534bce5459..3b08dc78d2 100755
--- a/build/world.sh
+++ b/build/world.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/bytecomp/bytegen.ml b/bytecomp/bytegen.ml
index b6c8f6fae8..9773f0b7c9 100644
--- a/bytecomp/bytegen.ml
+++ b/bytecomp/bytegen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/bytegen.mli b/bytecomp/bytegen.mli
index 04265fde30..e0cd5f6179 100644
--- a/bytecomp/bytegen.mli
+++ b/bytecomp/bytegen.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/bytelibrarian.ml b/bytecomp/bytelibrarian.ml
index ba08fc019f..62d900023d 100644
--- a/bytecomp/bytelibrarian.ml
+++ b/bytecomp/bytelibrarian.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/bytelibrarian.mli b/bytecomp/bytelibrarian.mli
index a4f9cc2f29..a4250f96d7 100644
--- a/bytecomp/bytelibrarian.mli
+++ b/bytecomp/bytelibrarian.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
index 15c6f7f58e..794a0acb4a 100644
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/bytelink.mli b/bytecomp/bytelink.mli
index 2e8f0cb313..375bde0d5d 100644
--- a/bytecomp/bytelink.mli
+++ b/bytecomp/bytelink.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/bytepackager.ml b/bytecomp/bytepackager.ml
index e2b6ff54bb..eee60f0f48 100644
--- a/bytecomp/bytepackager.ml
+++ b/bytecomp/bytepackager.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/bytepackager.mli b/bytecomp/bytepackager.mli
index 836eb9c637..2a599d9f98 100644
--- a/bytecomp/bytepackager.mli
+++ b/bytecomp/bytepackager.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/bytesections.ml b/bytecomp/bytesections.ml
index 16eaf23776..342f071414 100644
--- a/bytecomp/bytesections.ml
+++ b/bytecomp/bytesections.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/bytesections.mli b/bytecomp/bytesections.mli
index 5292cc1b4a..c9264ad899 100644
--- a/bytecomp/bytesections.mli
+++ b/bytecomp/bytesections.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/cmo_format.mli b/bytecomp/cmo_format.mli
index c87e6df4e2..b0cd05d67c 100644
--- a/bytecomp/cmo_format.mli
+++ b/bytecomp/cmo_format.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/dll.ml b/bytecomp/dll.ml
index bcf66b4296..6109028fc5 100644
--- a/bytecomp/dll.ml
+++ b/bytecomp/dll.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/dll.mli b/bytecomp/dll.mli
index fea455f7cb..a4841d3d31 100644
--- a/bytecomp/dll.mli
+++ b/bytecomp/dll.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/emitcode.ml b/bytecomp/emitcode.ml
index 2cec99dc83..f9a33db731 100644
--- a/bytecomp/emitcode.ml
+++ b/bytecomp/emitcode.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/emitcode.mli b/bytecomp/emitcode.mli
index fa20de1816..55f3dff11d 100644
--- a/bytecomp/emitcode.mli
+++ b/bytecomp/emitcode.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/instruct.ml b/bytecomp/instruct.ml
index 4f4fa14fa1..a26c094588 100644
--- a/bytecomp/instruct.ml
+++ b/bytecomp/instruct.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/instruct.mli b/bytecomp/instruct.mli
index 6b9367f9a0..0fdccd298c 100644
--- a/bytecomp/instruct.mli
+++ b/bytecomp/instruct.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/lambda.ml b/bytecomp/lambda.ml
index 06523ebcc1..b1e6f16eb6 100644
--- a/bytecomp/lambda.ml
+++ b/bytecomp/lambda.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/lambda.mli b/bytecomp/lambda.mli
index e671b89156..d09a8c6f6b 100644
--- a/bytecomp/lambda.mli
+++ b/bytecomp/lambda.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/matching.ml b/bytecomp/matching.ml
index 21006cc695..402ac12ad8 100644
--- a/bytecomp/matching.ml
+++ b/bytecomp/matching.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/matching.mli b/bytecomp/matching.mli
index ebfed8410d..d8ea791084 100644
--- a/bytecomp/matching.mli
+++ b/bytecomp/matching.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/meta.ml b/bytecomp/meta.ml
index a4beaf4224..732bcc8a1a 100644
--- a/bytecomp/meta.ml
+++ b/bytecomp/meta.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/meta.mli b/bytecomp/meta.mli
index 774c5f1374..93be656ad5 100644
--- a/bytecomp/meta.mli
+++ b/bytecomp/meta.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/printinstr.ml b/bytecomp/printinstr.ml
index 2f0508b299..f2aa87dc37 100644
--- a/bytecomp/printinstr.ml
+++ b/bytecomp/printinstr.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/printinstr.mli b/bytecomp/printinstr.mli
index e88e76ffc7..57cea578b5 100644
--- a/bytecomp/printinstr.mli
+++ b/bytecomp/printinstr.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/printlambda.ml b/bytecomp/printlambda.ml
index 9bfa099e15..38182db7eb 100644
--- a/bytecomp/printlambda.ml
+++ b/bytecomp/printlambda.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/printlambda.mli b/bytecomp/printlambda.mli
index 352d6d0248..16618350ce 100644
--- a/bytecomp/printlambda.mli
+++ b/bytecomp/printlambda.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/runtimedef.mli b/bytecomp/runtimedef.mli
index 27309f60aa..4892000947 100644
--- a/bytecomp/runtimedef.mli
+++ b/bytecomp/runtimedef.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/simplif.ml b/bytecomp/simplif.ml
index 1f1d32b2c5..e26524e676 100644
--- a/bytecomp/simplif.ml
+++ b/bytecomp/simplif.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/simplif.mli b/bytecomp/simplif.mli
index 2d9b352bb6..816c44b847 100644
--- a/bytecomp/simplif.mli
+++ b/bytecomp/simplif.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/switch.ml b/bytecomp/switch.ml
index 4fa7b62ba7..ff193ee132 100644
--- a/bytecomp/switch.ml
+++ b/bytecomp/switch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Luc Maranget, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/switch.mli b/bytecomp/switch.mli
index 33014c0f7a..69fc800d38 100644
--- a/bytecomp/switch.mli
+++ b/bytecomp/switch.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Luc Maranget, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml
index 136144efa5..cf210d92a5 100644
--- a/bytecomp/symtable.ml
+++ b/bytecomp/symtable.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/symtable.mli b/bytecomp/symtable.mli
index cbef01e25f..d9001051e9 100644
--- a/bytecomp/symtable.mli
+++ b/bytecomp/symtable.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/translclass.ml b/bytecomp/translclass.ml
index e18a13ba6c..f06e43b461 100644
--- a/bytecomp/translclass.ml
+++ b/bytecomp/translclass.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/translclass.mli b/bytecomp/translclass.mli
index 4938278f7e..7a5d6d1437 100644
--- a/bytecomp/translclass.mli
+++ b/bytecomp/translclass.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/translcore.ml b/bytecomp/translcore.ml
index 3b0b0b0d54..1e68756cd7 100644
--- a/bytecomp/translcore.ml
+++ b/bytecomp/translcore.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/translcore.mli b/bytecomp/translcore.mli
index baac055675..1bc5ce613d 100644
--- a/bytecomp/translcore.mli
+++ b/bytecomp/translcore.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/translmod.ml b/bytecomp/translmod.ml
index bd6107f035..7f52f99a17 100644
--- a/bytecomp/translmod.ml
+++ b/bytecomp/translmod.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/translmod.mli b/bytecomp/translmod.mli
index 9e47ca5e6a..5b6d0a0065 100644
--- a/bytecomp/translmod.mli
+++ b/bytecomp/translmod.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/translobj.ml b/bytecomp/translobj.ml
index a0df551d80..f72e34b0ae 100644
--- a/bytecomp/translobj.ml
+++ b/bytecomp/translobj.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/translobj.mli b/bytecomp/translobj.mli
index 26fa504b45..be1e6a90fc 100644
--- a/bytecomp/translobj.mli
+++ b/bytecomp/translobj.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/typeopt.ml b/bytecomp/typeopt.ml
index f8e43f0df7..3af2318390 100644
--- a/bytecomp/typeopt.ml
+++ b/bytecomp/typeopt.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/bytecomp/typeopt.mli b/bytecomp/typeopt.mli
index 811c2da37c..163ca44da0 100644
--- a/bytecomp/typeopt.mli
+++ b/bytecomp/typeopt.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/byterun/Makefile b/byterun/Makefile
index f39cde49a6..c8669710de 100644
--- a/byterun/Makefile
+++ b/byterun/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/byterun/Makefile.common b/byterun/Makefile.common
index d290368105..bf64e78c1f 100755
--- a/byterun/Makefile.common
+++ b/byterun/Makefile.common
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/byterun/Makefile.nt b/byterun/Makefile.nt
index a633787de6..b93fa58a85 100644
--- a/byterun/Makefile.nt
+++ b/byterun/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/byterun/alloc.c b/byterun/alloc.c
index cc19698a8f..034562e8ea 100644
--- a/byterun/alloc.c
+++ b/byterun/alloc.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/alloc.h b/byterun/alloc.h
index 66cab70244..7e954e36ef 100644
--- a/byterun/alloc.h
+++ b/byterun/alloc.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/array.c b/byterun/array.c
index 8f658058b9..ec609d04ba 100644
--- a/byterun/array.c
+++ b/byterun/array.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/backtrace.c b/byterun/backtrace.c
index 2b29c31dcc..7b8ddca885 100644
--- a/byterun/backtrace.c
+++ b/byterun/backtrace.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/backtrace.h b/byterun/backtrace.h
index 2d9c202eaa..23c72e6c94 100644
--- a/byterun/backtrace.h
+++ b/byterun/backtrace.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/callback.c b/byterun/callback.c
index d76cf108bf..0d781259af 100644
--- a/byterun/callback.c
+++ b/byterun/callback.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/callback.h b/byterun/callback.h
index ffa6cf3b5e..550053add3 100644
--- a/byterun/callback.h
+++ b/byterun/callback.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/compact.c b/byterun/compact.c
index ba1042fbe5..d409492877 100644
--- a/byterun/compact.c
+++ b/byterun/compact.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/compact.h b/byterun/compact.h
index a4ef4cb186..949a2766ed 100644
--- a/byterun/compact.h
+++ b/byterun/compact.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/compare.c b/byterun/compare.c
index 751630757b..79f71ef61d 100644
--- a/byterun/compare.c
+++ b/byterun/compare.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/compare.h b/byterun/compare.h
index dc392ff3de..c73a49a46f 100644
--- a/byterun/compare.h
+++ b/byterun/compare.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, Projet Moscova, INRIA Rocquencourt */
/* */
diff --git a/byterun/compatibility.h b/byterun/compatibility.h
index 5c21774e06..429d2275d7 100644
--- a/byterun/compatibility.h
+++ b/byterun/compatibility.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Moscova, INRIA Rocquencourt */
/* */
diff --git a/byterun/config.h b/byterun/config.h
index 22abe871d4..b36b73c955 100644
--- a/byterun/config.h
+++ b/byterun/config.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/custom.c b/byterun/custom.c
index 24281db84b..b2d7b52065 100644
--- a/byterun/custom.c
+++ b/byterun/custom.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Manuel Serrano and Xavier Leroy, INRIA Rocquencourt */
/* */
diff --git a/byterun/custom.h b/byterun/custom.h
index 51fabed9da..f71fb4fe16 100644
--- a/byterun/custom.h
+++ b/byterun/custom.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Manuel Serrano and Xavier Leroy, INRIA Rocquencourt */
/* */
diff --git a/byterun/debugger.c b/byterun/debugger.c
index f9689126a6..c69b1edd14 100644
--- a/byterun/debugger.c
+++ b/byterun/debugger.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/debugger.h b/byterun/debugger.h
index 57a58f1c6d..a9501abff1 100644
--- a/byterun/debugger.h
+++ b/byterun/debugger.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/dynlink.c b/byterun/dynlink.c
index 7df594dbe9..ddd406babf 100644
--- a/byterun/dynlink.c
+++ b/byterun/dynlink.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/dynlink.h b/byterun/dynlink.h
index ad4bfbadba..b1d14d844f 100644
--- a/byterun/dynlink.h
+++ b/byterun/dynlink.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/exec.h b/byterun/exec.h
index 1abfa455c3..88cf6d28b7 100644
--- a/byterun/exec.h
+++ b/byterun/exec.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/extern.c b/byterun/extern.c
index 89e89f00e4..ef07f9c949 100644
--- a/byterun/extern.c
+++ b/byterun/extern.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/fail.c b/byterun/fail.c
index aceb253b9d..2696ab8d97 100644
--- a/byterun/fail.c
+++ b/byterun/fail.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/fail.h b/byterun/fail.h
index f092c8115f..88ec381db4 100644
--- a/byterun/fail.h
+++ b/byterun/fail.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/finalise.c b/byterun/finalise.c
index bc7996d550..9a93084ae4 100644
--- a/byterun/finalise.c
+++ b/byterun/finalise.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Moscova, INRIA Rocquencourt */
/* */
diff --git a/byterun/finalise.h b/byterun/finalise.h
index ec656f4f48..e41baa320c 100644
--- a/byterun/finalise.h
+++ b/byterun/finalise.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Moscova, INRIA Rocquencourt */
/* */
diff --git a/byterun/fix_code.c b/byterun/fix_code.c
index b252efd587..7a8f1ffa55 100644
--- a/byterun/fix_code.c
+++ b/byterun/fix_code.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/fix_code.h b/byterun/fix_code.h
index f6e9e3b773..fb47b6c4dd 100644
--- a/byterun/fix_code.h
+++ b/byterun/fix_code.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/floats.c b/byterun/floats.c
index c067e60d20..51cfb23f18 100644
--- a/byterun/floats.c
+++ b/byterun/floats.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/freelist.c b/byterun/freelist.c
index ab1d458ba2..f3bb4a8ee0 100644
--- a/byterun/freelist.c
+++ b/byterun/freelist.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/freelist.h b/byterun/freelist.h
index 8db168e9b5..b4285d9556 100644
--- a/byterun/freelist.h
+++ b/byterun/freelist.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/gc.h b/byterun/gc.h
index 50d9945a8d..4f67ed9066 100644
--- a/byterun/gc.h
+++ b/byterun/gc.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/gc_ctrl.c b/byterun/gc_ctrl.c
index 9a2e0b08ca..2871220435 100644
--- a/byterun/gc_ctrl.c
+++ b/byterun/gc_ctrl.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/gc_ctrl.h b/byterun/gc_ctrl.h
index 205636d590..4dba74fa57 100644
--- a/byterun/gc_ctrl.h
+++ b/byterun/gc_ctrl.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/globroots.c b/byterun/globroots.c
index acac1e2170..513b7be553 100644
--- a/byterun/globroots.c
+++ b/byterun/globroots.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/globroots.h b/byterun/globroots.h
index 4dee35f23b..97a1edab15 100644
--- a/byterun/globroots.h
+++ b/byterun/globroots.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/hash.c b/byterun/hash.c
index 494cf28b62..5b8955df71 100644
--- a/byterun/hash.c
+++ b/byterun/hash.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/hash.h b/byterun/hash.h
index 213f720169..56eeec1131 100644
--- a/byterun/hash.h
+++ b/byterun/hash.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Gallium, INRIA Rocquencourt */
/* */
diff --git a/byterun/instrtrace.c b/byterun/instrtrace.c
index 3afdc9541e..1c329daa69 100644
--- a/byterun/instrtrace.c
+++ b/byterun/instrtrace.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/instrtrace.h b/byterun/instrtrace.h
index c1ca4a7ec0..686b9e4ed6 100644
--- a/byterun/instrtrace.h
+++ b/byterun/instrtrace.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/instruct.h b/byterun/instruct.h
index c45d4ea287..92f228504c 100644
--- a/byterun/instruct.h
+++ b/byterun/instruct.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/int64_emul.h b/byterun/int64_emul.h
index 202006a042..ad48584d89 100644
--- a/byterun/int64_emul.h
+++ b/byterun/int64_emul.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/int64_format.h b/byterun/int64_format.h
index b9ae910400..53df3fbc2e 100644
--- a/byterun/int64_format.h
+++ b/byterun/int64_format.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/int64_native.h b/byterun/int64_native.h
index 4ae188af4a..9aa45e3c0f 100644
--- a/byterun/int64_native.h
+++ b/byterun/int64_native.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/intern.c b/byterun/intern.c
index f442114622..9fa403ad66 100644
--- a/byterun/intern.c
+++ b/byterun/intern.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/interp.c b/byterun/interp.c
index 7bcdf7acb3..cbec02a5cb 100644
--- a/byterun/interp.c
+++ b/byterun/interp.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/interp.h b/byterun/interp.h
index 9eb7339405..7c3d26f289 100644
--- a/byterun/interp.h
+++ b/byterun/interp.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/intext.h b/byterun/intext.h
index b757d17186..05fc614419 100644
--- a/byterun/intext.h
+++ b/byterun/intext.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/ints.c b/byterun/ints.c
index a9f224c2b6..4fa1657beb 100644
--- a/byterun/ints.c
+++ b/byterun/ints.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/io.c b/byterun/io.c
index 8d95ef70d6..90a3995108 100644
--- a/byterun/io.c
+++ b/byterun/io.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/io.h b/byterun/io.h
index d02a5a72fc..53d9bb9bf4 100644
--- a/byterun/io.h
+++ b/byterun/io.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/lexing.c b/byterun/lexing.c
index 6e74795c23..cb763bce93 100644
--- a/byterun/lexing.c
+++ b/byterun/lexing.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/main.c b/byterun/main.c
index e6afb1b326..63355840f6 100644
--- a/byterun/main.c
+++ b/byterun/main.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/major_gc.c b/byterun/major_gc.c
index b9ec8cbfe0..aeb192fdea 100644
--- a/byterun/major_gc.c
+++ b/byterun/major_gc.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/major_gc.h b/byterun/major_gc.h
index 12f8806705..427312784c 100644
--- a/byterun/major_gc.h
+++ b/byterun/major_gc.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/md5.c b/byterun/md5.c
index d0b6e5e462..41a86ed726 100644
--- a/byterun/md5.c
+++ b/byterun/md5.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/md5.h b/byterun/md5.h
index b92b02ad12..7a3799eb3c 100644
--- a/byterun/md5.h
+++ b/byterun/md5.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/memory.c b/byterun/memory.c
index bc4c88df15..2a98ada34a 100644
--- a/byterun/memory.c
+++ b/byterun/memory.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/memory.h b/byterun/memory.h
index e0df37c7c5..0c659b84e8 100644
--- a/byterun/memory.h
+++ b/byterun/memory.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/meta.c b/byterun/meta.c
index 1ed4fbddd5..73287f79d6 100644
--- a/byterun/meta.c
+++ b/byterun/meta.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/minor_gc.c b/byterun/minor_gc.c
index 91aa29799b..2cab6d2b11 100644
--- a/byterun/minor_gc.c
+++ b/byterun/minor_gc.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/minor_gc.h b/byterun/minor_gc.h
index 8e834129bf..82c82cd3f6 100644
--- a/byterun/minor_gc.h
+++ b/byterun/minor_gc.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/misc.c b/byterun/misc.c
index e8597ee38c..927cbd81b1 100644
--- a/byterun/misc.c
+++ b/byterun/misc.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/misc.h b/byterun/misc.h
index d0aaffd1a2..e970d3d032 100644
--- a/byterun/misc.h
+++ b/byterun/misc.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/mlvalues.h b/byterun/mlvalues.h
index d66d5e9d21..201b86bda0 100644
--- a/byterun/mlvalues.h
+++ b/byterun/mlvalues.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/obj.c b/byterun/obj.c
index e085d67277..72464b315f 100644
--- a/byterun/obj.c
+++ b/byterun/obj.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/osdeps.h b/byterun/osdeps.h
index 248b3f6aa3..902ea2de65 100644
--- a/byterun/osdeps.h
+++ b/byterun/osdeps.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/parsing.c b/byterun/parsing.c
index bcb9e5faa5..aeba38d622 100644
--- a/byterun/parsing.c
+++ b/byterun/parsing.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/prims.h b/byterun/prims.h
index d8c1671e1b..3d7bb6d82a 100644
--- a/byterun/prims.h
+++ b/byterun/prims.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/printexc.c b/byterun/printexc.c
index f72157ff08..ca0a0bc2a0 100644
--- a/byterun/printexc.c
+++ b/byterun/printexc.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/printexc.h b/byterun/printexc.h
index e7d1768882..5b0549b23f 100644
--- a/byterun/printexc.h
+++ b/byterun/printexc.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/reverse.h b/byterun/reverse.h
index e80d1f7d9f..a48b6f2558 100644
--- a/byterun/reverse.h
+++ b/byterun/reverse.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/roots.c b/byterun/roots.c
index 74fbb41edb..8a4d23b33d 100644
--- a/byterun/roots.c
+++ b/byterun/roots.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/roots.h b/byterun/roots.h
index 95c2f63f7a..f2d3bd6940 100644
--- a/byterun/roots.h
+++ b/byterun/roots.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/signals.c b/byterun/signals.c
index 90fe891962..40ba0ab5e7 100644
--- a/byterun/signals.c
+++ b/byterun/signals.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/signals.h b/byterun/signals.h
index e5ba987773..f771a799e8 100644
--- a/byterun/signals.h
+++ b/byterun/signals.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/signals_byt.c b/byterun/signals_byt.c
index 523814938f..f52ee5a455 100644
--- a/byterun/signals_byt.c
+++ b/byterun/signals_byt.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/signals_machdep.h b/byterun/signals_machdep.h
index 08c5f4cb82..0308d3c1f0 100644
--- a/byterun/signals_machdep.h
+++ b/byterun/signals_machdep.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/byterun/stacks.c b/byterun/stacks.c
index ed06f95346..5f7a871d04 100644
--- a/byterun/stacks.c
+++ b/byterun/stacks.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/stacks.h b/byterun/stacks.h
index 48e8acc9c5..f8469572d8 100644
--- a/byterun/stacks.h
+++ b/byterun/stacks.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/startup.c b/byterun/startup.c
index 20e61e7d2f..6117ff7a37 100644
--- a/byterun/startup.c
+++ b/byterun/startup.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
@@ -216,7 +216,7 @@ static char * read_section(int fd, struct exec_trailer *trail, char *name)
Algorithm:
1- If argument 0 is a valid byte-code file that does not start with #!,
then we are in case 3 and we pass the same command line to the
- Objective Caml program.
+ OCaml program.
2- In all other cases, we parse the command line as:
(whatever) [options] bytecode args...
and we strip "(whatever) [options]" from the command line.
@@ -247,7 +247,7 @@ static int parse_command_line(char **argv)
#endif
case 'v':
if (!strcmp (argv[i], "-version")){
- printf ("The Objective Caml runtime, version " OCAML_VERSION "\n");
+ printf ("The OCaml runtime, version " OCAML_VERSION "\n");
exit (0);
}else if (!strcmp (argv[i], "-vnum")){
printf (OCAML_VERSION "\n");
diff --git a/byterun/startup.h b/byterun/startup.h
index 0d1a5a6046..5a42a73aaf 100644
--- a/byterun/startup.h
+++ b/byterun/startup.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/str.c b/byterun/str.c
index 760b154e30..3941cae17d 100644
--- a/byterun/str.c
+++ b/byterun/str.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/sys.c b/byterun/sys.c
index 9928910f73..4b35d1e03f 100644
--- a/byterun/sys.c
+++ b/byterun/sys.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/sys.h b/byterun/sys.h
index 4ad8011d9c..c6f5d3204b 100644
--- a/byterun/sys.h
+++ b/byterun/sys.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/terminfo.c b/byterun/terminfo.c
index e4502fb025..6797569679 100644
--- a/byterun/terminfo.c
+++ b/byterun/terminfo.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/ui.h b/byterun/ui.h
index fcd9cd9f88..0c3309b393 100644
--- a/byterun/ui.h
+++ b/byterun/ui.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/unix.c b/byterun/unix.c
index cdc1f2a018..664c32b18c 100644
--- a/byterun/unix.c
+++ b/byterun/unix.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/byterun/weak.c b/byterun/weak.c
index c6c4a223fe..efdb15e9c4 100644
--- a/byterun/weak.c
+++ b/byterun/weak.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/weak.h b/byterun/weak.h
index 270082dbf2..a30001a7e8 100644
--- a/byterun/weak.h
+++ b/byterun/weak.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Para, INRIA Rocquencourt */
/* */
diff --git a/byterun/win32.c b/byterun/win32.c
index 866977b121..e958fd6f24 100644
--- a/byterun/win32.c
+++ b/byterun/win32.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/camlp4/Camlp4/Camlp4Ast.partial.ml b/camlp4/Camlp4/Camlp4Ast.partial.ml
index 624ab86db9..bca2180b9c 100644
--- a/camlp4/Camlp4/Camlp4Ast.partial.ml
+++ b/camlp4/Camlp4/Camlp4Ast.partial.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
type loc = Loc.t
and meta_bool =
[ BTrue
diff --git a/camlp4/Camlp4/Debug.ml b/camlp4/Camlp4/Debug.ml
index cbd3092276..2d901f3e98 100644
--- a/camlp4/Camlp4/Debug.ml
+++ b/camlp4/Camlp4/Debug.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Debug.mli b/camlp4/Camlp4/Debug.mli
index 13af773391..97597f9c04 100644
--- a/camlp4/Camlp4/Debug.mli
+++ b/camlp4/Camlp4/Debug.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/ErrorHandler.ml b/camlp4/Camlp4/ErrorHandler.ml
index 84eceafabf..bfefa49ab2 100644
--- a/camlp4/Camlp4/ErrorHandler.ml
+++ b/camlp4/Camlp4/ErrorHandler.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/ErrorHandler.mli b/camlp4/Camlp4/ErrorHandler.mli
index 674811459b..d73238df0f 100644
--- a/camlp4/Camlp4/ErrorHandler.mli
+++ b/camlp4/Camlp4/ErrorHandler.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/OCamlInitSyntax.ml b/camlp4/Camlp4/OCamlInitSyntax.ml
index 85f8915f29..c424bfa72c 100644
--- a/camlp4/Camlp4/OCamlInitSyntax.ml
+++ b/camlp4/Camlp4/OCamlInitSyntax.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Options.ml b/camlp4/Camlp4/Options.ml
index e9979beeb4..20503b4088 100644
--- a/camlp4/Camlp4/Options.ml
+++ b/camlp4/Camlp4/Options.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Options.mli b/camlp4/Camlp4/Options.mli
index caffd8c212..2deb878d52 100644
--- a/camlp4/Camlp4/Options.mli
+++ b/camlp4/Camlp4/Options.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/PreCast.ml b/camlp4/Camlp4/PreCast.ml
index 8e3da3483d..169748519b 100644
--- a/camlp4/Camlp4/PreCast.ml
+++ b/camlp4/Camlp4/PreCast.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/PreCast.mli b/camlp4/Camlp4/PreCast.mli
index 1c6eb2e989..a7dad534c5 100644
--- a/camlp4/Camlp4/PreCast.mli
+++ b/camlp4/Camlp4/PreCast.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/DumpCamlp4Ast.ml b/camlp4/Camlp4/Printers/DumpCamlp4Ast.ml
index bd220c16d3..5b34e994d6 100644
--- a/camlp4/Camlp4/Printers/DumpCamlp4Ast.ml
+++ b/camlp4/Camlp4/Printers/DumpCamlp4Ast.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/DumpCamlp4Ast.mli b/camlp4/Camlp4/Printers/DumpCamlp4Ast.mli
index d35642ab41..5a0eb96f61 100644
--- a/camlp4/Camlp4/Printers/DumpCamlp4Ast.mli
+++ b/camlp4/Camlp4/Printers/DumpCamlp4Ast.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/DumpOCamlAst.ml b/camlp4/Camlp4/Printers/DumpOCamlAst.ml
index dd6c60f6f9..57d2a15e24 100644
--- a/camlp4/Camlp4/Printers/DumpOCamlAst.ml
+++ b/camlp4/Camlp4/Printers/DumpOCamlAst.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/DumpOCamlAst.mli b/camlp4/Camlp4/Printers/DumpOCamlAst.mli
index 3233557d06..16eafbdb03 100644
--- a/camlp4/Camlp4/Printers/DumpOCamlAst.mli
+++ b/camlp4/Camlp4/Printers/DumpOCamlAst.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/Null.ml b/camlp4/Camlp4/Printers/Null.ml
index a9a2c486b8..3b3b95490c 100644
--- a/camlp4/Camlp4/Printers/Null.ml
+++ b/camlp4/Camlp4/Printers/Null.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/Null.mli b/camlp4/Camlp4/Printers/Null.mli
index d77151177b..f81ce61379 100644
--- a/camlp4/Camlp4/Printers/Null.mli
+++ b/camlp4/Camlp4/Printers/Null.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/OCaml.ml b/camlp4/Camlp4/Printers/OCaml.ml
index 18da100ed9..f941fb59b9 100644
--- a/camlp4/Camlp4/Printers/OCaml.ml
+++ b/camlp4/Camlp4/Printers/OCaml.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/OCaml.mli b/camlp4/Camlp4/Printers/OCaml.mli
index 1ec7120b91..0d36742bf4 100644
--- a/camlp4/Camlp4/Printers/OCaml.mli
+++ b/camlp4/Camlp4/Printers/OCaml.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/OCamlr.ml b/camlp4/Camlp4/Printers/OCamlr.ml
index 1994587927..b91f8ea7c9 100644
--- a/camlp4/Camlp4/Printers/OCamlr.ml
+++ b/camlp4/Camlp4/Printers/OCamlr.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Printers/OCamlr.mli b/camlp4/Camlp4/Printers/OCamlr.mli
index f1db176a54..45fcbdef5a 100644
--- a/camlp4/Camlp4/Printers/OCamlr.mli
+++ b/camlp4/Camlp4/Printers/OCamlr.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Register.ml b/camlp4/Camlp4/Register.ml
index e286eafb9c..010a831092 100644
--- a/camlp4/Camlp4/Register.ml
+++ b/camlp4/Camlp4/Register.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Register.mli b/camlp4/Camlp4/Register.mli
index bd8e13a1ee..d997d417b9 100644
--- a/camlp4/Camlp4/Register.mli
+++ b/camlp4/Camlp4/Register.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Sig.ml b/camlp4/Camlp4/Sig.ml
index 1664be75b0..507fb7008c 100644
--- a/camlp4/Camlp4/Sig.ml
+++ b/camlp4/Camlp4/Sig.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
@@ -843,7 +843,7 @@ module type Token = sig
module Error : Error;
end;
-(** This signature describes tokens for the Objective Caml and the Revised
+(** This signature describes tokens for the OCaml and the Revised
syntax lexing rules. For some tokens the data constructor holds two
representations with the evaluated one and the source one. For example
the INT data constructor holds an integer and a string, this string can
diff --git a/camlp4/Camlp4/Struct/AstFilters.ml b/camlp4/Camlp4/Struct/AstFilters.ml
index 665e610aff..6474ba8e5c 100644
--- a/camlp4/Camlp4/Struct/AstFilters.ml
+++ b/camlp4/Camlp4/Struct/AstFilters.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Camlp4Ast.mlast b/camlp4/Camlp4/Struct/Camlp4Ast.mlast
index 4c692a380e..9c5a99752b 100644
--- a/camlp4/Camlp4/Struct/Camlp4Ast.mlast
+++ b/camlp4/Camlp4/Struct/Camlp4Ast.mlast
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
index d6a9c5aff0..5965a42c1b 100644
--- a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
+++ b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.mli b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.mli
index 6c28483323..0e6f52cc9f 100644
--- a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.mli
+++ b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.mli
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/CleanAst.ml b/camlp4/Camlp4/Struct/CleanAst.ml
index ab9250543c..8354d1c23b 100644
--- a/camlp4/Camlp4/Struct/CleanAst.ml
+++ b/camlp4/Camlp4/Struct/CleanAst.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/CommentFilter.ml b/camlp4/Camlp4/Struct/CommentFilter.ml
index 9dac53fbf7..f8cb3004d7 100644
--- a/camlp4/Camlp4/Struct/CommentFilter.ml
+++ b/camlp4/Camlp4/Struct/CommentFilter.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/CommentFilter.mli b/camlp4/Camlp4/Struct/CommentFilter.mli
index 79ece6a4c7..1df29f7bb5 100644
--- a/camlp4/Camlp4/Struct/CommentFilter.mli
+++ b/camlp4/Camlp4/Struct/CommentFilter.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/DynAst.ml b/camlp4/Camlp4/Struct/DynAst.ml
index 2161e1c91c..4bc8a33b7e 100644
--- a/camlp4/Camlp4/Struct/DynAst.ml
+++ b/camlp4/Camlp4/Struct/DynAst.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2007 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/DynLoader.ml b/camlp4/Camlp4/Struct/DynLoader.ml
index f8e8c22fdf..00ab05ab3f 100644
--- a/camlp4/Camlp4/Struct/DynLoader.ml
+++ b/camlp4/Camlp4/Struct/DynLoader.ml
@@ -1,15 +1,15 @@
(* camlp4r pa_macro.cmo *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2001-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/DynLoader.mli b/camlp4/Camlp4/Struct/DynLoader.mli
index 292b705b57..7a7dc899a0 100644
--- a/camlp4/Camlp4/Struct/DynLoader.mli
+++ b/camlp4/Camlp4/Struct/DynLoader.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/EmptyError.ml b/camlp4/Camlp4/Struct/EmptyError.ml
index 1acb2251a9..52a5028923 100644
--- a/camlp4/Camlp4/Struct/EmptyError.ml
+++ b/camlp4/Camlp4/Struct/EmptyError.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
@@ -19,4 +19,4 @@
type t = unit;
exception E of t;
value print _ = assert False;
-value to_string _ = assert False; \ No newline at end of file
+value to_string _ = assert False;
diff --git a/camlp4/Camlp4/Struct/EmptyError.mli b/camlp4/Camlp4/Struct/EmptyError.mli
index 9d216623a4..076ee3170d 100644
--- a/camlp4/Camlp4/Struct/EmptyError.mli
+++ b/camlp4/Camlp4/Struct/EmptyError.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
@@ -16,4 +16,4 @@
* - Daniel de Rauglaudre: initial version
* - Nicolas Pouillard: refactoring
*)
-include Sig.Error; \ No newline at end of file
+include Sig.Error;
diff --git a/camlp4/Camlp4/Struct/EmptyPrinter.ml b/camlp4/Camlp4/Struct/EmptyPrinter.ml
index 5886809b6b..11a93cd689 100644
--- a/camlp4/Camlp4/Struct/EmptyPrinter.ml
+++ b/camlp4/Camlp4/Struct/EmptyPrinter.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/EmptyPrinter.mli b/camlp4/Camlp4/Struct/EmptyPrinter.mli
index f8bf907ae5..94585b329c 100644
--- a/camlp4/Camlp4/Struct/EmptyPrinter.mli
+++ b/camlp4/Camlp4/Struct/EmptyPrinter.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/FreeVars.ml b/camlp4/Camlp4/Struct/FreeVars.ml
index 69e9030367..8c253ff50d 100644
--- a/camlp4/Camlp4/Struct/FreeVars.ml
+++ b/camlp4/Camlp4/Struct/FreeVars.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/FreeVars.mli b/camlp4/Camlp4/Struct/FreeVars.mli
index aac72db054..06d3cc0a9b 100644
--- a/camlp4/Camlp4/Struct/FreeVars.mli
+++ b/camlp4/Camlp4/Struct/FreeVars.mli
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Delete.ml b/camlp4/Camlp4/Struct/Grammar/Delete.ml
index 929ac2b4ea..d8f9f9aa42 100644
--- a/camlp4/Camlp4/Struct/Grammar/Delete.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Delete.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Dynamic.ml b/camlp4/Camlp4/Struct/Grammar/Dynamic.ml
index 7889cf0712..06ac28f1f8 100644
--- a/camlp4/Camlp4/Struct/Grammar/Dynamic.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Dynamic.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Entry.ml b/camlp4/Camlp4/Struct/Grammar/Entry.ml
index 0b39b7ca6c..4ab0c89603 100644
--- a/camlp4/Camlp4/Struct/Grammar/Entry.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Entry.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Failed.ml b/camlp4/Camlp4/Struct/Grammar/Failed.ml
index b22998bd48..a0327b152c 100644
--- a/camlp4/Camlp4/Struct/Grammar/Failed.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Failed.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Find.ml b/camlp4/Camlp4/Struct/Grammar/Find.ml
index 9e7774d152..82bd2f0ed3 100644
--- a/camlp4/Camlp4/Struct/Grammar/Find.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Find.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Fold.ml b/camlp4/Camlp4/Struct/Grammar/Fold.ml
index caf8a7a0a3..99e0955058 100644
--- a/camlp4/Camlp4/Struct/Grammar/Fold.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Fold.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Fold.mli b/camlp4/Camlp4/Struct/Grammar/Fold.mli
index 0b9b22b791..1578ccbd02 100644
--- a/camlp4/Camlp4/Struct/Grammar/Fold.mli
+++ b/camlp4/Camlp4/Struct/Grammar/Fold.mli
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Insert.ml b/camlp4/Camlp4/Struct/Grammar/Insert.ml
index a6cbf0eeed..551ce95ec7 100644
--- a/camlp4/Camlp4/Struct/Grammar/Insert.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Insert.ml
@@ -1,15 +1,15 @@
(* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Parser.ml b/camlp4/Camlp4/Struct/Grammar/Parser.ml
index 89bbe884df..d97eb28755 100644
--- a/camlp4/Camlp4/Struct/Grammar/Parser.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Parser.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Parser.mli b/camlp4/Camlp4/Struct/Grammar/Parser.mli
index 7b7cbe5a2b..74e0fe07d7 100644
--- a/camlp4/Camlp4/Struct/Grammar/Parser.mli
+++ b/camlp4/Camlp4/Struct/Grammar/Parser.mli
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2007 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Print.ml b/camlp4/Camlp4/Struct/Grammar/Print.ml
index 77000c88aa..06e09c2188 100644
--- a/camlp4/Camlp4/Struct/Grammar/Print.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Print.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Print.mli b/camlp4/Camlp4/Struct/Grammar/Print.mli
index 9acc836de2..b1059a6d9f 100644
--- a/camlp4/Camlp4/Struct/Grammar/Print.mli
+++ b/camlp4/Camlp4/Struct/Grammar/Print.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Search.ml b/camlp4/Camlp4/Struct/Grammar/Search.ml
index bc4ed301ad..226a0d44e5 100644
--- a/camlp4/Camlp4/Struct/Grammar/Search.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Search.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Static.ml b/camlp4/Camlp4/Struct/Grammar/Static.ml
index a94c9fa1c5..02aec0b171 100644
--- a/camlp4/Camlp4/Struct/Grammar/Static.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Static.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Structure.ml b/camlp4/Camlp4/Struct/Grammar/Structure.ml
index 67b99feb99..e2a79b18be 100644
--- a/camlp4/Camlp4/Struct/Grammar/Structure.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Structure.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Grammar/Tools.ml b/camlp4/Camlp4/Struct/Grammar/Tools.ml
index cb63478ad8..df4b03fe55 100644
--- a/camlp4/Camlp4/Struct/Grammar/Tools.ml
+++ b/camlp4/Camlp4/Struct/Grammar/Tools.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Lexer.mll b/camlp4/Camlp4/Struct/Lexer.mll
index 1823ae0af4..c73369959d 100644
--- a/camlp4/Camlp4/Struct/Lexer.mll
+++ b/camlp4/Camlp4/Struct/Lexer.mll
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Loc.ml b/camlp4/Camlp4/Struct/Loc.ml
index ac42d4b1c4..2fd2c91067 100644
--- a/camlp4/Camlp4/Struct/Loc.ml
+++ b/camlp4/Camlp4/Struct/Loc.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Loc.mli b/camlp4/Camlp4/Struct/Loc.mli
index e90161938c..c6c523fc5f 100644
--- a/camlp4/Camlp4/Struct/Loc.mli
+++ b/camlp4/Camlp4/Struct/Loc.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Quotation.ml b/camlp4/Camlp4/Struct/Quotation.ml
index 65202c8751..c9d6169a99 100644
--- a/camlp4/Camlp4/Struct/Quotation.ml
+++ b/camlp4/Camlp4/Struct/Quotation.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Token.ml b/camlp4/Camlp4/Struct/Token.ml
index 384bba9116..2620729728 100644
--- a/camlp4/Camlp4/Struct/Token.ml
+++ b/camlp4/Camlp4/Struct/Token.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4/Struct/Token.mli b/camlp4/Camlp4/Struct/Token.mli
index 812df0e008..d3e866a337 100644
--- a/camlp4/Camlp4/Struct/Token.mli
+++ b/camlp4/Camlp4/Struct/Token.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Bin.ml b/camlp4/Camlp4Bin.ml
index a123cc12f4..ecc64311f2 100644
--- a/camlp4/Camlp4Bin.ml
+++ b/camlp4/Camlp4Bin.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Filters/Camlp4AstLifter.ml b/camlp4/Camlp4Filters/Camlp4AstLifter.ml
index 768e4dac9e..cc594aac8f 100644
--- a/camlp4/Camlp4Filters/Camlp4AstLifter.ml
+++ b/camlp4/Camlp4Filters/Camlp4AstLifter.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Filters/Camlp4ExceptionTracer.ml b/camlp4/Camlp4Filters/Camlp4ExceptionTracer.ml
index 3d338c4198..3cf570c070 100644
--- a/camlp4/Camlp4Filters/Camlp4ExceptionTracer.ml
+++ b/camlp4/Camlp4Filters/Camlp4ExceptionTracer.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Filters/Camlp4FoldGenerator.ml b/camlp4/Camlp4Filters/Camlp4FoldGenerator.ml
index 66c48d7e54..205afa9271 100644
--- a/camlp4/Camlp4Filters/Camlp4FoldGenerator.ml
+++ b/camlp4/Camlp4Filters/Camlp4FoldGenerator.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
-(* Copyright 2006,2007 Institut National de Recherche en Informatique et *)
+(* Copyright 2006-2007 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Filters/Camlp4LocationStripper.ml b/camlp4/Camlp4Filters/Camlp4LocationStripper.ml
index 533292de61..59199f8888 100644
--- a/camlp4/Camlp4Filters/Camlp4LocationStripper.ml
+++ b/camlp4/Camlp4Filters/Camlp4LocationStripper.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Filters/Camlp4MapGenerator.ml b/camlp4/Camlp4Filters/Camlp4MapGenerator.ml
index 52b00eb6a9..de1f910bf8 100644
--- a/camlp4/Camlp4Filters/Camlp4MapGenerator.ml
+++ b/camlp4/Camlp4Filters/Camlp4MapGenerator.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
(* This module is useless now. Camlp4FoldGenerator handles map too. *)
module Id = struct
value name = "Camlp4MapGenerator";
diff --git a/camlp4/Camlp4Filters/Camlp4MetaGenerator.ml b/camlp4/Camlp4Filters/Camlp4MetaGenerator.ml
index a49cbf32ff..b716d5afdc 100644
--- a/camlp4/Camlp4Filters/Camlp4MetaGenerator.ml
+++ b/camlp4/Camlp4Filters/Camlp4MetaGenerator.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4;
open PreCast;
module MapTy = Map.Make String;
diff --git a/camlp4/Camlp4Filters/Camlp4Profiler.ml b/camlp4/Camlp4Filters/Camlp4Profiler.ml
index 1800851607..99335cc849 100644
--- a/camlp4/Camlp4Filters/Camlp4Profiler.ml
+++ b/camlp4/Camlp4Filters/Camlp4Profiler.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Filters/Camlp4TrashRemover.ml b/camlp4/Camlp4Filters/Camlp4TrashRemover.ml
index 07ead66a83..d486e2b663 100644
--- a/camlp4/Camlp4Filters/Camlp4TrashRemover.ml
+++ b/camlp4/Camlp4Filters/Camlp4TrashRemover.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4AstLoader.ml b/camlp4/Camlp4Parsers/Camlp4AstLoader.ml
index 67d04edf94..eb0a213908 100644
--- a/camlp4/Camlp4Parsers/Camlp4AstLoader.ml
+++ b/camlp4/Camlp4Parsers/Camlp4AstLoader.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4DebugParser.ml b/camlp4/Camlp4Parsers/Camlp4DebugParser.ml
index 7e72281881..be4fe60ac4 100644
--- a/camlp4/Camlp4Parsers/Camlp4DebugParser.ml
+++ b/camlp4/Camlp4Parsers/Camlp4DebugParser.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4GrammarParser.ml b/camlp4/Camlp4Parsers/Camlp4GrammarParser.ml
index 3d64b1ae38..6b4e1d8e25 100644
--- a/camlp4/Camlp4Parsers/Camlp4GrammarParser.ml
+++ b/camlp4/Camlp4Parsers/Camlp4GrammarParser.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4ListComprehension.ml b/camlp4/Camlp4Parsers/Camlp4ListComprehension.ml
index f5878fb989..7bdad3c4ec 100644
--- a/camlp4/Camlp4Parsers/Camlp4ListComprehension.ml
+++ b/camlp4/Camlp4Parsers/Camlp4ListComprehension.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2007 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4MacroParser.ml b/camlp4/Camlp4Parsers/Camlp4MacroParser.ml
index 0cb81be945..c29cdd7347 100644
--- a/camlp4/Camlp4Parsers/Camlp4MacroParser.ml
+++ b/camlp4/Camlp4Parsers/Camlp4MacroParser.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.ml b/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.ml
index c033a22cb0..eace67b4b9 100644
--- a/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.ml
+++ b/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlParser.ml b/camlp4/Camlp4Parsers/Camlp4OCamlParser.ml
index ec5351c40e..2367f7c0d2 100644
--- a/camlp4/Camlp4Parsers/Camlp4OCamlParser.ml
+++ b/camlp4/Camlp4Parsers/Camlp4OCamlParser.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.ml b/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.ml
index 94a2bdb213..082ac836a5 100644
--- a/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.ml
+++ b/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 1998-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.ml b/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.ml
index e56ab36199..02c89f818d 100644
--- a/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.ml
+++ b/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2007 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml
index a1dd59d8b6..d9317591a5 100644
--- a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml
+++ b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.ml b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.ml
index 97747d448e..2bdab6bf9e 100644
--- a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.ml
+++ b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 1998-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.ml b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.ml
index 07d2a01eb9..2e32bcd837 100644
--- a/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.ml
+++ b/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4QuotationCommon.ml b/camlp4/Camlp4Parsers/Camlp4QuotationCommon.ml
index 76e67f4123..3cf80b560d 100644
--- a/camlp4/Camlp4Parsers/Camlp4QuotationCommon.ml
+++ b/camlp4/Camlp4Parsers/Camlp4QuotationCommon.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Parsers/Camlp4QuotationExpander.ml b/camlp4/Camlp4Parsers/Camlp4QuotationExpander.ml
index fb225a583d..81680c6b46 100644
--- a/camlp4/Camlp4Parsers/Camlp4QuotationExpander.ml
+++ b/camlp4/Camlp4Parsers/Camlp4QuotationExpander.ml
@@ -1,15 +1,15 @@
open Camlp4; (* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Printers/Camlp4AstDumper.ml b/camlp4/Camlp4Printers/Camlp4AstDumper.ml
index f89fed40f2..b9adf90856 100644
--- a/camlp4/Camlp4Printers/Camlp4AstDumper.ml
+++ b/camlp4/Camlp4Printers/Camlp4AstDumper.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Printers/Camlp4AutoPrinter.ml b/camlp4/Camlp4Printers/Camlp4AutoPrinter.ml
index eb6b9a24dd..4b2787efcb 100644
--- a/camlp4/Camlp4Printers/Camlp4AutoPrinter.ml
+++ b/camlp4/Camlp4Printers/Camlp4AutoPrinter.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Printers/Camlp4NullDumper.ml b/camlp4/Camlp4Printers/Camlp4NullDumper.ml
index 0e02b66dfd..77105dc7d4 100644
--- a/camlp4/Camlp4Printers/Camlp4NullDumper.ml
+++ b/camlp4/Camlp4Printers/Camlp4NullDumper.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.ml b/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.ml
index 174e5ad13c..872be92587 100644
--- a/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.ml
+++ b/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Printers/Camlp4OCamlPrinter.ml b/camlp4/Camlp4Printers/Camlp4OCamlPrinter.ml
index 487b8627bf..63fd2a1c7b 100644
--- a/camlp4/Camlp4Printers/Camlp4OCamlPrinter.ml
+++ b/camlp4/Camlp4Printers/Camlp4OCamlPrinter.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.ml b/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.ml
index bd5af1f50d..4f8bf71d72 100644
--- a/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.ml
+++ b/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Top/Rprint.ml b/camlp4/Camlp4Top/Rprint.ml
index ce772d1db7..e5f1ec31c4 100644
--- a/camlp4/Camlp4Top/Rprint.ml
+++ b/camlp4/Camlp4Top/Rprint.ml
@@ -1,15 +1,15 @@
(* camlp4r *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4Top/Top.ml b/camlp4/Camlp4Top/Top.ml
index dcd3aa4607..1ff0ef8210 100644
--- a/camlp4/Camlp4Top/Top.ml
+++ b/camlp4/Camlp4Top/Top.ml
@@ -1,15 +1,15 @@
(* camlp4r q_MLast.cmo *)
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4_config.ml b/camlp4/Camlp4_config.ml
index 745930b79a..bb4d4cfd26 100644
--- a/camlp4/Camlp4_config.ml
+++ b/camlp4/Camlp4_config.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/Camlp4_config.mli b/camlp4/Camlp4_config.mli
index 1759208463..cbc1632233 100644
--- a/camlp4/Camlp4_config.mli
+++ b/camlp4/Camlp4_config.mli
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/boot/Camlp4.ml b/camlp4/boot/Camlp4.ml
index 8996b49084..47aa80ce6a 100644
--- a/camlp4/boot/Camlp4.ml
+++ b/camlp4/boot/Camlp4.ml
@@ -1,16 +1,29 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
module Debug :
sig
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -28,15 +41,15 @@ module Debug :
struct
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -110,15 +123,15 @@ module Options :
sig
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -142,15 +155,15 @@ module Options :
struct
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -357,15 +370,15 @@ module Sig =
(* camlp4r *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -788,6 +801,19 @@ module Sig =
(** The inner module for locations *)
module Loc : Loc
+ (****************************************************************************)
+ (* *)
+ (* OCaml *)
+ (* *)
+ (* INRIA Rocquencourt *)
+ (* *)
+ (* Copyright 2007 Institut National de Recherche en Informatique et *)
+ (* en Automatique. All rights reserved. This file is distributed under *)
+ (* the terms of the GNU Library General Public License, with the special *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
+ (* *)
+ (****************************************************************************)
type loc =
Loc.
t
diff --git a/camlp4/boot/Camlp4.ml4 b/camlp4/boot/Camlp4.ml4
index 3eb7978ac8..ffd0646f2a 100644
--- a/camlp4/boot/Camlp4.ml4
+++ b/camlp4/boot/Camlp4.ml4
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
module Debug : sig INCLUDE "camlp4/Camlp4/Debug.mli"; end = struct INCLUDE "camlp4/Camlp4/Debug.ml"; end;
module Options : sig INCLUDE "camlp4/Camlp4/Options.mli"; end = struct INCLUDE "camlp4/Camlp4/Options.ml"; end;
module Sig = struct INCLUDE "camlp4/Camlp4/Sig.ml"; end;
diff --git a/camlp4/boot/Camlp4Ast.ml b/camlp4/boot/Camlp4Ast.ml
index cab41221e0..c00b360a52 100644
--- a/camlp4/boot/Camlp4Ast.ml
+++ b/camlp4/boot/Camlp4Ast.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -4990,7 +4990,20 @@ module Make (Loc : Sig.Loc) : Sig.Camlp4Ast with module Loc = Loc =
let _x = o#loc _x in
let _x_i1 = o#string _x_i1 in MbAnt _x _x_i1 ];
method meta_option :
- ! 'a 'a_out.
+ ! (****************************************************************************)
+ (* *)
+ (* OCaml *)
+ (* *)
+ (* INRIA Rocquencourt *)
+ (* *)
+ (* Copyright 2007 Institut National de Recherche en Informatique et *)
+ (* en Automatique. All rights reserved. This file is distributed under *)
+ (* the terms of the GNU Library General Public License, with the special *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
+ (* *)
+ (****************************************************************************)
+ 'a 'a_out.
('self_type -> 'a -> 'a_out) ->
meta_option 'a -> meta_option 'a_out =
fun _f_a ->
diff --git a/camlp4/boot/camlp4boot.ml b/camlp4/boot/camlp4boot.ml
index e7a26e71a5..ea49fe70df 100644
--- a/camlp4/boot/camlp4boot.ml
+++ b/camlp4/boot/camlp4boot.ml
@@ -1,3 +1,16 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
module R =
struct
open Camlp4
@@ -5,15 +18,15 @@ module R =
(* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -9229,15 +9242,15 @@ module Camlp4QuotationCommon =
(* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -10024,15 +10037,15 @@ module Q =
(* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -10066,15 +10079,15 @@ module Rp =
(* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 1998-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -11009,15 +11022,15 @@ module G =
(* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2002-2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -13464,15 +13477,15 @@ module M =
(* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -14637,15 +14650,15 @@ module D =
(* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -14830,15 +14843,15 @@ module L =
(* -*- camlp4r -*- *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2007 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -15204,15 +15217,15 @@ module P =
struct
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
@@ -15227,15 +15240,15 @@ module B =
(* camlp4r *)
(****************************************************************************)
(* *)
- (* Objective Caml *)
+ (* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
- (* exception on linking described in LICENSE at the top of the Objective *)
- (* Caml source tree. *)
+ (* exception on linking described in LICENSE at the top of the OCaml *)
+ (* source tree. *)
(* *)
(****************************************************************************)
(* Authors:
diff --git a/camlp4/boot/camlp4boot.ml4 b/camlp4/boot/camlp4boot.ml4
index 4c4c46d145..686f1c8dac 100644
--- a/camlp4/boot/camlp4boot.ml4
+++ b/camlp4/boot/camlp4boot.ml4
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
module R = struct INCLUDE "camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml"; end;
module Camlp4QuotationCommon = struct INCLUDE "camlp4/Camlp4Parsers/Camlp4QuotationCommon.ml"; end;
module Q = struct INCLUDE "camlp4/Camlp4Parsers/Camlp4QuotationExpander.ml"; end;
diff --git a/camlp4/camlp4prof.ml b/camlp4/camlp4prof.ml
index 7e9df17f71..ec2ba8c5ad 100644
--- a/camlp4/camlp4prof.ml
+++ b/camlp4/camlp4prof.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2006 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
module Debug = struct value mode _ = False; end;
value count =
diff --git a/camlp4/camlp4prof.mli b/camlp4/camlp4prof.mli
index 0703ac03ce..b7de6450d6 100644
--- a/camlp4/camlp4prof.mli
+++ b/camlp4/camlp4prof.mli
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
value count : string -> unit;
value load : in_channel -> list (string * int);
diff --git a/camlp4/examples/_tags b/camlp4/examples/_tags
index 19b2d7017c..296772b8df 100644
--- a/camlp4/examples/_tags
+++ b/camlp4/examples/_tags
@@ -1,3 +1,16 @@
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../LICENSE. #
+# #
+#########################################################################
+
true: warn_A, warn_e
<{apply_operator,type_quotation,global_handler,expression_closure{,_filter}}.ml> or <free_vars_test.*>: camlp4rf, use_camlp4
"lambda_quot.ml": camlp4rf, use_camlp4_full
diff --git a/camlp4/examples/apply_operator.ml b/camlp4/examples/apply_operator.ml
index 35b17e5419..9afbf481b2 100644
--- a/camlp4/examples/apply_operator.ml
+++ b/camlp4/examples/apply_operator.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4.PreCast;
AstFilters.register_str_item_filter
(Ast.map_expr
diff --git a/camlp4/examples/apply_operator_test.ml b/camlp4/examples/apply_operator_test.ml
index 07ca329f67..94e7355cfe 100644
--- a/camlp4/examples/apply_operator_test.ml
+++ b/camlp4/examples/apply_operator_test.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
let ( & ) = ();; (* To force it to be inlined. If not it's not well typed. *)
fun f g h x -> f& g& h x
diff --git a/camlp4/examples/arith.ml b/camlp4/examples/arith.ml
index ff7ab4f0de..e60c7fb59a 100644
--- a/camlp4/examples/arith.ml
+++ b/camlp4/examples/arith.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
(* Please keep me in sync with brion.inria.fr/gallium/index.php/Arithmetic_Example *)
open Camlp4.PreCast;;
diff --git a/camlp4/examples/debug_extension.ml b/camlp4/examples/debug_extension.ml
index 21696e4a99..a690044ef6 100644
--- a/camlp4/examples/debug_extension.ml
+++ b/camlp4/examples/debug_extension.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
(*
* No debugging code at all:
* $ camlp4o -parser Camlp4DebugParser debug_extension.ml
diff --git a/camlp4/examples/ex_str.ml b/camlp4/examples/ex_str.ml
index ac9513b9a0..744cc33c80 100644
--- a/camlp4/examples/ex_str.ml
+++ b/camlp4/examples/ex_str.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4.PreCast;;
module Caml =
Camlp4OCamlParser.Make
diff --git a/camlp4/examples/ex_str_test.ml b/camlp4/examples/ex_str_test.ml
index 49a696fd20..7349c58339 100644
--- a/camlp4/examples/ex_str_test.ml
+++ b/camlp4/examples/ex_str_test.ml
@@ -1 +1,15 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
function <<foo>> -> <<bar>>
diff --git a/camlp4/examples/expression_closure.ml b/camlp4/examples/expression_closure.ml
index cfc47454d1..300d971086 100644
--- a/camlp4/examples/expression_closure.ml
+++ b/camlp4/examples/expression_closure.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2006 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
#default_quotation "expr";
open Camlp4.PreCast;
diff --git a/camlp4/examples/expression_closure_filter.ml b/camlp4/examples/expression_closure_filter.ml
index fb1fbe070e..dec08b622d 100644
--- a/camlp4/examples/expression_closure_filter.ml
+++ b/camlp4/examples/expression_closure_filter.ml
@@ -1,4 +1,18 @@
(* camlp4r *)
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2006 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
#default_quotation "expr";
open Camlp4.PreCast;
diff --git a/camlp4/examples/expression_closure_test.ml b/camlp4/examples/expression_closure_test.ml
index 28747ce015..9e4cc536a1 100644
--- a/camlp4/examples/expression_closure_test.ml
+++ b/camlp4/examples/expression_closure_test.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
(* x and y are free *)
close_expr(x y);;
diff --git a/camlp4/examples/fancy_lambda_quot.ml b/camlp4/examples/fancy_lambda_quot.ml
index be21fa2fd2..8384dd1988 100644
--- a/camlp4/examples/fancy_lambda_quot.ml
+++ b/camlp4/examples/fancy_lambda_quot.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2008 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
(* module LambdaSyntax = struct
module Loc = Camlp4.PreCast.Loc
type 'a antiquotable =
diff --git a/camlp4/examples/fancy_lambda_quot_test.ml b/camlp4/examples/fancy_lambda_quot_test.ml
index 5ff348c9dc..9f74deea6c 100644
--- a/camlp4/examples/fancy_lambda_quot_test.ml
+++ b/camlp4/examples/fancy_lambda_quot_test.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2008 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Fancy_lambda_quot.LambdaSyntax;;
let _loc = Camlp4.PreCast.Loc.ghost;;
let rec propagate = function
diff --git a/camlp4/examples/free_vars_test.ml b/camlp4/examples/free_vars_test.ml
index be01edc152..84d608b40b 100644
--- a/camlp4/examples/free_vars_test.ml
+++ b/camlp4/examples/free_vars_test.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2006 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Format;
open Camlp4.PreCast;
diff --git a/camlp4/examples/gen_match_case.ml b/camlp4/examples/gen_match_case.ml
index c72a146230..cd402d4cff 100644
--- a/camlp4/examples/gen_match_case.ml
+++ b/camlp4/examples/gen_match_case.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4.PreCast;;
let gen patts exprs =
diff --git a/camlp4/examples/gen_type_N.ml b/camlp4/examples/gen_type_N.ml
index 276f682b3e..361f74737c 100644
--- a/camlp4/examples/gen_type_N.ml
+++ b/camlp4/examples/gen_type_N.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4.PreCast;;
let data_constructor_arguments _loc n t =
diff --git a/camlp4/examples/gettext_test.ml b/camlp4/examples/gettext_test.ml
index 27f6ceed2b..11d1f146e1 100644
--- a/camlp4/examples/gettext_test.ml
+++ b/camlp4/examples/gettext_test.ml
@@ -1 +1,15 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2008 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
f "test", f "foo", "bar"
diff --git a/camlp4/examples/global_handler.ml b/camlp4/examples/global_handler.ml
index e2da52873d..08957fb808 100644
--- a/camlp4/examples/global_handler.ml
+++ b/camlp4/examples/global_handler.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2006 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4.PreCast;
value ghost = Loc.ghost;
diff --git a/camlp4/examples/global_handler_test.ml b/camlp4/examples/global_handler_test.ml
index 882af49432..9c3e98ca21 100644
--- a/camlp4/examples/global_handler_test.ml
+++ b/camlp4/examples/global_handler_test.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2006 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Format;;
let f1 x = printf "f1 %d@." x;;
let f2 x = printf "f2 %f@." x;;
diff --git a/camlp4/examples/lambda_parser.ml b/camlp4/examples/lambda_parser.ml
index 9c70976790..82ab3b8b59 100644
--- a/camlp4/examples/lambda_parser.ml
+++ b/camlp4/examples/lambda_parser.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2008 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
(* Please keep me in sync with brion.inria.fr/gallium/index.php/Lambda_calculus_quotations *)
type term =
diff --git a/camlp4/examples/lambda_quot.ml b/camlp4/examples/lambda_quot.ml
index 654511af2d..cf6485ab33 100644
--- a/camlp4/examples/lambda_quot.ml
+++ b/camlp4/examples/lambda_quot.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4.PreCast;
module CamlSyntax = Camlp4OCamlParser.Make (Camlp4OCamlRevisedParser.Make Syntax);
diff --git a/camlp4/examples/lambda_quot_expr.ml b/camlp4/examples/lambda_quot_expr.ml
index 98922123ad..d3eb22fe11 100644
--- a/camlp4/examples/lambda_quot_expr.ml
+++ b/camlp4/examples/lambda_quot_expr.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
(* Please keep me in sync with brion.inria.fr/gallium/index.php/Lambda_calculus_quotations *)
open Camlp4.PreCast;;
diff --git a/camlp4/examples/lambda_quot_patt.ml b/camlp4/examples/lambda_quot_patt.ml
index e6732dd3a3..044007b53b 100644
--- a/camlp4/examples/lambda_quot_patt.ml
+++ b/camlp4/examples/lambda_quot_patt.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2008 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
(* Please keep me in sync with brion.inria.fr/gallium/index.php/Lambda_calculus_quotations *)
open Camlp4.PreCast;;
diff --git a/camlp4/examples/lambda_test.ml b/camlp4/examples/lambda_test.ml
index e2603259a1..f56451fc0a 100644
--- a/camlp4/examples/lambda_test.ml
+++ b/camlp4/examples/lambda_test.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
let id = << fun x -> x >>
(* Imported and traduced from CCT *)
let zero = << fun s -> fun z -> z >>
diff --git a/camlp4/examples/macros.ml b/camlp4/examples/macros.ml
index fe7b7392ec..3ad5687f57 100644
--- a/camlp4/examples/macros.ml
+++ b/camlp4/examples/macros.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4.PreCast;;
let foldr_funs = ref [];;
let foldl_funs = ref [];;
diff --git a/camlp4/examples/parse_files.ml b/camlp4/examples/parse_files.ml
index 0df49c18bc..46cf8420b0 100644
--- a/camlp4/examples/parse_files.ml
+++ b/camlp4/examples/parse_files.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4.PreCast;;
module Caml =
diff --git a/camlp4/examples/syb_fold.ml b/camlp4/examples/syb_fold.ml
index 3441c6b61c..f5abc698fe 100644
--- a/camlp4/examples/syb_fold.ml
+++ b/camlp4/examples/syb_fold.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
type variable = string
and term =
| Var of variable
diff --git a/camlp4/examples/syb_map.ml b/camlp4/examples/syb_map.ml
index 8ef923f325..9185630519 100644
--- a/camlp4/examples/syb_map.ml
+++ b/camlp4/examples/syb_map.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
type variable = string
and term =
| Var of variable
diff --git a/camlp4/examples/test_macros.ml b/camlp4/examples/test_macros.ml
index 1e1b172b5d..955a7c2127 100644
--- a/camlp4/examples/test_macros.ml
+++ b/camlp4/examples/test_macros.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
(* DEFINE F(x, y, z) = x + y * z;; *)
(* F(F(1, 2, 3), 4, 5);; *)
diff --git a/camlp4/examples/test_type_quotation.ml b/camlp4/examples/test_type_quotation.ml
index 772dfcfcad..088924c8f1 100644
--- a/camlp4/examples/test_type_quotation.ml
+++ b/camlp4/examples/test_type_quotation.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
type t1 = <:power< 6 | int >>
type t2 = <:power< 3 | int -> int >> -> int
type t3 = <:power< 3 | int -> <:power< 2 | int >> >> -> int
diff --git a/camlp4/examples/type_quotation.ml b/camlp4/examples/type_quotation.ml
index 5dae046fd0..5c569a94ac 100644
--- a/camlp4/examples/type_quotation.ml
+++ b/camlp4/examples/type_quotation.ml
@@ -1,3 +1,17 @@
+(****************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed under *)
+(* the terms of the GNU Library General Public License, with the special *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
+(* *)
+(****************************************************************************)
+
open Camlp4.PreCast;
value rec mk_tuple _loc t n =
diff --git a/camlp4/man/Makefile b/camlp4/man/Makefile
index 381bdcc53b..64b3f970e8 100644
--- a/camlp4/man/Makefile
+++ b/camlp4/man/Makefile
@@ -1,4 +1,15 @@
-
+#########################################################################
+# #
+# OCaml #
+# #
+# Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 2001 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../LICENSE. #
+# #
+#########################################################################
include ../config/Makefile.cnf
diff --git a/camlp4/man/camlp4.1.tpl b/camlp4/man/camlp4.1.tpl
index ff8c650476..664ca9f758 100644
--- a/camlp4/man/camlp4.1.tpl
+++ b/camlp4/man/camlp4.1.tpl
@@ -1,3 +1,18 @@
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 2001 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the GNU Library General Public License, with *
+.\"* the special exception on linking described in file ../LICENSE. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH CAMLP4 1 "" "INRIA"
.SH NAME
camlp4 - Pre-Precessor-Pretty-Printer for OCaml
diff --git a/camlp4/mkcamlp4.ml b/camlp4/mkcamlp4.ml
index 8c911b12d7..180b17efff 100644
--- a/camlp4/mkcamlp4.ml
+++ b/camlp4/mkcamlp4.ml
@@ -1,14 +1,14 @@
(****************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* INRIA Rocquencourt *)
(* *)
(* Copyright 2006 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed under *)
(* the terms of the GNU Library General Public License, with the special *)
-(* exception on linking described in LICENSE at the top of the Objective *)
-(* Caml source tree. *)
+(* exception on linking described in LICENSE at the top of the OCaml *)
+(* source tree. *)
(* *)
(****************************************************************************)
diff --git a/camlp4/unmaintained/Makefile b/camlp4/unmaintained/Makefile
index b6db0753cb..ff79e3367f 100644
--- a/camlp4/unmaintained/Makefile
+++ b/camlp4/unmaintained/Makefile
@@ -1,12 +1,13 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Camlp4 #
# #
# Copyright 2004 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../LICENSE. #
# #
#########################################################################
#
diff --git a/camlp4/unmaintained/extfold/README b/camlp4/unmaintained/extfold/README
index 2a09ff0988..dce3da112c 100644
--- a/camlp4/unmaintained/extfold/README
+++ b/camlp4/unmaintained/extfold/README
@@ -7,8 +7,8 @@ accessible from the Camlp4 hump. If you are interested in developing
this package further and/or actively maintain it, please let us know
(caml@inria.fr)
-This package is distributed under the same license as the Objective
-Caml Library (that is, LGPL with a special exception allowing both
+This package is distributed under the same license as the OCaml
+Library (that is, LGPL with a special exception allowing both
static and dynamic link).
-- Michel Mauny
diff --git a/camlp4/unmaintained/format/Makefile b/camlp4/unmaintained/format/Makefile
index c388720974..1211a79995 100644
--- a/camlp4/unmaintained/format/Makefile
+++ b/camlp4/unmaintained/format/Makefile
@@ -1,12 +1,13 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Camlp4 #
# #
# Copyright 2004 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../../LICENSE.#
# #
#########################################################################
#
diff --git a/camlp4/unmaintained/format/README b/camlp4/unmaintained/format/README
index 809d42f2a8..830402b651 100644
--- a/camlp4/unmaintained/format/README
+++ b/camlp4/unmaintained/format/README
@@ -7,8 +7,8 @@ accessible from the Camlp4 hump. If you are interested in developing
this package further and/or actively maintain it, please let us know
(caml@inria.fr)
-This package is distributed under the same license as the Objective
-Caml Library (that is, LGPL with a special exception allowing both
+This package is distributed under the same license as the OCaml
+Library (that is, LGPL with a special exception allowing both
static and dynamic link).
-- Michel Mauny
diff --git a/camlp4/unmaintained/lefteval/Makefile b/camlp4/unmaintained/lefteval/Makefile
index 7e5cdd02e6..5d47776c5b 100644
--- a/camlp4/unmaintained/lefteval/Makefile
+++ b/camlp4/unmaintained/lefteval/Makefile
@@ -1,12 +1,13 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Camlp4 #
# #
# Copyright 2004 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../../LICENSE.#
# #
#########################################################################
#
diff --git a/camlp4/unmaintained/lefteval/README b/camlp4/unmaintained/lefteval/README
index 809d42f2a8..830402b651 100644
--- a/camlp4/unmaintained/lefteval/README
+++ b/camlp4/unmaintained/lefteval/README
@@ -7,8 +7,8 @@ accessible from the Camlp4 hump. If you are interested in developing
this package further and/or actively maintain it, please let us know
(caml@inria.fr)
-This package is distributed under the same license as the Objective
-Caml Library (that is, LGPL with a special exception allowing both
+This package is distributed under the same license as the OCaml
+Library (that is, LGPL with a special exception allowing both
static and dynamic link).
-- Michel Mauny
diff --git a/camlp4/unmaintained/ocamllex/Makefile b/camlp4/unmaintained/ocamllex/Makefile
index b232023e58..1407c40a6f 100644
--- a/camlp4/unmaintained/ocamllex/Makefile
+++ b/camlp4/unmaintained/ocamllex/Makefile
@@ -1,12 +1,13 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Camlp4 #
# #
# Copyright 2004 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../../LICENSE.#
# #
#########################################################################
#
diff --git a/camlp4/unmaintained/ocamllex/README b/camlp4/unmaintained/ocamllex/README
index 809d42f2a8..830402b651 100644
--- a/camlp4/unmaintained/ocamllex/README
+++ b/camlp4/unmaintained/ocamllex/README
@@ -7,8 +7,8 @@ accessible from the Camlp4 hump. If you are interested in developing
this package further and/or actively maintain it, please let us know
(caml@inria.fr)
-This package is distributed under the same license as the Objective
-Caml Library (that is, LGPL with a special exception allowing both
+This package is distributed under the same license as the OCaml
+Library (that is, LGPL with a special exception allowing both
static and dynamic link).
-- Michel Mauny
diff --git a/camlp4/unmaintained/olabl/Makefile b/camlp4/unmaintained/olabl/Makefile
index f928d4589f..2d9eb6904f 100644
--- a/camlp4/unmaintained/olabl/Makefile
+++ b/camlp4/unmaintained/olabl/Makefile
@@ -1,12 +1,13 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Camlp4 #
# #
# Copyright 2004 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../../LICENSE.#
# #
#########################################################################
#
diff --git a/camlp4/unmaintained/olabl/README b/camlp4/unmaintained/olabl/README
index 809d42f2a8..830402b651 100644
--- a/camlp4/unmaintained/olabl/README
+++ b/camlp4/unmaintained/olabl/README
@@ -7,8 +7,8 @@ accessible from the Camlp4 hump. If you are interested in developing
this package further and/or actively maintain it, please let us know
(caml@inria.fr)
-This package is distributed under the same license as the Objective
-Caml Library (that is, LGPL with a special exception allowing both
+This package is distributed under the same license as the OCaml
+Library (that is, LGPL with a special exception allowing both
static and dynamic link).
-- Michel Mauny
diff --git a/camlp4/unmaintained/scheme/Makefile b/camlp4/unmaintained/scheme/Makefile
index 01036c2252..4034629fb5 100644
--- a/camlp4/unmaintained/scheme/Makefile
+++ b/camlp4/unmaintained/scheme/Makefile
@@ -1,12 +1,13 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Camlp4 #
# #
# Copyright 2004 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../../LICENSE.#
# #
#########################################################################
#
@@ -77,7 +78,7 @@ pr_schemep.cmo: pr_schp_main.cmo
.ml.cmo:
- $(OCAMLC) $(OCAMLCFLAGS) -pp "$(CAMLP4) $(P4INCLUDES) `awk 'NR == 1 { ORS=" "; for (i=2; i < NF; i++) print $$i; } ' $<` -loc loc" -c $<
+ $(OCAMLC) $(OCAMLCFLAGS) -pp "$(CAMLP4) $(P4INCLUDES) `awk 'NR == 1 { ORS=" "; for (i=2; i < NF; i++) print $$i; } ' $<` -loc loc" -c $<
.ml.cmx:
$(OCAMLOPT) $(OCAMLCFLAGS) -pp "$(CAMLP4) $(P4INCLUDES) `awk 'NR == 1 { ORS=" "; for (i=2; i < NF; i++) print $$i; } ' $<` -loc loc" -c $<
diff --git a/camlp4/unmaintained/scheme/README b/camlp4/unmaintained/scheme/README
index 809d42f2a8..830402b651 100644
--- a/camlp4/unmaintained/scheme/README
+++ b/camlp4/unmaintained/scheme/README
@@ -7,8 +7,8 @@ accessible from the Camlp4 hump. If you are interested in developing
this package further and/or actively maintain it, please let us know
(caml@inria.fr)
-This package is distributed under the same license as the Objective
-Caml Library (that is, LGPL with a special exception allowing both
+This package is distributed under the same license as the OCaml
+Library (that is, LGPL with a special exception allowing both
static and dynamic link).
-- Michel Mauny
diff --git a/camlp4/unmaintained/sml/Makefile b/camlp4/unmaintained/sml/Makefile
index ea3980bef4..80b1724253 100644
--- a/camlp4/unmaintained/sml/Makefile
+++ b/camlp4/unmaintained/sml/Makefile
@@ -1,12 +1,13 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Camlp4 #
# #
# Copyright 2004 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../../LICENSE.#
# #
#########################################################################
#
diff --git a/camlp4/unmaintained/sml/README b/camlp4/unmaintained/sml/README
index 809d42f2a8..830402b651 100644
--- a/camlp4/unmaintained/sml/README
+++ b/camlp4/unmaintained/sml/README
@@ -7,8 +7,8 @@ accessible from the Camlp4 hump. If you are interested in developing
this package further and/or actively maintain it, please let us know
(caml@inria.fr)
-This package is distributed under the same license as the Objective
-Caml Library (that is, LGPL with a special exception allowing both
+This package is distributed under the same license as the OCaml
+Library (that is, LGPL with a special exception allowing both
static and dynamic link).
-- Michel Mauny
diff --git a/config/Makefile-templ b/config/Makefile-templ
index dd65452a94..1420522c88 100644
--- a/config/Makefile-templ
+++ b/config/Makefile-templ
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/config/Makefile.mingw b/config/Makefile.mingw
index f2e408cc0e..2be898e52e 100644
--- a/config/Makefile.mingw
+++ b/config/Makefile.mingw
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/config/Makefile.msvc b/config/Makefile.msvc
index 8f0a50ce43..7006fa6390 100644
--- a/config/Makefile.msvc
+++ b/config/Makefile.msvc
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64
index e91b26f724..c62e51a362 100644
--- a/config/Makefile.msvc64
+++ b/config/Makefile.msvc64
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/config/auto-aux/align.c b/config/auto-aux/align.c
index 0bedf77a02..a04684b483 100644
--- a/config/auto-aux/align.c
+++ b/config/auto-aux/align.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/ansi.c b/config/auto-aux/ansi.c
index f1a416b857..01d46252ae 100644
--- a/config/auto-aux/ansi.c
+++ b/config/auto-aux/ansi.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/async_io.c b/config/auto-aux/async_io.c
index 2b5faa2d70..2ce3da725a 100644
--- a/config/auto-aux/async_io.c
+++ b/config/auto-aux/async_io.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/bytecopy.c b/config/auto-aux/bytecopy.c
index 923b444e5b..2006147fd7 100644
--- a/config/auto-aux/bytecopy.c
+++ b/config/auto-aux/bytecopy.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/dblalign.c b/config/auto-aux/dblalign.c
index c2520381ce..91d4194c09 100644
--- a/config/auto-aux/dblalign.c
+++ b/config/auto-aux/dblalign.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/divmod.c b/config/auto-aux/divmod.c
index 8f69dabf35..d59bf31cc9 100644
--- a/config/auto-aux/divmod.c
+++ b/config/auto-aux/divmod.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/elf.c b/config/auto-aux/elf.c
index 026c4838eb..27be98d6b7 100644
--- a/config/auto-aux/elf.c
+++ b/config/auto-aux/elf.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/endian.c b/config/auto-aux/endian.c
index def617f0f5..b019eb1c7a 100644
--- a/config/auto-aux/endian.c
+++ b/config/auto-aux/endian.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/expm1.c b/config/auto-aux/expm1.c
index ec315871f8..f115a91110 100644
--- a/config/auto-aux/expm1.c
+++ b/config/auto-aux/expm1.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/getgroups.c b/config/auto-aux/getgroups.c
index 1ed8a1fbb1..b69b0be41f 100644
--- a/config/auto-aux/getgroups.c
+++ b/config/auto-aux/getgroups.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/gethostbyaddr.c b/config/auto-aux/gethostbyaddr.c
index c5dd129719..f6d36a7f3b 100644
--- a/config/auto-aux/gethostbyaddr.c
+++ b/config/auto-aux/gethostbyaddr.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/gethostbyname.c b/config/auto-aux/gethostbyname.c
index 043b9d3343..96a39438d5 100644
--- a/config/auto-aux/gethostbyname.c
+++ b/config/auto-aux/gethostbyname.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/hasgot b/config/auto-aux/hasgot
index 5014b903d7..53d578660b 100755
--- a/config/auto-aux/hasgot
+++ b/config/auto-aux/hasgot
@@ -1,5 +1,18 @@
#!/bin/sh
+#########################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 1995 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../LICENSE. #
+# #
+#########################################################################
+
opts=""
libs="$cclibs"
args=$*
diff --git a/config/auto-aux/hasgot2 b/config/auto-aux/hasgot2
index 98e04698eb..0e9cef9b0d 100644
--- a/config/auto-aux/hasgot2
+++ b/config/auto-aux/hasgot2
@@ -1,5 +1,18 @@
#!/bin/sh
+#########################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 2011 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../LICENSE. #
+# #
+#########################################################################
+
opts=""
libs="$cclibs"
args=$*
diff --git a/config/auto-aux/ia32sse2.c b/config/auto-aux/ia32sse2.c
index cbe114626a..8ba81601b6 100644
--- a/config/auto-aux/ia32sse2.c
+++ b/config/auto-aux/ia32sse2.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/initgroups.c b/config/auto-aux/initgroups.c
index b6e0ffbdf2..7b9c239834 100644
--- a/config/auto-aux/initgroups.c
+++ b/config/auto-aux/initgroups.c
@@ -1,6 +1,8 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
+/* */
+/* Contributed by Stephane Glondu <steph@glondu.net> */
/* */
/* Copyright 2009 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
@@ -9,8 +11,6 @@
/* */
/***********************************************************************/
-/* Contributed by Stephane Glondu <steph@glondu.net> */
-
/* $Id$ */
#include <errno.h>
diff --git a/config/auto-aux/int64align.c b/config/auto-aux/int64align.c
index 6bdd25567a..b087a3d66b 100644
--- a/config/auto-aux/int64align.c
+++ b/config/auto-aux/int64align.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/longlong.c b/config/auto-aux/longlong.c
index bcdf4c974b..424e540fdf 100644
--- a/config/auto-aux/longlong.c
+++ b/config/auto-aux/longlong.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/runtest b/config/auto-aux/runtest
index ce65bd07f1..c8d7c435a4 100755
--- a/config/auto-aux/runtest
+++ b/config/auto-aux/runtest
@@ -1,4 +1,18 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 1995 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../LICENSE. #
+# #
+#########################################################################
+
if test "$verbose" = yes; then
echo "runtest: $cc -o tst $* $cclibs" >&2
$cc -o tst $* $cclibs || exit 100
diff --git a/config/auto-aux/schar.c b/config/auto-aux/schar.c
index 55d49f31a7..e3e81e395e 100644
--- a/config/auto-aux/schar.c
+++ b/config/auto-aux/schar.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/schar2.c b/config/auto-aux/schar2.c
index d1d781a53e..d041af1830 100644
--- a/config/auto-aux/schar2.c
+++ b/config/auto-aux/schar2.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/searchpath b/config/auto-aux/searchpath
index 9b31267f67..79d7fcaebc 100755
--- a/config/auto-aux/searchpath
+++ b/config/auto-aux/searchpath
@@ -1,4 +1,18 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 1996 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../LICENSE. #
+# #
+#########################################################################
+
# Find a program in the path
IFS=':'
diff --git a/config/auto-aux/setgroups.c b/config/auto-aux/setgroups.c
index 5cfe49c082..63ac1b8c34 100644
--- a/config/auto-aux/setgroups.c
+++ b/config/auto-aux/setgroups.c
@@ -1,6 +1,8 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
+/* */
+/* Contributed by Stephane Glondu <steph@glondu.net> */
/* */
/* Copyright 2009 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
@@ -9,8 +11,6 @@
/* */
/***********************************************************************/
-/* Contributed by Stephane Glondu <steph@glondu.net> */
-
/* $Id$ */
#include <errno.h>
diff --git a/config/auto-aux/sighandler.c b/config/auto-aux/sighandler.c
index 7e748df572..b36557c5f0 100644
--- a/config/auto-aux/sighandler.c
+++ b/config/auto-aux/sighandler.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/signals.c b/config/auto-aux/signals.c
index df0a8b0b50..78ba8de69d 100644
--- a/config/auto-aux/signals.c
+++ b/config/auto-aux/signals.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/sizes.c b/config/auto-aux/sizes.c
index 992c47a658..58fd6b23fc 100644
--- a/config/auto-aux/sizes.c
+++ b/config/auto-aux/sizes.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/solaris-ld b/config/auto-aux/solaris-ld
index 3ab90bceff..cc846a31b3 100644
--- a/config/auto-aux/solaris-ld
+++ b/config/auto-aux/solaris-ld
@@ -1,4 +1,18 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 2001 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../LICENSE. #
+# #
+#########################################################################
+
# Determine if gcc calls the Solaris ld or the GNU ld
# Exit code is 0 for Solaris ld, 1 for GNU ld
diff --git a/config/auto-aux/stackov.c b/config/auto-aux/stackov.c
index 39e4e832be..47f252aa67 100644
--- a/config/auto-aux/stackov.c
+++ b/config/auto-aux/stackov.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/auto-aux/tclversion.c b/config/auto-aux/tclversion.c
index 77c0bb729e..84a94033c6 100644
--- a/config/auto-aux/tclversion.c
+++ b/config/auto-aux/tclversion.c
@@ -1,3 +1,21 @@
+/***********************************************************************/
+/* */
+/* MLTk, Tcl/Tk interface of OCaml */
+/* */
+/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
+/* projet Cristal, INRIA Rocquencourt */
+/* Jacques Garrigue, Kyoto University RIMS */
+/* */
+/* Copyright 2002 Institut National de Recherche en Informatique et */
+/* en Automatique and Kyoto University. All rights reserved. */
+/* This file is distributed under the terms of the GNU Library */
+/* General Public License, with the special exception on linking */
+/* described in file LICENSE found in the OCaml source tree. */
+/* */
+/***********************************************************************/
+
+/* $Id$ */
+
#include <stdio.h>
#include <tcl.h>
#include <tk.h>
diff --git a/config/auto-aux/trycompile b/config/auto-aux/trycompile
index 797a1c3869..934a00a9b7 100755
--- a/config/auto-aux/trycompile
+++ b/config/auto-aux/trycompile
@@ -1,4 +1,18 @@
#!/bin/sh
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../../LICENSE. #
+# #
+#########################################################################
+
if test "$verbose" = yes; then
echo "trycompile: $cc -o tst $* $cclibs" >&2
$cc -o tst $* $cclibs || exit 100
diff --git a/config/m-nt.h b/config/m-nt.h
index 7a92828110..80e0b5ee6a 100644
--- a/config/m-nt.h
+++ b/config/m-nt.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/m-templ.h b/config/m-templ.h
index 392ec562b8..6e09f64e4a 100644
--- a/config/m-templ.h
+++ b/config/m-templ.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/s-nt.h b/config/s-nt.h
index 5eaf3770f4..d3502401d4 100644
--- a/config/s-nt.h
+++ b/config/s-nt.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/config/s-templ.h b/config/s-templ.h
index 52f3cf609c..971bc48f1e 100644
--- a/config/s-templ.h
+++ b/config/s-templ.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/configure b/configure
index 4b7fabbdd9..5397a98fb6 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/debugger/Makefile b/debugger/Makefile
index 3ff1b54aa4..2e6534c730 100644
--- a/debugger/Makefile
+++ b/debugger/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/debugger/Makefile.nt b/debugger/Makefile.nt
index 70263e94d8..40034ef482 100644
--- a/debugger/Makefile.nt
+++ b/debugger/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/debugger/Makefile.shared b/debugger/Makefile.shared
index 778fcf1129..77b9c60e01 100644
--- a/debugger/Makefile.shared
+++ b/debugger/Makefile.shared
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/debugger/breakpoints.ml b/debugger/breakpoints.ml
index 1da4b74e26..5e84cc6ca6 100644
--- a/debugger/breakpoints.ml
+++ b/debugger/breakpoints.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/breakpoints.mli b/debugger/breakpoints.mli
index 091f609981..855ef5e17b 100644
--- a/debugger/breakpoints.mli
+++ b/debugger/breakpoints.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/checkpoints.ml b/debugger/checkpoints.ml
index ffcff35e36..e2371f1704 100644
--- a/debugger/checkpoints.ml
+++ b/debugger/checkpoints.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/checkpoints.mli b/debugger/checkpoints.mli
index 17c1037aa2..b37d1ae55e 100644
--- a/debugger/checkpoints.mli
+++ b/debugger/checkpoints.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/command_line.ml b/debugger/command_line.ml
index 944efa864c..3f84ea7b2c 100644
--- a/debugger/command_line.ml
+++ b/debugger/command_line.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/command_line.mli b/debugger/command_line.mli
index dd2349d2c4..422cf6a242 100644
--- a/debugger/command_line.mli
+++ b/debugger/command_line.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/debugcom.ml b/debugger/debugcom.ml
index dfe905bac4..8839476e33 100644
--- a/debugger/debugcom.ml
+++ b/debugger/debugcom.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/debugcom.mli b/debugger/debugcom.mli
index abf4fd0b2c..7d107ac5b8 100644
--- a/debugger/debugcom.mli
+++ b/debugger/debugcom.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/debugger_config.ml b/debugger/debugger_config.ml
index 54d6b2d583..007a3e973b 100644
--- a/debugger/debugger_config.ml
+++ b/debugger/debugger_config.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
@@ -56,7 +56,7 @@ let shell =
"Win32" -> "cmd"
| _ -> "/bin/sh"
-(* Name of the Objective Caml runtime. *)
+(* Name of the OCaml runtime. *)
let runtime_program = "ocamlrun"
(* Time history size (for `last') *)
diff --git a/debugger/debugger_config.mli b/debugger/debugger_config.mli
index 18faf9c62f..64411f96a5 100644
--- a/debugger/debugger_config.mli
+++ b/debugger/debugger_config.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/envaux.ml b/debugger/envaux.ml
index 8d462e2f87..56786929eb 100644
--- a/debugger/envaux.ml
+++ b/debugger/envaux.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/envaux.mli b/debugger/envaux.mli
index 8b122cc347..b78173c4a7 100644
--- a/debugger/envaux.mli
+++ b/debugger/envaux.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/eval.ml b/debugger/eval.ml
index 7ee1339f01..0f8c8a0566 100644
--- a/debugger/eval.ml
+++ b/debugger/eval.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/eval.mli b/debugger/eval.mli
index b2a2998f14..96661b2a3c 100644
--- a/debugger/eval.mli
+++ b/debugger/eval.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/events.ml b/debugger/events.ml
index 2521c064db..78733bfc4e 100644
--- a/debugger/events.ml
+++ b/debugger/events.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/events.mli b/debugger/events.mli
index 7166f2c9d0..f795058cc7 100644
--- a/debugger/events.mli
+++ b/debugger/events.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/exec.ml b/debugger/exec.ml
index 1ea165978f..22d281bcc3 100644
--- a/debugger/exec.ml
+++ b/debugger/exec.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/exec.mli b/debugger/exec.mli
index 9d3b986048..c9d665ae05 100644
--- a/debugger/exec.mli
+++ b/debugger/exec.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/frames.ml b/debugger/frames.ml
index c533782fc4..2a87ffdd8d 100644
--- a/debugger/frames.ml
+++ b/debugger/frames.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/frames.mli b/debugger/frames.mli
index b4863433dd..5023236cb8 100644
--- a/debugger/frames.mli
+++ b/debugger/frames.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/history.ml b/debugger/history.ml
index e8c5ed8ff5..473ba80bb0 100644
--- a/debugger/history.ml
+++ b/debugger/history.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/history.mli b/debugger/history.mli
index 249629fdb9..542b9ca047 100644
--- a/debugger/history.mli
+++ b/debugger/history.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/input_handling.ml b/debugger/input_handling.ml
index f25d474266..8bbc0d80f5 100644
--- a/debugger/input_handling.ml
+++ b/debugger/input_handling.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/input_handling.mli b/debugger/input_handling.mli
index 959547df79..7ae190ee1b 100644
--- a/debugger/input_handling.mli
+++ b/debugger/input_handling.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/int64ops.ml b/debugger/int64ops.ml
index b854a6c343..a3dbdbe2cc 100644
--- a/debugger/int64ops.ml
+++ b/debugger/int64ops.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocqencourt *)
(* *)
diff --git a/debugger/int64ops.mli b/debugger/int64ops.mli
index 98f7228d3d..f898f1431b 100644
--- a/debugger/int64ops.mli
+++ b/debugger/int64ops.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocqencourt *)
(* *)
diff --git a/debugger/lexer.mli b/debugger/lexer.mli
index 7214ed2be9..23f88e571f 100644
--- a/debugger/lexer.mli
+++ b/debugger/lexer.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/lexer.mll b/debugger/lexer.mll
index eea8ed0284..7dd51e7047 100644
--- a/debugger/lexer.mll
+++ b/debugger/lexer.mll
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/loadprinter.ml b/debugger/loadprinter.ml
index ac5aa0187d..49f76a402f 100644
--- a/debugger/loadprinter.ml
+++ b/debugger/loadprinter.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/debugger/loadprinter.mli b/debugger/loadprinter.mli
index bdaf77a285..77edfc53dc 100644
--- a/debugger/loadprinter.mli
+++ b/debugger/loadprinter.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/debugger/main.ml b/debugger/main.ml
index c25f9ffb4a..5e80081f0c 100644
--- a/debugger/main.ml
+++ b/debugger/main.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/parameters.ml b/debugger/parameters.ml
index 9d518e5494..fb816e4d5d 100644
--- a/debugger/parameters.ml
+++ b/debugger/parameters.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/parameters.mli b/debugger/parameters.mli
index 8f750e68a6..eb055f7c5d 100644
--- a/debugger/parameters.mli
+++ b/debugger/parameters.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/parser.mly b/debugger/parser.mly
index 6fc8392a86..ae1b0d153d 100644
--- a/debugger/parser.mly
+++ b/debugger/parser.mly
@@ -1,9 +1,9 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Jerome Vouillon, projet Cristal, INRIA Rocquencourt */
-/* Objective Caml port by John Malecki and Xavier Leroy */
+/* OCaml port by John Malecki and Xavier Leroy */
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
diff --git a/debugger/parser_aux.mli b/debugger/parser_aux.mli
index a68e08d5c8..275281cc49 100644
--- a/debugger/parser_aux.mli
+++ b/debugger/parser_aux.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/pattern_matching.ml b/debugger/pattern_matching.ml
index 97af9326b5..b921182657 100644
--- a/debugger/pattern_matching.ml
+++ b/debugger/pattern_matching.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/pattern_matching.mli b/debugger/pattern_matching.mli
index 3490edef69..a7a525622b 100644
--- a/debugger/pattern_matching.mli
+++ b/debugger/pattern_matching.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/pos.ml b/debugger/pos.ml
index 4beba3de0f..6c43f43393 100644
--- a/debugger/pos.ml
+++ b/debugger/pos.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/debugger/pos.mli b/debugger/pos.mli
index e7632e4274..a4c8e9e8d5 100644
--- a/debugger/pos.mli
+++ b/debugger/pos.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/debugger/primitives.ml b/debugger/primitives.ml
index d4ba22e5f8..bfd2fdd8de 100644
--- a/debugger/primitives.ml
+++ b/debugger/primitives.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/primitives.mli b/debugger/primitives.mli
index 4333128fb6..4d914da984 100644
--- a/debugger/primitives.mli
+++ b/debugger/primitives.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/printval.ml b/debugger/printval.ml
index 5f36e1a7cc..84a0f06e41 100644
--- a/debugger/printval.ml
+++ b/debugger/printval.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/printval.mli b/debugger/printval.mli
index bb6318880c..f1c4569bb8 100644
--- a/debugger/printval.mli
+++ b/debugger/printval.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/program_loading.ml b/debugger/program_loading.ml
index 79577ff4b9..3f32cb245f 100644
--- a/debugger/program_loading.ml
+++ b/debugger/program_loading.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/program_loading.mli b/debugger/program_loading.mli
index d1210d1ab0..2814eb39cf 100644
--- a/debugger/program_loading.mli
+++ b/debugger/program_loading.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/program_management.ml b/debugger/program_management.ml
index 8ebb907d1f..3e6ffa81d1 100644
--- a/debugger/program_management.ml
+++ b/debugger/program_management.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/program_management.mli b/debugger/program_management.mli
index 8e2f28e54e..96f5a43824 100644
--- a/debugger/program_management.mli
+++ b/debugger/program_management.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/question.ml b/debugger/question.ml
index 2eeec3ab0d..f17227b9be 100644
--- a/debugger/question.ml
+++ b/debugger/question.ml
@@ -1,3 +1,15 @@
+(***********************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* Nicolas Pouillard, projet Gallium, INRIA Rocquencourt *)
+(* *)
+(* Copyright 2006 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
+(* *)
+(***********************************************************************)
+
open Input_handling
open Primitives
diff --git a/debugger/question.mli b/debugger/question.mli
index 3a92dee6b2..d8e50ef9b8 100644
--- a/debugger/question.mli
+++ b/debugger/question.mli
@@ -1,2 +1,14 @@
+(***********************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* Nicolas Pouillard, projet Gallium, INRIA Rocquencourt *)
+(* *)
+(* Copyright 2006 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
+(* *)
+(***********************************************************************)
+
(* Ask user a yes or no question. *)
val yes_or_no : string -> bool
diff --git a/debugger/show_information.ml b/debugger/show_information.ml
index bd746eb7f8..86e9637a49 100644
--- a/debugger/show_information.ml
+++ b/debugger/show_information.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/show_information.mli b/debugger/show_information.mli
index 3069f93321..7774721a94 100644
--- a/debugger/show_information.mli
+++ b/debugger/show_information.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/show_source.ml b/debugger/show_source.ml
index 2826c9e686..4a998f5201 100644
--- a/debugger/show_source.ml
+++ b/debugger/show_source.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/show_source.mli b/debugger/show_source.mli
index 5ba418af58..3b136ab747 100644
--- a/debugger/show_source.mli
+++ b/debugger/show_source.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/source.ml b/debugger/source.ml
index f0d3d48fb9..0314cfacb6 100644
--- a/debugger/source.ml
+++ b/debugger/source.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/source.mli b/debugger/source.mli
index 273cb517b3..50fa3f02ad 100644
--- a/debugger/source.mli
+++ b/debugger/source.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/symbols.ml b/debugger/symbols.ml
index 392da976aa..9fba3e09c8 100644
--- a/debugger/symbols.ml
+++ b/debugger/symbols.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/symbols.mli b/debugger/symbols.mli
index 57ac8007b1..8823abd29c 100644
--- a/debugger/symbols.mli
+++ b/debugger/symbols.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/time_travel.ml b/debugger/time_travel.ml
index a4a4c83fa0..e10e039695 100644
--- a/debugger/time_travel.ml
+++ b/debugger/time_travel.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/time_travel.mli b/debugger/time_travel.mli
index 453e4df052..dad47fedca 100644
--- a/debugger/time_travel.mli
+++ b/debugger/time_travel.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/trap_barrier.ml b/debugger/trap_barrier.ml
index dba9c929f7..6aa22b267c 100644
--- a/debugger/trap_barrier.ml
+++ b/debugger/trap_barrier.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/trap_barrier.mli b/debugger/trap_barrier.mli
index 28bba5a3eb..b12391af63 100644
--- a/debugger/trap_barrier.mli
+++ b/debugger/trap_barrier.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/unix_tools.ml b/debugger/unix_tools.ml
index 9926e05d5a..dea47f99f8 100644
--- a/debugger/unix_tools.ml
+++ b/debugger/unix_tools.ml
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/debugger/unix_tools.mli b/debugger/unix_tools.mli
index b5e4ee6ca4..bbea8447e0 100644
--- a/debugger/unix_tools.mli
+++ b/debugger/unix_tools.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
-(* Objective Caml port by John Malecki and Xavier Leroy *)
+(* OCaml port by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/driver/compile.ml b/driver/compile.ml
index 4e2d8566ec..33a198ed83 100644
--- a/driver/compile.ml
+++ b/driver/compile.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/compile.mli b/driver/compile.mli
index 507d61bbd7..779239a8cc 100644
--- a/driver/compile.mli
+++ b/driver/compile.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/errors.ml b/driver/errors.ml
index 22dd1fc6a0..9400e9ebc5 100644
--- a/driver/errors.ml
+++ b/driver/errors.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/errors.mli b/driver/errors.mli
index ac203a53ef..9f7020d08a 100644
--- a/driver/errors.mli
+++ b/driver/errors.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/main.ml b/driver/main.ml
index e8f8021c99..a2246f75f0 100644
--- a/driver/main.ml
+++ b/driver/main.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/main.mli b/driver/main.mli
index d175a3ca26..b949bb0fe9 100644
--- a/driver/main.mli
+++ b/driver/main.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/driver/main_args.ml b/driver/main_args.ml
index ca6258d4ba..4a7136b298 100644
--- a/driver/main_args.ml
+++ b/driver/main_args.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/driver/main_args.mli b/driver/main_args.mli
index 3abe626e84..2c1a965f2a 100644
--- a/driver/main_args.mli
+++ b/driver/main_args.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/driver/ocamlcomp.sh.in b/driver/ocamlcomp.sh.in
index 2aeb2de20b..fc0a8e113f 100644
--- a/driver/ocamlcomp.sh.in
+++ b/driver/ocamlcomp.sh.in
@@ -1,5 +1,17 @@
#!/bin/sh
+#########################################################################
+# #
+# OCaml #
+# #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
topdir=`dirname $0`
exec @compiler@ -nostdlib -I $topdir/stdlib "$@"
diff --git a/driver/optcompile.ml b/driver/optcompile.ml
index 29afc628dc..ada7d9f71e 100644
--- a/driver/optcompile.ml
+++ b/driver/optcompile.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/optcompile.mli b/driver/optcompile.mli
index 507d61bbd7..779239a8cc 100644
--- a/driver/optcompile.mli
+++ b/driver/optcompile.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/opterrors.ml b/driver/opterrors.ml
index 581781997d..f931990a4c 100644
--- a/driver/opterrors.ml
+++ b/driver/opterrors.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/opterrors.mli b/driver/opterrors.mli
index d09dc733b6..94966741b7 100644
--- a/driver/opterrors.mli
+++ b/driver/opterrors.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/optmain.ml b/driver/optmain.ml
index d285bc5355..6184d513f6 100644
--- a/driver/optmain.ml
+++ b/driver/optmain.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/optmain.mli b/driver/optmain.mli
index 628d2d398b..701508af28 100644
--- a/driver/optmain.mli
+++ b/driver/optmain.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/driver/pparse.ml b/driver/pparse.ml
index 0622ddad9f..5d27beeb42 100644
--- a/driver/pparse.ml
+++ b/driver/pparse.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/driver/pparse.mli b/driver/pparse.mli
index 0ed0391360..96c2594f1e 100644
--- a/driver/pparse.mli
+++ b/driver/pparse.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/emacs/Makefile b/emacs/Makefile
index 077770c64f..125e9eb54c 100644
--- a/emacs/Makefile
+++ b/emacs/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/emacs/README b/emacs/README
index 7ddb362b4e..7dedfc89a6 100644
--- a/emacs/README
+++ b/emacs/README
@@ -1,7 +1,7 @@
O'Caml emacs mode, snapshot of $Date$
The files in this archive define a caml-mode for emacs, for editing
-Objective Caml and Objective Label programs, as well as an
+OCaml and Objective Label programs, as well as an
inferior-caml-mode, to run a toplevel.
Caml-mode supports indentation, compilation and error retrieving,
@@ -21,7 +21,7 @@ three lines in your .emacs.
(autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
I added camldebug.el from the original distribution, since there will
-soon be a debugger for Objective Caml, but I do not know enough about
+soon be a debugger for OCaml, but I do not know enough about
it.
To install the mode itself, edit the Makefile and do
diff --git a/emacs/caml-compat.el b/emacs/caml-compat.el
index 8ba7a99c7e..da54cd0dc0 100644
--- a/emacs/caml-compat.el
+++ b/emacs/caml-compat.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
;(* *)
diff --git a/emacs/caml-emacs.el b/emacs/caml-emacs.el
index d0a2c86ee0..06cabf3025 100644
--- a/emacs/caml-emacs.el
+++ b/emacs/caml-emacs.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Didier Remy, projet Cristal, INRIA Rocquencourt *)
;(* *)
diff --git a/emacs/caml-font-old.el b/emacs/caml-font-old.el
index 8faa542f05..12c318c90f 100644
--- a/emacs/caml-font-old.el
+++ b/emacs/caml-font-old.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
@@ -55,7 +55,7 @@
; The same definition is in caml.el:
; we don't know in which order they will be loaded.
(defvar caml-quote-char "'"
- "*Quote for character constants. \"'\" for Objective Caml, \"`\" for Caml-Light.")
+ "*Quote for character constants. \"'\" for OCaml, \"`\" for Caml-Light.")
(defconst caml-font-lock-keywords
(list
diff --git a/emacs/caml-font.el b/emacs/caml-font.el
index 956225466d..09d1ae701c 100644
--- a/emacs/caml-font.el
+++ b/emacs/caml-font.el
@@ -1,3 +1,15 @@
+;(***********************************************************************)
+;(* *)
+;(* OCaml *)
+;(* *)
+;(* Jacques Garrigue and Ian T Zimmerman *)
+;(* *)
+;(* Copyright 1997 Institut National de Recherche en Informatique et *)
+;(* en Automatique. All rights reserved. This file is distributed *)
+;(* under the terms of the GNU General Public License. *)
+;(* *)
+;(***********************************************************************)
+
;; caml-font: font-lock support for OCaml files
;;
;; rewrite and clean-up.
diff --git a/emacs/caml-help.el b/emacs/caml-help.el
index 59d8a3b0c5..101963294f 100644
--- a/emacs/caml-help.el
+++ b/emacs/caml-help.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Didier Remy, projet Cristal, INRIA Rocquencourt *)
;(* *)
diff --git a/emacs/caml-hilit.el b/emacs/caml-hilit.el
index 697e58173d..0d437c5096 100644
--- a/emacs/caml-hilit.el
+++ b/emacs/caml-hilit.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
@@ -16,7 +16,7 @@
; defined also in caml.el
(defvar caml-quote-char "'"
- "*Quote for character constants. \"'\" for Objective Caml, \"`\" for Caml-Light.")
+ "*Quote for character constants. \"'\" for OCaml, \"`\" for Caml-Light.")
(defconst caml-mode-patterns
(list
diff --git a/emacs/caml-types.el b/emacs/caml-types.el
index 3c7433a813..70d38bccea 100644
--- a/emacs/caml-types.el
+++ b/emacs/caml-types.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
;(* *)
diff --git a/emacs/caml-xemacs.el b/emacs/caml-xemacs.el
index 45d670c7ab..79321e0057 100644
--- a/emacs/caml-xemacs.el
+++ b/emacs/caml-xemacs.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Didier Remy, projet Cristal, INRIA Rocquencourt *)
;(* *)
diff --git a/emacs/caml.el b/emacs/caml.el
index 2e37bff527..342305de97 100644
--- a/emacs/caml.el
+++ b/emacs/caml.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
@@ -19,12 +19,12 @@
;;indentation code is Copyright (C) 1996 by Ian T Zimmerman <itz@rahul.net>
;;copying: covered by the current FSF General Public License.
-;; indentation code adapted for Objective Caml by Jacques Garrigue,
+;; indentation code adapted for OCaml by Jacques Garrigue,
;; july 1997. <garrigue@kurims.kyoto-u.ac.jp>
;;user customizable variables
(defvar caml-quote-char "'"
- "*Quote for character constants. \"'\" for Objective Caml, \"`\" for Caml-Light.")
+ "*Quote for character constants. \"'\" for OCaml, \"`\" for Caml-Light.")
(defvar caml-imenu-enable nil
"*Enable Imenu support.")
diff --git a/emacs/camldebug.el b/emacs/camldebug.el
index 57a98701b5..199a6cc1ad 100644
--- a/emacs/camldebug.el
+++ b/emacs/camldebug.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
diff --git a/emacs/inf-caml.el b/emacs/inf-caml.el
index f3e4c48d1b..4b9cd6bb8d 100644
--- a/emacs/inf-caml.el
+++ b/emacs/inf-caml.el
@@ -1,6 +1,6 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Xavier Leroy and Jacques Garrigue *)
;(* *)
diff --git a/emacs/ocamltags.in b/emacs/ocamltags.in
index aa3f8df1d2..2a6aadbfb7 100644
--- a/emacs/ocamltags.in
+++ b/emacs/ocamltags.in
@@ -2,7 +2,7 @@
;(***********************************************************************)
;(* *)
-;(* Objective Caml *)
+;(* OCaml *)
;(* *)
;(* Jacques Garrigue and Ian T Zimmerman *)
;(* *)
diff --git a/experimental/doligez/checkheaders b/experimental/doligez/checkheaders
new file mode 100755
index 0000000000..671325a5e7
--- /dev/null
+++ b/experimental/doligez/checkheaders
@@ -0,0 +1,157 @@
+#!/bin/sh
+
+#######################################################################
+# #
+# OCaml #
+# #
+# Damien Doligez, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2011 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#######################################################################
+
+(
+case $# in
+ 0) find . -type f -print;;
+ *) echo $1;;
+esac
+) | \
+while read f; do
+awk -f - "$f" <<\EOF
+
+function checkline (x) {
+ return ( $0 ~ ("^.{0,4}" x) );
+}
+
+function hrule () {
+ return (checkline("[*#]{69}"));
+}
+
+function blank () {
+ return (checkline(" {69}"));
+}
+
+function ocaml () {
+ return (checkline(" {32}OCaml {32}") \
+ || checkline(" {35}OCaml {32}") \
+ || checkline(" MLTk, Tcl/Tk interface of OCaml ") \
+ || checkline(" OCaml LablTk library ") \
+ || checkline(" ocamlbuild ") \
+ || checkline(" OCamldoc ") \
+ );
+}
+
+function any () {
+ return (checkline(".{69}"));
+}
+
+function copy1 () {
+ return (checkline(" Copyright +[-0-9]+ +Institut +National +de +Recherche +en +Informatique +et "));
+}
+
+function copy2 () {
+ return (checkline(" en Automatique"));
+}
+
+function err () {
+ printf ("File \"%s\", line %d:\n", FILENAME, FNR);
+ printf (" Error: line %d of header is wrong.\n", FNR + offset);
+ print $0;
+}
+
+function add_ignore_re (x) {
+ ignore_re[++ignore_re_index] = x;
+}
+
+function add_exception (x) {
+ exception[++exception_index] = x;
+}
+
+FNR == 1 {
+ offset = 0;
+ add_ignore_re("/\\.svn/");
+ add_ignore_re("/\\.depend(\\.nt)?$");
+ add_ignore_re("/\\.ignore$");
+ add_ignore_re("\\.gif$");
+ add_ignore_re("/[A-Z]*$");
+ add_ignore_re("/README\\.[^/]*$");
+ add_ignore_re("/Changes$");
+ add_ignore_re("\\.mlpack$");
+ add_ignore_re("\\.mllib$");
+ add_ignore_re("\\.mltop$");
+ add_ignore_re("\\.clib$");
+ add_ignore_re("\\.odocl$");
+ add_ignore_re("\\.itarget$");
+ add_ignore_re("^\\./boot/");
+ add_ignore_re("^\\./camlp4/test/");
+ add_ignore_re("^\\./camlp4/unmaintained/");
+ add_ignore_re("^\\./config/gnu/");
+ add_ignore_re("^\\./experimental/");
+ add_ignore_re("^\\./ocamlbuild/examples/");
+ add_ignore_re("^\\./ocamlbuild/test/");
+ add_ignore_re("^\\./otherlibs/labltk/builtin/");
+ add_ignore_re("^\\./otherlibs/labltk/examples_");
+ add_ignore_re("^\\./testsuite/");
+ for (i in ignore_re){
+ if (FILENAME ~ ignore_re[i]) { nextfile; }
+ }
+ add_exception("./asmrun/m68k.S"); # obsolete
+ add_exception("./build/camlp4-bootstrap-recipe.txt");
+ add_exception("./build/new-build-system");
+ add_exception("./ocamlbuild/ChangeLog");
+ add_exception("./ocamlbuild/manual/myocamlbuild.ml"); # TeX input file ?
+ add_exception("./ocamlbuild/manual/trace.out"); # TeX input file
+ add_exception("./ocamldoc/Changes.txt");
+ add_exception("./ocamldoc/ocamldoc.sty"); # public domain
+ add_exception("./otherlibs/labltk/browser/help.txt");
+ add_exception("./tools/objinfo_helper.c"); # non-INRIA
+ add_exception("./tools/magic"); # public domain ?
+ add_exception("./Upgrading");
+ add_exception("./win32caml/inriares.h"); # generated
+ add_exception("./win32caml/ocaml.rc"); # generated
+ add_exception("./win32caml/resource.h"); # generated
+ for (i in exception){
+ if (FILENAME == exception[i]) { nextfile; }
+ }
+}
+
+# 1 [!hrule] #!
+# 2 [!hrule] empty
+# 3 hrule
+# 4 [blank]
+# 5 ocaml title
+# 6 blank
+# 7 any author
+# 8 [!blank] author
+# 9 [!blank] author
+#10 blank
+#11 copy1 copyright
+#12 copy2 copyright
+#13 any copyright
+#14 [!blank] copyright
+#15 [!blank] copyright
+#16 blank
+#17 hrule
+
+FNR + offset == 1 && hrule() { ++offset; }
+FNR + offset == 2 && hrule() { ++offset; }
+FNR + offset == 3 && ! hrule() { err(); nextfile; }
+FNR + offset == 4 && ! blank() { ++offset; }
+FNR + offset == 5 && ! ocaml() { err(); nextfile; }
+FNR + offset == 6 && ! blank() { err(); nextfile; }
+FNR + offset == 7 && ! any() { err(); nextfile; }
+FNR + offset == 8 && blank() { ++offset; }
+FNR + offset == 9 && blank() { ++offset; }
+FNR + offset ==10 && ! blank() { err(); nextfile; }
+FNR + offset ==11 && ! copy1() { err(); nextfile; }
+FNR + offset ==12 && ! copy2() { err(); nextfile; }
+FNR + offset ==13 && ! any() { err(); nextfile; }
+FNR + offset ==14 && blank() { ++offset; }
+FNR + offset ==15 && blank() { ++offset; }
+FNR + offset ==16 && ! blank() { err(); nextfile; }
+FNR + offset ==17 && ! hrule() { err(); nextfile; }
+
+EOF
+done
diff --git a/lex/Makefile b/lex/Makefile
index f190ed8925..d73939a3c1 100644
--- a/lex/Makefile
+++ b/lex/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/lex/Makefile.nt b/lex/Makefile.nt
index cb1ef94a5d..8443c57598 100644
--- a/lex/Makefile.nt
+++ b/lex/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/lex/common.ml b/lex/common.ml
index cacea62d05..5638185d0b 100644
--- a/lex/common.ml
+++ b/lex/common.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Luc Maranget, projet Moscova, *)
(* INRIA Rocquencourt *)
diff --git a/lex/common.mli b/lex/common.mli
index e5742b45b2..f85baa01f8 100644
--- a/lex/common.mli
+++ b/lex/common.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/lex/compact.ml b/lex/compact.ml
index abbf5a5036..72cfd9e7c8 100644
--- a/lex/compact.ml
+++ b/lex/compact.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/compact.mli b/lex/compact.mli
index 18363c3d4d..6e48df0065 100644
--- a/lex/compact.mli
+++ b/lex/compact.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/cset.ml b/lex/cset.ml
index c4594540ec..ce77044b69 100644
--- a/lex/cset.ml
+++ b/lex/cset.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Luc Maranget, Jerome Vouillon projet Cristal, *)
(* INRIA Rocquencourt *)
diff --git a/lex/cset.mli b/lex/cset.mli
index 53b5899591..b30c3b6718 100644
--- a/lex/cset.mli
+++ b/lex/cset.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Luc Maranget, Jerome Vouillon projet Cristal, *)
(* INRIA Rocquencourt *)
diff --git a/lex/lexer.mli b/lex/lexer.mli
index be34674eb3..5097d30943 100644
--- a/lex/lexer.mli
+++ b/lex/lexer.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/lexer.mll b/lex/lexer.mll
index b72804287e..b99dddf9e0 100644
--- a/lex/lexer.mll
+++ b/lex/lexer.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/lexgen.ml b/lex/lexgen.ml
index 775e78b056..37720be612 100644
--- a/lex/lexgen.ml
+++ b/lex/lexgen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, *)
(* Luc Maranget, projet Moscova, *)
diff --git a/lex/lexgen.mli b/lex/lexgen.mli
index 5136f8f283..155b9e45a0 100644
--- a/lex/lexgen.mli
+++ b/lex/lexgen.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/main.ml b/lex/main.ml
index 4f05ca21e5..28f1e55e62 100644
--- a/lex/main.ml
+++ b/lex/main.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/output.ml b/lex/output.ml
index 5ca403b52d..377c00a2dd 100644
--- a/lex/output.ml
+++ b/lex/output.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/output.mli b/lex/output.mli
index 85f89b30ce..5eae103143 100644
--- a/lex/output.mli
+++ b/lex/output.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/outputbis.ml b/lex/outputbis.ml
index 6d5e77c30d..7eac354444 100644
--- a/lex/outputbis.ml
+++ b/lex/outputbis.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/outputbis.mli b/lex/outputbis.mli
index 76f00672bf..df6bf9600a 100644
--- a/lex/outputbis.mli
+++ b/lex/outputbis.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Luc Maranget projet Moscova INRIA Rocquencourt *)
(* *)
diff --git a/lex/parser.mly b/lex/parser.mly
index 9bc0906afd..c36d8e0202 100644
--- a/lex/parser.mly
+++ b/lex/parser.mly
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/lex/syntax.ml b/lex/syntax.ml
index d1daa02dbd..746a99a241 100644
--- a/lex/syntax.ml
+++ b/lex/syntax.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/syntax.mli b/lex/syntax.mli
index 4864b50ee9..d61fdb228e 100644
--- a/lex/syntax.mli
+++ b/lex/syntax.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/lex/table.ml b/lex/table.ml
index 402f52be8b..fb5a6128eb 100644
--- a/lex/table.ml
+++ b/lex/table.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Luc Maranget, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/lex/table.mli b/lex/table.mli
index b88d7d3454..8d9938cbff 100644
--- a/lex/table.mli
+++ b/lex/table.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Luc Maranget, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/man/Makefile b/man/Makefile
index 4753c202ea..e6c1e193bc 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/man/ocaml.m b/man/ocaml.m
index 80d641c12b..d7679af3a7 100644
--- a/man/ocaml.m
+++ b/man/ocaml.m
@@ -1,5 +1,17 @@
-\" $Id$
-
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1996 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAML 1
.SH NAME
diff --git a/man/ocamlc.m b/man/ocamlc.m
index 54c4296dd0..a1587d94ac 100644
--- a/man/ocamlc.m
+++ b/man/ocamlc.m
@@ -1,5 +1,17 @@
-\" $Id$
-
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1996 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLC 1
.SH NAME
diff --git a/man/ocamlcp.m b/man/ocamlcp.m
index c29cb00304..0c9979f108 100644
--- a/man/ocamlcp.m
+++ b/man/ocamlcp.m
@@ -1,5 +1,17 @@
-\" $Id$
-
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1996 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLCP 1
.SH NAME
diff --git a/man/ocamldebug.m b/man/ocamldebug.m
index 141076c5fe..0eceeba3b8 100644
--- a/man/ocamldebug.m
+++ b/man/ocamldebug.m
@@ -1,5 +1,17 @@
-\" $Id$
-
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 2001 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLDEBUG 1
.SH NAME
diff --git a/man/ocamldep.m b/man/ocamldep.m
index 97d4b37766..be1e7348ef 100644
--- a/man/ocamldep.m
+++ b/man/ocamldep.m
@@ -1,5 +1,17 @@
-\" $Id$
-
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1996 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLDEP 1
.SH NAME
diff --git a/man/ocamldoc.m b/man/ocamldoc.m
index 17be62d86c..32d6aae1c1 100644
--- a/man/ocamldoc.m
+++ b/man/ocamldoc.m
@@ -1,5 +1,17 @@
-\" $Id$
-
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Maxence Guesdon, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 2004 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLDOC 1
\" .de Sh \" Subsection heading
diff --git a/man/ocamllex.m b/man/ocamllex.m
index f07cc6cd65..314af516cb 100644
--- a/man/ocamllex.m
+++ b/man/ocamllex.m
@@ -1,4 +1,17 @@
-\" $Id$
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1996 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLLEX 1
.SH NAME
diff --git a/man/ocamlmktop.m b/man/ocamlmktop.m
index 647a29d80f..f9c014c543 100644
--- a/man/ocamlmktop.m
+++ b/man/ocamlmktop.m
@@ -1,4 +1,17 @@
-\" $Id$
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1999 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLMKTOP 1
.SH NAME
diff --git a/man/ocamlopt.m b/man/ocamlopt.m
index 80811fb894..a366d5a848 100644
--- a/man/ocamlopt.m
+++ b/man/ocamlopt.m
@@ -1,5 +1,17 @@
-\" $Id$
-
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1996 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLOPT 1
.SH NAME
diff --git a/man/ocamlprof.m b/man/ocamlprof.m
index f9775ae7bd..3f20398f0e 100644
--- a/man/ocamlprof.m
+++ b/man/ocamlprof.m
@@ -1,4 +1,17 @@
-\" $Id$
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1996 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLPROF 1
.SH NAME
diff --git a/man/ocamlrun.m b/man/ocamlrun.m
index aaa93a2777..7aef64eebe 100644
--- a/man/ocamlrun.m
+++ b/man/ocamlrun.m
@@ -1,5 +1,17 @@
-\" $Id$
-
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1996 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLRUN 1
.SH NAME
@@ -60,6 +72,7 @@ flag in the OCAMLRUNPARAM environment variable (see below).
Search the directory
.I dir
for dynamically-loaded libraries, in addition to the standard search path.
+.TP
.B \-p
Print the names of the primitives known to this version of
.BR ocamlrun (1)
diff --git a/man/ocamlyacc.m b/man/ocamlyacc.m
index 43436f2f6e..ce53cc4afa 100644
--- a/man/ocamlyacc.m
+++ b/man/ocamlyacc.m
@@ -1,4 +1,17 @@
-\" $Id$
+.\"***********************************************************************
+.\"* *
+.\"* OCaml *
+.\"* *
+.\"* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
+.\"* *
+.\"* Copyright 1996 Institut National de Recherche en Informatique et *
+.\"* en Automatique. All rights reserved. This file is distributed *
+.\"* under the terms of the Q Public License version 1.0. *
+.\"* *
+.\"***********************************************************************
+.\"
+.\" $Id$
+.\"
.TH OCAMLYACC 1
.SH NAME
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 663847b492..af07c8df35 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Nicolas Pouillard, projet Gallium, INRIA Rocquencourt *)
(* *)
diff --git a/myocamlbuild_config.mli b/myocamlbuild_config.mli
index 28b2261776..c50049956f 100644
--- a/myocamlbuild_config.mli
+++ b/myocamlbuild_config.mli
@@ -1,3 +1,15 @@
+(*************************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* Nicolas Pouillard, projet Gallium, INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
+(* *)
+(*************************************************************************)
+
val prefix : string
val bindir : string
val libdir : string
diff --git a/ocamlbuild/Makefile b/ocamlbuild/Makefile
index 0f19033697..e4ee877eb4 100644
--- a/ocamlbuild/Makefile
+++ b/ocamlbuild/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/ocamlbuild/_tags b/ocamlbuild/_tags
index 617d6a72f3..cd271d16f5 100644
--- a/ocamlbuild/_tags
+++ b/ocamlbuild/_tags
@@ -1,3 +1,15 @@
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# OCamlbuild tags file
true: debug
<*.ml> or <*.mli>: warn_L, warn_R, warn_Z, annot
diff --git a/ocamlbuild/exit_codes.ml b/ocamlbuild/exit_codes.ml
index 19cb4f02fc..71c9f06f26 100644
--- a/ocamlbuild/exit_codes.ml
+++ b/ocamlbuild/exit_codes.ml
@@ -1,3 +1,14 @@
+(***********************************************************************)
+(* ocamlbuild *)
+(* *)
+(* Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
+(* *)
+(***********************************************************************)
+
let rc_ok = 0
let rc_usage = 1
let rc_failure = 2
diff --git a/ocamlbuild/exit_codes.mli b/ocamlbuild/exit_codes.mli
index acbc0ede3c..a83a300b60 100644
--- a/ocamlbuild/exit_codes.mli
+++ b/ocamlbuild/exit_codes.mli
@@ -1,3 +1,14 @@
+(***********************************************************************)
+(* ocamlbuild *)
+(* *)
+(* Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
+(* *)
+(***********************************************************************)
+
val rc_ok : int
val rc_usage : int
val rc_failure : int
diff --git a/ocamlbuild/man/ocamlbuild.1 b/ocamlbuild/man/ocamlbuild.1
index 58a33740b7..dab9e941d9 100644
--- a/ocamlbuild/man/ocamlbuild.1
+++ b/ocamlbuild/man/ocamlbuild.1
@@ -1,7 +1,18 @@
+.\"***********************************************************************)
+.\"* ocamlbuild *)
+.\"* *)
+.\"* Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt *)
+.\"* *)
+.\"* Copyright 2007 Institut National de Recherche en Informatique et *)
+.\"* en Automatique. All rights reserved. This file is distributed *)
+.\"* under the terms of the Q Public License version 1.0. *)
+.\"* *)
+.\"***********************************************************************)
+.\"
.TH OCAMLBUILD 1
.SH NAME
-ocamlbuild \- The Objective Caml project compilation tool
+ocamlbuild \- The OCaml project compilation tool
.SH SYNOPSIS
@@ -250,4 +261,4 @@ manual,
.BR ocaml (1),
.BR make (1).
.br
-.I The Objective Caml user's manual, chapter "Batch compilation".
+.I The OCaml user's manual, chapter "Batch compilation".
diff --git a/ocamlbuild/manual/Makefile b/ocamlbuild/manual/Makefile
index 055d42e71f..595f730eed 100644
--- a/ocamlbuild/manual/Makefile
+++ b/ocamlbuild/manual/Makefile
@@ -1,3 +1,14 @@
+#######################################################################
+# ocamlbuild #
+# #
+# Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#######################################################################
+
# Makefile
all: manual.pdf manual.html
diff --git a/ocamlbuild/manual/manual.tex b/ocamlbuild/manual/manual.tex
index 62d900450f..01d671eb74 100644
--- a/ocamlbuild/manual/manual.tex
+++ b/ocamlbuild/manual/manual.tex
@@ -1,4 +1,15 @@
% -*- LaTeX -*-
+%(***********************************************************************)
+%(* ocamlbuild *)
+%(* *)
+%(* Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt *)
+%(* *)
+%(* Copyright 2007 Institut National de Recherche en Informatique et *)
+%(* en Automatique. All rights reserved. This file is distributed *)
+%(* under the terms of the Q Public License version 1.0. *)
+%(* *)
+%(***********************************************************************)
+
%(*** preamble
\documentclass[9pt]{article}
\usepackage[utf8]{inputenc}
diff --git a/ocamlbuild/ocamlbuild-presentation.rslide b/ocamlbuild/ocamlbuild-presentation.rslide
index 30ba657b35..8f17da0bc7 100644
--- a/ocamlbuild/ocamlbuild-presentation.rslide
+++ b/ocamlbuild/ocamlbuild-presentation.rslide
@@ -1,3 +1,15 @@
+#########################################################################
+# #
+# OCaml #
+# #
+# Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
# Works with rslide revision 8
# http://gallium.inria.fr/~pouillar/rslide/rslide
documentclass :beamer, :t, :compress, :red
diff --git a/ocamlbuild/ocamlbuild_plugin.mli b/ocamlbuild/ocamlbuild_plugin.mli
index 8e642f31a2..0844b4d7ca 100644
--- a/ocamlbuild/ocamlbuild_plugin.mli
+++ b/ocamlbuild/ocamlbuild_plugin.mli
@@ -1,3 +1,14 @@
+(***********************************************************************)
+(* ocamlbuild *)
+(* *)
+(* Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
+(* *)
+(***********************************************************************)
+
include Ocamlbuild_pack.Signatures.PLUGIN
with module Pathname = Ocamlbuild_pack.Pathname
and module Outcome = Ocamlbuild_pack.My_std.Outcome
diff --git a/ocamlbuild/ocamlbuild_where.ml b/ocamlbuild/ocamlbuild_where.ml
index 14fcde5d72..d65b41edca 100644
--- a/ocamlbuild/ocamlbuild_where.ml
+++ b/ocamlbuild/ocamlbuild_where.ml
@@ -1,3 +1,14 @@
+(***********************************************************************)
+(* ocamlbuild *)
+(* *)
+(* Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt *)
+(* *)
+(* Copyright 2007 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
+(* *)
+(***********************************************************************)
+
let bindir = ref Ocamlbuild_Myocamlbuild_config.bindir;;
let libdir = ref begin
Filename.concat
diff --git a/ocamlbuild/start.sh b/ocamlbuild/start.sh
index 20b7b76561..7386cbd3eb 100755
--- a/ocamlbuild/start.sh
+++ b/ocamlbuild/start.sh
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Nicolas Pouillard, projet Gallium, INRIA Rocquencourt #
# #
diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
index 64b85a8a34..0c4f61ecfc 100644
--- a/ocamldoc/Makefile
+++ b/ocamldoc/Makefile
@@ -1,5 +1,5 @@
#(***********************************************************************)
-#(* OCamldoc *)
+#(* OCamldoc *)
#(* *)
#(* Maxence Guesdon, projet Cristal, INRIA Rocquencourt *)
#(* *)
@@ -355,6 +355,7 @@ clean:: dummy
@rm -f odoc_lexer.ml odoc_text_lexer.ml odoc_see_lexer.ml odoc_ocamlhtml.ml
@rm -f odoc_parser.ml odoc_parser.mli odoc_text_parser.ml odoc_text_parser.mli
@rm -rf stdlib_man
+ @rm -f generators/*.cm[aiox] generators/*.[ao] generators/*.cmx[as]
depend::
$(OCAMLYACC) odoc_text_parser.mly
diff --git a/ocamldoc/Makefile.nt b/ocamldoc/Makefile.nt
index 387aec928c..bdc230d2fa 100644
--- a/ocamldoc/Makefile.nt
+++ b/ocamldoc/Makefile.nt
@@ -1,5 +1,5 @@
#(***********************************************************************)
-#(* OCamldoc *)
+#(* OCamldoc *)
#(* *)
#(* Maxence Guesdon, projet Cristal, INRIA Rocquencourt *)
#(* *)
diff --git a/ocamldoc/odoc_dep.ml b/ocamldoc/odoc_dep.ml
index 86a0f247c9..8878e723e0 100644
--- a/ocamldoc/odoc_dep.ml
+++ b/ocamldoc/odoc_dep.ml
@@ -1,5 +1,5 @@
(***********************************************************************)
-(* OCamldoc *)
+(* OCamldoc *)
(* *)
(* Maxence Guesdon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/ocamldoc/odoc_dot.ml b/ocamldoc/odoc_dot.ml
index 8d4fa2f3c9..a0d5ee2224 100644
--- a/ocamldoc/odoc_dot.ml
+++ b/ocamldoc/odoc_dot.ml
@@ -1,5 +1,5 @@
(***********************************************************************)
-(* Ocamldoc *)
+(* OCamldoc *)
(* *)
(* Maxence Guesdon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/ocamldoc/odoc_gen.ml b/ocamldoc/odoc_gen.ml
index 260aed4df4..b77b186d4c 100644
--- a/ocamldoc/odoc_gen.ml
+++ b/ocamldoc/odoc_gen.ml
@@ -1,3 +1,14 @@
+(***********************************************************************)
+(* OCamldoc *)
+(* *)
+(* Maxence Guesdon, projet Gallium, INRIA Rocquencourt *)
+(* *)
+(* Copyright 2010 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
+(* *)
+(***********************************************************************)
+
(** *)
class type doc_generator =
@@ -35,4 +46,4 @@ let get_minimal_generator = function
| Other m ->
let module M = (val m : Base) in
new M.generator
- ;; \ No newline at end of file
+ ;;
diff --git a/ocamldoc/odoc_gen.mli b/ocamldoc/odoc_gen.mli
index 1200a7c420..4649c9504b 100644
--- a/ocamldoc/odoc_gen.mli
+++ b/ocamldoc/odoc_gen.mli
@@ -1,3 +1,14 @@
+(***********************************************************************)
+(* OCamldoc *)
+(* *)
+(* Maxence Guesdon, projet Gallium, INRIA Rocquencourt *)
+(* *)
+(* Copyright 2010 Institut National de Recherche en Informatique et *)
+(* en Automatique. All rights reserved. This file is distributed *)
+(* under the terms of the Q Public License version 1.0. *)
+(* *)
+(***********************************************************************)
+
(** The types of generators. *)
(** The minimal class type of documentation generators. *)
@@ -19,4 +30,4 @@ type generator =
| Other of (module Base)
;;
-val get_minimal_generator : generator -> doc_generator \ No newline at end of file
+val get_minimal_generator : generator -> doc_generator
diff --git a/ocamldoc/odoc_global.ml b/ocamldoc/odoc_global.ml
index 0b2ab6a2bb..b2d7bf872f 100644
--- a/ocamldoc/odoc_global.ml
+++ b/ocamldoc/odoc_global.ml
@@ -1,5 +1,5 @@
(***********************************************************************)
-(* OCamldoc *)
+(* OCamldoc *)
(* *)
(* Maxence Guesdon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/ocamldoc/odoc_global.mli b/ocamldoc/odoc_global.mli
index 454bb8535b..d3d17ebe38 100644
--- a/ocamldoc/odoc_global.mli
+++ b/ocamldoc/odoc_global.mli
@@ -1,5 +1,5 @@
(***********************************************************************)
-(* Ocamldoc *)
+(* OCamldoc *)
(* *)
(* Maxence Guesdon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/ocamldoc/odoc_texi.ml b/ocamldoc/odoc_texi.ml
index c3ed148ff6..55cb972fae 100644
--- a/ocamldoc/odoc_texi.ml
+++ b/ocamldoc/odoc_texi.ml
@@ -1,11 +1,12 @@
(***********************************************************************)
-(* OCamldoc *)
+(* OCamldoc *)
(* *)
(* Olivier Andrieu, base sur du code de Maxence Guesdon *)
(* *)
(* Copyright 2001 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
(* under the terms of the Q Public License version 1.0. *)
+(* *)
(***********************************************************************)
(* $Id$ *)
diff --git a/ocamldoc/remove_DEBUG b/ocamldoc/remove_DEBUG
index 78b11e6128..b8550e252e 100755
--- a/ocamldoc/remove_DEBUG
+++ b/ocamldoc/remove_DEBUG
@@ -1,7 +1,7 @@
#!/bin/sh
#(***********************************************************************)
-#(* OCamldoc *)
+#(* OCamldoc *)
#(* *)
#(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
#(* *)
diff --git a/ocamldoc/runocamldoc b/ocamldoc/runocamldoc
index a71d705ccd..3aba71923a 100644
--- a/ocamldoc/runocamldoc
+++ b/ocamldoc/runocamldoc
@@ -1,4 +1,17 @@
#!/bin/sh
+
+#######################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#######################################################################
+
# $Id$
case "$1" in
diff --git a/otherlibs/Makefile b/otherlibs/Makefile
index c5db1981c1..fba032df85 100644
--- a/otherlibs/Makefile
+++ b/otherlibs/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/Makefile.nt b/otherlibs/Makefile.nt
index 32aca21c06..ceab7f0c59 100644
--- a/otherlibs/Makefile.nt
+++ b/otherlibs/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/Makefile.shared b/otherlibs/Makefile.shared
index 7e6780b3ea..08e9abb1d5 100644
--- a/otherlibs/Makefile.shared
+++ b/otherlibs/Makefile.shared
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/bigarray/Makefile b/otherlibs/bigarray/Makefile
index 38914ff35a..83b3152586 100644
--- a/otherlibs/bigarray/Makefile
+++ b/otherlibs/bigarray/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/bigarray/Makefile.nt b/otherlibs/bigarray/Makefile.nt
index 78f3fc6b67..e845ad62e0 100644
--- a/otherlibs/bigarray/Makefile.nt
+++ b/otherlibs/bigarray/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/bigarray/bigarray.h b/otherlibs/bigarray/bigarray.h
index 407a537767..6953065446 100644
--- a/otherlibs/bigarray/bigarray.h
+++ b/otherlibs/bigarray/bigarray.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Manuel Serrano and Xavier Leroy, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/bigarray/bigarray.ml b/otherlibs/bigarray/bigarray.ml
index 09ae8bd13a..1d3dbcf971 100644
--- a/otherlibs/bigarray/bigarray.ml
+++ b/otherlibs/bigarray/bigarray.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Manuel Serrano et Xavier Leroy, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/bigarray/bigarray.mli b/otherlibs/bigarray/bigarray.mli
index a49923ae21..a66e1eebbd 100644
--- a/otherlibs/bigarray/bigarray.mli
+++ b/otherlibs/bigarray/bigarray.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Manuel Serrano and Xavier Leroy, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/bigarray/bigarray_stubs.c b/otherlibs/bigarray/bigarray_stubs.c
index e7bee339b4..7c751b7cf9 100644
--- a/otherlibs/bigarray/bigarray_stubs.c
+++ b/otherlibs/bigarray/bigarray_stubs.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Manuel Serrano and Xavier Leroy, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/bigarray/mmap_unix.c b/otherlibs/bigarray/mmap_unix.c
index 6af0393020..4d77c2e541 100644
--- a/otherlibs/bigarray/mmap_unix.c
+++ b/otherlibs/bigarray/mmap_unix.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Manuel Serrano and Xavier Leroy, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/bigarray/mmap_win32.c b/otherlibs/bigarray/mmap_win32.c
index 9be9e18e01..067e3284af 100644
--- a/otherlibs/bigarray/mmap_win32.c
+++ b/otherlibs/bigarray/mmap_win32.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Manuel Serrano and Xavier Leroy, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/dbm/Makefile b/otherlibs/dbm/Makefile
index 099327d691..dcd068adee 100644
--- a/otherlibs/dbm/Makefile
+++ b/otherlibs/dbm/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/dbm/cldbm.c b/otherlibs/dbm/cldbm.c
index 0d6cb362d6..6c9954a349 100644
--- a/otherlibs/dbm/cldbm.c
+++ b/otherlibs/dbm/cldbm.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Francois Rouaix, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/dbm/dbm.ml b/otherlibs/dbm/dbm.ml
index f31d29934d..26fbb80a5e 100644
--- a/otherlibs/dbm/dbm.ml
+++ b/otherlibs/dbm/dbm.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Francois Rouaix, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/dbm/dbm.mli b/otherlibs/dbm/dbm.mli
index f9924427a7..9a0c492122 100644
--- a/otherlibs/dbm/dbm.mli
+++ b/otherlibs/dbm/dbm.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Francois Rouaix, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile
index 3da485f475..c44451c0e3 100644
--- a/otherlibs/dynlink/Makefile
+++ b/otherlibs/dynlink/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/dynlink/Makefile.nt b/otherlibs/dynlink/Makefile.nt
index 3d8b84b77a..31ee136d61 100644
--- a/otherlibs/dynlink/Makefile.nt
+++ b/otherlibs/dynlink/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/dynlink/dynlink.ml b/otherlibs/dynlink/dynlink.ml
index 0d324a8540..603535d65a 100644
--- a/otherlibs/dynlink/dynlink.ml
+++ b/otherlibs/dynlink/dynlink.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/dynlink/dynlink.mli b/otherlibs/dynlink/dynlink.mli
index 7cca68c5a0..849f1e148e 100644
--- a/otherlibs/dynlink/dynlink.mli
+++ b/otherlibs/dynlink/dynlink.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
@@ -98,7 +98,7 @@ val add_available_units : (string * Digest.t) list -> unit
for each unit. This way, the [.cmi] interface files need not be
available at run-time. The digests can be extracted from [.cmi]
files using the [extract_crc] program installed in the
- Objective Caml standard library directory. *)
+ OCaml standard library directory. *)
val clear_available_units : unit -> unit
(** Empty the list of compilation units accessible to dynamically-linked
diff --git a/otherlibs/dynlink/extract_crc.ml b/otherlibs/dynlink/extract_crc.ml
index e7d9139bed..672ca6ea97 100644
--- a/otherlibs/dynlink/extract_crc.ml
+++ b/otherlibs/dynlink/extract_crc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/dynlink/natdynlink.ml b/otherlibs/dynlink/natdynlink.ml
index 6ab9b9850a..d980a7b901 100644
--- a/otherlibs/dynlink/natdynlink.ml
+++ b/otherlibs/dynlink/natdynlink.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Gallium, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/graph/Makefile b/otherlibs/graph/Makefile
index 2be9844656..19c4612ed7 100644
--- a/otherlibs/graph/Makefile
+++ b/otherlibs/graph/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/graph/color.c b/otherlibs/graph/color.c
index 0dc2967071..bdd8b5e283 100644
--- a/otherlibs/graph/color.c
+++ b/otherlibs/graph/color.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/draw.c b/otherlibs/graph/draw.c
index 35a4ae1755..0419c62703 100644
--- a/otherlibs/graph/draw.c
+++ b/otherlibs/graph/draw.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/dump_img.c b/otherlibs/graph/dump_img.c
index 8c82c21bfb..66185d8750 100644
--- a/otherlibs/graph/dump_img.c
+++ b/otherlibs/graph/dump_img.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/events.c b/otherlibs/graph/events.c
index d9563a3970..508931055c 100644
--- a/otherlibs/graph/events.c
+++ b/otherlibs/graph/events.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/fill.c b/otherlibs/graph/fill.c
index 0430c14a63..bb1a60e78b 100644
--- a/otherlibs/graph/fill.c
+++ b/otherlibs/graph/fill.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/graphics.ml b/otherlibs/graph/graphics.ml
index 96a2471612..a9dd511401 100644
--- a/otherlibs/graph/graphics.ml
+++ b/otherlibs/graph/graphics.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/graph/graphics.mli b/otherlibs/graph/graphics.mli
index 23d61a39aa..10074cb7af 100644
--- a/otherlibs/graph/graphics.mli
+++ b/otherlibs/graph/graphics.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/graph/graphicsX11.ml b/otherlibs/graph/graphicsX11.ml
index 85f5a43605..4b70d29bd3 100644
--- a/otherlibs/graph/graphicsX11.ml
+++ b/otherlibs/graph/graphicsX11.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis and Jun Furuse, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/graph/graphicsX11.mli b/otherlibs/graph/graphicsX11.mli
index 1118253711..f35f5a6647 100644
--- a/otherlibs/graph/graphicsX11.mli
+++ b/otherlibs/graph/graphicsX11.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis and Jun Furuse, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/graph/image.c b/otherlibs/graph/image.c
index a337de348b..c610d96b6f 100644
--- a/otherlibs/graph/image.c
+++ b/otherlibs/graph/image.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/image.h b/otherlibs/graph/image.h
index 539cf9f8ca..76d319e0ab 100644
--- a/otherlibs/graph/image.h
+++ b/otherlibs/graph/image.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/libgraph.h b/otherlibs/graph/libgraph.h
index d2df1c1ae0..db3fd71d82 100644
--- a/otherlibs/graph/libgraph.h
+++ b/otherlibs/graph/libgraph.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/make_img.c b/otherlibs/graph/make_img.c
index 325e6698dd..08628804f5 100644
--- a/otherlibs/graph/make_img.c
+++ b/otherlibs/graph/make_img.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/open.c b/otherlibs/graph/open.c
index 82a4c0fb3b..1f7da5ba4f 100644
--- a/otherlibs/graph/open.c
+++ b/otherlibs/graph/open.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/point_col.c b/otherlibs/graph/point_col.c
index 473dae7d08..2149aa8eb1 100644
--- a/otherlibs/graph/point_col.c
+++ b/otherlibs/graph/point_col.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/sound.c b/otherlibs/graph/sound.c
index dc75b7ed03..cba7a909ba 100644
--- a/otherlibs/graph/sound.c
+++ b/otherlibs/graph/sound.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/subwindow.c b/otherlibs/graph/subwindow.c
index 642e28c401..08882569e1 100644
--- a/otherlibs/graph/subwindow.c
+++ b/otherlibs/graph/subwindow.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Jun Furuse, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/graph/text.c b/otherlibs/graph/text.c
index f4d980aed5..6743e8640f 100644
--- a/otherlibs/graph/text.c
+++ b/otherlibs/graph/text.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/labltk/Makefile b/otherlibs/labltk/Makefile
index 8c3b823c5e..8b7209b10f 100644
--- a/otherlibs/labltk/Makefile
+++ b/otherlibs/labltk/Makefile
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
# Top Makefile for mlTk
SUBDIRS=compiler support lib jpf frx examples_labltk \
diff --git a/otherlibs/labltk/Makefile.nt b/otherlibs/labltk/Makefile.nt
index f1fd56ed95..651540f342 100644
--- a/otherlibs/labltk/Makefile.nt
+++ b/otherlibs/labltk/Makefile.nt
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 2000 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
# Top Makefile for LablTk
include ../../config/Makefile
diff --git a/otherlibs/labltk/README b/otherlibs/labltk/README
index b556d2b3e8..5d3e9d314d 100644
--- a/otherlibs/labltk/README
+++ b/otherlibs/labltk/README
@@ -1,6 +1,6 @@
INTRODUCTION
============
-mlTk is a library for interfacing Objective Caml with the scripting
+mlTk is a library for interfacing OCaml with the scripting
language Tcl/Tk (all versions since 8.0.3, but no betas).
In addition to the basic interface with Tcl/Tk, this package contains
@@ -31,7 +31,7 @@ just with little fixes.
REQUIREMENTS
============
You must have already installed
- * Objective Caml source, version 3.04+8 or later
+ * OCaml source, version 3.04+8 or later
* Tcl/Tk 8.0.3 or later
http://www.scriptics.com/ or various mirrors
diff --git a/otherlibs/labltk/Widgets.src b/otherlibs/labltk/Widgets.src
index abf015a275..e662682788 100644
--- a/otherlibs/labltk/Widgets.src
+++ b/otherlibs/labltk/Widgets.src
@@ -1,3 +1,19 @@
+%(***********************************************************************)
+%(* *)
+%(* MLTk, Tcl/Tk interface of OCaml *)
+%(* *)
+%(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
+%(* projet Cristal, INRIA Rocquencourt *)
+%(* Jacques Garrigue, Kyoto University RIMS *)
+%(* *)
+%(* Copyright 2002 Institut National de Recherche en Informatique et *)
+%(* en Automatique and Kyoto University. All rights reserved. *)
+%(* This file is distributed under the terms of the GNU Library *)
+%(* General Public License, with the special exception on linking *)
+%(* described in file LICENSE found in the OCaml source tree. *)
+%(* *)
+%(***********************************************************************)
+
%%%%%%%%%%%%%% Standard Tk8.0.3 Widgets and functions %%%%%%%%%%%%%%
type Widget external
diff --git a/otherlibs/labltk/browser/Makefile b/otherlibs/labltk/browser/Makefile
index 5caed2bf60..a21973e7c5 100644
--- a/otherlibs/labltk/browser/Makefile
+++ b/otherlibs/labltk/browser/Makefile
@@ -1,3 +1,17 @@
+#########################################################################
+# #
+# OCaml LablTk library #
+# #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file ../../../LICENSE. #
+# #
+#########################################################################
+
# $Id$
OTHERSLIB=-I $(OTHERS)/unix -I $(OTHERS)/str
diff --git a/otherlibs/labltk/browser/Makefile.nt b/otherlibs/labltk/browser/Makefile.nt
index 405f47e746..289b0924c3 100644
--- a/otherlibs/labltk/browser/Makefile.nt
+++ b/otherlibs/labltk/browser/Makefile.nt
@@ -1,3 +1,17 @@
+#########################################################################
+# #
+# OCaml LablTk library #
+# #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 2000 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file ../../../LICENSE. #
+# #
+#########################################################################
+
# $Id$
OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/str -I $(OTHERS)/systhreads
diff --git a/otherlibs/labltk/browser/Makefile.shared b/otherlibs/labltk/browser/Makefile.shared
index b80967086f..b6be2fc334 100644
--- a/otherlibs/labltk/browser/Makefile.shared
+++ b/otherlibs/labltk/browser/Makefile.shared
@@ -1,5 +1,19 @@
include ../support/Makefile.common
+#########################################################################
+# #
+# OCaml LablTk library #
+# #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file ../../../LICENSE. #
+# #
+#########################################################################
+
LABLTKLIB=-I ../labltk -I ../lib -I ../support
OCAMLTOPLIB=-I $(TOPDIR)/parsing -I $(TOPDIR)/utils -I $(TOPDIR)/typing
INCLUDES=$(OTHERSLIB) $(LABLTKLIB) $(OCAMLTOPLIB)
@@ -52,7 +66,7 @@ install:
cp ocamlbrowser$(EXE) $(BINDIR); fi
clean:
- rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig *.$(O)
+ rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig *.$(O) help.ml
depend:
$(CAMLDEP) *.ml *.mli > .depend
diff --git a/otherlibs/labltk/browser/dummyUnix.mli b/otherlibs/labltk/browser/dummyUnix.mli
index 2272419236..1373681188 100644
--- a/otherlibs/labltk/browser/dummyUnix.mli
+++ b/otherlibs/labltk/browser/dummyUnix.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/dummyWin.mli b/otherlibs/labltk/browser/dummyWin.mli
index a4b75ee37b..3f8c26e63c 100644
--- a/otherlibs/labltk/browser/dummyWin.mli
+++ b/otherlibs/labltk/browser/dummyWin.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/editor.ml b/otherlibs/labltk/browser/editor.ml
index 617cdfa855..a9f7e6eace 100644
--- a/otherlibs/labltk/browser/editor.ml
+++ b/otherlibs/labltk/browser/editor.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/editor.mli b/otherlibs/labltk/browser/editor.mli
index 665ee813f3..2d5e90492a 100644
--- a/otherlibs/labltk/browser/editor.mli
+++ b/otherlibs/labltk/browser/editor.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/fileselect.ml b/otherlibs/labltk/browser/fileselect.ml
index 22052b4237..d62b8ba3cd 100644
--- a/otherlibs/labltk/browser/fileselect.ml
+++ b/otherlibs/labltk/browser/fileselect.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/fileselect.mli b/otherlibs/labltk/browser/fileselect.mli
index b723c626d5..ed10eaf68f 100644
--- a/otherlibs/labltk/browser/fileselect.mli
+++ b/otherlibs/labltk/browser/fileselect.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_bind.ml b/otherlibs/labltk/browser/jg_bind.ml
index 2e3ec9870b..3fb854b096 100644
--- a/otherlibs/labltk/browser/jg_bind.ml
+++ b/otherlibs/labltk/browser/jg_bind.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_bind.mli b/otherlibs/labltk/browser/jg_bind.mli
index e09c2ba460..70e323bee8 100644
--- a/otherlibs/labltk/browser/jg_bind.mli
+++ b/otherlibs/labltk/browser/jg_bind.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_box.ml b/otherlibs/labltk/browser/jg_box.ml
index 3675f4bfa8..bc865f6d5b 100644
--- a/otherlibs/labltk/browser/jg_box.ml
+++ b/otherlibs/labltk/browser/jg_box.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_button.ml b/otherlibs/labltk/browser/jg_button.ml
index 11abd68aba..de8d3582b9 100644
--- a/otherlibs/labltk/browser/jg_button.ml
+++ b/otherlibs/labltk/browser/jg_button.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_completion.ml b/otherlibs/labltk/browser/jg_completion.ml
index c93b099b3a..a5457a65b7 100644
--- a/otherlibs/labltk/browser/jg_completion.ml
+++ b/otherlibs/labltk/browser/jg_completion.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_completion.mli b/otherlibs/labltk/browser/jg_completion.mli
index 69c7a134c2..40c2db3cee 100644
--- a/otherlibs/labltk/browser/jg_completion.mli
+++ b/otherlibs/labltk/browser/jg_completion.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_config.ml b/otherlibs/labltk/browser/jg_config.ml
index bce0e50e76..fbbd2ef1bb 100644
--- a/otherlibs/labltk/browser/jg_config.ml
+++ b/otherlibs/labltk/browser/jg_config.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_config.mli b/otherlibs/labltk/browser/jg_config.mli
index 511e2b3a67..fdaab3fe1d 100644
--- a/otherlibs/labltk/browser/jg_config.mli
+++ b/otherlibs/labltk/browser/jg_config.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_entry.ml b/otherlibs/labltk/browser/jg_entry.ml
index c09a273e82..1f7aab751a 100644
--- a/otherlibs/labltk/browser/jg_entry.ml
+++ b/otherlibs/labltk/browser/jg_entry.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_memo.ml b/otherlibs/labltk/browser/jg_memo.ml
index e238929a08..fb1c05efaf 100644
--- a/otherlibs/labltk/browser/jg_memo.ml
+++ b/otherlibs/labltk/browser/jg_memo.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_memo.mli b/otherlibs/labltk/browser/jg_memo.mli
index 5491dee32f..14443ad16a 100644
--- a/otherlibs/labltk/browser/jg_memo.mli
+++ b/otherlibs/labltk/browser/jg_memo.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_menu.ml b/otherlibs/labltk/browser/jg_menu.ml
index b399d10d87..880ca775e7 100644
--- a/otherlibs/labltk/browser/jg_menu.ml
+++ b/otherlibs/labltk/browser/jg_menu.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_message.ml b/otherlibs/labltk/browser/jg_message.ml
index 3c18f193c4..d4d3ebbd26 100644
--- a/otherlibs/labltk/browser/jg_message.ml
+++ b/otherlibs/labltk/browser/jg_message.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_message.mli b/otherlibs/labltk/browser/jg_message.mli
index 0a83a594ff..0e123ac2c7 100644
--- a/otherlibs/labltk/browser/jg_message.mli
+++ b/otherlibs/labltk/browser/jg_message.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_multibox.ml b/otherlibs/labltk/browser/jg_multibox.ml
index febec8e5de..39082e329d 100644
--- a/otherlibs/labltk/browser/jg_multibox.ml
+++ b/otherlibs/labltk/browser/jg_multibox.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_multibox.mli b/otherlibs/labltk/browser/jg_multibox.mli
index 6dfe7d8fb3..bccca50625 100644
--- a/otherlibs/labltk/browser/jg_multibox.mli
+++ b/otherlibs/labltk/browser/jg_multibox.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_text.ml b/otherlibs/labltk/browser/jg_text.ml
index 067b9dac55..76eeb92a74 100644
--- a/otherlibs/labltk/browser/jg_text.ml
+++ b/otherlibs/labltk/browser/jg_text.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_text.mli b/otherlibs/labltk/browser/jg_text.mli
index e8646dd9d1..44cba0232a 100644
--- a/otherlibs/labltk/browser/jg_text.mli
+++ b/otherlibs/labltk/browser/jg_text.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_tk.ml b/otherlibs/labltk/browser/jg_tk.ml
index 7fc77f096a..16106eebff 100644
--- a/otherlibs/labltk/browser/jg_tk.ml
+++ b/otherlibs/labltk/browser/jg_tk.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/jg_toplevel.ml b/otherlibs/labltk/browser/jg_toplevel.ml
index 64b6f54d76..d77845df58 100644
--- a/otherlibs/labltk/browser/jg_toplevel.ml
+++ b/otherlibs/labltk/browser/jg_toplevel.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/lexical.ml b/otherlibs/labltk/browser/lexical.ml
index 72f1957ec0..a700f72869 100644
--- a/otherlibs/labltk/browser/lexical.ml
+++ b/otherlibs/labltk/browser/lexical.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/lexical.mli b/otherlibs/labltk/browser/lexical.mli
index 3be04d3246..52d09e35f5 100644
--- a/otherlibs/labltk/browser/lexical.mli
+++ b/otherlibs/labltk/browser/lexical.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/list2.ml b/otherlibs/labltk/browser/list2.ml
index 87b88f496a..4439e7410e 100644
--- a/otherlibs/labltk/browser/list2.ml
+++ b/otherlibs/labltk/browser/list2.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/main.ml b/otherlibs/labltk/browser/main.ml
index 181506960a..1d79daa547 100644
--- a/otherlibs/labltk/browser/main.ml
+++ b/otherlibs/labltk/browser/main.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
@@ -49,7 +49,7 @@ let check ~spec argv =
open Printf
let print_version () =
- printf "The Objective Caml browser, version %s\n" Sys.ocaml_version;
+ printf "The OCaml browser, version %s\n" Sys.ocaml_version;
exit 0;
;;
@@ -106,7 +106,7 @@ let _ =
(Printf.sprintf "%s\nPlease check that %s %s\nCurrent value is `%s'"
"Couldn't initialize environment."
(if is_win32 then "%OCAMLLIB%" else "$OCAMLLIB")
- "points to the Objective Caml library."
+ "points to the OCaml library."
Config.standard_library)
end;
diff --git a/otherlibs/labltk/browser/mytypes.mli b/otherlibs/labltk/browser/mytypes.mli
index 6db120adcc..b4deead236 100644
--- a/otherlibs/labltk/browser/mytypes.mli
+++ b/otherlibs/labltk/browser/mytypes.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/searchid.ml b/otherlibs/labltk/browser/searchid.ml
index 6742039c11..47d7dd39a2 100644
--- a/otherlibs/labltk/browser/searchid.ml
+++ b/otherlibs/labltk/browser/searchid.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/searchid.mli b/otherlibs/labltk/browser/searchid.mli
index 980c141d08..9e0c8ad989 100644
--- a/otherlibs/labltk/browser/searchid.mli
+++ b/otherlibs/labltk/browser/searchid.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/searchpos.ml b/otherlibs/labltk/browser/searchpos.ml
index 8cae995930..9d9f8d10c2 100644
--- a/otherlibs/labltk/browser/searchpos.ml
+++ b/otherlibs/labltk/browser/searchpos.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/searchpos.mli b/otherlibs/labltk/browser/searchpos.mli
index b2f89cd81c..a2d5dfd957 100644
--- a/otherlibs/labltk/browser/searchpos.mli
+++ b/otherlibs/labltk/browser/searchpos.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/setpath.ml b/otherlibs/labltk/browser/setpath.ml
index 1a41b573b5..018657610b 100644
--- a/otherlibs/labltk/browser/setpath.ml
+++ b/otherlibs/labltk/browser/setpath.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/setpath.mli b/otherlibs/labltk/browser/setpath.mli
index 22bf5dc583..6191b70c60 100644
--- a/otherlibs/labltk/browser/setpath.mli
+++ b/otherlibs/labltk/browser/setpath.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/shell.ml b/otherlibs/labltk/browser/shell.ml
index 1f1492de99..93525f8814 100644
--- a/otherlibs/labltk/browser/shell.ml
+++ b/otherlibs/labltk/browser/shell.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/shell.mli b/otherlibs/labltk/browser/shell.mli
index ac94f43d7c..5bb1ff5a3d 100644
--- a/otherlibs/labltk/browser/shell.mli
+++ b/otherlibs/labltk/browser/shell.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/typecheck.ml b/otherlibs/labltk/browser/typecheck.ml
index d5347ef53b..bcfa42d0c9 100644
--- a/otherlibs/labltk/browser/typecheck.ml
+++ b/otherlibs/labltk/browser/typecheck.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/typecheck.mli b/otherlibs/labltk/browser/typecheck.mli
index d61fce62e3..08a16dd20c 100644
--- a/otherlibs/labltk/browser/typecheck.mli
+++ b/otherlibs/labltk/browser/typecheck.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/useunix.ml b/otherlibs/labltk/browser/useunix.ml
index 666f866f02..86554d4884 100644
--- a/otherlibs/labltk/browser/useunix.ml
+++ b/otherlibs/labltk/browser/useunix.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/useunix.mli b/otherlibs/labltk/browser/useunix.mli
index 2850c0d2da..47d7a26aa5 100644
--- a/otherlibs/labltk/browser/useunix.mli
+++ b/otherlibs/labltk/browser/useunix.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/viewer.ml b/otherlibs/labltk/browser/viewer.ml
index fef3cbe104..6c0c9351f5 100644
--- a/otherlibs/labltk/browser/viewer.ml
+++ b/otherlibs/labltk/browser/viewer.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/viewer.mli b/otherlibs/labltk/browser/viewer.mli
index d8bec671df..c56c5e415e 100644
--- a/otherlibs/labltk/browser/viewer.mli
+++ b/otherlibs/labltk/browser/viewer.mli
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/labltk/browser/winmain.c b/otherlibs/labltk/browser/winmain.c
index dd9146fcce..4dd0644168 100644
--- a/otherlibs/labltk/browser/winmain.c
+++ b/otherlibs/labltk/browser/winmain.c
@@ -1,3 +1,17 @@
+/*************************************************************************/
+/* */
+/* OCaml LablTk library */
+/* */
+/* Jacques Garrigue, Kyoto University RIMS */
+/* */
+/* Copyright 2001 Institut National de Recherche en Informatique et */
+/* en Automatique and Kyoto University. All rights reserved. */
+/* This file is distributed under the terms of the GNU Library */
+/* General Public License, with the special exception on linking */
+/* described in file ../../../LICENSE. */
+/* */
+/*************************************************************************/
+
/* $Id$ */
#include <windows.h>
diff --git a/otherlibs/labltk/builtin/LICENSE b/otherlibs/labltk/builtin/LICENSE
index c006f51d5c..dbad5f1c06 100644
--- a/otherlibs/labltk/builtin/LICENSE
+++ b/otherlibs/labltk/builtin/LICENSE
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml LablTk library *)
+(* OCaml LablTk library *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -16,4 +16,4 @@
(* $Id$ *)
-All the files in this directory are subject to the above copyright notice. \ No newline at end of file
+All the files in this directory are subject to the above copyright notice.
diff --git a/otherlibs/labltk/camltk/Makefile b/otherlibs/labltk/camltk/Makefile
index 19300ead40..62c22d3af4 100644
--- a/otherlibs/labltk/camltk/Makefile
+++ b/otherlibs/labltk/camltk/Makefile
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
include ../support/Makefile.common
COMPFLAGS= -I ../support -I $(OTHERS)/win32unix -I $(OTHERS)/unix
diff --git a/otherlibs/labltk/camltk/Makefile.gen b/otherlibs/labltk/camltk/Makefile.gen
index f25e1f7612..9ec1972c07 100644
--- a/otherlibs/labltk/camltk/Makefile.gen
+++ b/otherlibs/labltk/camltk/Makefile.gen
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
include ../support/Makefile.common
all: cTk.ml camltk.ml .depend
diff --git a/otherlibs/labltk/compiler/Makefile b/otherlibs/labltk/compiler/Makefile
index b7db380f65..f6e584546e 100644
--- a/otherlibs/labltk/compiler/Makefile
+++ b/otherlibs/labltk/compiler/Makefile
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
include ../support/Makefile.common
OBJS= ../support/support.cmo flags.cmo copyright.cmo \
diff --git a/otherlibs/labltk/compiler/code.mli b/otherlibs/labltk/compiler/code.mli
index 6f3e292134..bde9c44554 100644
--- a/otherlibs/labltk/compiler/code.mli
+++ b/otherlibs/labltk/compiler/code.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/compile.ml b/otherlibs/labltk/compiler/compile.ml
index fd74bc173d..2735deb87f 100644
--- a/otherlibs/labltk/compiler/compile.ml
+++ b/otherlibs/labltk/compiler/compile.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/copyright b/otherlibs/labltk/compiler/copyright
index 23dff46dce..87ab0d30b0 100644
--- a/otherlibs/labltk/compiler/copyright
+++ b/otherlibs/labltk/compiler/copyright
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,6 +10,6 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/flags.ml b/otherlibs/labltk/compiler/flags.ml
index 009d5e725a..d832b4947c 100644
--- a/otherlibs/labltk/compiler/flags.ml
+++ b/otherlibs/labltk/compiler/flags.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/intf.ml b/otherlibs/labltk/compiler/intf.ml
index 59608b3815..42ad1b38da 100644
--- a/otherlibs/labltk/compiler/intf.ml
+++ b/otherlibs/labltk/compiler/intf.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/lexer.mll b/otherlibs/labltk/compiler/lexer.mll
index f51f0c01f3..2fc2376e27 100644
--- a/otherlibs/labltk/compiler/lexer.mll
+++ b/otherlibs/labltk/compiler/lexer.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
diff --git a/otherlibs/labltk/compiler/maincompile.ml b/otherlibs/labltk/compiler/maincompile.ml
index d8c72a312d..91b6bcdffb 100644
--- a/otherlibs/labltk/compiler/maincompile.ml
+++ b/otherlibs/labltk/compiler/maincompile.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/parser.mly b/otherlibs/labltk/compiler/parser.mly
index 15ced65f8d..6dc7aff329 100644
--- a/otherlibs/labltk/compiler/parser.mly
+++ b/otherlibs/labltk/compiler/parser.mly
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file ../LICENSE. */
+/* described in file ../../../LICENSE. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/compiler/pp.ml b/otherlibs/labltk/compiler/pp.ml
index 5c46766af7..c6d4f79873 100644
--- a/otherlibs/labltk/compiler/pp.ml
+++ b/otherlibs/labltk/compiler/pp.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/ppexec.ml b/otherlibs/labltk/compiler/ppexec.ml
index 71118b9601..dd66928c74 100644
--- a/otherlibs/labltk/compiler/ppexec.ml
+++ b/otherlibs/labltk/compiler/ppexec.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/pplex.mli b/otherlibs/labltk/compiler/pplex.mli
index 4eaa183b24..0502fc9019 100644
--- a/otherlibs/labltk/compiler/pplex.mli
+++ b/otherlibs/labltk/compiler/pplex.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/pplex.mll b/otherlibs/labltk/compiler/pplex.mll
index 313d1f2dd5..6559d8e94e 100644
--- a/otherlibs/labltk/compiler/pplex.mll
+++ b/otherlibs/labltk/compiler/pplex.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file ../LICENSE. *)
+(* described in file ../../../LICENSE. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/ppparse.ml b/otherlibs/labltk/compiler/ppparse.ml
index 630d675dec..2b0fdbf8ca 100644
--- a/otherlibs/labltk/compiler/ppparse.ml
+++ b/otherlibs/labltk/compiler/ppparse.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/ppyac.mly b/otherlibs/labltk/compiler/ppyac.mly
index da7ee681f2..f92ef96648 100644
--- a/otherlibs/labltk/compiler/ppyac.mly
+++ b/otherlibs/labltk/compiler/ppyac.mly
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file ../LICENSE. */
+/* described in file ../../../LICENSE. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/compiler/printer.ml b/otherlibs/labltk/compiler/printer.ml
index be70612aa2..fe33ada367 100644
--- a/otherlibs/labltk/compiler/printer.ml
+++ b/otherlibs/labltk/compiler/printer.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/tables.ml b/otherlibs/labltk/compiler/tables.ml
index 0663dfaadd..a86b4af508 100644
--- a/otherlibs/labltk/compiler/tables.ml
+++ b/otherlibs/labltk/compiler/tables.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/compiler/tsort.ml b/otherlibs/labltk/compiler/tsort.ml
index 6496eaae22..6768d0d7fc 100644
--- a/otherlibs/labltk/compiler/tsort.ml
+++ b/otherlibs/labltk/compiler/tsort.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_camltk/addition.ml b/otherlibs/labltk/examples_camltk/addition.ml
index d4b333dcd4..44988370c2 100644
--- a/otherlibs/labltk/examples_camltk/addition.ml
+++ b/otherlibs/labltk/examples_camltk/addition.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/examples_camltk/eyes.ml b/otherlibs/labltk/examples_camltk/eyes.ml
index c931462312..ba88af3436 100644
--- a/otherlibs/labltk/examples_camltk/eyes.ml
+++ b/otherlibs/labltk/examples_camltk/eyes.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_camltk/fileinput.ml b/otherlibs/labltk/examples_camltk/fileinput.ml
index c6190bdd49..70bc675bf3 100644
--- a/otherlibs/labltk/examples_camltk/fileinput.ml
+++ b/otherlibs/labltk/examples_camltk/fileinput.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk ;;
diff --git a/otherlibs/labltk/examples_camltk/fileopen.ml b/otherlibs/labltk/examples_camltk/fileopen.ml
index 927c24851e..d0829bd2b2 100644
--- a/otherlibs/labltk/examples_camltk/fileopen.ml
+++ b/otherlibs/labltk/examples_camltk/fileopen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk;;
diff --git a/otherlibs/labltk/examples_camltk/helloworld.ml b/otherlibs/labltk/examples_camltk/helloworld.ml
index bb99d9dd54..9829fca84b 100644
--- a/otherlibs/labltk/examples_camltk/helloworld.ml
+++ b/otherlibs/labltk/examples_camltk/helloworld.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk;; (* Make interface functions available *)
diff --git a/otherlibs/labltk/examples_camltk/jptest.ml b/otherlibs/labltk/examples_camltk/jptest.ml
index 38d9694c3f..9ec06acaae 100644
--- a/otherlibs/labltk/examples_camltk/jptest.ml
+++ b/otherlibs/labltk/examples_camltk/jptest.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Tk
diff --git a/otherlibs/labltk/examples_camltk/mytext.ml b/otherlibs/labltk/examples_camltk/mytext.ml
index d4c0d00b09..f3aadfbbec 100644
--- a/otherlibs/labltk/examples_camltk/mytext.ml
+++ b/otherlibs/labltk/examples_camltk/mytext.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/examples_camltk/socketinput.ml b/otherlibs/labltk/examples_camltk/socketinput.ml
index 492fdc926f..485c258648 100644
--- a/otherlibs/labltk/examples_camltk/socketinput.ml
+++ b/otherlibs/labltk/examples_camltk/socketinput.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/examples_camltk/taddition.ml b/otherlibs/labltk/examples_camltk/taddition.ml
index 990812d730..c186730303 100644
--- a/otherlibs/labltk/examples_camltk/taddition.ml
+++ b/otherlibs/labltk/examples_camltk/taddition.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Tk
diff --git a/otherlibs/labltk/examples_camltk/tetris.ml b/otherlibs/labltk/examples_camltk/tetris.ml
index 835343475b..14a9b648f3 100644
--- a/otherlibs/labltk/examples_camltk/tetris.ml
+++ b/otherlibs/labltk/examples_camltk/tetris.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_camltk/text.ml b/otherlibs/labltk/examples_camltk/text.ml
index 35273377be..0f876337ff 100644
--- a/otherlibs/labltk/examples_camltk/text.ml
+++ b/otherlibs/labltk/examples_camltk/text.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Tk
diff --git a/otherlibs/labltk/examples_camltk/winskel.ml b/otherlibs/labltk/examples_camltk/winskel.ml
index cf68178ae1..c83e643684 100644
--- a/otherlibs/labltk/examples_camltk/winskel.ml
+++ b/otherlibs/labltk/examples_camltk/winskel.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* This examples is based on Ousterhout's book (fig 16.15) *)
diff --git a/otherlibs/labltk/examples_labltk/calc.ml b/otherlibs/labltk/examples_labltk/calc.ml
index 088bf192f9..17a410c8d7 100644
--- a/otherlibs/labltk/examples_labltk/calc.ml
+++ b/otherlibs/labltk/examples_labltk/calc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_labltk/clock.ml b/otherlibs/labltk/examples_labltk/clock.ml
index 57a59b825b..6903acb21a 100644
--- a/otherlibs/labltk/examples_labltk/clock.ml
+++ b/otherlibs/labltk/examples_labltk/clock.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_labltk/demo.ml b/otherlibs/labltk/examples_labltk/demo.ml
index bd36f3f382..9524c1c7e0 100644
--- a/otherlibs/labltk/examples_labltk/demo.ml
+++ b/otherlibs/labltk/examples_labltk/demo.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_labltk/eyes.ml b/otherlibs/labltk/examples_labltk/eyes.ml
index 81f6aa4a2a..a96e08260a 100644
--- a/otherlibs/labltk/examples_labltk/eyes.ml
+++ b/otherlibs/labltk/examples_labltk/eyes.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_labltk/hello.ml b/otherlibs/labltk/examples_labltk/hello.ml
index 3f39d546d2..838b50ffc3 100644
--- a/otherlibs/labltk/examples_labltk/hello.ml
+++ b/otherlibs/labltk/examples_labltk/hello.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_labltk/lang.ml b/otherlibs/labltk/examples_labltk/lang.ml
index cde3639918..0d6ba8c9cc 100644
--- a/otherlibs/labltk/examples_labltk/lang.ml
+++ b/otherlibs/labltk/examples_labltk/lang.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_labltk/taquin.ml b/otherlibs/labltk/examples_labltk/taquin.ml
index 2809935181..616f38cb46 100644
--- a/otherlibs/labltk/examples_labltk/taquin.ml
+++ b/otherlibs/labltk/examples_labltk/taquin.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/examples_labltk/tetris.ml b/otherlibs/labltk/examples_labltk/tetris.ml
index 4f401e5924..8260fc2059 100644
--- a/otherlibs/labltk/examples_labltk/tetris.ml
+++ b/otherlibs/labltk/examples_labltk/tetris.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/frx/Makefile b/otherlibs/labltk/frx/Makefile
index 192034cf5d..581200b078 100644
--- a/otherlibs/labltk/frx/Makefile
+++ b/otherlibs/labltk/frx/Makefile
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
include ../support/Makefile.common
COMPFLAGS=-I ../camltk -I ../support
diff --git a/otherlibs/labltk/frx/frx_after.ml b/otherlibs/labltk/frx/frx_after.ml
index 7fe6a4f2a5..1b7dfef8bd 100644
--- a/otherlibs/labltk/frx/frx_after.ml
+++ b/otherlibs/labltk/frx/frx_after.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Protocol
diff --git a/otherlibs/labltk/frx/frx_after.mli b/otherlibs/labltk/frx/frx_after.mli
index 73c07f7bb9..45e30456c4 100644
--- a/otherlibs/labltk/frx/frx_after.mli
+++ b/otherlibs/labltk/frx/frx_after.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
val idle : (unit -> unit) -> unit
diff --git a/otherlibs/labltk/frx/frx_color.ml b/otherlibs/labltk/frx/frx_color.ml
index 140e138792..e3e616a98e 100644
--- a/otherlibs/labltk/frx/frx_color.ml
+++ b/otherlibs/labltk/frx/frx_color.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_color.mli b/otherlibs/labltk/frx/frx_color.mli
index 513cb08394..b2791655a5 100644
--- a/otherlibs/labltk/frx/frx_color.mli
+++ b/otherlibs/labltk/frx/frx_color.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
val check : string -> bool
diff --git a/otherlibs/labltk/frx/frx_ctext.ml b/otherlibs/labltk/frx/frx_ctext.ml
index 7d3cbb15af..498fe8ec78 100644
--- a/otherlibs/labltk/frx/frx_ctext.ml
+++ b/otherlibs/labltk/frx/frx_ctext.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* A trick by Steve Ball to do pixel scrolling on text widgets *)
diff --git a/otherlibs/labltk/frx/frx_ctext.mli b/otherlibs/labltk/frx/frx_ctext.mli
index e539f5a8bc..2f696abea1 100644
--- a/otherlibs/labltk/frx/frx_ctext.mli
+++ b/otherlibs/labltk/frx/frx_ctext.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_dialog.ml b/otherlibs/labltk/frx/frx_dialog.ml
index 12289de638..096812dbc6 100644
--- a/otherlibs/labltk/frx/frx_dialog.ml
+++ b/otherlibs/labltk/frx/frx_dialog.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_dialog.mli b/otherlibs/labltk/frx/frx_dialog.mli
index cd256acb3e..fd816d34c2 100644
--- a/otherlibs/labltk/frx/frx_dialog.mli
+++ b/otherlibs/labltk/frx/frx_dialog.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_entry.ml b/otherlibs/labltk/frx/frx_entry.ml
index ec84221862..0b7c339a02 100644
--- a/otherlibs/labltk/frx/frx_entry.ml
+++ b/otherlibs/labltk/frx/frx_entry.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_entry.mli b/otherlibs/labltk/frx/frx_entry.mli
index 2f34a7e64c..0b09f16d3d 100644
--- a/otherlibs/labltk/frx/frx_entry.mli
+++ b/otherlibs/labltk/frx/frx_entry.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_fileinput.ml b/otherlibs/labltk/frx/frx_fileinput.ml
index de13686703..dfba7a0f82 100644
--- a/otherlibs/labltk/frx/frx_fileinput.ml
+++ b/otherlibs/labltk/frx/frx_fileinput.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_fillbox.ml b/otherlibs/labltk/frx/frx_fillbox.ml
index 611b55a5df..143bea4a21 100644
--- a/otherlibs/labltk/frx/frx_fillbox.ml
+++ b/otherlibs/labltk/frx/frx_fillbox.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_fillbox.mli b/otherlibs/labltk/frx/frx_fillbox.mli
index a825524cdc..9cfc9e780b 100644
--- a/otherlibs/labltk/frx/frx_fillbox.mli
+++ b/otherlibs/labltk/frx/frx_fillbox.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_fit.ml b/otherlibs/labltk/frx/frx_fit.ml
index c03d6997a7..bcfd457a2e 100644
--- a/otherlibs/labltk/frx/frx_fit.ml
+++ b/otherlibs/labltk/frx/frx_fit.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_fit.mli b/otherlibs/labltk/frx/frx_fit.mli
index 29479d8013..e614964553 100644
--- a/otherlibs/labltk/frx/frx_fit.mli
+++ b/otherlibs/labltk/frx/frx_fit.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_focus.ml b/otherlibs/labltk/frx/frx_focus.ml
index ce855e201f..29eba574d8 100644
--- a/otherlibs/labltk/frx/frx_focus.ml
+++ b/otherlibs/labltk/frx/frx_focus.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_focus.mli b/otherlibs/labltk/frx/frx_focus.mli
index 919f704754..dcb9317f8d 100644
--- a/otherlibs/labltk/frx/frx_focus.mli
+++ b/otherlibs/labltk/frx/frx_focus.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_font.ml b/otherlibs/labltk/frx/frx_font.ml
index 3b739a6507..4acb59979e 100644
--- a/otherlibs/labltk/frx/frx_font.ml
+++ b/otherlibs/labltk/frx/frx_font.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_font.mli b/otherlibs/labltk/frx/frx_font.mli
index 8dd9997377..4ed235f4ce 100644
--- a/otherlibs/labltk/frx/frx_font.mli
+++ b/otherlibs/labltk/frx/frx_font.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
val find : string -> string -> string -> int -> string
diff --git a/otherlibs/labltk/frx/frx_group.ml b/otherlibs/labltk/frx/frx_group.ml
index 17c8a0310d..1adc2d8804 100644
--- a/otherlibs/labltk/frx/frx_group.ml
+++ b/otherlibs/labltk/frx/frx_group.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_lbutton.ml b/otherlibs/labltk/frx/frx_lbutton.ml
index c4d51f7b59..82ea8a8cc9 100644
--- a/otherlibs/labltk/frx/frx_lbutton.ml
+++ b/otherlibs/labltk/frx/frx_lbutton.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_lbutton.mli b/otherlibs/labltk/frx/frx_lbutton.mli
index 60c26a5b51..5522e5c248 100644
--- a/otherlibs/labltk/frx/frx_lbutton.mli
+++ b/otherlibs/labltk/frx/frx_lbutton.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Widget
diff --git a/otherlibs/labltk/frx/frx_listbox.ml b/otherlibs/labltk/frx/frx_listbox.ml
index 17d6a3f9ae..6d04262b69 100644
--- a/otherlibs/labltk/frx/frx_listbox.ml
+++ b/otherlibs/labltk/frx/frx_listbox.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_listbox.mli b/otherlibs/labltk/frx/frx_listbox.mli
index b44b6ee9d3..54e7ec6a72 100644
--- a/otherlibs/labltk/frx/frx_listbox.mli
+++ b/otherlibs/labltk/frx/frx_listbox.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_mem.ml b/otherlibs/labltk/frx/frx_mem.ml
index 37af208306..6df0da75f1 100644
--- a/otherlibs/labltk/frx/frx_mem.ml
+++ b/otherlibs/labltk/frx/frx_mem.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* Memory gauge *)
diff --git a/otherlibs/labltk/frx/frx_mem.mli b/otherlibs/labltk/frx/frx_mem.mli
index f3069ec28b..4f17fa79de 100644
--- a/otherlibs/labltk/frx/frx_mem.mli
+++ b/otherlibs/labltk/frx/frx_mem.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* A Garbage Collector Gauge for Caml *)
diff --git a/otherlibs/labltk/frx/frx_misc.ml b/otherlibs/labltk/frx/frx_misc.ml
index 75c8a3e4df..e45c5f0f03 100644
--- a/otherlibs/labltk/frx/frx_misc.ml
+++ b/otherlibs/labltk/frx/frx_misc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* Delayed global, a.k.a cache&carry *)
diff --git a/otherlibs/labltk/frx/frx_misc.mli b/otherlibs/labltk/frx/frx_misc.mli
index 2df8ce3d20..cd3d589fa1 100644
--- a/otherlibs/labltk/frx/frx_misc.mli
+++ b/otherlibs/labltk/frx/frx_misc.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_req.ml b/otherlibs/labltk/frx/frx_req.ml
index ab7308fa36..41590c1451 100644
--- a/otherlibs/labltk/frx/frx_req.ml
+++ b/otherlibs/labltk/frx/frx_req.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_req.mli b/otherlibs/labltk/frx/frx_req.mli
index 41de7df35a..62985b9f90 100644
--- a/otherlibs/labltk/frx/frx_req.mli
+++ b/otherlibs/labltk/frx/frx_req.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* Various dialog boxes *)
diff --git a/otherlibs/labltk/frx/frx_rpc.ml b/otherlibs/labltk/frx/frx_rpc.ml
index 5f29cbce5d..5de7a15de7 100644
--- a/otherlibs/labltk/frx/frx_rpc.ml
+++ b/otherlibs/labltk/frx/frx_rpc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* Some notion of RPC *)
diff --git a/otherlibs/labltk/frx/frx_rpc.mli b/otherlibs/labltk/frx/frx_rpc.mli
index 808fe87c75..20811738a5 100644
--- a/otherlibs/labltk/frx/frx_rpc.mli
+++ b/otherlibs/labltk/frx/frx_rpc.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* Some notion of RPC *)
diff --git a/otherlibs/labltk/frx/frx_selection.ml b/otherlibs/labltk/frx/frx_selection.ml
index 7ef64ce860..ad037ce2d8 100644
--- a/otherlibs/labltk/frx/frx_selection.ml
+++ b/otherlibs/labltk/frx/frx_selection.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* A selection handler *)
diff --git a/otherlibs/labltk/frx/frx_selection.mli b/otherlibs/labltk/frx/frx_selection.mli
index dfb27ee249..b15265834b 100644
--- a/otherlibs/labltk/frx/frx_selection.mli
+++ b/otherlibs/labltk/frx/frx_selection.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
val set : string -> unit
diff --git a/otherlibs/labltk/frx/frx_synth.ml b/otherlibs/labltk/frx/frx_synth.ml
index 76b83b640f..21bd7fa86e 100644
--- a/otherlibs/labltk/frx/frx_synth.ml
+++ b/otherlibs/labltk/frx/frx_synth.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* Some notion of synthetic events *)
diff --git a/otherlibs/labltk/frx/frx_synth.mli b/otherlibs/labltk/frx/frx_synth.mli
index 0b8d85d85e..e5a96aa85f 100644
--- a/otherlibs/labltk/frx/frx_synth.mli
+++ b/otherlibs/labltk/frx/frx_synth.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* Synthetic events *)
diff --git a/otherlibs/labltk/frx/frx_text.ml b/otherlibs/labltk/frx/frx_text.ml
index 18d9961ffc..a9ca17a372 100644
--- a/otherlibs/labltk/frx/frx_text.ml
+++ b/otherlibs/labltk/frx/frx_text.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_text.mli b/otherlibs/labltk/frx/frx_text.mli
index ac03844323..97783fa96d 100644
--- a/otherlibs/labltk/frx/frx_text.mli
+++ b/otherlibs/labltk/frx/frx_text.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_toplevel.mli b/otherlibs/labltk/frx/frx_toplevel.mli
index 3608e1e578..628cde2078 100644
--- a/otherlibs/labltk/frx/frx_toplevel.mli
+++ b/otherlibs/labltk/frx/frx_toplevel.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Widget
diff --git a/otherlibs/labltk/frx/frx_widget.ml b/otherlibs/labltk/frx/frx_widget.ml
index a81c768f01..9045134361 100644
--- a/otherlibs/labltk/frx/frx_widget.ml
+++ b/otherlibs/labltk/frx/frx_widget.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/frx/frx_widget.mli b/otherlibs/labltk/frx/frx_widget.mli
index ff26749ca2..f856664cf3 100644
--- a/otherlibs/labltk/frx/frx_widget.mli
+++ b/otherlibs/labltk/frx/frx_widget.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Camltk
diff --git a/otherlibs/labltk/jpf/Makefile b/otherlibs/labltk/jpf/Makefile
index a79b3d5683..a768b1390a 100644
--- a/otherlibs/labltk/jpf/Makefile
+++ b/otherlibs/labltk/jpf/Makefile
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
include ../support/Makefile.common
COMPFLAGS=-I ../labltk -I ../support -I $(OTHERS)/win32unix -I $(OTHERS)/unix -I $(OTHERS)/str
diff --git a/otherlibs/labltk/jpf/balloon.ml b/otherlibs/labltk/jpf/balloon.ml
index 739a8d9ece..e880f27774 100644
--- a/otherlibs/labltk/jpf/balloon.ml
+++ b/otherlibs/labltk/jpf/balloon.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/jpf/balloon.mli b/otherlibs/labltk/jpf/balloon.mli
index 633796ce6b..f3e65269da 100644
--- a/otherlibs/labltk/jpf/balloon.mli
+++ b/otherlibs/labltk/jpf/balloon.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/jpf/balloontest.ml b/otherlibs/labltk/jpf/balloontest.ml
index 60e3aded38..236f6174bf 100644
--- a/otherlibs/labltk/jpf/balloontest.ml
+++ b/otherlibs/labltk/jpf/balloontest.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/jpf/fileselect.ml b/otherlibs/labltk/jpf/fileselect.ml
index 3d42ac2dc1..23aaeb6d29 100644
--- a/otherlibs/labltk/jpf/fileselect.ml
+++ b/otherlibs/labltk/jpf/fileselect.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/jpf/fileselect.mli b/otherlibs/labltk/jpf/fileselect.mli
index 4412a41875..42f7d34fa3 100644
--- a/otherlibs/labltk/jpf/fileselect.mli
+++ b/otherlibs/labltk/jpf/fileselect.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/jpf/jpf_font.ml b/otherlibs/labltk/jpf/jpf_font.ml
index 24b87b7c06..b036d421ab 100644
--- a/otherlibs/labltk/jpf/jpf_font.ml
+++ b/otherlibs/labltk/jpf/jpf_font.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
(* find font information *)
diff --git a/otherlibs/labltk/jpf/jpf_font.mli b/otherlibs/labltk/jpf/jpf_font.mli
index 03f705f529..f3045a9c8b 100644
--- a/otherlibs/labltk/jpf/jpf_font.mli
+++ b/otherlibs/labltk/jpf/jpf_font.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
val debug : bool ref
diff --git a/otherlibs/labltk/jpf/shell.ml b/otherlibs/labltk/jpf/shell.ml
index 8b00a8f2cf..0d566e050e 100644
--- a/otherlibs/labltk/jpf/shell.ml
+++ b/otherlibs/labltk/jpf/shell.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
open Unix
diff --git a/otherlibs/labltk/jpf/shell.mli b/otherlibs/labltk/jpf/shell.mli
index c3fec3a2e3..7c7dd8e1a0 100644
--- a/otherlibs/labltk/jpf/shell.mli
+++ b/otherlibs/labltk/jpf/shell.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
val subshell : string -> string list
diff --git a/otherlibs/labltk/labltk/Makefile b/otherlibs/labltk/labltk/Makefile
index f678954e04..1510de8f8e 100644
--- a/otherlibs/labltk/labltk/Makefile
+++ b/otherlibs/labltk/labltk/Makefile
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
include ../support/Makefile.common
COMPFLAGS= -I ../support -I $(OTHERS)/win32unix -I $(OTHERS)/unix
diff --git a/otherlibs/labltk/labltk/Makefile.gen b/otherlibs/labltk/labltk/Makefile.gen
index 592ea44623..2e1fc274ee 100644
--- a/otherlibs/labltk/labltk/Makefile.gen
+++ b/otherlibs/labltk/labltk/Makefile.gen
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
include ../support/Makefile.common
all: tk.ml labltk.ml .depend
diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile
index b82bcddfaf..6be9af0560 100644
--- a/otherlibs/labltk/lib/Makefile
+++ b/otherlibs/labltk/lib/Makefile
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
include ../support/Makefile.common
all: $(LIBNAME).cma $(LIBNAME)top$(EXE) $(LIBNAME)
diff --git a/otherlibs/labltk/support/Makefile b/otherlibs/labltk/support/Makefile
index dd037a2b4b..382f12c66c 100644
--- a/otherlibs/labltk/support/Makefile
+++ b/otherlibs/labltk/support/Makefile
@@ -1,3 +1,19 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
include Makefile.common
all: support.cmo rawwidget.cmo widget.cmo protocol.cmo \
diff --git a/otherlibs/labltk/support/Makefile.common b/otherlibs/labltk/support/Makefile.common
index 56f6fd1377..f0aa930d30 100644
--- a/otherlibs/labltk/support/Makefile.common
+++ b/otherlibs/labltk/support/Makefile.common
@@ -1,5 +1,21 @@
+#######################################################################
+# #
+# MLTk, Tcl/Tk interface of OCaml #
+# #
+# Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis #
+# projet Cristal, INRIA Rocquencourt #
+# Jacques Garrigue, Kyoto University RIMS #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique and Kyoto University. All rights reserved. #
+# This file is distributed under the terms of the GNU Library #
+# General Public License, with the special exception on linking #
+# described in file LICENSE found in the OCaml source tree. #
+# #
+#######################################################################
+
## Paths are relative to subdirectories
-## Where you compiled Objective Caml
+## Where you compiled OCaml
TOPDIR=../../..
## Path to the otherlibs subdirectory
OTHERS=$(TOPDIR)/otherlibs
@@ -10,7 +26,7 @@ include $(TOPDIR)/config/Makefile
INSTALLDIR=$(LIBDIR)/$(LIBNAME)
-## Tools from the Objective Caml distribution
+## Tools from the OCaml distribution
CAMLRUN=$(TOPDIR)/boot/ocamlrun
CAMLC=$(TOPDIR)/ocamlcomp.sh
diff --git a/otherlibs/labltk/support/camltk.h b/otherlibs/labltk/support/camltk.h
index 5be206faa8..54671a075d 100644
--- a/otherlibs/labltk/support/camltk.h
+++ b/otherlibs/labltk/support/camltk.h
@@ -1,6 +1,6 @@
/*************************************************************************/
/* */
-/* Objective Caml LablTk library */
+/* OCaml LablTk library */
/* */
/* Francois Rouaix, Francois Pessaux and Jun Furuse */
/* projet Cristal, INRIA Rocquencourt */
diff --git a/otherlibs/labltk/support/camltkwrap.ml b/otherlibs/labltk/support/camltkwrap.ml
index 5b49b19f0f..635349a315 100644
--- a/otherlibs/labltk/support/camltkwrap.ml
+++ b/otherlibs/labltk/support/camltkwrap.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
module Widget = struct
diff --git a/otherlibs/labltk/support/camltkwrap.mli b/otherlibs/labltk/support/camltkwrap.mli
index 1af566d2cd..4fc7e3c159 100644
--- a/otherlibs/labltk/support/camltkwrap.mli
+++ b/otherlibs/labltk/support/camltkwrap.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
module Widget : sig
diff --git a/otherlibs/labltk/support/cltkCaml.c b/otherlibs/labltk/support/cltkCaml.c
index c9bcc80dce..f0372f14b7 100644
--- a/otherlibs/labltk/support/cltkCaml.c
+++ b/otherlibs/labltk/support/cltkCaml.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/cltkDMain.c b/otherlibs/labltk/support/cltkDMain.c
index 3d9a4c2dfe..7edb92a98d 100644
--- a/otherlibs/labltk/support/cltkDMain.c
+++ b/otherlibs/labltk/support/cltkDMain.c
@@ -1,6 +1,6 @@
/*************************************************************************/
/* */
-/* Objective Caml LablTk library */
+/* OCaml LablTk library */
/* */
/* Francois Rouaix, Francois Pessaux and Jun Furuse */
/* projet Cristal, INRIA Rocquencourt */
diff --git a/otherlibs/labltk/support/cltkEval.c b/otherlibs/labltk/support/cltkEval.c
index cdd16a914a..282d2f44c8 100644
--- a/otherlibs/labltk/support/cltkEval.c
+++ b/otherlibs/labltk/support/cltkEval.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/cltkEvent.c b/otherlibs/labltk/support/cltkEvent.c
index ad9b4d9eda..4507cf6943 100644
--- a/otherlibs/labltk/support/cltkEvent.c
+++ b/otherlibs/labltk/support/cltkEvent.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/cltkFile.c b/otherlibs/labltk/support/cltkFile.c
index 4fbf9868e6..b4ebca6144 100644
--- a/otherlibs/labltk/support/cltkFile.c
+++ b/otherlibs/labltk/support/cltkFile.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/cltkImg.c b/otherlibs/labltk/support/cltkImg.c
index d8d5dd3d07..7f47760dff 100644
--- a/otherlibs/labltk/support/cltkImg.c
+++ b/otherlibs/labltk/support/cltkImg.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
#include <string.h>
diff --git a/otherlibs/labltk/support/cltkMain.c b/otherlibs/labltk/support/cltkMain.c
index eb4617a45d..5886e2cc33 100644
--- a/otherlibs/labltk/support/cltkMain.c
+++ b/otherlibs/labltk/support/cltkMain.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/cltkMisc.c b/otherlibs/labltk/support/cltkMisc.c
index b19713cda7..e5360aa209 100644
--- a/otherlibs/labltk/support/cltkMisc.c
+++ b/otherlibs/labltk/support/cltkMisc.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/cltkTimer.c b/otherlibs/labltk/support/cltkTimer.c
index e0635e8501..380dde3ed5 100644
--- a/otherlibs/labltk/support/cltkTimer.c
+++ b/otherlibs/labltk/support/cltkTimer.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/cltkUtf.c b/otherlibs/labltk/support/cltkUtf.c
index fd01bd15a4..448e06a1cf 100644
--- a/otherlibs/labltk/support/cltkUtf.c
+++ b/otherlibs/labltk/support/cltkUtf.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/cltkVar.c b/otherlibs/labltk/support/cltkVar.c
index 0411a94cda..96af9d21d1 100644
--- a/otherlibs/labltk/support/cltkVar.c
+++ b/otherlibs/labltk/support/cltkVar.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/cltkWait.c b/otherlibs/labltk/support/cltkWait.c
index 4c126b5d20..a46860b85c 100644
--- a/otherlibs/labltk/support/cltkWait.c
+++ b/otherlibs/labltk/support/cltkWait.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* MLTk, Tcl/Tk interface of Objective Caml */
+/* MLTk, Tcl/Tk interface of OCaml */
/* */
/* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis */
/* projet Cristal, INRIA Rocquencourt */
@@ -10,7 +10,7 @@
/* en Automatique and Kyoto University. All rights reserved. */
/* This file is distributed under the terms of the GNU Library */
/* General Public License, with the special exception on linking */
-/* described in file LICENSE found in the Objective Caml source tree. */
+/* described in file LICENSE found in the OCaml source tree. */
/* */
/***********************************************************************/
diff --git a/otherlibs/labltk/support/fileevent.ml b/otherlibs/labltk/support/fileevent.ml
index 846a7519b8..ae1cc261a3 100644
--- a/otherlibs/labltk/support/fileevent.ml
+++ b/otherlibs/labltk/support/fileevent.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/fileevent.mli b/otherlibs/labltk/support/fileevent.mli
index 34760f0c7e..f5468ca599 100644
--- a/otherlibs/labltk/support/fileevent.mli
+++ b/otherlibs/labltk/support/fileevent.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/protocol.ml b/otherlibs/labltk/support/protocol.ml
index 26b97c0bda..28cb4737d9 100644
--- a/otherlibs/labltk/support/protocol.ml
+++ b/otherlibs/labltk/support/protocol.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/protocol.mli b/otherlibs/labltk/support/protocol.mli
index 9b5ae39362..1ce6718a85 100644
--- a/otherlibs/labltk/support/protocol.mli
+++ b/otherlibs/labltk/support/protocol.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/rawwidget.ml b/otherlibs/labltk/support/rawwidget.ml
index 99b1dce1a9..f216df726a 100644
--- a/otherlibs/labltk/support/rawwidget.ml
+++ b/otherlibs/labltk/support/rawwidget.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/rawwidget.mli b/otherlibs/labltk/support/rawwidget.mli
index 4eda7311c7..e9f82ef2cc 100644
--- a/otherlibs/labltk/support/rawwidget.mli
+++ b/otherlibs/labltk/support/rawwidget.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/slave.ml b/otherlibs/labltk/support/slave.ml
index 51eae853bb..44349c05cf 100644
--- a/otherlibs/labltk/support/slave.ml
+++ b/otherlibs/labltk/support/slave.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/support.ml b/otherlibs/labltk/support/support.ml
index fa650e8a9e..7d019967c0 100644
--- a/otherlibs/labltk/support/support.ml
+++ b/otherlibs/labltk/support/support.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/support.mli b/otherlibs/labltk/support/support.mli
index 95a2255cb5..fe30208ac2 100644
--- a/otherlibs/labltk/support/support.mli
+++ b/otherlibs/labltk/support/support.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/textvariable.ml b/otherlibs/labltk/support/textvariable.ml
index ad9033d450..4e17a008ad 100644
--- a/otherlibs/labltk/support/textvariable.ml
+++ b/otherlibs/labltk/support/textvariable.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/textvariable.mli b/otherlibs/labltk/support/textvariable.mli
index dfa511a29f..f18f6cc86c 100644
--- a/otherlibs/labltk/support/textvariable.mli
+++ b/otherlibs/labltk/support/textvariable.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/timer.ml b/otherlibs/labltk/support/timer.ml
index a6ef8c2992..d5bd176aa7 100644
--- a/otherlibs/labltk/support/timer.ml
+++ b/otherlibs/labltk/support/timer.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/timer.mli b/otherlibs/labltk/support/timer.mli
index a45e1c9d22..4b31668c9c 100644
--- a/otherlibs/labltk/support/timer.mli
+++ b/otherlibs/labltk/support/timer.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/tkthread.ml b/otherlibs/labltk/support/tkthread.ml
index ecdf61460a..4ae36685c9 100644
--- a/otherlibs/labltk/support/tkthread.ml
+++ b/otherlibs/labltk/support/tkthread.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* LablTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Jacques Garrigue, Nagoya University Mathematics Dept. *)
(* *)
@@ -8,7 +8,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/tkthread.mli b/otherlibs/labltk/support/tkthread.mli
index 4f20e6140b..2bc104da2e 100644
--- a/otherlibs/labltk/support/tkthread.mli
+++ b/otherlibs/labltk/support/tkthread.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* LablTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Jacques Garrigue, Nagoya University Mathematics Dept. *)
(* *)
@@ -8,7 +8,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/tkwait.ml b/otherlibs/labltk/support/tkwait.ml
index 97a0b0eb84..34f6908deb 100644
--- a/otherlibs/labltk/support/tkwait.ml
+++ b/otherlibs/labltk/support/tkwait.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/widget.ml b/otherlibs/labltk/support/widget.ml
index 65e0d26a9e..083e4b96c3 100644
--- a/otherlibs/labltk/support/widget.ml
+++ b/otherlibs/labltk/support/widget.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/labltk/support/widget.mli b/otherlibs/labltk/support/widget.mli
index f9c832783a..7761f2f2c8 100644
--- a/otherlibs/labltk/support/widget.mli
+++ b/otherlibs/labltk/support/widget.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* MLTk, Tcl/Tk interface of Objective Caml *)
+(* MLTk, Tcl/Tk interface of OCaml *)
(* *)
(* Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis *)
(* projet Cristal, INRIA Rocquencourt *)
@@ -10,7 +10,7 @@
(* en Automatique and Kyoto University. All rights reserved. *)
(* This file is distributed under the terms of the GNU Library *)
(* General Public License, with the special exception on linking *)
-(* described in file LICENSE found in the Objective Caml source tree. *)
+(* described in file LICENSE found in the OCaml source tree. *)
(* *)
(***********************************************************************)
diff --git a/otherlibs/num/Makefile b/otherlibs/num/Makefile
index 0a4349e802..756aec2b4c 100644
--- a/otherlibs/num/Makefile
+++ b/otherlibs/num/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/num/Makefile.nt b/otherlibs/num/Makefile.nt
index 16103b2b00..9d831657af 100644
--- a/otherlibs/num/Makefile.nt
+++ b/otherlibs/num/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/num/arith_flags.ml b/otherlibs/num/arith_flags.ml
index 00e2813e62..048d4f8dba 100644
--- a/otherlibs/num/arith_flags.ml
+++ b/otherlibs/num/arith_flags.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/arith_flags.mli b/otherlibs/num/arith_flags.mli
index 36160edb24..6539424311 100644
--- a/otherlibs/num/arith_flags.mli
+++ b/otherlibs/num/arith_flags.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/arith_status.ml b/otherlibs/num/arith_status.ml
index 8b6fa9f727..0f9deb363b 100644
--- a/otherlibs/num/arith_status.ml
+++ b/otherlibs/num/arith_status.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/arith_status.mli b/otherlibs/num/arith_status.mli
index 121b4d5756..170e8cd4c2 100644
--- a/otherlibs/num/arith_status.mli
+++ b/otherlibs/num/arith_status.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/big_int.ml b/otherlibs/num/big_int.ml
index b96b8e1f42..34de4b1272 100644
--- a/otherlibs/num/big_int.ml
+++ b/otherlibs/num/big_int.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/big_int.mli b/otherlibs/num/big_int.mli
index 2ac7b7eb6f..46621f9414 100644
--- a/otherlibs/num/big_int.mli
+++ b/otherlibs/num/big_int.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/bng.c b/otherlibs/num/bng.c
index 7450247009..5bbedb0b46 100644
--- a/otherlibs/num/bng.c
+++ b/otherlibs/num/bng.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/bng.h b/otherlibs/num/bng.h
index 6d12c87cb3..19f2e2b9cf 100644
--- a/otherlibs/num/bng.h
+++ b/otherlibs/num/bng.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/bng_alpha.c b/otherlibs/num/bng_alpha.c
index 5bf964b582..b888df4c00 100644
--- a/otherlibs/num/bng_alpha.c
+++ b/otherlibs/num/bng_alpha.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/bng_amd64.c b/otherlibs/num/bng_amd64.c
index e829eef23e..ecf9f2535d 100644
--- a/otherlibs/num/bng_amd64.c
+++ b/otherlibs/num/bng_amd64.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/bng_digit.c b/otherlibs/num/bng_digit.c
index 168b44ad3d..e429197c22 100644
--- a/otherlibs/num/bng_digit.c
+++ b/otherlibs/num/bng_digit.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/bng_ia32.c b/otherlibs/num/bng_ia32.c
index bbca8e9dcd..b4981cd488 100644
--- a/otherlibs/num/bng_ia32.c
+++ b/otherlibs/num/bng_ia32.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/bng_mips.c b/otherlibs/num/bng_mips.c
index f246843cb8..92ec2c03ed 100644
--- a/otherlibs/num/bng_mips.c
+++ b/otherlibs/num/bng_mips.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/bng_ppc.c b/otherlibs/num/bng_ppc.c
index 32d573cd0f..6bbf108e9c 100644
--- a/otherlibs/num/bng_ppc.c
+++ b/otherlibs/num/bng_ppc.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
@@ -91,4 +91,4 @@
"mulhwu %1, %2, %3" \
: "=&r" (resl), "=r" (resh) \
: "r" (arg1), "r" (arg2))
-#endif \ No newline at end of file
+#endif
diff --git a/otherlibs/num/bng_sparc.c b/otherlibs/num/bng_sparc.c
index 934c0b2f7e..4e46a316ae 100644
--- a/otherlibs/num/bng_sparc.c
+++ b/otherlibs/num/bng_sparc.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/int_misc.ml b/otherlibs/num/int_misc.ml
index b7eb4c67d4..99713b916e 100644
--- a/otherlibs/num/int_misc.ml
+++ b/otherlibs/num/int_misc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/int_misc.mli b/otherlibs/num/int_misc.mli
index 28bb335b8e..7f465c5ad7 100644
--- a/otherlibs/num/int_misc.mli
+++ b/otherlibs/num/int_misc.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/nat.h b/otherlibs/num/nat.h
index 7f67b916a1..62c7ac9885 100644
--- a/otherlibs/num/nat.h
+++ b/otherlibs/num/nat.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/nat.ml b/otherlibs/num/nat.ml
index cda80d5d48..44742a213b 100644
--- a/otherlibs/num/nat.ml
+++ b/otherlibs/num/nat.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/nat.mli b/otherlibs/num/nat.mli
index 3b32ac8dcf..39f1c5908c 100644
--- a/otherlibs/num/nat.mli
+++ b/otherlibs/num/nat.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/nat_stubs.c b/otherlibs/num/nat_stubs.c
index d56ee2ddbc..5215851659 100644
--- a/otherlibs/num/nat_stubs.c
+++ b/otherlibs/num/nat_stubs.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/num/num.ml b/otherlibs/num/num.ml
index 52fe8cc0e8..4ede5ee49c 100644
--- a/otherlibs/num/num.ml
+++ b/otherlibs/num/num.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/num.mli b/otherlibs/num/num.mli
index 8bf3d4e6e7..1d421ff29d 100644
--- a/otherlibs/num/num.mli
+++ b/otherlibs/num/num.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/ratio.ml b/otherlibs/num/ratio.ml
index 7885df15d6..fe0170f299 100644
--- a/otherlibs/num/ratio.ml
+++ b/otherlibs/num/ratio.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/num/ratio.mli b/otherlibs/num/ratio.mli
index 12621f08a2..60c0f66dba 100644
--- a/otherlibs/num/ratio.mli
+++ b/otherlibs/num/ratio.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Valerie Menissier-Morain, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/str/Makefile b/otherlibs/str/Makefile
index b6c16a0769..e36000e4ac 100644
--- a/otherlibs/str/Makefile
+++ b/otherlibs/str/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/str/Makefile.nt b/otherlibs/str/Makefile.nt
index 5aeff80b25..b0420b39b8 100644
--- a/otherlibs/str/Makefile.nt
+++ b/otherlibs/str/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/str/str.ml b/otherlibs/str/str.ml
index f3f760acb9..5d53168fd8 100644
--- a/otherlibs/str/str.ml
+++ b/otherlibs/str/str.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/str/str.mli b/otherlibs/str/str.mli
index b63faf845a..a4d65b6aed 100644
--- a/otherlibs/str/str.mli
+++ b/otherlibs/str/str.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/str/strstubs.c b/otherlibs/str/strstubs.c
index b8d53ff8fa..fc2f46f8e8 100644
--- a/otherlibs/str/strstubs.c
+++ b/otherlibs/str/strstubs.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile
index f5c80c0e2d..fbdd899466 100644
--- a/otherlibs/systhreads/Makefile
+++ b/otherlibs/systhreads/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/systhreads/Makefile.nt b/otherlibs/systhreads/Makefile.nt
index 8c559e0b6d..8cc9dd2649 100644
--- a/otherlibs/systhreads/Makefile.nt
+++ b/otherlibs/systhreads/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/systhreads/condition.ml b/otherlibs/systhreads/condition.ml
index 6549c642d8..6bdac6a369 100644
--- a/otherlibs/systhreads/condition.ml
+++ b/otherlibs/systhreads/condition.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/condition.mli b/otherlibs/systhreads/condition.mli
index 5bc9d6740a..d13b30d866 100644
--- a/otherlibs/systhreads/condition.mli
+++ b/otherlibs/systhreads/condition.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Damien Doligez, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/event.ml b/otherlibs/systhreads/event.ml
index 74f457b06d..ff137e981d 100644
--- a/otherlibs/systhreads/event.ml
+++ b/otherlibs/systhreads/event.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* David Nowak and Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/event.mli b/otherlibs/systhreads/event.mli
index 08d6b0bf6b..11842e5ad0 100644
--- a/otherlibs/systhreads/event.mli
+++ b/otherlibs/systhreads/event.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* David Nowak and Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/mutex.ml b/otherlibs/systhreads/mutex.ml
index 4e108f4a9f..5e9cc886c5 100644
--- a/otherlibs/systhreads/mutex.ml
+++ b/otherlibs/systhreads/mutex.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Pascal Cuoq, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/mutex.mli b/otherlibs/systhreads/mutex.mli
index b1fe141358..844d4e5d4c 100644
--- a/otherlibs/systhreads/mutex.mli
+++ b/otherlibs/systhreads/mutex.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Damien Doligez, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/st_posix.h b/otherlibs/systhreads/st_posix.h
index 165d8a367d..68ac00ddfe 100644
--- a/otherlibs/systhreads/st_posix.h
+++ b/otherlibs/systhreads/st_posix.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/systhreads/st_stubs.c b/otherlibs/systhreads/st_stubs.c
index 54cbb4e8c3..6435aebf3b 100644
--- a/otherlibs/systhreads/st_stubs.c
+++ b/otherlibs/systhreads/st_stubs.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/systhreads/st_win32.h b/otherlibs/systhreads/st_win32.h
index e3e37c8c2c..4b5755ec38 100644
--- a/otherlibs/systhreads/st_win32.h
+++ b/otherlibs/systhreads/st_win32.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/systhreads/thread.ml b/otherlibs/systhreads/thread.ml
index 18cc819bbf..f66396e857 100644
--- a/otherlibs/systhreads/thread.ml
+++ b/otherlibs/systhreads/thread.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/thread.mli b/otherlibs/systhreads/thread.mli
index 3c2fc01b53..42d18e6355 100644
--- a/otherlibs/systhreads/thread.mli
+++ b/otherlibs/systhreads/thread.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/threadUnix.ml b/otherlibs/systhreads/threadUnix.ml
index 71855ec696..d4b6fd59f5 100644
--- a/otherlibs/systhreads/threadUnix.ml
+++ b/otherlibs/systhreads/threadUnix.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/threadUnix.mli b/otherlibs/systhreads/threadUnix.mli
index c05346fef3..9c7e76e56b 100644
--- a/otherlibs/systhreads/threadUnix.mli
+++ b/otherlibs/systhreads/threadUnix.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/systhreads/threads.h b/otherlibs/systhreads/threads.h
index 746624256a..a0a4078350 100644
--- a/otherlibs/systhreads/threads.h
+++ b/otherlibs/systhreads/threads.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/threads/Makefile b/otherlibs/threads/Makefile
index 0e6ef86ff0..3354a275bd 100644
--- a/otherlibs/threads/Makefile
+++ b/otherlibs/threads/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/threads/condition.ml b/otherlibs/threads/condition.ml
index e012a86e35..ee687a85b9 100644
--- a/otherlibs/threads/condition.ml
+++ b/otherlibs/threads/condition.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Damien Doligez, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/condition.mli b/otherlibs/threads/condition.mli
index 5bc9d6740a..d13b30d866 100644
--- a/otherlibs/threads/condition.mli
+++ b/otherlibs/threads/condition.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Damien Doligez, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/event.ml b/otherlibs/threads/event.ml
index 74f457b06d..ff137e981d 100644
--- a/otherlibs/threads/event.ml
+++ b/otherlibs/threads/event.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* David Nowak and Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/event.mli b/otherlibs/threads/event.mli
index 08d6b0bf6b..11842e5ad0 100644
--- a/otherlibs/threads/event.mli
+++ b/otherlibs/threads/event.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* David Nowak and Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/marshal.ml b/otherlibs/threads/marshal.ml
index d31a667df8..6f2bcfed78 100644
--- a/otherlibs/threads/marshal.ml
+++ b/otherlibs/threads/marshal.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/mutex.ml b/otherlibs/threads/mutex.ml
index f0f6845b21..12e3f534dd 100644
--- a/otherlibs/threads/mutex.ml
+++ b/otherlibs/threads/mutex.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Damien Doligez, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/mutex.mli b/otherlibs/threads/mutex.mli
index b1fe141358..844d4e5d4c 100644
--- a/otherlibs/threads/mutex.mli
+++ b/otherlibs/threads/mutex.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Damien Doligez, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/pervasives.ml b/otherlibs/threads/pervasives.ml
index 748e967960..f83a1cf0dc 100644
--- a/otherlibs/threads/pervasives.ml
+++ b/otherlibs/threads/pervasives.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/scheduler.c b/otherlibs/threads/scheduler.c
index c73ac67e81..3f51979032 100644
--- a/otherlibs/threads/scheduler.c
+++ b/otherlibs/threads/scheduler.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/threads/thread.ml b/otherlibs/threads/thread.ml
index 723669a39d..f4bbd8a5ae 100644
--- a/otherlibs/threads/thread.ml
+++ b/otherlibs/threads/thread.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/thread.mli b/otherlibs/threads/thread.mli
index 9577a54eb0..e97e55ab15 100644
--- a/otherlibs/threads/thread.mli
+++ b/otherlibs/threads/thread.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/threadUnix.ml b/otherlibs/threads/threadUnix.ml
index 66a3704c19..bd4181b996 100644
--- a/otherlibs/threads/threadUnix.ml
+++ b/otherlibs/threads/threadUnix.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/threadUnix.mli b/otherlibs/threads/threadUnix.mli
index 1b4dde29b6..22ed9330e8 100644
--- a/otherlibs/threads/threadUnix.mli
+++ b/otherlibs/threads/threadUnix.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/threads/unix.ml b/otherlibs/threads/unix.ml
index 5a8bb697da..2306170728 100644
--- a/otherlibs/threads/unix.ml
+++ b/otherlibs/threads/unix.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/unix/Makefile b/otherlibs/unix/Makefile
index be72349694..5a11b5c2c9 100644
--- a/otherlibs/unix/Makefile
+++ b/otherlibs/unix/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/unix/accept.c b/otherlibs/unix/accept.c
index a6e80f064f..7b2688f03e 100644
--- a/otherlibs/unix/accept.c
+++ b/otherlibs/unix/accept.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/access.c b/otherlibs/unix/access.c
index 0c0c5fc1a3..813c0634a6 100644
--- a/otherlibs/unix/access.c
+++ b/otherlibs/unix/access.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/addrofstr.c b/otherlibs/unix/addrofstr.c
index 6947d66f11..217397b508 100644
--- a/otherlibs/unix/addrofstr.c
+++ b/otherlibs/unix/addrofstr.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/alarm.c b/otherlibs/unix/alarm.c
index 55e4d6cf80..6275e25564 100644
--- a/otherlibs/unix/alarm.c
+++ b/otherlibs/unix/alarm.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/bind.c b/otherlibs/unix/bind.c
index 85cf1d28aa..a6999a9f45 100644
--- a/otherlibs/unix/bind.c
+++ b/otherlibs/unix/bind.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/chdir.c b/otherlibs/unix/chdir.c
index 7901eca0e4..2788c5054c 100644
--- a/otherlibs/unix/chdir.c
+++ b/otherlibs/unix/chdir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/chmod.c b/otherlibs/unix/chmod.c
index dff837223e..f01d7e85b5 100644
--- a/otherlibs/unix/chmod.c
+++ b/otherlibs/unix/chmod.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/chown.c b/otherlibs/unix/chown.c
index bfd164008f..72002e9364 100644
--- a/otherlibs/unix/chown.c
+++ b/otherlibs/unix/chown.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/chroot.c b/otherlibs/unix/chroot.c
index 24f49877d5..879d0662f1 100644
--- a/otherlibs/unix/chroot.c
+++ b/otherlibs/unix/chroot.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/close.c b/otherlibs/unix/close.c
index 27e1937df4..0aaf74bd92 100644
--- a/otherlibs/unix/close.c
+++ b/otherlibs/unix/close.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/closedir.c b/otherlibs/unix/closedir.c
index b2fd51357d..a6440efa4b 100644
--- a/otherlibs/unix/closedir.c
+++ b/otherlibs/unix/closedir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/connect.c b/otherlibs/unix/connect.c
index 669c347f3f..a17a89ffc9 100644
--- a/otherlibs/unix/connect.c
+++ b/otherlibs/unix/connect.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/cst2constr.c b/otherlibs/unix/cst2constr.c
index 9035160dcc..8ce4d3f0d4 100644
--- a/otherlibs/unix/cst2constr.c
+++ b/otherlibs/unix/cst2constr.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/cst2constr.h b/otherlibs/unix/cst2constr.h
index 3cb1c11824..e1c61a0c5f 100644
--- a/otherlibs/unix/cst2constr.h
+++ b/otherlibs/unix/cst2constr.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/cstringv.c b/otherlibs/unix/cstringv.c
index 0e37914d82..5c83b59e44 100644
--- a/otherlibs/unix/cstringv.c
+++ b/otherlibs/unix/cstringv.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/dup.c b/otherlibs/unix/dup.c
index 5935d0b440..f78d9369dc 100644
--- a/otherlibs/unix/dup.c
+++ b/otherlibs/unix/dup.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/dup2.c b/otherlibs/unix/dup2.c
index beb987133b..412315891f 100644
--- a/otherlibs/unix/dup2.c
+++ b/otherlibs/unix/dup2.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/envir.c b/otherlibs/unix/envir.c
index 1df842c593..020edf0cf7 100644
--- a/otherlibs/unix/envir.c
+++ b/otherlibs/unix/envir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/errmsg.c b/otherlibs/unix/errmsg.c
index ae8793e196..6cf82d6330 100644
--- a/otherlibs/unix/errmsg.c
+++ b/otherlibs/unix/errmsg.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/execv.c b/otherlibs/unix/execv.c
index bc0330b356..51eabc7127 100644
--- a/otherlibs/unix/execv.c
+++ b/otherlibs/unix/execv.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/execve.c b/otherlibs/unix/execve.c
index 4d29fb55b7..00ab6af4cf 100644
--- a/otherlibs/unix/execve.c
+++ b/otherlibs/unix/execve.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/execvp.c b/otherlibs/unix/execvp.c
index 6d03a29ea4..db77d41345 100644
--- a/otherlibs/unix/execvp.c
+++ b/otherlibs/unix/execvp.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/exit.c b/otherlibs/unix/exit.c
index 8f1df6d532..88fc012547 100644
--- a/otherlibs/unix/exit.c
+++ b/otherlibs/unix/exit.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/fchmod.c b/otherlibs/unix/fchmod.c
index a90de6ef1f..b2d49dcd46 100644
--- a/otherlibs/unix/fchmod.c
+++ b/otherlibs/unix/fchmod.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/fchown.c b/otherlibs/unix/fchown.c
index 29683a5c79..e2c934ae07 100644
--- a/otherlibs/unix/fchown.c
+++ b/otherlibs/unix/fchown.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/fcntl.c b/otherlibs/unix/fcntl.c
index a0891b2c30..58f7df7569 100644
--- a/otherlibs/unix/fcntl.c
+++ b/otherlibs/unix/fcntl.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/fork.c b/otherlibs/unix/fork.c
index 74ec6294d0..80b4435511 100644
--- a/otherlibs/unix/fork.c
+++ b/otherlibs/unix/fork.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/ftruncate.c b/otherlibs/unix/ftruncate.c
index 661640e353..5eaa166fb1 100644
--- a/otherlibs/unix/ftruncate.c
+++ b/otherlibs/unix/ftruncate.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getaddrinfo.c b/otherlibs/unix/getaddrinfo.c
index adc54998a7..34cf8280c4 100644
--- a/otherlibs/unix/getaddrinfo.c
+++ b/otherlibs/unix/getaddrinfo.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getcwd.c b/otherlibs/unix/getcwd.c
index 7c735b68dc..f3ff97114e 100644
--- a/otherlibs/unix/getcwd.c
+++ b/otherlibs/unix/getcwd.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getegid.c b/otherlibs/unix/getegid.c
index 02beaf1241..9c6097ef58 100644
--- a/otherlibs/unix/getegid.c
+++ b/otherlibs/unix/getegid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/geteuid.c b/otherlibs/unix/geteuid.c
index 7c9f660afe..55e0763808 100644
--- a/otherlibs/unix/geteuid.c
+++ b/otherlibs/unix/geteuid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getgid.c b/otherlibs/unix/getgid.c
index d0ed4bff74..a3039d56cd 100644
--- a/otherlibs/unix/getgid.c
+++ b/otherlibs/unix/getgid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getgr.c b/otherlibs/unix/getgr.c
index eefaa5979c..7b212bd279 100644
--- a/otherlibs/unix/getgr.c
+++ b/otherlibs/unix/getgr.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getgroups.c b/otherlibs/unix/getgroups.c
index 4d34d5be90..485fabc45d 100644
--- a/otherlibs/unix/getgroups.c
+++ b/otherlibs/unix/getgroups.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/gethost.c b/otherlibs/unix/gethost.c
index 36fdfd8ef9..b0b29d9e06 100644
--- a/otherlibs/unix/gethost.c
+++ b/otherlibs/unix/gethost.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/gethostname.c b/otherlibs/unix/gethostname.c
index f84f8f5b56..cf334e9b80 100644
--- a/otherlibs/unix/gethostname.c
+++ b/otherlibs/unix/gethostname.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getlogin.c b/otherlibs/unix/getlogin.c
index 132ed443a4..60197a07bb 100644
--- a/otherlibs/unix/getlogin.c
+++ b/otherlibs/unix/getlogin.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getnameinfo.c b/otherlibs/unix/getnameinfo.c
index c887856993..eea15c59cf 100644
--- a/otherlibs/unix/getnameinfo.c
+++ b/otherlibs/unix/getnameinfo.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getpeername.c b/otherlibs/unix/getpeername.c
index 20a837ca19..3c4da55675 100644
--- a/otherlibs/unix/getpeername.c
+++ b/otherlibs/unix/getpeername.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getpid.c b/otherlibs/unix/getpid.c
index cb522749de..5cc4f3a68a 100644
--- a/otherlibs/unix/getpid.c
+++ b/otherlibs/unix/getpid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getppid.c b/otherlibs/unix/getppid.c
index 0d69aafb4a..2d1cd39493 100644
--- a/otherlibs/unix/getppid.c
+++ b/otherlibs/unix/getppid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getproto.c b/otherlibs/unix/getproto.c
index c9ca1a5c9e..0213e8795a 100644
--- a/otherlibs/unix/getproto.c
+++ b/otherlibs/unix/getproto.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getpw.c b/otherlibs/unix/getpw.c
index eba9d6c3c3..4317dc202f 100644
--- a/otherlibs/unix/getpw.c
+++ b/otherlibs/unix/getpw.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getserv.c b/otherlibs/unix/getserv.c
index e252aacb70..626f63b8a6 100644
--- a/otherlibs/unix/getserv.c
+++ b/otherlibs/unix/getserv.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getsockname.c b/otherlibs/unix/getsockname.c
index 6f0b64dcd3..8ab6debb09 100644
--- a/otherlibs/unix/getsockname.c
+++ b/otherlibs/unix/getsockname.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/gettimeofday.c b/otherlibs/unix/gettimeofday.c
index e095326e67..3e203d54e0 100644
--- a/otherlibs/unix/gettimeofday.c
+++ b/otherlibs/unix/gettimeofday.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/getuid.c b/otherlibs/unix/getuid.c
index 780a8d8ec4..db3fab130e 100644
--- a/otherlibs/unix/getuid.c
+++ b/otherlibs/unix/getuid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/gmtime.c b/otherlibs/unix/gmtime.c
index 2ffeb3927b..b55d70f4d9 100644
--- a/otherlibs/unix/gmtime.c
+++ b/otherlibs/unix/gmtime.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/initgroups.c b/otherlibs/unix/initgroups.c
index df358dae16..d5b3dc5680 100644
--- a/otherlibs/unix/initgroups.c
+++ b/otherlibs/unix/initgroups.c
@@ -1,6 +1,8 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
+/* */
+/* Contributed by Stephane Glondu <steph@glondu.net> */
/* */
/* Copyright 2009 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
@@ -9,8 +11,6 @@
/* */
/***********************************************************************/
-/* Contributed by Stephane Glondu <steph@glondu.net> */
-
/* $Id$ */
#include <mlvalues.h>
diff --git a/otherlibs/unix/isatty.c b/otherlibs/unix/isatty.c
index f534dd773b..c2bdaad1c1 100644
--- a/otherlibs/unix/isatty.c
+++ b/otherlibs/unix/isatty.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Gallium, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/itimer.c b/otherlibs/unix/itimer.c
index 14bac626ab..7c32783a9b 100644
--- a/otherlibs/unix/itimer.c
+++ b/otherlibs/unix/itimer.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/kill.c b/otherlibs/unix/kill.c
index 8d8a47340c..715060ee78 100644
--- a/otherlibs/unix/kill.c
+++ b/otherlibs/unix/kill.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/link.c b/otherlibs/unix/link.c
index 181e9c1800..e28f649ea0 100644
--- a/otherlibs/unix/link.c
+++ b/otherlibs/unix/link.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/listen.c b/otherlibs/unix/listen.c
index 2f40cfbafa..503cf6a6ad 100644
--- a/otherlibs/unix/listen.c
+++ b/otherlibs/unix/listen.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/lockf.c b/otherlibs/unix/lockf.c
index 6e6ce5c173..70359cf76d 100644
--- a/otherlibs/unix/lockf.c
+++ b/otherlibs/unix/lockf.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/lseek.c b/otherlibs/unix/lseek.c
index d8180eaea6..65d7d50e40 100644
--- a/otherlibs/unix/lseek.c
+++ b/otherlibs/unix/lseek.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/mkdir.c b/otherlibs/unix/mkdir.c
index 1b8fd6242f..fd935ae67a 100644
--- a/otherlibs/unix/mkdir.c
+++ b/otherlibs/unix/mkdir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/mkfifo.c b/otherlibs/unix/mkfifo.c
index 3e2cf3ddb5..30f247d90f 100644
--- a/otherlibs/unix/mkfifo.c
+++ b/otherlibs/unix/mkfifo.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/nice.c b/otherlibs/unix/nice.c
index 77def267c1..a0902f2309 100644
--- a/otherlibs/unix/nice.c
+++ b/otherlibs/unix/nice.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/open.c b/otherlibs/unix/open.c
index 421218308c..39c7328f9c 100644
--- a/otherlibs/unix/open.c
+++ b/otherlibs/unix/open.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/opendir.c b/otherlibs/unix/opendir.c
index 0497ef1f4f..bb4825812c 100644
--- a/otherlibs/unix/opendir.c
+++ b/otherlibs/unix/opendir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/pipe.c b/otherlibs/unix/pipe.c
index b68705e9ff..81baeaf4e1 100644
--- a/otherlibs/unix/pipe.c
+++ b/otherlibs/unix/pipe.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/putenv.c b/otherlibs/unix/putenv.c
index e403d2966f..0fc5534f5d 100644
--- a/otherlibs/unix/putenv.c
+++ b/otherlibs/unix/putenv.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/read.c b/otherlibs/unix/read.c
index 03a9e6aaa7..cd1eab8cf6 100644
--- a/otherlibs/unix/read.c
+++ b/otherlibs/unix/read.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/readdir.c b/otherlibs/unix/readdir.c
index fb8a67b20e..1d508ac6eb 100644
--- a/otherlibs/unix/readdir.c
+++ b/otherlibs/unix/readdir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/readlink.c b/otherlibs/unix/readlink.c
index d2b9c4e125..29d28d3d4a 100644
--- a/otherlibs/unix/readlink.c
+++ b/otherlibs/unix/readlink.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/rename.c b/otherlibs/unix/rename.c
index 65f33c8b57..d121037f27 100644
--- a/otherlibs/unix/rename.c
+++ b/otherlibs/unix/rename.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/rewinddir.c b/otherlibs/unix/rewinddir.c
index d14c526d96..7c7b4a3c89 100644
--- a/otherlibs/unix/rewinddir.c
+++ b/otherlibs/unix/rewinddir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/rmdir.c b/otherlibs/unix/rmdir.c
index 8de223464d..887496712d 100644
--- a/otherlibs/unix/rmdir.c
+++ b/otherlibs/unix/rmdir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/select.c b/otherlibs/unix/select.c
index 612d597014..0493839861 100644
--- a/otherlibs/unix/select.c
+++ b/otherlibs/unix/select.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/sendrecv.c b/otherlibs/unix/sendrecv.c
index bb3989af78..1f884aa87d 100644
--- a/otherlibs/unix/sendrecv.c
+++ b/otherlibs/unix/sendrecv.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/setgid.c b/otherlibs/unix/setgid.c
index bd8810f819..a1096f26ba 100644
--- a/otherlibs/unix/setgid.c
+++ b/otherlibs/unix/setgid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/setgroups.c b/otherlibs/unix/setgroups.c
index dd4592ad00..e681c97647 100644
--- a/otherlibs/unix/setgroups.c
+++ b/otherlibs/unix/setgroups.c
@@ -1,6 +1,8 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
+/* */
+/* Contributed by Stephane Glondu <steph@glondu.net> */
/* */
/* Copyright 2009 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
@@ -9,8 +11,6 @@
/* */
/***********************************************************************/
-/* Contributed by Stephane Glondu <steph@glondu.net> */
-
/* $Id$ */
#include <mlvalues.h>
diff --git a/otherlibs/unix/setsid.c b/otherlibs/unix/setsid.c
index bfa9dac0b2..9cc89e642c 100644
--- a/otherlibs/unix/setsid.c
+++ b/otherlibs/unix/setsid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/setuid.c b/otherlibs/unix/setuid.c
index c867f4c68b..4af0d781c9 100644
--- a/otherlibs/unix/setuid.c
+++ b/otherlibs/unix/setuid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/shutdown.c b/otherlibs/unix/shutdown.c
index d51b1a3de9..abd8c07344 100644
--- a/otherlibs/unix/shutdown.c
+++ b/otherlibs/unix/shutdown.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/signals.c b/otherlibs/unix/signals.c
index c388b13936..fb3acf00bf 100644
--- a/otherlibs/unix/signals.c
+++ b/otherlibs/unix/signals.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/sleep.c b/otherlibs/unix/sleep.c
index ec14e39d0b..aca1003c5c 100644
--- a/otherlibs/unix/sleep.c
+++ b/otherlibs/unix/sleep.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/socket.c b/otherlibs/unix/socket.c
index 82f6329c03..7243b8f15b 100644
--- a/otherlibs/unix/socket.c
+++ b/otherlibs/unix/socket.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/socketaddr.c b/otherlibs/unix/socketaddr.c
index f285d15a7b..caf83b785e 100644
--- a/otherlibs/unix/socketaddr.c
+++ b/otherlibs/unix/socketaddr.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/socketaddr.h b/otherlibs/unix/socketaddr.h
index 79bc80fa7a..43d7e91b4f 100644
--- a/otherlibs/unix/socketaddr.h
+++ b/otherlibs/unix/socketaddr.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/socketpair.c b/otherlibs/unix/socketpair.c
index df4dcff036..8a52dbb81b 100644
--- a/otherlibs/unix/socketpair.c
+++ b/otherlibs/unix/socketpair.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/sockopt.c b/otherlibs/unix/sockopt.c
index 31c95c1f55..6b3bfa4a4b 100644
--- a/otherlibs/unix/sockopt.c
+++ b/otherlibs/unix/sockopt.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/stat.c b/otherlibs/unix/stat.c
index 9cd0000632..17ae53c0b2 100644
--- a/otherlibs/unix/stat.c
+++ b/otherlibs/unix/stat.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/strofaddr.c b/otherlibs/unix/strofaddr.c
index ad9ea19117..a2c8cdc732 100644
--- a/otherlibs/unix/strofaddr.c
+++ b/otherlibs/unix/strofaddr.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/symlink.c b/otherlibs/unix/symlink.c
index 6085fd516d..b66c76bda1 100644
--- a/otherlibs/unix/symlink.c
+++ b/otherlibs/unix/symlink.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/termios.c b/otherlibs/unix/termios.c
index ce49d77e09..99cca2b643 100644
--- a/otherlibs/unix/termios.c
+++ b/otherlibs/unix/termios.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/time.c b/otherlibs/unix/time.c
index 2fdf4978e4..63eac84eb7 100644
--- a/otherlibs/unix/time.c
+++ b/otherlibs/unix/time.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/times.c b/otherlibs/unix/times.c
index aa32f10db0..94abde8a6d 100644
--- a/otherlibs/unix/times.c
+++ b/otherlibs/unix/times.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/truncate.c b/otherlibs/unix/truncate.c
index c23eb47b52..dfc350a329 100644
--- a/otherlibs/unix/truncate.c
+++ b/otherlibs/unix/truncate.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/umask.c b/otherlibs/unix/umask.c
index 6f5d14fd0c..cf5eaa7c08 100644
--- a/otherlibs/unix/umask.c
+++ b/otherlibs/unix/umask.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/unix.ml b/otherlibs/unix/unix.ml
index 8de827b0c8..eda85de0fd 100644
--- a/otherlibs/unix/unix.ml
+++ b/otherlibs/unix/unix.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/unix/unix.mli b/otherlibs/unix/unix.mli
index 614c206f26..38d1b96591 100644
--- a/otherlibs/unix/unix.mli
+++ b/otherlibs/unix/unix.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/unix/unixLabels.ml b/otherlibs/unix/unixLabels.ml
index 683f15ec67..424fcc6e62 100644
--- a/otherlibs/unix/unixLabels.ml
+++ b/otherlibs/unix/unixLabels.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/otherlibs/unix/unixLabels.mli b/otherlibs/unix/unixLabels.mli
index 7126d23e70..702a656a48 100644
--- a/otherlibs/unix/unixLabels.mli
+++ b/otherlibs/unix/unixLabels.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/unix/unixsupport.c b/otherlibs/unix/unixsupport.c
index c6eaf706c5..3138115a6f 100644
--- a/otherlibs/unix/unixsupport.c
+++ b/otherlibs/unix/unixsupport.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/unixsupport.h b/otherlibs/unix/unixsupport.h
index 84179f43f3..a90bb2dcf2 100644
--- a/otherlibs/unix/unixsupport.h
+++ b/otherlibs/unix/unixsupport.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/unlink.c b/otherlibs/unix/unlink.c
index 1d956758b3..3fb5151be0 100644
--- a/otherlibs/unix/unlink.c
+++ b/otherlibs/unix/unlink.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/utimes.c b/otherlibs/unix/utimes.c
index da2913570a..a6a2f5ebc5 100644
--- a/otherlibs/unix/utimes.c
+++ b/otherlibs/unix/utimes.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/wait.c b/otherlibs/unix/wait.c
index 486d06af7b..fc12e5ad5c 100644
--- a/otherlibs/unix/wait.c
+++ b/otherlibs/unix/wait.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/unix/write.c b/otherlibs/unix/write.c
index 9ddf74e3d5..ca42d1e75b 100644
--- a/otherlibs/unix/write.c
+++ b/otherlibs/unix/write.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32graph/Makefile.nt b/otherlibs/win32graph/Makefile.nt
index 12e3d23925..453d9f3c85 100644
--- a/otherlibs/win32graph/Makefile.nt
+++ b/otherlibs/win32graph/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/win32graph/dib.c b/otherlibs/win32graph/dib.c
index cbf4725a43..8acba6f132 100644
--- a/otherlibs/win32graph/dib.c
+++ b/otherlibs/win32graph/dib.c
@@ -1,8 +1,9 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Developed by Jacob Navia */
+/* */
/* Copyright 2001 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License, with */
diff --git a/otherlibs/win32graph/draw.c b/otherlibs/win32graph/draw.c
index 4bd60812a0..f089a01a32 100644
--- a/otherlibs/win32graph/draw.c
+++ b/otherlibs/win32graph/draw.c
@@ -1,8 +1,9 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Developed by Jacob Navia, based on code by J-M Geffroy and X Leroy */
+/* */
/* Copyright 2001 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License, with */
diff --git a/otherlibs/win32graph/events.c b/otherlibs/win32graph/events.c
index 9e0791c389..29def467ff 100755
--- a/otherlibs/win32graph/events.c
+++ b/otherlibs/win32graph/events.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32graph/libgraph.h b/otherlibs/win32graph/libgraph.h
index 6c32f15df6..96ac954e7d 100644
--- a/otherlibs/win32graph/libgraph.h
+++ b/otherlibs/win32graph/libgraph.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Jacob Navia, after Xavier Leroy */
/* */
diff --git a/otherlibs/win32graph/open.c b/otherlibs/win32graph/open.c
index 2797bc669a..8ffe259e5b 100644
--- a/otherlibs/win32graph/open.c
+++ b/otherlibs/win32graph/open.c
@@ -1,8 +1,9 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Developed by Jacob Navia, based on code by J-M Geffroy and X Leroy */
+/* */
/* Copyright 2001 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License, with */
diff --git a/otherlibs/win32unix/Makefile.nt b/otherlibs/win32unix/Makefile.nt
index 0d98b31695..80fcbf35b7 100644
--- a/otherlibs/win32unix/Makefile.nt
+++ b/otherlibs/win32unix/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/otherlibs/win32unix/accept.c b/otherlibs/win32unix/accept.c
index 1d54b89b32..48d028790f 100644
--- a/otherlibs/win32unix/accept.c
+++ b/otherlibs/win32unix/accept.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/bind.c b/otherlibs/win32unix/bind.c
index fca9694890..84d07570c3 100644
--- a/otherlibs/win32unix/bind.c
+++ b/otherlibs/win32unix/bind.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/channels.c b/otherlibs/win32unix/channels.c
index 56a19c7dc3..2a3774d90e 100644
--- a/otherlibs/win32unix/channels.c
+++ b/otherlibs/win32unix/channels.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/close.c b/otherlibs/win32unix/close.c
index 21254ef1e1..f7463690b6 100644
--- a/otherlibs/win32unix/close.c
+++ b/otherlibs/win32unix/close.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/close_on.c b/otherlibs/win32unix/close_on.c
index 5b2c4ece32..b64dd44dd3 100644
--- a/otherlibs/win32unix/close_on.c
+++ b/otherlibs/win32unix/close_on.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/connect.c b/otherlibs/win32unix/connect.c
index 198d02e2de..bd342a2ea8 100644
--- a/otherlibs/win32unix/connect.c
+++ b/otherlibs/win32unix/connect.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/createprocess.c b/otherlibs/win32unix/createprocess.c
index 042eaef9e7..714513cacb 100644
--- a/otherlibs/win32unix/createprocess.c
+++ b/otherlibs/win32unix/createprocess.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/dup.c b/otherlibs/win32unix/dup.c
index 2668e75bf1..a86211bbb1 100644
--- a/otherlibs/win32unix/dup.c
+++ b/otherlibs/win32unix/dup.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/dup2.c b/otherlibs/win32unix/dup2.c
index 3f6d37e76d..f224fc54e7 100644
--- a/otherlibs/win32unix/dup2.c
+++ b/otherlibs/win32unix/dup2.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/errmsg.c b/otherlibs/win32unix/errmsg.c
index 9ce9dddb2a..1f07e514fd 100644
--- a/otherlibs/win32unix/errmsg.c
+++ b/otherlibs/win32unix/errmsg.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/getpeername.c b/otherlibs/win32unix/getpeername.c
index 9aeb4c21b0..8517f54672 100644
--- a/otherlibs/win32unix/getpeername.c
+++ b/otherlibs/win32unix/getpeername.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/getpid.c b/otherlibs/win32unix/getpid.c
index 0892f8f95c..677acdc55f 100644
--- a/otherlibs/win32unix/getpid.c
+++ b/otherlibs/win32unix/getpid.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/getsockname.c b/otherlibs/win32unix/getsockname.c
index 88487a43bd..3af6c3412b 100644
--- a/otherlibs/win32unix/getsockname.c
+++ b/otherlibs/win32unix/getsockname.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/gettimeofday.c b/otherlibs/win32unix/gettimeofday.c
index f1313f0617..b68eeb1ad2 100644
--- a/otherlibs/win32unix/gettimeofday.c
+++ b/otherlibs/win32unix/gettimeofday.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/link.c b/otherlibs/win32unix/link.c
index 8921434234..05320491ed 100644
--- a/otherlibs/win32unix/link.c
+++ b/otherlibs/win32unix/link.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* File contributed by Lionel Fourquaux */
/* */
diff --git a/otherlibs/win32unix/listen.c b/otherlibs/win32unix/listen.c
index 20789e1a4c..402247fd09 100644
--- a/otherlibs/win32unix/listen.c
+++ b/otherlibs/win32unix/listen.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/lockf.c b/otherlibs/win32unix/lockf.c
index 524f9516b6..1a47824dcb 100644
--- a/otherlibs/win32unix/lockf.c
+++ b/otherlibs/win32unix/lockf.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Contributed by Tracy Camp, PolyServe Inc., <campt@polyserve.com> */
/* Further improvements by Reed Wilson */
diff --git a/otherlibs/win32unix/lseek.c b/otherlibs/win32unix/lseek.c
index 9619fcc92a..86ea537dca 100644
--- a/otherlibs/win32unix/lseek.c
+++ b/otherlibs/win32unix/lseek.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/mkdir.c b/otherlibs/win32unix/mkdir.c
index aae54783bc..d47d7a28bf 100644
--- a/otherlibs/win32unix/mkdir.c
+++ b/otherlibs/win32unix/mkdir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/nonblock.c b/otherlibs/win32unix/nonblock.c
index 1bf80bfc7e..8df1048d50 100755
--- a/otherlibs/win32unix/nonblock.c
+++ b/otherlibs/win32unix/nonblock.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/open.c b/otherlibs/win32unix/open.c
index f2f334bbb4..4f90ed7612 100644
--- a/otherlibs/win32unix/open.c
+++ b/otherlibs/win32unix/open.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/pipe.c b/otherlibs/win32unix/pipe.c
index afacd3e17e..ca0df36996 100644
--- a/otherlibs/win32unix/pipe.c
+++ b/otherlibs/win32unix/pipe.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/read.c b/otherlibs/win32unix/read.c
index 67882eb77a..c885857bf8 100644
--- a/otherlibs/win32unix/read.c
+++ b/otherlibs/win32unix/read.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/rename.c b/otherlibs/win32unix/rename.c
index 9ab43fca89..6b750eba3e 100644
--- a/otherlibs/win32unix/rename.c
+++ b/otherlibs/win32unix/rename.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Contributed by Tracy Camp, PolyServe Inc., <campt@polyserve.com> */
/* */
diff --git a/otherlibs/win32unix/select.c b/otherlibs/win32unix/select.c
index b82c423cc5..d96c3d9d28 100644
--- a/otherlibs/win32unix/select.c
+++ b/otherlibs/win32unix/select.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Contributed by Sylvain Le Gall for Lexifi */
/* */
diff --git a/otherlibs/win32unix/sendrecv.c b/otherlibs/win32unix/sendrecv.c
index 855957bd4a..8837c99940 100644
--- a/otherlibs/win32unix/sendrecv.c
+++ b/otherlibs/win32unix/sendrecv.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/shutdown.c b/otherlibs/win32unix/shutdown.c
index f3d2c6e03f..dd4e7ed346 100644
--- a/otherlibs/win32unix/shutdown.c
+++ b/otherlibs/win32unix/shutdown.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/sleep.c b/otherlibs/win32unix/sleep.c
index 421e5f9023..682096728a 100644
--- a/otherlibs/win32unix/sleep.c
+++ b/otherlibs/win32unix/sleep.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/socket.c b/otherlibs/win32unix/socket.c
index 3cd55ec29f..abdab25f3a 100644
--- a/otherlibs/win32unix/socket.c
+++ b/otherlibs/win32unix/socket.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/socketaddr.h b/otherlibs/win32unix/socketaddr.h
index 8abc63b477..3d2c667544 100644
--- a/otherlibs/win32unix/socketaddr.h
+++ b/otherlibs/win32unix/socketaddr.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/sockopt.c b/otherlibs/win32unix/sockopt.c
index f82d810e6e..94a6c04023 100644
--- a/otherlibs/win32unix/sockopt.c
+++ b/otherlibs/win32unix/sockopt.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/startup.c b/otherlibs/win32unix/startup.c
index 8417e13669..8d4def6cba 100644
--- a/otherlibs/win32unix/startup.c
+++ b/otherlibs/win32unix/startup.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/stat.c b/otherlibs/win32unix/stat.c
index 79fc3b2eb7..08ad397ca1 100644
--- a/otherlibs/win32unix/stat.c
+++ b/otherlibs/win32unix/stat.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/system.c b/otherlibs/win32unix/system.c
index 51dc9bfb7b..8abfa6f88c 100644
--- a/otherlibs/win32unix/system.c
+++ b/otherlibs/win32unix/system.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/unix.ml b/otherlibs/win32unix/unix.ml
index c8396d7fd4..c513ee4dab 100644
--- a/otherlibs/win32unix/unix.ml
+++ b/otherlibs/win32unix/unix.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/otherlibs/win32unix/unixsupport.c b/otherlibs/win32unix/unixsupport.c
index 45d689ff6f..2a45684a69 100644
--- a/otherlibs/win32unix/unixsupport.c
+++ b/otherlibs/win32unix/unixsupport.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/unixsupport.h b/otherlibs/win32unix/unixsupport.h
index d56158304d..f50d40c093 100644
--- a/otherlibs/win32unix/unixsupport.h
+++ b/otherlibs/win32unix/unixsupport.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/windbug.c b/otherlibs/win32unix/windbug.c
index e3a2772dbf..0370d2de7d 100644
--- a/otherlibs/win32unix/windbug.c
+++ b/otherlibs/win32unix/windbug.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Contributed by Sylvain Le Gall for Lexifi */
/* */
diff --git a/otherlibs/win32unix/windbug.h b/otherlibs/win32unix/windbug.h
index 69cbd3b6e9..3e23413619 100644
--- a/otherlibs/win32unix/windbug.h
+++ b/otherlibs/win32unix/windbug.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Contributed by Sylvain Le Gall for Lexifi */
/* */
diff --git a/otherlibs/win32unix/windir.c b/otherlibs/win32unix/windir.c
index 8b96589ec9..240b863b2b 100644
--- a/otherlibs/win32unix/windir.c
+++ b/otherlibs/win32unix/windir.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Pascal Cuoq and Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/winlist.c b/otherlibs/win32unix/winlist.c
index 318a0addfd..bbb2e7cffa 100644
--- a/otherlibs/win32unix/winlist.c
+++ b/otherlibs/win32unix/winlist.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Contributed by Sylvain Le Gall for Lexifi */
/* */
diff --git a/otherlibs/win32unix/winlist.h b/otherlibs/win32unix/winlist.h
index be388a4ca2..1f0a8435ab 100644
--- a/otherlibs/win32unix/winlist.h
+++ b/otherlibs/win32unix/winlist.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Contributed by Sylvain Le Gall for Lexifi */
/* */
diff --git a/otherlibs/win32unix/winwait.c b/otherlibs/win32unix/winwait.c
index 895a6926b8..db13231ae2 100644
--- a/otherlibs/win32unix/winwait.c
+++ b/otherlibs/win32unix/winwait.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Pascal Cuoq and Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/otherlibs/win32unix/winworker.c b/otherlibs/win32unix/winworker.c
index 57f95a9ae6..01c7dc4002 100644
--- a/otherlibs/win32unix/winworker.c
+++ b/otherlibs/win32unix/winworker.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Contributed by Sylvain Le Gall for Lexifi */
/* */
diff --git a/otherlibs/win32unix/winworker.h b/otherlibs/win32unix/winworker.h
index 06450a4ec3..caf9067a61 100644
--- a/otherlibs/win32unix/winworker.h
+++ b/otherlibs/win32unix/winworker.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Contributed by Sylvain Le Gall for Lexifi */
/* */
diff --git a/otherlibs/win32unix/write.c b/otherlibs/win32unix/write.c
index 190d902539..46d75ccba9 100644
--- a/otherlibs/win32unix/write.c
+++ b/otherlibs/win32unix/write.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/parsing/asttypes.mli b/parsing/asttypes.mli
index 2530b44c6a..d23a87fb7b 100644
--- a/parsing/asttypes.mli
+++ b/parsing/asttypes.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/lexer.mli b/parsing/lexer.mli
index 3ddb5dde7c..175eedc900 100644
--- a/parsing/lexer.mli
+++ b/parsing/lexer.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/lexer.mll b/parsing/lexer.mll
index 5da264ec09..20af0fb313 100644
--- a/parsing/lexer.mll
+++ b/parsing/lexer.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/linenum.mli b/parsing/linenum.mli
index 50cc57e8ee..e63694761b 100644
--- a/parsing/linenum.mli
+++ b/parsing/linenum.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/linenum.mll b/parsing/linenum.mll
index 91e71e972c..1844d361f7 100644
--- a/parsing/linenum.mll
+++ b/parsing/linenum.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/location.ml b/parsing/location.ml
index 15b074acd4..e9a988245b 100644
--- a/parsing/location.ml
+++ b/parsing/location.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/location.mli b/parsing/location.mli
index a496a35506..2215d98646 100644
--- a/parsing/location.mli
+++ b/parsing/location.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/longident.ml b/parsing/longident.ml
index 1b459ca3f4..1114a2ef55 100644
--- a/parsing/longident.ml
+++ b/parsing/longident.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/longident.mli b/parsing/longident.mli
index 4568bc953c..a802049b96 100644
--- a/parsing/longident.mli
+++ b/parsing/longident.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/parse.ml b/parsing/parse.ml
index 7f3e4cdc02..edeed48f24 100644
--- a/parsing/parse.ml
+++ b/parsing/parse.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/parse.mli b/parsing/parse.mli
index 87a09f0e2a..85e08bc482 100644
--- a/parsing/parse.mli
+++ b/parsing/parse.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/parser.mly b/parsing/parser.mly
index 9bba8768c6..30a96d672b 100644
--- a/parsing/parser.mly
+++ b/parsing/parser.mly
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/parsing/parsetree.mli b/parsing/parsetree.mli
index 976283ff19..0f03141f11 100644
--- a/parsing/parsetree.mli
+++ b/parsing/parsetree.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/printast.ml b/parsing/printast.ml
index 2b236ae827..2ca0c8d942 100644
--- a/parsing/printast.ml
+++ b/parsing/printast.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/printast.mli b/parsing/printast.mli
index 7ea148678d..096f461727 100644
--- a/parsing/printast.mli
+++ b/parsing/printast.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/syntaxerr.ml b/parsing/syntaxerr.ml
index edaabda122..00e06bba08 100644
--- a/parsing/syntaxerr.ml
+++ b/parsing/syntaxerr.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/parsing/syntaxerr.mli b/parsing/syntaxerr.mli
index 4e9679926a..10a07d14c9 100644
--- a/parsing/syntaxerr.mli
+++ b/parsing/syntaxerr.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/Compflags b/stdlib/Compflags
index 8578751c94..6ab038f44b 100755
--- a/stdlib/Compflags
+++ b/stdlib/Compflags
@@ -1,7 +1,7 @@
#!/bin/sh
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 59a2e18fb1..2c8e067063 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/stdlib/Makefile.nt b/stdlib/Makefile.nt
index b21f0a375c..579391a775 100644
--- a/stdlib/Makefile.nt
+++ b/stdlib/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/stdlib/Makefile.shared b/stdlib/Makefile.shared
index d1b1812785..0752a1b5f1 100755
--- a/stdlib/Makefile.shared
+++ b/stdlib/Makefile.shared
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/stdlib/StdlibModules b/stdlib/StdlibModules
index 4f689f8c4a..926e2cb514 100644
--- a/stdlib/StdlibModules
+++ b/stdlib/StdlibModules
@@ -1,7 +1,23 @@
-# This file lists all standard library modules. -*- Makefile -*-
-# It is used in particular to know what to expunge in toplevels.
+# -*- Makefile -*-
+
+#########################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License, with #
+# the special exception on linking described in file ../LICENSE. #
+# #
+#########################################################################
+
# $Id$
+# This file lists all standard library modules.
+# It is used in particular to know what to expunge in toplevels.
+
STDLIB_MODULES=\
arg \
array \
diff --git a/stdlib/arg.ml b/stdlib/arg.ml
index ac552d38e8..d5d1bdf74d 100644
--- a/stdlib/arg.ml
+++ b/stdlib/arg.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/arg.mli b/stdlib/arg.mli
index 8872566152..1fff78f190 100644
--- a/stdlib/arg.mli
+++ b/stdlib/arg.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/array.ml b/stdlib/array.ml
index d1cbd65576..e29b2fe831 100644
--- a/stdlib/array.ml
+++ b/stdlib/array.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/array.mli b/stdlib/array.mli
index 9fb74b06eb..df5b1c41c6 100644
--- a/stdlib/array.mli
+++ b/stdlib/array.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/arrayLabels.ml b/stdlib/arrayLabels.ml
index fed0ad1c2c..652f4cac42 100644
--- a/stdlib/arrayLabels.ml
+++ b/stdlib/arrayLabels.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/stdlib/arrayLabels.mli b/stdlib/arrayLabels.mli
index f45f70c6de..d4833e0269 100644
--- a/stdlib/arrayLabels.mli
+++ b/stdlib/arrayLabels.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/buffer.ml b/stdlib/buffer.ml
index 9327aaefb5..541717ade8 100644
--- a/stdlib/buffer.ml
+++ b/stdlib/buffer.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis and Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/buffer.mli b/stdlib/buffer.mli
index efe2e9ea2e..ce70c983e9 100644
--- a/stdlib/buffer.mli
+++ b/stdlib/buffer.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis and Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/callback.ml b/stdlib/callback.ml
index 819f9d3f40..a8a490c46b 100644
--- a/stdlib/callback.ml
+++ b/stdlib/callback.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/callback.mli b/stdlib/callback.mli
index ba2ab7ecb7..dfb31617a2 100644
--- a/stdlib/callback.mli
+++ b/stdlib/callback.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/camlinternalLazy.ml b/stdlib/camlinternalLazy.ml
index 46cf42788a..042a377c9d 100644
--- a/stdlib/camlinternalLazy.ml
+++ b/stdlib/camlinternalLazy.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/camlinternalLazy.mli b/stdlib/camlinternalLazy.mli
index 37b707d4f9..99de7ed84f 100644
--- a/stdlib/camlinternalLazy.mli
+++ b/stdlib/camlinternalLazy.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/camlinternalMod.ml b/stdlib/camlinternalMod.ml
index 12a77cc8fb..36d73bdcf2 100644
--- a/stdlib/camlinternalMod.ml
+++ b/stdlib/camlinternalMod.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/camlinternalMod.mli b/stdlib/camlinternalMod.mli
index 74bf28db28..dc8c61ca06 100644
--- a/stdlib/camlinternalMod.mli
+++ b/stdlib/camlinternalMod.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/camlinternalOO.ml b/stdlib/camlinternalOO.ml
index 2ffa71c0a2..db3aef73df 100644
--- a/stdlib/camlinternalOO.ml
+++ b/stdlib/camlinternalOO.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/camlinternalOO.mli b/stdlib/camlinternalOO.mli
index d2aeea319b..f02b020360 100644
--- a/stdlib/camlinternalOO.mli
+++ b/stdlib/camlinternalOO.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/char.ml b/stdlib/char.ml
index 28a1bcc46c..6dafbad2b3 100644
--- a/stdlib/char.ml
+++ b/stdlib/char.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/char.mli b/stdlib/char.mli
index 8ab72bd9a6..34bd6c23d0 100644
--- a/stdlib/char.mli
+++ b/stdlib/char.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
@@ -26,7 +26,7 @@ val chr : int -> char
val escaped : char -> string
(** Return a string representing the given character,
with special characters escaped following the lexical conventions
- of Objective Caml. *)
+ of OCaml. *)
val lowercase : char -> char
(** Convert the given character to its equivalent lowercase character. *)
diff --git a/stdlib/complex.ml b/stdlib/complex.ml
index 3c28a58b79..c52e647cc9 100644
--- a/stdlib/complex.ml
+++ b/stdlib/complex.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/complex.mli b/stdlib/complex.mli
index 3c3b361d27..1bfa8b7bc8 100644
--- a/stdlib/complex.mli
+++ b/stdlib/complex.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/digest.ml b/stdlib/digest.ml
index 78a45d54ee..7d69141561 100644
--- a/stdlib/digest.ml
+++ b/stdlib/digest.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/digest.mli b/stdlib/digest.mli
index 981bd02fc3..14f27e2630 100644
--- a/stdlib/digest.mli
+++ b/stdlib/digest.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/filename.ml b/stdlib/filename.ml
index e11f1e3304..92bd217188 100644
--- a/stdlib/filename.ml
+++ b/stdlib/filename.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Damien Doligez, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/filename.mli b/stdlib/filename.mli
index efbdcd98d5..7e447585ca 100644
--- a/stdlib/filename.mli
+++ b/stdlib/filename.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/format.ml b/stdlib/format.ml
index 56648dd6ab..9cb9a1afd3 100644
--- a/stdlib/format.ml
+++ b/stdlib/format.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/format.mli b/stdlib/format.mli
index 9b49c53f46..8ddc0f5194 100644
--- a/stdlib/format.mli
+++ b/stdlib/format.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/gc.ml b/stdlib/gc.ml
index 6482ebb78b..16a354a35f 100644
--- a/stdlib/gc.ml
+++ b/stdlib/gc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/gc.mli b/stdlib/gc.mli
index 142a38af20..ec6cc17c30 100644
--- a/stdlib/gc.mli
+++ b/stdlib/gc.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/genlex.ml b/stdlib/genlex.ml
index 6ecc2805a9..1c6276c9f9 100644
--- a/stdlib/genlex.ml
+++ b/stdlib/genlex.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/genlex.mli b/stdlib/genlex.mli
index 93bc5f55e8..d7cecc781e 100644
--- a/stdlib/genlex.mli
+++ b/stdlib/genlex.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/hashtbl.ml b/stdlib/hashtbl.ml
index 0c6b1324dd..b91b8e5120 100644
--- a/stdlib/hashtbl.ml
+++ b/stdlib/hashtbl.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/hashtbl.mli b/stdlib/hashtbl.mli
index 774443f9fd..6fb3c10299 100644
--- a/stdlib/hashtbl.mli
+++ b/stdlib/hashtbl.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/header.c b/stdlib/header.c
index eda76325a6..c82c7bc7f8 100644
--- a/stdlib/header.c
+++ b/stdlib/header.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/stdlib/headernt.c b/stdlib/headernt.c
index 77f368afd9..9972d5d5c1 100644
--- a/stdlib/headernt.c
+++ b/stdlib/headernt.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/stdlib/int32.ml b/stdlib/int32.ml
index 64d525e88f..15237d7f48 100644
--- a/stdlib/int32.ml
+++ b/stdlib/int32.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/int32.mli b/stdlib/int32.mli
index eeafb1a2fc..8bc7384ff2 100644
--- a/stdlib/int32.mli
+++ b/stdlib/int32.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/int64.ml b/stdlib/int64.ml
index e916fa4e0d..d8b1c3ca32 100644
--- a/stdlib/int64.ml
+++ b/stdlib/int64.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/int64.mli b/stdlib/int64.mli
index 3b641338e7..1f28f5c49b 100644
--- a/stdlib/int64.mli
+++ b/stdlib/int64.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/lazy.ml b/stdlib/lazy.ml
index b1a9cbbda3..359fcaa637 100644
--- a/stdlib/lazy.ml
+++ b/stdlib/lazy.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
@@ -18,7 +18,7 @@
(*
WARNING: some purple magic is going on here. Do not take this file
- as an example of how to program in Objective Caml.
+ as an example of how to program in OCaml.
*)
diff --git a/stdlib/lazy.mli b/stdlib/lazy.mli
index 3b85717f14..4a3b5df0fb 100644
--- a/stdlib/lazy.mli
+++ b/stdlib/lazy.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/lexing.ml b/stdlib/lexing.ml
index 9e01415265..4d03ec088a 100644
--- a/stdlib/lexing.ml
+++ b/stdlib/lexing.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/lexing.mli b/stdlib/lexing.mli
index 2edb6c5df2..6008e127b7 100644
--- a/stdlib/lexing.mli
+++ b/stdlib/lexing.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/list.ml b/stdlib/list.ml
index c6b1618847..aea05b4bf3 100644
--- a/stdlib/list.ml
+++ b/stdlib/list.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/list.mli b/stdlib/list.mli
index 547fb13287..996436ef50 100644
--- a/stdlib/list.mli
+++ b/stdlib/list.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/listLabels.ml b/stdlib/listLabels.ml
index be7bddea36..62b6e37687 100644
--- a/stdlib/listLabels.ml
+++ b/stdlib/listLabels.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/stdlib/listLabels.mli b/stdlib/listLabels.mli
index 94c875a6cd..324df1394d 100644
--- a/stdlib/listLabels.mli
+++ b/stdlib/listLabels.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/map.ml b/stdlib/map.ml
index 3d9597aa0e..8f658b2126 100644
--- a/stdlib/map.ml
+++ b/stdlib/map.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/map.mli b/stdlib/map.mli
index b025b8c0a6..a6374dbdf6 100644
--- a/stdlib/map.mli
+++ b/stdlib/map.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/marshal.ml b/stdlib/marshal.ml
index 0410a23e99..c42851504f 100644
--- a/stdlib/marshal.ml
+++ b/stdlib/marshal.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/marshal.mli b/stdlib/marshal.mli
index ac0775bb16..800f061e3c 100644
--- a/stdlib/marshal.mli
+++ b/stdlib/marshal.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
@@ -20,7 +20,7 @@
sent over a pipe or network connection. The bytes can then
be read back later, possibly in another process, and decoded back
into a data structure. The format for the byte sequences
- is compatible across all machines for a given version of Objective Caml.
+ is compatible across all machines for a given version of OCaml.
Warning: marshaling is currently not type-safe. The type
of marshaled data is not transmitted along the value of the data,
diff --git a/stdlib/moreLabels.ml b/stdlib/moreLabels.ml
index f6cfddabc6..3fda7a5b32 100644
--- a/stdlib/moreLabels.ml
+++ b/stdlib/moreLabels.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/stdlib/moreLabels.mli b/stdlib/moreLabels.mli
index 21b60bdd72..accf7f3e83 100644
--- a/stdlib/moreLabels.mli
+++ b/stdlib/moreLabels.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
@@ -19,7 +19,7 @@
{!Map} and {!Set} modules.
They only differ by their labels. They are provided to help
- porting from previous versions of Objective Caml.
+ porting from previous versions of OCaml.
The contents of this module are subject to change.
*)
diff --git a/stdlib/nativeint.ml b/stdlib/nativeint.ml
index 9347843619..4bba76d566 100644
--- a/stdlib/nativeint.ml
+++ b/stdlib/nativeint.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/nativeint.mli b/stdlib/nativeint.mli
index ff499a26f8..7de11ea00d 100644
--- a/stdlib/nativeint.mli
+++ b/stdlib/nativeint.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/obj.ml b/stdlib/obj.ml
index c16b511560..96de162f6c 100644
--- a/stdlib/obj.ml
+++ b/stdlib/obj.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/obj.mli b/stdlib/obj.mli
index 57df04917d..9b66723b2a 100644
--- a/stdlib/obj.mli
+++ b/stdlib/obj.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/oo.ml b/stdlib/oo.ml
index c9ec64ae44..40c8ae6e4a 100644
--- a/stdlib/oo.ml
+++ b/stdlib/oo.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/oo.mli b/stdlib/oo.mli
index b3111ce857..cd83151bb8 100644
--- a/stdlib/oo.mli
+++ b/stdlib/oo.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/parsing.ml b/stdlib/parsing.ml
index 5d53c74132..55a8f53aab 100644
--- a/stdlib/parsing.ml
+++ b/stdlib/parsing.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/parsing.mli b/stdlib/parsing.mli
index 03721ba308..0d053b899e 100644
--- a/stdlib/parsing.mli
+++ b/stdlib/parsing.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml
index b4277953c8..5148f228fa 100644
--- a/stdlib/pervasives.ml
+++ b/stdlib/pervasives.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/pervasives.mli b/stdlib/pervasives.mli
index 2062f8fdbe..e5b21d1106 100644
--- a/stdlib/pervasives.mli
+++ b/stdlib/pervasives.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
@@ -655,7 +655,7 @@ val output_binary_int : out_channel -> int -> unit
The given integer is taken modulo 2{^32}.
The only reliable way to read it back is through the
{!Pervasives.input_binary_int} function. The format is compatible across
- all machines for a given version of Objective Caml. *)
+ all machines for a given version of OCaml. *)
val output_value : out_channel -> 'a -> unit
(** Write the representation of a structured value of any type
@@ -868,8 +868,7 @@ external decr : int ref -> unit = "%decr"
(** Format strings have a general and highly polymorphic type
[('a, 'b, 'c, 'd, 'e, 'f) format6]. Type [format6] is built in.
The two simplified types, [format] and [format4] below are
- included for backward compatibility with earlier releases of Objective
- Caml.
+ included for backward compatibility with earlier releases of OCaml.
['a] is the type of the parameters of the format,
['b] is the type of the first argument given to
[%a] and [%t] printing functions,
diff --git a/stdlib/printexc.ml b/stdlib/printexc.ml
index 9e435c590b..6f71b497fe 100644
--- a/stdlib/printexc.ml
+++ b/stdlib/printexc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/printexc.mli b/stdlib/printexc.mli
index 319ba52c4a..93ee5d6d1a 100644
--- a/stdlib/printexc.mli
+++ b/stdlib/printexc.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/printf.ml b/stdlib/printf.ml
index dc88335f68..afca2034ee 100644
--- a/stdlib/printf.ml
+++ b/stdlib/printf.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/printf.mli b/stdlib/printf.mli
index e122dececa..797a354dd0 100644
--- a/stdlib/printf.mli
+++ b/stdlib/printf.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/queue.ml b/stdlib/queue.ml
index 9e21686a13..605a892046 100644
--- a/stdlib/queue.ml
+++ b/stdlib/queue.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* François Pottier, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/queue.mli b/stdlib/queue.mli
index 085cfb003e..5dea9244bc 100644
--- a/stdlib/queue.mli
+++ b/stdlib/queue.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/random.ml b/stdlib/random.ml
index bd3979914a..44b8301501 100644
--- a/stdlib/random.ml
+++ b/stdlib/random.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/random.mli b/stdlib/random.mli
index 88387d191b..389ef8d218 100644
--- a/stdlib/random.mli
+++ b/stdlib/random.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/scanf.ml b/stdlib/scanf.ml
index aa6e65621b..a11613c203 100644
--- a/stdlib/scanf.ml
+++ b/stdlib/scanf.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/scanf.mli b/stdlib/scanf.mli
index 373c9ae31e..38cbad8656 100644
--- a/stdlib/scanf.mli
+++ b/stdlib/scanf.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/set.ml b/stdlib/set.ml
index 375fc5d0e4..63e965fa4f 100644
--- a/stdlib/set.ml
+++ b/stdlib/set.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/set.mli b/stdlib/set.mli
index 851a9ef51c..0f1a3b7c96 100644
--- a/stdlib/set.mli
+++ b/stdlib/set.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/sort.ml b/stdlib/sort.ml
index 7c53ab7774..66546b12b1 100644
--- a/stdlib/sort.ml
+++ b/stdlib/sort.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/sort.mli b/stdlib/sort.mli
index 7069052eb4..4f2a961aaa 100644
--- a/stdlib/sort.mli
+++ b/stdlib/sort.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/stack.ml b/stdlib/stack.ml
index 03277d0794..599b10c8bb 100644
--- a/stdlib/stack.ml
+++ b/stdlib/stack.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/stack.mli b/stdlib/stack.mli
index bf33d01aba..2d7a90066a 100644
--- a/stdlib/stack.mli
+++ b/stdlib/stack.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/stdLabels.ml b/stdlib/stdLabels.ml
index bd6a5841de..468dd5176e 100644
--- a/stdlib/stdLabels.ml
+++ b/stdlib/stdLabels.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/stdlib/stdLabels.mli b/stdlib/stdLabels.mli
index 73f72dc687..cb1ba01a44 100644
--- a/stdlib/stdLabels.mli
+++ b/stdlib/stdLabels.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/stdlib/std_exit.ml b/stdlib/std_exit.ml
index 6f5ff301aa..c56153738f 100644
--- a/stdlib/std_exit.ml
+++ b/stdlib/std_exit.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/stream.ml b/stdlib/stream.ml
index aa6a2a2ab2..fc66acb3e9 100644
--- a/stdlib/stream.ml
+++ b/stdlib/stream.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Ocaml *)
+(* OCaml *)
(* *)
(* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/stream.mli b/stdlib/stream.mli
index 28cfd3a1c4..2859e65e0e 100644
--- a/stdlib/stream.mli
+++ b/stdlib/stream.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Ocaml *)
+(* OCaml *)
(* *)
(* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/string.ml b/stdlib/string.ml
index 72f9494cc0..7eafec02fc 100644
--- a/stdlib/string.ml
+++ b/stdlib/string.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/string.mli b/stdlib/string.mli
index 8c08898037..3a7976bd20 100644
--- a/stdlib/string.mli
+++ b/stdlib/string.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
@@ -104,7 +104,7 @@ val iteri : (int -> char -> unit) -> string -> unit
val escaped : string -> string
(** Return a copy of the argument, with special characters
represented by escape sequences, following the lexical
- conventions of Objective Caml. If there is no special
+ conventions of OCaml. If there is no special
character in the argument, return the original string itself,
not a copy. *)
diff --git a/stdlib/stringLabels.ml b/stdlib/stringLabels.ml
index 87d23d86fc..2345d4992c 100644
--- a/stdlib/stringLabels.ml
+++ b/stdlib/stringLabels.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/stdlib/stringLabels.mli b/stdlib/stringLabels.mli
index d1a3966f57..5a17c67dae 100644
--- a/stdlib/stringLabels.mli
+++ b/stdlib/stringLabels.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
@@ -94,7 +94,7 @@ val iteri : f:(int -> char -> unit) -> string -> unit
val escaped : string -> string
(** Return a copy of the argument, with special characters
represented by escape sequences, following the lexical
- conventions of Objective Caml. If there is no special
+ conventions of OCaml. If there is no special
character in the argument, return the original string itself,
not a copy. *)
diff --git a/stdlib/sys.mli b/stdlib/sys.mli
index 713038aa7a..ee5021dcc1 100644
--- a/stdlib/sys.mli
+++ b/stdlib/sys.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
@@ -199,7 +199,7 @@ val catch_break : bool -> unit
val ocaml_version : string;;
-(** [ocaml_version] is the version of Objective Caml.
+(** [ocaml_version] is the version of OCaml.
It is a string of the form ["major.minor[.patchlevel][+additional-info]"],
where [major], [minor], and [patchlevel] are integers, and
[additional-info] is an arbitrary string. The [[.patchlevel]] and
diff --git a/stdlib/sys.mlp b/stdlib/sys.mlp
index b58ca0bb3a..b83cbb287c 100644
--- a/stdlib/sys.mlp
+++ b/stdlib/sys.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/weak.ml b/stdlib/weak.ml
index 4adacd8e4a..bbd3debc44 100644
--- a/stdlib/weak.ml
+++ b/stdlib/weak.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/stdlib/weak.mli b/stdlib/weak.mli
index 33f4bf1d0c..add9b0abb2 100644
--- a/stdlib/weak.mli
+++ b/stdlib/weak.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/interactive/lib-gc/alloc.ml b/testsuite/interactive/lib-gc/alloc.ml
index ea103e42af..dbcb3e4fda 100644
--- a/testsuite/interactive/lib-gc/alloc.ml
+++ b/testsuite/interactive/lib-gc/alloc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Para, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/interactive/lib-graph-2/graph_test.ml b/testsuite/interactive/lib-graph-2/graph_test.ml
index 217e2fa56f..39b845675d 100644
--- a/testsuite/interactive/lib-graph-2/graph_test.ml
+++ b/testsuite/interactive/lib-graph-2/graph_test.ml
@@ -1,13 +1,12 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
(* Copyright 2000 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
-(* under the terms of the GNU Library General Public License, with *)
-(* the special exception on linking described in file ../../LICENSE. *)
+(* under the terms of the Q Public License version 1.0. *)
(* *)
(***********************************************************************)
diff --git a/testsuite/lib/testing.ml b/testsuite/lib/testing.ml
index 2015aa1472..aa8933a789 100644
--- a/testsuite/lib/testing.ml
+++ b/testsuite/lib/testing.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/lib/testing.mli b/testsuite/lib/testing.mli
index 6f47d2a3e0..18b2ea0376 100644
--- a/testsuite/lib/testing.mli
+++ b/testsuite/lib/testing.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/alpha.S b/testsuite/tests/asmcomp/alpha.S
index d8851065c3..10e3388637 100644
--- a/testsuite/tests/asmcomp/alpha.S
+++ b/testsuite/tests/asmcomp/alpha.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/amd64.S b/testsuite/tests/asmcomp/amd64.S
index 8df6e2d20d..26db8722a9 100644
--- a/testsuite/tests/asmcomp/amd64.S
+++ b/testsuite/tests/asmcomp/amd64.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/arith.cmm b/testsuite/tests/asmcomp/arith.cmm
index f4efefdbef..a8bc613c77 100644
--- a/testsuite/tests/asmcomp/arith.cmm
+++ b/testsuite/tests/asmcomp/arith.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/arm.S b/testsuite/tests/asmcomp/arm.S
index 186d706146..0fd1a29fe6 100644
--- a/testsuite/tests/asmcomp/arm.S
+++ b/testsuite/tests/asmcomp/arm.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/checkbound.cmm b/testsuite/tests/asmcomp/checkbound.cmm
index 995b74f8a3..c20740c113 100644
--- a/testsuite/tests/asmcomp/checkbound.cmm
+++ b/testsuite/tests/asmcomp/checkbound.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/fib.cmm b/testsuite/tests/asmcomp/fib.cmm
index b7e64d3025..d21260448b 100644
--- a/testsuite/tests/asmcomp/fib.cmm
+++ b/testsuite/tests/asmcomp/fib.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/hppa.S b/testsuite/tests/asmcomp/hppa.S
index 2b1ab21c66..02f457dc75 100644
--- a/testsuite/tests/asmcomp/hppa.S
+++ b/testsuite/tests/asmcomp/hppa.S
@@ -1,6 +1,6 @@
;*********************************************************************
;* *
-;* Objective Caml *
+;* OCaml *
;* *
;* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
;* *
diff --git a/testsuite/tests/asmcomp/i386.S b/testsuite/tests/asmcomp/i386.S
index f4b65e57ac..fc75b1f1f8 100644
--- a/testsuite/tests/asmcomp/i386.S
+++ b/testsuite/tests/asmcomp/i386.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/i386nt.asm b/testsuite/tests/asmcomp/i386nt.asm
index 66550eb8b2..75ae8ce737 100644
--- a/testsuite/tests/asmcomp/i386nt.asm
+++ b/testsuite/tests/asmcomp/i386nt.asm
@@ -1,6 +1,6 @@
;*********************************************************************
;
-; Objective Caml
+; OCaml
;
; Xavier Leroy, projet Cristal, INRIA Rocquencourt
;
diff --git a/testsuite/tests/asmcomp/ia64.S b/testsuite/tests/asmcomp/ia64.S
index 51361690b8..68d649b531 100644
--- a/testsuite/tests/asmcomp/ia64.S
+++ b/testsuite/tests/asmcomp/ia64.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/integr.cmm b/testsuite/tests/asmcomp/integr.cmm
index 481dd7587d..504bb0db5a 100644
--- a/testsuite/tests/asmcomp/integr.cmm
+++ b/testsuite/tests/asmcomp/integr.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/lexcmm.mli b/testsuite/tests/asmcomp/lexcmm.mli
index a28a57c520..a4998ca127 100644
--- a/testsuite/tests/asmcomp/lexcmm.mli
+++ b/testsuite/tests/asmcomp/lexcmm.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/lexcmm.mll b/testsuite/tests/asmcomp/lexcmm.mll
index 0e8432e1c8..eb2f2c8296 100644
--- a/testsuite/tests/asmcomp/lexcmm.mll
+++ b/testsuite/tests/asmcomp/lexcmm.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/m68k.S b/testsuite/tests/asmcomp/m68k.S
index 436e65e695..f15ddcbb40 100644
--- a/testsuite/tests/asmcomp/m68k.S
+++ b/testsuite/tests/asmcomp/m68k.S
@@ -1,6 +1,6 @@
|***********************************************************************
|* *
-|* Objective Caml *
+|* OCaml *
|* *
|* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
|* *
diff --git a/testsuite/tests/asmcomp/main.c b/testsuite/tests/asmcomp/main.c
index e45c8c27c3..33fd8a98a4 100644
--- a/testsuite/tests/asmcomp/main.c
+++ b/testsuite/tests/asmcomp/main.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/main.ml b/testsuite/tests/asmcomp/main.ml
index d6207102ac..0555daed8d 100644
--- a/testsuite/tests/asmcomp/main.ml
+++ b/testsuite/tests/asmcomp/main.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/mainarith.c b/testsuite/tests/asmcomp/mainarith.c
index 95a923d8b9..a71be4961c 100644
--- a/testsuite/tests/asmcomp/mainarith.c
+++ b/testsuite/tests/asmcomp/mainarith.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/mips.s b/testsuite/tests/asmcomp/mips.s
index 9fe9f94b60..ec6931bf71 100644
--- a/testsuite/tests/asmcomp/mips.s
+++ b/testsuite/tests/asmcomp/mips.s
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/parsecmm.mly b/testsuite/tests/asmcomp/parsecmm.mly
index 79b278b052..87db7a5fea 100644
--- a/testsuite/tests/asmcomp/parsecmm.mly
+++ b/testsuite/tests/asmcomp/parsecmm.mly
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/parsecmmaux.ml b/testsuite/tests/asmcomp/parsecmmaux.ml
index 8c46888c6b..5aa2ea05b5 100644
--- a/testsuite/tests/asmcomp/parsecmmaux.ml
+++ b/testsuite/tests/asmcomp/parsecmmaux.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/parsecmmaux.mli b/testsuite/tests/asmcomp/parsecmmaux.mli
index 558996552c..d488db1f5d 100644
--- a/testsuite/tests/asmcomp/parsecmmaux.mli
+++ b/testsuite/tests/asmcomp/parsecmmaux.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/power-aix.S b/testsuite/tests/asmcomp/power-aix.S
index 96ed2b92d1..ee8a09698d 100644
--- a/testsuite/tests/asmcomp/power-aix.S
+++ b/testsuite/tests/asmcomp/power-aix.S
@@ -1,6 +1,6 @@
#*********************************************************************
#* *
-#* Objective Caml *
+#* OCaml *
#* *
#* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
#* *
diff --git a/testsuite/tests/asmcomp/power-elf.S b/testsuite/tests/asmcomp/power-elf.S
index 994a9fa7be..7fee4aa1bf 100644
--- a/testsuite/tests/asmcomp/power-elf.S
+++ b/testsuite/tests/asmcomp/power-elf.S
@@ -1,6 +1,6 @@
/*********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/power-rhapsody.S b/testsuite/tests/asmcomp/power-rhapsody.S
index b456105862..06788a8c47 100644
--- a/testsuite/tests/asmcomp/power-rhapsody.S
+++ b/testsuite/tests/asmcomp/power-rhapsody.S
@@ -1,6 +1,6 @@
/*********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/quicksort.cmm b/testsuite/tests/asmcomp/quicksort.cmm
index 4029da8d15..21b1add570 100644
--- a/testsuite/tests/asmcomp/quicksort.cmm
+++ b/testsuite/tests/asmcomp/quicksort.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/quicksort2.cmm b/testsuite/tests/asmcomp/quicksort2.cmm
index eae9809a79..08988573af 100644
--- a/testsuite/tests/asmcomp/quicksort2.cmm
+++ b/testsuite/tests/asmcomp/quicksort2.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/soli.cmm b/testsuite/tests/asmcomp/soli.cmm
index 47ce64c0b5..af4d39fc6a 100644
--- a/testsuite/tests/asmcomp/soli.cmm
+++ b/testsuite/tests/asmcomp/soli.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/sparc.S b/testsuite/tests/asmcomp/sparc.S
index 9a829e1732..5f83bf0f22 100644
--- a/testsuite/tests/asmcomp/sparc.S
+++ b/testsuite/tests/asmcomp/sparc.S
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/asmcomp/tagged-fib.cmm b/testsuite/tests/asmcomp/tagged-fib.cmm
index e5e45b0fbf..5ee234d9ff 100644
--- a/testsuite/tests/asmcomp/tagged-fib.cmm
+++ b/testsuite/tests/asmcomp/tagged-fib.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/tagged-integr.cmm b/testsuite/tests/asmcomp/tagged-integr.cmm
index df46813eb9..6f7562878e 100644
--- a/testsuite/tests/asmcomp/tagged-integr.cmm
+++ b/testsuite/tests/asmcomp/tagged-integr.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/tagged-quicksort.cmm b/testsuite/tests/asmcomp/tagged-quicksort.cmm
index b519e5cef9..73fca10171 100644
--- a/testsuite/tests/asmcomp/tagged-quicksort.cmm
+++ b/testsuite/tests/asmcomp/tagged-quicksort.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/tagged-tak.cmm b/testsuite/tests/asmcomp/tagged-tak.cmm
index fe9e6eb026..2bda22385e 100644
--- a/testsuite/tests/asmcomp/tagged-tak.cmm
+++ b/testsuite/tests/asmcomp/tagged-tak.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/asmcomp/tak.cmm b/testsuite/tests/asmcomp/tak.cmm
index cd61ec89be..26bbd96817 100644
--- a/testsuite/tests/asmcomp/tak.cmm
+++ b/testsuite/tests/asmcomp/tak.cmm
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/basic-more/tformat.ml b/testsuite/tests/basic-more/tformat.ml
index d02cb2907a..77d30ac34d 100644
--- a/testsuite/tests/basic-more/tformat.ml
+++ b/testsuite/tests/basic-more/tformat.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis, projet Estime, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/basic/maps.ml b/testsuite/tests/basic/maps.ml
index c23f2d8c1e..ffbaa041cb 100644
--- a/testsuite/tests/basic/maps.ml
+++ b/testsuite/tests/basic/maps.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/basic/sets.ml b/testsuite/tests/basic/sets.ml
index 983145ee48..f2fa158c38 100644
--- a/testsuite/tests/basic/sets.ml
+++ b/testsuite/tests/basic/sets.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/lib-bigarray/fftba.ml b/testsuite/tests/lib-bigarray/fftba.ml
index 17465df5c6..10c22f1db4 100644
--- a/testsuite/tests/lib-bigarray/fftba.ml
+++ b/testsuite/tests/lib-bigarray/fftba.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/lib-scanf/tscanf.ml b/testsuite/tests/lib-scanf/tscanf.ml
index 89b188b461..d929eb7474 100644
--- a/testsuite/tests/lib-scanf/tscanf.ml
+++ b/testsuite/tests/lib-scanf/tscanf.ml
@@ -1,6 +1,6 @@
(*************************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-kb/equations.ml b/testsuite/tests/misc-kb/equations.ml
index a7ea9a03b6..5617bc4f9d 100644
--- a/testsuite/tests/misc-kb/equations.ml
+++ b/testsuite/tests/misc-kb/equations.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-kb/equations.mli b/testsuite/tests/misc-kb/equations.mli
index 45d790260f..0db190b858 100644
--- a/testsuite/tests/misc-kb/equations.mli
+++ b/testsuite/tests/misc-kb/equations.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-kb/kb.ml b/testsuite/tests/misc-kb/kb.ml
index 590f4cd5d0..ff357b3ff8 100644
--- a/testsuite/tests/misc-kb/kb.ml
+++ b/testsuite/tests/misc-kb/kb.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-kb/kb.mli b/testsuite/tests/misc-kb/kb.mli
index 59b60e4ea2..27aa2e9862 100644
--- a/testsuite/tests/misc-kb/kb.mli
+++ b/testsuite/tests/misc-kb/kb.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-kb/kbmain.ml b/testsuite/tests/misc-kb/kbmain.ml
index 0a5da2fb63..580b715040 100644
--- a/testsuite/tests/misc-kb/kbmain.ml
+++ b/testsuite/tests/misc-kb/kbmain.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-kb/orderings.ml b/testsuite/tests/misc-kb/orderings.ml
index 11a776ba7c..c81746e309 100644
--- a/testsuite/tests/misc-kb/orderings.ml
+++ b/testsuite/tests/misc-kb/orderings.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-kb/orderings.mli b/testsuite/tests/misc-kb/orderings.mli
index d7abfd5645..bb44f0832d 100644
--- a/testsuite/tests/misc-kb/orderings.mli
+++ b/testsuite/tests/misc-kb/orderings.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-kb/terms.ml b/testsuite/tests/misc-kb/terms.ml
index dba7000646..86604f9c5a 100644
--- a/testsuite/tests/misc-kb/terms.ml
+++ b/testsuite/tests/misc-kb/terms.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-kb/terms.mli b/testsuite/tests/misc-kb/terms.mli
index 7d22e9cb00..0f6be4c8e8 100644
--- a/testsuite/tests/misc-kb/terms.mli
+++ b/testsuite/tests/misc-kb/terms.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-unsafe/almabench.ml b/testsuite/tests/misc-unsafe/almabench.ml
index b213047296..73293e9ad9 100644
--- a/testsuite/tests/misc-unsafe/almabench.ml
+++ b/testsuite/tests/misc-unsafe/almabench.ml
@@ -1,6 +1,6 @@
(*
* ALMABENCH 1.0.1
- * Objective Caml version
+ * OCaml version
*
* A number-crunching benchmark designed for cross-language and vendor
* comparisons.
diff --git a/testsuite/tests/misc-unsafe/fft.ml b/testsuite/tests/misc-unsafe/fft.ml
index 0907cdee3c..f0a2ed3289 100644
--- a/testsuite/tests/misc-unsafe/fft.ml
+++ b/testsuite/tests/misc-unsafe/fft.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-unsafe/quicksort.ml b/testsuite/tests/misc-unsafe/quicksort.ml
index 7449488d2d..d5d8fb4dd3 100644
--- a/testsuite/tests/misc-unsafe/quicksort.ml
+++ b/testsuite/tests/misc-unsafe/quicksort.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc-unsafe/soli.ml b/testsuite/tests/misc-unsafe/soli.ml
index aba79b15b8..1639398608 100644
--- a/testsuite/tests/misc-unsafe/soli.ml
+++ b/testsuite/tests/misc-unsafe/soli.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc/bdd.ml b/testsuite/tests/misc/bdd.ml
index 8452b8c645..ddf99a7295 100644
--- a/testsuite/tests/misc/bdd.ml
+++ b/testsuite/tests/misc/bdd.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc/boyer.ml b/testsuite/tests/misc/boyer.ml
index c5e829ff2c..4f4e081300 100644
--- a/testsuite/tests/misc/boyer.ml
+++ b/testsuite/tests/misc/boyer.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc/fib.ml b/testsuite/tests/misc/fib.ml
index 7fad4bfdbc..4160004ea4 100644
--- a/testsuite/tests/misc/fib.ml
+++ b/testsuite/tests/misc/fib.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc/hamming.ml b/testsuite/tests/misc/hamming.ml
index 7216ddb0d9..872454401c 100644
--- a/testsuite/tests/misc/hamming.ml
+++ b/testsuite/tests/misc/hamming.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc/nucleic.ml b/testsuite/tests/misc/nucleic.ml
index e3adfd6228..b35360a882 100644
--- a/testsuite/tests/misc/nucleic.ml
+++ b/testsuite/tests/misc/nucleic.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc/sieve.ml b/testsuite/tests/misc/sieve.ml
index 994a4087d3..7f0295bb67 100644
--- a/testsuite/tests/misc/sieve.ml
+++ b/testsuite/tests/misc/sieve.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc/takc.ml b/testsuite/tests/misc/takc.ml
index 8e49f24849..8f9400ebdf 100644
--- a/testsuite/tests/misc/takc.ml
+++ b/testsuite/tests/misc/takc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/misc/taku.ml b/testsuite/tests/misc/taku.ml
index 555fb01c86..31e617eed7 100644
--- a/testsuite/tests/misc/taku.ml
+++ b/testsuite/tests/misc/taku.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/tool-lexyacc/gram_aux.ml b/testsuite/tests/tool-lexyacc/gram_aux.ml
index b84d8588a6..c00fa9bfe1 100644
--- a/testsuite/tests/tool-lexyacc/gram_aux.ml
+++ b/testsuite/tests/tool-lexyacc/gram_aux.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/tool-lexyacc/grammar.mly b/testsuite/tests/tool-lexyacc/grammar.mly
index 8c1e4db943..8d1346f8e3 100644
--- a/testsuite/tests/tool-lexyacc/grammar.mly
+++ b/testsuite/tests/tool-lexyacc/grammar.mly
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/testsuite/tests/tool-lexyacc/input b/testsuite/tests/tool-lexyacc/input
index 6793cb8745..b6fdfee8df 100644
--- a/testsuite/tests/tool-lexyacc/input
+++ b/testsuite/tests/tool-lexyacc/input
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/tool-lexyacc/lexgen.ml b/testsuite/tests/tool-lexyacc/lexgen.ml
index bbd729b0f1..d4b6f9a96e 100644
--- a/testsuite/tests/tool-lexyacc/lexgen.ml
+++ b/testsuite/tests/tool-lexyacc/lexgen.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/tool-lexyacc/main.ml b/testsuite/tests/tool-lexyacc/main.ml
index d18a4886d2..a9337d4b9b 100644
--- a/testsuite/tests/tool-lexyacc/main.ml
+++ b/testsuite/tests/tool-lexyacc/main.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/tool-lexyacc/output.ml b/testsuite/tests/tool-lexyacc/output.ml
index 09c66b6873..141510c445 100644
--- a/testsuite/tests/tool-lexyacc/output.ml
+++ b/testsuite/tests/tool-lexyacc/output.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/tool-lexyacc/scan_aux.ml b/testsuite/tests/tool-lexyacc/scan_aux.ml
index c449b13a59..7c796f353c 100644
--- a/testsuite/tests/tool-lexyacc/scan_aux.ml
+++ b/testsuite/tests/tool-lexyacc/scan_aux.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/tool-lexyacc/scanner.mll b/testsuite/tests/tool-lexyacc/scanner.mll
index 131272fdd4..f791feaf24 100644
--- a/testsuite/tests/tool-lexyacc/scanner.mll
+++ b/testsuite/tests/tool-lexyacc/scanner.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/testsuite/tests/tool-lexyacc/syntax.ml b/testsuite/tests/tool-lexyacc/syntax.ml
index ff704cd2f0..e2ff025eee 100644
--- a/testsuite/tests/tool-lexyacc/syntax.ml
+++ b/testsuite/tests/tool-lexyacc/syntax.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/Makefile b/tools/Makefile
index bad14c7e50..754af2a046 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/tools/Makefile.nt b/tools/Makefile.nt
index b90c0c4f66..7331ed06eb 100644
--- a/tools/Makefile.nt
+++ b/tools/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/tools/Makefile.shared b/tools/Makefile.shared
index 32049eab1e..31cbb6a08c 100644
--- a/tools/Makefile.shared
+++ b/tools/Makefile.shared
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/tools/addlabels.ml b/tools/addlabels.ml
index 6a297b9e86..db8ecdc9a9 100644
--- a/tools/addlabels.ml
+++ b/tools/addlabels.ml
@@ -1,3 +1,16 @@
+(***********************************************************************)
+(* *)
+(* OCaml *)
+(* *)
+(* Jacques Garrigue, Kyoto University RIMS *)
+(* *)
+(* Copyright 2001 Institut National de Recherche en Informatique et *)
+(* en Automatique and Kyoto University. All rights reserved. *)
+(* This file is distributed under the terms of the Q Public License *)
+(* version 1.0. *)
+(* *)
+(***********************************************************************)
+
(* $Id$ *)
open StdLabels
diff --git a/tools/checkstack.c b/tools/checkstack.c
index fc760945fc..9289c678ca 100644
--- a/tools/checkstack.c
+++ b/tools/checkstack.c
@@ -1,13 +1,12 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Damien Doligez, projet Moscova, INRIA Rocquencourt */
/* */
/* Copyright 2002 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../../LICENSE. */
+/* under the terms of the Q Public License version 1.0. */
/* */
/***********************************************************************/
diff --git a/tools/cleanup-header b/tools/cleanup-header
index 6c320fb39c..bc64f2e921 100644
--- a/tools/cleanup-header
+++ b/tools/cleanup-header
@@ -1,4 +1,17 @@
#!/bin/sed -f
+
+#######################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#######################################################################
+
# Remove private parts from runtime include files, before installation
# in /usr/local/lib/ocaml/caml
diff --git a/tools/cvt_emit.mll b/tools/cvt_emit.mll
index 3e28ae9722..eabd1baf1a 100644
--- a/tools/cvt_emit.mll
+++ b/tools/cvt_emit.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/depend.ml b/tools/depend.ml
index 4a0da760b2..2a8fc21d8f 100644
--- a/tools/depend.ml
+++ b/tools/depend.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/depend.mli b/tools/depend.mli
index a13870610b..7c6d0c01d6 100644
--- a/tools/depend.mli
+++ b/tools/depend.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/dumpobj.ml b/tools/dumpobj.ml
index 2a054ee684..18f8bf82ea 100644
--- a/tools/dumpobj.ml
+++ b/tools/dumpobj.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/lexer299.mll b/tools/lexer299.mll
index 9a244721df..38241af0a5 100644
--- a/tools/lexer299.mll
+++ b/tools/lexer299.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/lexer301.mll b/tools/lexer301.mll
index daec549e7e..4548de57e9 100644
--- a/tools/lexer301.mll
+++ b/tools/lexer301.mll
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/magic b/tools/magic
index 7468066e01..089f169a16 100644
--- a/tools/magic
+++ b/tools/magic
@@ -1,7 +1,7 @@
# Here are some definitions that can be added to the /usr/share/magic
# database so that the file(1) command recognizes OCaml compiled files.
# Contributed by Sven Luther.
-0 string Caml1999 Objective Caml
+0 string Caml1999 OCaml
>8 string X bytecode executable
>8 string I interface data (.cmi)
>8 string O bytecode object data (.cmo)
diff --git a/tools/make-package-macosx b/tools/make-package-macosx
index ebdf0eba2c..222df82211 100755
--- a/tools/make-package-macosx
+++ b/tools/make-package-macosx
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Damien Doligez, projet Moscova, INRIA Rocquencourt #
# #
@@ -30,9 +30,9 @@ cat >Description.plist <<EOF
<key>IFPkgDescriptionDeleteWarning</key>
<string></string>
<key>IFPkgDescriptionDescription</key>
- <string>The Objective Caml compiler and tools</string>
+ <string>The OCaml compiler and tools</string>
<key>IFPkgDescriptionTitle</key>
- <string>Objective Caml</string>
+ <string>OCaml</string>
<key>IFPkgDescriptionVersion</key>
<string>${VERSION}</string>
</dict>
@@ -46,11 +46,11 @@ cat >Info.plist <<EOF
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>Objective Caml ${VERSION}</string>
+ <string>OCaml ${VERSION}</string>
<key>CFBundleIdentifier</key>
<string>fr.inria.ocaml</string>
<key>CFBundleName</key>
- <string>Objective Caml</string>
+ <string>OCaml</string>
<key>CFBundleShortVersionString</key>
<string>${VERSION}</string>
<key>IFMajorVersion</key>
@@ -85,7 +85,7 @@ mkdir -p resources
# stop here -> |
cat >resources/ReadMe.txt <<EOF
-This package installs Objective Caml version ${VERSION}.
+This package installs OCaml version ${VERSION}.
You need Mac OS X 10.5.x (Leopard), with the
XCode tools installed (v3.1.1 or later), and
optionally X11.
@@ -109,7 +109,7 @@ size=`expr $size + 8192`
hdiutil create -sectors $size ocaml-rw.dmg
name=`hdid -nomount ocaml-rw.dmg | grep Apple_HFS | cut -d ' ' -f 1`
-volname="Objective Caml ${VERSION}"
+volname="OCaml ${VERSION}"
newfs_hfs -v "$volname" $name
hdiutil detach $name
diff --git a/tools/objinfo.ml b/tools/objinfo.ml
index e9eb403135..dedda3143f 100644
--- a/tools/objinfo.ml
+++ b/tools/objinfo.ml
@@ -1,13 +1,13 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* Mehdi Dogguy, PPS laboratory, University Paris Diderot *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. Modifications Copyright 2010 Mehdi Dogguy, *)
-(* used and distributed as part of Objective Caml by permission from *)
+(* used and distributed as part of OCaml by permission from *)
(* the author. This file is distributed under the terms of the *)
(* Q Public License version 1.0. *)
(* *)
diff --git a/tools/objinfo_helper.c b/tools/objinfo_helper.c
index 464720c296..689cdf750e 100644
--- a/tools/objinfo_helper.c
+++ b/tools/objinfo_helper.c
@@ -1,11 +1,11 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Mehdi Dogguy, PPS laboratory, University Paris Diderot */
/* */
/* Copyright 2010 Mehdi Dogguy. Used and distributed as part of */
-/* Objective Caml by permission from the author. This file is */
+/* OCaml by permission from the author. This file is */
/* distributed under the terms of the Q Public License version 1.0. */
/***********************************************************************/
diff --git a/tools/ocaml-objcopy-macosx b/tools/ocaml-objcopy-macosx
index cb2f703b4d..b4584a0738 100755
--- a/tools/ocaml-objcopy-macosx
+++ b/tools/ocaml-objcopy-macosx
@@ -2,7 +2,7 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Damien Doligez, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/tools/ocaml299to3.ml b/tools/ocaml299to3.ml
index ad016f64d3..fb66c7616c 100644
--- a/tools/ocaml299to3.ml
+++ b/tools/ocaml299to3.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml
index 0218a14fba..87c8eeca15 100644
--- a/tools/ocamlcp.ml
+++ b/tools/ocamlcp.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/ocamldep.ml b/tools/ocamldep.ml
index 569728d271..1e8b3b8608 100644
--- a/tools/ocamldep.ml
+++ b/tools/ocamldep.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp
index 2e2edd0249..5beaae3218 100644
--- a/tools/ocamlmklib.mlp
+++ b/tools/ocamlmklib.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/ocamlmktop.ml b/tools/ocamlmktop.ml
index 3d353a8f59..0b4a8b0926 100644
--- a/tools/ocamlmktop.ml
+++ b/tools/ocamlmktop.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/ocamlmktop.tpl b/tools/ocamlmktop.tpl
index 477f7387ce..0f44da8ca2 100644
--- a/tools/ocamlmktop.tpl
+++ b/tools/ocamlmktop.tpl
@@ -1,7 +1,7 @@
#!/bin/sh
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Damien Doligez, projet Para, INRIA Rocquencourt #
# #
diff --git a/tools/ocamlprof.ml b/tools/ocamlprof.ml
index f58712ec51..c1ed927e46 100644
--- a/tools/ocamlprof.ml
+++ b/tools/ocamlprof.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez and Francois Rouaix, INRIA Rocquencourt *)
(* Ported to Caml Special Light by John Malecki *)
diff --git a/tools/ocamlsize b/tools/ocamlsize
index 659543d593..7b419cebac 100755
--- a/tools/ocamlsize
+++ b/tools/ocamlsize
@@ -1,5 +1,17 @@
#!/usr/bin/perl
+#######################################################################
+# #
+# OCaml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 2002 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#######################################################################
+
foreach $f (@ARGV) {
open(FILE, $f) || die("Cannot open $f");
seek(FILE, -16, 2);
diff --git a/tools/primreq.ml b/tools/primreq.ml
index dcace11ba7..c1764f5df6 100644
--- a/tools/primreq.ml
+++ b/tools/primreq.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/tools/profiling.ml b/tools/profiling.ml
index 9c6d9dd02b..06c9761094 100644
--- a/tools/profiling.ml
+++ b/tools/profiling.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez and Francois Rouaix, INRIA Rocquencourt *)
(* Ported to Caml Special Light by John Malecki and Xavier Leroy *)
diff --git a/tools/profiling.mli b/tools/profiling.mli
index ca8486f436..61be2be760 100644
--- a/tools/profiling.mli
+++ b/tools/profiling.mli
@@ -1,9 +1,9 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez and Francois Rouaix, INRIA Rocquencourt *)
-(* Ported to Objective Caml by John Malecki and Xavier Leroy *)
+(* Ported to OCaml by John Malecki and Xavier Leroy *)
(* *)
(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* en Automatique. All rights reserved. This file is distributed *)
diff --git a/tools/scrapelabels.ml b/tools/scrapelabels.ml
index dc43e97b70..3d8ab032c7 100644
--- a/tools/scrapelabels.ml
+++ b/tools/scrapelabels.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jacques Garrigue, Kyoto University RIMS *)
(* *)
diff --git a/tools/setignore b/tools/setignore
index c99a77b828..708ed26cc1 100755
--- a/tools/setignore
+++ b/tools/setignore
@@ -1,5 +1,17 @@
#!/bin/sh
+#########################################################################
+# #
+# OCaml #
+# #
+# Damien Doligez, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2011 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
(
cat <<EOF
*.o
diff --git a/toplevel/expunge.ml b/toplevel/expunge.ml
index 5debb41243..1ff4685ef3 100644
--- a/toplevel/expunge.ml
+++ b/toplevel/expunge.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/genprintval.ml b/toplevel/genprintval.ml
index 3277004006..023874c396 100644
--- a/toplevel/genprintval.ml
+++ b/toplevel/genprintval.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt*)
(* *)
diff --git a/toplevel/genprintval.mli b/toplevel/genprintval.mli
index 898588b2dd..6522cccdb0 100644
--- a/toplevel/genprintval.mli
+++ b/toplevel/genprintval.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/opttopdirs.ml b/toplevel/opttopdirs.ml
index b586bae1c8..4f506a8fa6 100644
--- a/toplevel/opttopdirs.ml
+++ b/toplevel/opttopdirs.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/opttopdirs.mli b/toplevel/opttopdirs.mli
index 800c6cf7bd..9a8573e57d 100644
--- a/toplevel/opttopdirs.mli
+++ b/toplevel/opttopdirs.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/opttoploop.ml b/toplevel/opttoploop.ml
index a1592529d2..97e715f2c4 100644
--- a/toplevel/opttoploop.ml
+++ b/toplevel/opttoploop.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/opttoploop.mli b/toplevel/opttoploop.mli
index 78e45f0bab..cdd32de121 100644
--- a/toplevel/opttoploop.mli
+++ b/toplevel/opttoploop.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/opttopmain.ml b/toplevel/opttopmain.ml
index d5516858d7..e25113eba4 100644
--- a/toplevel/opttopmain.ml
+++ b/toplevel/opttopmain.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/opttopmain.mli b/toplevel/opttopmain.mli
index 197f88bbc6..61747d892f 100644
--- a/toplevel/opttopmain.mli
+++ b/toplevel/opttopmain.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/opttopstart.ml b/toplevel/opttopstart.ml
index 3e3fe58baf..db279940ec 100644
--- a/toplevel/opttopstart.ml
+++ b/toplevel/opttopstart.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/topdirs.ml b/toplevel/topdirs.ml
index 6516a38770..2a5a359541 100644
--- a/toplevel/topdirs.ml
+++ b/toplevel/topdirs.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/topdirs.mli b/toplevel/topdirs.mli
index 36af2211ba..11aa9b851b 100644
--- a/toplevel/topdirs.mli
+++ b/toplevel/topdirs.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/toploop.ml b/toplevel/toploop.ml
index e618ed82b0..8a679af395 100644
--- a/toplevel/toploop.ml
+++ b/toplevel/toploop.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/toploop.mli b/toplevel/toploop.mli
index 35eb5dbf5b..e9afb5a0df 100644
--- a/toplevel/toploop.mli
+++ b/toplevel/toploop.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/topmain.ml b/toplevel/topmain.ml
index da56c407c5..1740dda236 100644
--- a/toplevel/topmain.ml
+++ b/toplevel/topmain.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/topmain.mli b/toplevel/topmain.mli
index 197f88bbc6..61747d892f 100644
--- a/toplevel/topmain.mli
+++ b/toplevel/topmain.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/topstart.ml b/toplevel/topstart.ml
index 570e2f203a..823b4c813a 100644
--- a/toplevel/topstart.ml
+++ b/toplevel/topstart.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/trace.ml b/toplevel/trace.ml
index fad92d98a3..104f39fe4b 100644
--- a/toplevel/trace.ml
+++ b/toplevel/trace.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/toplevel/trace.mli b/toplevel/trace.mli
index d708361c7c..0675dd1bf6 100644
--- a/toplevel/trace.mli
+++ b/toplevel/trace.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/annot.mli b/typing/annot.mli
index 92b2f6ec69..934438194e 100644
--- a/typing/annot.mli
+++ b/typing/annot.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Gallium, INRIA Rocquencourt *)
(* *)
diff --git a/typing/btype.ml b/typing/btype.ml
index e57e760f2e..faba4a4c9b 100644
--- a/typing/btype.ml
+++ b/typing/btype.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt*)
(* *)
diff --git a/typing/btype.mli b/typing/btype.mli
index 4ea5e3b40b..0d71e83974 100644
--- a/typing/btype.mli
+++ b/typing/btype.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/ctype.ml b/typing/ctype.ml
index 361d9e17cc..e5e9f98524 100644
--- a/typing/ctype.ml
+++ b/typing/ctype.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt*)
(* *)
diff --git a/typing/ctype.mli b/typing/ctype.mli
index d12a673b08..c25eb1db47 100644
--- a/typing/ctype.mli
+++ b/typing/ctype.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/datarepr.ml b/typing/datarepr.ml
index 80b94132d9..fe45d8d888 100644
--- a/typing/datarepr.ml
+++ b/typing/datarepr.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/datarepr.mli b/typing/datarepr.mli
index 283dbd294a..86915bed33 100644
--- a/typing/datarepr.mli
+++ b/typing/datarepr.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/env.ml b/typing/env.ml
index 6eb5585528..9b2f59056f 100644
--- a/typing/env.ml
+++ b/typing/env.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/env.mli b/typing/env.mli
index 8f00972a62..f56a19cf43 100644
--- a/typing/env.mli
+++ b/typing/env.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/ident.ml b/typing/ident.ml
index c5bc09f418..4196bb8338 100644
--- a/typing/ident.ml
+++ b/typing/ident.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/ident.mli b/typing/ident.mli
index 03e2eee48d..e26490a9c3 100644
--- a/typing/ident.mli
+++ b/typing/ident.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/includeclass.ml b/typing/includeclass.ml
index 0bb47b52ed..8dc35115ea 100644
--- a/typing/includeclass.ml
+++ b/typing/includeclass.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/includeclass.mli b/typing/includeclass.mli
index 5596056d0f..f5bc98a032 100644
--- a/typing/includeclass.mli
+++ b/typing/includeclass.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/includecore.ml b/typing/includecore.ml
index a088319249..621e1bb1e5 100644
--- a/typing/includecore.ml
+++ b/typing/includecore.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/includecore.mli b/typing/includecore.mli
index a2af04ba49..66bd04c310 100644
--- a/typing/includecore.mli
+++ b/typing/includecore.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/includemod.ml b/typing/includemod.ml
index 4b9d4ff3c2..21dd58e10d 100644
--- a/typing/includemod.ml
+++ b/typing/includemod.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/includemod.mli b/typing/includemod.mli
index 347fd2d650..35e8dfb7e6 100644
--- a/typing/includemod.mli
+++ b/typing/includemod.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/mtype.ml b/typing/mtype.ml
index dddc65a0e9..9e18d237b4 100644
--- a/typing/mtype.ml
+++ b/typing/mtype.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/mtype.mli b/typing/mtype.mli
index b15b09ec9c..a24756dc08 100644
--- a/typing/mtype.mli
+++ b/typing/mtype.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/oprint.ml b/typing/oprint.ml
index 6816617343..1a5fe1cf08 100644
--- a/typing/oprint.ml
+++ b/typing/oprint.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/oprint.mli b/typing/oprint.mli
index 7a5121ae19..5724355b85 100644
--- a/typing/oprint.mli
+++ b/typing/oprint.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/outcometree.mli b/typing/outcometree.mli
index 80c28ea085..d0c9252561 100644
--- a/typing/outcometree.mli
+++ b/typing/outcometree.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/parmatch.ml b/typing/parmatch.ml
index 57cebda7bd..65a671edb5 100644
--- a/typing/parmatch.ml
+++ b/typing/parmatch.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/parmatch.mli b/typing/parmatch.mli
index 7ef6a83087..79ab366e5e 100644
--- a/typing/parmatch.mli
+++ b/typing/parmatch.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/path.ml b/typing/path.ml
index 009550261c..9387611a2d 100644
--- a/typing/path.ml
+++ b/typing/path.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/path.mli b/typing/path.mli
index 96f3e98369..ffee167e11 100644
--- a/typing/path.mli
+++ b/typing/path.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/predef.ml b/typing/predef.ml
index 728eb57295..d387522d6b 100644
--- a/typing/predef.ml
+++ b/typing/predef.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/predef.mli b/typing/predef.mli
index b7bbb6f4b2..43e37965c8 100644
--- a/typing/predef.mli
+++ b/typing/predef.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/primitive.ml b/typing/primitive.ml
index 3d7ab5f7cb..a5c3765967 100644
--- a/typing/primitive.ml
+++ b/typing/primitive.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/primitive.mli b/typing/primitive.mli
index 8446037f40..0b48079a82 100644
--- a/typing/primitive.mli
+++ b/typing/primitive.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/printtyp.ml b/typing/printtyp.ml
index 081e300832..27adf01633 100644
--- a/typing/printtyp.ml
+++ b/typing/printtyp.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt*)
(* *)
diff --git a/typing/printtyp.mli b/typing/printtyp.mli
index 5e3402ff8f..5417ebf41f 100644
--- a/typing/printtyp.mli
+++ b/typing/printtyp.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/stypes.ml b/typing/stypes.ml
index 4d1166fe5b..1d2c0efde3 100644
--- a/typing/stypes.ml
+++ b/typing/stypes.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/typing/stypes.mli b/typing/stypes.mli
index 32f92c1d71..02cccd800d 100644
--- a/typing/stypes.mli
+++ b/typing/stypes.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Moscova, INRIA Rocquencourt *)
(* *)
diff --git a/typing/subst.ml b/typing/subst.ml
index 6aa2766061..b4b9c08a08 100644
--- a/typing/subst.ml
+++ b/typing/subst.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/subst.mli b/typing/subst.mli
index c861a57be3..cf97788541 100644
--- a/typing/subst.mli
+++ b/typing/subst.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typeclass.ml b/typing/typeclass.ml
index c81e8fe8d5..4e64ef6429 100644
--- a/typing/typeclass.ml
+++ b/typing/typeclass.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typeclass.mli b/typing/typeclass.mli
index e360ba4e17..9841ed4010 100644
--- a/typing/typeclass.mli
+++ b/typing/typeclass.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typecore.ml b/typing/typecore.ml
index 511bb5e36d..5a9a876ffe 100644
--- a/typing/typecore.ml
+++ b/typing/typecore.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typecore.mli b/typing/typecore.mli
index 1d3cda6dc2..b2d2970a4c 100644
--- a/typing/typecore.mli
+++ b/typing/typecore.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typedecl.ml b/typing/typedecl.ml
index f8a5818151..aae9b13430 100644
--- a/typing/typedecl.ml
+++ b/typing/typedecl.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt*)
(* *)
diff --git a/typing/typedecl.mli b/typing/typedecl.mli
index f0e742bd89..1a7b4a42d3 100644
--- a/typing/typedecl.mli
+++ b/typing/typedecl.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typedtree.ml b/typing/typedtree.ml
index e2b7e285e9..2256a61437 100644
--- a/typing/typedtree.ml
+++ b/typing/typedtree.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typedtree.mli b/typing/typedtree.mli
index eb64937cfe..d6d4f5da3d 100644
--- a/typing/typedtree.mli
+++ b/typing/typedtree.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typemod.ml b/typing/typemod.ml
index 64c099e651..502d23542e 100644
--- a/typing/typemod.ml
+++ b/typing/typemod.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typemod.mli b/typing/typemod.mli
index 6272b56c08..5ca93ae0c6 100644
--- a/typing/typemod.mli
+++ b/typing/typemod.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/types.ml b/typing/types.ml
index 5996719d4d..3b5e3e605e 100644
--- a/typing/types.ml
+++ b/typing/types.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/types.mli b/typing/types.mli
index a4c6408457..c7272438cd 100644
--- a/typing/types.mli
+++ b/typing/types.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typetexp.ml b/typing/typetexp.ml
index 838719b7c4..f6eddbf95a 100644
--- a/typing/typetexp.ml
+++ b/typing/typetexp.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/typetexp.mli b/typing/typetexp.mli
index ec9042ce8d..529e008e73 100644
--- a/typing/typetexp.mli
+++ b/typing/typetexp.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/unused_var.ml b/typing/unused_var.ml
index 00675655c0..ec468980c1 100644
--- a/typing/unused_var.ml
+++ b/typing/unused_var.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/typing/unused_var.mli b/typing/unused_var.mli
index be36fccadd..fb2d2dfa25 100644
--- a/typing/unused_var.mli
+++ b/typing/unused_var.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Damien Doligez, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/ccomp.ml b/utils/ccomp.ml
index 94a29217dc..881223ef9f 100644
--- a/utils/ccomp.ml
+++ b/utils/ccomp.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/ccomp.mli b/utils/ccomp.mli
index 72ae713145..687c701fa7 100644
--- a/utils/ccomp.mli
+++ b/utils/ccomp.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/clflags.ml b/utils/clflags.ml
index b289744770..0f7187d8a0 100644
--- a/utils/clflags.ml
+++ b/utils/clflags.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/clflags.mli b/utils/clflags.mli
index c3a3966b58..7bbd32694c 100644
--- a/utils/clflags.mli
+++ b/utils/clflags.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/config.mlbuild b/utils/config.mlbuild
index 68a7c85849..f041f9962d 100644
--- a/utils/config.mlbuild
+++ b/utils/config.mlbuild
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/config.mli b/utils/config.mli
index da39808bda..102f9b1293 100644
--- a/utils/config.mli
+++ b/utils/config.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/config.mlp b/utils/config.mlp
index 4cabf90bfa..cfaa20aa49 100644
--- a/utils/config.mlp
+++ b/utils/config.mlp
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/consistbl.ml b/utils/consistbl.ml
index d01d7c8735..f724e4f8f7 100644
--- a/utils/consistbl.ml
+++ b/utils/consistbl.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/consistbl.mli b/utils/consistbl.mli
index edaac12fc5..a877733b5e 100644
--- a/utils/consistbl.mli
+++ b/utils/consistbl.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/misc.ml b/utils/misc.ml
index 68ca8e3dac..0eab66dc55 100644
--- a/utils/misc.ml
+++ b/utils/misc.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/misc.mli b/utils/misc.mli
index 87f74e2575..fdb4926564 100644
--- a/utils/misc.mli
+++ b/utils/misc.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/tbl.ml b/utils/tbl.ml
index b06516931d..63c133a205 100644
--- a/utils/tbl.ml
+++ b/utils/tbl.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/tbl.mli b/utils/tbl.mli
index 44a021a785..626fd4c132 100644
--- a/utils/tbl.mli
+++ b/utils/tbl.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/terminfo.ml b/utils/terminfo.ml
index cc17991081..4619ac61c6 100644
--- a/utils/terminfo.ml
+++ b/utils/terminfo.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/terminfo.mli b/utils/terminfo.mli
index ef26b61a51..5fa3aa14e7 100644
--- a/utils/terminfo.mli
+++ b/utils/terminfo.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
diff --git a/utils/warnings.ml b/utils/warnings.ml
index 8393f91630..f77c5c060b 100644
--- a/utils/warnings.ml
+++ b/utils/warnings.ml
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis && Damien Doligez, INRIA Rocquencourt *)
(* *)
diff --git a/utils/warnings.mli b/utils/warnings.mli
index c9e577d9f3..61e372076a 100644
--- a/utils/warnings.mli
+++ b/utils/warnings.mli
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* Objective Caml *)
+(* OCaml *)
(* *)
(* Pierre Weis && Damien Doligez, INRIA Rocquencourt *)
(* *)
diff --git a/win32caml/Makefile b/win32caml/Makefile
index a73b731521..153c9a0687 100644
--- a/win32caml/Makefile
+++ b/win32caml/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/win32caml/editbuffer.c b/win32caml/editbuffer.c
index 480d22d86a..a91e91f9c5 100644
--- a/win32caml/editbuffer.c
+++ b/win32caml/editbuffer.c
@@ -1,8 +1,9 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Developed by Jacob Navia. */
+/* */
/* Copyright 2001 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License, with */
@@ -22,321 +23,321 @@
/*------------------------------------------------------------------------
Procedure: editbuffer_addline ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Adds a line to the current edit buffer
- Input: Line of text to append to the end
+ Input: Line of text to append to the end
Output:
Errors:
--------------------------------------------------------------------------
Edit History:
- 18 Sept 2003 - Chris Watford watford@uiuc.edu
- - Corrected doubly linked list issue
+ 18 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Corrected doubly linked list issue
------------------------------------------------------------------------*/
BOOL editbuffer_addline(EditBuffer* edBuf, char* line)
{
- LineList *tail = NULL; //head of the edit buffer line list
- LineList *newline = NULL;
-
- // sanity check
- if(edBuf == NULL)
- {
- return FALSE;
- }
-
- // perform edit buffer sanity checks
- if((edBuf->LineCount < 0) || (edBuf->Lines == NULL))
- {
- edBuf->LineCount = 0;
- }
-
- // move to the end of the line list in the edit buffer
- if((tail = edBuf->Lines) != NULL)
- for( ; tail->Next != NULL; tail = tail->Next);
-
- // create the new line entry
- newline = (LineList*)SafeMalloc(sizeof(LineList));
- newline->Next = NULL;
- newline->Prev = tail;
- newline->Text = (char*)SafeMalloc(strlen(line)+1);
- strncpy(newline->Text, line, strlen(line)+1);
- newline->Text[strlen(line)] = '\0';
-
- // add it to the list as the head or the tail
- if(tail != NULL)
- {
- tail->Next = newline;
- } else {
- edBuf->Lines = newline;
- }
-
- // update the number of lines in the buffer
- edBuf->LineCount++;
-
- return TRUE;
+ LineList *tail = NULL; //head of the edit buffer line list
+ LineList *newline = NULL;
+
+ // sanity check
+ if(edBuf == NULL)
+ {
+ return FALSE;
+ }
+
+ // perform edit buffer sanity checks
+ if((edBuf->LineCount < 0) || (edBuf->Lines == NULL))
+ {
+ edBuf->LineCount = 0;
+ }
+
+ // move to the end of the line list in the edit buffer
+ if((tail = edBuf->Lines) != NULL)
+ for( ; tail->Next != NULL; tail = tail->Next);
+
+ // create the new line entry
+ newline = (LineList*)SafeMalloc(sizeof(LineList));
+ newline->Next = NULL;
+ newline->Prev = tail;
+ newline->Text = (char*)SafeMalloc(strlen(line)+1);
+ strncpy(newline->Text, line, strlen(line)+1);
+ newline->Text[strlen(line)] = '\0';
+
+ // add it to the list as the head or the tail
+ if(tail != NULL)
+ {
+ tail->Next = newline;
+ } else {
+ edBuf->Lines = newline;
+ }
+
+ // update the number of lines in the buffer
+ edBuf->LineCount++;
+
+ return TRUE;
}
/*------------------------------------------------------------------------
Procedure: editbuffer_updateline ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Updates the edit buffer's internal contents for a line
- Input: idx - Line index
- line - String to add
- Output: if the line was updated or not
+ Input: idx - Line index
+ line - String to add
+ Output: if the line was updated or not
Errors:
------------------------------------------------------------------------*/
BOOL editbuffer_updateline(EditBuffer* edBuf, int idx, char* line)
{
- LineList *update = edBuf->Lines; //head of the edit buffer line list
- LineList *newline = NULL;
- int i;
-
- // sanity checks
- if(edBuf == NULL)
- {
- return FALSE;
- } else if( (edBuf->LineCount == 0) ||
- (edBuf->Lines == NULL) ||
- (idx >= edBuf->LineCount) ||
- (idx < 0) ) {
- return FALSE;
- }
-
- // move to the index in the line list
- // i left in update != NULL as a sanity check
- for(i = 0; ((update != NULL) && (i != idx)); update = update->Next, i++);
-
- // did things mess up?
- if( (update == NULL) || (i != idx) )
- {
- return FALSE;
- }
-
- // get rid of the old line
- free(update->Text);
-
- // get the new line updated
- update->Text = (char*)SafeMalloc(strlen(line)+1);
- strncpy(update->Text, line, strlen(line)+1);
- update->Text[strlen(line)] = '\0';
-
- return TRUE;
+ LineList *update = edBuf->Lines; //head of the edit buffer line list
+ LineList *newline = NULL;
+ int i;
+
+ // sanity checks
+ if(edBuf == NULL)
+ {
+ return FALSE;
+ } else if( (edBuf->LineCount == 0) ||
+ (edBuf->Lines == NULL) ||
+ (idx >= edBuf->LineCount) ||
+ (idx < 0) ) {
+ return FALSE;
+ }
+
+ // move to the index in the line list
+ // i left in update != NULL as a sanity check
+ for(i = 0; ((update != NULL) && (i != idx)); update = update->Next, i++);
+
+ // did things mess up?
+ if( (update == NULL) || (i != idx) )
+ {
+ return FALSE;
+ }
+
+ // get rid of the old line
+ free(update->Text);
+
+ // get the new line updated
+ update->Text = (char*)SafeMalloc(strlen(line)+1);
+ strncpy(update->Text, line, strlen(line)+1);
+ update->Text[strlen(line)] = '\0';
+
+ return TRUE;
}
/*------------------------------------------------------------------------
Procedure: editbuffer_updateoraddline ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Updates the edit buffer's internal contents for a line
- Input: idx - Line index
- line - String to add
- Output: if the line was updated or not
+ Input: idx - Line index
+ line - String to add
+ Output: if the line was updated or not
Errors:
------------------------------------------------------------------------*/
BOOL editbuffer_updateoraddline(EditBuffer* edBuf, int idx, char* line)
{
- LineList *update;
-
- // sanity checks
- if(edBuf == NULL)
- {
- return FALSE;
- } else if((idx > edBuf->LineCount) || (idx < 0)) {
- return FALSE;
- }
-
- update = edBuf->Lines; //head of the edit buffer line list
-
- // do we update or add?
- if((idx < edBuf->LineCount) && (edBuf->Lines != NULL))
- { //interior line, update
- return editbuffer_updateline(edBuf, idx, line);
- } else {
- //fence line, add
- return editbuffer_addline(edBuf, line);
- }
+ LineList *update;
+
+ // sanity checks
+ if(edBuf == NULL)
+ {
+ return FALSE;
+ } else if((idx > edBuf->LineCount) || (idx < 0)) {
+ return FALSE;
+ }
+
+ update = edBuf->Lines; //head of the edit buffer line list
+
+ // do we update or add?
+ if((idx < edBuf->LineCount) && (edBuf->Lines != NULL))
+ { //interior line, update
+ return editbuffer_updateline(edBuf, idx, line);
+ } else {
+ //fence line, add
+ return editbuffer_addline(edBuf, line);
+ }
}
/*------------------------------------------------------------------------
Procedure: editbuffer_removeline ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Removes a line from the edit buffer
- Input: idx - Line index to remove
- Output: if the line was removed or not
+ Input: idx - Line index to remove
+ Output: if the line was removed or not
Errors:
--------------------------------------------------------------------------
Edit History:
- 18 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added to allow backspace and delete support
- - Corrected doubly linked list issue
+ 18 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added to allow backspace and delete support
+ - Corrected doubly linked list issue
------------------------------------------------------------------------*/
BOOL editbuffer_removeline(EditBuffer* edBuf, int idx)
{
- LineList *update = NULL;
- int i = 0;
-
- // sanity checks
- if(edBuf == NULL)
- {
- return FALSE;
- } else if( (edBuf->LineCount == 0) ||
- (edBuf->Lines == NULL) ||
- (idx >= edBuf->LineCount) ||
- (idx < 0) ) {
- return FALSE;
- }
-
- // move to the index in the line list
- // i left in update != NULL as a sanity check
- for(i = 0, update = edBuf->Lines; ((update != NULL) && (i != idx)); update = update->Next, i++);
-
- // remove this line
- if(update != NULL)
- {
- // break links, removing our line
- if(update->Prev != NULL)
- {
- // we're not the first so just break the link
- update->Prev->Next = update->Next;
-
- // fix the prev check
- if(update->Next != NULL)
- update->Next->Prev = update->Prev;
- } else {
- // we're the first, attach the next guy to lines
- edBuf->Lines = update->Next;
- }
-
- // one less line to worry about
- edBuf->LineCount--;
-
- // get rid of the text
- if(update->Text != NULL)
- free(update->Text);
-
- // get rid of us
- free(update);
-
- return TRUE;
- }
-
- return FALSE;
+ LineList *update = NULL;
+ int i = 0;
+
+ // sanity checks
+ if(edBuf == NULL)
+ {
+ return FALSE;
+ } else if( (edBuf->LineCount == 0) ||
+ (edBuf->Lines == NULL) ||
+ (idx >= edBuf->LineCount) ||
+ (idx < 0) ) {
+ return FALSE;
+ }
+
+ // move to the index in the line list
+ // i left in update != NULL as a sanity check
+ for(i = 0, update = edBuf->Lines; ((update != NULL) && (i != idx)); update = update->Next, i++);
+
+ // remove this line
+ if(update != NULL)
+ {
+ // break links, removing our line
+ if(update->Prev != NULL)
+ {
+ // we're not the first so just break the link
+ update->Prev->Next = update->Next;
+
+ // fix the prev check
+ if(update->Next != NULL)
+ update->Next->Prev = update->Prev;
+ } else {
+ // we're the first, attach the next guy to lines
+ edBuf->Lines = update->Next;
+ }
+
+ // one less line to worry about
+ edBuf->LineCount--;
+
+ // get rid of the text
+ if(update->Text != NULL)
+ free(update->Text);
+
+ // get rid of us
+ free(update);
+
+ return TRUE;
+ }
+
+ return FALSE;
}
/*------------------------------------------------------------------------
Procedure: editbuffer_getasline ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Returns the edit buffer as one big line, \n's and \t's
- become spaces.
+ become spaces.
Input:
Output:
Errors:
------------------------------------------------------------------------*/
char* editbuffer_getasline(EditBuffer* edBuf)
{
- LineList *line = NULL; //head of the edit buffer line list
- char* retline = (char*)realloc(NULL, 1);
- unsigned int i = 0;
-
- // fix retline bug
- retline[0] = '\0';
-
- // sanity checks
- if(edBuf == NULL)
- {
- return NULL;
- } else if (edBuf->LineCount == 0 || edBuf->Lines == NULL) {
- // fix any possible errors that may come from this
- edBuf->LineCount = 0;
- edBuf->Lines = NULL;
- return NULL;
- }
-
- // get the big line
- for(line = edBuf->Lines; line != NULL; line = line->Next)
- {
- if(line->Text != NULL)
- {
- retline = (char*)realloc(retline, (strlen(retline) + strlen(line->Text) + (strlen(retline) > 0 ? 2 : 1)));
-
- if(strlen(retline) > 0)
- retline = strcat(retline, " ");
-
- retline = strcat(retline, line->Text);
-
- //concat in the hoouuusssseee!
- }
- }
-
- // now we have the big line, so lets ditch all \n's \t's and \r's
- for(i = 0; i < strlen(retline); i++)
- {
- switch(retline[i])
- {
- case '\n':
- case '\t':
- case '\r':
- retline[i] = ' ';
- }
- }
-
- return retline;
+ LineList *line = NULL; //head of the edit buffer line list
+ char* retline = (char*)realloc(NULL, 1);
+ unsigned int i = 0;
+
+ // fix retline bug
+ retline[0] = '\0';
+
+ // sanity checks
+ if(edBuf == NULL)
+ {
+ return NULL;
+ } else if (edBuf->LineCount == 0 || edBuf->Lines == NULL) {
+ // fix any possible errors that may come from this
+ edBuf->LineCount = 0;
+ edBuf->Lines = NULL;
+ return NULL;
+ }
+
+ // get the big line
+ for(line = edBuf->Lines; line != NULL; line = line->Next)
+ {
+ if(line->Text != NULL)
+ {
+ retline = (char*)realloc(retline, (strlen(retline) + strlen(line->Text) + (strlen(retline) > 0 ? 2 : 1)));
+
+ if(strlen(retline) > 0)
+ retline = strcat(retline, " ");
+
+ retline = strcat(retline, line->Text);
+
+ //concat in the hoouuusssseee!
+ }
+ }
+
+ // now we have the big line, so lets ditch all \n's \t's and \r's
+ for(i = 0; i < strlen(retline); i++)
+ {
+ switch(retline[i])
+ {
+ case '\n':
+ case '\t':
+ case '\r':
+ retline[i] = ' ';
+ }
+ }
+
+ return retline;
}
/*------------------------------------------------------------------------
Procedure: editbuffer_getasbuffer ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Returns the edit buffer as one big line, \n's and \t's
- become spaces.
+ become spaces.
Input:
Output:
Errors:
------------------------------------------------------------------------*/
char* editbuffer_getasbuffer(EditBuffer* edBuf)
{
- LineList *line = NULL; //head of the edit buffer line list
- char* retbuf = (char*)realloc(NULL, 1);
- unsigned int i = 0;
-
- // fix retline bug
- retbuf[0] = '\0';
-
- // sanity checks
- if(edBuf == NULL)
- {
- return NULL;
- } else if (edBuf->LineCount == 0 || edBuf->Lines == NULL) {
- // fix any possible errors that may come from this
- edBuf->LineCount = 0;
- edBuf->Lines = NULL;
- return NULL;
- }
-
- // get the big line
- for(line = edBuf->Lines; line != NULL; line = line->Next)
- {
- if(line->Text != NULL)
- {
- int len = strlen(retbuf);
- len += strlen(line->Text) + (len > 0 ? 3 : 1);
-
- retbuf = (char*)realloc(retbuf, len);
-
- if(strlen(retbuf) > 0)
- retbuf = strcat(retbuf, "\r\n");
-
- retbuf = strcat(retbuf, line->Text);
-
- retbuf[len-1] = '\0';
-
- //concat in the hoouuusssseee!
- }
- }
-
- return retbuf;
+ LineList *line = NULL; //head of the edit buffer line list
+ char* retbuf = (char*)realloc(NULL, 1);
+ unsigned int i = 0;
+
+ // fix retline bug
+ retbuf[0] = '\0';
+
+ // sanity checks
+ if(edBuf == NULL)
+ {
+ return NULL;
+ } else if (edBuf->LineCount == 0 || edBuf->Lines == NULL) {
+ // fix any possible errors that may come from this
+ edBuf->LineCount = 0;
+ edBuf->Lines = NULL;
+ return NULL;
+ }
+
+ // get the big line
+ for(line = edBuf->Lines; line != NULL; line = line->Next)
+ {
+ if(line->Text != NULL)
+ {
+ int len = strlen(retbuf);
+ len += strlen(line->Text) + (len > 0 ? 3 : 1);
+
+ retbuf = (char*)realloc(retbuf, len);
+
+ if(strlen(retbuf) > 0)
+ retbuf = strcat(retbuf, "\r\n");
+
+ retbuf = strcat(retbuf, line->Text);
+
+ retbuf[len-1] = '\0';
+
+ //concat in the hoouuusssseee!
+ }
+ }
+
+ return retbuf;
}
/*------------------------------------------------------------------------
Procedure: editbuffer_lastline ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Returns the last line in the edit buffer
Input:
Output:
@@ -344,111 +345,111 @@ char* editbuffer_getasbuffer(EditBuffer* edBuf)
------------------------------------------------------------------------*/
char* editbuffer_lastline(EditBuffer* edBuf)
{
- LineList *line = NULL; //head of the edit buffer line list
-
- // sanity checks
- if(edBuf == NULL)
- {
- return NULL;
- } else if (edBuf->LineCount == 0 || edBuf->Lines == NULL) {
- // fix any possible errors that may come from this
- edBuf->LineCount = 0;
- edBuf->Lines = NULL;
- return NULL;
- }
-
- // go to the last line
- for(line = edBuf->Lines; line->Next != NULL; line = line->Next);
-
- return line->Text;
+ LineList *line = NULL; //head of the edit buffer line list
+
+ // sanity checks
+ if(edBuf == NULL)
+ {
+ return NULL;
+ } else if (edBuf->LineCount == 0 || edBuf->Lines == NULL) {
+ // fix any possible errors that may come from this
+ edBuf->LineCount = 0;
+ edBuf->Lines = NULL;
+ return NULL;
+ }
+
+ // go to the last line
+ for(line = edBuf->Lines; line->Next != NULL; line = line->Next);
+
+ return line->Text;
}
/*------------------------------------------------------------------------
Procedure: editbuffer_copy ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Makes an exact copy of an edit buffer
Input:
Output:
Errors:
--------------------------------------------------------------------------
Edit History:
- 16 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added to make copies of history entries
- 18 Sept 2003 - Chris Watford watford@uiuc.edu
- - Corrected doubly linked list issue
- 06 Oct 2003 - Chris Watford watford@uiuc.edu
- - Added isCorrect flag
+ 16 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added to make copies of history entries
+ 18 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Corrected doubly linked list issue
+ 06 Oct 2003 - Chris Watford watford@uiuc.edu
+ - Added isCorrect flag
------------------------------------------------------------------------*/
EditBuffer* editbuffer_copy(EditBuffer* edBuf)
{
- // sanity checks
- if(edBuf == NULL)
- {
- return NULL;
- } else {
- EditBuffer* copy = (EditBuffer*)SafeMalloc(sizeof(EditBuffer));
- LineList* lines = edBuf->Lines;
- LineList* lastLine = NULL;
-
- // clear its initial values
- copy->LineCount = 0;
- copy->Lines = NULL;
- copy->isCorrect = FALSE;
-
- // well we don't have to copy much
- if((lines == NULL) || (edBuf->LineCount <= 0))
- {
- return copy;
- }
-
- // get if its correct
- copy->isCorrect = edBuf->isCorrect;
-
- // go through each line, malloc it and add it
- for( ; lines != NULL; lines = lines->Next)
- {
- LineList* curline = (LineList*)SafeMalloc(sizeof(LineList));
- curline->Next = NULL;
- curline->Prev = NULL;
-
- // if there was a last line, link them to us
- if(lastLine != NULL)
- {
- lastLine->Next = curline;
- curline->Prev = lastLine;
- }
-
- // are we the first line? add us to the edit buffer as the first
- if(copy->Lines == NULL)
- {
- copy->Lines = curline;
- }
-
- // check if there is text on the line
- if(lines->Text == NULL)
- { // no text, make it blankz0r
- curline->Text = (char*)SafeMalloc(sizeof(char));
- curline->Text[0] = '\0';
- } else {
- // there is text, copy it and null-terminate
- curline->Text = (char*)SafeMalloc(strlen(lines->Text) + 1);
- strncpy(curline->Text, lines->Text, strlen(lines->Text));
- curline->Text[strlen(lines->Text)] = '\0';
- }
-
- // up the line count and make us the last line
- copy->LineCount++;
- lastLine = curline;
- }
-
- // return our new copy
- return copy;
- }
+ // sanity checks
+ if(edBuf == NULL)
+ {
+ return NULL;
+ } else {
+ EditBuffer* copy = (EditBuffer*)SafeMalloc(sizeof(EditBuffer));
+ LineList* lines = edBuf->Lines;
+ LineList* lastLine = NULL;
+
+ // clear its initial values
+ copy->LineCount = 0;
+ copy->Lines = NULL;
+ copy->isCorrect = FALSE;
+
+ // well we don't have to copy much
+ if((lines == NULL) || (edBuf->LineCount <= 0))
+ {
+ return copy;
+ }
+
+ // get if its correct
+ copy->isCorrect = edBuf->isCorrect;
+
+ // go through each line, malloc it and add it
+ for( ; lines != NULL; lines = lines->Next)
+ {
+ LineList* curline = (LineList*)SafeMalloc(sizeof(LineList));
+ curline->Next = NULL;
+ curline->Prev = NULL;
+
+ // if there was a last line, link them to us
+ if(lastLine != NULL)
+ {
+ lastLine->Next = curline;
+ curline->Prev = lastLine;
+ }
+
+ // are we the first line? add us to the edit buffer as the first
+ if(copy->Lines == NULL)
+ {
+ copy->Lines = curline;
+ }
+
+ // check if there is text on the line
+ if(lines->Text == NULL)
+ { // no text, make it blankz0r
+ curline->Text = (char*)SafeMalloc(sizeof(char));
+ curline->Text[0] = '\0';
+ } else {
+ // there is text, copy it and null-terminate
+ curline->Text = (char*)SafeMalloc(strlen(lines->Text) + 1);
+ strncpy(curline->Text, lines->Text, strlen(lines->Text));
+ curline->Text[strlen(lines->Text)] = '\0';
+ }
+
+ // up the line count and make us the last line
+ copy->LineCount++;
+ lastLine = curline;
+ }
+
+ // return our new copy
+ return copy;
+ }
}
/*------------------------------------------------------------------------
Procedure: editbuffer_destroy ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Destroys an edit buffer
Input:
Output:
@@ -456,59 +457,59 @@ EditBuffer* editbuffer_copy(EditBuffer* edBuf)
------------------------------------------------------------------------*/
void editbuffer_destroy(EditBuffer* edBuf)
{
- // sanity checks
- if(edBuf == NULL)
- { // nothing to do
- return;
- } else if(edBuf->Lines != NULL) {
- LineList* lastline = NULL;
-
- // loop through each line free'ing its text
- for( ; edBuf->Lines != NULL; edBuf->Lines = edBuf->Lines->Next)
- {
- if(edBuf->Lines->Text != NULL)
- free(edBuf->Lines->Text);
-
- // if there was a line before us, free it
- if(lastline != NULL)
- {
- free(lastline);
- lastline = NULL;
- }
-
- lastline = edBuf->Lines;
- }
-
- // free the last line
- free(lastline);
- }
-
- // free ourself
- free(edBuf);
+ // sanity checks
+ if(edBuf == NULL)
+ { // nothing to do
+ return;
+ } else if(edBuf->Lines != NULL) {
+ LineList* lastline = NULL;
+
+ // loop through each line free'ing its text
+ for( ; edBuf->Lines != NULL; edBuf->Lines = edBuf->Lines->Next)
+ {
+ if(edBuf->Lines->Text != NULL)
+ free(edBuf->Lines->Text);
+
+ // if there was a line before us, free it
+ if(lastline != NULL)
+ {
+ free(lastline);
+ lastline = NULL;
+ }
+
+ lastline = edBuf->Lines;
+ }
+
+ // free the last line
+ free(lastline);
+ }
+
+ // free ourself
+ free(edBuf);
}
/*------------------------------------------------------------------------
Procedure: editbuffer_new ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Creates an edit buffer
Input:
Output:
Errors:
--------------------------------------------------------------------------
Edit History:
- 06 Oct 2003 - Chris Watford watford@uiuc.edu
- - Added isCorrect flag
+ 06 Oct 2003 - Chris Watford watford@uiuc.edu
+ - Added isCorrect flag
------------------------------------------------------------------------*/
EditBuffer* editbuffer_new(void)
{
- // create a new one
- EditBuffer *edBuf = (EditBuffer*)SafeMalloc(sizeof(EditBuffer));
-
- // default vals
- edBuf->LineCount = 0;
- edBuf->Lines = NULL;
- edBuf->isCorrect = FALSE;
-
- // return it
- return edBuf;
+ // create a new one
+ EditBuffer *edBuf = (EditBuffer*)SafeMalloc(sizeof(EditBuffer));
+
+ // default vals
+ edBuf->LineCount = 0;
+ edBuf->Lines = NULL;
+ edBuf->isCorrect = FALSE;
+
+ // return it
+ return edBuf;
}
diff --git a/win32caml/editbuffer.h b/win32caml/editbuffer.h
index 91e2999c31..add99b2eeb 100644
--- a/win32caml/editbuffer.h
+++ b/win32caml/editbuffer.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Jacob Navia, after Xavier Leroy */
/* */
@@ -22,26 +22,26 @@
// All the below was added by Chris Watford watford@uiuc.edu
typedef struct tagLineList {
- struct tagLineList *Next;
- struct tagLineList *Prev;
- char *Text;
+ struct tagLineList *Next;
+ struct tagLineList *Prev;
+ char *Text;
} LineList;
typedef struct tagEditBuffer {
- int LineCount;
- struct tagLineList *Lines;
- BOOL isCorrect;
+ int LineCount;
+ struct tagLineList *Lines;
+ BOOL isCorrect;
} EditBuffer;
-BOOL editbuffer_addline (EditBuffer* edBuf, char* line);
-BOOL editbuffer_updateline (EditBuffer* edBuf, int idx, char* line);
-BOOL editbuffer_updateoraddline (EditBuffer* edBuf, int idx, char* line);
-BOOL editbuffer_removeline (EditBuffer* edBuf, int idx);
-char* editbuffer_getasline (EditBuffer* edBuf);
-char* editbuffer_getasbuffer (EditBuffer* edBuf);
-char* editbuffer_lastline (EditBuffer* edBuf);
-EditBuffer* editbuffer_copy (EditBuffer* edBuf);
-void editbuffer_destroy (EditBuffer* edBuf);
-EditBuffer* editbuffer_new (void);
+BOOL editbuffer_addline (EditBuffer* edBuf, char* line);
+BOOL editbuffer_updateline (EditBuffer* edBuf, int idx, char* line);
+BOOL editbuffer_updateoraddline (EditBuffer* edBuf, int idx, char* line);
+BOOL editbuffer_removeline (EditBuffer* edBuf, int idx);
+char* editbuffer_getasline (EditBuffer* edBuf);
+char* editbuffer_getasbuffer (EditBuffer* edBuf);
+char* editbuffer_lastline (EditBuffer* edBuf);
+EditBuffer* editbuffer_copy (EditBuffer* edBuf);
+void editbuffer_destroy (EditBuffer* edBuf);
+EditBuffer* editbuffer_new (void);
#endif
diff --git a/win32caml/history.c b/win32caml/history.c
index 11397ac66a..9a00034828 100644
--- a/win32caml/history.c
+++ b/win32caml/history.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Jacob Navia, after Xavier Leroy */
/* */
@@ -21,78 +21,78 @@
/*------------------------------------------------------------------------
Procedure: AddToHistory ID:2
-Author: Chris Watford watford@uiuc.edu
+Author: Chris Watford watford@uiuc.edu
Purpose: Adds an edit buffer to the history control
-Input: Pointer to the edit buffer to add
+Input: Pointer to the edit buffer to add
Output:
Errors:
--------------------------------------------------------------------------
Edit History:
- 15 Sept 2003 - Chris Watford watford@uiuc.edu
- - Complete rewrite
- - Got it to add the edit buffer to the history
- 17 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added doubly link list support
+ 15 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Complete rewrite
+ - Got it to add the edit buffer to the history
+ 17 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added doubly link list support
------------------------------------------------------------------------*/
void AddToHistory(EditBuffer *edBuf)
{
- StatementHistory *newLine;
+ StatementHistory *newLine;
- // sanity checks
- if(edBuf == NULL)
- {
- return;
- } else if (edBuf->LineCount == 0 || edBuf->Lines == NULL) {
- // fix any possible errors that may come from this
- edBuf->LineCount = 0;
- edBuf->Lines = NULL;
- return;
- }
+ // sanity checks
+ if(edBuf == NULL)
+ {
+ return;
+ } else if (edBuf->LineCount == 0 || edBuf->Lines == NULL) {
+ // fix any possible errors that may come from this
+ edBuf->LineCount = 0;
+ edBuf->Lines = NULL;
+ return;
+ }
- // setup newline and add as the front of the linked list
- newLine = SafeMalloc(sizeof(StatementHistory));
- newLine->Next = History;
- newLine->Prev = NULL;
- newLine->Statement = edBuf;
+ // setup newline and add as the front of the linked list
+ newLine = SafeMalloc(sizeof(StatementHistory));
+ newLine->Next = History;
+ newLine->Prev = NULL;
+ newLine->Statement = edBuf;
- // setup back linking
- if(History != NULL)
- History->Prev = newLine;
+ // setup back linking
+ if(History != NULL)
+ History->Prev = newLine;
- // set the history up
- History = newLine;
+ // set the history up
+ History = newLine;
- // search for the new history tail
- for(HistoryTail = (HistoryTail != NULL ? HistoryTail : History); HistoryTail->Next != NULL; HistoryTail = HistoryTail->Next);
+ // search for the new history tail
+ for(HistoryTail = (HistoryTail != NULL ? HistoryTail : History); HistoryTail->Next != NULL; HistoryTail = HistoryTail->Next);
}
/*------------------------------------------------------------------------
Procedure: GetHistoryLine ID:2
-Author: Chris Watford watford@uiuc.edu
+Author: Chris Watford watford@uiuc.edu
Purpose: Returns an entry from the history table
-Input: Index of the history entry to return
-Output: The history entry as a single line
+Input: Index of the history entry to return
+Output: The history entry as a single line
Errors:
--------------------------------------------------------------------------
Edit History:
- 15 Sept 2003 - Chris Watford watford@uiuc.edu
- - Complete rewrite
- 17 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added doubly link list support
+ 15 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Complete rewrite
+ 17 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added doubly link list support
------------------------------------------------------------------------*/
char *GetHistoryLine(int n)
{
- StatementHistory *histentry = History;
- int i;
+ StatementHistory *histentry = History;
+ int i;
- // traverse linked list looking for member n
- for (i = 0; ((i < n) && (histentry != NULL)); i++, histentry = histentry->Next);
+ // traverse linked list looking for member n
+ for (i = 0; ((i < n) && (histentry != NULL)); i++, histentry = histentry->Next);
- // figure out what to return
- if (histentry != NULL)
- {
- return editbuffer_getasline(histentry->Statement);
- } else {
- return "";
- }
+ // figure out what to return
+ if (histentry != NULL)
+ {
+ return editbuffer_getasline(histentry->Statement);
+ } else {
+ return "";
+ }
}
diff --git a/win32caml/history.h b/win32caml/history.h
index a9ba85841b..4fceef1fee 100644
--- a/win32caml/history.h
+++ b/win32caml/history.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Jacob Navia, after Xavier Leroy */
/* */
@@ -23,13 +23,13 @@
// Simple linked list for holding the history lines
typedef struct tagStatementHistory {
- struct tagStatementHistory *Next;
- struct tagStatementHistory *Prev;
- EditBuffer *Statement;
+ struct tagStatementHistory *Next;
+ struct tagStatementHistory *Prev;
+ EditBuffer *Statement;
} StatementHistory;
-void AddToHistory (EditBuffer *edBuf);
-char *GetHistoryLine (int n);
+void AddToHistory (EditBuffer *edBuf);
+char *GetHistoryLine (int n);
static BOOL CALLBACK HistoryDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
#endif
diff --git a/win32caml/inria.h b/win32caml/inria.h
index 095cbcc750..325fb38ac0 100644
--- a/win32caml/inria.h
+++ b/win32caml/inria.h
@@ -1,8 +1,9 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Developed by Jacob Navia. */
+/* */
/* Copyright 2001 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License, with */
@@ -112,12 +113,12 @@ void RewriteCurrentEditBuffer(void);
void RefreshCurrentEditBuffer(void);
// **************** User defined window messages *************
-#define WM_NEWLINE (WM_USER+6000)
-#define WM_TIMERTICK (WM_USER+6001)
-#define WM_QUITOCAML (WM_USER+6002)
-#define WM_SYNTAXERROR (WM_USER+6003)
-#define WM_UNBOUNDVAL (WM_USER+6004)
-#define WM_ILLEGALCHAR (WM_USER+6005)
+#define WM_NEWLINE (WM_USER+6000)
+#define WM_TIMERTICK (WM_USER+6001)
+#define WM_QUITOCAML (WM_USER+6002)
+#define WM_SYNTAXERROR (WM_USER+6003)
+#define WM_UNBOUNDVAL (WM_USER+6004)
+#define WM_ILLEGALCHAR (WM_USER+6005)
// ********************** Structures ***********************
typedef struct tagPosition {
diff --git a/win32caml/libgraph.h b/win32caml/libgraph.h
index 3bfaff301f..1df232988c 100644
--- a/win32caml/libgraph.h
+++ b/win32caml/libgraph.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Jacob Navia, after Xavier Leroy */
/* */
diff --git a/win32caml/menu.c b/win32caml/menu.c
index 9ab0f5f37e..f0dcb5bbe4 100644
--- a/win32caml/menu.c
+++ b/win32caml/menu.c
@@ -1,8 +1,9 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Developed by Jacob Navia. */
+/* */
/* Copyright 2001 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License, with */
@@ -396,25 +397,25 @@ void AddLineToControl(char *buf)
/*------------------------------------------------------------------------
Procedure: AddStringToControl ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: It will ad the given text at the end of the edit
control. This simulates user input. The history will not
- be modified by this procedure.
+ be modified by this procedure.
Input: The text to be added
Output: None
Errors: If the line is empty, nothing will be done
--------------------------------------------------------------------------
Edit History:
- 16 Sept 2003 - Chris Watford watford@uiuc.edu
- - Basically this is AddLineToControl, but without appending a
- newline
+ 16 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Basically this is AddLineToControl, but without appending a
+ newline
------------------------------------------------------------------------*/
void AddStringToControl(char* buf)
{
HWND hEditCtrl;
- if(buf == NULL)
- return;
+ if(buf == NULL)
+ return;
if((*buf) == 0)
return;
@@ -451,10 +452,10 @@ static BOOL CALLBACK AboutDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
Errors:
--------------------------------------------------------------------------
Edit History:
- 15 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added support for my StatementHistory structure
- - Added the ability to export it as its exact entry, rather than
- just a 1 liner
+ 15 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added support for my StatementHistory structure
+ - Added the ability to export it as its exact entry, rather than
+ just a 1 liner
------------------------------------------------------------------------*/
static BOOL CALLBACK HistoryDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
@@ -468,7 +469,7 @@ static BOOL CALLBACK HistoryDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
histentry = History; // get our statement history object
idx = 0;
- // loop through each history entry adding it to the dialog
+ // loop through each history entry adding it to the dialog
while (histentry != NULL) {
SendDlgItemMessage(hDlg,IDLIST,LB_INSERTSTRING,0,(LPARAM)editbuffer_getasline(histentry->Statement));
SendDlgItemMessage(hDlg,IDLIST,LB_SETITEMDATA,0,(LPARAM)idx);
@@ -515,8 +516,8 @@ static BOOL CALLBACK HistoryDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
error box
--------------------------------------------------------------------------
Edit History:
- 06 Oct 2003 - Chris Watford watford@uiuc.edu
- - Corrected wsprintf error
+ 06 Oct 2003 - Chris Watford watford@uiuc.edu
+ - Corrected wsprintf error
------------------------------------------------------------------------*/
static void SaveText(char *fname)
{
@@ -528,8 +529,8 @@ static void SaveText(char *fname)
f = fopen(fname,"wb");
if (f == NULL)
- {
- // corrected error using wsprintf
+ {
+ // corrected error using wsprintf
wsprintf(buf, "Impossible to open %s for writing", fname);
ShowDbgMsg(buf);
@@ -537,11 +538,11 @@ static void SaveText(char *fname)
}
for (i = 0; i < linesCount; i++)
- {
+ {
*(unsigned short *)buf = 8100;
len = SendMessage(hEdit, EM_GETLINE, i, (LPARAM)buf);
buf[len] = '\0';
- fprintf(f, "%s\r\n", buf+1);
+ fprintf(f, "%s\r\n", buf+1);
//fwrite(buf,1,len+2,f);
}
@@ -551,9 +552,9 @@ static void SaveText(char *fname)
/*------------------------------------------------------------------------
Procedure: SaveML ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Saves the ML source to a file, commenting out functions
- that contained errors
+ that contained errors
Input: The name of the file where the session will be saved
Output: The session is saved
Errors: If it can't open the file for writing it will show an
@@ -567,47 +568,47 @@ static void SaveML(char *fname)
f = fopen(fname, "wb");
if(f == NULL)
- {
+ {
wsprintf(buf, "Impossible to open %s for writing", fname);
ShowDbgMsg(buf);
return;
}
- fprintf(f, "(* %s *)\r\n\r\n", fname);
-
- if(History != NULL)
- {
- StatementHistory *h = NULL;
- EditBuffer *stmt = NULL;
-
- // get to the end
- for(h = History; h->Next != NULL; h = h->Next);
-
- // go back :(
- // this is NOT the fastest method, BUT this is the easiest
- // on the subsystem
- for(; h != NULL; h = h->Prev)
- {
- stmt = h->Statement;
-
- if(stmt != NULL)
- {
- // comment out incorrect lines
- if(stmt->isCorrect)
- {
- char *buff = editbuffer_getasbuffer(stmt);
- fprintf(f, "%s\r\n", buff);
- free(buff);
- } else {
- char *buff = editbuffer_getasbuffer(stmt);
- fprintf(f, "(* Syntax Error or Unbound Value\r\n%s\r\n *)\r\n", buff);
- free(buff);
- }
- }
-
- fprintf(f, "\r\n");
- }
- }
+ fprintf(f, "(* %s *)\r\n\r\n", fname);
+
+ if(History != NULL)
+ {
+ StatementHistory *h = NULL;
+ EditBuffer *stmt = NULL;
+
+ // get to the end
+ for(h = History; h->Next != NULL; h = h->Next);
+
+ // go back :(
+ // this is NOT the fastest method, BUT this is the easiest
+ // on the subsystem
+ for(; h != NULL; h = h->Prev)
+ {
+ stmt = h->Statement;
+
+ if(stmt != NULL)
+ {
+ // comment out incorrect lines
+ if(stmt->isCorrect)
+ {
+ char *buff = editbuffer_getasbuffer(stmt);
+ fprintf(f, "%s\r\n", buff);
+ free(buff);
+ } else {
+ char *buff = editbuffer_getasbuffer(stmt);
+ fprintf(f, "(* Syntax Error or Unbound Value\r\n%s\r\n *)\r\n", buff);
+ free(buff);
+ }
+ }
+
+ fprintf(f, "\r\n");
+ }
+ }
fclose(f);
free(buf);
@@ -615,15 +616,15 @@ static void SaveML(char *fname)
/*------------------------------------------------------------------------
Procedure: Add_Clipboard_To_Queue ID:1
- Author: Chris Watford watford@uiuc.edu
+ Author: Chris Watford watford@uiuc.edu
Purpose: Adds the clipboard text to the control
Input:
Output:
Errors:
--------------------------------------------------------------------------
Edit History:
- 16 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added method to update edit buffer with paste contents
+ 16 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added method to update edit buffer with paste contents
------------------------------------------------------------------------*/
static void Add_Clipboard_To_Queue(void)
{
@@ -636,7 +637,7 @@ static void Add_Clipboard_To_Queue(void)
char *str = GlobalLock(hClipData);
if (str != NULL)
- {
+ {
while ((*str) != 0)
{
if (*str != '\r')
@@ -645,9 +646,9 @@ static void Add_Clipboard_To_Queue(void)
str++;
}
- // added to fix odd errors
- RefreshCurrentEditBuffer();
- }
+ // added to fix odd errors
+ RefreshCurrentEditBuffer();
+ }
GlobalUnlock(hClipData);
}
@@ -659,7 +660,7 @@ static void Add_Clipboard_To_Queue(void)
/*------------------------------------------------------------------------
Procedure: CopyToClipboard ID:1
Purpose: Copies text to the clipboard
- Input: Window with the edit control
+ Input: Window with the edit control
Output:
Errors:
------------------------------------------------------------------------*/
@@ -673,7 +674,7 @@ static void CopyToClipboard(HWND hwnd)
Procedure: ResetText ID:1
Purpose: Resets the text? I'm not really sure
Input:
- Output: Always returns 0
+ Output: Always returns 0
Errors:
------------------------------------------------------------------------*/
int ResetText(void)
@@ -706,10 +707,10 @@ int ResetText(void)
Errors:
--------------------------------------------------------------------------
Edit History:
- 06 Oct 2003 - Chris Watford watford@uiuc.edu
- - Removed entries that crashed OCaml
- - Removed useless entries
- - Added Save ML and Save Transcript
+ 06 Oct 2003 - Chris Watford watford@uiuc.edu
+ - Removed entries that crashed OCaml
+ - Removed useless entries
+ - Added Save ML and Save Transcript
------------------------------------------------------------------------*/
void HandleCommand(HWND hwnd, WPARAM wParam,LPARAM lParam)
{
@@ -747,7 +748,7 @@ void HandleCommand(HWND hwnd, WPARAM wParam,LPARAM lParam)
CopyToClipboard(hwnd);
break;
- // updated to save a transcript
+ // updated to save a transcript
case IDM_SAVEAS:
fname = SafeMalloc(512);
if (GetSaveName(fname,512)) {
@@ -756,29 +757,29 @@ void HandleCommand(HWND hwnd, WPARAM wParam,LPARAM lParam)
free(fname);
break;
- // updated to save an ML file
- case IDM_SAVE:
+ // updated to save an ML file
+ case IDM_SAVE:
fname = SafeMalloc(512);
if (GetSaveMLName(fname,512))
- {
+ {
SaveML(fname);
}
free(fname);
break;
- // updated to work with new history system
+ // updated to work with new history system
case IDM_HISTORY:
r = CallDlgProc(HistoryDlgProc,IDD_HISTORY);
if (r)
- {
+ {
AddLineToControl(GetHistoryLine(r-1));
}
break;
case IDM_PRINTSU:
- // Removed by Chris Watford
- // seems to die
+ // Removed by Chris Watford
+ // seems to die
// CallPrintSetup();
break;
@@ -799,7 +800,7 @@ void HandleCommand(HWND hwnd, WPARAM wParam,LPARAM lParam)
Undo(hwnd);
break;
- /* Removed, really not very useful in this IDE
+ /* Removed, really not very useful in this IDE
case IDM_WINDOWTILE:
SendMessage(hwndMDIClient,WM_MDITILE,0,0);
break;
@@ -809,7 +810,7 @@ void HandleCommand(HWND hwnd, WPARAM wParam,LPARAM lParam)
case IDM_WINDOWICONS:
SendMessage(hwndMDIClient,WM_MDIICONARRANGE,0,0);
break;
- */
+ */
case IDM_EXIT:
PostMessage(hwnd,WM_CLOSE,0,0);
diff --git a/win32caml/ocaml.c b/win32caml/ocaml.c
index 2a2e04a545..04899473f7 100644
--- a/win32caml/ocaml.c
+++ b/win32caml/ocaml.c
@@ -1,7 +1,9 @@
+/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Developed by Jacob Navia. */
+/* */
/* Copyright 2001 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License, with */
@@ -76,10 +78,10 @@ Errors: none
------------------------------------------------------------------------*/
void UpdateStatusBar(LPSTR lpszStatusString, WORD partNumber, WORD displayFlags)
{
- SendMessage(hWndStatusbar,
- SB_SETTEXT,
- partNumber | displayFlags,
- (LPARAM)lpszStatusString);
+ SendMessage(hWndStatusbar,
+ SB_SETTEXT,
+ partNumber | displayFlags,
+ (LPARAM)lpszStatusString);
}
@@ -95,36 +97,36 @@ Errors: If the string is not found nothing will be shown.
------------------------------------------------------------------------*/
LRESULT MsgMenuSelect(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM lparam)
{
- static char szBuffer[256];
- UINT nStringID = 0;
- UINT fuFlags = GET_WM_MENUSELECT_FLAGS(wparam, lparam) & 0xffff;
- UINT uCmd = GET_WM_MENUSELECT_CMD(wparam, lparam);
- HMENU hMenu = GET_WM_MENUSELECT_HMENU(wparam, lparam);
-
- szBuffer[0] = 0; // First reset the buffer
- if (fuFlags == 0xffff && hMenu == NULL) // Menu has been closed
- nStringID = 0;
-
- else if (fuFlags & MFT_SEPARATOR) // Ignore separators
- nStringID = 0;
-
- else if (fuFlags & MF_POPUP) // Popup menu
- {
- if (fuFlags & MF_SYSMENU) // System menu
- nStringID = IDS_SYSMENU;
- else
- // Get string ID for popup menu from idPopup array.
- nStringID = 0;
- } // for MF_POPUP
- else // Must be a command item
- nStringID = uCmd; // String ID == Command ID
-
- // Load the string if we have an ID
- if (0 != nStringID)
- LoadString(hInst, nStringID, szBuffer, sizeof(szBuffer));
- // Finally... send the string to the status bar
- UpdateStatusBar(szBuffer, 0, 0);
- return 0;
+ static char szBuffer[256];
+ UINT nStringID = 0;
+ UINT fuFlags = GET_WM_MENUSELECT_FLAGS(wparam, lparam) & 0xffff;
+ UINT uCmd = GET_WM_MENUSELECT_CMD(wparam, lparam);
+ HMENU hMenu = GET_WM_MENUSELECT_HMENU(wparam, lparam);
+
+ szBuffer[0] = 0; // First reset the buffer
+ if (fuFlags == 0xffff && hMenu == NULL) // Menu has been closed
+ nStringID = 0;
+
+ else if (fuFlags & MFT_SEPARATOR) // Ignore separators
+ nStringID = 0;
+
+ else if (fuFlags & MF_POPUP) // Popup menu
+ {
+ if (fuFlags & MF_SYSMENU) // System menu
+ nStringID = IDS_SYSMENU;
+ else
+ // Get string ID for popup menu from idPopup array.
+ nStringID = 0;
+ } // for MF_POPUP
+ else // Must be a command item
+ nStringID = uCmd; // String ID == Command ID
+
+ // Load the string if we have an ID
+ if (0 != nStringID)
+ LoadString(hInst, nStringID, szBuffer, sizeof(szBuffer));
+ // Finally... send the string to the status bar
+ UpdateStatusBar(szBuffer, 0, 0);
+ return 0;
}
/*------------------------------------------------------------------------
@@ -138,7 +140,7 @@ Errors:
------------------------------------------------------------------------*/
static VOID CALLBACK TimerProc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
{
- SendMessage(hwndSession, WM_TIMERTICK, 0, 0);
+ SendMessage(hwndSession, WM_TIMERTICK, 0, 0);
}
/*------------------------------------------------------------------------
@@ -154,27 +156,27 @@ Errors:
------------------------------------------------------------------------*/
void InitializeStatusBar(HWND hwndParent,int nrOfParts)
{
- const int cSpaceInBetween = 8;
- int ptArray[40]; // Array defining the number of parts/sections
- RECT rect;
- HDC hDC;
+ const int cSpaceInBetween = 8;
+ int ptArray[40]; // Array defining the number of parts/sections
+ RECT rect;
+ HDC hDC;
- /* * Fill in the ptArray... */
+ /* * Fill in the ptArray... */
- hDC = GetDC(hwndParent);
- GetClientRect(hwndParent, &rect);
+ hDC = GetDC(hwndParent);
+ GetClientRect(hwndParent, &rect);
- ptArray[nrOfParts-1] = rect.right;
- //---TODO--- Add code to calculate the size of each part of the status
- // bar here.
+ ptArray[nrOfParts-1] = rect.right;
+ //---TODO--- Add code to calculate the size of each part of the status
+ // bar here.
- ReleaseDC(hwndParent, hDC);
- SendMessage(hWndStatusbar,
- SB_SETPARTS,
- nrOfParts,
- (LPARAM)(LPINT)ptArray);
+ ReleaseDC(hwndParent, hDC);
+ SendMessage(hWndStatusbar,
+ SB_SETPARTS,
+ nrOfParts,
+ (LPARAM)(LPINT)ptArray);
- UpdateStatusBar("Ready", 0, 0);
+ UpdateStatusBar("Ready", 0, 0);
}
@@ -188,17 +190,17 @@ Errors:
------------------------------------------------------------------------*/
static BOOL CreateSBar(HWND hwndParent,char *initialText,int nrOfParts)
{
- hWndStatusbar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_BORDER|SBARS_SIZEGRIP,
- initialText,
- hwndParent,
- IDM_STATUSBAR);
- if(hWndStatusbar)
- {
- InitializeStatusBar(hwndParent,nrOfParts);
- return TRUE;
- }
-
- return FALSE;
+ hWndStatusbar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_BORDER|SBARS_SIZEGRIP,
+ initialText,
+ hwndParent,
+ IDM_STATUSBAR);
+ if(hWndStatusbar)
+ {
+ InitializeStatusBar(hwndParent,nrOfParts);
+ return TRUE;
+ }
+
+ return FALSE;
}
/*------------------------------------------------------------------------
Procedure: InitApplication ID:1
@@ -211,32 +213,32 @@ Errors:
------------------------------------------------------------------------*/
static BOOL InitApplication(void)
{
- WNDCLASS wc;
-
- memset(&wc,0,sizeof(WNDCLASS));
- wc.style = CS_HREDRAW|CS_VREDRAW |CS_DBLCLKS ;
- wc.lpfnWndProc = (WNDPROC)MainWndProc;
- wc.hInstance = hInst;
- wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
- wc.lpszClassName = "inriaWndClass";
- wc.lpszMenuName = MAKEINTRESOURCE(IDMAINMENU);
- wc.hCursor = LoadCursor(NULL,IDC_ARROW);
- wc.hIcon = LoadIcon(hInst,MAKEINTRESOURCE(OCAML_ICON));
- if (!RegisterClass(&wc))
- return 0;
- wc.style = 0;
- wc.lpfnWndProc = (WNDPROC)MdiChildWndProc;
- wc.cbClsExtra = 0;
- wc.cbWndExtra = 20;
- wc.hInstance = hInst; // Owner of this class
- wc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(OCAML_ICON));
- wc.hCursor = LoadCursor(NULL, IDC_ARROW);
- wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); // Default color
- wc.lpszMenuName = NULL;
- wc.lpszClassName = "MdiChildWndClass";
- if (!RegisterClass((LPWNDCLASS)&wc))
- return FALSE;
- return 1;
+ WNDCLASS wc;
+
+ memset(&wc,0,sizeof(WNDCLASS));
+ wc.style = CS_HREDRAW|CS_VREDRAW |CS_DBLCLKS ;
+ wc.lpfnWndProc = (WNDPROC)MainWndProc;
+ wc.hInstance = hInst;
+ wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
+ wc.lpszClassName = "inriaWndClass";
+ wc.lpszMenuName = MAKEINTRESOURCE(IDMAINMENU);
+ wc.hCursor = LoadCursor(NULL,IDC_ARROW);
+ wc.hIcon = LoadIcon(hInst,MAKEINTRESOURCE(OCAML_ICON));
+ if (!RegisterClass(&wc))
+ return 0;
+ wc.style = 0;
+ wc.lpfnWndProc = (WNDPROC)MdiChildWndProc;
+ wc.cbClsExtra = 0;
+ wc.cbWndExtra = 20;
+ wc.hInstance = hInst; // Owner of this class
+ wc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(OCAML_ICON));
+ wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+ wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); // Default color
+ wc.lpszMenuName = NULL;
+ wc.lpszClassName = "MdiChildWndClass";
+ if (!RegisterClass((LPWNDCLASS)&wc))
+ return FALSE;
+ return 1;
}
/*------------------------------------------------------------------------
@@ -248,13 +250,13 @@ Errors:
------------------------------------------------------------------------*/
HWND CreateinriaWndClassWnd(void)
{
- return CreateWindow("inriaWndClass","OCamlWinPlus v1.9RC4",
- WS_MINIMIZEBOX|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|WS_MAXIMIZEBOX|WS_CAPTION|WS_BORDER|WS_SYSMENU|WS_THICKFRAME,
- CW_USEDEFAULT,0,CW_USEDEFAULT,0,
- NULL,
- NULL,
- hInst,
- NULL);
+ return CreateWindow("inriaWndClass","OCamlWinPlus v1.9RC4",
+ WS_MINIMIZEBOX|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|WS_MAXIMIZEBOX|WS_CAPTION|WS_BORDER|WS_SYSMENU|WS_THICKFRAME,
+ CW_USEDEFAULT,0,CW_USEDEFAULT,0,
+ NULL,
+ NULL,
+ hInst,
+ NULL);
}
/*------------------------------------------------------------------------
@@ -267,80 +269,80 @@ Errors:
------------------------------------------------------------------------*/
static HWND MDICmdFileNew(char *title, int show)
{
- HWND hwndChild;
- char rgch[150];
- static int cUntitled;
- MDICREATESTRUCT mcs;
-
- if (title == NULL)
- wsprintf(rgch,"Session%d", cUntitled++);
- else {
- strncpy(rgch,title,149);
- rgch[149] = 0;
- }
-
- // Create the MDI child window
-
- mcs.szClass = "MdiChildWndClass"; // window class name
- mcs.szTitle = rgch; // window title
- mcs.hOwner = hInst; // owner
- mcs.x = CW_USEDEFAULT; // x position
- mcs.y = CW_USEDEFAULT; // y position
- mcs.cx = CW_USEDEFAULT; // width
- mcs.cy = CW_USEDEFAULT; // height
- mcs.style = 0; // window style
- mcs.lParam = 0; // lparam
-
- hwndChild = (HWND) SendMessage(hwndMDIClient,
- WM_MDICREATE,
- 0,
- (LPARAM)(LPMDICREATESTRUCT) &mcs);
-
- if (hwndChild != NULL && show)
- ShowWindow(hwndChild, SW_SHOW);
-
- return hwndChild;
+ HWND hwndChild;
+ char rgch[150];
+ static int cUntitled;
+ MDICREATESTRUCT mcs;
+
+ if (title == NULL)
+ wsprintf(rgch,"Session%d", cUntitled++);
+ else {
+ strncpy(rgch,title,149);
+ rgch[149] = 0;
+ }
+
+ // Create the MDI child window
+
+ mcs.szClass = "MdiChildWndClass"; // window class name
+ mcs.szTitle = rgch; // window title
+ mcs.hOwner = hInst; // owner
+ mcs.x = CW_USEDEFAULT; // x position
+ mcs.y = CW_USEDEFAULT; // y position
+ mcs.cx = CW_USEDEFAULT; // width
+ mcs.cy = CW_USEDEFAULT; // height
+ mcs.style = 0; // window style
+ mcs.lParam = 0; // lparam
+
+ hwndChild = (HWND) SendMessage(hwndMDIClient,
+ WM_MDICREATE,
+ 0,
+ (LPARAM)(LPMDICREATESTRUCT) &mcs);
+
+ if (hwndChild != NULL && show)
+ ShowWindow(hwndChild, SW_SHOW);
+
+ return hwndChild;
}
static HWND CreateMdiClient(HWND hwndparent)
{
- CLIENTCREATESTRUCT ccs = {0};
- HWND hwndMDIClient;
- int icount = GetMenuItemCount(GetMenu(hwndparent));
-
- // Find window menu where children will be listed
- ccs.hWindowMenu = GetSubMenu(GetMenu(hwndparent), icount-2);
- ccs.idFirstChild = IDM_WINDOWCHILD;
-
- // Create the MDI client filling the client area
- hwndMDIClient = CreateWindow("mdiclient",
- NULL,
- WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL |
- WS_HSCROLL,
- 0, 0, 0, 0,
- hwndparent,
- (HMENU)0xCAC,
- hInst,
- (LPVOID)&ccs);
-
- ShowWindow(hwndMDIClient, SW_SHOW);
-
- return hwndMDIClient;
+ CLIENTCREATESTRUCT ccs = {0};
+ HWND hwndMDIClient;
+ int icount = GetMenuItemCount(GetMenu(hwndparent));
+
+ // Find window menu where children will be listed
+ ccs.hWindowMenu = GetSubMenu(GetMenu(hwndparent), icount-2);
+ ccs.idFirstChild = IDM_WINDOWCHILD;
+
+ // Create the MDI client filling the client area
+ hwndMDIClient = CreateWindow("mdiclient",
+ NULL,
+ WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL |
+ WS_HSCROLL,
+ 0, 0, 0, 0,
+ hwndparent,
+ (HMENU)0xCAC,
+ hInst,
+ (LPVOID)&ccs);
+
+ ShowWindow(hwndMDIClient, SW_SHOW);
+
+ return hwndMDIClient;
}
void GotoEOF(void)
{
- HWND hEdit = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
- int linesCount = SendMessage(hEdit,EM_GETLINECOUNT,0,0);
- int lineindex = SendMessage(hEdit,EM_LINEINDEX,linesCount-1,0);
- int lastLineLength = SendMessage(hEdit,EM_LINELENGTH,linesCount-1,0);
+ HWND hEdit = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
+ int linesCount = SendMessage(hEdit,EM_GETLINECOUNT,0,0);
+ int lineindex = SendMessage(hEdit,EM_LINEINDEX,linesCount-1,0);
+ int lastLineLength = SendMessage(hEdit,EM_LINELENGTH,linesCount-1,0);
- lineindex += lastLineLength;
- SendMessage(hEdit,EM_SETSEL,lineindex,lineindex);
+ lineindex += lastLineLength;
+ SendMessage(hEdit,EM_SETSEL,lineindex,lineindex);
}
/*------------------------------------------------------------------------
Procedure: GotoPrompt ID:1
-Author: Chris Watford watford@uiuc.edu
+Author: Chris Watford watford@uiuc.edu
Purpose: Puts the cursor on the prompt line right after the '# '
Input:
Output:
@@ -348,190 +350,190 @@ Errors:
------------------------------------------------------------------------*/
void GotoPrompt(void)
{
- HWND hEdit = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
- int lineindex = SendMessage(hEdit,EM_LINEINDEX,LastPromptPosition.line,0)+2;
- SendMessage(hEdit,EM_SETSEL,lineindex,lineindex);
+ HWND hEdit = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
+ int lineindex = SendMessage(hEdit,EM_LINEINDEX,LastPromptPosition.line,0)+2;
+ SendMessage(hEdit,EM_SETSEL,lineindex,lineindex);
}
int GetCurLineIndex(HWND hEdit)
{
- return SendMessage(hEdit,EM_LINEFROMCHAR,(WPARAM)-1,0);
+ return SendMessage(hEdit,EM_LINEFROMCHAR,(WPARAM)-1,0);
}
int GetNumberOfLines(HWND hEdit)
{
- return SendMessage(hEdit,EM_GETLINECOUNT,0,0);
+ return SendMessage(hEdit,EM_GETLINECOUNT,0,0);
}
static int GetWordUnderCursor(HWND hwndEditControl,char *buf,int len)
{
- char *line,*p,*pstart,*pend;
- int lineidx,start,end,length,offset,cursorpos,startingChar;
-
- SendMessage(hwndEditControl,EM_GETSEL,(WPARAM)&start,(LPARAM)&end);
- lineidx = SendMessage(hwndEditControl,EM_EXLINEFROMCHAR,0,start);
- startingChar = SendMessage(hwndEditControl,EM_LINEINDEX,lineidx,0);
- start -= startingChar;
- end -= startingChar;
- lineidx = SendMessage(hwndEditControl,EM_LINEFROMCHAR,start,0);
- length = SendMessage(hwndEditControl,EM_LINELENGTH,lineidx,0);
- offset = SendMessage(hwndEditControl,EM_LINEINDEX,lineidx,0);
- line = SafeMalloc(length+1);
- memset(line,0,length+1);
- *(unsigned short *)line = length;
- SendMessage(hwndEditControl,EM_GETLINE,lineidx,(LPARAM)line);
- cursorpos = start-offset;
- p = line + cursorpos;
- pstart = p;
- while (*pstart
- && *pstart != ' '
- && *pstart != '\t'
- && *pstart != '('
- && pstart > line)
- pstart--;
- pend = p;
- while (*pend
- && *pend != ' '
- && *pend != '\t'
- && *pend != '('
- && pend < line + length)
- pend++;
- if (*pstart == ' ' || *pstart == '\t')
- pstart++;
- if (*pend == ' ' || *pend == '\t')
- pend--;
- memcpy(buf,pstart,1+pend-pstart);
- buf[pend-pstart] = 0;
- free(line);
- return 1;
+ char *line,*p,*pstart,*pend;
+ int lineidx,start,end,length,offset,cursorpos,startingChar;
+
+ SendMessage(hwndEditControl,EM_GETSEL,(WPARAM)&start,(LPARAM)&end);
+ lineidx = SendMessage(hwndEditControl,EM_EXLINEFROMCHAR,0,start);
+ startingChar = SendMessage(hwndEditControl,EM_LINEINDEX,lineidx,0);
+ start -= startingChar;
+ end -= startingChar;
+ lineidx = SendMessage(hwndEditControl,EM_LINEFROMCHAR,start,0);
+ length = SendMessage(hwndEditControl,EM_LINELENGTH,lineidx,0);
+ offset = SendMessage(hwndEditControl,EM_LINEINDEX,lineidx,0);
+ line = SafeMalloc(length+1);
+ memset(line,0,length+1);
+ *(unsigned short *)line = length;
+ SendMessage(hwndEditControl,EM_GETLINE,lineidx,(LPARAM)line);
+ cursorpos = start-offset;
+ p = line + cursorpos;
+ pstart = p;
+ while (*pstart
+ && *pstart != ' '
+ && *pstart != '\t'
+ && *pstart != '('
+ && pstart > line)
+ pstart--;
+ pend = p;
+ while (*pend
+ && *pend != ' '
+ && *pend != '\t'
+ && *pend != '('
+ && pend < line + length)
+ pend++;
+ if (*pstart == ' ' || *pstart == '\t')
+ pstart++;
+ if (*pend == ' ' || *pend == '\t')
+ pend--;
+ memcpy(buf,pstart,1+pend-pstart);
+ buf[pend-pstart] = 0;
+ free(line);
+ return 1;
}
/*------------------------------------------------------------------------
Procedure: GetLastLine ID:1
Purpose: Gets the data in the line containing the cursor to
- the interpreter.
+ the interpreter.
Input: The edit control window handle
Output: None explicit
Errors: None
------------------------------------------------------------------------*/
char* GetLastLine(HWND hEdit)
{
- int curline = GetCurLineIndex(hEdit);
- char *linebuffer = (char*)SafeMalloc(2048*sizeof(char));
- int n;
- int linescount = GetNumberOfLines(hEdit);
+ int curline = GetCurLineIndex(hEdit);
+ char *linebuffer = (char*)SafeMalloc(2048*sizeof(char));
+ int n;
+ int linescount = GetNumberOfLines(hEdit);
- *(unsigned short *)linebuffer = 2047;
- n = SendMessage(hEdit,EM_GETLINE,curline,(LPARAM)linebuffer);
+ *(unsigned short *)linebuffer = 2047;
+ n = SendMessage(hEdit,EM_GETLINE,curline,(LPARAM)linebuffer);
- if (n >= 2 && linebuffer[0] == '#' && linebuffer[1] == ' ') {
- n -= 2;
- memmove(linebuffer, linebuffer+2, n);
- }
+ if (n >= 2 && linebuffer[0] == '#' && linebuffer[1] == ' ') {
+ n -= 2;
+ memmove(linebuffer, linebuffer+2, n);
+ }
- linebuffer[n] = '\0';
+ linebuffer[n] = '\0';
- return linebuffer;
+ return linebuffer;
}
void DoHelp(HWND hwnd)
{
- char word[256];
- GetWordUnderCursor(hwnd,word,sizeof(word));
- MessageBox(NULL,word,"Aide pour:",MB_OK);
+ char word[256];
+ GetWordUnderCursor(hwnd,word,sizeof(word));
+ MessageBox(NULL,word,"Aide pour:",MB_OK);
}
/*------------------------------------------------------------------------
Procedure: RewriteCurrentEditBuffer ID:1
Purpose: Rewrites what is at the prompt with the current contents of
- the edit buffer
+ the edit buffer
Input: None
Output: None explicit
Errors: None
------------------------------------------------------------------------*/
void RewriteCurrentEditBuffer(void)
{
- // get the editbox's handle
- HWND hEdit = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
-
- // calculate what to highlight
- int linesCount = SendMessage(hEdit,EM_GETLINECOUNT,0,0);
- int lineindex = SendMessage(hEdit,EM_LINEINDEX,LastPromptPosition.line,0) + 2;
- int lastLine = SendMessage(hEdit,EM_LINEINDEX,linesCount-1,0) + SendMessage(hEdit,EM_LINELENGTH,linesCount-1,0) + 100;
-
- // delete the current text
- SendMessage(hEdit, EM_SETSEL, (WPARAM)lineindex, (LPARAM)lastLine);
- SendMessage(hEdit, EM_REPLACESEL, (WPARAM)TRUE, (LPARAM)"");
-
- {
- // loop through each line in the edit buffer and add it to the control
- LineList* line = CurrentEditBuffer->Lines;
- for(; line != NULL; line = line->Next)
- {
- // if there is a line before me, add a newline
- if(line->Prev != NULL)
- SendMessage(hEdit, EM_REPLACESEL, (WPARAM)TRUE, (LPARAM)"\r\n");
-
- // add the line
- SendMessage(hEdit, EM_REPLACESEL, (WPARAM)TRUE, (LPARAM)line->Text);
- }
- }
+ // get the editbox's handle
+ HWND hEdit = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
+
+ // calculate what to highlight
+ int linesCount = SendMessage(hEdit,EM_GETLINECOUNT,0,0);
+ int lineindex = SendMessage(hEdit,EM_LINEINDEX,LastPromptPosition.line,0) + 2;
+ int lastLine = SendMessage(hEdit,EM_LINEINDEX,linesCount-1,0) + SendMessage(hEdit,EM_LINELENGTH,linesCount-1,0) + 100;
+
+ // delete the current text
+ SendMessage(hEdit, EM_SETSEL, (WPARAM)lineindex, (LPARAM)lastLine);
+ SendMessage(hEdit, EM_REPLACESEL, (WPARAM)TRUE, (LPARAM)"");
+
+ {
+ // loop through each line in the edit buffer and add it to the control
+ LineList* line = CurrentEditBuffer->Lines;
+ for(; line != NULL; line = line->Next)
+ {
+ // if there is a line before me, add a newline
+ if(line->Prev != NULL)
+ SendMessage(hEdit, EM_REPLACESEL, (WPARAM)TRUE, (LPARAM)"\r\n");
+
+ // add the line
+ SendMessage(hEdit, EM_REPLACESEL, (WPARAM)TRUE, (LPARAM)line->Text);
+ }
+ }
}
/*------------------------------------------------------------------------
Procedure: RefreshCurrentEditBuffer ID:1
Purpose: Rewrites what is in the CurrentEditBuffer with what is
- actually there
+ actually there
Input: None
Output: None explicit
Errors: None
------------------------------------------------------------------------*/
void RefreshCurrentEditBuffer(void)
{
- // get the editbox's handle
- HWND hEdit = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
-
- // get the last line index
- int linesCount = SendMessage(hEdit,EM_GETLINECOUNT,0,0) - 1;
- int i = 0, n = 0;
-
- // where to hold the line we grab
- char *linebuffer = (char*)SafeMalloc(2048*sizeof(char));
- *(unsigned short *)linebuffer = 2047;
-
- editbuffer_destroy(CurrentEditBuffer);
- CurrentEditBuffer = editbuffer_new();
-
- // loop through each line updating or adding it to the current edit buffer
- for( ; (i + LastPromptPosition.line) <= linesCount; i++)
- {
- n = SendMessage(hEdit, EM_GETLINE, (i + LastPromptPosition.line), (LPARAM)linebuffer);
-
- if ((n >= 2) && (linebuffer[0] == '#') && (linebuffer[1] == ' ')) {
- n -= 2;
- memmove(linebuffer, linebuffer+2, n);
- }
-
- linebuffer[n] = '\0';
-
- { // remove line breaks and feeds
- char* ln = linebuffer;
-
- while((*ln) != 0)
- {
- switch((*ln))
- {
- case '\r':
- case '\n':
- (*ln) = ' ';
- }
-
- ln++;
- }
- }
-
- editbuffer_addline(CurrentEditBuffer, linebuffer);
- }
+ // get the editbox's handle
+ HWND hEdit = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
+
+ // get the last line index
+ int linesCount = SendMessage(hEdit,EM_GETLINECOUNT,0,0) - 1;
+ int i = 0, n = 0;
+
+ // where to hold the line we grab
+ char *linebuffer = (char*)SafeMalloc(2048*sizeof(char));
+ *(unsigned short *)linebuffer = 2047;
+
+ editbuffer_destroy(CurrentEditBuffer);
+ CurrentEditBuffer = editbuffer_new();
+
+ // loop through each line updating or adding it to the current edit buffer
+ for( ; (i + LastPromptPosition.line) <= linesCount; i++)
+ {
+ n = SendMessage(hEdit, EM_GETLINE, (i + LastPromptPosition.line), (LPARAM)linebuffer);
+
+ if ((n >= 2) && (linebuffer[0] == '#') && (linebuffer[1] == ' ')) {
+ n -= 2;
+ memmove(linebuffer, linebuffer+2, n);
+ }
+
+ linebuffer[n] = '\0';
+
+ { // remove line breaks and feeds
+ char* ln = linebuffer;
+
+ while((*ln) != 0)
+ {
+ switch((*ln))
+ {
+ case '\r':
+ case '\n':
+ (*ln) = ' ';
+ }
+
+ ln++;
+ }
+ }
+
+ editbuffer_addline(CurrentEditBuffer, linebuffer);
+ }
}
/*------------------------------------------------------------------------
@@ -542,42 +544,42 @@ Output: None explicit
Errors: None
--------------------------------------------------------------------------
Edit History:
- 17 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added this as a helper function
- 18 Sept 2003 - Chris Watford watford@uiuc.edu
- - Corrected doubly linked list problems
+ 17 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added this as a helper function
+ 18 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Corrected doubly linked list problems
------------------------------------------------------------------------*/
void NextHistoryEntry(void)
{
- // out of bounds, put it back into bounds
- if(historyEntry == NULL && History == NULL)
- {
- return;
- } else if (historyEntry == NULL && History != NULL) {
- historyEntry = History;
- } else {
- if(historyEntry->Next == NULL)
- return;
-
- historyEntry = historyEntry->Next;
- }
-
- // if its valid
- if(historyEntry != NULL)
- {
- // copy the history entry to a new buffer
- EditBuffer* newBuf = editbuffer_copy(historyEntry->Statement);
-
- // destroy the old buffer
- editbuffer_destroy(CurrentEditBuffer);
-
- // setup the current one to the copy
- CurrentEditBuffer = newBuf;
-
- // rewrite the old one and go to the prompt
- RewriteCurrentEditBuffer();
- GotoPrompt();
- }
+ // out of bounds, put it back into bounds
+ if(historyEntry == NULL && History == NULL)
+ {
+ return;
+ } else if (historyEntry == NULL && History != NULL) {
+ historyEntry = History;
+ } else {
+ if(historyEntry->Next == NULL)
+ return;
+
+ historyEntry = historyEntry->Next;
+ }
+
+ // if its valid
+ if(historyEntry != NULL)
+ {
+ // copy the history entry to a new buffer
+ EditBuffer* newBuf = editbuffer_copy(historyEntry->Statement);
+
+ // destroy the old buffer
+ editbuffer_destroy(CurrentEditBuffer);
+
+ // setup the current one to the copy
+ CurrentEditBuffer = newBuf;
+
+ // rewrite the old one and go to the prompt
+ RewriteCurrentEditBuffer();
+ GotoPrompt();
+ }
}
/*------------------------------------------------------------------------
@@ -588,312 +590,312 @@ Output: None explicit
Errors: None
--------------------------------------------------------------------------
Edit History:
- 17 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added this as a helper function
- 18 Sept 2003 - Chris Watford watford@uiuc.edu
- - Corrected doubly linked list problems
+ 17 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added this as a helper function
+ 18 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Corrected doubly linked list problems
------------------------------------------------------------------------*/
void PrevHistoryEntry(void)
{
- // out of bounds, put it back into bounds
- if(historyEntry == NULL || History == NULL)
- {
- return;
- } else {
- if(historyEntry->Prev == NULL)
- return;
-
- historyEntry = historyEntry->Prev;
- }
-
- // if its valid
- if(historyEntry != NULL)
- {
- // copy the history entry to a new buffer
- EditBuffer* newBuf = editbuffer_copy(historyEntry->Statement);
-
- // destroy the old buffer
- editbuffer_destroy(CurrentEditBuffer);
-
- // setup the current one to the copy
- CurrentEditBuffer = newBuf;
-
- // rewrite the old one and go to the prompt
- RewriteCurrentEditBuffer();
- GotoPrompt();
- }
+ // out of bounds, put it back into bounds
+ if(historyEntry == NULL || History == NULL)
+ {
+ return;
+ } else {
+ if(historyEntry->Prev == NULL)
+ return;
+
+ historyEntry = historyEntry->Prev;
+ }
+
+ // if its valid
+ if(historyEntry != NULL)
+ {
+ // copy the history entry to a new buffer
+ EditBuffer* newBuf = editbuffer_copy(historyEntry->Statement);
+
+ // destroy the old buffer
+ editbuffer_destroy(CurrentEditBuffer);
+
+ // setup the current one to the copy
+ CurrentEditBuffer = newBuf;
+
+ // rewrite the old one and go to the prompt
+ RewriteCurrentEditBuffer();
+ GotoPrompt();
+ }
}
/*------------------------------------------------------------------------
Procedure: SubClassEdit ID:1
Purpose: Handles messages to the editbox
-Input:
-Output:
+Input:
+Output:
Errors:
--------------------------------------------------------------------------
Edit History:
- 14 Sept 2003 - Chris Watford watford@uiuc.edu
- - Setup handler for up and down arrows
- 15 Sept 2003 - Chris Watford watford@uiuc.edu
- - Setup framework for history on up arrow
- - Saves lines you move off of in the edit buffer
- 16 Sept 2003 - Chris Watford watford@uiuc.edu
- - Proper handling of newline message finished
- - Fixed ENTER on middle of interior line, moves cursor to the end
- and sends the line
- - Setup the copying and destroying of the old buffer
- - Included buffer rewrite
- 17 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added C-p/C-n support
- - Changed UpArrow to C-UpArrow so as to not confuse users
- 18 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added Left and Right arrow line saving
- - Added backspace and delete line saving and removing
- - Fixed history scrolling
- 21 Sept 2003 - Chris Watford watford@uiuc.edu
- - Fixed pasting errors associated with lines being out of bounds
- for the buffer
- - Added error handling, possibly able to handle it diff down the
- line
- - Removed C-Up/C-Dn for history scrolling, buggy at best on my
- machine
+ 14 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Setup handler for up and down arrows
+ 15 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Setup framework for history on up arrow
+ - Saves lines you move off of in the edit buffer
+ 16 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Proper handling of newline message finished
+ - Fixed ENTER on middle of interior line, moves cursor to the end
+ and sends the line
+ - Setup the copying and destroying of the old buffer
+ - Included buffer rewrite
+ 17 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added C-p/C-n support
+ - Changed UpArrow to C-UpArrow so as to not confuse users
+ 18 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added Left and Right arrow line saving
+ - Added backspace and delete line saving and removing
+ - Fixed history scrolling
+ 21 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Fixed pasting errors associated with lines being out of bounds
+ for the buffer
+ - Added error handling, possibly able to handle it diff down the
+ line
+ - Removed C-Up/C-Dn for history scrolling, buggy at best on my
+ machine
------------------------------------------------------------------------*/
static LRESULT CALLBACK SubClassEdit(HWND hwnd, UINT msg, WPARAM mp1, LPARAM mp2)
{
- LRESULT r;
- int postit=0,nl;
-
- if (msg == WM_CHAR && mp1 == '\r') {
- if (!busy) {
- r = GetCurLineIndex(hwnd);
- nl = GetNumberOfLines(hwnd);
-
- // if we're not the last line
- if (r != nl-1)
- {
- // update or add us, we might not have any lines in the edit buffer
- editbuffer_updateoraddline(CurrentEditBuffer, r-LastPromptPosition.line, GetLastLine(hwnd));
-
- // scroll to the end, add CrLf then post the newline message
- GotoEOF();
- AddStringToControl("\r\n");
- PostMessage(GetParent(hwnd),WM_NEWLINE,0,0);
- return 0;
- }
-
- CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
- CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
-
- postit = 1;
- }
-
- }
- else if (msg == WM_CHAR && mp1 == (char)0x08) {
- int lineindex = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 2;
- int curline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)-1,0);
- int nextline = 0;
- int curpoint = 0;
-
- SendMessage(hwnd, EM_GETSEL, (WPARAM)&curpoint, (LPARAM)NULL);
- nextline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)(curpoint - 1),0);
-
- if(curpoint <= lineindex)
- {
- return 0;
- } else if(nextline != curline) {
- // delete the line we're on
-
- // grab the index
- curline -= LastPromptPosition.line;
-
- // kill it
- editbuffer_removeline(CurrentEditBuffer, curline);
- }
- }
- else if (msg == WM_KEYDOWN && mp1 == VK_F1) {
- DoHelp(hwnd);
- }
- else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && mp1 == VK_UP) {
- int curline = GetCurLineIndex(hwnd);
-
- /*if((msg == WM_KEYDOWN) && (GetKeyState(VK_CONTROL) && 0x8000))
- { // go forward once in history
- NextHistoryEntry();
- return 0;
- } else */
- if((curline > LastPromptPosition.line) && (curline <= (LastPromptPosition.line + CurrentEditBuffer->LineCount)))
- {
- // update current line
- if (msg == WM_KEYDOWN)
- {
- int lineidx = (curline - LastPromptPosition.line);
-
- CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
- CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
-
- // we may have to add this line, otherwise update it
- editbuffer_updateoraddline(CurrentEditBuffer, lineidx, GetLastLine(hwnd));
- }
- } else {
- return 0;
- }
- }
- else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && (mp1 == VK_LEFT)) {
- int lineindex = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 2;
- int curline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)-1,0);
- int nextline = 0;
- int curpoint = 0;
-
- SendMessage(hwnd, EM_GETSEL, (WPARAM)&curpoint, (LPARAM)NULL);
- nextline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)(curpoint - 1),0);
-
- if(curpoint <= lineindex)
- { // no left arrow to the left of the prompt
- return 0;
- } else if(nextline != curline) {
- // update current line
- if (msg == WM_KEYDOWN)
- {
- int lineidx = (curline - LastPromptPosition.line);
-
- CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
- CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
-
- // we may have to add this line, otherwise update it
- editbuffer_updateoraddline(CurrentEditBuffer, lineidx, GetLastLine(hwnd));
-
- CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_HOME,1);
- CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_HOME,1);
- }
- }
- }
- else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && (mp1 == VK_DOWN)) {
- int curline = GetCurLineIndex(hwnd);
-
- /*if((msg == WM_KEYDOWN) && (GetKeyState(VK_CONTROL) && 0x8000))
- { // go back once in history
- PrevHistoryEntry();
- return 0;
- } else*/
- if((curline >= LastPromptPosition.line) && (curline < (LastPromptPosition.line + CurrentEditBuffer->LineCount)))
- {
- // We don't post the newline, but instead update the current line
- if (msg == WM_KEYDOWN)
- {
- int lineidx = (curline - LastPromptPosition.line);
-
- CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
- CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
-
- editbuffer_updateline(CurrentEditBuffer, lineidx, GetLastLine(hwnd));
- }
- } else {
- return 0;
- }
- }
- else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && (mp1 == VK_RIGHT)) {
- int lineindex = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 1;
- int curline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)-1,0);
- int nextline = 0;
- int curpoint = 0;
-
- SendMessage(hwnd, EM_GETSEL, (WPARAM)&curpoint, (LPARAM)NULL);
- nextline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)(curpoint + 2),0);
-
- if(curpoint <= lineindex)
- { // no movement behind the prompt
- return 0;
- } else if((nextline != curline) && (msg = WM_KEYDOWN)) {
- int lineidx = (curline - LastPromptPosition.line);
-
- CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
- CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
-
- editbuffer_updateline(CurrentEditBuffer, lineidx, GetLastLine(hwnd));
- }
- }
- else if ((msg == WM_KEYDOWN) && (mp1 == VK_PRIOR) && (GetKeyState(VK_CONTROL) && 0x8000)) {
- // C-p
- NextHistoryEntry();
- return 0;
- }
- else if ((msg == WM_KEYDOWN) && (mp1 == VK_NEXT) && (GetKeyState(VK_CONTROL) && 0x8000)) {
- // C-n
- PrevHistoryEntry();
- return 0;
- }
- else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && (mp1 == VK_DELETE)) {
- // see if we're the last char on the line, if so delete the next line
- // don't allow deleting left of the prompt
- int lineindex = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 2;
- int curline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)-1,0);
- int nextline = 0;
- int curpoint = 0;
-
- SendMessage(hwnd, EM_GETSEL, (WPARAM)&curpoint, (LPARAM)NULL);
- nextline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)(curpoint + 2),0);
-
- if(curpoint < lineindex)
- { // no chomping behind the prompt
- return 0;
- } else if(nextline != curline) {
- // deleting
- // grab the next line index
- curline -= LastPromptPosition.line;
-
- // kill it
- editbuffer_removeline(CurrentEditBuffer, curline+1);
- }
- }
- else if (msg == WM_PASTE) {
- // if they paste text, allow it
- r = CallWindowProc(lpEProc, hwnd, msg, mp1, mp2);
-
- // update the current edit buffer
- RefreshCurrentEditBuffer();
-
- return r;
- }
-
- // handle errors
- switch(msg)
- {
- case WM_SYNTAXERROR:
- case WM_ILLEGALCHAR:
- case WM_UNBOUNDVAL:
- { // currently I handle them all the same
- // get the start of the line
- int start = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 2;
-
- // get the statement that error'd
- NextHistoryEntry();
-
- // tell the history that the last line errored
- if(History != NULL)
- if(History->Statement != NULL)
- History->Statement->isCorrect = FALSE;
-
- // highlight the offending chars
- SendMessage(hwnd,EM_SETSEL,(WPARAM)(start + mp1), (LPARAM)(start + mp2));
-
- return 0;
- }
- }
-
- r = CallWindowProc(lpEProc, hwnd, msg, mp1, mp2);
-
- if (postit)
- PostMessage(GetParent(hwnd),WM_NEWLINE,0,0);
-
- return r;
+ LRESULT r;
+ int postit=0,nl;
+
+ if (msg == WM_CHAR && mp1 == '\r') {
+ if (!busy) {
+ r = GetCurLineIndex(hwnd);
+ nl = GetNumberOfLines(hwnd);
+
+ // if we're not the last line
+ if (r != nl-1)
+ {
+ // update or add us, we might not have any lines in the edit buffer
+ editbuffer_updateoraddline(CurrentEditBuffer, r-LastPromptPosition.line, GetLastLine(hwnd));
+
+ // scroll to the end, add CrLf then post the newline message
+ GotoEOF();
+ AddStringToControl("\r\n");
+ PostMessage(GetParent(hwnd),WM_NEWLINE,0,0);
+ return 0;
+ }
+
+ CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
+ CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
+
+ postit = 1;
+ }
+
+ }
+ else if (msg == WM_CHAR && mp1 == (char)0x08) {
+ int lineindex = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 2;
+ int curline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)-1,0);
+ int nextline = 0;
+ int curpoint = 0;
+
+ SendMessage(hwnd, EM_GETSEL, (WPARAM)&curpoint, (LPARAM)NULL);
+ nextline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)(curpoint - 1),0);
+
+ if(curpoint <= lineindex)
+ {
+ return 0;
+ } else if(nextline != curline) {
+ // delete the line we're on
+
+ // grab the index
+ curline -= LastPromptPosition.line;
+
+ // kill it
+ editbuffer_removeline(CurrentEditBuffer, curline);
+ }
+ }
+ else if (msg == WM_KEYDOWN && mp1 == VK_F1) {
+ DoHelp(hwnd);
+ }
+ else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && mp1 == VK_UP) {
+ int curline = GetCurLineIndex(hwnd);
+
+ /*if((msg == WM_KEYDOWN) && (GetKeyState(VK_CONTROL) && 0x8000))
+ { // go forward once in history
+ NextHistoryEntry();
+ return 0;
+ } else */
+ if((curline > LastPromptPosition.line) && (curline <= (LastPromptPosition.line + CurrentEditBuffer->LineCount)))
+ {
+ // update current line
+ if (msg == WM_KEYDOWN)
+ {
+ int lineidx = (curline - LastPromptPosition.line);
+
+ CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
+ CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
+
+ // we may have to add this line, otherwise update it
+ editbuffer_updateoraddline(CurrentEditBuffer, lineidx, GetLastLine(hwnd));
+ }
+ } else {
+ return 0;
+ }
+ }
+ else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && (mp1 == VK_LEFT)) {
+ int lineindex = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 2;
+ int curline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)-1,0);
+ int nextline = 0;
+ int curpoint = 0;
+
+ SendMessage(hwnd, EM_GETSEL, (WPARAM)&curpoint, (LPARAM)NULL);
+ nextline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)(curpoint - 1),0);
+
+ if(curpoint <= lineindex)
+ { // no left arrow to the left of the prompt
+ return 0;
+ } else if(nextline != curline) {
+ // update current line
+ if (msg == WM_KEYDOWN)
+ {
+ int lineidx = (curline - LastPromptPosition.line);
+
+ CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
+ CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
+
+ // we may have to add this line, otherwise update it
+ editbuffer_updateoraddline(CurrentEditBuffer, lineidx, GetLastLine(hwnd));
+
+ CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_HOME,1);
+ CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_HOME,1);
+ }
+ }
+ }
+ else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && (mp1 == VK_DOWN)) {
+ int curline = GetCurLineIndex(hwnd);
+
+ /*if((msg == WM_KEYDOWN) && (GetKeyState(VK_CONTROL) && 0x8000))
+ { // go back once in history
+ PrevHistoryEntry();
+ return 0;
+ } else*/
+ if((curline >= LastPromptPosition.line) && (curline < (LastPromptPosition.line + CurrentEditBuffer->LineCount)))
+ {
+ // We don't post the newline, but instead update the current line
+ if (msg == WM_KEYDOWN)
+ {
+ int lineidx = (curline - LastPromptPosition.line);
+
+ CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
+ CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
+
+ editbuffer_updateline(CurrentEditBuffer, lineidx, GetLastLine(hwnd));
+ }
+ } else {
+ return 0;
+ }
+ }
+ else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && (mp1 == VK_RIGHT)) {
+ int lineindex = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 1;
+ int curline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)-1,0);
+ int nextline = 0;
+ int curpoint = 0;
+
+ SendMessage(hwnd, EM_GETSEL, (WPARAM)&curpoint, (LPARAM)NULL);
+ nextline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)(curpoint + 2),0);
+
+ if(curpoint <= lineindex)
+ { // no movement behind the prompt
+ return 0;
+ } else if((nextline != curline) && (msg = WM_KEYDOWN)) {
+ int lineidx = (curline - LastPromptPosition.line);
+
+ CallWindowProc(lpEProc,hwnd,WM_KEYDOWN,VK_END,1);
+ CallWindowProc(lpEProc,hwnd,WM_KEYUP,VK_END,1);
+
+ editbuffer_updateline(CurrentEditBuffer, lineidx, GetLastLine(hwnd));
+ }
+ }
+ else if ((msg == WM_KEYDOWN) && (mp1 == VK_PRIOR) && (GetKeyState(VK_CONTROL) && 0x8000)) {
+ // C-p
+ NextHistoryEntry();
+ return 0;
+ }
+ else if ((msg == WM_KEYDOWN) && (mp1 == VK_NEXT) && (GetKeyState(VK_CONTROL) && 0x8000)) {
+ // C-n
+ PrevHistoryEntry();
+ return 0;
+ }
+ else if ((msg == WM_KEYDOWN || msg == WM_KEYUP) && (mp1 == VK_DELETE)) {
+ // see if we're the last char on the line, if so delete the next line
+ // don't allow deleting left of the prompt
+ int lineindex = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 2;
+ int curline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)-1,0);
+ int nextline = 0;
+ int curpoint = 0;
+
+ SendMessage(hwnd, EM_GETSEL, (WPARAM)&curpoint, (LPARAM)NULL);
+ nextline = SendMessage(hwnd,EM_LINEFROMCHAR,(WPARAM)(curpoint + 2),0);
+
+ if(curpoint < lineindex)
+ { // no chomping behind the prompt
+ return 0;
+ } else if(nextline != curline) {
+ // deleting
+ // grab the next line index
+ curline -= LastPromptPosition.line;
+
+ // kill it
+ editbuffer_removeline(CurrentEditBuffer, curline+1);
+ }
+ }
+ else if (msg == WM_PASTE) {
+ // if they paste text, allow it
+ r = CallWindowProc(lpEProc, hwnd, msg, mp1, mp2);
+
+ // update the current edit buffer
+ RefreshCurrentEditBuffer();
+
+ return r;
+ }
+
+ // handle errors
+ switch(msg)
+ {
+ case WM_SYNTAXERROR:
+ case WM_ILLEGALCHAR:
+ case WM_UNBOUNDVAL:
+ { // currently I handle them all the same
+ // get the start of the line
+ int start = SendMessage(hwnd, EM_LINEINDEX, LastPromptPosition.line, 0) + 2;
+
+ // get the statement that error'd
+ NextHistoryEntry();
+
+ // tell the history that the last line errored
+ if(History != NULL)
+ if(History->Statement != NULL)
+ History->Statement->isCorrect = FALSE;
+
+ // highlight the offending chars
+ SendMessage(hwnd,EM_SETSEL,(WPARAM)(start + mp1), (LPARAM)(start + mp2));
+
+ return 0;
+ }
+ }
+
+ r = CallWindowProc(lpEProc, hwnd, msg, mp1, mp2);
+
+ if (postit)
+ PostMessage(GetParent(hwnd),WM_NEWLINE,0,0);
+
+ return r;
}
static void SubClassEditField(HWND hwnd)
{
- if (lpEProc == NULL) {
- lpEProc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
- }
- SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) SubClassEdit);
+ if (lpEProc == NULL) {
+ lpEProc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
+ }
+ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) SubClassEdit);
}
/*------------------------------------------------------------------------
@@ -909,42 +911,42 @@ REMOVED!
------------------------------------------------------------------------*/
void SendLastLine(HWND hEdit)
{
-/* int curline = GetCurLineIndex(hEdit);
- char *p,linebuffer[2048];
- int n;
- int linescount = GetNumberOfLines(hEdit);
-
- *(unsigned short *)linebuffer = sizeof(linebuffer)-1;
- if (curline != linescount-1)
- n = SendMessage(hEdit,EM_GETLINE,curline,(LPARAM)linebuffer);
- else
- n = SendMessage(hEdit,EM_GETLINE,curline-1,(LPARAM)linebuffer);
- if (n >= 2 && linebuffer[0] == '#' && linebuffer[1] == ' ') {
- n -= 2;
- memmove(linebuffer, linebuffer+2, n);
- }
- linebuffer[n] = 0;
-
- // Record user input!
- AddToHistory(linebuffer);
- linebuffer[n] = '\n';
- linebuffer[n+1] = 0;
- WriteToPipe(linebuffer);
- if (curline != linescount-1) {
- // Copy the line sent to the end of the text
- p = strrchr(linebuffer,'\n');
- if (p) {
- *p = 0;
- }
- busy = 1;
- AddLineToControl(linebuffer);
- busy = 0;
- }*/
+/* int curline = GetCurLineIndex(hEdit);
+ char *p,linebuffer[2048];
+ int n;
+ int linescount = GetNumberOfLines(hEdit);
+
+ *(unsigned short *)linebuffer = sizeof(linebuffer)-1;
+ if (curline != linescount-1)
+ n = SendMessage(hEdit,EM_GETLINE,curline,(LPARAM)linebuffer);
+ else
+ n = SendMessage(hEdit,EM_GETLINE,curline-1,(LPARAM)linebuffer);
+ if (n >= 2 && linebuffer[0] == '#' && linebuffer[1] == ' ') {
+ n -= 2;
+ memmove(linebuffer, linebuffer+2, n);
+ }
+ linebuffer[n] = 0;
+
+ // Record user input!
+ AddToHistory(linebuffer);
+ linebuffer[n] = '\n';
+ linebuffer[n+1] = 0;
+ WriteToPipe(linebuffer);
+ if (curline != linescount-1) {
+ // Copy the line sent to the end of the text
+ p = strrchr(linebuffer,'\n');
+ if (p) {
+ *p = 0;
+ }
+ busy = 1;
+ AddLineToControl(linebuffer);
+ busy = 0;
+ }*/
}
/*------------------------------------------------------------------------
Procedure: SendLastEditBuffer ID:1
-Author: Chris Watford watford@uiuc.edu
+Author: Chris Watford watford@uiuc.edu
Purpose: Sends an edit buffer to the pipe
Input:
Output:
@@ -952,231 +954,231 @@ Errors:
--------------------------------------------------------------------------
Edit History:
7 Aug 2004 - Chris Watford christopher.watford@gmail.com
- - Fixed error where SendLastEditBuffer sent waaaay too many
- newlines which completely broke the underlying connection to the
- ocaml.exe pipe
- 15 Sept 2003 - Chris Watford watford@uiuc.edu
- - Sends line to the pipe and adds newline to the end
+ - Fixed error where SendLastEditBuffer sent waaaay too many
+ newlines which completely broke the underlying connection to the
+ ocaml.exe pipe
+ 15 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Sends line to the pipe and adds newline to the end
------------------------------------------------------------------------*/
void SendLastEditBuffer(HWND hwndChild)
{
- char* line = editbuffer_getasbuffer(CurrentEditBuffer);
- int l = strlen(line) - 1;
- char* linebuffer = (char*)SafeMalloc(l+2);
-
- // save current edit buffer to history and create a new blank edit buffer
- CurrentEditBuffer->isCorrect = TRUE;
- AddToHistory(CurrentEditBuffer);
- CurrentEditBuffer = (EditBuffer*)SafeMalloc(sizeof(EditBuffer));
- CurrentEditBuffer->LineCount = 0;
- CurrentEditBuffer->Lines = NULL;
-
- // trim and add the newline to the end
- strncpy(linebuffer, line, l+1);
- while((linebuffer[l] == '\n' || linebuffer[l] == '\r') && (l >= 0))
- {
- linebuffer[l--] = '\0';
- }
-
- linebuffer[l+1] = '\n';
- linebuffer[l+2] = '\0';
-
- // save line to the pipe
- WriteToPipe(linebuffer);
+ char* line = editbuffer_getasbuffer(CurrentEditBuffer);
+ int l = strlen(line) - 1;
+ char* linebuffer = (char*)SafeMalloc(l+2);
+
+ // save current edit buffer to history and create a new blank edit buffer
+ CurrentEditBuffer->isCorrect = TRUE;
+ AddToHistory(CurrentEditBuffer);
+ CurrentEditBuffer = (EditBuffer*)SafeMalloc(sizeof(EditBuffer));
+ CurrentEditBuffer->LineCount = 0;
+ CurrentEditBuffer->Lines = NULL;
+
+ // trim and add the newline to the end
+ strncpy(linebuffer, line, l+1);
+ while((linebuffer[l] == '\n' || linebuffer[l] == '\r') && (l >= 0))
+ {
+ linebuffer[l--] = '\0';
+ }
+
+ linebuffer[l+1] = '\n';
+ linebuffer[l+2] = '\0';
+
+ // save line to the pipe
+ WriteToPipe(linebuffer);
}
/*------------------------------------------------------------------------
Procedure: SendingFullCommand ID:1
-Author: Chris Watford watford@uiuc.edu
-Purpose: Returns if the command being sent
+Author: Chris Watford watford@uiuc.edu
+Purpose: Returns if the command being sent
Input: The edit control window handle
Output: None explicit
Errors: None
--------------------------------------------------------------------------
Edit History:
- 7 Aug 2004 - Chris Watford christopher.watford@gmail.com
- - Fixed bug #2932 where many carraige returns were sent and it came
- back with a null pointer error due to a fault of not checking if
- the line returned was NULL
- 13 Oct 2003 - Chris Watford watford@uiuc.edu
- - Solved the error when you have a malformed comment in the buffer
+ 7 Aug 2004 - Chris Watford christopher.watford@gmail.com
+ - Fixed bug #2932 where many carraige returns were sent and it came
+ back with a null pointer error due to a fault of not checking if
+ the line returned was NULL
+ 13 Oct 2003 - Chris Watford watford@uiuc.edu
+ - Solved the error when you have a malformed comment in the buffer
------------------------------------------------------------------------*/
BOOL SendingFullCommand(void)
{
- // if there is a ;; on the line, return true
- char *line = editbuffer_getasline(CurrentEditBuffer);
- char *firstComment, *firstSemiColonSemiColon, *firstQuote;
-
- if(line == NULL)
- {
- return FALSE;
- }
-
- firstComment = strstr(line, "(*");
- firstSemiColonSemiColon = strstr(line, ";;");
- firstQuote = strstr(line, "\"");
-
- // easy case :D
- if(firstSemiColonSemiColon == NULL)
- {
- free(line);
- return FALSE;
- }
-
- // if there are no comments
- if(firstComment == NULL)
- {
- // if there are no quotations used
- if(firstQuote == NULL)
- {
- BOOL r = (firstSemiColonSemiColon != NULL);
- free(line);
- return r;
- } else {
- // we need to first check if the ;; is before the \", since the \"
- // won't matter if its before the semicolonsemicolon
- if(firstQuote < firstSemiColonSemiColon)
- {
- // the quote is before the ;;, we need to make sure its terminated
- // also we have to check for escaped quotes, le sigh!
- char *c = firstQuote+1;
- BOOL in_quote = TRUE;
-
- // in-quote determiner loop
- while(c[0] != '\0')
- {
- // are we a backslash?
- if(c[0] == '\\')
- {
- // ignore the next character
- c++;
- }
- else
- {
- // are we a quote?
- if(c[0] == '"')
- {
- in_quote = !in_quote;
- }
- }
-
- c++;
- }
-
- free(line);
- return !in_quote;
- } else {
- BOOL r = (firstSemiColonSemiColon != NULL);
- free(line);
- return r;
- }
- }
- } else {
- // we have to search through finding all comments
-
- // a neat little trick we can do is compare the point at which
- // the ;; is and where the first (* can be found, if the ;; is
- // before the (* ocaml.exe ignores the comment
- if((unsigned int)firstSemiColonSemiColon < (unsigned int)firstComment)
- {
- free(line);
- return TRUE;
- } else {
- // time to search and find if the endline is inside a comment or not
- // start at the first comment, and move forward keeping track of the
- // nesting level, if the nest level is 0, i.e. outside a comment
- // and we find the ;; return TRUE immediately, otherwise keep searching
- // if we end with a nest level >0 return FALSE
-
- char *c = firstComment+2; // firstComment[0] is the '(', firstComment[1] is the '*'
- int nestLevel = 1; // we have a (*
-
- // in-comment determiner loop
- while(c[0] != '\0')
- {
- // are we an endline
- if((c[0] == ';') && (c[1] == ';'))
- {
- // if we are NOT in a comment, its a full line
- if(nestLevel <= 0)
- {
- free(line);
- return TRUE;
- }
- }
-
- // are we in a comment?
- if((c[0] == '(') && (c[1] == '*'))
- {
- nestLevel++;
-
- // watch out we may go past the end
- if(c[2] == '\0')
- {
- free(line);
- return FALSE;
- }
-
- // c needs to advance past the *, cause (*) is NOT the start/finish of a comment
- c++;
- }
-
- // adjust the nesting down a level
- if((c[0] == '*') && (c[1] == ')'))
- nestLevel--;
-
- // next char
- c++;
- }
-
- // not a full line
- free(line);
- return FALSE;
- }
- }
-
- // weird case ;)
- free(line);
- return FALSE;
+ // if there is a ;; on the line, return true
+ char *line = editbuffer_getasline(CurrentEditBuffer);
+ char *firstComment, *firstSemiColonSemiColon, *firstQuote;
+
+ if(line == NULL)
+ {
+ return FALSE;
+ }
+
+ firstComment = strstr(line, "(*");
+ firstSemiColonSemiColon = strstr(line, ";;");
+ firstQuote = strstr(line, "\"");
+
+ // easy case :D
+ if(firstSemiColonSemiColon == NULL)
+ {
+ free(line);
+ return FALSE;
+ }
+
+ // if there are no comments
+ if(firstComment == NULL)
+ {
+ // if there are no quotations used
+ if(firstQuote == NULL)
+ {
+ BOOL r = (firstSemiColonSemiColon != NULL);
+ free(line);
+ return r;
+ } else {
+ // we need to first check if the ;; is before the \", since the \"
+ // won't matter if its before the semicolonsemicolon
+ if(firstQuote < firstSemiColonSemiColon)
+ {
+ // the quote is before the ;;, we need to make sure its terminated
+ // also we have to check for escaped quotes, le sigh!
+ char *c = firstQuote+1;
+ BOOL in_quote = TRUE;
+
+ // in-quote determiner loop
+ while(c[0] != '\0')
+ {
+ // are we a backslash?
+ if(c[0] == '\\')
+ {
+ // ignore the next character
+ c++;
+ }
+ else
+ {
+ // are we a quote?
+ if(c[0] == '"')
+ {
+ in_quote = !in_quote;
+ }
+ }
+
+ c++;
+ }
+
+ free(line);
+ return !in_quote;
+ } else {
+ BOOL r = (firstSemiColonSemiColon != NULL);
+ free(line);
+ return r;
+ }
+ }
+ } else {
+ // we have to search through finding all comments
+
+ // a neat little trick we can do is compare the point at which
+ // the ;; is and where the first (* can be found, if the ;; is
+ // before the (* ocaml.exe ignores the comment
+ if((unsigned int)firstSemiColonSemiColon < (unsigned int)firstComment)
+ {
+ free(line);
+ return TRUE;
+ } else {
+ // time to search and find if the endline is inside a comment or not
+ // start at the first comment, and move forward keeping track of the
+ // nesting level, if the nest level is 0, i.e. outside a comment
+ // and we find the ;; return TRUE immediately, otherwise keep searching
+ // if we end with a nest level >0 return FALSE
+
+ char *c = firstComment+2; // firstComment[0] is the '(', firstComment[1] is the '*'
+ int nestLevel = 1; // we have a (*
+
+ // in-comment determiner loop
+ while(c[0] != '\0')
+ {
+ // are we an endline
+ if((c[0] == ';') && (c[1] == ';'))
+ {
+ // if we are NOT in a comment, its a full line
+ if(nestLevel <= 0)
+ {
+ free(line);
+ return TRUE;
+ }
+ }
+
+ // are we in a comment?
+ if((c[0] == '(') && (c[1] == '*'))
+ {
+ nestLevel++;
+
+ // watch out we may go past the end
+ if(c[2] == '\0')
+ {
+ free(line);
+ return FALSE;
+ }
+
+ // c needs to advance past the *, cause (*) is NOT the start/finish of a comment
+ c++;
+ }
+
+ // adjust the nesting down a level
+ if((c[0] == '*') && (c[1] == ')'))
+ nestLevel--;
+
+ // next char
+ c++;
+ }
+
+ // not a full line
+ free(line);
+ return FALSE;
+ }
+ }
+
+ // weird case ;)
+ free(line);
+ return FALSE;
}
/*------------------------------------------------------------------------
Procedure: AppendToEditBuffer ID:1
-Author: Chris Watford watford@uiuc.edu
+Author: Chris Watford watford@uiuc.edu
Purpose: Add a line to the edit buffer
-Input: Handle of the edit control
+Input: Handle of the edit control
Output:
Errors:
------------------------------------------------------------------------*/
void AppendToEditBuffer(HWND hEdit)
{
- char *p = NULL, linebuffer[2048];
- int n = 0;
- int curline = GetCurLineIndex(hEdit);
- int linescount = GetNumberOfLines(hEdit);
-
- // they are passing the size of the buffer as
- // the first 'short' in the array...
- *(unsigned short *)linebuffer = sizeof(linebuffer)-1;
-
- if (curline > (linescount-1))
- {
- n = SendMessage(hEdit, EM_GETLINE, curline, (LPARAM)linebuffer);
- } else {
- n = SendMessage(hEdit, EM_GETLINE, --curline, (LPARAM)linebuffer);
- }
-
- // correct for the prompt line
- if (n >= 2 && linebuffer[0] == '#' && linebuffer[1] == ' ')
- {
- n -= 2;
- memmove(linebuffer, linebuffer+2, n);
- }
-
- linebuffer[n] = '\0';
-
- // linebuffer now has the line to add to our edit buffer
- editbuffer_updateoraddline(CurrentEditBuffer, (curline - LastPromptPosition.line), linebuffer);
+ char *p = NULL, linebuffer[2048];
+ int n = 0;
+ int curline = GetCurLineIndex(hEdit);
+ int linescount = GetNumberOfLines(hEdit);
+
+ // they are passing the size of the buffer as
+ // the first 'short' in the array...
+ *(unsigned short *)linebuffer = sizeof(linebuffer)-1;
+
+ if (curline > (linescount-1))
+ {
+ n = SendMessage(hEdit, EM_GETLINE, curline, (LPARAM)linebuffer);
+ } else {
+ n = SendMessage(hEdit, EM_GETLINE, --curline, (LPARAM)linebuffer);
+ }
+
+ // correct for the prompt line
+ if (n >= 2 && linebuffer[0] == '#' && linebuffer[1] == ' ')
+ {
+ n -= 2;
+ memmove(linebuffer, linebuffer+2, n);
+ }
+
+ linebuffer[n] = '\0';
+
+ // linebuffer now has the line to add to our edit buffer
+ editbuffer_updateoraddline(CurrentEditBuffer, (curline - LastPromptPosition.line), linebuffer);
}
/*------------------------------------------------------------------------
@@ -1189,10 +1191,10 @@ Errors:
------------------------------------------------------------------------*/
void SetLastPrompt(HWND hEdit)
{
- DWORD startpos,endpos;
- SendMessage(hEdit,EM_GETSEL,(WPARAM)&startpos,(LPARAM)&endpos);
- LastPromptPosition.line = SendMessage(hEdit,EM_LINEFROMCHAR,(WPARAM)-1,0);
- LastPromptPosition.col = startpos;
+ DWORD startpos,endpos;
+ SendMessage(hEdit,EM_GETSEL,(WPARAM)&startpos,(LPARAM)&endpos);
+ LastPromptPosition.line = SendMessage(hEdit,EM_LINEFROMCHAR,(WPARAM)-1,0);
+ LastPromptPosition.col = startpos;
}
/*------------------------------------------------------------------------
@@ -1206,194 +1208,194 @@ Output:
Errors:
--------------------------------------------------------------------------
Edit History:
- 14 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added edit buffer and statement buffer support to the WM_NEWLINE
- message.
- 15 Sept 2003 - Chris Watford watford@uiuc.edu
- - Got it adding to the edit buffer
- 16 Sept 2003 - Chris Watford watford@uiuc.edu
- - Proper handling of newline message finished
- 21 Sept 2003 - Chris Watford watford@uiuc.edu
- - Added error detection on return from ocaml interp
- 23 Sept 2003 - Chris Watford watford@uiuc.edu
- - Fixed prompt detection error as pointed out by Patrick Meredith
+ 14 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added edit buffer and statement buffer support to the WM_NEWLINE
+ message.
+ 15 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Got it adding to the edit buffer
+ 16 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Proper handling of newline message finished
+ 21 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Added error detection on return from ocaml interp
+ 23 Sept 2003 - Chris Watford watford@uiuc.edu
+ - Fixed prompt detection error as pointed out by Patrick Meredith
------------------------------------------------------------------------*/
static LRESULT CALLBACK MdiChildWndProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM lparam)
{
- HWND hwndChild;
- RECT rc;
- HDC hDC;
-
- switch(msg) {
- case WM_CREATE:
- GetClientRect(hwnd,&rc);
- hwndChild= CreateWindow("EDIT",
- NULL,
- WS_CHILD | WS_VISIBLE |
- ES_MULTILINE |
- WS_VSCROLL | WS_HSCROLL |
- ES_AUTOHSCROLL | ES_AUTOVSCROLL,
- 0,
- 0,
- (rc.right-rc.left),
- (rc.bottom-rc.top),
- hwnd,
- (HMENU) EditControls++,
- hInst,
- NULL);
- SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR) hwndChild);
- SendMessage(hwndChild, WM_SETFONT, (WPARAM) ProgramParams.hFont, 0L);
- SendMessage(hwndChild,EM_LIMITTEXT,0xffffffff,0);
- SubClassEditField(hwndChild);
- break;
- // Resize the edit control
- case WM_SIZE:
- hwndChild = (HWND) GetWindowLongPtr(hwnd, DWLP_USER);
- MoveWindow(hwndChild, 0, 0, LOWORD(lparam), HIWORD(lparam), TRUE);
- break;
- // Always set the focus to the edit control.
- case WM_SETFOCUS:
- hwndChild = (HWND) GetWindowLongPtr(hwnd, DWLP_USER);
- SetFocus(hwndChild);
- break;
- // Repainting of the edit control about to happen.
- // Set the text color and the background color
- case WM_CTLCOLOREDIT:
- hDC = (HDC)wparam;
- SetTextColor(hDC,ProgramParams.TextColor);
- SetBkColor(hDC,BackColor);
- return (LRESULT)BackgroundBrush;
- // Take care of erasing the background color to avoid flicker
- case WM_ERASEBKGND:
- GetWindowRect(hwnd,&rc);
- hDC = (HDC)wparam;
- FillRect(hDC,&rc,BackgroundBrush);
- return 1;
- // A carriage return has been pressed. Send the data to the interpreted.
- // This message is posted by the subclassed edit field.
- case WM_COMMAND:
- if (LOWORD(wparam) >= IDEDITCONTROL && LOWORD(wparam) < IDEDITCONTROL+5) {
- switch (HIWORD(wparam)) {
- case EN_ERRSPACE:
- case EN_MAXTEXT:
- ResetText();
- break;
- }
- }
- break;
- case WM_NEWLINE:
- if (busy)
- break;
-
- hwndChild = (HWND) GetWindowLongPtr(hwnd, DWLP_USER);
-
- // add what they wrote to the edit buffer
- AppendToEditBuffer(hwndChild);
-
- /** Modified by Chris Watford 14 Sept 2003, 15 Sept 2003, 16 Sept 2003 **/
- // test if this line has an end or if it needs to be in the Edit Buffer
- if(SendingFullCommand())
- {
- // send the edit buffer to the interpreter
- //SendLastLine(hwndChild);
- SendLastEditBuffer(hwndChild);
- historyEntry = NULL;
- } else {
- AddStringToControl(" ");
- }
- /** End Modifications **/
-
- break;
- // The timer will call us 4 times a second. Look if the interpreter
- // has written something in its end of the pipe.
- case WM_TIMERTICK:
- /** Modified by Chris Watford 21 Sept 2003 **/
- hwndChild = (HWND) GetWindowLongPtr(hwnd, DWLP_USER);
-
- if (ReadToLineBuffer())
- {
- int errMsg = 0;
- char *p, *l = lineBuffer;
-
- // Ok we read something. Display the trimmed version
- while(((*l) == ' ') || ((*l) == '\t') || ((*l) == '\n') || ((*l) == '\r') || ((*l) == '*'))
- l++;
-
- SendMessage(hwndChild,EM_REPLACESEL,0,(LPARAM)l);
-
- // fix bug where it won't find prompt
- p = strrchr(l, '\r');
- if((l[0] == '#') || (p != NULL))
- {
- if(p != NULL)
- {
- if(!strcmp(p, "\r\n# "))
- {
- SetLastPrompt(hwndChild);
- }
- // solve the bug Patrick found
- } else if((l[0] == '#') && (l[1] == ' ')) {
- SetLastPrompt(hwndChild);
- }
- }
-
- // detect syntax errors
- if(strstr(lineBuffer, "Syntax error"))
- {
- errMsg = WM_SYNTAXERROR;
- } else if(strstr(lineBuffer, "Illegal character")) {
- errMsg = WM_ILLEGALCHAR;
- } else if(strstr(lineBuffer, "Unbound value")) {
- errMsg = WM_UNBOUNDVAL;
- }
-
- // error! error! alert alert!
- if(errMsg > 0)
- {
- int len = strlen(lineBuffer);
- char* err = (char*)SafeMalloc(len+1);
- char *m = err, *n1 = NULL, *n2 = NULL, *nt = NULL;
-
- // make a copy of the message
- strncpy(err, lineBuffer, len);
- err[len] = '\0';
-
- // find it
- m = strstr(err, "Characters ");
- if(m == NULL)
- break;
-
- // got the start char
- n1 = m + strlen("Characters ");
-
- // start looking for the end char
- nt = strstr(n1, "-");
- if(nt == NULL)
- break;
-
- // makes n1 a valid string
- nt[0] = '\0';
-
- // end char is right after this
- n2 = nt + 1;
-
- // find the end of n2
- nt = strstr(n2, ":");
- if(nt == NULL)
- break;
-
- // makes n2 a valid string
- nt[0] = '\0';
-
- SendMessage(hwndChild, errMsg, (WPARAM)atoi(n1), (LPARAM)atoi(n2));
- }
- }
- /** End Modifications **/
-
- break;
-
- }
- return DefMDIChildProc(hwnd, msg, wparam, lparam);
+ HWND hwndChild;
+ RECT rc;
+ HDC hDC;
+
+ switch(msg) {
+ case WM_CREATE:
+ GetClientRect(hwnd,&rc);
+ hwndChild= CreateWindow("EDIT",
+ NULL,
+ WS_CHILD | WS_VISIBLE |
+ ES_MULTILINE |
+ WS_VSCROLL | WS_HSCROLL |
+ ES_AUTOHSCROLL | ES_AUTOVSCROLL,
+ 0,
+ 0,
+ (rc.right-rc.left),
+ (rc.bottom-rc.top),
+ hwnd,
+ (HMENU) EditControls++,
+ hInst,
+ NULL);
+ SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR) hwndChild);
+ SendMessage(hwndChild, WM_SETFONT, (WPARAM) ProgramParams.hFont, 0L);
+ SendMessage(hwndChild,EM_LIMITTEXT,0xffffffff,0);
+ SubClassEditField(hwndChild);
+ break;
+ // Resize the edit control
+ case WM_SIZE:
+ hwndChild = (HWND) GetWindowLongPtr(hwnd, DWLP_USER);
+ MoveWindow(hwndChild, 0, 0, LOWORD(lparam), HIWORD(lparam), TRUE);
+ break;
+ // Always set the focus to the edit control.
+ case WM_SETFOCUS:
+ hwndChild = (HWND) GetWindowLongPtr(hwnd, DWLP_USER);
+ SetFocus(hwndChild);
+ break;
+ // Repainting of the edit control about to happen.
+ // Set the text color and the background color
+ case WM_CTLCOLOREDIT:
+ hDC = (HDC)wparam;
+ SetTextColor(hDC,ProgramParams.TextColor);
+ SetBkColor(hDC,BackColor);
+ return (LRESULT)BackgroundBrush;
+ // Take care of erasing the background color to avoid flicker
+ case WM_ERASEBKGND:
+ GetWindowRect(hwnd,&rc);
+ hDC = (HDC)wparam;
+ FillRect(hDC,&rc,BackgroundBrush);
+ return 1;
+ // A carriage return has been pressed. Send the data to the interpreted.
+ // This message is posted by the subclassed edit field.
+ case WM_COMMAND:
+ if (LOWORD(wparam) >= IDEDITCONTROL && LOWORD(wparam) < IDEDITCONTROL+5) {
+ switch (HIWORD(wparam)) {
+ case EN_ERRSPACE:
+ case EN_MAXTEXT:
+ ResetText();
+ break;
+ }
+ }
+ break;
+ case WM_NEWLINE:
+ if (busy)
+ break;
+
+ hwndChild = (HWND) GetWindowLongPtr(hwnd, DWLP_USER);
+
+ // add what they wrote to the edit buffer
+ AppendToEditBuffer(hwndChild);
+
+ /** Modified by Chris Watford 14 Sept 2003, 15 Sept 2003, 16 Sept 2003 **/
+ // test if this line has an end or if it needs to be in the Edit Buffer
+ if(SendingFullCommand())
+ {
+ // send the edit buffer to the interpreter
+ //SendLastLine(hwndChild);
+ SendLastEditBuffer(hwndChild);
+ historyEntry = NULL;
+ } else {
+ AddStringToControl(" ");
+ }
+ /** End Modifications **/
+
+ break;
+ // The timer will call us 4 times a second. Look if the interpreter
+ // has written something in its end of the pipe.
+ case WM_TIMERTICK:
+ /** Modified by Chris Watford 21 Sept 2003 **/
+ hwndChild = (HWND) GetWindowLongPtr(hwnd, DWLP_USER);
+
+ if (ReadToLineBuffer())
+ {
+ int errMsg = 0;
+ char *p, *l = lineBuffer;
+
+ // Ok we read something. Display the trimmed version
+ while(((*l) == ' ') || ((*l) == '\t') || ((*l) == '\n') || ((*l) == '\r') || ((*l) == '*'))
+ l++;
+
+ SendMessage(hwndChild,EM_REPLACESEL,0,(LPARAM)l);
+
+ // fix bug where it won't find prompt
+ p = strrchr(l, '\r');
+ if((l[0] == '#') || (p != NULL))
+ {
+ if(p != NULL)
+ {
+ if(!strcmp(p, "\r\n# "))
+ {
+ SetLastPrompt(hwndChild);
+ }
+ // solve the bug Patrick found
+ } else if((l[0] == '#') && (l[1] == ' ')) {
+ SetLastPrompt(hwndChild);
+ }
+ }
+
+ // detect syntax errors
+ if(strstr(lineBuffer, "Syntax error"))
+ {
+ errMsg = WM_SYNTAXERROR;
+ } else if(strstr(lineBuffer, "Illegal character")) {
+ errMsg = WM_ILLEGALCHAR;
+ } else if(strstr(lineBuffer, "Unbound value")) {
+ errMsg = WM_UNBOUNDVAL;
+ }
+
+ // error! error! alert alert!
+ if(errMsg > 0)
+ {
+ int len = strlen(lineBuffer);
+ char* err = (char*)SafeMalloc(len+1);
+ char *m = err, *n1 = NULL, *n2 = NULL, *nt = NULL;
+
+ // make a copy of the message
+ strncpy(err, lineBuffer, len);
+ err[len] = '\0';
+
+ // find it
+ m = strstr(err, "Characters ");
+ if(m == NULL)
+ break;
+
+ // got the start char
+ n1 = m + strlen("Characters ");
+
+ // start looking for the end char
+ nt = strstr(n1, "-");
+ if(nt == NULL)
+ break;
+
+ // makes n1 a valid string
+ nt[0] = '\0';
+
+ // end char is right after this
+ n2 = nt + 1;
+
+ // find the end of n2
+ nt = strstr(n2, ":");
+ if(nt == NULL)
+ break;
+
+ // makes n2 a valid string
+ nt[0] = '\0';
+
+ SendMessage(hwndChild, errMsg, (WPARAM)atoi(n1), (LPARAM)atoi(n2));
+ }
+ }
+ /** End Modifications **/
+
+ break;
+
+ }
+ return DefMDIChildProc(hwnd, msg, wparam, lparam);
}
@@ -1413,52 +1415,52 @@ Errors:
------------------------------------------------------------------------*/
static LRESULT CALLBACK MainWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
{
- switch (msg) {
- // Create the MDI client invisible window
- case WM_CREATE:
- hwndMDIClient = CreateMdiClient(hwnd);
- TimerId = SetTimer((HWND) 0, 0, 100, (TIMERPROC) TimerProc);
- break;
- // Move the child windows
- case WM_SIZE:
- SendMessage(hWndStatusbar,msg,wParam,lParam);
- InitializeStatusBar(hWndStatusbar,1);
- // Position the MDI client window between the tool and status bars
- if (wParam != SIZE_MINIMIZED) {
- RECT rc, rcClient;
-
- GetClientRect(hwnd, &rcClient);
- GetWindowRect(hWndStatusbar, &rc);
- ScreenToClient(hwnd, (LPPOINT)&rc.left);
- rcClient.bottom = rc.top;
- MoveWindow(hwndMDIClient,rcClient.left,rcClient.top,rcClient.right-rcClient.left, rcClient.bottom-rcClient.top, TRUE);
- }
-
- return 0;
- // Dispatch the menu commands
- case WM_COMMAND:
- HandleCommand(hwnd, wParam,lParam);
- return 0;
- // If user confirms close
- case WM_CLOSE:
- if (!AskYesOrNo("Quit OCamlWinPlus?"))
- return 0;
- break;
- // End application
- case WM_DESTROY:
- PostQuitMessage(0);
- break;
- // The interpreter has exited. Force close of the application
- case WM_QUITOCAML:
- DestroyWindow(hwnd);
- return 0;
- case WM_USER+1000:
- // TestGraphics();
- break;
- default:
- return DefFrameProc(hwnd,hwndMDIClient,msg,wParam,lParam);
- }
- return DefFrameProc(hwnd,hwndMDIClient,msg,wParam,lParam);
+ switch (msg) {
+ // Create the MDI client invisible window
+ case WM_CREATE:
+ hwndMDIClient = CreateMdiClient(hwnd);
+ TimerId = SetTimer((HWND) 0, 0, 100, (TIMERPROC) TimerProc);
+ break;
+ // Move the child windows
+ case WM_SIZE:
+ SendMessage(hWndStatusbar,msg,wParam,lParam);
+ InitializeStatusBar(hWndStatusbar,1);
+ // Position the MDI client window between the tool and status bars
+ if (wParam != SIZE_MINIMIZED) {
+ RECT rc, rcClient;
+
+ GetClientRect(hwnd, &rcClient);
+ GetWindowRect(hWndStatusbar, &rc);
+ ScreenToClient(hwnd, (LPPOINT)&rc.left);
+ rcClient.bottom = rc.top;
+ MoveWindow(hwndMDIClient,rcClient.left,rcClient.top,rcClient.right-rcClient.left, rcClient.bottom-rcClient.top, TRUE);
+ }
+
+ return 0;
+ // Dispatch the menu commands
+ case WM_COMMAND:
+ HandleCommand(hwnd, wParam,lParam);
+ return 0;
+ // If user confirms close
+ case WM_CLOSE:
+ if (!AskYesOrNo("Quit OCamlWinPlus?"))
+ return 0;
+ break;
+ // End application
+ case WM_DESTROY:
+ PostQuitMessage(0);
+ break;
+ // The interpreter has exited. Force close of the application
+ case WM_QUITOCAML:
+ DestroyWindow(hwnd);
+ return 0;
+ case WM_USER+1000:
+ // TestGraphics();
+ break;
+ default:
+ return DefFrameProc(hwnd,hwndMDIClient,msg,wParam,lParam);
+ }
+ return DefFrameProc(hwnd,hwndMDIClient,msg,wParam,lParam);
}
/*------------------------------------------------------------------------
@@ -1470,17 +1472,17 @@ Errors:
------------------------------------------------------------------------*/
static HFONT CreationCourier(int flag)
{
- LOGFONT CurrentFont;
- memset(&CurrentFont, 0, sizeof(LOGFONT));
- CurrentFont.lfCharSet = ANSI_CHARSET;
- CurrentFont.lfWeight = FW_NORMAL;
- if (flag)
- CurrentFont.lfHeight = 18;
- else
- CurrentFont.lfHeight = 15;
- CurrentFont.lfPitchAndFamily = (BYTE) (FIXED_PITCH | FF_MODERN);
- strcpy(CurrentFont.lfFaceName, "Courier"); /* Courier */
- return (CreateFontIndirect(&CurrentFont));
+ LOGFONT CurrentFont;
+ memset(&CurrentFont, 0, sizeof(LOGFONT));
+ CurrentFont.lfCharSet = ANSI_CHARSET;
+ CurrentFont.lfWeight = FW_NORMAL;
+ if (flag)
+ CurrentFont.lfHeight = 18;
+ else
+ CurrentFont.lfHeight = 15;
+ CurrentFont.lfPitchAndFamily = (BYTE) (FIXED_PITCH | FF_MODERN);
+ strcpy(CurrentFont.lfFaceName, "Courier"); /* Courier */
+ return (CreateFontIndirect(&CurrentFont));
}
/*------------------------------------------------------------------------
@@ -1493,8 +1495,8 @@ Errors: None
------------------------------------------------------------------------*/
int ReadToLineBuffer(void)
{
- memset(lineBuffer,0,sizeof(lineBuffer));
- return ReadFromPipe(lineBuffer,sizeof(lineBuffer));
+ memset(lineBuffer,0,sizeof(lineBuffer));
+ return ReadFromPipe(lineBuffer,sizeof(lineBuffer));
}
/*------------------------------------------------------------------------
@@ -1507,10 +1509,10 @@ Errors:
------------------------------------------------------------------------*/
int AddLineBuffer(void)
{
- HWND hEditCtrl;
+ HWND hEditCtrl;
- hEditCtrl = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
- return SendMessage(hEditCtrl,EM_REPLACESEL,0,(LPARAM)lineBuffer);
+ hEditCtrl = (HWND)GetWindowLongPtr(hwndSession,DWLP_USER);
+ return SendMessage(hEditCtrl,EM_REPLACESEL,0,(LPARAM)lineBuffer);
}
@@ -1524,14 +1526,14 @@ Errors:
------------------------------------------------------------------------*/
static int Setup(HANDLE *phAccelTable)
{
- if (!InitApplication())
- return 0;
- ProgramParams.hFont = CreationCourier(1);
- ProgramParams.TextColor = RGB(0,0,0);
- GetObject(ProgramParams.hFont,sizeof(LOGFONT),&CurrentFont);
- BackgroundBrush = CreateSolidBrush(BackColor);
- *phAccelTable = LoadAccelerators(hInst,MAKEINTRESOURCE(IDACCEL));
- return 1;
+ if (!InitApplication())
+ return 0;
+ ProgramParams.hFont = CreationCourier(1);
+ ProgramParams.TextColor = RGB(0,0,0);
+ GetObject(ProgramParams.hFont,sizeof(LOGFONT),&CurrentFont);
+ BackgroundBrush = CreateSolidBrush(BackColor);
+ *phAccelTable = LoadAccelerators(hInst,MAKEINTRESOURCE(IDACCEL));
+ return 1;
}
@@ -1544,56 +1546,56 @@ Errors:
------------------------------------------------------------------------*/
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, INT nCmdShow)
{
- MSG msg;
- HANDLE hAccelTable;
- char consoleTitle[512];
- HWND hwndConsole;
-
- CurrentEditBuffer = (EditBuffer*)SafeMalloc(sizeof(EditBuffer));
- CurrentEditBuffer->LineCount = 0;
- CurrentEditBuffer->Lines = NULL;
-
- //setup the history index pointer
- historyEntry = NULL;
-
- // Setup the hInst global
- hInst = hInstance;
- // Do the setup
- if (!Setup(&hAccelTable))
- return 0;
- // Need to set up a console so that we can send ctrl-break signal
- // to inferior Caml
- AllocConsole();
- GetConsoleTitle(consoleTitle,sizeof(consoleTitle));
- hwndConsole = FindWindow(NULL,consoleTitle);
- ShowWindow(hwndConsole,SW_HIDE);
- // Create main window and exit if this fails
- if ((hwndMain = CreateinriaWndClassWnd()) == (HWND)0)
- return 0;
- // Create the status bar
- CreateSBar(hwndMain,"Ready",2);
- // Show the window
- ShowWindow(hwndMain,SW_SHOW);
- // Create the session window
- hwndSession = MDICmdFileNew("Session transcript",0);
- // Get the path to ocaml.exe
- GetOcamlPath();
- // Start the interpreter
- StartOcaml();
- // Show the session window
- ShowWindow(hwndSession, SW_SHOW);
- // Maximize it
- SendMessage(hwndMDIClient, WM_MDIMAXIMIZE, (WPARAM) hwndSession, 0);
-
- PostMessage(hwndMain,WM_USER+1000,0,0);
- while (GetMessage(&msg,NULL,0,0)) {
- if (!TranslateMDISysAccel(hwndMDIClient, &msg))
- if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) {
- TranslateMessage(&msg); // Translates virtual key codes
- DispatchMessage(&msg); // Dispatches message to window
- }
- }
- WriteToPipe("#quit;;\r\n\032");
- KillTimer((HWND) 0, TimerId);
- return msg.wParam;
+ MSG msg;
+ HANDLE hAccelTable;
+ char consoleTitle[512];
+ HWND hwndConsole;
+
+ CurrentEditBuffer = (EditBuffer*)SafeMalloc(sizeof(EditBuffer));
+ CurrentEditBuffer->LineCount = 0;
+ CurrentEditBuffer->Lines = NULL;
+
+ //setup the history index pointer
+ historyEntry = NULL;
+
+ // Setup the hInst global
+ hInst = hInstance;
+ // Do the setup
+ if (!Setup(&hAccelTable))
+ return 0;
+ // Need to set up a console so that we can send ctrl-break signal
+ // to inferior Caml
+ AllocConsole();
+ GetConsoleTitle(consoleTitle,sizeof(consoleTitle));
+ hwndConsole = FindWindow(NULL,consoleTitle);
+ ShowWindow(hwndConsole,SW_HIDE);
+ // Create main window and exit if this fails
+ if ((hwndMain = CreateinriaWndClassWnd()) == (HWND)0)
+ return 0;
+ // Create the status bar
+ CreateSBar(hwndMain,"Ready",2);
+ // Show the window
+ ShowWindow(hwndMain,SW_SHOW);
+ // Create the session window
+ hwndSession = MDICmdFileNew("Session transcript",0);
+ // Get the path to ocaml.exe
+ GetOcamlPath();
+ // Start the interpreter
+ StartOcaml();
+ // Show the session window
+ ShowWindow(hwndSession, SW_SHOW);
+ // Maximize it
+ SendMessage(hwndMDIClient, WM_MDIMAXIMIZE, (WPARAM) hwndSession, 0);
+
+ PostMessage(hwndMain,WM_USER+1000,0,0);
+ while (GetMessage(&msg,NULL,0,0)) {
+ if (!TranslateMDISysAccel(hwndMDIClient, &msg))
+ if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) {
+ TranslateMessage(&msg); // Translates virtual key codes
+ DispatchMessage(&msg); // Dispatches message to window
+ }
+ }
+ WriteToPipe("#quit;;\r\n\032");
+ KillTimer((HWND) 0, TimerId);
+ return msg.wParam;
}
diff --git a/win32caml/ocaml.rc b/win32caml/ocaml.rc
index 52ae949742..0aab9c3c73 100644
--- a/win32caml/ocaml.rc
+++ b/win32caml/ocaml.rc
@@ -106,7 +106,7 @@ EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE
CAPTION "About OCamlWinPlus"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- LTEXT "Objective Caml for Windows",101,75,7,90,12
+ LTEXT "OCaml for Windows",101,75,7,90,12
LTEXT "New Windows Interface 1.9RC4",102,68,15,104,12
CTEXT "Copyright 1996-2001\nUpdated 2003",103,88,25,66,23
CTEXT "Institut National de Recherche en Informatique et Automatique",
diff --git a/win32caml/startocaml.c b/win32caml/startocaml.c
index f1a3562d9c..d457dd41b0 100644
--- a/win32caml/startocaml.c
+++ b/win32caml/startocaml.c
@@ -1,8 +1,9 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Developed by Jacob Navia. */
+/* */
/* Copyright 2001 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
/* under the terms of the GNU Library General Public License, with */
@@ -37,28 +38,28 @@ Errors:
------------------------------------------------------------------------*/
void ShowDbgMsg(char *str)
{
- HWND hWnd;
- char p[20], message[255];
- hWnd = hwndMain;
- if (IsIconic(hWnd)){
- ShowWindow(hWnd,SW_RESTORE);
- }
- strncpy(message, str, 254);
- message[254] = 0;
- strcpy(p, "Error");
- MessageBox(hWnd, message, p, MB_OK | MB_ICONHAND|MB_TASKMODAL|MB_SETFOREGROUND);
+ HWND hWnd;
+ char p[20], message[255];
+ hWnd = hwndMain;
+ if (IsIconic(hWnd)){
+ ShowWindow(hWnd,SW_RESTORE);
+ }
+ strncpy(message, str, 254);
+ message[254] = 0;
+ strcpy(p, "Error");
+ MessageBox(hWnd, message, p, MB_OK | MB_ICONHAND|MB_TASKMODAL|MB_SETFOREGROUND);
}
int AskYesOrNo(char *msg)
{
- HWND hwnd;
- int r;
-
- hwnd = hwndMain;
- r = MessageBox(hwnd, msg, "Ocaml", MB_YESNO | MB_SETFOREGROUND);
- if (r == IDYES)
- return (TRUE);
- return (FALSE);
+ HWND hwnd;
+ int r;
+
+ hwnd = hwndMain;
+ r = MessageBox(hwnd, msg, "Ocaml", MB_YESNO | MB_SETFOREGROUND);
+ if (r == IDYES)
+ return (TRUE);
+ return (FALSE);
}
@@ -66,60 +67,60 @@ static DWORD OcamlStatus;
static int RegistryError(void)
{
- char buf[512];
+ char buf[512];
- wsprintf(buf,"Error %d writing to the registry",GetLastError());
- ShowDbgMsg(buf);
- return 0;
+ wsprintf(buf,"Error %d writing to the registry",GetLastError());
+ ShowDbgMsg(buf);
+ return 0;
}
static int ReadRegistry(HKEY hroot,
- char * p1, char * p2, char * p3,
- char dest[1024])
+ char * p1, char * p2, char * p3,
+ char dest[1024])
{
- HKEY h1, h2;
- DWORD dwType;
- unsigned long size;
- LONG ret;
-
- if (RegOpenKeyExA(hroot, p1, 0, KEY_QUERY_VALUE, &h1) != ERROR_SUCCESS)
- return 0;
- if (RegOpenKeyExA(h1, p2, 0, KEY_QUERY_VALUE, &h2) != ERROR_SUCCESS) {
- RegCloseKey(h1);
- return 0;
- }
- dwType = REG_SZ;
- size = 1024;
- ret = RegQueryValueExA(h2, p3, 0, &dwType, dest, &size);
- RegCloseKey(h2);
- RegCloseKey(h1);
- return ret == ERROR_SUCCESS;
+ HKEY h1, h2;
+ DWORD dwType;
+ unsigned long size;
+ LONG ret;
+
+ if (RegOpenKeyExA(hroot, p1, 0, KEY_QUERY_VALUE, &h1) != ERROR_SUCCESS)
+ return 0;
+ if (RegOpenKeyExA(h1, p2, 0, KEY_QUERY_VALUE, &h2) != ERROR_SUCCESS) {
+ RegCloseKey(h1);
+ return 0;
+ }
+ dwType = REG_SZ;
+ size = 1024;
+ ret = RegQueryValueExA(h2, p3, 0, &dwType, dest, &size);
+ RegCloseKey(h2);
+ RegCloseKey(h1);
+ return ret == ERROR_SUCCESS;
}
static int WriteRegistry(HKEY hroot,
- char * p1, char * p2, char * p3,
- char data[1024])
+ char * p1, char * p2, char * p3,
+ char data[1024])
{
- HKEY h1, h2;
- DWORD disp;
- LONG ret;
-
- if (RegOpenKeyExA(hroot, p1, 0, KEY_QUERY_VALUE, &h1) != ERROR_SUCCESS)
- return 0;
- if (RegCreateKeyExA(h1, p2, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &h2, &disp)
- != ERROR_SUCCESS) {
- RegCloseKey(h1);
- return 0;
- }
- ret = RegSetValueEx(h2, p3, 0, REG_SZ, data, strlen(data) + 1);
- RegCloseKey(h2);
- RegCloseKey(h1);
- return ret == ERROR_SUCCESS;
+ HKEY h1, h2;
+ DWORD disp;
+ LONG ret;
+
+ if (RegOpenKeyExA(hroot, p1, 0, KEY_QUERY_VALUE, &h1) != ERROR_SUCCESS)
+ return 0;
+ if (RegCreateKeyExA(h1, p2, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &h2, &disp)
+ != ERROR_SUCCESS) {
+ RegCloseKey(h1);
+ return 0;
+ }
+ ret = RegSetValueEx(h2, p3, 0, REG_SZ, data, strlen(data) + 1);
+ RegCloseKey(h2);
+ RegCloseKey(h1);
+ return ret == ERROR_SUCCESS;
}
/*------------------------------------------------------------------------
Procedure: GetOcamlPath ID:1
-Purpose: Read the registry key
+Purpose: Read the registry key
HKEY_LOCAL_MACHINE\Software\Objective Caml
or
HKEY_CURRENT_USER\Software\Objective Caml,
@@ -141,13 +142,13 @@ int GetOcamlPath(void)
char path[1024], *p;
while (( !ReadRegistry(HKEY_CURRENT_USER,
- "Software", "Objective Caml",
- "InterpreterPath", path)
- &&
- !ReadRegistry(HKEY_LOCAL_MACHINE,
- "Software", "Objective Caml",
- "InterpreterPath", path))
- || _access(path, 0) != 0) {
+ "Software", "Objective Caml",
+ "InterpreterPath", path)
+ &&
+ !ReadRegistry(HKEY_LOCAL_MACHINE,
+ "Software", "Objective Caml",
+ "InterpreterPath", path))
+ || _access(path, 0) != 0) {
/* Registry key doesn't exist or contains invalid path */
/* Ask user */
if (!BrowseForFile("Ocaml interpreter|ocaml.exe", path)) {
@@ -155,8 +156,8 @@ int GetOcamlPath(void)
exit(0);
}
WriteRegistry(HKEY_CURRENT_USER,
- "Software", "Objective Caml",
- "InterpreterPath", path);
+ "Software", "Objective Caml",
+ "InterpreterPath", path);
/* Iterate to validate again */
}
strcpy(OcamlPath, path);
@@ -185,11 +186,11 @@ Errors:
------------------------------------------------------------------------*/
int IsWindowsNT(void)
{
- OSVERSIONINFO osv;
+ OSVERSIONINFO osv;
- osv.dwOSVersionInfoSize = sizeof(osv);
- GetVersionEx(&osv);
- return(osv.dwPlatformId == VER_PLATFORM_WIN32_NT);
+ osv.dwOSVersionInfoSize = sizeof(osv);
+ GetVersionEx(&osv);
+ return(osv.dwPlatformId == VER_PLATFORM_WIN32_NT);
}
/*------------------------------------------------------------------------
@@ -215,56 +216,56 @@ thread will exit. No error message is shown.
DWORD WINAPI DoStartOcaml(LPVOID param)
{
HWND hwndParent = (HWND) param;
- char *cmdline;
- int processStarted;
- LPSECURITY_ATTRIBUTES lpsa=NULL;
- SECURITY_ATTRIBUTES sa;
- SECURITY_DESCRIPTOR sd;
-
- sa.nLength = sizeof(SECURITY_ATTRIBUTES);
- // Under windows NT/2000/Whistler we have to initialize the security descriptors
- // This is not necessary under windows 98/95.
- if (IsWindowsNT()) {
- InitializeSecurityDescriptor(&sd,SECURITY_DESCRIPTOR_REVISION);
- SetSecurityDescriptorDacl(&sd,TRUE,NULL,FALSE);
- sa.bInheritHandle = TRUE;
- sa.lpSecurityDescriptor = &sd;
- lpsa = &sa;
- }
- memset(&startInfo,0,sizeof(STARTUPINFO));
- startInfo.cb = sizeof(STARTUPINFO);
- // Create a pipe for the child process's STDOUT.
- if (! CreatePipe(&hChildStdoutRd, &hChildStdoutWr, &sa, 0))
- return 0;
- // Create a pipe for the child process's STDIN.
- if (! CreatePipe(&hChildStdinRd, &hChildStdinWr, &sa, 0))
- return 0;
- // Setup the start info structure
- startInfo.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
- startInfo.wShowWindow = SW_HIDE;
- startInfo.hStdOutput = hChildStdoutWr;
- startInfo.hStdError = hChildStdoutWr;
- startInfo.hStdInput = hChildStdinRd;
- cmdline = OcamlPath;
- // Set the OCAMLLIB environment variable
- SetEnvironmentVariable("OCAMLLIB", LibDir);
- // Let's go: start the ocaml interpreter
- processStarted = CreateProcess(NULL,cmdline,lpsa,lpsa,1,
- CREATE_NEW_PROCESS_GROUP|NORMAL_PRIORITY_CLASS,
- NULL,ProgramParams.CurrentWorkingDir,&startInfo,&pi);
- if (processStarted) {
- WaitForSingleObject(pi.hProcess,INFINITE);
- GetExitCodeProcess(pi.hProcess,(unsigned long *)&OcamlStatus);
- CloseHandle(pi.hProcess);
- PostMessage(hwndMain,WM_QUITOCAML,0,0);
- }
- else {
- char *msg = malloc(1024);
- wsprintf(msg,"Impossible to start ocaml.exe in:\n%s",cmdline);
- ShowDbgMsg(msg);
- free(msg);
- }
- return 0;
+ char *cmdline;
+ int processStarted;
+ LPSECURITY_ATTRIBUTES lpsa=NULL;
+ SECURITY_ATTRIBUTES sa;
+ SECURITY_DESCRIPTOR sd;
+
+ sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+ // Under windows NT/2000/Whistler we have to initialize the security descriptors
+ // This is not necessary under windows 98/95.
+ if (IsWindowsNT()) {
+ InitializeSecurityDescriptor(&sd,SECURITY_DESCRIPTOR_REVISION);
+ SetSecurityDescriptorDacl(&sd,TRUE,NULL,FALSE);
+ sa.bInheritHandle = TRUE;
+ sa.lpSecurityDescriptor = &sd;
+ lpsa = &sa;
+ }
+ memset(&startInfo,0,sizeof(STARTUPINFO));
+ startInfo.cb = sizeof(STARTUPINFO);
+ // Create a pipe for the child process's STDOUT.
+ if (! CreatePipe(&hChildStdoutRd, &hChildStdoutWr, &sa, 0))
+ return 0;
+ // Create a pipe for the child process's STDIN.
+ if (! CreatePipe(&hChildStdinRd, &hChildStdinWr, &sa, 0))
+ return 0;
+ // Setup the start info structure
+ startInfo.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
+ startInfo.wShowWindow = SW_HIDE;
+ startInfo.hStdOutput = hChildStdoutWr;
+ startInfo.hStdError = hChildStdoutWr;
+ startInfo.hStdInput = hChildStdinRd;
+ cmdline = OcamlPath;
+ // Set the OCAMLLIB environment variable
+ SetEnvironmentVariable("OCAMLLIB", LibDir);
+ // Let's go: start the ocaml interpreter
+ processStarted = CreateProcess(NULL,cmdline,lpsa,lpsa,1,
+ CREATE_NEW_PROCESS_GROUP|NORMAL_PRIORITY_CLASS,
+ NULL,ProgramParams.CurrentWorkingDir,&startInfo,&pi);
+ if (processStarted) {
+ WaitForSingleObject(pi.hProcess,INFINITE);
+ GetExitCodeProcess(pi.hProcess,(unsigned long *)&OcamlStatus);
+ CloseHandle(pi.hProcess);
+ PostMessage(hwndMain,WM_QUITOCAML,0,0);
+ }
+ else {
+ char *msg = malloc(1024);
+ wsprintf(msg,"Impossible to start ocaml.exe in:\n%s",cmdline);
+ ShowDbgMsg(msg);
+ free(msg);
+ }
+ return 0;
}
/*------------------------------------------------------------------------
@@ -278,12 +279,12 @@ Errors: None
------------------------------------------------------------------------*/
int WriteToPipe(char *data)
{
- DWORD dwWritten;
+ DWORD dwWritten;
- if (! WriteFile(hChildStdinWr, data, strlen(data), &dwWritten, NULL))
- return 0;
+ if (! WriteFile(hChildStdinWr, data, strlen(data), &dwWritten, NULL))
+ return 0;
- return dwWritten;
+ return dwWritten;
}
@@ -300,17 +301,17 @@ Errors: None explicit
------------------------------------------------------------------------*/
int ReadFromPipe(char *data,int len)
{
- DWORD dwRead;
+ DWORD dwRead;
- PeekNamedPipe(hChildStdoutRd,data,len,NULL,&dwRead,NULL);
- if (dwRead == 0)
- return 0;
+ PeekNamedPipe(hChildStdoutRd,data,len,NULL,&dwRead,NULL);
+ if (dwRead == 0)
+ return 0;
- // Read output from the child process, and write to parent's STDOUT.
- if( !ReadFile( hChildStdoutRd, data, len, &dwRead, NULL) || dwRead == 0)
- return 0;
+ // Read output from the child process, and write to parent's STDOUT.
+ if( !ReadFile( hChildStdoutRd, data, len, &dwRead, NULL) || dwRead == 0)
+ return 0;
- return dwRead;
+ return dwRead;
}
static DWORD tid;
@@ -324,39 +325,39 @@ Errors:
------------------------------------------------------------------------*/
int StartOcaml(void)
{
- getcwd(ProgramParams.CurrentWorkingDir,sizeof(ProgramParams.CurrentWorkingDir));
- CreateThread(NULL,0,DoStartOcaml,hwndMain,0,&tid);
- return 1;
+ getcwd(ProgramParams.CurrentWorkingDir,sizeof(ProgramParams.CurrentWorkingDir));
+ CreateThread(NULL,0,DoStartOcaml,hwndMain,0,&tid);
+ return 1;
}
void *SafeMalloc(int size)
{
- void *result;
+ void *result;
- if (size < 0) {
- char message[1024];
+ if (size < 0) {
+ char message[1024];
error:
- sprintf(message,"Can't allocate %d bytes",size);
- MessageBox(NULL, message, "Ocaml", MB_OK);
- exit(-1);
- }
- result = malloc(size);
+ sprintf(message,"Can't allocate %d bytes",size);
+ MessageBox(NULL, message, "Ocaml", MB_OK);
+ exit(-1);
+ }
+ result = malloc(size);
- if (result == NULL)
- goto error;
+ if (result == NULL)
+ goto error;
- return result;
+ return result;
}
void InterruptOcaml(void)
{
- if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pi.dwProcessId)) {
- char message[1024];
- sprintf(message, "GenerateConsole failed: %lu\n", GetLastError());
- MessageBox(NULL, message, "Ocaml", MB_OK);
- }
- WriteToPipe(" ");
+ if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pi.dwProcessId)) {
+ char message[1024];
+ sprintf(message, "GenerateConsole failed: %lu\n", GetLastError());
+ MessageBox(NULL, message, "Ocaml", MB_OK);
+ }
+ WriteToPipe(" ");
}
diff --git a/yacc/Makefile b/yacc/Makefile
index a90700f2fe..fb560cfd32 100644
--- a/yacc/Makefile
+++ b/yacc/Makefile
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/yacc/Makefile.nt b/yacc/Makefile.nt
index a33fa01430..14a69f02d7 100644
--- a/yacc/Makefile.nt
+++ b/yacc/Makefile.nt
@@ -1,6 +1,6 @@
#########################################################################
# #
-# Objective Caml #
+# OCaml #
# #
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
# #
diff --git a/yacc/closure.c b/yacc/closure.c
index 1b7926a078..b3f4659d01 100644
--- a/yacc/closure.c
+++ b/yacc/closure.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/defs.h b/yacc/defs.h
index 1be27d1a3f..75c8ef101d 100644
--- a/yacc/defs.h
+++ b/yacc/defs.h
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/error.c b/yacc/error.c
index ae0b77aca1..f0b92d2d6d 100644
--- a/yacc/error.c
+++ b/yacc/error.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/lalr.c b/yacc/lalr.c
index f87afb1dc6..d595e76d71 100644
--- a/yacc/lalr.c
+++ b/yacc/lalr.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/lr0.c b/yacc/lr0.c
index e05fcb072a..3da50da00b 100644
--- a/yacc/lr0.c
+++ b/yacc/lr0.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/main.c b/yacc/main.c
index feb2dbdac5..8616b9b3da 100644
--- a/yacc/main.c
+++ b/yacc/main.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
@@ -188,7 +188,7 @@ void getargs(int argc, char **argv)
case 'v':
if (!strcmp (argv[i], "-version")){
- printf ("The Objective Caml parser generator, version "
+ printf ("The OCaml parser generator, version "
OCAML_VERSION "\n");
exit (0);
}else if (!strcmp (argv[i], "-vnum")){
diff --git a/yacc/mkpar.c b/yacc/mkpar.c
index 1f9759e176..0e20724bf0 100644
--- a/yacc/mkpar.c
+++ b/yacc/mkpar.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/output.c b/yacc/output.c
index 00d61ac9c6..9723d3fa67 100644
--- a/yacc/output.c
+++ b/yacc/output.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/reader.c b/yacc/reader.c
index d3c2755720..1c36843d44 100644
--- a/yacc/reader.c
+++ b/yacc/reader.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/skeleton.c b/yacc/skeleton.c
index 86e152ac2d..8048999d7d 100644
--- a/yacc/skeleton.c
+++ b/yacc/skeleton.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/symtab.c b/yacc/symtab.c
index 87e280a09d..f30e4a90d4 100644
--- a/yacc/symtab.c
+++ b/yacc/symtab.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/verbose.c b/yacc/verbose.c
index 0a1850ff0f..799c4969aa 100644
--- a/yacc/verbose.c
+++ b/yacc/verbose.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */
diff --git a/yacc/warshall.c b/yacc/warshall.c
index 5b8f10c89f..c9ec782beb 100644
--- a/yacc/warshall.c
+++ b/yacc/warshall.c
@@ -1,6 +1,6 @@
/***********************************************************************/
/* */
-/* Objective Caml */
+/* OCaml */
/* */
/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
/* */