Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Renommage en Objective Caml

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@782 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information...
commit 11d8fff755287ecb320d392bcf5447fc7e510988 1 parent fafc71c
xleroy authored
Showing with 951 additions and 896 deletions.
  1. +3 −3 .cvsignore
  2. +52 −16 Changes
  3. +19 −19 INSTALL
  4. +6 −6 LICENSE
  5. +53 −52 Makefile
  6. +53 −53 Makefile.nt
  7. +8 −13 README
  8. +28 −28 README.win32
  9. +2 −2 asmcomp/all.ml
  10. +2 −2 asmcomp/arch_alpha.ml
  11. +2 −2 asmcomp/arch_hppa.ml
  12. +2 −2 asmcomp/arch_i386.ml
  13. +2 −2 asmcomp/arch_mips.ml
  14. +2 −2 asmcomp/arch_power.ml
  15. +2 −2 asmcomp/arch_sparc.ml
  16. +2 −2 asmcomp/asmgen.ml
  17. +2 −2 asmcomp/asmgen.mli
  18. +2 −2 asmcomp/asmlibrarian.ml
  19. +2 −2 asmcomp/asmlibrarian.mli
  20. +2 −2 asmcomp/asmlink.ml
  21. +2 −2 asmcomp/asmlink.mli
  22. +2 −2 asmcomp/clambda.ml
  23. +2 −2 asmcomp/clambda.mli
  24. +2 −2 asmcomp/closure.ml
  25. +2 −2 asmcomp/closure.mli
  26. +2 −2 asmcomp/cmm.ml
  27. +2 −2 asmcomp/cmm.mli
  28. +2 −2 asmcomp/cmmgen.ml
  29. +2 −2 asmcomp/cmmgen.mli
  30. +2 −2 asmcomp/codegen.ml
  31. +2 −2 asmcomp/codegen.mli
  32. +2 −2 asmcomp/coloring.ml
  33. +2 −2 asmcomp/coloring.mli
  34. +2 −2 asmcomp/compilenv.ml
  35. +2 −2 asmcomp/compilenv.mli
  36. +2 −2 asmcomp/emit.mli
  37. +2 −2 asmcomp/emit_alpha.mlp
  38. +2 −2 asmcomp/emit_hppa.mlp
  39. +2 −2 asmcomp/emit_i386.mlp
  40. +2 −2 asmcomp/emit_i386nt.mlp
  41. +2 −2 asmcomp/emit_mips.mlp
  42. +2 −2 asmcomp/emit_power.mlp
  43. +2 −2 asmcomp/emit_sparc.mlp
  44. +2 −2 asmcomp/emitaux.ml
  45. +2 −2 asmcomp/emitaux.mli
  46. +2 −2 asmcomp/interf.ml
  47. +2 −2 asmcomp/interf.mli
  48. +2 −2 asmcomp/linearize.ml
  49. +2 −2 asmcomp/linearize.mli
  50. +2 −2 asmcomp/liveness.ml
  51. +2 −2 asmcomp/liveness.mli
  52. +2 −2 asmcomp/mach.ml
  53. +2 −2 asmcomp/mach.mli
  54. +2 −2 asmcomp/printcmm.ml
  55. +2 −2 asmcomp/printcmm.mli
  56. +2 −2 asmcomp/printlinear.ml
  57. +2 −2 asmcomp/printlinear.mli
  58. +2 −2 asmcomp/printmach.ml
  59. +2 −2 asmcomp/printmach.mli
  60. +2 −2 asmcomp/proc.mli
  61. +2 −2 asmcomp/proc_alpha.ml
  62. +2 −2 asmcomp/proc_hppa.ml
  63. +2 −2 asmcomp/proc_i386.ml
  64. +2 −2 asmcomp/proc_i386nt.ml
  65. +2 −2 asmcomp/proc_mips.ml
  66. +2 −2 asmcomp/proc_power.ml
  67. +2 −2 asmcomp/proc_sparc.ml
  68. +2 −2 asmcomp/reg.ml
  69. +2 −2 asmcomp/reg.mli
  70. +2 −2 asmcomp/reload.ml
  71. +2 −2 asmcomp/reload.mli
  72. +2 −2 asmcomp/scheduling.ml
  73. +2 −2 asmcomp/scheduling.mli
  74. +2 −2 asmcomp/selection.ml
  75. +2 −2 asmcomp/selection.mli
  76. +2 −2 asmcomp/spill.ml
  77. +2 −2 asmcomp/spill.mli
  78. +2 −2 asmcomp/split.ml
  79. +2 −2 asmcomp/split.mli
  80. +7 −0 asmrun/Makefile
  81. +2 −2 asmrun/alpha.asm
  82. +2 −2 asmrun/array.c
  83. +2 −2 asmrun/fail.c
  84. +2 −2 asmrun/hppa.asm
  85. +2 −2 asmrun/i386.S
  86. +2 −2 asmrun/i386nt.asm
  87. +2 −2 asmrun/main.c
  88. +2 −2 asmrun/mips.asm
  89. +2 −2 asmrun/power.asm
  90. +2 −2 asmrun/roots.c
  91. +2 −2 asmrun/signals.c
  92. +2 −2 asmrun/sparc.asm
  93. +2 −2 asmrun/stack.h
  94. +3 −3 boot/.cvsignore
  95. BIN  boot/cslc
  96. BIN  boot/ocamlc
  97. BIN  boot/{csllex → ocamllex}
  98. +2 −2 bytecomp/bytegen.ml
  99. +2 −2 bytecomp/bytegen.mli
  100. +2 −2 bytecomp/bytelibrarian.ml
  101. +2 −2 bytecomp/bytelibrarian.mli
  102. +3 −3 bytecomp/bytelink.ml
  103. +2 −2 bytecomp/bytelink.mli
  104. +2 −2 bytecomp/emitcode.ml
  105. +2 −2 bytecomp/emitcode.mli
  106. +2 −2 bytecomp/instruct.ml
  107. +2 −2 bytecomp/instruct.mli
  108. +2 −2 bytecomp/lambda.ml
  109. +2 −2 bytecomp/lambda.mli
  110. +2 −2 bytecomp/matching.ml
  111. +2 −2 bytecomp/matching.mli
  112. +2 −2 bytecomp/meta.ml
  113. +2 −2 bytecomp/meta.mli
  114. +2 −2 bytecomp/printinstr.ml
  115. +2 −2 bytecomp/printinstr.mli
  116. +2 −2 bytecomp/printlambda.ml
  117. +2 −2 bytecomp/printlambda.mli
  118. +2 −2 bytecomp/runtimedef.mli
  119. +2 −2 bytecomp/simplif.ml
  120. +2 −2 bytecomp/simplif.mli
  121. +2 −2 bytecomp/symtable.ml
  122. +2 −2 bytecomp/symtable.mli
  123. +1 −1  bytecomp/translclass.ml
  124. +1 −1  bytecomp/translclass.mli
  125. +2 −2 bytecomp/translcore.ml
  126. +2 −2 bytecomp/translcore.mli
  127. +2 −2 bytecomp/translmod.ml
  128. +2 −2 bytecomp/translmod.mli
  129. +1 −1  bytecomp/translobj.ml
  130. +1 −1  bytecomp/translobj.mli
  131. +2 −2 byterun/.cvsignore
  132. +7 −7 byterun/Makefile
  133. +4 −4 byterun/Makefile.nt
  134. +2 −2 byterun/alloc.c
  135. +2 −2 byterun/alloc.h
  136. +2 −2 byterun/array.c
  137. +2 −2 byterun/compare.c
  138. +2 −2 byterun/config.h
  139. +2 −2 byterun/exec.h
  140. +2 −2 byterun/extern.c
  141. +2 −2 byterun/fail.c
  142. +2 −2 byterun/fail.h
  143. +2 −2 byterun/fix_code.c
  144. +2 −2 byterun/fix_code.h
  145. +2 −2 byterun/floats.c
  146. +2 −2 byterun/freelist.c
  147. +2 −2 byterun/freelist.h
  148. +2 −2 byterun/gc.h
  149. +2 −2 byterun/gc_ctrl.c
  150. +2 −2 byterun/gc_ctrl.h
  151. +2 −2 byterun/hash.c
  152. +2 −2 byterun/instrtrace.c
  153. +2 −2 byterun/instrtrace.h
  154. +2 −2 byterun/instruct.h
  155. +2 −2 byterun/intern.c
  156. +2 −2 byterun/interp.c
  157. +2 −2 byterun/interp.h
  158. +2 −2 byterun/intext.h
  159. +2 −2 byterun/ints.c
  160. +2 −2 byterun/io.c
  161. +2 −2 byterun/io.h
  162. +2 −2 byterun/lexing.c
  163. +2 −2 byterun/main.c
  164. +2 −2 byterun/major_gc.c
  165. +2 −2 byterun/major_gc.h
  166. +2 −2 byterun/md5.c
  167. +2 −2 byterun/memory.c
  168. +2 −2 byterun/memory.h
  169. +2 −2 byterun/meta.c
  170. +2 −2 byterun/minor_gc.c
  171. +2 −2 byterun/minor_gc.h
  172. +2 −2 byterun/misc.c
  173. +2 −2 byterun/misc.h
  174. +2 −2 byterun/mlvalues.h
  175. +2 −2 byterun/obj.c
  176. +2 −2 byterun/parsing.c
  177. +2 −2 byterun/prims.h
  178. +2 −2 byterun/reverse.h
  179. +2 −2 byterun/roots.c
  180. +2 −2 byterun/roots.h
  181. +2 −2 byterun/signals.c
  182. +2 −2 byterun/signals.h
  183. +2 −2 byterun/stacks.c
  184. +2 −2 byterun/stacks.h
  185. +2 −2 byterun/str.c
  186. +2 −2 byterun/str.h
  187. +2 −2 byterun/sys.c
  188. +2 −2 byterun/sys.h
  189. +2 −2 byterun/terminfo.c
  190. +2 −2 config/auto-aux/align.c
  191. +2 −2 config/auto-aux/async_io.c
  192. +2 −2 config/auto-aux/bytecopy.c
  193. +2 −2 config/auto-aux/dblalign.c
  194. +2 −2 config/auto-aux/endian.c
  195. +2 −2 config/auto-aux/getgroups.c
  196. +2 −2 config/auto-aux/schar.c
  197. +2 −2 config/auto-aux/schar2.c
  198. +2 −2 config/auto-aux/sighandler.c
  199. +2 −2 config/auto-aux/signals.c
  200. +2 −2 config/auto-aux/sizes.c
  201. +2 −2 config/m-nt.h
  202. +2 −2 config/m-templ.h
  203. +2 −2 config/s-nt.h
  204. +2 −2 config/s-templ.h
  205. +10 −10 configure
  206. +2 −2 driver/compile.ml
  207. +2 −2 driver/compile.mli
  208. +2 −2 driver/errors.ml
  209. +2 −2 driver/errors.mli
  210. +3 −3 driver/main.ml
  211. +2 −2 driver/optcompile.ml
  212. +2 −2 driver/optcompile.mli
  213. +2 −2 driver/opterrors.ml
  214. +2 −2 driver/opterrors.mli
  215. +3 −3 driver/optmain.ml
  216. +1 −1  lex/.cvsignore
  217. +8 −8 lex/Makefile
  218. +8 −8 lex/Makefile.nt
  219. +2 −2 lex/compact.ml
  220. +2 −2 lex/compact.mli
  221. +2 −2 lex/lexer.mli
  222. +2 −2 lex/lexer.mll
  223. +2 −2 lex/lexgen.ml
  224. +2 −2 lex/lexgen.mli
  225. +2 −2 lex/main.ml
  226. +2 −2 lex/output.ml
  227. +2 −2 lex/output.mli
  228. +2 −2 lex/parser.mly
  229. +2 −2 lex/syntax.mli
  230. +15 −15 man/{cslc.m → ocamlc.m}
  231. +16 −16 man/{cslcp.m → ocamlcp.m}
  232. +12 −12 man/{csldep.m → ocamldep.m}
  233. +8 −8 man/{csllex.m → ocamllex.m}
  234. +16 −16 man/{cslopt.m → ocamlopt.m}
  235. +10 −10 man/{cslprof.m → ocamlprof.m}
  236. +9 −9 man/{cslrun.m → ocamlrun.m}
  237. +10 −10 man/{csltop.m → ocamltop.m}
  238. +9 −9 man/{cslyacc.m → ocamlyacc.m}
  239. +2 −2 otherlibs/dynlink/Makefile
  240. +2 −2 otherlibs/dynlink/dynlink.ml
  241. +3 −3 otherlibs/dynlink/dynlink.mli
  242. +2 −2 otherlibs/dynlink/extract_crc.ml
  243. +3 −3 otherlibs/graph/Makefile
  244. +2 −2 otherlibs/graph/color.c
  245. +2 −2 otherlibs/graph/draw.c
  246. +2 −2 otherlibs/graph/dump_img.c
  247. +2 −2 otherlibs/graph/events.c
  248. +2 −2 otherlibs/graph/fill.c
  249. +2 −2 otherlibs/graph/graphics.mli
  250. +2 −2 otherlibs/graph/graphics.mlp
  251. +2 −2 otherlibs/graph/image.c
  252. +2 −2 otherlibs/graph/image.h
  253. +2 −2 otherlibs/graph/libgraph.h
  254. +2 −2 otherlibs/graph/make_img.c
  255. +2 −2 otherlibs/graph/open.c
  256. +2 −2 otherlibs/graph/point_col.c
  257. +2 −2 otherlibs/graph/sound.c
  258. +2 −2 otherlibs/graph/text.c
  259. +4 −4 otherlibs/num/Makefile
  260. +3 −3 otherlibs/num/Makefile.nt
  261. +2 −2 otherlibs/num/arith_flags.ml
  262. +2 −2 otherlibs/num/arith_flags.mli
  263. +2 −2 otherlibs/num/arith_status.ml
  264. +2 −2 otherlibs/num/arith_status.mli
  265. +2 −2 otherlibs/num/big_int.ml
  266. +2 −2 otherlibs/num/big_int.mli
  267. +2 −2 otherlibs/num/int_misc.mli
  268. +2 −2 otherlibs/num/int_misc.mlp
  269. +2 −2 otherlibs/num/nat.mli
  270. +2 −2 otherlibs/num/nat.mlp
  271. +2 −2 otherlibs/num/nat_stubs.c
  272. +2 −2 otherlibs/num/num.ml
  273. +2 −2 otherlibs/num/num.mli
  274. +2 −2 otherlibs/num/ratio.ml
  275. +2 −2 otherlibs/num/ratio.mli
  276. +2 −2 otherlibs/num/string_misc.ml
  277. +2 −2 otherlibs/num/string_misc.mli
  278. +7 −7 otherlibs/num/test/Makefile.nt
  279. +4 −4 otherlibs/str/Makefile
  280. +4 −4 otherlibs/str/Makefile.nt
  281. +2 −2 otherlibs/str/str.ml
  282. +2 −2 otherlibs/str/str.mli
  283. +2 −2 otherlibs/threads/Makefile
  284. +2 −2 otherlibs/threads/Tests/Makefile
  285. +2 −2 otherlibs/threads/condition.ml
  286. +2 −2 otherlibs/threads/condition.mli
  287. +2 −2 otherlibs/threads/event.ml
  288. +2 −2 otherlibs/threads/event.mli
  289. +2 −2 otherlibs/threads/mutex.ml
  290. +2 −2 otherlibs/threads/mutex.mli
  291. +15 −0 otherlibs/threads/scheduler.c
  292. +2 −2 otherlibs/threads/thread.ml
  293. +6 −5 otherlibs/threads/thread.mli
  294. +2 −2 otherlibs/threads/threadIO.ml
  295. +2 −2 otherlibs/threads/threadIO.mli
  296. +2 −2 otherlibs/threads/threadUnix.ml
  297. +2 −2 otherlibs/threads/threadUnix.mli
  298. +4 −4 otherlibs/unix/Makefile
  299. +2 −2 otherlibs/unix/accept.c
  300. +2 −2 otherlibs/unix/access.c
