detabisation

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2736 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2000-01-07 15:50:42 +00:00
parent 26959fb1d9
commit 469ec90391
4 changed files with 50 additions and 52 deletions

25
INSTALL
View File

@ -69,17 +69,17 @@ The "configure" script accepts the following options:
It will *not* work under Digital Unix 3.2 or earlier, SunOS 4, It will *not* work under Digital Unix 3.2 or earlier, SunOS 4,
HPUX, AIX, nor Linux without LinuxThreads. HPUX, AIX, nor Linux without LinuxThreads.
-tkdefs <cpp flags> (default: none) -tkdefs <cpp flags> (default: none)
-tklibs <flags and libraries> (default: determined automatically) -tklibs <flags and libraries> (default: determined automatically)
These options specify where to find the Tcl/Tk libraries for These options specify where to find the Tcl/Tk libraries for
LablTk. "-tkdefs" helps to find the headers, and "-tklibs" LablTk. "-tkdefs" helps to find the headers, and "-tklibs"
the C libraries. "-tklibs" may contain either only -L/path flags, the C libraries. "-tklibs" may contain either only -L/path flags,
in which case the library names are determined automatically, in which case the library names are determined automatically,
or the actual libraries, which are used as given. or the actual libraries, which are used as given.
Example: for a Japanese tcl/tk whose headers are in specific Example: for a Japanese tcl/tk whose headers are in specific
directories and libraries in /usr/local/lib, you can use directories and libraries in /usr/local/lib, you can use
./configure -tklibs "-L/usr/local/lib -ltk8.0jp -ltcl8.0jp" ./configure -tklibs "-L/usr/local/lib -ltk8.0jp -ltcl8.0jp"
-tkdefs "-I/usr/local/include/tcl8.0jp -I/usr/local/include/tk8.0jp" -tkdefs "-I/usr/local/include/tcl8.0jp -I/usr/local/include/tk8.0jp"
Examples: Examples:
./configure -prefix /usr/bin ./configure -prefix /usr/bin
@ -148,7 +148,7 @@ ocamlopt. The ".opt" compilers should run faster than the normal
compilers, especially on large input files, but they may take longer compilers, especially on large input files, but they may take longer
to start due to increased code size. If compilation times are an issue on to start due to increased code size. If compilation times are an issue on
your programs, try the ".opt" compilers to see if they make a your programs, try the ".opt" compilers to see if they make a
significant difference. significant difference.
6- You can now install the Objective Caml system. This will create the 6- You can now install the Objective Caml system. This will create the
following commands (in the binary directory selected during autoconfiguration): following commands (in the binary directory selected during autoconfiguration):
@ -234,4 +234,3 @@ If this causes a problem, the solution is to upgrade to 2.7.2.3 or above.
unable to compile correctly the runtime system (wrong code is unable to compile correctly the runtime system (wrong code is
generated for (x - y) where x is a pointer and y an integer). generated for (x - y) where x is a pointer and y an integer).
Fix: use gcc. Fix: use gcc.

14
LICENSE
View File

@ -116,8 +116,8 @@ settled by the Court of Versailles.
---------------------------------------------------------------------- ----------------------------------------------------------------------
GNU LIBRARY GENERAL PUBLIC LICENSE GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991 Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc. Copyright (C) 1991 Free Software Foundation, Inc.
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@ -127,7 +127,7 @@ settled by the Court of Versailles.
[This is the first released version of the library GPL. It is [This is the first released version of the library GPL. It is
numbered 2 because it goes with version 2 of the ordinary GPL.] numbered 2 because it goes with version 2 of the ordinary GPL.]
Preamble Preamble
The licenses for most software are designed to take away your The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public freedom to share and change it. By contrast, the GNU General Public
@ -217,7 +217,7 @@ works together with the library.
Note that it is possible for a library to be covered by the ordinary Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one. General Public License rather than by this special one.
GNU LIBRARY GENERAL PUBLIC LICENSE GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library which 0. This License Agreement applies to any software library which
@ -251,7 +251,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does. and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's 1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an you conspicuously and appropriately publish on each copy an
@ -529,7 +529,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing of all derivatives of our free software and of promoting the sharing
and reuse of software generally. and reuse of software generally.
NO WARRANTY NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@ -552,7 +552,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES. DAMAGES.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
Appendix: How to Apply These Terms to Your New Libraries Appendix: How to Apply These Terms to Your New Libraries

View File

