diff options
613 files changed, 1722 insertions, 1656 deletions
diff --git a/.cvsignore b/.cvsignore index 7d3d799fe..7d6fcc622 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -cslc +ocamlc expunge -csltop -cslopt +ocaml +ocamlopt @@ -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. @@ -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. @@ -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. @@ -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 diff --git a/Makefile.nt b/Makefile.nt index d5df4bd95..93514aba7 100644 --- a/Makefile.nt +++ b/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 @@ -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) diff --git a/README.win32 b/README.win32 index aae995e9d..87368ac15 100644 --- a/README.win32 +++ b/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. diff --git a/asmcomp/all.ml b/asmcomp/all.ml index e2a6219bb..b8347e925 100644 --- a/asmcomp/all.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/arch_alpha.ml b/asmcomp/arch_alpha.ml index 2092248ce..0181cc1d4 100644 --- a/asmcomp/arch_alpha.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/arch_hppa.ml b/asmcomp/arch_hppa.ml index aa3e78eef..c41556bd4 100644 --- a/asmcomp/arch_hppa.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/arch_i386.ml b/asmcomp/arch_i386.ml index bfb136c1f..61b6abcb3 100644 --- a/asmcomp/arch_i386.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/arch_mips.ml b/asmcomp/arch_mips.ml index 826d6310b..7bfe7f2f8 100644 --- a/asmcomp/arch_mips.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/arch_power.ml b/asmcomp/arch_power.ml index cbba7a906..5fa4f4041 100644 --- a/asmcomp/arch_power.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/arch_sparc.ml b/asmcomp/arch_sparc.ml index 3f0f4abec..13a5ca6fc 100644 --- a/asmcomp/arch_sparc.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/asmgen.ml b/asmcomp/asmgen.ml index 790908053..f40643e77 100644 --- a/asmcomp/asmgen.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/asmgen.mli b/asmcomp/asmgen.mli index a34d76e23..8b5e49076 100644 --- a/asmcomp/asmgen.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/asmlibrarian.ml b/asmcomp/asmlibrarian.ml index 7a461c8cc..e0ebfcd7a 100644 --- a/asmcomp/asmlibrarian.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/asmlibrarian.mli b/asmcomp/asmlibrarian.mli index ff992a193..4e12898c1 100644 --- a/asmcomp/asmlibrarian.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml index b7baadb3d..ccc7b6ad6 100644 --- a/asmcomp/asmlink.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/asmlink.mli b/asmcomp/asmlink.mli index 0046ea78b..a1f80ba83 100644 --- a/asmcomp/asmlink.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/clambda.ml b/asmcomp/clambda.ml index d640aeb25..ba8efbdb8 100644 --- a/asmcomp/clambda.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/clambda.mli b/asmcomp/clambda.mli index d640aeb25..ba8efbdb8 100644 --- a/asmcomp/clambda.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/closure.ml b/asmcomp/closure.ml index 8dfdad2d0..d6c70cc42 100644 --- a/asmcomp/closure.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/closure.mli b/asmcomp/closure.mli index 905b848dd..9f04b3560 100644 --- a/asmcomp/closure.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/cmm.ml b/asmcomp/cmm.ml index 10d69cf30..74e1648aa 100644 --- a/asmcomp/cmm.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/cmm.mli b/asmcomp/cmm.mli index cfbf5f504..183ef4b58 100644 --- a/asmcomp/cmm.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/cmmgen.ml b/asmcomp/cmmgen.ml index e442c6d8e..9466a4881 100644 --- a/asmcomp/cmmgen.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/cmmgen.mli b/asmcomp/cmmgen.mli index 6a80ce7d0..fc54974b3 100644 --- a/asmcomp/cmmgen.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/codegen.ml b/asmcomp/codegen.ml index 0599fa45e..24dc2517a 100644 --- a/asmcomp/codegen.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/codegen.mli b/asmcomp/codegen.mli index a3da5fad4..b7a51fba9 100644 --- a/asmcomp/codegen.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/coloring.ml b/asmcomp/coloring.ml index 58a59be0e..74cfbb632 100644 --- a/asmcomp/coloring.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/coloring.mli b/asmcomp/coloring.mli index 798756e54..d74bdad5d 100644 --- a/asmcomp/coloring.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/compilenv.ml b/asmcomp/compilenv.ml index 3d4f4fae2..5c0636f22 100644 --- a/asmcomp/compilenv.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/compilenv.mli b/asmcomp/compilenv.mli index 6c45497c2..100630594 100644 --- a/asmcomp/compilenv.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emit.mli b/asmcomp/emit.mli index 4c88afbc6..c08b80b42 100644 --- a/asmcomp/emit.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emit_alpha.mlp b/asmcomp/emit_alpha.mlp index 379b7c3b0..4d8b08874 100644 --- a/asmcomp/emit_alpha.mlp +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emit_hppa.mlp b/asmcomp/emit_hppa.mlp index a10584633..45cb929ba 100644 --- a/asmcomp/emit_hppa.mlp +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emit_i386.mlp b/asmcomp/emit_i386.mlp index 8d907a03f..b90e648c6 100644 --- a/asmcomp/emit_i386.mlp +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emit_i386nt.mlp b/asmcomp/emit_i386nt.mlp index 1aa560a6f..542cdc699 100644 --- a/asmcomp/emit_i386nt.mlp +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emit_mips.mlp b/asmcomp/emit_mips.mlp index 3aa6132c6..7741314d0 100644 --- a/asmcomp/emit_mips.mlp +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emit_power.mlp b/asmcomp/emit_power.mlp index 65ec092e7..d0dd00e67 100644 --- a/asmcomp/emit_power.mlp +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emit_sparc.mlp b/asmcomp/emit_sparc.mlp index 09f7b8a7f..dd1f613b3 100644 --- a/asmcomp/emit_sparc.mlp +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emitaux.ml b/asmcomp/emitaux.ml index be0830cf4..0ef40435a 100644 --- a/asmcomp/emitaux.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/emitaux.mli b/asmcomp/emitaux.mli index 5ef88b178..ab2a957fe 100644 --- a/asmcomp/emitaux.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/interf.ml b/asmcomp/interf.ml index 5c4cfb7ca..d3ceed293 100644 --- a/asmcomp/interf.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/interf.mli b/asmcomp/interf.mli index c17305323..8faa93b3b 100644 --- a/asmcomp/interf.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/linearize.ml b/asmcomp/linearize.ml index 4c2713922..6c07efcef 100644 --- a/asmcomp/linearize.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/linearize.mli b/asmcomp/linearize.mli index 5edc58c4b..c4416741f 100644 --- a/asmcomp/linearize.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/liveness.ml b/asmcomp/liveness.ml index ad1f31c74..23373e76d 100644 --- a/asmcomp/liveness.ml +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/liveness.mli b/asmcomp/liveness.mli index ee909d60d..8cf976ad4 100644 --- a/asmcomp/liveness.mli +++ b/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. *) (* *) (***********************************************************************) diff --git a/asmcomp/mach.ml b/asmcomp/mach.ml index 5ec11f901..d65cad8fc 100644 --- a/asmcomp/mach.ml +++ b/asmcomp/mach.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/mach.mli b/asmcomp/mach.mli index b8f533ff9..faf7fe8a1 100644 --- a/asmcomp/mach.mli +++ b/asmcomp/mach.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/printcmm.ml b/asmcomp/printcmm.ml index 3ecaea6f3..e9f552947 100644 --- a/asmcomp/printcmm.ml +++ b/asmcomp/printcmm.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/printcmm.mli b/asmcomp/printcmm.mli index d4cd5f096..049b858cb 100644 --- a/asmcomp/printcmm.mli +++ b/asmcomp/printcmm.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/printlinear.ml b/asmcomp/printlinear.ml index b91e8d69e..83f363b6a 100644 --- a/asmcomp/printlinear.ml +++ b/asmcomp/printlinear.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/printlinear.mli b/asmcomp/printlinear.mli index f0180852d..c919b5b2e 100644 --- a/asmcomp/printlinear.mli +++ b/asmcomp/printlinear.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/printmach.ml b/asmcomp/printmach.ml index 5ccd18e67..2c2ef8aca 100644 --- a/asmcomp/printmach.ml +++ b/asmcomp/printmach.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/printmach.mli b/asmcomp/printmach.mli index d79ab1e16..2125f9bf1 100644 --- a/asmcomp/printmach.mli +++ b/asmcomp/printmach.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/proc.mli b/asmcomp/proc.mli index 21739bcfc..1fd4c555b 100644 --- a/asmcomp/proc.mli +++ b/asmcomp/proc.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/proc_alpha.ml b/asmcomp/proc_alpha.ml index e42b98f57..29c872132 100644 --- a/asmcomp/proc_alpha.ml +++ b/asmcomp/proc_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. *) (* *) (***********************************************************************) diff --git a/asmcomp/proc_hppa.ml b/asmcomp/proc_hppa.ml index 5b1f27712..14cc280a2 100644 --- a/asmcomp/proc_hppa.ml +++ b/asmcomp/proc_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. *) (* *) (***********************************************************************) diff --git a/asmcomp/proc_i386.ml b/asmcomp/proc_i386.ml index 57169d87a..69f19ba4f 100644 --- a/asmcomp/proc_i386.ml +++ b/asmcomp/proc_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. *) (* *) (***********************************************************************) diff --git a/asmcomp/proc_i386nt.ml b/asmcomp/proc_i386nt.ml index bb1c3c2b6..903627f3b 100644 --- a/asmcomp/proc_i386nt.ml +++ b/asmcomp/proc_i386nt.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/proc_mips.ml b/asmcomp/proc_mips.ml index 6d82aef0b..617b4c438 100644 --- a/asmcomp/proc_mips.ml +++ b/asmcomp/proc_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. *) (* *) (***********************************************************************) diff --git a/asmcomp/proc_power.ml b/asmcomp/proc_power.ml index 2532bd08b..9a5585944 100644 --- a/asmcomp/proc_power.ml +++ b/asmcomp/proc_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. *) (* *) (***********************************************************************) diff --git a/asmcomp/proc_sparc.ml b/asmcomp/proc_sparc.ml index c600f9358..55185a1bd 100644 --- a/asmcomp/proc_sparc.ml +++ b/asmcomp/proc_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. *) (* *) (***********************************************************************) diff --git a/asmcomp/reg.ml b/asmcomp/reg.ml index 9ab142988..66c9e3bad 100644 --- a/asmcomp/reg.ml +++ b/asmcomp/reg.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/reg.mli b/asmcomp/reg.mli index 60a292ef7..38f2333b0 100644 --- a/asmcomp/reg.mli +++ b/asmcomp/reg.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/reload.ml b/asmcomp/reload.ml index f07d2d9d2..7c559b2dc 100644 --- a/asmcomp/reload.ml +++ b/asmcomp/reload.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/reload.mli b/asmcomp/reload.mli index 2ce07c87a..c43deaf86 100644 --- a/asmcomp/reload.mli +++ b/asmcomp/reload.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/scheduling.ml b/asmcomp/scheduling.ml index 0c7f9b56d..f39627896 100644 --- a/asmcomp/scheduling.ml +++ b/asmcomp/scheduling.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/scheduling.mli b/asmcomp/scheduling.mli index c338fa1e5..e2ed0fd83 100644 --- a/asmcomp/scheduling.mli +++ b/asmcomp/scheduling.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/selection.ml b/asmcomp/selection.ml index 107a64f03..7fdf4eab2 100644 --- a/asmcomp/selection.ml +++ b/asmcomp/selection.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/selection.mli b/asmcomp/selection.mli index 4279e594b..8888cafcc 100644 --- a/asmcomp/selection.mli +++ b/asmcomp/selection.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/spill.ml b/asmcomp/spill.ml index d2ea84fa6..754f457fb 100644 --- a/asmcomp/spill.ml +++ b/asmcomp/spill.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/spill.mli b/asmcomp/spill.mli index 83ced7bb6..b6b02f1b2 100644 --- a/asmcomp/spill.mli +++ b/asmcomp/spill.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/split.ml b/asmcomp/split.ml index e14b9e4e0..6a18a1934 100644 --- a/asmcomp/split.ml +++ b/asmcomp/split.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. *) (* *) (***********************************************************************) diff --git a/asmcomp/split.mli b/asmcomp/split.mli index 508ec0623..2cdcf3c0e 100644 --- a/asmcomp/split.mli +++ b/asmcomp/split.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. *) (* *) (***********************************************************************) diff --git a/asmrun/Makefile b/asmrun/Makefile index 365d07280..1bc82d7ba 100644 --- a/asmrun/Makefile +++ b/asmrun/Makefile @@ -74,6 +74,13 @@ obj.c: ../byterun/obj.c lexing.c: ../byterun/lexing.c ln -s ../byterun/lexing.c lexing.c +LINKEDFILES=misc.c freelist.c major_gc.c minor_gc.c memory.c alloc.c \ + compare.c ints.c floats.c str.c io.c extern.c intern.c hash.c sys.c \ + parsing.c gc_ctrl.c terminfo.c md5.c obj.c lexing.c + +clean:: + rm -f $(LINKEDFILES) + .SUFFIXES: .asm .S .d.o .asm.o: diff --git a/asmrun/alpha.asm b/asmrun/alpha.asm index 5cec8a868..2ed00be4c 100644 --- a/asmrun/alpha.asm +++ b/asmrun/alpha.asm @@ -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. */ /* */ /***********************************************************************/ diff --git a/asmrun/array.c b/asmrun/array.c index 15eed72f1..9c117e3bf 100644 --- a/asmrun/array.c +++ b/asmrun/array.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/asmrun/fail.c b/asmrun/fail.c index b796ecf68..4a3ffcdb6 100644 --- a/asmrun/fail.c +++ b/asmrun/fail.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/asmrun/hppa.asm b/asmrun/hppa.asm index e91444132..0eafcac67 100644 --- a/asmrun/hppa.asm +++ b/asmrun/hppa.asm @@ -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. * ;* * ;********************************************************************* diff --git a/asmrun/i386.S b/asmrun/i386.S index 6b5d7f6b3..409404890 100644 --- a/asmrun/i386.S +++ b/asmrun/i386.S @@ -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. */ /* */ /***********************************************************************/ diff --git a/asmrun/i386nt.asm b/asmrun/i386nt.asm index 264a96e02..fbd3277e4 100644 --- a/asmrun/i386nt.asm +++ b/asmrun/i386nt.asm @@ -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. ; ;********************************************************************* diff --git a/asmrun/main.c b/asmrun/main.c index f2d202d6c..f191a94e5 100644 --- a/asmrun/main.c +++ b/asmrun/main.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/asmrun/mips.asm b/asmrun/mips.asm index 755305371..97fdb6f63 100644 --- a/asmrun/mips.asm +++ b/asmrun/mips.asm @@ -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. */ /* */ /***********************************************************************/ diff --git a/asmrun/power.asm b/asmrun/power.asm index 76947cf9f..0de68af6d 100644 --- a/asmrun/power.asm +++ b/asmrun/power.asm @@ -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. * #* * #********************************************************************* diff --git a/asmrun/roots.c b/asmrun/roots.c index dc5dcc705..3f2b47666 100644 --- a/asmrun/roots.c +++ b/asmrun/roots.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/asmrun/signals.c b/asmrun/signals.c index 5d6a061df..e0c917d14 100644 --- a/asmrun/signals.c +++ b/asmrun/signals.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/asmrun/sparc.asm b/asmrun/sparc.asm index bd2ccbb8b..276260a9b 100644 --- a/asmrun/sparc.asm +++ b/asmrun/sparc.asm @@ -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. */ /* */ /***********************************************************************/ diff --git a/asmrun/stack.h b/asmrun/stack.h index 2f76193bd..6adf0f006 100644 --- a/asmrun/stack.h +++ b/asmrun/stack.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/boot/.cvsignore b/boot/.cvsignore index 853b7355e..849670a4e 100644 --- a/boot/.cvsignore +++ b/boot/.cvsignore @@ -1,4 +1,4 @@ Saved -cslrun -cslyacc -cslheader +ocamlrun +ocamlyacc +ocamlheader diff --git a/boot/cslc b/boot/cslc Binary files differdeleted file mode 100755 index 3039551fe..000000000 --- a/boot/cslc +++ /dev/null diff --git a/boot/ocamlc b/boot/ocamlc Binary files differnew file mode 100755 index 000000000..3edb6a1a3 --- /dev/null +++ b/boot/ocamlc diff --git a/boot/csllex b/boot/ocamllex Binary files differindex 609cf3b95..fa5aa829b 100755 --- a/boot/csllex +++ b/boot/ocamllex diff --git a/bytecomp/bytegen.ml b/bytecomp/bytegen.ml index 2d84daeb0..a3416a1a4 100644 --- a/bytecomp/bytegen.ml +++ b/bytecomp/bytegen.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/bytegen.mli b/bytecomp/bytegen.mli index 668ea90e2..d89781d07 100644 --- a/bytecomp/bytegen.mli +++ b/bytecomp/bytegen.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/bytelibrarian.ml b/bytecomp/bytelibrarian.ml index 1ee707861..8c8cd82fb 100644 --- a/bytecomp/bytelibrarian.ml +++ b/bytecomp/bytelibrarian.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/bytelibrarian.mli b/bytecomp/bytelibrarian.mli index fee79d9db..b34ebba83 100644 --- a/bytecomp/bytelibrarian.mli +++ b/bytecomp/bytelibrarian.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml index 1ae65375b..46b18c3c6 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.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. *) (* *) (***********************************************************************) @@ -186,7 +186,7 @@ let link_bytecode objfiles exec_name copy_header = (* Copy the header *) if copy_header then begin try - let inchan = open_in_bin (find_in_path !load_path "cslheader") in + let inchan = open_in_bin (find_in_path !load_path "camlheader") in copy_file inchan outchan; close_in inchan with Not_found | Sys_error _ -> () diff --git a/bytecomp/bytelink.mli b/bytecomp/bytelink.mli index aebd42f5f..fdf505ecf 100644 --- a/bytecomp/bytelink.mli +++ b/bytecomp/bytelink.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/emitcode.ml b/bytecomp/emitcode.ml index 6738da2de..9b021977a 100644 --- a/bytecomp/emitcode.ml +++ b/bytecomp/emitcode.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/emitcode.mli b/bytecomp/emitcode.mli index de3a03647..87dcb1d6b 100644 --- a/bytecomp/emitcode.mli +++ b/bytecomp/emitcode.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/instruct.ml b/bytecomp/instruct.ml index 8c3539a56..f3d7c9e7a 100644 --- a/bytecomp/instruct.ml +++ b/bytecomp/instruct.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/instruct.mli b/bytecomp/instruct.mli index 2f1043d17..5aabce887 100644 --- a/bytecomp/instruct.mli +++ b/bytecomp/instruct.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/lambda.ml b/bytecomp/lambda.ml index 1c119ab51..0f70e773c 100644 --- a/bytecomp/lambda.ml +++ b/bytecomp/lambda.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/lambda.mli b/bytecomp/lambda.mli index 6ea5bafef..d9852ad88 100644 --- a/bytecomp/lambda.mli +++ b/bytecomp/lambda.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/matching.ml b/bytecomp/matching.ml index 7123e4144..ee9f1e470 100644 --- a/bytecomp/matching.ml +++ b/bytecomp/matching.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/matching.mli b/bytecomp/matching.mli index 6fae1941a..6021e2618 100644 --- a/bytecomp/matching.mli +++ b/bytecomp/matching.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/meta.ml b/bytecomp/meta.ml index 715421967..038ac3526 100644 --- a/bytecomp/meta.ml +++ b/bytecomp/meta.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/meta.mli b/bytecomp/meta.mli index f64bc390e..ab4d161ab 100644 --- a/bytecomp/meta.mli +++ b/bytecomp/meta.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/printinstr.ml b/bytecomp/printinstr.ml index eac2b5f00..56b15763f 100644 --- a/bytecomp/printinstr.ml +++ b/bytecomp/printinstr.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/printinstr.mli b/bytecomp/printinstr.mli index 0652c3d8d..a41a046da 100644 --- a/bytecomp/printinstr.mli +++ b/bytecomp/printinstr.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/printlambda.ml b/bytecomp/printlambda.ml index dabc6e335..68f95e67e 100644 --- a/bytecomp/printlambda.ml +++ b/bytecomp/printlambda.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/printlambda.mli b/bytecomp/printlambda.mli index 44457559b..456d749fc 100644 --- a/bytecomp/printlambda.mli +++ b/bytecomp/printlambda.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/runtimedef.mli b/bytecomp/runtimedef.mli index 87272091f..3b4006361 100644 --- a/bytecomp/runtimedef.mli +++ b/bytecomp/runtimedef.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/simplif.ml b/bytecomp/simplif.ml index 177f19b62..d9f566ca7 100644 --- a/bytecomp/simplif.ml +++ b/bytecomp/simplif.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/simplif.mli b/bytecomp/simplif.mli index 760923273..f85c51cb6 100644 --- a/bytecomp/simplif.mli +++ b/bytecomp/simplif.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml index 431fd424c..dcd2d2f6e 100644 --- a/bytecomp/symtable.ml +++ b/bytecomp/symtable.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/symtable.mli b/bytecomp/symtable.mli index 7ff2d4255..5ec16dade 100644 --- a/bytecomp/symtable.mli +++ b/bytecomp/symtable.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/translclass.ml b/bytecomp/translclass.ml index 4b7639645..f6e04667f 100644 --- a/bytecomp/translclass.ml +++ b/bytecomp/translclass.ml @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/bytecomp/translclass.mli b/bytecomp/translclass.mli index d309da71b..5265d1bf8 100644 --- a/bytecomp/translclass.mli +++ b/bytecomp/translclass.mli @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/bytecomp/translcore.ml b/bytecomp/translcore.ml index 07ad56c8b..ab06c8516 100644 --- a/bytecomp/translcore.ml +++ b/bytecomp/translcore.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/translcore.mli b/bytecomp/translcore.mli index 20ffd18df..dd002754f 100644 --- a/bytecomp/translcore.mli +++ b/bytecomp/translcore.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/translmod.ml b/bytecomp/translmod.ml index d90e66430..90f039545 100644 --- a/bytecomp/translmod.ml +++ b/bytecomp/translmod.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/translmod.mli b/bytecomp/translmod.mli index ec66166c1..b58e2cbcb 100644 --- a/bytecomp/translmod.mli +++ b/bytecomp/translmod.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. *) (* *) (***********************************************************************) diff --git a/bytecomp/translobj.ml b/bytecomp/translobj.ml index 682730354..5f63660e1 100644 --- a/bytecomp/translobj.ml +++ b/bytecomp/translobj.ml @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/bytecomp/translobj.mli b/bytecomp/translobj.mli index 8bdb7ba3e..e2530ec36 100644 --- a/bytecomp/translobj.mli +++ b/bytecomp/translobj.mli @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/byterun/.cvsignore b/byterun/.cvsignore index d118bd7d8..7d4ca37c7 100644 --- a/byterun/.cvsignore +++ b/byterun/.cvsignore @@ -2,5 +2,5 @@ jumptbl.h primitives prims.c opnames.h -cslrun -cslrund +ocamlrun +ocamlrund diff --git a/byterun/Makefile b/byterun/Makefile index 2776bc91b..584df65bf 100644 --- a/byterun/Makefile +++ b/byterun/Makefile @@ -16,16 +16,16 @@ PRIMS=array.c compare.c extern.c floats.c gc_ctrl.c hash.c \ intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c \ signals.c str.c sys.c terminfo.c -all: cslrun +all: ocamlrun -cslrun: $(OBJS) prims.o - $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -o cslrun prims.o $(OBJS) $(CCLIBS) +ocamlrun: $(OBJS) prims.o + $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -o ocamlrun prims.o $(OBJS) $(CCLIBS) -cslrund: $(DOBJS) prims.o - $(BYTECC) -g $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -o cslrund prims.o $(DOBJS) $(CCLIBS) +ocamlrund: $(DOBJS) prims.o + $(BYTECC) -g $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -o ocamlrund prims.o $(DOBJS) $(CCLIBS) install: - cp cslrun $(BINDIR)/cslrun + cp ocamlrun $(BINDIR)/ocamlrun rm -f $(LIBDIR)/libcamlrun.a ar rc $(LIBDIR)/libcamlrun.a $(OBJS) cd $(LIBDIR); $(RANLIB) libcamlrun.a @@ -39,7 +39,7 @@ install: -e '/Modify/,/^}/d' memory.h > $(LIBDIR)/caml/memory.h clean: - rm -f cslrun cslrund *.o *.a + rm -f ocamlrun ocamlrund *.o *.a rm -f primitives prims.c opnames.h jumptbl.h primitives : $(PRIMS) diff --git a/byterun/Makefile.nt b/byterun/Makefile.nt index ba55c2e9e..5ccf84c41 100644 --- a/byterun/Makefile.nt +++ b/byterun/Makefile.nt @@ -13,13 +13,13 @@ PRIMS=array.c compare.c extern.c floats.c gc_ctrl.c hash.c \ intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c \ signals.c str.c sys.c terminfo.c -all: cslrun.exe +all: ocamlrun.exe -cslrun.exe: $(OBJS) prims.obj +ocamlrun.exe: $(OBJS) prims.obj $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) /Fecslrun.exe prims.obj $(OBJS) $(CCLIBS) install: - cp cslrun.exe $(BINDIR)\cslrun.exe + cp ocamlrun.exe $(BINDIR)\ocamlrun.exe rm -f $(LIBDIR)\libcamlrun.lib $(MKLIB)$(LIBDIR)\libcamlrun.lib $(OBJS) if not exist $(LIBDIR)\caml mkdir $(LIBDIR)\caml @@ -32,7 +32,7 @@ install: -e "/Modify/,/^}/d" memory.h > $(LIBDIR)\caml\memory.h clean: - rm -f cslrun.exe *.obj *.lib + rm -f ocamlrun.exe *.obj *.lib rm -f primitives prims.c opnames.h jumptbl.h primitives : $(PRIMS) diff --git a/byterun/alloc.c b/byterun/alloc.c index 0c0212fe3..e7bf157b1 100644 --- a/byterun/alloc.c +++ b/byterun/alloc.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/alloc.h b/byterun/alloc.h index b29ba5041..c027358e0 100644 --- a/byterun/alloc.h +++ b/byterun/alloc.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/array.c b/byterun/array.c index 172156d7c..e6b191aff 100644 --- a/byterun/array.c +++ b/byterun/array.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/compare.c b/byterun/compare.c index e23a4aa90..648b72fab 100644 --- a/byterun/compare.c +++ b/byterun/compare.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/config.h b/byterun/config.h index 55277fc52..f93f2f444 100644 --- a/byterun/config.h +++ b/byterun/config.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/exec.h b/byterun/exec.h index 3ba540865..38547d5ae 100644 --- a/byterun/exec.h +++ b/byterun/exec.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/extern.c b/byterun/extern.c index 43e645019..82626581a 100644 --- a/byterun/extern.c +++ b/byterun/extern.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/fail.c b/byterun/fail.c index 610a6d389..98be20838 100644 --- a/byterun/fail.c +++ b/byterun/fail.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/fail.h b/byterun/fail.h index 9e6bda68c..d7fe755d7 100644 --- a/byterun/fail.h +++ b/byterun/fail.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/fix_code.c b/byterun/fix_code.c index a047e29a4..3269aa473 100644 --- a/byterun/fix_code.c +++ b/byterun/fix_code.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/fix_code.h b/byterun/fix_code.h index 18df9ed17..7a66dc62c 100644 --- a/byterun/fix_code.h +++ b/byterun/fix_code.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/floats.c b/byterun/floats.c index fa8b3466b..ea1999377 100644 --- a/byterun/floats.c +++ b/byterun/floats.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/freelist.c b/byterun/freelist.c index 1bb4ad4ad..7a876680e 100644 --- a/byterun/freelist.c +++ b/byterun/freelist.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/freelist.h b/byterun/freelist.h index 370391fb6..d40a082dd 100644 --- a/byterun/freelist.h +++ b/byterun/freelist.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/gc.h b/byterun/gc.h index 89d5c7d10..a54f06589 100644 --- a/byterun/gc.h +++ b/byterun/gc.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/gc_ctrl.c b/byterun/gc_ctrl.c index 9be12687e..419a1f4a1 100644 --- a/byterun/gc_ctrl.c +++ b/byterun/gc_ctrl.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/gc_ctrl.h b/byterun/gc_ctrl.h index c74b458a9..1b877c771 100644 --- a/byterun/gc_ctrl.h +++ b/byterun/gc_ctrl.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/hash.c b/byterun/hash.c index 1f8cb5bfc..f240c16a1 100644 --- a/byterun/hash.c +++ b/byterun/hash.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/instrtrace.c b/byterun/instrtrace.c index 5592bd047..1acad5349 100644 --- a/byterun/instrtrace.c +++ b/byterun/instrtrace.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/instrtrace.h b/byterun/instrtrace.h index bc87693ff..84e2317a6 100644 --- a/byterun/instrtrace.h +++ b/byterun/instrtrace.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/instruct.h b/byterun/instruct.h index 98a36f1c9..68695f9f3 100644 --- a/byterun/instruct.h +++ b/byterun/instruct.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/intern.c b/byterun/intern.c index 6b56eefb8..ee8faeb4b 100644 --- a/byterun/intern.c +++ b/byterun/intern.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/interp.c b/byterun/interp.c index ba4cde90f..1f830e7f3 100644 --- a/byterun/interp.c +++ b/byterun/interp.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/interp.h b/byterun/interp.h index ded26d6e7..98da1b0b4 100644 --- a/byterun/interp.h +++ b/byterun/interp.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/intext.h b/byterun/intext.h index e127cf398..9768b6db4 100644 --- a/byterun/intext.h +++ b/byterun/intext.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/ints.c b/byterun/ints.c index caf37c0be..740d1db7c 100644 --- a/byterun/ints.c +++ b/byterun/ints.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/io.c b/byterun/io.c index f9aa267a0..895a733af 100644 --- a/byterun/io.c +++ b/byterun/io.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/io.h b/byterun/io.h index 26a2ca4d5..a5bfbecc3 100644 --- a/byterun/io.h +++ b/byterun/io.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/lexing.c b/byterun/lexing.c index fa275eb99..8a3219f6c 100644 --- a/byterun/lexing.c +++ b/byterun/lexing.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/main.c b/byterun/main.c index 2c02e1391..af20ad245 100644 --- a/byterun/main.c +++ b/byterun/main.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/major_gc.c b/byterun/major_gc.c index 821ecef6a..58376071b 100644 --- a/byterun/major_gc.c +++ b/byterun/major_gc.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/major_gc.h b/byterun/major_gc.h index 478bb2676..e8c1faff7 100644 --- a/byterun/major_gc.h +++ b/byterun/major_gc.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/md5.c b/byterun/md5.c index a174ab76d..ed6abcdfb 100644 --- a/byterun/md5.c +++ b/byterun/md5.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/memory.c b/byterun/memory.c index 173ee9004..c2251a415 100644 --- a/byterun/memory.c +++ b/byterun/memory.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/memory.h b/byterun/memory.h index ea514e68a..9c06d1080 100644 --- a/byterun/memory.h +++ b/byterun/memory.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/meta.c b/byterun/meta.c index 01d377dfd..4b1c76644 100644 --- a/byterun/meta.c +++ b/byterun/meta.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/minor_gc.c b/byterun/minor_gc.c index 647ac4396..7b85f9a30 100644 --- a/byterun/minor_gc.c +++ b/byterun/minor_gc.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/minor_gc.h b/byterun/minor_gc.h index d6348f297..fa0558a3d 100644 --- a/byterun/minor_gc.h +++ b/byterun/minor_gc.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Damien Doligez, projet Para, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/misc.c b/byterun/misc.c index a2d0c9545..da667ee37 100644 --- a/byterun/misc.c +++ b/byterun/misc.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/misc.h b/byterun/misc.h index 173b799e6..a8960081e 100644 --- a/byterun/misc.h +++ b/byterun/misc.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/mlvalues.h b/byterun/mlvalues.h index 02684b20f..c6b049677 100644 --- a/byterun/mlvalues.h +++ b/byterun/mlvalues.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/obj.c b/byterun/obj.c index 29b951ea3..b3d356593 100644 --- a/byterun/obj.c +++ b/byterun/obj.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/parsing.c b/byterun/parsing.c index ea470c2ca..1c3de01c5 100644 --- a/byterun/parsing.c +++ b/byterun/parsing.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/prims.h b/byterun/prims.h index 93e8cdb33..10f53c022 100644 --- a/byterun/prims.h +++ b/byterun/prims.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/reverse.h b/byterun/reverse.h index 85e637070..1b404f561 100644 --- a/byterun/reverse.h +++ b/byterun/reverse.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/roots.c b/byterun/roots.c index af1fe12cc..a9dfd2065 100644 --- a/byterun/roots.c +++ b/byterun/roots.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/roots.h b/byterun/roots.h index 923c485de..97ef61b82 100644 --- a/byterun/roots.h +++ b/byterun/roots.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/signals.c b/byterun/signals.c index 9858107dd..8db4c4628 100644 --- a/byterun/signals.c +++ b/byterun/signals.c @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/signals.h b/byterun/signals.h index 5689546c0..d9897d4ec 100644 --- a/byterun/signals.h +++ b/byterun/signals.h @@ -1,10 +1,10 @@ /***********************************************************************/ /* */ -/* Caml Special Light */ +/* Objective Caml */ /* */ /* Xavier Leroy and Damien Doligez, 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. */ /* */ /***********************************************************************/ diff --git a/byterun/stacks.c b/byterun/stacks.c index 746ec4c80..40aba8cdd 100644 --- a/byterun/stacks.c +++ b/byterun/stacks.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/stacks.h b/byterun/stacks.h index 8254d4a45..637fc16d6 100644 --- a/byterun/stacks.h +++ b/byterun/stacks.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/str.c b/byterun/str.c index b1ed65d8f..59d314043 100644 --- a/byterun/str.c +++ b/byterun/str.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/str.h b/byterun/str.h index edb3d47da..7c0da581e 100644 --- a/byterun/str.h +++ b/byterun/str.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/sys.c b/byterun/sys.c index 7d8dc41b1..a5a83542d 100644 --- a/byterun/sys.c +++ b/byterun/sys.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/sys.h b/byterun/sys.h index eae01d217..f6dcb0f3c 100644 --- a/byterun/sys.h +++ b/byterun/sys.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/byterun/terminfo.c b/byterun/terminfo.c index 30385cc66..c573c0306 100644 --- a/byterun/terminfo.c +++ b/byterun/terminfo.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/align.c b/config/auto-aux/align.c index 035f76bfb..507176b65 100644 --- a/config/auto-aux/align.c +++ b/config/auto-aux/align.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/async_io.c b/config/auto-aux/async_io.c index ca2b2ca0a..e38a74212 100644 --- a/config/auto-aux/async_io.c +++ b/config/auto-aux/async_io.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/bytecopy.c b/config/auto-aux/bytecopy.c index fe43dbd8a..b8cb38cfe 100644 --- a/config/auto-aux/bytecopy.c +++ b/config/auto-aux/bytecopy.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/dblalign.c b/config/auto-aux/dblalign.c index dec0caa96..918cd5497 100644 --- a/config/auto-aux/dblalign.c +++ b/config/auto-aux/dblalign.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/endian.c b/config/auto-aux/endian.c index 187fecab0..0f3306d0e 100644 --- a/config/auto-aux/endian.c +++ b/config/auto-aux/endian.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/getgroups.c b/config/auto-aux/getgroups.c index 3b26df7a4..b69a10c00 100644 --- a/config/auto-aux/getgroups.c +++ b/config/auto-aux/getgroups.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/schar.c b/config/auto-aux/schar.c index 7f0034ce6..b68c69a47 100644 --- a/config/auto-aux/schar.c +++ b/config/auto-aux/schar.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/schar2.c b/config/auto-aux/schar2.c index b7d841070..062aef252 100644 --- a/config/auto-aux/schar2.c +++ b/config/auto-aux/schar2.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/sighandler.c b/config/auto-aux/sighandler.c index e47669dc1..489a2a2df 100644 --- a/config/auto-aux/sighandler.c +++ b/config/auto-aux/sighandler.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/signals.c b/config/auto-aux/signals.c index 2827c3021..144a4feb4 100644 --- a/config/auto-aux/signals.c +++ b/config/auto-aux/signals.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/auto-aux/sizes.c b/config/auto-aux/sizes.c index fd0a50999..0fccd8029 100644 --- a/config/auto-aux/sizes.c +++ b/config/auto-aux/sizes.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/m-nt.h b/config/m-nt.h index 3bf7c7739..b3d88107f 100644 --- a/config/m-nt.h +++ b/config/m-nt.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/m-templ.h b/config/m-templ.h index a122b1ed1..98afad177 100644 --- a/config/m-templ.h +++ b/config/m-templ.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/s-nt.h b/config/s-nt.h index 90dcc158b..76f1a9463 100644 --- a/config/s-nt.h +++ b/config/s-nt.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/config/s-templ.h b/config/s-templ.h index bfb6d2a5d..f1f5b651d 100644 --- a/config/s-templ.h +++ b/config/s-templ.h @@ -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. */ /* */ /***********************************************************************/ @@ -2,7 +2,7 @@ #*********************************************************************# # # -# Caml Special Light # +# Objective Caml # # # # Xavier Leroy, projet Cristal, INRIA Rocquencourt # # # @@ -14,7 +14,7 @@ # $Id$ bindir=/usr/local/bin -libdir=/usr/local/lib/camlsl +libdir=/usr/local/lib/ocaml mandir=/usr/local/man/man1 manext=1 host_type=unknown @@ -98,17 +98,17 @@ case "$1,$2,$3" in 4,8,8) echo "Wow! A 64 bit architecture!" echo "#define SIXTYFOUR" >> m.h;; 8,*,*) echo "Wow! A 64 bit architecture!" - echo "Unfortunately, Caml Special Light does not handle the case" + echo "Unfortunately, Objective Caml does not handle the case" echo "sizeof(int) = 8." - echo "Caml Special Light won't run on this architecture." + echo "Objective Caml won't run on this architecture." exit 2;; *,4,8) echo "Wow! A 64 bit architecture!" - echo "Unfortunately, Caml Special Light cannot work in the case" + echo "Unfortunately, Objective Caml cannot work in the case" echo "sizeof(long) != sizeof(long *)." - echo "Caml Special Light won't run on this architecture." + echo "Objective Caml won't run on this architecture." exit 2;; ?,?,?) echo "This architecture seems to be neither 32 bits nor 64 bits." - echo "Caml Special Light won't run on this architecture." + echo "Objective Caml won't run on this architecture." exit 2;; *) echo "Unable to compile the test program." echo "Make sure the C compiler $cc is properly installed." @@ -124,7 +124,7 @@ case $? in 1) echo "This is a little-endian architecture." echo "#undef BIG_ENDIAN" >> m.h;; 2) echo "This architecture seems to be neither big endian nor little endian." - echo "Caml Special Light won't run on this architecture." + echo "Objective Caml won't run on this architecture." exit 2;; *) echo "Something went wrong during endianness determination." echo "You'll have to figure out endianness yourself" @@ -141,7 +141,7 @@ case $? in echo "#define ALIGN_DOUBLE" >> m.h;; *) echo "Something went wrong during alignment determination for doubles." echo "I'm going to assume this architecture has alignment constraints over doubles." - echo "That's a safe bet: Caml Special Light will work even if" + echo "That's a safe bet: Objective Caml will work even if" echo "this architecture has actually no alignment constraints." echo "#define ALIGN_DOUBLE" >> m.h;; esac @@ -558,7 +558,7 @@ mv m.h s.h Makefile .. echo echo "** Configuration summary **" echo -echo "Directories where Caml Special Light will be installed:" +echo "Directories where Objective Caml will be installed:" echo " binaries.................. $bindir" echo " standard library.......... $libdir" echo " manual pages.............. $mandir (with extension .$manext)" diff --git a/driver/compile.ml b/driver/compile.ml index bf896c3fb..4408cac1e 100644 --- a/driver/compile.ml +++ b/driver/compile.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. *) (* *) (***********************************************************************) diff --git a/driver/compile.mli b/driver/compile.mli index 5dc85f270..c6857c56a 100644 --- a/driver/compile.mli +++ b/driver/compile.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. *) (* *) (***********************************************************************) diff --git a/driver/errors.ml b/driver/errors.ml index add586a15..d0a7aa479 100644 --- a/driver/errors.ml +++ b/driver/errors.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. *) (* *) (***********************************************************************) diff --git a/driver/errors.mli b/driver/errors.mli index 3c5747413..05ff15c45 100644 --- a/driver/errors.mli +++ b/driver/errors.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. *) (* *) (***********************************************************************) diff --git a/driver/main.ml b/driver/main.ml index 83afaa4d6..25e952af0 100644 --- a/driver/main.ml +++ b/driver/main.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. *) (* *) (***********************************************************************) @@ -37,7 +37,7 @@ let process_file name = raise(Arg.Bad("don't know what to do with " ^ name)) let print_version_number () = - print_string "The Caml Special Light compiler, version "; + print_string "The Objective Caml compiler, version "; print_string Config.version; print_newline() diff --git a/driver/optcompile.ml b/driver/optcompile.ml index 3a40ca31e..8b75cbb5e 100644 --- a/driver/optcompile.ml +++ b/driver/optcompile.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. *) (* *) (***********************************************************************) diff --git a/driver/optcompile.mli b/driver/optcompile.mli index 5dc85f270..c6857c56a 100644 --- a/driver/optcompile.mli +++ b/driver/optcompile.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. *) (* *) (***********************************************************************) diff --git a/driver/opterrors.ml b/driver/opterrors.ml index bfddf14e2..45d0780fb 100644 --- a/driver/opterrors.ml +++ b/driver/opterrors.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. *) (* *) (***********************************************************************) diff --git a/driver/opterrors.mli b/driver/opterrors.mli index 3c5747413..05ff15c45 100644 --- a/driver/opterrors.mli +++ b/driver/opterrors.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. *) (* *) (***********************************************************************) diff --git a/driver/optmain.ml b/driver/optmain.ml index 415b7a9e0..41405c200 100644 --- a/driver/optmain.ml +++ b/driver/optmain.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. *) (* *) (***********************************************************************) @@ -37,7 +37,7 @@ let process_file name = raise(Arg.Bad("don't know what to do with " ^ name)) let print_version_number () = - print_string "The Caml Special Light native-code compiler, version "; + print_string "The Objective Caml native-code compiler, version "; print_string Config.version; print_newline() diff --git a/lex/.cvsignore b/lex/.cvsignore index c54ee1f32..407c794d8 100644 --- a/lex/.cvsignore +++ b/lex/.cvsignore @@ -1,4 +1,4 @@ parser.ml parser.mli lexer.ml -csllex +ocamllex diff --git a/lex/Makefile b/lex/Makefile index 599492970..9e64bf71e 100644 --- a/lex/Makefile +++ b/lex/Makefile @@ -1,23 +1,23 @@ # The lexer generator -CAMLC=../boot/cslrun ../boot/cslc -I ../boot +CAMLC=../boot/ocamlrun ../boot/ocamlc -I ../boot COMPFLAGS= 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= OBJS=parser.cmo lexer.cmo lexgen.cmo compact.cmo output.cmo main.cmo -all: csllex +all: ocamllex -csllex: $(OBJS) - $(CAMLC) $(LINKFLAGS) -o csllex $(OBJS) +ocamllex: $(OBJS) + $(CAMLC) $(LINKFLAGS) -o ocamllex $(OBJS) clean:: - rm -f csllex + rm -f ocamllex rm -f *.cmo *.cmi parser.ml parser.mli: parser.mly diff --git a/lex/Makefile.nt b/lex/Makefile.nt index bde5b466e..35a1f80a8 100644 --- a/lex/Makefile.nt +++ b/lex/Makefile.nt @@ -1,23 +1,23 @@ # The lexer generator -CAMLC=..\boot\cslrun ..\boot\cslc -I ..\boot +CAMLC=..\boot\ocamlrun ..\boot\ocamlc -I ..\boot COMPFLAGS= 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= OBJS=parser.cmo lexer.cmo lexgen.cmo compact.cmo output.cmo main.cmo -all: csllex +all: ocamllex -csllex: $(OBJS) - $(CAMLC) $(LINKFLAGS) -o csllex $(OBJS) +ocamllex: $(OBJS) + $(CAMLC) $(LINKFLAGS) -o ocamllex $(OBJS) clean:: - rm -f csllex + rm -f ocamllex rm -f *.cmo *.cmi parser.ml parser.mli: parser.mly diff --git a/lex/compact.ml b/lex/compact.ml index 34845eb81..aafa76738 100644 --- a/lex/compact.ml +++ b/lex/compact.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. *) (* *) (***********************************************************************) diff --git a/lex/compact.mli b/lex/compact.mli index 00ede4168..68db267fd 100644 --- a/lex/compact.mli +++ b/lex/compact.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. *) (* *) (***********************************************************************) diff --git a/lex/lexer.mli b/lex/lexer.mli index d82ce8348..eda622fa9 100644 --- a/lex/lexer.mli +++ b/lex/lexer.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. *) (* *) (***********************************************************************) diff --git a/lex/lexer.mll b/lex/lexer.mll index 3a7e06ffc..11779cc75 100644 --- a/lex/lexer.mll +++ b/lex/lexer.mll @@ -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. *) (* *) (***********************************************************************) diff --git a/lex/lexgen.ml b/lex/lexgen.ml index 1289a0baa..80ada9789 100644 --- a/lex/lexgen.ml +++ b/lex/lexgen.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. *) (* *) (***********************************************************************) diff --git a/lex/lexgen.mli b/lex/lexgen.mli index 42b47c60a..74a4e79ef 100644 --- a/lex/lexgen.mli +++ b/lex/lexgen.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. *) (* *) (***********************************************************************) diff --git a/lex/main.ml b/lex/main.ml index 7a46a788c..066a91994 100644 --- a/lex/main.ml +++ b/lex/main.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. *) (* *) (***********************************************************************) diff --git a/lex/output.ml b/lex/output.ml index 29dd9483c..3803cd5ba 100644 --- a/lex/output.ml +++ b/lex/output.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. *) (* *) (***********************************************************************) diff --git a/lex/output.mli b/lex/output.mli index 3cbca47e9..a60c97a24 100644 --- a/lex/output.mli +++ b/lex/output.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. *) (* *) (***********************************************************************) diff --git a/lex/parser.mly b/lex/parser.mly index 9d34894b0..b28550af2 100644 --- a/lex/parser.mly +++ b/lex/parser.mly @@ -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. */ /* */ /***********************************************************************/ diff --git a/lex/syntax.mli b/lex/syntax.mli index 87267ad95..48f971709 100644 --- a/lex/syntax.mli +++ b/lex/syntax.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. *) (* *) (***********************************************************************) diff --git a/man/cslc.m b/man/ocamlc.m index f6996233c..7dd057354 100644 --- a/man/cslc.m +++ b/man/ocamlc.m @@ -1,11 +1,11 @@ .TH CSLC 1 .SH NAME -cslc \- The Caml Special Light bytecode compiler +ocamlc \- The Objective Caml bytecode compiler .SH SYNOPSIS -.B cslc +.B ocamlc [ .B \-aciv ] @@ -31,15 +31,15 @@ cslc \- The Caml Special Light bytecode compiler .SH DESCRIPTION -The Caml Special Light bytecode compiler -.BR cslc (1) +The Objective Caml bytecode compiler +.BR ocamlc (1) compiles Caml source files to bytecode object files and link these object files to produce standalone bytecode executable files. These executable files are then run by the bytecode interpreter -.BR cslrun (1). +.BR ocamlrun (1). The -.BR cslc (1) +.BR ocamlc (1) command has a command-line interface similar to the one of most C compilers. It accepts several types of arguments: @@ -50,7 +50,7 @@ public data types, declare abstract data types, and so on. From the file .IR x \&.mli, the -.BR cslc (1) +.BR ocamlc (1) compiler produces a compiled interface in the file .IR x \&.cmi. @@ -61,7 +61,7 @@ names exported by the unit, and also contain expressions to be evaluated for their side-effects. From the file .IR x \&.ml, the -.BR cslc (1) +.BR ocamlc (1) compiler produces compiled object bytecode in the file .IR x \&.cmo. @@ -101,7 +101,7 @@ file must come before all .cmo files that refer to the unit Arguments ending in .cma are taken to be libraries of object bytecode. A library of object bytecode packs in a single file a set of object bytecode files (.cmo files). Libraries are built with -.B cslc \-a +.B ocamlc \-a (see the description of the .B \-a option below). The object files @@ -125,7 +125,7 @@ below). .SH OPTIONS The following command-line options are recognized by -.BR cslc (1). +.BR ocamlc (1). .TP .B \-a @@ -169,12 +169,12 @@ directory Link in ``custom runtime'' mode. In the default linking mode, the linker produces bytecode that is intended to be executed with the shared runtime system, -.BR cslrun (1). +.BR ocamlrun (1). In the custom runtime mode, the linker produces an output file that contains both the runtime system and the bytecode for the program. The resulting file is larger, but it can be executed directly, even if the -.BR cslrun (1) +.BR ocamlrun (1) command is not installed. Moreover, the ``custom runtime'' mode enables linking Caml code with user-defined C functions. @@ -226,8 +226,8 @@ slightly faster, but unsafe: anything can happen if the program accesses an array or string outside of its bounds. .SH SEE ALSO -.BR csltop (1), -.BR cslrun (1). +.BR ocaml (1), +.BR ocamlrun (1). .br -.I The Caml Special Light user's manual, +.I The Objective Caml user's manual, chapter "Batch compilation". diff --git a/man/cslcp.m b/man/ocamlcp.m index 7e788283e..ddaee1231 100644 --- a/man/cslcp.m +++ b/man/ocamlcp.m @@ -1,12 +1,12 @@ .TH CSLCP 1 .SH NAME -cslcp \- The Caml Special Light profiling compiler +ocamlcp \- The Objective Caml profiling compiler .SH SYNOPSIS -.B cslcp +.B ocamlcp [ -.I cslc options +.I ocamlc options ] [ .BI \-p \ flags @@ -15,25 +15,25 @@ cslcp \- The Caml Special Light profiling compiler .SH DESCRIPTION The -.B cslcp +.B ocamlcp script is a front-end to -.BR cslc (1) +.BR ocamlc (1) that instruments the source code, adding code to record how many times functions are called, branches of conditionals are taken, ... Execution of instrumented code produces an execution profile in the -file cslprof.dump, which can be read using -.BR cslprof (1). +file ocamlprof.dump, which can be read using +.BR ocamlprof (1). -.B cslcp +.B ocamlcp accepts the same arguments and options as -.BR cslc (1). +.BR ocamlc (1). .SH OPTIONS In addition to the -.BR cslc (1) +.BR ocamlc (1) options, -.B cslcp +.B ocamlcp accepts the following option controlling the amount of profiling information: @@ -67,12 +67,12 @@ try...with branches: a count point is set at the beginning of the body of each branch For instance, compiling with -.B cslcp \-pfilm +.B ocamlcp \-pfilm profiles function calls, if... then... else..., loops, and pattern matching. Calling -.BR cslcp (1) +.BR ocamlcp (1) without the .B \-p option defaults to @@ -81,8 +81,8 @@ meaning that only function calls and pattern matching are profiled. .SH SEE ALSO -.BR cslc (1), -.BR cslprof (1). +.BR ocamlc (1), +.BR ocamlprof (1). .br -.I The Caml Special Light user's manual, +.I The Objective Caml user's manual, chapter "Profiling". diff --git a/man/csldep.m b/man/ocamldep.m index 795a6d67f..53cd7ffac 100644 --- a/man/csldep.m +++ b/man/ocamldep.m @@ -1,10 +1,10 @@ .TH CSLDEP 1 .SH NAME -csldep \- Dependency generator for Caml Special Light +ocamldep \- Dependency generator for Objective Caml .SH SYNOPSIS -.B csldep +.B ocamldep [ .BI \-I \ lib-dir ] @@ -13,8 +13,8 @@ csldep \- Dependency generator for Caml Special Light .SH DESCRIPTION The -.BR csldep (1) -command scans a set of Caml Special Light source files +.BR ocamldep (1) +command scans a set of Objective Caml source files (.ml and .mli files) for references to external compilation units, and outputs dependency lines in a format suitable for the .BR make (1) @@ -24,7 +24,7 @@ file is modified. The typical usage is: .P -csldep +ocamldep .I options *.mli *.ml > .depend .P @@ -33,14 +33,14 @@ dependencies. Dependencies are generated both for compiling with the bytecode compiler -.BR cslc (1) +.BR ocamlc (1) and with the native-code compiler -.BR cslopt (1). +.BR ocamlopt (1). .SH OPTIONS The following command-line option is recognized by -.BR csldep (1). +.BR ocamldep (1). .TP .BI \-I \ directory @@ -53,12 +53,12 @@ current directory or in one of the directories specified with Otherwise, Bar is assumed to be a module form the standard library, and no dependencies are generated. For programs that span multiple directories, it is recommended to pass -.BR csldep (1) +.BR ocamldep (1) the same -I options that are passed to the compiler. .SH SEE ALSO -.BR cslc (1), -.BR cslopt (1). +.BR ocamlc (1), +.BR ocamlopt (1). .br -.I The Caml Special Light user's manual, +.I The Objective Caml user's manual, chapter "Dependency generator". diff --git a/man/csllex.m b/man/ocamllex.m index b1a76e59c..d6c2333fd 100644 --- a/man/csllex.m +++ b/man/ocamllex.m @@ -1,22 +1,22 @@ .TH CSLLEX 1 .SH NAME -csllex \- The Caml Special Light lexer generator +ocamllex \- The Objective Caml lexer generator .SH SYNOPSIS -.B csllex +.B ocamllex .I filename.mll .SH DESCRIPTION The -.BR csllex (1) -command generates Caml Special Light lexers from a set of regular +.BR ocamllex (1) +command generates Objective Caml lexers from a set of regular expressions with associated semantic actions, in the style of .BR lex (1). Running -.BR csllex (1) +.BR ocamllex (1) on the input file .IR lexer \&.mll produces Caml code for a lexical analyzer in file @@ -34,12 +34,12 @@ lexer buffers that read from an input channel, a character string, or any reading function, respectively. When used in conjunction with a parser generated by -.BR cslyacc (1), +.BR ocamlyacc (1), the semantic actions compute a value belonging to the type token defined by the generated parsing module. .SH SEE ALSO -.BR cslyacc (1). +.BR ocamlyacc (1). .br -.I The Caml Special Light user's manual, +.I The Objective Caml user's manual, chapter "Lexer and parser generators". diff --git a/man/cslopt.m b/man/ocamlopt.m index 3251d663e..4a474433f 100644 --- a/man/cslopt.m +++ b/man/ocamlopt.m @@ -1,11 +1,11 @@ .TH CSLOPT 1 .SH NAME -cslopt \- The Caml Special Light native-code compiler +ocamlopt \- The Objective Caml native-code compiler .SH SYNOPSIS -.B cslopt +.B ocamlopt [ .B \-acivS ] @@ -30,17 +30,17 @@ cslopt \- The Caml Special Light native-code compiler .I filename ... .SH DESCRIPTION -The Caml Special Light high-performance +The Objective Caml high-performance native-code compiler -.BR cslopt (1) +.BR ocamlopt (1) compiles Caml source files to native code object files and link these object files to produce standalone executables. The -.BR cslopt (1) +.BR ocamlopt (1) command has a command-line interface very close to that of -.BR cslc (1). +.BR ocamlc (1). It accepts the same types of arguments: Arguments ending in .mli are taken to be source files for @@ -50,13 +50,13 @@ public data types, declare abstract data types, and so on. From the file .IR x \&.mli, the -.BR cslopt (1) +.BR ocamlopt (1) compiler produces a compiled interface in the file .IR x \&.cmi. The interface produced is identical to that produced by the bytecode compiler -.BR cslc (1). +.BR ocamlc (1). Arguments ending in .ml are taken to be source files for compilation unit implementations. Implementations provide definitions for the @@ -64,7 +64,7 @@ names exported by the unit, and also contain expressions to be evaluated for their side-effects. From the file .IR x \&.ml, the -.BR cslc (1) +.BR ocamlc (1) compiler produces two files: .IR x \&.o, containing native object code, and @@ -74,13 +74,13 @@ optimization of the clients of the unit. The compiled implementation should always be referred to under the name .IR x \&.cmx (when given a .o file, -.BR cslopt (1) +.BR ocamlopt (1) assumes that it contains code compiled from C, not from Caml). The implementation is checked against the interface file .IR x \&.mli (if it exists) as described in the manual for -.BR cslc (1). +.BR ocamlc (1). Arguments ending in .cmx are taken to be compiled object code. These files are linked together, along with the object files obtained @@ -101,7 +101,7 @@ Such a library packs in two files and .IR lib \&.a a set of object files (.cmx/.o files). Libraries are build with -.B cslopt \-a +.B ocamlopt \-a (see the description of the .B \-a option below). The object @@ -118,13 +118,13 @@ libraries. They are linked with the program. The output of the linking phase is a regular Unix executable file. It does not need -.BR cslrun (1) +.BR ocamlrun (1) to run. .SH OPTIONS The following command-line options are recognized by -.BR cslopt (1). +.BR ocamlopt (1). .TP .B \-a @@ -209,7 +209,7 @@ faster, but unsafe: anything can happen if the program accesses an array or string outside of its bounds. .SH SEE ALSO -.BR cslc (1). +.BR ocamlc (1). .br -.I The Caml Special Light user's manual, +.I The Objective Caml user's manual, chapter "Native-code compilation". diff --git a/man/cslprof.m b/man/ocamlprof.m index f9522d815..2f7177996 100644 --- a/man/cslprof.m +++ b/man/ocamlprof.m @@ -1,10 +1,10 @@ .TH CSLPROF 1 .SH NAME -cslprof \- The Caml Special Light profiler +ocamlprof \- The Objective Caml profiler .SH SYNOPSIS -.B cslprof +.B ocamlprof [ .BI \-f \ dump-file ] @@ -15,15 +15,15 @@ cslprof \- The Caml Special Light profiler .SH DESCRIPTION The -.B cslprof +.B ocamlprof command prints execution counts gathered during the execution of a -Caml Special Light program instrumented with -.BR cslcp (1). +Objective Caml program instrumented with +.BR ocamlcp (1). It produces a source listing of the program modules given as arguments where execution counts have been inserted as comments. For instance, .P -cslprof foo.ml +ocamlprof foo.ml .P prints the source code for the foo module, with comments indicating how many times the functions in this module have been called. Naturally, @@ -35,12 +35,12 @@ since the profiling execution took place. .TP .BI \-f \ dumpfile Specifies an alternate dump file of profiling information. -The default is the file cslprof.dump in the current directory. +The default is the file ocamlprof.dump in the current directory. .TP .BI \-F \ string Specifies an additional string to be output with profiling information. By default, -.B cslprof +.B ocamlprof will annotate progams with comments of the form .BI (* \ n \ *) where @@ -51,7 +51,7 @@ the annotation will be .BI (* \ s\ n \ *) .SH SEE ALSO -.BR cslcp (1). +.BR ocamlcp (1). .br -.I The Caml Special Light user's manual, +.I The Objective Caml user's manual, chapter "Profiling". diff --git a/man/cslrun.m b/man/ocamlrun.m index 78af3614c..26d502112 100644 --- a/man/cslrun.m +++ b/man/ocamlrun.m @@ -1,10 +1,10 @@ .TH CSLRUN 1 .SH NAME -cslrun \- The Caml Special Light bytecode interpreter +ocamlrun \- The Objective Caml bytecode interpreter .SH SYNOPSIS -.B cslrun +.B ocamlrun [ .B \-v ] @@ -12,10 +12,10 @@ cslrun \- The Caml Special Light bytecode interpreter .SH DESCRIPTION The -.BR cslrun (1) +.BR ocamlrun (1) command executes bytecode files produced by the linking phase of the -.BR cslc (1) +.BR ocamlc (1) command. The first non-option argument is taken to be the name of the file @@ -29,16 +29,16 @@ are the remaining arguments. In most cases, the bytecode executable files produced by the -.BR cslc (1) +.BR ocamlc (1) command are self-executable, and manage to launch the -.BR cslrun (1) +.BR ocamlrun (1) command on themselves automatically. .SH OPTIONS The following command-line option is recognized by -.BR cslrun (1). +.BR ocamlrun (1). .TP .B \-v @@ -74,7 +74,7 @@ false; 1 is true; other values may give unexpected results. List of directories searched to find the bytecode executable file. .SH SEE ALSO -.BR cslc (1). +.BR ocamlc (1). .br -.I The Caml Special Light user's manual, +.I The Objective Caml user's manual, chapter "Runtime system". diff --git a/man/csltop.m b/man/ocamltop.m index d423c3af1..8d7d3cd57 100644 --- a/man/csltop.m +++ b/man/ocamltop.m @@ -1,11 +1,11 @@ .TH CSLTOP 1 .SH NAME -csltop \- The Caml Special Light interactive toplevel +ocaml \- The Objective Caml interactive toplevel .SH SYNOPSIS -.B csltop +.B ocaml [ .B \-unsafe ] @@ -16,9 +16,9 @@ csltop \- The Caml Special Light interactive toplevel .SH DESCRIPTION The -.BR csltop (1) -command is the toplevel system for Caml Special Light, -that permits interactive use of the Caml Special Light system through a +.BR ocaml (1) +command is the toplevel system for Objective Caml, +that permits interactive use of the Objective Caml system through a read-eval-print loop. In this mode, the system repeatedly reads Caml phrases from the input, then typechecks, compile and evaluate them, then prints the inferred type and result value, if any. The @@ -28,16 +28,16 @@ A toplevel phrase can span several lines. It is terminated by ;; (a double-semicolon). The syntax of toplevel phrases is as follows. The toplevel system is started by the command -.BR csltop (1). +.BR ocaml (1). Phrases are read on standard input, results are printed on standard output, errors on standard error. End-of-file on standard input terminates -.BR csltop (1). +.BR ocaml (1). .SH OPTIONS The following command-line options are recognized by -.BR csltop (1). +.BR ocaml (1). .TP .BI \-I \ directory @@ -74,8 +74,8 @@ consults the TERM variable to determines the type of output terminal and look up its capabilities in the terminal database. .SH SEE ALSO -.BR cslc (1). +.BR ocamlc (1). .br -.I The Caml Special Light user's manual, +.I The Objective Caml user's manual, chapter "The toplevel system". diff --git a/man/cslyacc.m b/man/ocamlyacc.m index d6f7af8cc..8f7933b56 100644 --- a/man/cslyacc.m +++ b/man/ocamlyacc.m @@ -1,10 +1,10 @@ .TH CSLYACC 1 .SH NAME -cslyacc \- The Caml Special Light parser generator +ocamlyacc \- The Objective Caml parser generator .SH SYNOPSIS -.B cslyacc +.B ocamlyacc [ .B -v ] @@ -16,14 +16,14 @@ cslyacc \- The Caml Special Light parser generator .SH DESCRIPTION The -.BR cslyacc (1) +.BR ocamlyacc (1) command produces a parser from a LALR(1) context-free grammar specification with attached semantic actions, in the style of .BR yacc (1). Assuming the input file is .IR grammar \&.mly, running -.B cslyacc +.B ocamlyacc produces Caml code for a parser in the file .IR grammar \&.ml, and its interface in file @@ -35,18 +35,18 @@ Parsing functions take as arguments a lexical analyzer (a function from lexer buffers to tokens) and a lexer buffer, and return the semantic attribute of the corresponding entry point. Lexical analyzer functions are usually generated from a lexer specification by the -.BR csllex (1) +.BR ocamllex (1) program. Lexer buffers are an abstract data type implemented in the standard library module Lexing. Tokens are values from the concrete type token, defined in the interface file .IR grammar \&.mli produced by -.BR cslyacc (1). +.BR ocamlyacc (1). .SH OPTIONS The -.BR cslyacc (1) +.BR ocamlyacc (1) command recognizes the following options: .TP @@ -65,7 +65,7 @@ Name the output files instead of the default naming convention. .SH SEE ALSO -.BR csllex (1). +.BR ocamllex (1). .br -.I The Caml Special Light user's manual, +.I The Objective Caml user's manual, chapter "Lexer and parser generators". diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile index 93497854f..3acab542f 100644 --- a/otherlibs/dynlink/Makefile +++ b/otherlibs/dynlink/Makefile @@ -2,7 +2,7 @@ include ../../config/Makefile -CAMLC=../../boot/cslrun ../../boot/cslc +CAMLC=../../boot/ocamlrun ../../boot/ocamlc INCLUDES=-I ../../utils -I ../../typing -I ../../bytecomp COMPFLAGS=-I ../../boot $(INCLUDES) @@ -39,6 +39,6 @@ realclean: $(CAMLC) -c $(COMPFLAGS) $< depend: - ../../tools/csldep *.mli *.ml > .depend + ../../tools/ocamldep *.mli *.ml > .depend include .depend diff --git a/otherlibs/dynlink/dynlink.ml b/otherlibs/dynlink/dynlink.ml index 3a843d2c2..c55b3e547 100644 --- a/otherlibs/dynlink/dynlink.ml +++ b/otherlibs/dynlink/dynlink.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/dynlink/dynlink.mli b/otherlibs/dynlink/dynlink.mli index 464b174e0..bb8bc4a18 100644 --- a/otherlibs/dynlink/dynlink.mli +++ b/otherlibs/dynlink/dynlink.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. *) (* *) (***********************************************************************) @@ -44,7 +44,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 - Caml Special Light standard library directory. *) + Objective Caml standard library directory. *) val clear_available_units : unit -> unit (* Clear the list of compilation units accessible to dynamically-linked programs. *) diff --git a/otherlibs/dynlink/extract_crc.ml b/otherlibs/dynlink/extract_crc.ml index 3d6e53736..0c1906212 100644 --- a/otherlibs/dynlink/extract_crc.ml +++ b/otherlibs/dynlink/extract_crc.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/graph/Makefile b/otherlibs/graph/Makefile index 58406c58e..08ebb982a 100644 --- a/otherlibs/graph/Makefile +++ b/otherlibs/graph/Makefile @@ -5,8 +5,8 @@ include ../../config/Makefile CC=$(BYTECC) CFLAGS=-I../../byterun -I$(X11_INCLUDES) -O $(BYTECCCOMPOPTS) -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 OBJS=open.o draw.o fill.o color.o text.o \ image.o make_img.o dump_img.o point_col.o sound.o events.o @@ -51,6 +51,6 @@ installopt: depend: graphics.ml gcc -MM $(CFLAGS) *.c > .depend - ../../tools/csldep *.mli *.ml >> .depend + ../../tools/ocamldep *.mli *.ml >> .depend include .depend diff --git a/otherlibs/graph/color.c b/otherlibs/graph/color.c index cc6cadd26..28d5eb8a2 100644 --- a/otherlibs/graph/color.c +++ b/otherlibs/graph/color.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/draw.c b/otherlibs/graph/draw.c index c0a6c4370..c6cacffa6 100644 --- a/otherlibs/graph/draw.c +++ b/otherlibs/graph/draw.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/dump_img.c b/otherlibs/graph/dump_img.c index f3b09fe26..7f0ba680e 100644 --- a/otherlibs/graph/dump_img.c +++ b/otherlibs/graph/dump_img.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/events.c b/otherlibs/graph/events.c index ed4d9fbab..b531f95dd 100644 --- a/otherlibs/graph/events.c +++ b/otherlibs/graph/events.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/fill.c b/otherlibs/graph/fill.c index 46cb5721b..edf75925e 100644 --- a/otherlibs/graph/fill.c +++ b/otherlibs/graph/fill.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/graphics.mli b/otherlibs/graph/graphics.mli index c01fe6280..55fc1b3b0 100644 --- a/otherlibs/graph/graphics.mli +++ b/otherlibs/graph/graphics.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/graph/graphics.mlp b/otherlibs/graph/graphics.mlp index f393b87a4..eafbd1f05 100644 --- a/otherlibs/graph/graphics.mlp +++ b/otherlibs/graph/graphics.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/graph/image.c b/otherlibs/graph/image.c index 0389d672f..007e87951 100644 --- a/otherlibs/graph/image.c +++ b/otherlibs/graph/image.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/image.h b/otherlibs/graph/image.h index afe3a60ca..45bec8fa4 100644 --- a/otherlibs/graph/image.h +++ b/otherlibs/graph/image.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/libgraph.h b/otherlibs/graph/libgraph.h index 29137cc46..6ec1e6720 100644 --- a/otherlibs/graph/libgraph.h +++ b/otherlibs/graph/libgraph.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/make_img.c b/otherlibs/graph/make_img.c index f655f7739..91bcd2694 100644 --- a/otherlibs/graph/make_img.c +++ b/otherlibs/graph/make_img.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/open.c b/otherlibs/graph/open.c index a2b605a8a..5f9eed064 100644 --- a/otherlibs/graph/open.c +++ b/otherlibs/graph/open.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/point_col.c b/otherlibs/graph/point_col.c index c70709c7b..b45414166 100644 --- a/otherlibs/graph/point_col.c +++ b/otherlibs/graph/point_col.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/sound.c b/otherlibs/graph/sound.c index 4d9dbfd23..c05b5c987 100644 --- a/otherlibs/graph/sound.c +++ b/otherlibs/graph/sound.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/graph/text.c b/otherlibs/graph/text.c index a449de964..e9e2df057 100644 --- a/otherlibs/graph/text.c +++ b/otherlibs/graph/text.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/num/Makefile b/otherlibs/num/Makefile index ecf5995a1..02811d40c 100644 --- a/otherlibs/num/Makefile +++ b/otherlibs/num/Makefile @@ -5,8 +5,8 @@ include ../../config/Makefile # Compilation options CC=$(BYTECC) CFLAGS=-O -I./bignum/h -I../../byterun $(BYTECCCOMPOPTS) -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 CAMLOBJS=int_misc.cmo string_misc.cmo nat.cmo big_int.cmo arith_flags.cmo \ ratio.cmo num.cmo arith_status.cmo @@ -33,7 +33,7 @@ libnums.a: bignum/libbignum.a $(COBJS) bignum/libbignum.a: cd bignum; $(MAKE) $(BIGNUM_ARCH) CC="$(CC)" -$(CAMLOBJS:.cmo=.cmx): ../../cslopt +$(CAMLOBJS:.cmo=.cmx): ../../ocamlopt install: cp libnums.a $(LIBDIR)/libnums.a @@ -75,6 +75,6 @@ nat_stubs.o: nat.h depend: nat.ml int_misc.ml gcc -MM $(CFLAGS) *.c > .depend - ../../tools/csldep *.mli *.ml >> .depend + ../../tools/ocamldep *.mli *.ml >> .depend include .depend diff --git a/otherlibs/num/Makefile.nt b/otherlibs/num/Makefile.nt index 3d9a147c5..883d1598f 100644 --- a/otherlibs/num/Makefile.nt +++ b/otherlibs/num/Makefile.nt @@ -5,8 +5,8 @@ # Compilation options CC=$(BYTECC) CFLAGS=-O -I.\bignum\h -I..\..\byterun $(BYTECCCOMPOPTS) -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 CAMLOBJS=int_misc.cmo string_misc.cmo nat.cmo big_int.cmo arith_flags.cmo \ ratio.cmo num.cmo arith_status.cmo @@ -31,7 +31,7 @@ libnums.lib: bignum\libbignum.lib $(COBJS) bignum\libbignum.lib: cd bignum & $(MAKEREC) -$(CAMLOBJS:.cmo=.cmx): ..\..\cslopt +$(CAMLOBJS:.cmo=.cmx): ..\..\ocamlopt install: cp libnums.lib $(LIBDIR)\libnums.lib diff --git a/otherlibs/num/arith_flags.ml b/otherlibs/num/arith_flags.ml index e9d9fb035..6383b0b5d 100644 --- a/otherlibs/num/arith_flags.ml +++ b/otherlibs/num/arith_flags.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/arith_flags.mli b/otherlibs/num/arith_flags.mli index d8098be28..eadb0a584 100644 --- a/otherlibs/num/arith_flags.mli +++ b/otherlibs/num/arith_flags.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/arith_status.ml b/otherlibs/num/arith_status.ml index e98e3f82c..a57a26c8e 100644 --- a/otherlibs/num/arith_status.ml +++ b/otherlibs/num/arith_status.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/arith_status.mli b/otherlibs/num/arith_status.mli index 77bf2e3f9..bc45510d5 100644 --- a/otherlibs/num/arith_status.mli +++ b/otherlibs/num/arith_status.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/big_int.ml b/otherlibs/num/big_int.ml index 81ff44278..d0cb46787 100644 --- a/otherlibs/num/big_int.ml +++ b/otherlibs/num/big_int.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/big_int.mli b/otherlibs/num/big_int.mli index 42c26f1b3..98699c381 100644 --- a/otherlibs/num/big_int.mli +++ b/otherlibs/num/big_int.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/int_misc.mli b/otherlibs/num/int_misc.mli index 32693f1fe..ce7a2797d 100644 --- a/otherlibs/num/int_misc.mli +++ b/otherlibs/num/int_misc.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/int_misc.mlp b/otherlibs/num/int_misc.mlp index a6ff5b425..de525800c 100644 --- a/otherlibs/num/int_misc.mlp +++ b/otherlibs/num/int_misc.mlp @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/nat.mli b/otherlibs/num/nat.mli index 72c971831..40fdf99d1 100644 --- a/otherlibs/num/nat.mli +++ b/otherlibs/num/nat.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/nat.mlp b/otherlibs/num/nat.mlp index 699b7ed33..31a6c8371 100644 --- a/otherlibs/num/nat.mlp +++ b/otherlibs/num/nat.mlp @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/nat_stubs.c b/otherlibs/num/nat_stubs.c index 00940f082..249f11e79 100644 --- a/otherlibs/num/nat_stubs.c +++ b/otherlibs/num/nat_stubs.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/num/num.ml b/otherlibs/num/num.ml index be61ff055..037456063 100644 --- a/otherlibs/num/num.ml +++ b/otherlibs/num/num.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/num.mli b/otherlibs/num/num.mli index 77a82d728..6a6cf014b 100644 --- a/otherlibs/num/num.mli +++ b/otherlibs/num/num.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/ratio.ml b/otherlibs/num/ratio.ml index d3168b239..d97f22073 100644 --- a/otherlibs/num/ratio.ml +++ b/otherlibs/num/ratio.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/ratio.mli b/otherlibs/num/ratio.mli index 524b7b48a..5524268b0 100644 --- a/otherlibs/num/ratio.mli +++ b/otherlibs/num/ratio.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/string_misc.ml b/otherlibs/num/string_misc.ml index ba86407d8..13fb3139b 100644 --- a/otherlibs/num/string_misc.ml +++ b/otherlibs/num/string_misc.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/string_misc.mli b/otherlibs/num/string_misc.mli index cffd4729e..9385ee5f8 100644 --- a/otherlibs/num/string_misc.mli +++ b/otherlibs/num/string_misc.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Valerie Menissier-Morain, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/num/test/Makefile.nt b/otherlibs/num/test/Makefile.nt index 903b23c9c..0c1cb4948 100644 --- a/otherlibs/num/test/Makefile.nt +++ b/otherlibs/num/test/Makefile.nt @@ -1,5 +1,5 @@ -CAMLC=..\..\..\boot\cslrun ..\..\..\cslc -I ..\..\..\stdlib -CAMLOPT=..\..\..\boot\cslrun ..\..\..\cslopt -I ..\..\..\stdlib +CAMLC=..\..\..\boot\ocamlrun ..\..\..\ocamlc -I ..\..\..\stdlib +CAMLOPT=..\..\..\boot\ocamlrun ..\..\..\ocamlopt -I ..\..\..\stdlib test: test.byt test.opt .\test.byt @@ -16,7 +16,7 @@ test.byt: $(TESTFILES) ..\nums.cma ..\libnums.lib test.opt: $(TESTOPTFILES) ..\nums.cmxa ..\libnums.lib $(CAMLOPT) -o test.opt ..\nums.cmxa $(TESTOPTFILES) ..\libnums.lib -$(TESTOPTFILES): ..\..\..\cslopt +$(TESTOPTFILES): ..\..\..\ocamlopt .SUFFIXES: .ml .cmo .cmx @@ -26,13 +26,13 @@ $(TESTOPTFILES): ..\..\..\cslopt .ml.cmx: $(CAMLOPT) -I .. -c $< -csltopnum: - cslmktop -o csltopnum -custom ..\nums.cma ..\libnums.lib +ocamltopnum: + ocamlmktop -o ocamltopnum -custom ..\nums.cma ..\libnums.lib clean: - rm -f test.byt test.opt *.obj *.cm? csltopnum + rm -f test.byt test.opt *.obj *.cm? ocamltopnum depend: - csldep *.ml > .depend + ocamldep *.ml > .depend !include .depend diff --git a/otherlibs/str/Makefile b/otherlibs/str/Makefile index 55b1fa406..65ebf97c4 100644 --- a/otherlibs/str/Makefile +++ b/otherlibs/str/Makefile @@ -5,8 +5,8 @@ include ../../config/Makefile # Compilation options CC=$(BYTECC) CFLAGS=-O -I$(REGEXLIB) -I../../byterun $(BYTECCCOMPOPTS) -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 REGEXLIB=regex-0.12 COBJS=strstubs.o $(REGEXLIB)/regex.o @@ -28,7 +28,7 @@ str.cmxa: str.cmx $(REGEXLIB)/regex.o: $(REGEXLIB)/regex.c $(REGEXLIB)/regex.h cd $(REGEXLIB); CC="$(CC)" sh configure; $(MAKE) -str.cmx: ../../cslopt +str.cmx: ../../ocamlopt clean: rm -f *.cm* @@ -59,6 +59,6 @@ installopt: depend: gcc -MM $(CFLAGS) *.c > .depend - ../../tools/csldep *.mli *.ml >> .depend + ../../tools/ocamldep *.mli *.ml >> .depend include .depend diff --git a/otherlibs/str/Makefile.nt b/otherlibs/str/Makefile.nt index ba7d951e2..77f90f086 100644 --- a/otherlibs/str/Makefile.nt +++ b/otherlibs/str/Makefile.nt @@ -5,8 +5,8 @@ # Compilation options CC=$(BYTECC) CFLAGS=-I$(REGEXLIB) -I..\..\byterun $(BYTECCCOMPOPTS) -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 REGEXLIB=regex-0.12 REGEXFLAGS=-DREGEX_MALLOC -DSTDC_HEADERS $(BYTECCCOMPOPTS) COBJS=strstubs.obj $(REGEXLIB)\regex.obj @@ -27,7 +27,7 @@ str.cmxa: str.cmx $(REGEXLIB)\regex.obj: $(REGEXLIB)\regex.c $(REGEXLIB)\regex.h cd $(REGEXLIB) & $(CC) $(REGEXFLAGS) -c regex.c -str.cmx: ..\..\cslopt +str.cmx: ..\..\ocamlopt clean: rm -f *.cm* @@ -56,6 +56,6 @@ installopt: depend: gcc -MM $(CFLAGS) *.c > .depend - ..\..\tools\csldep *.mli *.ml >> .depend + ..\..\tools\ocamldep *.mli *.ml >> .depend !include .depend diff --git a/otherlibs/str/str.ml b/otherlibs/str/str.ml index 1a123d323..1cede822c 100644 --- a/otherlibs/str/str.ml +++ b/otherlibs/str/str.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/str/str.mli b/otherlibs/str/str.mli index 3010c3fa6..d573a0f73 100644 --- a/otherlibs/str/str.mli +++ b/otherlibs/str/str.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/Makefile b/otherlibs/threads/Makefile index 7d4026eaf..7c543470c 100644 --- a/otherlibs/threads/Makefile +++ b/otherlibs/threads/Makefile @@ -3,7 +3,7 @@ include ../../config/Makefile # Compilation options CC=$(BYTECC) CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) -CAMLC=../../boot/cslrun ../../boot/cslc -I ../../boot -I ../unix +CAMLC=../../boot/ocamlrun ../../boot/ocamlc -I ../../boot -I ../unix C_OBJS=scheduler.o CAML_OBJS=thread.cmo threadIO.cmo threadUnix.cmo \ @@ -46,6 +46,6 @@ installopt: depend: gcc -MM $(CFLAGS) *.c > .depend - ../../tools/csldep *.mli *.ml >> .depend + ../../tools/ocamldep *.mli *.ml >> .depend include .depend diff --git a/otherlibs/threads/Tests/Makefile b/otherlibs/threads/Tests/Makefile index a29e66c71..4f188786c 100644 --- a/otherlibs/threads/Tests/Makefile +++ b/otherlibs/threads/Tests/Makefile @@ -8,11 +8,11 @@ clean: rm -f *.cm* *.byt sorts.byt: sorts.ml - cslc -custom -o sorts.byt -I .. -I ../../graph threads.cma graphics.cma sorts.ml ../libthreads.a ../../graph/libgraphics.a $(X11_LINK) + ocamlc -custom -o sorts.byt -I .. -I ../../graph threads.cma graphics.cma sorts.ml ../libthreads.a ../../graph/libgraphics.a $(X11_LINK) .SUFFIXES: .ml .byt .ml.byt: - cslc -custom -o $*.byt -I .. -I ../../unix unix.cma threads.cma $*.ml ../libthreads.a ../../unix/libunix.a + ocamlc -custom -o $*.byt -I .. -I ../../unix unix.cma threads.cma $*.ml ../libthreads.a ../../unix/libunix.a $(PROGS): ../threads.cma ../libthreads.a diff --git a/otherlibs/threads/condition.ml b/otherlibs/threads/condition.ml index e7ed55e57..b0c9d21a2 100644 --- a/otherlibs/threads/condition.ml +++ b/otherlibs/threads/condition.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Xavier Leroy and Damien Doligez, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/condition.mli b/otherlibs/threads/condition.mli index cc6e0770a..35110ddbc 100644 --- a/otherlibs/threads/condition.mli +++ b/otherlibs/threads/condition.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Xavier Leroy and Damien Doligez, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/event.ml b/otherlibs/threads/event.ml index f93e55657..c74a4676b 100644 --- a/otherlibs/threads/event.ml +++ b/otherlibs/threads/event.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* David Nowak and 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/event.mli b/otherlibs/threads/event.mli index e84f28fd8..bbbba23a4 100644 --- a/otherlibs/threads/event.mli +++ b/otherlibs/threads/event.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* David Nowak and 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/mutex.ml b/otherlibs/threads/mutex.ml index 6a4e03ddb..d5412ba81 100644 --- a/otherlibs/threads/mutex.ml +++ b/otherlibs/threads/mutex.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Xavier Leroy and Damien Doligez, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/mutex.mli b/otherlibs/threads/mutex.mli index a9c433a57..49bee12fa 100644 --- a/otherlibs/threads/mutex.mli +++ b/otherlibs/threads/mutex.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Xavier Leroy and Damien Doligez, 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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/scheduler.c b/otherlibs/threads/scheduler.c index b1620580d..dfc34bcbe 100644 --- a/otherlibs/threads/scheduler.c +++ b/otherlibs/threads/scheduler.c @@ -1,3 +1,18 @@ +/***********************************************************************/ +/* */ +/* Objective Caml */ +/* */ +/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */ +/* */ +/* Copyright 1996 Institut National de Recherche en Informatique et */ +/* Automatique. Distributed only by permission. */ +/* */ +/***********************************************************************/ + +/* $Id$ */ + +/* The thread scheduler */ + #include "config.h" #include "misc.h" #include "mlvalues.h" diff --git a/otherlibs/threads/thread.ml b/otherlibs/threads/thread.ml index eef49bc86..d60f346c4 100644 --- a/otherlibs/threads/thread.ml +++ b/otherlibs/threads/thread.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/thread.mli b/otherlibs/threads/thread.mli index bf2bf32c5..aac9e56e7 100644 --- a/otherlibs/threads/thread.mli +++ b/otherlibs/threads/thread.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. *) (* *) (***********************************************************************) @@ -19,9 +19,10 @@ type t (** Thread creation and termination *) val create : ('a -> 'b) -> 'a -> t - (* [new funct arg] creates a new thread of control, in which the - function application [funct arg] is executed concurrently - with the other threads of the program. The application of [new] + (* [Thread.create funct arg] creates a new thread of control, + in which the function application [funct arg] + is executed concurrently with the other threads of the program. + The application of [Thread.create] returns the handle of the newly created thread. The new thread terminates when the application [funct arg] returns, either normally or by raising an uncaught exception. diff --git a/otherlibs/threads/threadIO.ml b/otherlibs/threads/threadIO.ml index 0864737b8..13b37436b 100644 --- a/otherlibs/threads/threadIO.ml +++ b/otherlibs/threads/threadIO.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/threadIO.mli b/otherlibs/threads/threadIO.mli index b1ce30104..8bb514e38 100644 --- a/otherlibs/threads/threadIO.mli +++ b/otherlibs/threads/threadIO.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/threadUnix.ml b/otherlibs/threads/threadUnix.ml index 6782f1560..5fc25af95 100644 --- a/otherlibs/threads/threadUnix.ml +++ b/otherlibs/threads/threadUnix.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/threads/threadUnix.mli b/otherlibs/threads/threadUnix.mli index b61cc4e09..29ca70fda 100644 --- a/otherlibs/threads/threadUnix.mli +++ b/otherlibs/threads/threadUnix.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/unix/Makefile b/otherlibs/unix/Makefile index 1508e994a..06566781d 100644 --- a/otherlibs/unix/Makefile +++ b/otherlibs/unix/Makefile @@ -5,8 +5,8 @@ include ../../config/Makefile # Compilation options CC=$(BYTECC) CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) -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 OBJS=accept.o access.o addrofstr.o alarm.o bind.o chdir.o chmod.o \ chown.o chroot.o close.o closedir.o connect.o cst2constr.o cstringv.o \ @@ -38,7 +38,7 @@ unix.cma: unix.cmo unix.cmxa: unix.cmx $(CAMLOPT) -a -linkall -o unix.cmxa unix.cmx -unix.cmx: ../../cslopt +unix.cmx: ../../ocamlopt clean: rm -f *.cm* @@ -68,6 +68,6 @@ installopt: depend: gcc -MM $(CFLAGS) *.c > .depend - ../../tools/csldep *.mli *.ml >> .depend + ../../tools/ocamldep *.mli *.ml >> .depend include .depend diff --git a/otherlibs/unix/accept.c b/otherlibs/unix/accept.c index 181970e22..2b7940e2b 100644 --- a/otherlibs/unix/accept.c +++ b/otherlibs/unix/accept.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/access.c b/otherlibs/unix/access.c index d3cd59205..96ef61c0e 100644 --- a/otherlibs/unix/access.c +++ b/otherlibs/unix/access.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/addrofstr.c b/otherlibs/unix/addrofstr.c index 0070f1262..3a376bd38 100644 --- a/otherlibs/unix/addrofstr.c +++ b/otherlibs/unix/addrofstr.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/alarm.c b/otherlibs/unix/alarm.c index 51dfaf9b4..76709c904 100644 --- a/otherlibs/unix/alarm.c +++ b/otherlibs/unix/alarm.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/bind.c b/otherlibs/unix/bind.c index 06ea00eca..5c0aaa3e4 100644 --- a/otherlibs/unix/bind.c +++ b/otherlibs/unix/bind.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/chdir.c b/otherlibs/unix/chdir.c index 146dc5a12..c1f21ef87 100644 --- a/otherlibs/unix/chdir.c +++ b/otherlibs/unix/chdir.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/chmod.c b/otherlibs/unix/chmod.c index 7d2d68d50..07a84d6a1 100644 --- a/otherlibs/unix/chmod.c +++ b/otherlibs/unix/chmod.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/chown.c b/otherlibs/unix/chown.c index 5f3fcbf55..de2f74086 100644 --- a/otherlibs/unix/chown.c +++ b/otherlibs/unix/chown.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/chroot.c b/otherlibs/unix/chroot.c index 5c1df641e..5c074f007 100644 --- a/otherlibs/unix/chroot.c +++ b/otherlibs/unix/chroot.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/close.c b/otherlibs/unix/close.c index 3d122c168..41dfca5e9 100644 --- a/otherlibs/unix/close.c +++ b/otherlibs/unix/close.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/closedir.c b/otherlibs/unix/closedir.c index e418a1887..985a7d333 100644 --- a/otherlibs/unix/closedir.c +++ b/otherlibs/unix/closedir.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/connect.c b/otherlibs/unix/connect.c index b69396b4b..ad16fde7a 100644 --- a/otherlibs/unix/connect.c +++ b/otherlibs/unix/connect.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/cst2constr.c b/otherlibs/unix/cst2constr.c index 95967f2ec..8ce4fb7d4 100644 --- a/otherlibs/unix/cst2constr.c +++ b/otherlibs/unix/cst2constr.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/cst2constr.h b/otherlibs/unix/cst2constr.h index e46e5a1dc..a9fc39c7c 100644 --- a/otherlibs/unix/cst2constr.h +++ b/otherlibs/unix/cst2constr.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/cstringv.c b/otherlibs/unix/cstringv.c index d6a673603..9563b5e6a 100644 --- a/otherlibs/unix/cstringv.c +++ b/otherlibs/unix/cstringv.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/dup.c b/otherlibs/unix/dup.c index d7cfd3aef..4feaf44fd 100644 --- a/otherlibs/unix/dup.c +++ b/otherlibs/unix/dup.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/dup2.c b/otherlibs/unix/dup2.c index 9f2b406ed..1e9af1b76 100644 --- a/otherlibs/unix/dup2.c +++ b/otherlibs/unix/dup2.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/envir.c b/otherlibs/unix/envir.c index 9769e2efd..24e57ce4d 100644 --- a/otherlibs/unix/envir.c +++ b/otherlibs/unix/envir.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/errmsg.c b/otherlibs/unix/errmsg.c index c3586ecb0..b10a080fb 100644 --- a/otherlibs/unix/errmsg.c +++ b/otherlibs/unix/errmsg.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/execv.c b/otherlibs/unix/execv.c index 5404e11e9..7df864208 100644 --- a/otherlibs/unix/execv.c +++ b/otherlibs/unix/execv.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/execve.c b/otherlibs/unix/execve.c index 74721c83e..6d1a2fb4a 100644 --- a/otherlibs/unix/execve.c +++ b/otherlibs/unix/execve.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/execvp.c b/otherlibs/unix/execvp.c index 59f6c4848..579f08faa 100644 --- a/otherlibs/unix/execvp.c +++ b/otherlibs/unix/execvp.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/exit.c b/otherlibs/unix/exit.c index 1c40845aa..9eba09ba5 100644 --- a/otherlibs/unix/exit.c +++ b/otherlibs/unix/exit.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/fchmod.c b/otherlibs/unix/fchmod.c index f1864aaab..d0fea9b50 100644 --- a/otherlibs/unix/fchmod.c +++ b/otherlibs/unix/fchmod.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/fchown.c b/otherlibs/unix/fchown.c index 4f963ff7f..df23d4d76 100644 --- a/otherlibs/unix/fchown.c +++ b/otherlibs/unix/fchown.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/fcntl.c b/otherlibs/unix/fcntl.c index 680729d1c..54f4a7a3c 100644 --- a/otherlibs/unix/fcntl.c +++ b/otherlibs/unix/fcntl.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/fork.c b/otherlibs/unix/fork.c index d24b0a59a..748cc6955 100644 --- a/otherlibs/unix/fork.c +++ b/otherlibs/unix/fork.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/ftruncate.c b/otherlibs/unix/ftruncate.c index 58ec40d08..5748238e6 100644 --- a/otherlibs/unix/ftruncate.c +++ b/otherlibs/unix/ftruncate.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getcwd.c b/otherlibs/unix/getcwd.c index 6a961d76d..cf7a94ef7 100644 --- a/otherlibs/unix/getcwd.c +++ b/otherlibs/unix/getcwd.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getegid.c b/otherlibs/unix/getegid.c index f65391377..d9bc680bf 100644 --- a/otherlibs/unix/getegid.c +++ b/otherlibs/unix/getegid.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/geteuid.c b/otherlibs/unix/geteuid.c index d91f1521c..287289274 100644 --- a/otherlibs/unix/geteuid.c +++ b/otherlibs/unix/geteuid.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getgid.c b/otherlibs/unix/getgid.c index 002baf9d0..6595ffdef 100644 --- a/otherlibs/unix/getgid.c +++ b/otherlibs/unix/getgid.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getgr.c b/otherlibs/unix/getgr.c index e12186a24..9217ab267 100644 --- a/otherlibs/unix/getgr.c +++ b/otherlibs/unix/getgr.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getgroups.c b/otherlibs/unix/getgroups.c index ed9991b7e..088dae199 100644 --- a/otherlibs/unix/getgroups.c +++ b/otherlibs/unix/getgroups.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/gethost.c b/otherlibs/unix/gethost.c index a634d2a43..c32d9927a 100644 --- a/otherlibs/unix/gethost.c +++ b/otherlibs/unix/gethost.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/gethostname.c b/otherlibs/unix/gethostname.c index 04dcd4bb2..90a0b3ace 100644 --- a/otherlibs/unix/gethostname.c +++ b/otherlibs/unix/gethostname.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getlogin.c b/otherlibs/unix/getlogin.c index 115857c9f..1f1515ae6 100644 --- a/otherlibs/unix/getlogin.c +++ b/otherlibs/unix/getlogin.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getpeername.c b/otherlibs/unix/getpeername.c index c2c767c1e..bafa5ec41 100644 --- a/otherlibs/unix/getpeername.c +++ b/otherlibs/unix/getpeername.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getpid.c b/otherlibs/unix/getpid.c index 23abb2a61..e54b0777e 100644 --- a/otherlibs/unix/getpid.c +++ b/otherlibs/unix/getpid.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getppid.c b/otherlibs/unix/getppid.c index 4d0b38bc9..851e499d9 100644 --- a/otherlibs/unix/getppid.c +++ b/otherlibs/unix/getppid.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getproto.c b/otherlibs/unix/getproto.c index 9510195d9..1bb223461 100644 --- a/otherlibs/unix/getproto.c +++ b/otherlibs/unix/getproto.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getpw.c b/otherlibs/unix/getpw.c index 75f042b49..0f321adca 100644 --- a/otherlibs/unix/getpw.c +++ b/otherlibs/unix/getpw.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getserv.c b/otherlibs/unix/getserv.c index 11da23153..675f2499a 100644 --- a/otherlibs/unix/getserv.c +++ b/otherlibs/unix/getserv.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getsockname.c b/otherlibs/unix/getsockname.c index 2d4876658..b2ad75357 100644 --- a/otherlibs/unix/getsockname.c +++ b/otherlibs/unix/getsockname.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/getuid.c b/otherlibs/unix/getuid.c index d79347e22..7fb3e8089 100644 --- a/otherlibs/unix/getuid.c +++ b/otherlibs/unix/getuid.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/gmtime.c b/otherlibs/unix/gmtime.c index a2e63c045..d7c251c54 100644 --- a/otherlibs/unix/gmtime.c +++ b/otherlibs/unix/gmtime.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/ioctl.c b/otherlibs/unix/ioctl.c index fc9e24c53..22717760d 100644 --- a/otherlibs/unix/ioctl.c +++ b/otherlibs/unix/ioctl.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/itimer.c b/otherlibs/unix/itimer.c index 28a188e73..000238292 100644 --- a/otherlibs/unix/itimer.c +++ b/otherlibs/unix/itimer.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/kill.c b/otherlibs/unix/kill.c index de84a044f..b296f06a1 100644 --- a/otherlibs/unix/kill.c +++ b/otherlibs/unix/kill.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/link.c b/otherlibs/unix/link.c index aaca7faed..7c0c8a8c2 100644 --- a/otherlibs/unix/link.c +++ b/otherlibs/unix/link.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/listen.c b/otherlibs/unix/listen.c index 54b413979..bcb8f398b 100644 --- a/otherlibs/unix/listen.c +++ b/otherlibs/unix/listen.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/lockf.c b/otherlibs/unix/lockf.c index f69c2caab..5a27c0db6 100644 --- a/otherlibs/unix/lockf.c +++ b/otherlibs/unix/lockf.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/lseek.c b/otherlibs/unix/lseek.c index 4adc9d323..3ed1b2e4e 100644 --- a/otherlibs/unix/lseek.c +++ b/otherlibs/unix/lseek.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/mkdir.c b/otherlibs/unix/mkdir.c index 9e70f3315..8f551118d 100644 --- a/otherlibs/unix/mkdir.c +++ b/otherlibs/unix/mkdir.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/mkfifo.c b/otherlibs/unix/mkfifo.c index 3bdf31687..8177871b6 100644 --- a/otherlibs/unix/mkfifo.c +++ b/otherlibs/unix/mkfifo.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/nice.c b/otherlibs/unix/nice.c index 31af31687..71cd865b5 100644 --- a/otherlibs/unix/nice.c +++ b/otherlibs/unix/nice.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/open.c b/otherlibs/unix/open.c index 9c12eedc8..f76c52719 100644 --- a/otherlibs/unix/open.c +++ b/otherlibs/unix/open.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/opendir.c b/otherlibs/unix/opendir.c index 14292349c..fcbe4a8f3 100644 --- a/otherlibs/unix/opendir.c +++ b/otherlibs/unix/opendir.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/pause.c b/otherlibs/unix/pause.c index a1ec4d12b..0becf9bce 100644 --- a/otherlibs/unix/pause.c +++ b/otherlibs/unix/pause.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/pipe.c b/otherlibs/unix/pipe.c index 17c34326b..596e641ea 100644 --- a/otherlibs/unix/pipe.c +++ b/otherlibs/unix/pipe.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/read.c b/otherlibs/unix/read.c index f7870a821..6373c57ea 100644 --- a/otherlibs/unix/read.c +++ b/otherlibs/unix/read.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/readdir.c b/otherlibs/unix/readdir.c index 15dcd14df..dd9a288b5 100644 --- a/otherlibs/unix/readdir.c +++ b/otherlibs/unix/readdir.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/readlink.c b/otherlibs/unix/readlink.c index f49118812..d8c4fbbc4 100644 --- a/otherlibs/unix/readlink.c +++ b/otherlibs/unix/readlink.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/rename.c b/otherlibs/unix/rename.c index d90fb5f2e..cd0409b5f 100644 --- a/otherlibs/unix/rename.c +++ b/otherlibs/unix/rename.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/rewinddir.c b/otherlibs/unix/rewinddir.c index c8253a5b8..a523f5553 100644 --- a/otherlibs/unix/rewinddir.c +++ b/otherlibs/unix/rewinddir.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/rmdir.c b/otherlibs/unix/rmdir.c index 100fed2da..10a986810 100644 --- a/otherlibs/unix/rmdir.c +++ b/otherlibs/unix/rmdir.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/select.c b/otherlibs/unix/select.c index 0e6d16ec8..bacd810d4 100644 --- a/otherlibs/unix/select.c +++ b/otherlibs/unix/select.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/sendrecv.c b/otherlibs/unix/sendrecv.c index 8b9f7452a..ea531e7e4 100644 --- a/otherlibs/unix/sendrecv.c +++ b/otherlibs/unix/sendrecv.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/setgid.c b/otherlibs/unix/setgid.c index c63215aba..0f159601a 100644 --- a/otherlibs/unix/setgid.c +++ b/otherlibs/unix/setgid.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/setuid.c b/otherlibs/unix/setuid.c index 0756e0a6d..d8b69705c 100644 --- a/otherlibs/unix/setuid.c +++ b/otherlibs/unix/setuid.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/shutdown.c b/otherlibs/unix/shutdown.c index d264465d0..ae66d69a5 100644 --- a/otherlibs/unix/shutdown.c +++ b/otherlibs/unix/shutdown.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/sleep.c b/otherlibs/unix/sleep.c index fb5d916db..d7590b81c 100644 --- a/otherlibs/unix/sleep.c +++ b/otherlibs/unix/sleep.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/socket.c b/otherlibs/unix/socket.c index e0374a3ec..3f197b536 100644 --- a/otherlibs/unix/socket.c +++ b/otherlibs/unix/socket.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/socketaddr.c b/otherlibs/unix/socketaddr.c index bc179f13d..b46f290ee 100644 --- a/otherlibs/unix/socketaddr.c +++ b/otherlibs/unix/socketaddr.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/socketaddr.h b/otherlibs/unix/socketaddr.h index 1a65c7891..803aed27e 100644 --- a/otherlibs/unix/socketaddr.h +++ b/otherlibs/unix/socketaddr.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/socketpair.c b/otherlibs/unix/socketpair.c index 7a9fc8490..fedc939a6 100644 --- a/otherlibs/unix/socketpair.c +++ b/otherlibs/unix/socketpair.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/sockopt.c b/otherlibs/unix/sockopt.c index 50dd84875..cdb23ba02 100644 --- a/otherlibs/unix/sockopt.c +++ b/otherlibs/unix/sockopt.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/stat.c b/otherlibs/unix/stat.c index 9d5a1b1b8..41e0e23f6 100644 --- a/otherlibs/unix/stat.c +++ b/otherlibs/unix/stat.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/strofaddr.c b/otherlibs/unix/strofaddr.c index 137b7940b..d14cc2742 100644 --- a/otherlibs/unix/strofaddr.c +++ b/otherlibs/unix/strofaddr.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/symlink.c b/otherlibs/unix/symlink.c index cb95f3436..177c3dc9a 100644 --- a/otherlibs/unix/symlink.c +++ b/otherlibs/unix/symlink.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/termios.c b/otherlibs/unix/termios.c index 314132cf4..ec0a6a589 100644 --- a/otherlibs/unix/termios.c +++ b/otherlibs/unix/termios.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/time.c b/otherlibs/unix/time.c index 35e0bdc6e..2fa973f75 100644 --- a/otherlibs/unix/time.c +++ b/otherlibs/unix/time.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/times.c b/otherlibs/unix/times.c index fb3897286..79c799799 100644 --- a/otherlibs/unix/times.c +++ b/otherlibs/unix/times.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/truncate.c b/otherlibs/unix/truncate.c index e0fa53854..3670a7e9d 100644 --- a/otherlibs/unix/truncate.c +++ b/otherlibs/unix/truncate.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/umask.c b/otherlibs/unix/umask.c index f7a8e4807..f2475677f 100644 --- a/otherlibs/unix/umask.c +++ b/otherlibs/unix/umask.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/unix.h b/otherlibs/unix/unix.h index 8783328f8..78d333375 100644 --- a/otherlibs/unix/unix.h +++ b/otherlibs/unix/unix.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/unix.ml b/otherlibs/unix/unix.ml index 8f8315902..b3c2d0072 100644 --- a/otherlibs/unix/unix.ml +++ b/otherlibs/unix/unix.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/unix/unix.mli b/otherlibs/unix/unix.mli index 9fe7dd1f2..05c4b0912 100644 --- a/otherlibs/unix/unix.mli +++ b/otherlibs/unix/unix.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. *) (* *) (***********************************************************************) diff --git a/otherlibs/unix/unixsupport.c b/otherlibs/unix/unixsupport.c index 50c0b07f4..188e9501a 100644 --- a/otherlibs/unix/unixsupport.c +++ b/otherlibs/unix/unixsupport.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/unlink.c b/otherlibs/unix/unlink.c index ce112529a..407ad11c0 100644 --- a/otherlibs/unix/unlink.c +++ b/otherlibs/unix/unlink.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/utimes.c b/otherlibs/unix/utimes.c index 71f433160..b7108b33c 100644 --- a/otherlibs/unix/utimes.c +++ b/otherlibs/unix/utimes.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/wait.c b/otherlibs/unix/wait.c index fa7f77404..8bc3285a6 100644 --- a/otherlibs/unix/wait.c +++ b/otherlibs/unix/wait.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/otherlibs/unix/write.c b/otherlibs/unix/write.c index db7ab276c..6b292bbf3 100644 --- a/otherlibs/unix/write.c +++ b/otherlibs/unix/write.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/parsing/asttypes.mli b/parsing/asttypes.mli index ce0f30648..4431233d5 100644 --- a/parsing/asttypes.mli +++ b/parsing/asttypes.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. *) (* *) (***********************************************************************) diff --git a/parsing/label.ml b/parsing/label.ml index dd9fd309c..54d1cdc2c 100644 --- a/parsing/label.ml +++ b/parsing/label.ml @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/parsing/label.mli b/parsing/label.mli index 88b191288..9f37415cc 100644 --- a/parsing/label.mli +++ b/parsing/label.mli @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/parsing/lexer.mli b/parsing/lexer.mli index 5d3af4086..330d565e2 100644 --- a/parsing/lexer.mli +++ b/parsing/lexer.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. *) (* *) (***********************************************************************) diff --git a/parsing/lexer.mll b/parsing/lexer.mll index 21e987a44..4929e14d5 100644 --- a/parsing/lexer.mll +++ b/parsing/lexer.mll @@ -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. *) (* *) (***********************************************************************) @@ -186,48 +186,53 @@ rule token = parse start_pos := Lexing.lexeme_start lexbuf; comment lexbuf; token lexbuf } - | "#" { SHARP } - | "&" { AMPERSAND } + | "#" { SHARP } + | "&" { AMPERSAND } | "&&" { AMPERAMPER } - | "'" { QUOTE } - | "(" { LPAREN } - | ")" { RPAREN } - | "*" { STAR } - | "," { COMMA } - | "?" { QUESTION } + | "'" { QUOTE } + | "(" { LPAREN } + | ")" { RPAREN } + | "*" { STAR } + | "," { COMMA } + | "?" { QUESTION } | "->" { MINUSGREATER } - | "." { DOT } + | "." { DOT } | ".." { DOTDOT } - | ":" { COLON } + | ":" { COLON } | "::" { COLONCOLON } | ":=" { COLONEQUAL } | ":>" { COLONGREATER } - | ";" { SEMI } + | ";" { SEMI } | ";;" { SEMISEMI } + | "<" { LESS } | "<-" { LESSMINUS } - | "=" { EQUAL } - | "[" { LBRACKET } + | "=" { EQUAL } + | "[" { LBRACKET } | "[|" { LBRACKETBAR } | "[<" { LBRACKETLESS } - | "]" { RBRACKET } - | "_" { UNDERSCORE } - | "{" { LBRACE } + | "]" { RBRACKET } + | "_" { UNDERSCORE } + | "{" { LBRACE } | "{<" { LBRACELESS } - | "|" { BAR } + | "|" { BAR } | "||" { BARBAR } | "|]" { BARRBRACKET } + | ">" { GREATER } | ">]" { GREATERRBRACKET } - | "}" { RBRACE } + | "}" { RBRACE } | ">}" { GREATERRBRACE } - | "!=" { INFIXOP1 "!=" } - | "-" { SUBTRACTIVE "-" } - | "-." { SUBTRACTIVE "-." } + | "!=" { INFIXOP0 "!=" } + | "-" { SUBTRACTIVE "-" } + | "-." { SUBTRACTIVE "-." } | ['!' '?' '~'] ['!' '$' '%' '&' '*' '+' '-' '.' '/' ':' '<' '=' '>' '?' '@' '^' '|' '~'] * { PREFIXOP(Lexing.lexeme lexbuf) } - | ['=' '<' '>' '@' '^' '|' '&' '$'] + | ['=' '<' '>' '|' '&' '$'] + ['!' '$' '%' '&' '*' '+' '-' '.' '/' ':' '<' '=' '>' '?' '@' '^' '|' '~'] * + { INFIXOP0(Lexing.lexeme lexbuf) } + | ['@' '^'] ['!' '$' '%' '&' '*' '+' '-' '.' '/' ':' '<' '=' '>' '?' '@' '^' '|' '~'] * { INFIXOP1(Lexing.lexeme lexbuf) } | ['+' '-'] diff --git a/parsing/location.ml b/parsing/location.ml index 7de0845bf..82d6a2a61 100644 --- a/parsing/location.ml +++ b/parsing/location.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. *) (* *) (***********************************************************************) diff --git a/parsing/location.mli b/parsing/location.mli index 1509620e7..01afb75d9 100644 --- a/parsing/location.mli +++ b/parsing/location.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. *) (* *) (***********************************************************************) diff --git a/parsing/longident.ml b/parsing/longident.ml index 243cb3d0d..82e499027 100644 --- a/parsing/longident.ml +++ b/parsing/longident.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. *) (* *) (***********************************************************************) diff --git a/parsing/longident.mli b/parsing/longident.mli index bbe7ef2e0..9835c3380 100644 --- a/parsing/longident.mli +++ b/parsing/longident.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. *) (* *) (***********************************************************************) diff --git a/parsing/parse.ml b/parsing/parse.ml index fdb3ec6d9..7cf8caff2 100644 --- a/parsing/parse.ml +++ b/parsing/parse.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. *) (* *) (***********************************************************************) diff --git a/parsing/parse.mli b/parsing/parse.mli index f1eaf3464..ddd58daa1 100644 --- a/parsing/parse.mli +++ b/parsing/parse.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. *) (* *) (***********************************************************************) diff --git a/parsing/parser.mly b/parsing/parser.mly index 1535626f9..ac80d29f1 100644 --- a/parsing/parser.mly +++ b/parsing/parser.mly @@ -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. */ /* */ /***********************************************************************/ @@ -116,11 +116,13 @@ let rec mkrangepat c1 c2 = %token FUN %token FUNCTION %token FUNCTOR +%token GREATER %token GREATERRBRACE %token GREATERRBRACKET %token IF %token IN %token INCLUDE +%token <string> INFIXOP0 %token <string> INFIXOP1 %token <string> INFIXOP2 %token <string> INFIXOP3 @@ -132,6 +134,7 @@ let rec mkrangepat c1 c2 = %token LBRACKET %token LBRACKETBAR %token LBRACKETLESS +%token LESS %token LESSMINUS %token LET %token <string> LIDENT @@ -190,7 +193,8 @@ let rec mkrangepat c1 c2 = %right prec_type_arrow /* -> in type expressions */ %right OR BARBAR /* or */ %right AMPERSAND AMPERAMPER /* & */ -%left INFIXOP1 EQUAL /* = < > etc */ +%left INFIXOP0 EQUAL LESS GREATER /* = < > etc */ +%right INFIXOP1 /* @ ^ etc */ %right COLONCOLON /* :: */ %left INFIXOP2 SUBTRACTIVE /* + - */ %left INFIXOP3 STAR /* * / */ @@ -387,6 +391,8 @@ expr: { mkexp(Pexp_for($2, $4, $6, $5, $8)) } | expr COLONCOLON expr { mkexp(Pexp_construct(Lident "::", Some(mkexp(Pexp_tuple[$1;$3])))) } + | expr INFIXOP0 expr + { mkinfix $1 $2 $3 } | expr INFIXOP1 expr { mkinfix $1 $2 $3 } | expr INFIXOP2 expr @@ -401,6 +407,10 @@ expr: { mkinfix $1 "*" $3 } | expr EQUAL expr { mkinfix $1 "=" $3 } + | expr LESS expr + { mkinfix $1 "<" $3 } + | expr GREATER expr + { mkinfix $1 ">" $3 } | expr OR expr { mkinfix $1 "or" $3 } | expr BARBAR expr @@ -867,9 +877,9 @@ simple_core_type: { mktyp(Ptyp_constr($4, List.rev $2, $5)) } | LPAREN core_type RPAREN { $2 } - | less meth_list more alias + | LESS meth_list GREATER alias { mktyp(Ptyp_object($2, $4)) } - | less more alias + | LESS GREATER alias { mktyp(Ptyp_object([], $3)) } | SHARP class_longident alias { mktyp(Ptyp_class($2, [], $3)) } @@ -885,14 +895,6 @@ alias: | /* empty */ {None} ; -less: - INFIXOP1 - { if $1 <> "<" then raise Parse_error } -; -more: - INFIXOP1 - { if $1 <> ">" then raise Parse_error } -; core_type_tuple: simple_core_type STAR simple_core_type { [$3; $1] } @@ -949,6 +951,7 @@ val_ident: ; operator: PREFIXOP { $1 } + | INFIXOP0 { $1 } | INFIXOP1 { $1 } | INFIXOP2 { $1 } | INFIXOP3 { $1 } @@ -956,6 +959,8 @@ operator: | SUBTRACTIVE { $1 } | STAR { "*" } | EQUAL { "=" } + | LESS { "<" } + | GREATER { ">" } | OR { "or" } | BARBAR { "||" } | AMPERSAND { "&" } diff --git a/parsing/parsetree.mli b/parsing/parsetree.mli index ea8356a7e..be7db29fa 100644 --- a/parsing/parsetree.mli +++ b/parsing/parsetree.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. *) (* *) (***********************************************************************) diff --git a/parsing/pstream.ml b/parsing/pstream.ml index c94d244b8..4e7d00123 100644 --- a/parsing/pstream.ml +++ b/parsing/pstream.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Daniel de Rauglaudre, 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. *) (* *) (***********************************************************************) diff --git a/parsing/pstream.mli b/parsing/pstream.mli index fb4f6c68c..6d478abee 100644 --- a/parsing/pstream.mli +++ b/parsing/pstream.mli @@ -1,17 +1,17 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Daniel de Rauglaudre, 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. *) (* *) (***********************************************************************) (* $Id$ *) -(* Conversion of streams and parsers into Caml-Special-Light syntax *) +(* Conversion of streams and parsers into Objective Caml syntax *) open Parsetree diff --git a/stdlib/.cvsignore b/stdlib/.cvsignore index e95b2de1e..7ea00d7ab 100644 --- a/stdlib/.cvsignore +++ b/stdlib/.cvsignore @@ -1,2 +1,2 @@ -cslheader +ocamlheader filename.ml diff --git a/stdlib/Makefile b/stdlib/Makefile index 408eefbf1..75a17d5c7 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -1,11 +1,11 @@ include ../config/Makefile -RUNTIME=../boot/cslrun -COMPILER=../cslc +RUNTIME=../boot/ocamlrun +COMPILER=../ocamlc CAMLC=$(RUNTIME) $(COMPILER) -OPTCOMPILER=../cslopt +OPTCOMPILER=../ocamlopt CAMLOPT=$(RUNTIME) $(OPTCOMPILER) -CAMLDEP=../boot/cslrun ../tools/csldep +CAMLDEP=../boot/ocamlrun ../tools/ocamldep CPPFLAGS=-DUNIX OBJS=pervasives.cmo list.cmo string.cmo char.cmo array.cmo sys.cmo \ @@ -14,12 +14,12 @@ OBJS=pervasives.cmo list.cmo string.cmo char.cmo array.cmo sys.cmo \ printf.cmo format.cmo arg.cmo printexc.cmo gc.cmo \ digest.cmo random.cmo oo.cmo genlex.cmo -all: stdlib.cma std_exit.cmo cslheader +all: stdlib.cma std_exit.cmo camlheader allopt: stdlib.cmxa std_exit.cmx install: - cp stdlib.cma std_exit.cmo *.cmi *.mli cslheader $(LIBDIR) + cp stdlib.cma std_exit.cmo *.cmi *.mli camlheader $(LIBDIR) installopt: cp stdlib.cmxa stdlib.a std_exit.o *.cmx $(LIBDIR) @@ -31,14 +31,14 @@ stdlib.cma: $(OBJS) stdlib.cmxa: $(OBJS:.cmo=.cmx) $(CAMLOPT) -a -o stdlib.cmxa $(OBJS:.cmo=.cmx) -cslheader: header.c ../config/Makefile +camlheader: header.c ../config/Makefile if $(SHARPBANGSCRIPTS); \ - then echo "#!$(BINDIR)/cslrun" > cslheader; \ - else $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) header.c -o cslheader; \ - strip cslheader; fi + then echo "#!$(BINDIR)/ocamlrun" > camlheader; \ + else $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) header.c -o camlheader; \ + strip camlheader; fi clean:: - rm -f cslheader + rm -f camlheader pervasives.cmi: pervasives.mli $(CAMLC) $(COMPFLAGS) -nopervasives -c pervasives.mli diff --git a/stdlib/Makefile.nt b/stdlib/Makefile.nt index 4e015f8a0..acbcc33c4 100644 --- a/stdlib/Makefile.nt +++ b/stdlib/Makefile.nt @@ -1,11 +1,11 @@ !include ..\config\Makefile.nt -RUNTIME=..\boot\cslrun -COMPILER=..\cslc +RUNTIME=..\boot\ocamlrun +COMPILER=..\ocamlc CAMLC=$(RUNTIME) $(COMPILER) -OPTCOMPILER=..\cslopt +OPTCOMPILER=..\ocamlopt CAMLOPT=$(RUNTIME) $(OPTCOMPILER) -CAMLDEP=..\boot\cslrun ..\tools\csldep +CAMLDEP=..\boot\ocamlrun ..\tools\ocamldep OBJS=pervasives.cmo list.cmo string.cmo char.cmo array.cmo sys.cmo \ hashtbl.cmo sort.cmo filename.cmo obj.cmo lexing.cmo parsing.cmo \ @@ -13,12 +13,12 @@ OBJS=pervasives.cmo list.cmo string.cmo char.cmo array.cmo sys.cmo \ printf.cmo format.cmo arg.cmo printexc.cmo gc.cmo \ digest.cmo random.cmo oo.cmo -all: stdlib.cma std_exit.cmo cslheader +all: stdlib.cma std_exit.cmo ocamlheader allopt: stdlib.cmxa std_exit.cmx install: - cp stdlib.cma std_exit.cmo *.cmi *.mli cslheader $(LIBDIR) + cp stdlib.cma std_exit.cmo *.cmi *.mli ocamlheader $(LIBDIR) installopt: cp stdlib.cmxa stdlib.lib std_exit.obj *.cmx $(LIBDIR) @@ -29,11 +29,11 @@ stdlib.cma: $(OBJS) stdlib.cmxa: $(OBJS:.cmo=.cmx) $(CAMLOPT) -a -o stdlib.cmxa $(OBJS:.cmo=.cmx) -cslheader: headernt.c ..\config\Makefile.nt +ocamlheader: headernt.c ..\config\Makefile.nt $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -Fecslheader. headernt.c clean:: - rm -f cslheader + rm -f ocamlheader pervasives.cmi: pervasives.mli $(CAMLC) $(COMPFLAGS) -nopervasives -c pervasives.mli diff --git a/stdlib/arg.ml b/stdlib/arg.ml index 3cd16739f..58218a80c 100644 --- a/stdlib/arg.ml +++ b/stdlib/arg.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. *) (* *) (***********************************************************************) diff --git a/stdlib/arg.mli b/stdlib/arg.mli index b7fb1a464..0cdd07227 100644 --- a/stdlib/arg.mli +++ b/stdlib/arg.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. *) (* *) (***********************************************************************) diff --git a/stdlib/array.ml b/stdlib/array.ml index f3867c84f..0bfebdeb5 100644 --- a/stdlib/array.ml +++ b/stdlib/array.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. *) (* *) (***********************************************************************) diff --git a/stdlib/array.mli b/stdlib/array.mli index 36aedf85b..6591a65de 100644 --- a/stdlib/array.mli +++ b/stdlib/array.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. *) (* *) (***********************************************************************) diff --git a/stdlib/char.ml b/stdlib/char.ml index 43ccdef71..077719d8c 100644 --- a/stdlib/char.ml +++ b/stdlib/char.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. *) (* *) (***********************************************************************) diff --git a/stdlib/char.mli b/stdlib/char.mli index 2afbd6718..bccfc15d5 100644 --- a/stdlib/char.mli +++ b/stdlib/char.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. *) (* *) (***********************************************************************) diff --git a/stdlib/digest.ml b/stdlib/digest.ml index 3b7c039d1..ae0a4a78e 100644 --- a/stdlib/digest.ml +++ b/stdlib/digest.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. *) (* *) (***********************************************************************) diff --git a/stdlib/digest.mli b/stdlib/digest.mli index c5b5de498..c01332b36 100644 --- a/stdlib/digest.mli +++ b/stdlib/digest.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. *) (* *) (***********************************************************************) diff --git a/stdlib/filename.mli b/stdlib/filename.mli index 223f4fd21..61013232c 100644 --- a/stdlib/filename.mli +++ b/stdlib/filename.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. *) (* *) (***********************************************************************) diff --git a/stdlib/filename.mlp b/stdlib/filename.mlp index 646e7b32e..ceb3480d3 100644 --- a/stdlib/filename.mlp +++ b/stdlib/filename.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. *) (* *) (***********************************************************************) diff --git a/stdlib/format.ml b/stdlib/format.ml index b98f774dc..ecbf8c59e 100644 --- a/stdlib/format.ml +++ b/stdlib/format.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. *) (* *) (***********************************************************************) diff --git a/stdlib/format.mli b/stdlib/format.mli index 8fa6a3b86..19986520c 100644 --- a/stdlib/format.mli +++ b/stdlib/format.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. *) (* *) (***********************************************************************) diff --git a/stdlib/gc.ml b/stdlib/gc.ml index d07be8361..da3feb67e 100644 --- a/stdlib/gc.ml +++ b/stdlib/gc.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. *) (* *) (***********************************************************************) diff --git a/stdlib/gc.mli b/stdlib/gc.mli index 15753dd46..3acebc9d5 100644 --- a/stdlib/gc.mli +++ b/stdlib/gc.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. *) (* *) (***********************************************************************) diff --git a/stdlib/genlex.ml b/stdlib/genlex.ml index 276db124d..3c28e88dc 100644 --- a/stdlib/genlex.ml +++ b/stdlib/genlex.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. *) (* *) (***********************************************************************) diff --git a/stdlib/genlex.mli b/stdlib/genlex.mli index 54c75be5b..e11fdb344 100644 --- a/stdlib/genlex.mli +++ b/stdlib/genlex.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. *) (* *) (***********************************************************************) diff --git a/stdlib/hashtbl.ml b/stdlib/hashtbl.ml index c2ba6392c..52a62784a 100644 --- a/stdlib/hashtbl.ml +++ b/stdlib/hashtbl.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. *) (* *) (***********************************************************************) @@ -93,8 +93,9 @@ let find_all h key = find_in_bucket h.data.((hash_param 10 100 key) mod (Array.length h.data)) let iter f h = - let len = Array.length h.data in - for i = 0 to Array.length h.data - 1 do + let d = h.data in + let len = Array.length d in + for i = 0 to len - 1 do let rec do_bucket = function Empty -> () @@ -102,7 +103,7 @@ let iter f h = if (hash_param 10 100 k) mod len = i then begin f k d; do_bucket rest end else do_bucket rest in - do_bucket h.data.(i) + do_bucket d.(i) done let hash x = hash_param 50 500 x diff --git a/stdlib/hashtbl.mli b/stdlib/hashtbl.mli index 628143701..2d7199921 100644 --- a/stdlib/hashtbl.mli +++ b/stdlib/hashtbl.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. *) (* *) (***********************************************************************) diff --git a/stdlib/header.c b/stdlib/header.c index 7ceb931dc..30d1c4100 100644 --- a/stdlib/header.c +++ b/stdlib/header.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/stdlib/headernt.c b/stdlib/headernt.c index 768bb1fe8..c466dfe31 100644 --- a/stdlib/headernt.c +++ b/stdlib/headernt.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/stdlib/lexing.ml b/stdlib/lexing.ml index 33e0ded2a..21d858847 100644 --- a/stdlib/lexing.ml +++ b/stdlib/lexing.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. *) (* *) (***********************************************************************) diff --git a/stdlib/lexing.mli b/stdlib/lexing.mli index d0e4ebd77..b12a9a725 100644 --- a/stdlib/lexing.mli +++ b/stdlib/lexing.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. *) (* *) (***********************************************************************) diff --git a/stdlib/list.ml b/stdlib/list.ml index c4dfb3ab9..fa79c7817 100644 --- a/stdlib/list.ml +++ b/stdlib/list.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. *) (* *) (***********************************************************************) diff --git a/stdlib/list.mli b/stdlib/list.mli index 60c0feb15..1f0804d3f 100644 --- a/stdlib/list.mli +++ b/stdlib/list.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. *) (* *) (***********************************************************************) diff --git a/stdlib/map.ml b/stdlib/map.ml index 4af05803e..b1d725f33 100644 --- a/stdlib/map.ml +++ b/stdlib/map.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. *) (* *) (***********************************************************************) diff --git a/stdlib/map.mli b/stdlib/map.mli index 3da155581..d79da9d2e 100644 --- a/stdlib/map.mli +++ b/stdlib/map.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. *) (* *) (***********************************************************************) diff --git a/stdlib/obj.ml b/stdlib/obj.ml index 8129fa6b9..1ad65dd61 100644 --- a/stdlib/obj.ml +++ b/stdlib/obj.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. *) (* *) (***********************************************************************) diff --git a/stdlib/obj.mli b/stdlib/obj.mli index 9640871a5..295ea93c3 100644 --- a/stdlib/obj.mli +++ b/stdlib/obj.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. *) (* *) (***********************************************************************) diff --git a/stdlib/oo.ml b/stdlib/oo.ml index 16f1c7413..ef98f2930 100644 --- a/stdlib/oo.ml +++ b/stdlib/oo.ml @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/stdlib/oo.mli b/stdlib/oo.mli index 2710fad6b..e617fc4c6 100644 --- a/stdlib/oo.mli +++ b/stdlib/oo.mli @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/stdlib/parsing.ml b/stdlib/parsing.ml index af83e15d4..005f4acdd 100644 --- a/stdlib/parsing.ml +++ b/stdlib/parsing.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. *) (* *) (***********************************************************************) diff --git a/stdlib/parsing.mli b/stdlib/parsing.mli index c2a364d56..a6a5a34cd 100644 --- a/stdlib/parsing.mli +++ b/stdlib/parsing.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. *) (* *) (***********************************************************************) diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml index d2ee5a447..eb8aa8e0f 100644 --- a/stdlib/pervasives.ml +++ b/stdlib/pervasives.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. *) (* *) (***********************************************************************) diff --git a/stdlib/pervasives.mli b/stdlib/pervasives.mli index 33c973802..09b0e7029 100644 --- a/stdlib/pervasives.mli +++ b/stdlib/pervasives.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. *) (* *) (***********************************************************************) diff --git a/stdlib/printexc.ml b/stdlib/printexc.ml index e75fb43ee..bb0be8b44 100644 --- a/stdlib/printexc.ml +++ b/stdlib/printexc.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. *) (* *) (***********************************************************************) diff --git a/stdlib/printexc.mli b/stdlib/printexc.mli index 4c6c027e8..986d8ed3c 100644 --- a/stdlib/printexc.mli +++ b/stdlib/printexc.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. *) (* *) (***********************************************************************) diff --git a/stdlib/printf.ml b/stdlib/printf.ml index 8d7c0f115..085f27f9c 100644 --- a/stdlib/printf.ml +++ b/stdlib/printf.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. *) (* *) (***********************************************************************) diff --git a/stdlib/printf.mli b/stdlib/printf.mli index d167bfd96..5cf740e33 100644 --- a/stdlib/printf.mli +++ b/stdlib/printf.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. *) (* *) (***********************************************************************) diff --git a/stdlib/queue.ml b/stdlib/queue.ml index 15ec967e5..84bb67aa4 100644 --- a/stdlib/queue.ml +++ b/stdlib/queue.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. *) (* *) (***********************************************************************) diff --git a/stdlib/queue.mli b/stdlib/queue.mli index c8504b015..4cc0d6aa4 100644 --- a/stdlib/queue.mli +++ b/stdlib/queue.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. *) (* *) (***********************************************************************) diff --git a/stdlib/random.ml b/stdlib/random.ml index 4100091f2..4ed2dee5f 100644 --- a/stdlib/random.ml +++ b/stdlib/random.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Damien Doligez, projet Para, 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. *) (* *) (***********************************************************************) diff --git a/stdlib/random.mli b/stdlib/random.mli index aa01f6d0a..63cc357f8 100644 --- a/stdlib/random.mli +++ b/stdlib/random.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Damien Doligez, projet Para, 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. *) (* *) (***********************************************************************) diff --git a/stdlib/set.ml b/stdlib/set.ml index 149856ab3..cb0635850 100644 --- a/stdlib/set.ml +++ b/stdlib/set.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. *) (* *) (***********************************************************************) diff --git a/stdlib/set.mli b/stdlib/set.mli index e359adab8..ded5a9bd4 100644 --- a/stdlib/set.mli +++ b/stdlib/set.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. *) (* *) (***********************************************************************) diff --git a/stdlib/sort.ml b/stdlib/sort.ml index d4b6ad0b1..e6a2652e9 100644 --- a/stdlib/sort.ml +++ b/stdlib/sort.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. *) (* *) (***********************************************************************) diff --git a/stdlib/sort.mli b/stdlib/sort.mli index a64d7db99..44c06ff23 100644 --- a/stdlib/sort.mli +++ b/stdlib/sort.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. *) (* *) (***********************************************************************) diff --git a/stdlib/stack.ml b/stdlib/stack.ml index 17233c1e8..40a7398a8 100644 --- a/stdlib/stack.ml +++ b/stdlib/stack.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. *) (* *) (***********************************************************************) diff --git a/stdlib/stack.mli b/stdlib/stack.mli index b91dca4a5..410b38718 100644 --- a/stdlib/stack.mli +++ b/stdlib/stack.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. *) (* *) (***********************************************************************) diff --git a/stdlib/std_exit.ml b/stdlib/std_exit.ml index 4df8a5feb..5debeac6d 100644 --- a/stdlib/std_exit.ml +++ b/stdlib/std_exit.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. *) (* *) (***********************************************************************) diff --git a/stdlib/stream.ml b/stdlib/stream.ml index 3de33f04a..91d280f7f 100644 --- a/stdlib/stream.ml +++ b/stdlib/stream.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Daniel de Rauglaudre, 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. *) (* *) (***********************************************************************) diff --git a/stdlib/stream.mli b/stdlib/stream.mli index 18db4d7c9..9f6d615a1 100644 --- a/stdlib/stream.mli +++ b/stdlib/stream.mli @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Daniel de Rauglaudre, 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. *) (* *) (***********************************************************************) diff --git a/stdlib/string.ml b/stdlib/string.ml index 771813bed..ad7f6524b 100644 --- a/stdlib/string.ml +++ b/stdlib/string.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. *) (* *) (***********************************************************************) diff --git a/stdlib/string.mli b/stdlib/string.mli index 042dfa426..3ae892940 100644 --- a/stdlib/string.mli +++ b/stdlib/string.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. *) (* *) (***********************************************************************) diff --git a/stdlib/sys.ml b/stdlib/sys.ml index 3f50f6ff2..5e52fd3c3 100644 --- a/stdlib/sys.ml +++ b/stdlib/sys.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. *) (* *) (***********************************************************************) diff --git a/stdlib/sys.mli b/stdlib/sys.mli index d316a6e0e..14245ccd5 100644 --- a/stdlib/sys.mli +++ b/stdlib/sys.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. *) (* *) (***********************************************************************) diff --git a/test/KB/equations.ml b/test/KB/equations.ml index 92770283e..ed13f4eb4 100644 --- a/test/KB/equations.ml +++ b/test/KB/equations.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. *) (* *) (***********************************************************************) diff --git a/test/KB/equations.mli b/test/KB/equations.mli index caa88ec96..619fd5710 100644 --- a/test/KB/equations.mli +++ b/test/KB/equations.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. *) (* *) (***********************************************************************) diff --git a/test/KB/kb.ml b/test/KB/kb.ml index b4d2b6d32..52c9e8d1e 100644 --- a/test/KB/kb.ml +++ b/test/KB/kb.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. *) (* *) (***********************************************************************) diff --git a/test/KB/kb.mli b/test/KB/kb.mli index d715f2daf..c80771ab6 100644 --- a/test/KB/kb.mli +++ b/test/KB/kb.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. *) (* *) (***********************************************************************) diff --git a/test/KB/kbmain.ml b/test/KB/kbmain.ml index 61047351a..84d555dfd 100644 --- a/test/KB/kbmain.ml +++ b/test/KB/kbmain.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. *) (* *) (***********************************************************************) diff --git a/test/KB/orderings.ml b/test/KB/orderings.ml index 2f30c8cb0..762d5849b 100644 --- a/test/KB/orderings.ml +++ b/test/KB/orderings.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. *) (* *) (***********************************************************************) diff --git a/test/KB/orderings.mli b/test/KB/orderings.mli index 91777aeb0..678ffd5ba 100644 --- a/test/KB/orderings.mli +++ b/test/KB/orderings.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. *) (* *) (***********************************************************************) diff --git a/test/KB/terms.ml b/test/KB/terms.ml index d4790f6ed..493bfb262 100644 --- a/test/KB/terms.ml +++ b/test/KB/terms.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. *) (* *) (***********************************************************************) diff --git a/test/KB/terms.mli b/test/KB/terms.mli index 7d1197074..302c3801a 100644 --- a/test/KB/terms.mli +++ b/test/KB/terms.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. *) (* *) (***********************************************************************) diff --git a/test/Lex/gram_aux.ml b/test/Lex/gram_aux.ml index 0d6d724c7..17eb892c0 100644 --- a/test/Lex/gram_aux.ml +++ b/test/Lex/gram_aux.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. *) (* *) (***********************************************************************) @@ -29,11 +29,11 @@ let regexp_for_string s = let char_class c1 c2 = - let class = ref [] in + let cl = ref [] in for i = Char.code c2 downto Char.code c1 do - class := Char.chr i :: !class + cl := Char.chr i :: !cl done; - !class + !cl let all_chars = char_class '\001' '\255' diff --git a/test/Lex/grammar.mly b/test/Lex/grammar.mly index f5e8ba398..e0d989062 100644 --- a/test/Lex/grammar.mly +++ b/test/Lex/grammar.mly @@ -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. */ /* */ /***********************************************************************/ diff --git a/test/Lex/lexgen.ml b/test/Lex/lexgen.ml index 6dd225000..cf0d85d07 100644 --- a/test/Lex/lexgen.ml +++ b/test/Lex/lexgen.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. *) (* *) (***********************************************************************) @@ -165,7 +165,7 @@ let rec lastpos = function let followpos size name_regexp_list = - let v = Array.new size [] in + let v = Array.create size [] in let fill_pos first = function OnChars pos -> v.(pos) <- merge_trans first v.(pos); () | ToAction _ -> () in @@ -195,7 +195,7 @@ let split_trans_set = (no_action, []) -let memory = (Hashtbl.new 131 : (transition list, int) Hashtbl.t) +let memory = (Hashtbl.create 131 : (transition list, int) Hashtbl.t) let todo = ref ([] : (transition list * int) list) let next = ref 0 @@ -222,8 +222,8 @@ let goto_state = function let transition_from chars follow pos_set = - let tr = Array.new 256 [] - and shift = Array.new 256 Backtrack in + let tr = Array.create 256 [] + and shift = Array.create 256 Backtrack in List.iter (fun pos -> List.iter @@ -259,7 +259,7 @@ let make_dfa lexdef = let states = map_on_states (translate_state chars follow) in let v = - Array.new (number_of_states()) (Perform 0) in + Array.create (number_of_states()) (Perform 0) in List.iter (fun (auto, i) -> v.(i) <- auto) states; (initial_states, v, actions) diff --git a/test/Lex/main.ml b/test/Lex/main.ml index bdf1176bc..1e8a7e81e 100644 --- a/test/Lex/main.ml +++ b/test/Lex/main.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. *) (* *) (***********************************************************************) diff --git a/test/Lex/output.ml b/test/Lex/output.ml index 0b5350e75..2a94efe0b 100644 --- a/test/Lex/output.ml +++ b/test/Lex/output.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. *) (* *) (***********************************************************************) diff --git a/test/Lex/scan_aux.ml b/test/Lex/scan_aux.ml index 7bf98bcf0..1c2db88db 100644 --- a/test/Lex/scan_aux.ml +++ b/test/Lex/scan_aux.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. *) (* *) (***********************************************************************) diff --git a/test/Lex/scanner.mll b/test/Lex/scanner.mll index bc3cc29f6..08a687325 100644 --- a/test/Lex/scanner.mll +++ b/test/Lex/scanner.mll @@ -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. *) (* *) (***********************************************************************) diff --git a/test/Lex/syntax.ml b/test/Lex/syntax.ml index 6685f8e7e..40ced286c 100644 --- a/test/Lex/syntax.ml +++ b/test/Lex/syntax.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. *) (* *) (***********************************************************************) diff --git a/test/Lex/testmain.ml b/test/Lex/testmain.ml index 1862c592e..969890f3b 100644 --- a/test/Lex/testmain.ml +++ b/test/Lex/testmain.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. *) (* *) (***********************************************************************) diff --git a/test/Lex/testscanner.mll b/test/Lex/testscanner.mll index f01ff5cca..3a88596ee 100644 --- a/test/Lex/testscanner.mll +++ b/test/Lex/testscanner.mll @@ -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. *) (* *) (***********************************************************************) diff --git a/test/Makefile b/test/Makefile index fd1542e67..8b3b2eb6a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,12 +1,12 @@ include ../config/Makefile -CAMLC=../boot/cslrun ../cslc -I ../stdlib -I KB -I Lex -CAMLOPT=../boot/cslrun ../cslopt -I ../stdlib -I KB -I Lex +CAMLC=../boot/ocamlrun ../ocamlc -I ../stdlib -I KB -I Lex +CAMLOPT=../boot/ocamlrun ../ocamlopt -I ../stdlib -I KB -I Lex OPTFLAGS=-S -CAMLYACC=../yacc/cslyacc -CAMLLEX=../boot/cslrun ../lex/csllex -CAMLDEP=../boot/cslrun ../tools/csldep -CAMLRUN=../byterun/cslrun +CAMLYACC=../yacc/ocamlyacc +CAMLLEX=../boot/ocamlrun ../lex/ocamllex +CAMLDEP=../boot/ocamlrun ../tools/ocamldep +CAMLRUN=../byterun/ocamlrun CODERUNPARAMS=CAMLRUNPARAM='o=100' BYTE_EXE=fib.byt takc.byt taku.byt sieve.byt quicksort.byt quicksort.fast.byt \ @@ -57,14 +57,14 @@ clean:: rm -f Lex/*.cm[iox] Lex/*.[os] rm -f Lex/*~ -Lex/grammar.ml Lex/grammar.mli: Lex/grammar.mly ../yacc/cslyacc +Lex/grammar.ml Lex/grammar.mli: Lex/grammar.mly ../yacc/ocamlyacc $(CAMLYACC) $(YACCFLAGS) Lex/grammar.mly clean:: rm -f Lex/grammar.ml Lex/grammar.mli beforedepend:: Lex/grammar.ml Lex/grammar.mli -Lex/scanner.ml: Lex/scanner.mll ../lex/csllex +Lex/scanner.ml: Lex/scanner.mll ../lex/ocamllex $(CAMLLEX) Lex/scanner.mll clean:: @@ -101,9 +101,9 @@ beforedepend:: Lex/scanner.ml .ml.cmx: $(CAMLOPT) $(OPTFLAGS) -c $< -$(BYTE_EXE) $(BYTE_KB) $(BYTE_GENLEX): ../cslc +$(BYTE_EXE) $(BYTE_KB) $(BYTE_GENLEX): ../ocamlc $(BYTE_EXE): ../stdlib/stdlib.cma -$(CODE_EXE) $(CODE_KB) $(CODE_GENLEX): ../cslopt +$(CODE_EXE) $(CODE_KB) $(CODE_GENLEX): ../ocamlopt $(CODE_EXE): ../stdlib/stdlib.cmxa ../stdlib/libasmrun.a clean:: diff --git a/test/Makefile.nt b/test/Makefile.nt index 3b2d8474c..88ae492f1 100644 --- a/test/Makefile.nt +++ b/test/Makefile.nt @@ -1,12 +1,12 @@ !include ..\config\Makefile.nt -CAMLC=..\boot\cslrun ..\cslc -I ..\stdlib -I KB -I Lex -CAMLOPT=..\boot\cslrun ..\cslopt -I ..\stdlib -I KB -I Lex +CAMLC=..\boot\ocamlrun ..\ocamlc -I ..\stdlib -I KB -I Lex +CAMLOPT=..\boot\ocamlrun ..\ocamlopt -I ..\stdlib -I KB -I Lex OPTFLAGS=-S -CAMLYACC=..\yacc\cslyacc -CAMLLEX=..\boot\cslrun ..\lex\csllex -CAMLDEP=..\boot\cslrun ..\tools\csldep -CAMLRUN=..\byterun\cslrun +CAMLYACC=..\yacc\ocamlyacc +CAMLLEX=..\boot\ocamlrun ..\lex\ocamllex +CAMLDEP=..\boot\ocamlrun ..\tools\ocamldep +CAMLRUN=..\byterun\ocamlrun CODERUNPARAMS=CAMLRUNPARAM='o=100' BYTE_EXE=fib.byt takc.byt taku.byt sieve.byt quicksort.byt quicksort.fast.byt \ @@ -121,9 +121,9 @@ fft.fast.exe: fft.ml .ml.cmx: $(CAMLOPT) $(OPTFLAGS) -c $< -$(BYTE_EXE) $(BYTE_KB) $(BYTE_GENLEX): ..\cslc +$(BYTE_EXE) $(BYTE_KB) $(BYTE_GENLEX): ..\ocamlc $(BYTE_EXE): ..\stdlib\stdlib.cma -$(CODE_EXE) $(CODE_KB) $(CODE_GENLEX): ..\cslopt +$(CODE_EXE) $(CODE_KB) $(CODE_GENLEX): ..\ocamlopt $(CODE_EXE): ..\stdlib\stdlib.cmxa ..\stdlib\libasmrun.lib clean:: diff --git a/test/Moretest/Makefile b/test/Moretest/Makefile index e8b083b43..e79523031 100644 --- a/test/Moretest/Makefile +++ b/test/Moretest/Makefile @@ -1,10 +1,10 @@ include ../../config/Makefile -CAMLC=../../boot/cslrun ../../cslc -I ../../stdlib -CAMLOPT=../../boot/cslrun ../../cslopt -I ../../stdlib +CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib +CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib OPTFLAGS=-S -CAMLDEP=../../boot/cslrun ../../tools/csldep -CAMLRUN=../../byterun/cslrun +CAMLDEP=../../boot/ocamlrun ../../tools/ocamldep +CAMLRUN=../../byterun/ocamlrun CODERUNPARAMS=CAMLRUNPARAM='o=100' callback.byt: callback.cmo callbackprim.o diff --git a/test/Moretest/sets.ml b/test/Moretest/sets.ml index 4a363d62d..7d295823b 100644 --- a/test/Moretest/sets.ml +++ b/test/Moretest/sets.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. *) (* *) (***********************************************************************) diff --git a/test/boyer.ml b/test/boyer.ml index 054699271..5eaceff9a 100644 --- a/test/boyer.ml +++ b/test/boyer.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. *) (* *) (***********************************************************************) diff --git a/test/fft.ml b/test/fft.ml index 7a7517c4c..9dabe517d 100644 --- a/test/fft.ml +++ b/test/fft.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. *) (* *) (***********************************************************************) @@ -136,8 +136,8 @@ let test np = print_int np; print_string "... "; flush stdout; let enp = float np in let npm = np / 2 - 1 in - let pxr = Array.new (np+2) 0.0 - and pxi = Array.new (np+2) 0.0 in + let pxr = Array.create (np+2) 0.0 + and pxi = Array.create (np+2) 0.0 in let t = pi /. enp in pxr.(1) <- (enp -. 1.0) *. 0.5; pxi.(1) <- 0.0; diff --git a/test/fib.ml b/test/fib.ml index bb8833729..ef7aa3bfc 100644 --- a/test/fib.ml +++ b/test/fib.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. *) (* *) (***********************************************************************) diff --git a/test/nucleic.ml b/test/nucleic.ml index 931ac178f..146809e87 100644 --- a/test/nucleic.ml +++ b/test/nucleic.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. *) (* *) (***********************************************************************) @@ -2875,15 +2875,15 @@ let rec get_var id (v::lst) = (* Sequential backtracking algorithm *) -let rec search (partial_inst : variable list) l constraint = +let rec search (partial_inst : variable list) l constr = match l with [] -> [partial_inst] | (h::t) -> let rec try_assignments = function [] -> [] | v::vs -> - if constraint v partial_inst then - (search (v::partial_inst) t constraint) @ (try_assignments vs) + if constr v partial_inst then + (search (v::partial_inst) t constr) @ (try_assignments vs) else try_assignments vs in diff --git a/test/quicksort.ml b/test/quicksort.ml index 7a484b259..0f42248d9 100644 --- a/test/quicksort.ml +++ b/test/quicksort.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. *) (* *) (***********************************************************************) @@ -64,8 +64,8 @@ let random() = exception Failed let test_sort sort_fun size = - let a = Array.new size 0 in - let check = Array.new 4096 0 in + let a = Array.create size 0 in + let check = Array.create 4096 0 in for i = 0 to size-1 do let n = random() in a.(i) <- n; check.(n) <- check.(n)+1 done; diff --git a/test/sieve.ml b/test/sieve.ml index 4a11e9020..22dc759bb 100644 --- a/test/sieve.ml +++ b/test/sieve.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. *) (* *) (***********************************************************************) diff --git a/test/soli.ml b/test/soli.ml index e143d4761..80c2b8673 100644 --- a/test/soli.ml +++ b/test/soli.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. *) (* *) (***********************************************************************) @@ -49,7 +49,7 @@ let dir = [| {dx = 0; dy = 1}; {dx = 1; dy = 0}; type move = { x1: int; y1: int; x2: int; y2: int } -let moves = Array.new 31 {x1=0;y1=0;x2=0;y2=0} +let moves = Array.create 31 {x1=0;y1=0;x2=0;y2=0} let counter = ref 0 diff --git a/test/takc.ml b/test/takc.ml index 627f26423..c561b8156 100644 --- a/test/takc.ml +++ b/test/takc.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. *) (* *) (***********************************************************************) diff --git a/test/taku.ml b/test/taku.ml index e14225300..95dab2ea7 100644 --- a/test/taku.ml +++ b/test/taku.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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/Makefile b/testasmcomp/Makefile index 2513bc4ea..67bdcf8b7 100644 --- a/testasmcomp/Makefile +++ b/testasmcomp/Makefile @@ -1,14 +1,14 @@ include ../config/Makefile -CAMLC=../boot/cslrun ../boot/cslc -I ../boot +CAMLC=../boot/ocamlrun ../boot/ocamlc -I ../boot 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=../boot/cslrun +CAMLRUN=../boot/ocamlrun CODEGEN=./codegen CC=$(NATIVECC) @@ -23,10 +23,10 @@ INCLUDES=-I ../utils -I ../typing -I ../asmcomp OTHEROBJS=../utils/misc.cmo ../utils/tbl.cmo \ ../utils/clflags.cmo ../utils/config.cmo \ - ../parsing/location.cmo \ - ../typing/ident.cmo ../typing/path.cmo ../typing/subst.cmo \ - ../typing/primitive.cmo ../typing/predef.cmo ../typing/printtyp.cmo \ - ../typing/datarepr.cmo ../typing/env.cmo \ + ../parsing/location.cmo ../parsing/label.cmo \ + ../typing/ident.cmo ../typing/path.cmo \ + ../typing/typedtree.cmo ../typing/subst.cmo ../typing/primitive.cmo \ + ../typing/predef.cmo ../typing/datarepr.cmo ../typing/env.cmo \ ../bytecomp/lambda.cmo \ ../asmcomp/arch.cmo ../asmcomp/cmm.cmo ../asmcomp/printcmm.cmo \ ../asmcomp/clambda.cmo ../asmcomp/compilenv.cmo \ diff --git a/testasmcomp/Makefile.nt b/testasmcomp/Makefile.nt index e15a85d89..3b07dbc0d 100644 --- a/testasmcomp/Makefile.nt +++ b/testasmcomp/Makefile.nt @@ -1,14 +1,14 @@ !include ..\config\Makefile.nt -CAMLC=..\boot\cslrun ..\boot\cslc -I ..\boot +CAMLC=..\boot\ocamlrun ..\boot\ocamlc -I ..\boot 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=..\boot\cslrun +CAMLRUN=..\boot\ocamlrun CODEGEN=.\codegen CC=$(NATIVECC) diff --git a/testasmcomp/alpha.asm b/testasmcomp/alpha.asm index 2bb1a2686..db5a64412 100644 --- a/testasmcomp/alpha.asm +++ b/testasmcomp/alpha.asm @@ -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. */ /* */ /***********************************************************************/ diff --git a/testasmcomp/arith.cmm b/testasmcomp/arith.cmm index afb410257..0ae71f85a 100644 --- a/testasmcomp/arith.cmm +++ b/testasmcomp/arith.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/checkbound.cmm b/testasmcomp/checkbound.cmm index 9beade6ef..159aa4b9c 100644 --- a/testasmcomp/checkbound.cmm +++ b/testasmcomp/checkbound.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/fib.cmm b/testasmcomp/fib.cmm index 19336302c..001957e3e 100644 --- a/testasmcomp/fib.cmm +++ b/testasmcomp/fib.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/hppa.asm b/testasmcomp/hppa.asm index 007d3cd8d..7679edaeb 100644 --- a/testasmcomp/hppa.asm +++ b/testasmcomp/hppa.asm @@ -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. * ;* * ;********************************************************************* diff --git a/testasmcomp/i386.S b/testasmcomp/i386.S index 1eedc65b2..1cd08eef5 100644 --- a/testasmcomp/i386.S +++ b/testasmcomp/i386.S @@ -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. */ /* */ /***********************************************************************/ diff --git a/testasmcomp/i386nt.asm b/testasmcomp/i386nt.asm index 1bcbf84f8..51272b58c 100644 --- a/testasmcomp/i386nt.asm +++ b/testasmcomp/i386nt.asm @@ -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. ; ;********************************************************************* diff --git a/testasmcomp/integr.cmm b/testasmcomp/integr.cmm index 0d2a1dbe7..4dde4e684 100644 --- a/testasmcomp/integr.cmm +++ b/testasmcomp/integr.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/lexcmm.mli b/testasmcomp/lexcmm.mli index bfe114901..f84a3a835 100644 --- a/testasmcomp/lexcmm.mli +++ b/testasmcomp/lexcmm.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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/lexcmm.mll b/testasmcomp/lexcmm.mll index 032b7bc7d..d7f12c3de 100644 --- a/testasmcomp/lexcmm.mll +++ b/testasmcomp/lexcmm.mll @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/main.c b/testasmcomp/main.c index 8a83bdacc..214b481e1 100644 --- a/testasmcomp/main.c +++ b/testasmcomp/main.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/testasmcomp/main.ml b/testasmcomp/main.ml index 5d80c670e..ec1af937c 100644 --- a/testasmcomp/main.ml +++ b/testasmcomp/main.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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/mainarith.c b/testasmcomp/mainarith.c index 78a78eb6c..f487044f4 100644 --- a/testasmcomp/mainarith.c +++ b/testasmcomp/mainarith.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/testasmcomp/mips.asm b/testasmcomp/mips.asm index 03992b504..82f2e23f8 100644 --- a/testasmcomp/mips.asm +++ b/testasmcomp/mips.asm @@ -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. */ /* */ /***********************************************************************/ diff --git a/testasmcomp/parsecmm.mly b/testasmcomp/parsecmm.mly index 16a4e5a05..31ad14c2f 100644 --- a/testasmcomp/parsecmm.mly +++ b/testasmcomp/parsecmm.mly @@ -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. */ /* */ /***********************************************************************/ @@ -25,9 +25,9 @@ let rec make_letdef def body = Clet(id, def, make_letdef rem body) let make_switch n selector caselist = - let index = Array.new n 0 in + let index = Array.create n 0 in let casev = Array.of_list caselist in - let actv = Array.new (Array.length casev) Cexit in + let actv = Array.create (Array.length casev) Cexit in for i = 0 to Array.length casev - 1 do let (posl, e) = casev.(i) in List.iter (fun pos -> index.(pos) <- i) posl; diff --git a/testasmcomp/parsecmmaux.ml b/testasmcomp/parsecmmaux.ml index 2bd36f16d..371f210a0 100644 --- a/testasmcomp/parsecmmaux.ml +++ b/testasmcomp/parsecmmaux.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. *) (* *) (***********************************************************************) @@ -18,10 +18,10 @@ type error = exception Error of error -let tbl_ident = (Hashtbl.new 57 : (string, Ident.t) Hashtbl.t) +let tbl_ident = (Hashtbl.create 57 : (string, Ident.t) Hashtbl.t) let bind_ident s = - let id = Ident.new s in + let id = Ident.create s in Hashtbl.add tbl_ident s id; id diff --git a/testasmcomp/parsecmmaux.mli b/testasmcomp/parsecmmaux.mli index 0f2d84f69..186f7d9df 100644 --- a/testasmcomp/parsecmmaux.mli +++ b/testasmcomp/parsecmmaux.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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/power.asm b/testasmcomp/power.asm index 11f3cff9b..cde1d30a3 100644 --- a/testasmcomp/power.asm +++ b/testasmcomp/power.asm @@ -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. * #* * #********************************************************************* diff --git a/testasmcomp/quicksort.cmm b/testasmcomp/quicksort.cmm index cfcb601ad..cca6eb3d4 100644 --- a/testasmcomp/quicksort.cmm +++ b/testasmcomp/quicksort.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/quicksort2.cmm b/testasmcomp/quicksort2.cmm index 7bf8e617d..b1d3453ca 100644 --- a/testasmcomp/quicksort2.cmm +++ b/testasmcomp/quicksort2.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/soli.cmm b/testasmcomp/soli.cmm index b91994eb3..5bee86ffa 100644 --- a/testasmcomp/soli.cmm +++ b/testasmcomp/soli.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/sparc.asm b/testasmcomp/sparc.asm index 45eb4ed46..254875e14 100644 --- a/testasmcomp/sparc.asm +++ b/testasmcomp/sparc.asm @@ -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. */ /* */ /***********************************************************************/ diff --git a/testasmcomp/tagged-fib.cmm b/testasmcomp/tagged-fib.cmm index b31a449c2..5d18a5ea0 100644 --- a/testasmcomp/tagged-fib.cmm +++ b/testasmcomp/tagged-fib.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/tagged-integr.cmm b/testasmcomp/tagged-integr.cmm index b88df9d92..cce79ebdc 100644 --- a/testasmcomp/tagged-integr.cmm +++ b/testasmcomp/tagged-integr.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/tagged-quicksort.cmm b/testasmcomp/tagged-quicksort.cmm index ac33af658..500e49a66 100644 --- a/testasmcomp/tagged-quicksort.cmm +++ b/testasmcomp/tagged-quicksort.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/tagged-tak.cmm b/testasmcomp/tagged-tak.cmm index ca78dbf73..667566600 100644 --- a/testasmcomp/tagged-tak.cmm +++ b/testasmcomp/tagged-tak.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/testasmcomp/tak.cmm b/testasmcomp/tak.cmm index 162664285..639956699 100644 --- a/testasmcomp/tak.cmm +++ b/testasmcomp/tak.cmm @@ -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. *) (* *) (***********************************************************************) diff --git a/tools/.cvsignore b/tools/.cvsignore index 56c8c9c76..73f5ff79d 100644 --- a/tools/.cvsignore +++ b/tools/.cvsignore @@ -1,6 +1,6 @@ -csldep -csldep.ml -cslprof +ocamldep +ocamldep.ml +ocamlprof opnames.ml dumpobj dumpapprox diff --git a/tools/Makefile b/tools/Makefile index 6d89d48bb..47616bc6e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,56 +1,56 @@ include ../config/Makefile -CAMLRUN=../boot/cslrun -CAMLC=$(CAMLRUN) ../boot/cslc -I ../boot -CAMLLEX=$(CAMLRUN) ../boot/csllex +CAMLRUN=../boot/ocamlrun +CAMLC=$(CAMLRUN) ../boot/ocamlc -I ../boot +CAMLLEX=$(CAMLRUN) ../boot/ocamllex INCLUDES=-I ../utils -I ../parsing -I ../typing -I ../bytecomp -I ../asmcomp COMPFLAGS=$(INCLUDES) LINKFLAGS=$(INCLUDES) -all: csldep cslprof +all: ocamldep ocamlprof # The dependency generator -CAMLDEP=csldep.cmo +CAMLDEP=ocamldep.cmo -csldep: $(CAMLDEP) - $(CAMLC) $(LINKFLAGS) -o csldep misc.cmo $(CAMLDEP) +ocamldep: $(CAMLDEP) + $(CAMLC) $(LINKFLAGS) -o ocamldep misc.cmo $(CAMLDEP) clean:: - rm -f csldep + rm -f ocamldep -csldep.ml: csldep.mll - $(CAMLLEX) csldep.mll +ocamldep.ml: ocamldep.mll + $(CAMLLEX) ocamldep.mll clean:: - rm -f csldep.ml + rm -f ocamldep.ml install:: - cp csldep $(BINDIR)/csldep + cp ocamldep $(BINDIR)/ocamldep -beforedepend:: csldep +beforedepend:: ocamldep # The profiler -CSLPROF=cslprof.cmo +CSLPROF=ocamlprof.cmo CSLPROF_IMPORTS=misc.cmo config.cmo clflags.cmo terminfo.cmo \ location.cmo longident.cmo pstream.cmo parser.cmo lexer.cmo parse.cmo -cslprof: $(CSLPROF) profiling.cmo - $(CAMLC) $(LINKFLAGS) -o cslprof $(CSLPROF_IMPORTS) $(CSLPROF) +ocamlprof: $(CSLPROF) profiling.cmo + $(CAMLC) $(LINKFLAGS) -o ocamlprof $(CSLPROF_IMPORTS) $(CSLPROF) install:: - cp cslprof $(BINDIR)/cslprof - cp cslcp $(BINDIR)/cslcp + cp ocamlprof $(BINDIR)/ocamlprof + cp ocamlcp $(BINDIR)/ocamlcp cp profiling.cmi profiling.cmo $(LIBDIR) clean:: - rm -f cslprof + rm -f ocamlprof # To make custom toplevels install:: - cp cslmktop $(BINDIR)/cslmktop + cp ocamlmktop $(BINDIR)/ocamlmktop # The bytecode disassembler @@ -106,6 +106,6 @@ clean:: rm -f *.cmo *.cmi depend: beforedepend - $(CAMLRUN) ./csldep $(INCLUDES) *.mli *.ml > .depend + $(CAMLRUN) ./ocamldep $(INCLUDES) *.mli *.ml > .depend include .depend diff --git a/tools/Makefile.nt b/tools/Makefile.nt index 88eba5139..4423970f8 100644 --- a/tools/Makefile.nt +++ b/tools/Makefile.nt @@ -1,65 +1,65 @@ !include ..\config\Makefile.nt -CAMLRUN=..\boot\cslrun -CAMLC=$(CAMLRUN) ..\boot\cslc -I ..\boot -CAMLLEX=$(CAMLRUN) ..\boot\csllex +CAMLRUN=..\boot\ocamlrun +CAMLC=$(CAMLRUN) ..\boot\ocamlc -I ..\boot +CAMLLEX=$(CAMLRUN) ..\boot\ocamllex INCLUDES=-I ..\utils -I ..\parsing -I ..\typing -I ..\bytecomp -I ..\asmcomp COMPFLAGS=$(INCLUDES) LINKFLAGS=$(INCLUDES) -all: csldep cslprof cslcp.exe cslmktop.exe +all: ocamldep ocamlprof ocamlcp.exe ocamlmktop.exe # The dependency generator -CAMLDEP=csldep.cmo +CAMLDEP=ocamldep.cmo -csldep: $(CAMLDEP) - $(CAMLC) $(LINKFLAGS) -o csldep misc.cmo $(CAMLDEP) +ocamldep: $(CAMLDEP) + $(CAMLC) $(LINKFLAGS) -o ocamldep misc.cmo $(CAMLDEP) clean:: - rm -f csldep + rm -f ocamldep -csldep.ml: csldep.mll - $(CAMLLEX) csldep.mll +ocamldep.ml: ocamldep.mll + $(CAMLLEX) ocamldep.mll clean:: - rm -f csldep.ml + rm -f ocamldep.ml install:: - cp csldep $(BINDIR)\csldep.exe + cp ocamldep $(BINDIR)\ocamldep.exe -beforedepend:: csldep +beforedepend:: ocamldep # The profiler -CSLPROF=cslprof.cmo +CSLPROF=ocamlprof.cmo CSLPROF_IMPORTS=misc.cmo config.cmo clflags.cmo terminfo.cmo \ location.cmo longident.cmo pstream.cmo parser.cmo lexer.cmo parse.cmo -cslprof: $(CSLPROF) profiling.cmo - $(CAMLC) $(LINKFLAGS) -o cslprof $(CSLPROF_IMPORTS) $(CSLPROF) +ocamlprof: $(CSLPROF) profiling.cmo + $(CAMLC) $(LINKFLAGS) -o ocamlprof $(CSLPROF_IMPORTS) $(CSLPROF) -cslcp.exe: cslcp.cmo - $(CAMLC) $(LINKFLAGS) -o cslcp.exe cslcp.cmo +ocamlcp.exe: ocamlcp.cmo + $(CAMLC) $(LINKFLAGS) -o ocamlcp.exe ocamlcp.cmo install:: - cp cslprof $(BINDIR)\cslprof.exe - cp cslcp.exe $(BINDIR)\cslcp.exe + cp ocamlprof $(BINDIR)\ocamlprof.exe + cp ocamlcp.exe $(BINDIR)\ocamlcp.exe cp profiling.cmi profiling.cmo $(LIBDIR) clean:: - rm -f cslprof cslcp.exe + rm -f ocamlprof ocamlcp.exe # To make custom toplevels -cslmktop.exe: cslmktop.cmo - $(CAMLC) $(LINKFLAGS) -o cslmktop.exe cslmktop.cmo +ocamlmktop.exe: ocamlmktop.cmo + $(CAMLC) $(LINKFLAGS) -o ocamlmktop.exe ocamlmktop.cmo install:: - cp cslmktop.exe $(BINDIR)\cslmktop.exe + cp ocamlmktop.exe $(BINDIR)\ocamlmktop.exe clean:: - rm -f cslmktop.exe + rm -f ocamlmktop.exe # The bytecode disassembler @@ -115,6 +115,6 @@ clean:: rm -f *.cmo *.cmi depend: beforedepend - $(CAMLRUN) .\csldep $(INCLUDES) *.mli *.ml > .depend + $(CAMLRUN) .\ocamldep $(INCLUDES) *.mli *.ml > .depend !include .depend diff --git a/tools/dumpapprox.ml b/tools/dumpapprox.ml index e738ff72d..214c9a382 100644 --- a/tools/dumpapprox.ml +++ b/tools/dumpapprox.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. *) (* *) (***********************************************************************) diff --git a/tools/dumpobj.ml b/tools/dumpobj.ml index d2a604684..920379ea8 100644 --- a/tools/dumpobj.ml +++ b/tools/dumpobj.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. *) (* *) (***********************************************************************) diff --git a/tools/objinfo.ml b/tools/objinfo.ml index ea93542f8..61300912b 100644 --- a/tools/objinfo.ml +++ b/tools/objinfo.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. *) (* *) (***********************************************************************) diff --git a/tools/cslcp b/tools/ocamlcp index fd5be6665..fd5be6665 100755 --- a/tools/cslcp +++ b/tools/ocamlcp diff --git a/tools/cslcp.ml b/tools/ocamlcp.ml index 90f8caf6d..fbc4c6d65 100644 --- a/tools/cslcp.ml +++ b/tools/ocamlcp.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. *) (* *) (***********************************************************************) diff --git a/tools/csldep.mll b/tools/ocamldep.mll index ed598ea89..5e1a87590 100644 --- a/tools/csldep.mll +++ b/tools/ocamldep.mll @@ -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. *) (* *) (***********************************************************************) diff --git a/tools/cslmktop b/tools/ocamlmktop index f11f85ed9..f11f85ed9 100755 --- a/tools/cslmktop +++ b/tools/ocamlmktop diff --git a/tools/cslmktop.ml b/tools/ocamlmktop.ml index aec257252..a199f9240 100644 --- a/tools/cslmktop.ml +++ b/tools/ocamlmktop.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. *) (* *) (***********************************************************************) diff --git a/tools/cslprof.ml b/tools/ocamlprof.ml index 98dffd360..f649c3b6a 100644 --- a/tools/cslprof.ml +++ b/tools/ocamlprof.ml @@ -1,11 +1,11 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Damien Doligez and Francois Rouaix, INRIA Rocquencourt *) (* Ported to Caml Special Light by John Malecki *) (* *) -(* Copyright 1995 Institut National de Recherche en Informatique et *) +(* Copyright 1996 Institut National de Recherche en Informatique et *) (* Automatique. Distributed only by permission. *) (* *) (***********************************************************************) diff --git a/tools/cslsize b/tools/ocamlsize index 8904d47a2..8904d47a2 100755 --- a/tools/cslsize +++ b/tools/ocamlsize diff --git a/tools/profiling.ml b/tools/profiling.ml index 362b7d1a8..69efdb94d 100644 --- a/tools/profiling.ml +++ b/tools/profiling.ml @@ -1,11 +1,11 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Damien Doligez and Francois Rouaix, INRIA Rocquencourt *) (* Ported to Caml Special Light by John Malecki and Xavier Leroy *) (* *) -(* Copyright 1995 Institut National de Recherche en Informatique et *) +(* Copyright 1996 Institut National de Recherche en Informatique et *) (* Automatique. Distributed only by permission. *) (* *) (***********************************************************************) diff --git a/tools/profiling.mli b/tools/profiling.mli index bd9ad74a4..9d9eceb4d 100644 --- a/tools/profiling.mli +++ b/tools/profiling.mli @@ -1,11 +1,11 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Damien Doligez and Francois Rouaix, INRIA Rocquencourt *) (* Ported to Caml Special Light by John Malecki and Xavier Leroy *) (* *) -(* Copyright 1995 Institut National de Recherche en Informatique et *) +(* Copyright 1996 Institut National de Recherche en Informatique et *) (* Automatique. Distributed only by permission. *) (* *) (***********************************************************************) diff --git a/toplevel/expunge.ml b/toplevel/expunge.ml index 77acf5521..2de01aff2 100644 --- a/toplevel/expunge.ml +++ b/toplevel/expunge.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. *) (* *) (***********************************************************************) diff --git a/toplevel/printval.ml b/toplevel/printval.ml index b6c02b457..26c2f3b57 100644 --- a/toplevel/printval.ml +++ b/toplevel/printval.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. *) (* *) (***********************************************************************) diff --git a/toplevel/printval.mli b/toplevel/printval.mli index 988d30de1..f940ed019 100644 --- a/toplevel/printval.mli +++ b/toplevel/printval.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. *) (* *) (***********************************************************************) diff --git a/toplevel/topdirs.ml b/toplevel/topdirs.ml index 569b2cd40..4e4f4a7ba 100644 --- a/toplevel/topdirs.ml +++ b/toplevel/topdirs.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. *) (* *) (***********************************************************************) diff --git a/toplevel/topdirs.mli b/toplevel/topdirs.mli index 3adea2b1e..4c98872ed 100644 --- a/toplevel/topdirs.mli +++ b/toplevel/topdirs.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. *) (* *) (***********************************************************************) diff --git a/toplevel/toploop.ml b/toplevel/toploop.ml index 4fdfb54da..72a4a7fb4 100644 --- a/toplevel/toploop.ml +++ b/toplevel/toploop.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. *) (* *) (***********************************************************************) @@ -196,7 +196,7 @@ let _ = (* The loop *) let loop() = - print_string "\tCaml Special Light version "; + print_string "\tObjective Caml version "; print_string Config.version; print_newline(); print_newline(); (* Add whatever -I options have been specified on the command line, diff --git a/toplevel/toploop.mli b/toplevel/toploop.mli index 554591493..ef3653f4e 100644 --- a/toplevel/toploop.mli +++ b/toplevel/toploop.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. *) (* *) (***********************************************************************) diff --git a/toplevel/topmain.ml b/toplevel/topmain.ml index a8a0377f3..4ee44fd12 100644 --- a/toplevel/topmain.ml +++ b/toplevel/topmain.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. *) (* *) (***********************************************************************) diff --git a/toplevel/trace.ml b/toplevel/trace.ml index a6e3e9f1f..86d9836c9 100644 --- a/toplevel/trace.ml +++ b/toplevel/trace.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. *) (* *) (***********************************************************************) diff --git a/toplevel/trace.mli b/toplevel/trace.mli index 931f05287..d9ebe1b05 100644 --- a/toplevel/trace.mli +++ b/toplevel/trace.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. *) (* *) (***********************************************************************) diff --git a/typing/ctype.ml b/typing/ctype.ml index 9ebf2869c..8b8ca76de 100644 --- a/typing/ctype.ml +++ b/typing/ctype.ml @@ -1,10 +1,10 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Xavier Leroy and Jerome Vouillon, 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. *) (* *) (***********************************************************************) diff --git a/typing/ctype.mli b/typing/ctype.mli index 87f9d81be..3e464bf56 100644 --- a/typing/ctype.mli +++ b/typing/ctype.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. *) (* *) (***********************************************************************) diff --git a/typing/datarepr.ml b/typing/datarepr.ml index 03a3b4f47..4368ba252 100644 --- a/typing/datarepr.ml +++ b/typing/datarepr.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. *) (* *) (***********************************************************************) diff --git a/typing/datarepr.mli b/typing/datarepr.mli index b1825eac5..faca1af40 100644 --- a/typing/datarepr.mli +++ b/typing/datarepr.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. *) (* *) (***********************************************************************) diff --git a/typing/env.ml b/typing/env.ml index c42b417b9..91fef9f80 100644 --- a/typing/env.ml +++ b/typing/env.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. *) (* *) (***********************************************************************) diff --git a/typing/env.mli b/typing/env.mli index 9ebe0b3fc..616c75be7 100644 --- a/typing/env.mli +++ b/typing/env.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. *) (* *) (***********************************************************************) diff --git a/typing/ident.ml b/typing/ident.ml index 0ecd1cd03..9a30a3be3 100644 --- a/typing/ident.ml +++ b/typing/ident.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. *) (* *) (***********************************************************************) diff --git a/typing/ident.mli b/typing/ident.mli index eaee99869..0e011ad0d 100644 --- a/typing/ident.mli +++ b/typing/ident.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. *) (* *) (***********************************************************************) diff --git a/typing/includecore.ml b/typing/includecore.ml index d355a609e..f25e238d0 100644 --- a/typing/includecore.ml +++ b/typing/includecore.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. *) (* *) (***********************************************************************) diff --git a/typing/includecore.mli b/typing/includecore.mli index 98680a4ff..0f63a7dd2 100644 --- a/typing/includecore.mli +++ b/typing/includecore.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. *) (* *) (***********************************************************************) diff --git a/typing/includemod.ml b/typing/includemod.ml index a5835f9a6..ce2c7203b 100644 --- a/typing/includemod.ml +++ b/typing/includemod.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. *) (* *) (***********************************************************************) diff --git a/typing/includemod.mli b/typing/includemod.mli index e0c739e14..4b6809f25 100644 --- a/typing/includemod.mli +++ b/typing/includemod.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. *) (* *) (***********************************************************************) diff --git a/typing/mtype.ml b/typing/mtype.ml index 6cfea5ba4..6443ff57a 100644 --- a/typing/mtype.ml +++ b/typing/mtype.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. *) (* *) (***********************************************************************) diff --git a/typing/mtype.mli b/typing/mtype.mli index 60cc53c92..aa37727bc 100644 --- a/typing/mtype.mli +++ b/typing/mtype.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. *) (* *) (***********************************************************************) diff --git a/typing/parmatch.ml b/typing/parmatch.ml index 0ac7a544e..406819dee 100644 --- a/typing/parmatch.ml +++ b/typing/parmatch.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. *) (* *) (***********************************************************************) diff --git a/typing/parmatch.mli b/typing/parmatch.mli index a9ec400cf..2afdadfff 100644 --- a/typing/parmatch.mli +++ b/typing/parmatch.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. *) (* *) (***********************************************************************) diff --git a/typing/path.ml b/typing/path.ml index 19c617d3d..2412833eb 100644 --- a/typing/path.ml +++ b/typing/path.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. *) (* *) (***********************************************************************) diff --git a/typing/path.mli b/typing/path.mli index c813e4319..89ab84d63 100644 --- a/typing/path.mli +++ b/typing/path.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. *) (* *) (***********************************************************************) diff --git a/typing/predef.ml b/typing/predef.ml index 742ea89ca..f8a941c32 100644 --- a/typing/predef.ml +++ b/typing/predef.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. *) (* *) (***********************************************************************) diff --git a/typing/predef.mli b/typing/predef.mli index 18a5c8c6c..752275fa0 100644 --- a/typing/predef.mli +++ b/typing/predef.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. *) (* *) (***********************************************************************) diff --git a/typing/primitive.ml b/typing/primitive.ml index 383b9f825..40667168a 100644 --- a/typing/primitive.ml +++ b/typing/primitive.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. *) (* *) (***********************************************************************) diff --git a/typing/primitive.mli b/typing/primitive.mli index 83aebcce7..5c5af4b61 100644 --- a/typing/primitive.mli +++ b/typing/primitive.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. *) (* *) (***********************************************************************) diff --git a/typing/printtyp.ml b/typing/printtyp.ml index a8f23388e..170bb7237 100644 --- a/typing/printtyp.ml +++ b/typing/printtyp.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. *) (* *) (***********************************************************************) diff --git a/typing/printtyp.mli b/typing/printtyp.mli index 96cc8769e..c9770cafa 100644 --- a/typing/printtyp.mli +++ b/typing/printtyp.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. *) (* *) (***********************************************************************) diff --git a/typing/subst.ml b/typing/subst.ml index 2a73ea99d..16d3ed947 100644 --- a/typing/subst.ml +++ b/typing/subst.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. *) (* *) (***********************************************************************) diff --git a/typing/subst.mli b/typing/subst.mli index 98cbe278c..496c9d31a 100644 --- a/typing/subst.mli +++ b/typing/subst.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. *) (* *) (***********************************************************************) diff --git a/typing/typeclass.ml b/typing/typeclass.ml index f0cb0e2e8..b51433cdd 100644 --- a/typing/typeclass.ml +++ b/typing/typeclass.ml @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/typing/typeclass.mli b/typing/typeclass.mli index a7c879adf..b5e72e3c5 100644 --- a/typing/typeclass.mli +++ b/typing/typeclass.mli @@ -1,6 +1,6 @@ (***********************************************************************) (* *) -(* Caml Special Light *) +(* Objective Caml *) (* *) (* Jerome Vouillon, projet Cristal, INRIA Rocquencourt *) (* *) diff --git a/typing/typecore.ml b/typing/typecore.ml index ea778281c..00f1499b8 100644 --- a/typing/typecore.ml +++ b/typing/typecore.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. *) (* *) (***********************************************************************) diff --git a/typing/typecore.mli b/typing/typecore.mli index d527ae41d..be663ad6e 100644 --- a/typing/typecore.mli +++ b/typing/typecore.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. *) (* *) (***********************************************************************) diff --git a/typing/typedecl.ml b/typing/typedecl.ml index f7cca50b2..f87df145d 100644 --- a/typing/typedecl.ml +++ b/typing/typedecl.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. *) (* *) (***********************************************************************) diff --git a/typing/typedecl.mli b/typing/typedecl.mli index 1a010157d..1cd7eb1a3 100644 --- a/typing/typedecl.mli +++ b/typing/typedecl.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. *) (* *) (***********************************************************************) diff --git a/typing/typedtree.ml b/typing/typedtree.ml index 6f137d5c6..ed2aaafa6 100644 --- a/typing/typedtree.ml +++ b/typing/typedtree.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. *) (* *) (***********************************************************************) diff --git a/typing/typedtree.mli b/typing/typedtree.mli index fe0e72ae3..4dd7412b8 100644 --- a/typing/typedtree.mli +++ b/typing/typedtree.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. *) (* *) (***********************************************************************) diff --git a/typing/typemod.ml b/typing/typemod.ml index bd76c0358..1c8dd7319 100644 --- a/typing/typemod.ml +++ b/typing/typemod.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. *) (* *) (***********************************************************************) diff --git a/typing/typemod.mli b/typing/typemod.mli index 58abc68b3..f4e045648 100644 --- a/typing/typemod.mli +++ b/typing/typemod.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. *) (* *) (***********************************************************************) diff --git a/typing/typetexp.ml b/typing/typetexp.ml index ec83c7755..b76fea2c1 100644 --- a/typing/typetexp.ml +++ b/typing/typetexp.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. *) (* *) (***********************************************************************) diff --git a/typing/typetexp.mli b/typing/typetexp.mli index c1dd2d006..cf48b57b4 100644 --- a/typing/typetexp.mli +++ b/typing/typetexp.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. *) (* *) (***********************************************************************) diff --git a/utils/clflags.ml b/utils/clflags.ml index 0c771c5b0..4b31212f6 100644 --- a/utils/clflags.ml +++ b/utils/clflags.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. *) (* *) (***********************************************************************) diff --git a/utils/config.mli b/utils/config.mli index d0fe3bdaa..74dec59d3 100644 --- a/utils/config.mli +++ b/utils/config.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. *) (* *) (***********************************************************************) diff --git a/utils/config.mlp b/utils/config.mlp index 33e54e570..28cb1d2f8 100644 --- a/utils/config.mlp +++ b/utils/config.mlp @@ -1,17 +1,17 @@ (***********************************************************************) (* *) -(* 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. *) (* *) (***********************************************************************) (* $Id$ *) -let version = "1.16" +let version = "1.00" let standard_library = try diff --git a/utils/misc.ml b/utils/misc.ml index c78e2d26a..37f7598b4 100644 --- a/utils/misc.ml +++ b/utils/misc.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. *) (* *) (***********************************************************************) diff --git a/utils/misc.mli b/utils/misc.mli index 9c97aeab7..5efe20f13 100644 --- a/utils/misc.mli +++ b/utils/misc.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. *) (* *) (***********************************************************************) diff --git a/utils/tbl.ml b/utils/tbl.ml index afc58bb09..5b3fd2208 100644 --- a/utils/tbl.ml +++ b/utils/tbl.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. *) (* *) (***********************************************************************) diff --git a/utils/tbl.mli b/utils/tbl.mli index c7114adfc..ff1c600d0 100644 --- a/utils/tbl.mli +++ b/utils/tbl.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. *) (* *) (***********************************************************************) diff --git a/utils/terminfo.ml b/utils/terminfo.ml index d933c45c8..59ea74d67 100644 --- a/utils/terminfo.ml +++ b/utils/terminfo.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. *) (* *) (***********************************************************************) diff --git a/utils/terminfo.mli b/utils/terminfo.mli index d933c45c8..59ea74d67 100644 --- a/utils/terminfo.mli +++ b/utils/terminfo.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. *) (* *) (***********************************************************************) diff --git a/yacc/.cvsignore b/yacc/.cvsignore index 94c6c912a..f3588fdb5 100644 --- a/yacc/.cvsignore +++ b/yacc/.cvsignore @@ -1 +1 @@ -cslyacc +ocamlyacc diff --git a/yacc/Makefile b/yacc/Makefile index 2ef97a99e..238929a40 100644 --- a/yacc/Makefile +++ b/yacc/Makefile @@ -8,13 +8,13 @@ CFLAGS=-O -DNDEBUG $(BYTECCCOMPOPTS) OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \ skeleton.o symtab.o verbose.o warshall.o -all: cslyacc +all: ocamlyacc -cslyacc: $(OBJS) - $(CC) $(CFLAGS) $(CCLINKFLAGS) -o cslyacc $(OBJS) +ocamlyacc: $(OBJS) + $(CC) $(CFLAGS) $(CCLINKFLAGS) -o ocamlyacc $(OBJS) clean: - rm -f *.o cslyacc *~ + rm -f *.o ocamlyacc *~ depend: diff --git a/yacc/Makefile.nt b/yacc/Makefile.nt index 86231f37e..37ee40549 100644 --- a/yacc/Makefile.nt +++ b/yacc/Makefile.nt @@ -8,13 +8,13 @@ CFLAGS=-DNDEBUG -DNO_UNIX $(BYTECCCOMPOPTS) OBJS= closure.obj error.obj lalr.obj lr0.obj main.obj mkpar.obj output.obj reader.obj \ skeleton.obj symtab.obj verbose.obj warshall.obj -all: cslyacc.exe +all: ocamlyacc.exe -cslyacc.exe: $(OBJS) - $(CC) $(CFLAGS) $(CCLINKFLAGS) -o cslyacc.exe $(OBJS) +ocamlyacc.exe: $(OBJS) + $(CC) $(CFLAGS) $(CCLINKFLAGS) -o ocamlyacc.exe $(OBJS) clean: - rm -f *.obj cslyacc.exe *~ + rm -f *.obj ocamlyacc.exe *~ depend: diff --git a/yacc/closure.c b/yacc/closure.c index 7dcd2aacb..c47df93a4 100644 --- a/yacc/closure.c +++ b/yacc/closure.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/defs.h b/yacc/defs.h index 1c3338d59..bdf9183a9 100644 --- a/yacc/defs.h +++ b/yacc/defs.h @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/error.c b/yacc/error.c index ae65dd714..f41f861fa 100644 --- a/yacc/error.c +++ b/yacc/error.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/lalr.c b/yacc/lalr.c index 3e031c57f..b971f11ad 100644 --- a/yacc/lalr.c +++ b/yacc/lalr.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/lr0.c b/yacc/lr0.c index c38a686a4..cadf5871c 100644 --- a/yacc/lr0.c +++ b/yacc/lr0.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/main.c b/yacc/main.c index 96df510d7..a87729052 100644 --- a/yacc/main.c +++ b/yacc/main.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/mkpar.c b/yacc/mkpar.c index 854bd3d0a..4d5346d29 100644 --- a/yacc/mkpar.c +++ b/yacc/mkpar.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/output.c b/yacc/output.c index 9a70c1772..a4b236677 100644 --- a/yacc/output.c +++ b/yacc/output.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/reader.c b/yacc/reader.c index 0fe134d5c..63688e354 100644 --- a/yacc/reader.c +++ b/yacc/reader.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/skeleton.c b/yacc/skeleton.c index b2869e196..72b039ad8 100644 --- a/yacc/skeleton.c +++ b/yacc/skeleton.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/symtab.c b/yacc/symtab.c index e13127927..4cf7e6bee 100644 --- a/yacc/symtab.c +++ b/yacc/symtab.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/verbose.c b/yacc/verbose.c index f172db578..270528ddb 100644 --- a/yacc/verbose.c +++ b/yacc/verbose.c @@ -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. */ /* */ /***********************************************************************/ diff --git a/yacc/warshall.c b/yacc/warshall.c index 50561136b..e9be403ca 100644 --- a/yacc/warshall.c +++ b/yacc/warshall.c @@ -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. */ /* */ /***********************************************************************/ |