Sorry, we could not display the entire diff because too many files (620) changed.
View
6 .cvsignore
@@ -1,4 +1,4 @@
-cslc
+ocamlc
expunge
-csltop
-cslopt
+ocaml
+ocamlopt
View
68 Changes
@@ -1,5 +1,41 @@
-Release 1.15:
--------------
+Objective Caml 1.00:
+--------------------
+
+* Merge of Jerome Vouillon and Didier Remy's object-oriented
+extensions.
+
+* All libraries: all "new" functions renamed to "create" because "new"
+is now a reserved keyword.
+
+* Compilation of "or" patterns (pat1 | pat2) completely revised to
+avoid code size explosion.
+
+* Compiler support for preprocessing source files (-pp flag).
+
+* Library construction: flag -linkall to force linking of all units in
+a library.
+
+* Native-code compiler: port to the Sparc under NetBSD.
+
+* Toplevel: fixed bug when tracing several times the same function
+under different names.
+
+* New format for marshaling arbitrary data structures, allows
+marshaling to/from strings.
+
+* Standard library: new module Genlex (configurable lexer for streams)
+
+* Thread library: much better support for I/O and blocking system calls.
+
+* Graphics library: faster reclaimation of unused pixmaps.
+
+* Unix library: new functions {set,clear}_nonblock, {set,clear}_close_on_exec,
+{set,get}itimer, inet_addr_any, {get,set}sockopt.
+
+* Dynlink library: added support for linking libraries (.cma files).
+
+Caml Special Light 1.15:
+------------------------
* Caml Special Light now runs under Windows NT and 95. Many thanks to
Kevin Gallo (Microsoft Research) who contributed his initial port.
@@ -29,8 +65,8 @@ manifest module type specifications.
* Unix library: bug in gethostbyaddr fixed; bounds checking for read,
write, etc.
-Release 1.14:
--------------
+Caml Special Light 1.14:
+------------------------
* cslopt ported to the PowerPC/RS6000 architecture. Better support for
AIX in the bytecode system as well.
@@ -43,8 +79,8 @@ out-of-order pops fixed.
* Several bug fixes in callbacks and signals.
-Release 1.13:
--------------
+Caml Special Light 1.13:
+------------------------
* Pattern-matching compilation revised to factor out accesses inside
matched structures.
@@ -67,13 +103,13 @@ Intel decided to organize the floating-point registers as a stack).
* cslopt for the Sparc: don't use Sparc V8 smul and sdiv instructions,
emulation on V7 processors is abysmal.
-Release 1.12:
--------------
+Caml Special Light 1.12:
+------------------------
* Fixed an embarrassing bug with references to floats.
-Release 1.11:
--------------
+Caml Special Light 1.11:
+------------------------
* Streams and stream parsers a la Caml Light are back (thanks to
Daniel de Rauglaudre).
@@ -95,8 +131,8 @@ core on me).
* Lower memory consumption for the native-code compiler.
-Release 1.10:
--------------
+Caml Special Light 1.10:
+------------------------
* Many bug fixes (too many to list here).
@@ -113,8 +149,8 @@ arbitrary-precision arithmetic have been ported (thanks to John
Malecki and Victor Manuel Gulias Fernandez); better docs for the Unix
and regexp libraries.
-Release 1.07:
--------------
+Caml Special Light 1.07:
+------------------------
* Syntax: optional ;; allowed in compilation units and structures
(back by popular demand)
@@ -130,7 +166,7 @@ no calls to ranlib in Solaris
* Standard library: added List.memq; documentation of Array fixed.
-Release 1.06:
--------------
+Caml Special Light 1.06:
+------------------------
* First public release.
View
38 INSTALL
@@ -12,7 +12,7 @@ The "configure" script accepts the following options:
-bindir <dir> (default: /usr/local/bin)
Directory where the binaries will be installed
--libdir <dir> (default: /usr/local/lib/camlsl)
+-libdir <dir> (default: /usr/local/lib/ocaml)
Directory where the Caml library will be installed
-mandir <dir> (default: /usr/local/man/man1)
@@ -32,8 +32,8 @@ The "configure" script accepts the following options:
for gcc or emacs contain a complete list of configuration names.
Examples:
- ./configure -bindir /usr/bin -libdir /usr/lib/csl -mandir /usr/man/manl
- ./configure -cc "acc -fast" -libs "-lucb"
+ ./configure -bindir /usr/bin -libdir /usr/lib/ocaml -mandir /usr/man/manl
+ ./configure -cc "acc -fast" -libs "-lucb"
If something goes wrong during the automatic configuration, or if the
generated files cause errors later on, then look at the template files
@@ -48,14 +48,14 @@ for guidance on how to edit the generated files by hand.
make world
-This builds the Caml Special Light bytecode compiler for the first time.
+This builds the Objective Caml bytecode compiler for the first time.
This phase is fairly verbose; consider redirecting the output to a file:
make world > log.world 2>&1 # in sh
make world >& log.world # in csh
3- To be sure everything works well, you can try to bootstrap the
-system --- that is, to recompile all Caml Special Light sources with
+system --- that is, to recompile all Objective Caml sources with
the newly created compiler. From the top directory, do:
make bootstrap
@@ -83,20 +83,20 @@ or:
make opt > log.opt 2>&1 # in sh
make opt >& log.opt # in csh
-5- You can now install the Caml Special Light system. This will create the
+5- You can now install the Objective Caml system. This will create the
following commands (in the binary directory selected during autoconfiguration):
- cslc the batch bytecode compiler
- cslopt the batch native-code compiler (if supported)
- cslrun the runtime system for the bytecode compiler
- cslyacc the parser generator
- csllex the lexer generator
- csltop the interactive, toplevel-based system
- cslmktop a tool to make toplevel systems that integrate
- user-defined C primitives and Caml code
- csldep output "make" dependencies for Caml sources
- cslprof execution count profiler
- cslcp the bytecode compiler in profiling mode
+ ocamlc the batch bytecode compiler
+ ocamlopt the batch native-code compiler (if supported)
+ ocamlrun the runtime system for the bytecode compiler
+ ocamlyacc the parser generator
+ ocamllex the lexer generator
+ ocaml the interactive, toplevel-based system
+ ocamlmktop a tool to make toplevel systems that integrate
+ user-defined C primitives and Caml code
+ ocamldep output "make" dependencies for Caml sources
+ ocamlprof execution count profiler
+ ocamlcp the bytecode compiler in profiling mode
From the top directory, become superuser and do "make install".
Also do "make installopt" to install the native-code compiler, if you
@@ -126,8 +126,8 @@ that can uncover bugs in optimizing compilers. Alternatively, try
another C compiler (e.g. gcc instead of the vendor-supplied cc).
You can also build a debug version of the runtime system. Go to the
-byterun/ directory and do "make camlrund". Then, copy camlrund to
-../boot/camlrun, and try again. This version of the runtime system
+byterun/ directory and do "make ocamlrund". Then, copy ocamlrund to
+../boot/ocamlrun, and try again. This version of the runtime system
contains lots of assertions and sanity checks that could help you
pinpoint the problem.
View
12 LICENSE
@@ -1,6 +1,6 @@
LEGAL NOTICE
-Software: Caml Special Light, version 1.15 of March 1996,
+Software: Objective Caml, version 1.00 of May 1996,
hereinafter referred to as "the software".
The software has been designed and produced by Xavier Leroy and Damien
@@ -8,7 +8,7 @@ Doligez, research workers for the Institut National de Recherche en
Informatique et en Automatique (INRIA) - Domaine de Voluceau -
Rocquencourt - 78153 Le Chesnay Cedex - France.
-INRIA holds all ownership rights to Caml Special Light.
+INRIA holds all ownership rights to Objective Caml.
The software has been registered at Agence pour la Protection
des Programmes (APP).
@@ -28,15 +28,15 @@ personal use only. Public distribution of derivative works is not
permitted, unless the user obtains the express approval of INRIA.
INRIA freely grants the right to distribute executable files generated
-by the Caml Special Light compilers (cslc and cslopt). Binaries of the
-Caml Special Light run-time system (cslrun) can also be distributed
+by the Objective Caml compilers (cslc and cslopt). Binaries of the
+Objective Caml run-time system (cslrun) can also be distributed
freely, with the sole condition that the distribution includes the
following statement:
- "This software includes the Caml Special Light run-time system,
+ "This software includes the Objective Caml run-time system,
which is copyright 1995 INRIA."
-All other files generated by the Caml Special Light system, including
+All other files generated by the Objective Caml system, including
custom toplevel systems generated by cslmktop, are considered as
derivative works and cannot be publicly distributed without the
express approval of INRIA.
View
105 Makefile
@@ -2,16 +2,16 @@
include config/Makefile
-CAMLC=boot/cslrun boot/cslc -I boot
-CAMLOPT=boot/cslrun ./cslopt -I stdlib
+CAMLC=boot/ocamlrun boot/ocamlc -I boot
+CAMLOPT=boot/ocamlrun ./ocamlopt -I stdlib
COMPFLAGS=$(INCLUDES)
LINKFLAGS=
-CAMLYACC=boot/cslyacc
+CAMLYACC=boot/ocamlyacc
YACCFLAGS=
-CAMLLEX=boot/cslrun boot/csllex
-CAMLDEP=boot/cslrun tools/csldep
+CAMLLEX=boot/ocamlrun boot/ocamllex
+CAMLDEP=boot/ocamlrun tools/ocamldep
DEPFLAGS=$(INCLUDES)
-CAMLRUN=byterun/cslrun
+CAMLRUN=byterun/ocamlrun
SHELL=/bin/sh
INCLUDES=-I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver -I toplevel
@@ -82,9 +82,9 @@ PERVASIVES=arg array char digest filename format gc hashtbl lexing list map \
stack string stream sys oo
# Recompile the system using the bootstrap compiler
-all: runtime cslc csllex cslyacc csltools library csltop otherlibraries
+all: runtime ocamlc ocamllex ocamlyacc ocamltools library ocaml otherlibraries
-# The compilation of csltop will fail if the runtime has changed.
+# The compilation of ocaml will fail if the runtime has changed.
# Never mind, just do make bootstrap to reach fixpoint again.
# Compile everything the first time
@@ -95,30 +95,31 @@ bootstrap:
# Save the original bootstrap compiler
$(MAKE) backup
# Promote the new compiler but keep the old runtime
-# This compiler runs on boot/cslrun and produces bytecode for byterun/cslrun
+# This compiler runs on boot/ocamlrun and produces bytecode for
+# byterun/ocamlrun
$(MAKE) promote-cross
-# Rebuild cslc and csllex (run on byterun/cslrun)
+# Rebuild ocamlc and ocamllex (run on byterun/ocamlrun)
$(MAKE) clean
- $(MAKE) cslc csllex
-# Rebuild the library (using byterun/cslrun ./cslc)
+ $(MAKE) ocamlc ocamllex
+# Rebuild the library (using byterun/ocamlrun ./ocamlc)
$(MAKE) library-cross
# Promote the new compiler and the new runtime
$(MAKE) promote
-# Rebuild everything, including csltop and the tools
+# Rebuild everything, including ocaml and the tools
$(MAKE) clean
$(MAKE) all
# Check if fixpoint reached
$(MAKE) compare
-LIBFILES=stdlib.cma std_exit.cmo *.cmi cslheader
+LIBFILES=stdlib.cma std_exit.cmo *.cmi camlheader
# Start up the system from the distribution compiler
coldstart:
cd byterun; $(MAKE) all
- cp byterun/cslrun boot/cslrun
+ cp byterun/ocamlrun boot/ocamlrun
cd yacc; $(MAKE) all
- cp yacc/cslyacc boot/cslyacc
- cd stdlib; $(MAKE) COMPILER=../boot/cslc all
+ cp yacc/ocamlyacc boot/ocamlyacc
+ cd stdlib; $(MAKE) COMPILER=../boot/ocamlc all
cd stdlib; cp $(LIBFILES) ../boot
# Save the current bootstrap compiler
@@ -127,22 +128,22 @@ backup:
mv boot/Saved boot/Saved.prev
mkdir boot/Saved
mv boot/Saved.prev boot/Saved/Saved.prev
- cp boot/cslrun boot/Saved
- mv boot/cslc boot/csllex boot/cslyacc boot/Saved
+ cp boot/ocamlrun boot/Saved
+ mv boot/ocamlc boot/ocamllex boot/ocamlyacc boot/Saved
cd boot; cp $(LIBFILES) Saved
# Promote the newly compiled system to the rank of cross compiler
# (Runs on the old runtime, produces code for the new runtime)
promote-cross:
- cp cslc boot/cslc
- cp lex/csllex boot/csllex
- cp yacc/cslyacc boot/cslyacc
+ cp ocamlc boot/ocamlc
+ cp lex/ocamllex boot/ocamllex
+ cp yacc/ocamlyacc boot/ocamlyacc
cd stdlib; cp $(LIBFILES) ../boot
# Promote the newly compiled system to the rank of bootstrap compiler
# (Runs on the new runtime, produces code for the new runtime)
promote: promote-cross
- cp byterun/cslrun boot/cslrun
+ cp byterun/ocamlrun boot/ocamlrun
# Restore the saved bootstrap compiler if a problem arises
restore:
@@ -152,7 +153,7 @@ restore:
# Check if fixpoint reached
compare:
- @if cmp boot/cslc cslc && cmp boot/csllex lex/csllex; \
+ @if cmp boot/ocamlc ocamlc && cmp boot/ocamllex lex/ocamllex; \
then echo "Fixpoint reached, bootstrap succeeded."; \
else echo "Fixpoint not reached, try one more bootstrapping cycle."; \
fi
@@ -162,7 +163,7 @@ cleanboot:
rm -rf boot/Saved/Saved.prev/*
# Compile the native-code compiler
-opt: runtimeopt cslopt libraryopt otherlibrariesopt
+opt: runtimeopt ocamlopt libraryopt otherlibrariesopt
# Installation
install:
@@ -170,11 +171,11 @@ install:
if test -d $(LIBDIR); then : ; else mkdir $(LIBDIR); fi
if test -d $(MANDIR); then : ; else mkdir $(MANDIR); fi
cd byterun; $(MAKE) install
- cp cslc $(BINDIR)/cslc
- cp csltop $(BINDIR)/csltop
+ cp ocamlc $(BINDIR)/ocamlc
+ cp ocaml $(BINDIR)/ocaml
cd stdlib; $(MAKE) install
- cp lex/csllex $(BINDIR)/csllex
- cp yacc/cslyacc $(BINDIR)/cslyacc
+ cp lex/ocamllex $(BINDIR)/ocamllex
+ cp yacc/ocamlyacc $(BINDIR)/ocamlyacc
$(CAMLC) -a -o $(LIBDIR)/toplevellib.cma $(TOPLIB)
cp expunge $(LIBDIR)
cp toplevel/topmain.cmo $(LIBDIR)
@@ -186,7 +187,7 @@ install:
# Installation of the native-code compiler
installopt:
cd asmrun; $(MAKE) install
- cp cslopt $(BINDIR)/cslopt
+ cp ocamlopt $(BINDIR)/ocamlopt
cd stdlib; $(MAKE) installopt
for i in $(OTHERLIBRARIES); do (cd otherlibs/$$i; $(MAKE) installopt); done
@@ -194,29 +195,29 @@ realclean:: clean
# The compiler
-cslc: $(COMPOBJS)
- $(CAMLC) $(LINKFLAGS) -o cslc $(COMPOBJS)
+ocamlc: $(COMPOBJS)
+ $(CAMLC) $(LINKFLAGS) -o ocamlc $(COMPOBJS)
clean::
- rm -f cslc
+ rm -f ocamlc
# The native-code compiler
-cslopt: $(OPTOBJS)
- $(CAMLC) $(LINKFLAGS) -o cslopt $(OPTOBJS)
+ocamlopt: $(OPTOBJS)
+ $(CAMLC) $(LINKFLAGS) -o ocamlopt $(OPTOBJS)
clean::
- rm -f cslopt
+ rm -f ocamlopt
# The toplevel
-csltop: $(TOPOBJS) expunge
- $(CAMLC) $(LINKFLAGS) -linkall -o csltop.tmp $(TOPOBJS)
- - $(CAMLRUN) ./expunge csltop.tmp csltop $(PERVASIVES)
- rm -f csltop.tmp
+ocaml: $(TOPOBJS) expunge
+ $(CAMLC) $(LINKFLAGS) -linkall -o ocaml.tmp $(TOPOBJS)
+ - $(CAMLRUN) ./expunge ocaml.tmp ocaml $(PERVASIVES)
+ rm -f ocaml.tmp
clean::
- rm -f csltop
+ rm -f ocaml
# The configuration file
@@ -264,21 +265,21 @@ beforedepend:: parsing/lexer.ml
# Currently not working because it requires C primitives from byterun/meta.c
# which are not provided by asmrun/libasmrun.a
-# cslc.opt: $(COMPOBJS:.cmo=.cmx)
-# $(CAMLOPT) $(LINKFLAGS) -o cslc.opt $(COMPOBJS:.cmo=.cmx)
+# ocamlc.opt: $(COMPOBJS:.cmo=.cmx)
+# $(CAMLOPT) $(LINKFLAGS) -o ocamlc.opt $(COMPOBJS:.cmo=.cmx)
clean::
- rm -f cslc.opt
+ rm -f ocamlc.opt
# The native-code compiler compiled with itself
-cslopt.opt: $(OPTOBJS:.cmo=.cmx)
- $(CAMLOPT) $(LINKFLAGS) -o cslopt.opt $(OPTOBJS:.cmo=.cmx)
+ocamlopt.opt: $(OPTOBJS:.cmo=.cmx)
+ $(CAMLOPT) $(LINKFLAGS) -o ocamlopt.opt $(OPTOBJS:.cmo=.cmx)
clean::
- rm -f cslopt.opt
+ rm -f ocamlopt.opt
-$(OPTOBJS:.cmo=.cmx): cslopt
+$(OPTOBJS:.cmo=.cmx): ocamlopt
# The numeric opcodes
@@ -372,7 +373,7 @@ alldepend::
library:
cd stdlib; $(MAKE) all
library-cross:
- cd stdlib; $(MAKE) RUNTIME=../byterun/cslrun all
+ cd stdlib; $(MAKE) RUNTIME=../byterun/ocamlrun all
libraryopt:
cd stdlib; $(MAKE) allopt
clean::
@@ -382,21 +383,21 @@ alldepend::
# The lexer and parser generators
-csllex:
+ocamllex:
cd lex; $(MAKE) all
clean::
cd lex; $(MAKE) clean
alldepend::
cd lex; $(MAKE) depend
-cslyacc:
+ocamlyacc:
cd yacc; $(MAKE) all
realclean::
cd yacc; $(MAKE) clean
# Tools
-csltools:
+ocamltools:
cd tools; $(MAKE) all
clean::
cd tools; $(MAKE) clean
View
106 Makefile.nt
@@ -2,16 +2,16 @@
!include config\Makefile.nt
-CAMLC=boot\cslrun boot\cslc -I boot
-CAMLOPT=boot\cslrun .\cslopt -I stdlib
+CAMLC=boot\ocamlrun boot\ocamlc -I boot
+CAMLOPT=boot\ocamlrun .\ocamlopt -I stdlib
COMPFLAGS=$(INCLUDES)
LINKFLAGS=
-CAMLYACC=boot\cslyacc
+CAMLYACC=boot\ocamlyacc
YACCFLAGS=
-CAMLLEX=boot\cslrun boot\csllex
-CAMLDEP=boot\cslrun tools\csldep
+CAMLLEX=boot\ocamlrun boot\ocamllex
+CAMLDEP=boot\ocamlrun tools\ocamldep
DEPFLAGS=$(INCLUDES)
-CAMLRUN=byterun\cslrun
+CAMLRUN=byterun\ocamlrun
INCLUDES=-I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver -I toplevel
@@ -82,9 +82,9 @@ PERVASIVES=arg array char digest filename format gc hashtbl lexing list map \
stack string stream sys oo
# Recompile the system using the bootstrap compiler
-all: runtime cslc csllex cslyacc csltools library csltop otherlibraries
+all: runtime ocamlc ocamllex ocamlyacc ocamltools library ocaml otherlibraries
-# The compilation of csltop will fail if the runtime has changed.
+# The compilation of ocaml will fail if the runtime has changed.
# Never mind, just do make bootstrap to reach fixpoint again.
# Compile everything the first time
@@ -101,30 +101,30 @@ bootstrap:
# Save the original bootstrap compiler
$(MAKEREC) backup
# Promote the new compiler but keep the old runtime
-# This compiler runs on boot\cslrun and produces bytecode for byterun\cslrun
+# This compiler runs on boot\ocamlrun and produces bytecode for byterun\ocamlrun
$(MAKEREC) promote-cross
-# Rebuild cslc and csllex (run on byterun\cslrun)
+# Rebuild ocamlc and ocamllex (run on byterun\ocamlrun)
$(MAKEREC) clean
- $(MAKEREC) cslc csllex
-# Rebuild the library (using byterun\cslrun .\cslc)
+ $(MAKEREC) ocamlc ocamllex
+# Rebuild the library (using byterun\ocamlrun .\ocamlc)
$(MAKEREC) library-cross
# Promote the new compiler and the new runtime
$(MAKEREC) promote
-# Rebuild everything, including csltop and the tools
+# Rebuild everything, including ocaml and the tools
$(MAKEREC) clean
$(MAKEREC) all
# Check if fixpoint reached
$(MAKEREC) compare
-LIBFILES=stdlib.cma std_exit.cmo *.cmi cslheader
+LIBFILES=stdlib.cma std_exit.cmo *.cmi ocamlheader
# Start up the system from the distribution compiler
coldstart:
cd byterun & $(MAKEREC) all
- cp byterun\cslrun.exe boot\cslrun.exe
+ cp byterun\ocamlrun.exe boot\ocamlrun.exe
cd yacc & $(MAKEREC) all
- cp yacc\cslyacc.exe boot\cslyacc.exe
- cd stdlib & $(MAKEREC) COMPILER=..\boot\cslc all
+ cp yacc\ocamlyacc.exe boot\ocamlyacc.exe
+ cd stdlib & $(MAKEREC) COMPILER=..\boot\ocamlc all
cd stdlib & cp $(LIBFILES) ..\boot
# Save the current bootstrap compiler
@@ -133,22 +133,22 @@ backup:
mv boot\Saved boot\Saved.prev
mkdir boot\Saved
mv boot\Saved.prev boot\Saved\Saved.prev
- cp boot\cslrun.exe boot\Saved\cslrun.exe
- cd boot & mv cslc csllex cslyacc.exe Saved
+ cp boot\ocamlrun.exe boot\Saved\ocamlrun.exe
+ cd boot & mv ocamlc ocamllex ocamlyacc.exe Saved
cd boot & cp $(LIBFILES) Saved
# Promote the newly compiled system to the rank of cross compiler
# (Runs on the old runtime, produces code for the new runtime)
promote-cross:
- cp cslc boot\cslc
- cp lex\csllex boot\csllex
- cp yacc\cslyacc.exe boot\cslyacc.exe
+ cp ocamlc boot\ocamlc
+ cp lex\ocamllex boot\ocamllex
+ cp yacc\ocamlyacc.exe boot\ocamlyacc.exe
cd stdlib & cp $(LIBFILES) ..\boot
# Promote the newly compiled system to the rank of bootstrap compiler
# (Runs on the new runtime, produces code for the new runtime)
promote: promote-cross
- cp byterun\cslrun.exe boot\cslrun.exe
+ cp byterun\ocamlrun.exe boot\ocamlrun.exe
# Restore the saved bootstrap compiler if a problem arises
restore:
@@ -158,8 +158,8 @@ restore:
# Check if fixpoint reached
compare:
- fc /b boot\cslc cslc
- fc /b boot\csllex lex\csllex
+ fc /b boot\ocamlc ocamlc
+ fc /b boot\ocamllex lex\ocamllex
echo "Fixpoint reached, bootstrap succeeded."
# Remove old bootstrap compilers
@@ -167,18 +167,18 @@ cleanboot:
rm -rf boot\Saved\Saved.prev\*
# Compile the native-code compiler
-opt: runtimeopt cslopt libraryopt otherlibrariesopt
+opt: runtimeopt ocamlopt libraryopt otherlibrariesopt
# Installation
install: installbyt installopt
installbyt:
cd byterun & $(MAKEREC) install
- cp cslc $(BINDIR)\cslc.exe
- cp csltop $(BINDIR)\csltop.exe
+ cp ocamlc $(BINDIR)\ocamlc.exe
+ cp ocaml $(BINDIR)\ocaml.exe
cd stdlib & $(MAKEREC) install
- cp lex\csllex $(BINDIR)\csllex.exe
- cp yacc\cslyacc.exe $(BINDIR)\cslyacc.exe
+ cp lex\ocamllex $(BINDIR)\ocamllex.exe
+ cp yacc\ocamlyacc.exe $(BINDIR)\ocamlyacc.exe
$(CAMLC) -a -o $(LIBDIR)\toplevellib.cma $(TOPLIB)
cp expunge $(LIBDIR)\expunge.exe
cp toplevel\topmain.cmo $(LIBDIR)\topmain.cmo
@@ -194,7 +194,7 @@ installbyt:
# Installation of the native-code compiler
installopt:
cd asmrun & $(MAKEREC) install
- cp cslopt $(BINDIR)\cslopt.exe
+ cp ocamlopt $(BINDIR)\ocamlopt.exe
cd stdlib & $(MAKEREC) installopt
for %i in ($(OTHERLIBRARIES)) do (cd otherlibs\%i & $(MAKEREC) installopt & cd ..\..)
@@ -202,29 +202,29 @@ realclean:: clean
# The compiler
-cslc: $(COMPOBJS)
- $(CAMLC) $(LINKFLAGS) -o cslc $(COMPOBJS)
+ocamlc: $(COMPOBJS)
+ $(CAMLC) $(LINKFLAGS) -o ocamlc $(COMPOBJS)
clean::
- rm -f cslc
+ rm -f ocamlc
# The native-code compiler
-cslopt: $(OPTOBJS)
- $(CAMLC) $(LINKFLAGS) -o cslopt $(OPTOBJS)
+ocamlopt: $(OPTOBJS)
+ $(CAMLC) $(LINKFLAGS) -o ocamlopt $(OPTOBJS)
clean::
- rm -f cslopt
+ rm -f ocamlopt
# The toplevel
-csltop: $(TOPOBJS) expunge
- $(CAMLC) $(LINKFLAGS) -linkall -o csltop.tmp $(TOPOBJS)
- - $(CAMLRUN) .\expunge csltop.tmp csltop $(PERVASIVES)
- rm -f csltop.tmp
+ocaml: $(TOPOBJS) expunge
+ $(CAMLC) $(LINKFLAGS) -linkall -o ocaml.tmp $(TOPOBJS)
+ - $(CAMLRUN) .\expunge ocaml.tmp ocaml $(PERVASIVES)
+ rm -f ocaml.tmp
clean::
- rm -f csltop
+ rm -f ocaml
# The configuration file
@@ -272,21 +272,21 @@ beforedepend:: parsing\lexer.ml
# Currently not working because it requires C primitives from byterun\meta.c
# which are not provided by asmrun\libasmrun.lib
-# cslc.opt: $(COMPOBJS:.cmo=.cmx)
-# $(CAMLOPT) $(LINKFLAGS) -o cslc.opt $(COMPOBJS:.cmo=.cmx)
+# ocamlc.opt: $(COMPOBJS:.cmo=.cmx)
+# $(CAMLOPT) $(LINKFLAGS) -o ocamlc.opt $(COMPOBJS:.cmo=.cmx)
clean::
- rm -f cslc.opt
+ rm -f ocamlc.opt
# The native-code compiler compiled with itself
-cslopt.opt: $(OPTOBJS:.cmo=.cmx)
- $(CAMLOPT) $(LINKFLAGS) -o cslopt.opt $(OPTOBJS:.cmo=.cmx)
+ocamlopt.opt: $(OPTOBJS:.cmo=.cmx)
+ $(CAMLOPT) $(LINKFLAGS) -o ocamlopt.opt $(OPTOBJS:.cmo=.cmx)
clean::
- rm -f cslopt.opt
+ rm -f ocamlopt.opt
-$(OPTOBJS:.cmo=.cmx): cslopt
+$(OPTOBJS:.cmo=.cmx): ocamlopt
# The numeric opcodes
@@ -382,7 +382,7 @@ alldepend::
library:
cd stdlib & $(MAKEREC) all
library-cross:
- cd stdlib & $(MAKEREC) RUNTIME=..\byterun\cslrun all
+ cd stdlib & $(MAKEREC) RUNTIME=..\byterun\ocamlrun all
libraryopt:
cd stdlib & $(MAKEREC) allopt
clean::
@@ -392,21 +392,21 @@ alldepend::
# The lexer and parser generators
-csllex:
+ocamllex:
cd lex & $(MAKEREC) all
clean::
cd lex & $(MAKEREC) clean
alldepend::
cd lex & $(MAKEREC) depend
-cslyacc:
+ocamlyacc:
cd yacc & $(MAKEREC) all
realclean::
cd yacc & $(MAKEREC) clean
# Tools
-csltools:
+ocamltools:
cd tools & $(MAKEREC) all
clean::
cd tools & $(MAKEREC) clean
View
21 README
@@ -1,15 +1,10 @@
OVERVIEW:
-Caml Special Light is an implementation of the ML language, based on
-the Caml Light dialect extended with a powerful module system in the
-style of Standard ML.
+Objective Caml is an implementation of the ML language, based on
+the Caml Light dialect extended with a complete class-based object system
+and a powerful module system in the style of Standard ML.
-Though close to Caml Light in many ways, Caml Special Light is not the
-latest release of Caml Light: the language implemented has changed in
-significant ways, source-level compatibility is not ensured, and the
-implementation has been almost completely rewritten from scratch.
-
-Caml Special Light comprises two compilers. One generates bytecode
+Objective Caml comprises two compilers. One generates bytecode
which is then interpreted by a C program. This compiler runs quickly,
generates compact code with moderate memory requirements, and is
portable to essentially any 32 or 64 bit Unix platform. Performance of
@@ -68,7 +63,7 @@ CONTENTS:
COPYRIGHT:
-All files in this distribution are copyright 1995 Institut National de
+All files in this distribution are copyright 1996 Institut National de
Recherche en Informatique et Automatique (INRIA) and distributed under
the conditions stated in file LICENSE.
They can be freely redistributed for non-commercial purposes, provided
@@ -80,15 +75,15 @@ See the file INSTALL for installation instructions on Unix machines.
DOCUMENTATION:
-The Caml Special Light manual is distributed in Postscript, DVI, and
+The Objective Caml manual is distributed in Postscript, DVI, and
plain text. It can be obtained by anonymous FTP from ftp.inria.fr as
described below. It is also available on the World Wide Web, at
- http://pauillac.inria.fr/csl/
+ http://pauillac.inria.fr/caml/
AVAILABILITY:
-The complete Caml Special Light distribution resides on ftp.inria.fr,
+The complete Objective Caml distribution resides on ftp.inria.fr,
and can be accessed by anonymous FTP:
host: ftp.inria.fr (192.93.2.54)
View
56 README.win32
@@ -1,4 +1,4 @@
- Release notes on the MS Windows port of Caml Special Light
+ Release notes on the MS Windows port of Objective Caml
----------------------------------------------------------
REQUIREMENTS:
@@ -7,13 +7,13 @@ This port runs under Windows 95 and Windows NT on Intel-based machines.
Windows 3.1 and Windows for Workgroups are not supported. Windows NT
on non-Intel processors has not been tested.
-The base bytecode system (cslc, csltop, csllex, cslyacc, ...) runs without
-any additional tools.
+The base bytecode system (ocamlc, ocaml, ocamllex, ocamlyacc, ...)
+runs without any additional tools.
-Linking Caml bytecode with C code (cslc -custom) requires the
+Linking Caml bytecode with C code (ocamlc -custom) requires the
Microsoft Visual C++ compiler.
-The native-code compiler (cslopt) requires Visual C++ and the
+The native-code compiler (ocamlopt) requires Visual C++ and the
Microsoft assembler MASM version 6.
@@ -29,55 +29,55 @@ version 2. Use either Winzip (shareware) or the NT/95 version of unzip
Unzipping the distribution creates (among others) the following
directories and files:
- camlsl\cslwin.exe The toplevel application
- camlsl\cslwin.ini Its configuration file
- camlsl\bin\ The command-line compilers and tools
- camlsl\lib\ The standard library files
+ ocaml\ocamlwin.exe The toplevel application
+ ocaml\ocamlwin.ini Its configuration file
+ ocaml\bin\ The command-line compilers and tools
+ ocaml\lib\ The standard library files
Installing the toplevel application:
- Copy the file camlsl\cslwin.ini to the Windows system directory
+ Copy the file ocaml\ocamlwin.ini to the Windows system directory
(e.g. C:\windows). This file assumes that the Caml distribution
- resides in C:\camlsl. If this is not the case, edit the file cslwin.ini
+ resides in C:\ocaml. If this is not the case, edit the file ocamlwin.ini
and change the line that says
- CmdLine=cslrun c:\camlsl\bin\csltop.exe -I c:\camlsl\lib
+ CmdLine=ocamlrun c:\ocaml\bin\ocaml.exe -I c:\ocaml\lib
to
- CmdLine=cslrun <caml_dir>\bin\csltop.exe -I <caml_dir>\lib
+ CmdLine=ocamlrun <caml_dir>\bin\ocaml.exe -I <caml_dir>\lib
e.g.
- CmdLine=cslrun d:\lang\camlsl\bin\csltop.exe -I d:\lang\camlsl\lib
+ CmdLine=ocamlrun d:\lang\ocaml\bin\ocaml.exe -I d:\lang\ocaml\lib
Installing the command-line tools:
- You must add the camlsl\bin subdirectory to the PATH variable, e.g.
+ You must add the ocaml\bin subdirectory to the PATH variable, e.g.
- set PATH=%PATH%;D:\lang\camlsl\bin
+ set PATH=%PATH%;D:\lang\ocaml\bin
- Running directly the tools (e.g. typing D:\lang\camlsl\bin\cslc)
- will not work if the camlsl\bin directory is not in PATH, because cslc
+ Running directly the tools (e.g. typing D:\lang\ocaml\bin\ocamlc)
+ will not work if the ocaml\bin directory is not in PATH, because ocamlc
and the other tools will be unable to find the Caml runtime system
- cslrun.exe.
+ ocamlrun.exe.
The command-line tools assume that the standard library resides in
- C:\camlsl\lib. If you have unpacked it elsehwere, define the CAMLLIB
+ C:\ocaml\lib. If you have unpacked it elsehwere, define the CAMLLIB
environment variable to point to the standard library directory, e.g.
- set CAMLLIB=D:\lang\camlsl\lib
+ set CAMLLIB=D:\lang\ocaml\lib
RECOMPILATION FROM THE SOURCES:
The command-line tools can be recompiled from the Unix source
-distribution (csl-X.YZ.tar.gz), which also contains the files modified
+distribution (ocaml-X.YZ.tar.gz), which also contains the files modified
for Windows.
In addition to Visual C++ 4.0 and MASM 6, you will also need a healthy
set of Unix / GNU utilities that understands long file names
(see e.g. ftp://ftp.cc.utexas.edu/microlib/nt/gnu/).
-The bootstrap compilers provided in the Unix distribution (boot/cslc
-and boot/csllex) must be replaced by those from the binary Windows
-distribution (camlsl\bin\cslc.exe and camlsl\bin\csllex.exe).
+The bootstrap compilers provided in the Unix distribution (boot/ocamlc
+and boot/ocamllex) must be replaced by those from the binary Windows
+distribution (ocaml\bin\ocamlc.exe and ocaml\bin\ocamllex.exe).
The sources for the toplevel graphical user interface are not
publically available.
@@ -101,9 +101,9 @@ Win32.
CREDITS:
-The initial port of Caml Special Light to Windows NT was done by Kevin
-Gallo at Microsoft Research, who kindly contributed his changes to the
-Caml Special Light project.
+The initial port of Caml Special Light (the ancestor of Objective Caml)
+to Windows NT was done by Kevin Gallo at Microsoft Research, who
+kindly contributed his changes to the Caml project.
The graphical user interface for the toplevel is due to Jean-Marie
Geffroy at INRIA Rocquencourt.
View
4 asmcomp/all.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/arch_alpha.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/arch_hppa.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/arch_i386.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/arch_mips.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/arch_power.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/arch_sparc.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/asmgen.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/asmgen.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/asmlibrarian.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/asmlibrarian.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/asmlink.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/asmlink.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/clambda.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/clambda.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/closure.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/closure.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/cmm.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/cmm.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/cmmgen.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/cmmgen.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/codegen.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/codegen.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/coloring.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/coloring.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/compilenv.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/compilenv.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emit.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emit_alpha.mlp
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emit_hppa.mlp
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emit_i386.mlp
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emit_i386nt.mlp
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emit_mips.mlp
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emit_power.mlp
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emit_sparc.mlp
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emitaux.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/emitaux.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/interf.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/interf.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/linearize.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/linearize.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/liveness.ml
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/liveness.mli
@@ -1,10 +1,10 @@
(***********************************************************************)
(* *)
-(* Caml Special Light *)
+(* Objective Caml *)
(* *)
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
(* *)
-(* Copyright 1995 Institut National de Recherche en Informatique et *)
+(* Copyright 1996 Institut National de Recherche en Informatique et *)
(* Automatique. Distributed only by permission. *)
(* *)
(***********************************************************************)
View
4 asmcomp/mach.ml
@@ -1,10 +1,10 @@
(******