@ -101,7 +101,7 @@ let get_label n =
| _ -> let lbl = new_label() in (lbl, cons_instr (Llabel lbl) n) | _ -> let lbl = new_label() in (lbl, cons_instr (Llabel lbl) n)
(* Discard all instructions up to the next label. (* Discard all instructions up to the next label.
This function is to be called before adding a non-terminating This function is to be called before adding a non-terminating
instruction. *) instruction. *)
let rec discard_dead_code n = let rec discard_dead_code n =
@ -153,15 +153,15 @@ let rec linear i n =
| _, Iend, Lbranch lbl -> | _, Iend, Lbranch lbl ->
copy_instr (Lcondbranch(invert_test test, lbl)) i (linear ifso n1) copy_instr (Lcondbranch(invert_test test, lbl)) i (linear ifso n1)
| Iexit, _, _ -> | Iexit, _, _ ->
let n2 = linear ifnot n1 in let n2 = linear ifnot n1 in
begin match !exit_label with None -> n2 begin match !exit_label with None -> n2
| Some lbl -> copy_instr (Lcondbranch(test, lbl)) i n2 | Some lbl -> copy_instr (Lcondbranch(test, lbl)) i n2
end end
| _, Iexit, _ -> | _, Iexit, _ ->
let n2 = linear ifso n1 in let n2 = linear ifso n1 in
begin match !exit_label with None -> n2 begin match !exit_label with None -> n2
| Some lbl -> copy_instr (Lcondbranch(invert_test test, lbl)) i n2 | Some lbl -> copy_instr (Lcondbranch(invert_test test, lbl)) i n2
end end
| Iend, _, _ -> | Iend, _, _ ->
let (lbl_end, n2) = get_label n1 in let (lbl_end, n2) = get_label n1 in
copy_instr (Lcondbranch(test, lbl_end)) i (linear ifnot n2) copy_instr (Lcondbranch(test, lbl_end)) i (linear ifnot n2)
@ -214,7 +214,7 @@ let rec linear i n =
| Iexit -> | Iexit ->
let n1 = linear i.Mach.next n in let n1 = linear i.Mach.next n in
begin match !exit_label with None -> n1 begin match !exit_label with None -> n1
| Some lbl -> add_branch lbl n1 | Some lbl -> add_branch lbl n1
end end
| Itrywith(body, handler) -> | Itrywith(body, handler) ->
let (lbl_join, n1) = get_label (linear i.Mach.next n) in let (lbl_join, n1) = get_label (linear i.Mach.next n) in
@ -230,4 +230,3 @@ let fundecl f =
{ fun_name = f.Mach.fun_name; { fun_name = f.Mach.fun_name;
fun_body = linear f.Mach.fun_body end_instr; fun_body = linear f.Mach.fun_body end_instr;
fun_fast = f.Mach.fun_fast } fun_fast = f.Mach.fun_fast }

42
configure vendored
View File

@ -64,7 +64,7 @@ while : ; do
-tklibs*|--tklibs*) -tklibs*|--tklibs*)
tk_libs=$2; shift;; tk_libs=$2; shift;;
-verbose|--verbose) -verbose|--verbose)
verbose=yes;; verbose=yes;;
*) echo "Unknown option \"$1\"." 1>&2; exit 2;; *) echo "Unknown option \"$1\"." 1>&2; exit 2;;
esac esac
shift shift
@ -890,30 +890,30 @@ echo
echo "** Configuration summary **" echo "** Configuration summary **"
echo echo
echo "Directories where Objective Caml will be installed:" echo "Directories where Objective Caml will be installed:"
echo " binaries.................. $bindir" echo " binaries.................. $bindir"
echo " standard library.......... $libdir" echo " standard library.......... $libdir"
echo " manual pages.............. $mandir (with extension .$manext)" echo " manual pages.............. $mandir (with extension .$manext)"
echo "Configuration for the bytecode compiler:" echo "Configuration for the bytecode compiler:"
echo " C compiler used........... $bytecc" echo " C compiler used........... $bytecc"
echo " options for compiling..... $bytecccompopts" echo " options for compiling..... $bytecccompopts"
echo " options for linking....... $bytecclinkopts $cclibs" echo " options for linking....... $bytecclinkopts $cclibs"
echo "Configuration for the native-code compiler:" echo "Configuration for the native-code compiler:"
if test "$arch" = "none"; then if test "$arch" = "none"; then
echo " (not supported on this platform)" echo " (not supported on this platform)"
else else
if test "$model" = "default"; then if test "$model" = "default"; then
echo " hardware architecture..... $arch" echo " hardware architecture..... $arch"
else else
echo " hardware architecture..... $arch ($model)" echo " hardware architecture..... $arch ($model)"
fi fi
if test "$system" = "unknown"; then : ; else if test "$system" = "unknown"; then : ; else
echo " OS variant................ $system" echo " OS variant................ $system"
fi fi
echo " C compiler used........... $nativecc" echo " C compiler used........... $nativecc"
echo " options for compiling..... $nativecccompopts" echo " options for compiling..... $nativecccompopts"
echo " options for linking....... $nativecclinkopts $cclibs" echo " options for linking....... $nativecclinkopts $cclibs"
echo " assembler ................ \$(AS) $asflags" echo " assembler ................ \$(AS) $asflags"
echo " preprocessed assembler ... $aspp $asppflags" echo " preprocessed assembler ... $aspp $asppflags"
if test "$profiling" = "prof"; then if test "$profiling" = "prof"; then
@ -930,22 +930,22 @@ else
fi fi
echo "Configuration for the external libraries:" echo "Configuration for the external libraries:"
echo " libraries supported....... $otherlibraries" echo " libraries supported....... $otherlibraries"
echo "The \"num\" library:" echo "The \"num\" library:"
echo " target architecture ...... $bignum_arch" echo " target architecture ...... $bignum_arch"
if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then
echo "The \"graph\" library:" echo "The \"graph\" library:"
echo " options for compiling .... $x11_include" echo " options for compiling .... $x11_include"
echo " options for linking ...... $x11_link" echo " options for linking ...... $x11_link"
fi fi
if test $has_tk = true; then if test $has_tk = true; then
echo "The \"labltk\" library:" echo "The \"labltk\" library:"
echo " use tcl/tk version ....... $tcl_version" echo " use tcl/tk version ....... $tcl_version"
echo " options for compiling .... $tk_defs" echo " options for compiling .... $tk_defs"
echo " options for linking ...... $tk_libs" echo " options for linking ...... $tk_libs"
else else
echo "The \"labltk\" library: configuration failed" echo "The \"labltk\" library: configuration failed"
fi fi