detabisation

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5029 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

Author: Damien Doligez

README.win32

@@ -56,7 +56,7 @@ supported out of the box, without additional software.
 The native-code compiler (ocamlopt) requires Visual C++ and the
 Microsoft assembler MASM version 6.11 or later.  MASM can be
 downloaded for free from Microsoft's Web site; for directions, see
-	http://www.easystreet.com/~jkirwan/pctools.html
+        http://www.easystreet.com/~jkirwan/pctools.html
     or  http://www2.dgsys.com/~raymoon/faq/masm.html
     or  the comp.lang.asm.x86 FAQ.
 
@@ -96,14 +96,14 @@ You will need the following software components to perform the recompilation:
 To recompile, start a Cygwin shell and change to the top-level
 directory of the OCaml distribution.  Then, do
 
-	cp config/m-nt.h config/m.h
-	cp config/s-nt.h config/s.h
-	cp config/Makefile.msvc config/Makefile
+        cp config/m-nt.h config/m.h
+        cp config/s-nt.h config/s.h
+        cp config/Makefile.msvc config/Makefile
 
 Then, edit config/Makefile as needed, following the comments in this file.
 Normally, the only variables that need to be changed are
-        PREFIX	    where to install everything
-	TK_ROOT	    where TCL/TK was installed
+        PREFIX      where to install everything
+        TK_ROOT     where TCL/TK was installed
 
 Finally, use "make -f Makefile.nt" to build the system, e.g. 
 
@@ -149,7 +149,7 @@ runs without any additional tools.
 The native-code compiler (ocamlopt), as well as static linking of
 Caml bytecode with C code (ocamlc -custom), require either the MinGW
 development tools, which is free software available at
-	http://www.mingw.org/
+        http://www.mingw.org/
 or the Cygwin development tools (also free software), available at
         http://sources.redhat.com/cygwin/
 
@@ -174,14 +174,14 @@ Start a Cygwin shell and unpack the source distribution
 (ocaml-X.YZ.tar.gz) with "tar xzf".  Change to the top-level
 directory of the OCaml distribution.  Then, do
 
-	cp config/m-nt.h config/m.h
-	cp config/s-nt.h config/s.h
-	cp config/Makefile.mingw config/Makefile
+        cp config/m-nt.h config/m.h
+        cp config/s-nt.h config/s.h
+        cp config/Makefile.mingw config/Makefile
 
 Then, edit config/Makefile as needed, following the comments in this file.
 Normally, the only variables that need to be changed are
-        PREFIX	    where to install everything
-	TK_ROOT	    where TCL/TK was installed
+        PREFIX      where to install everything
+        TK_ROOT     where TCL/TK was installed
 
 Finally, use "make -f Makefile.nt" to build the system, e.g. 
 

byterun/extern.c

@@ -335,8 +335,8 @@ static void extern_rec(value v)
       unsigned long sz_32, sz_64;
       char * ident = Custom_ops_val(v)->identifier;
       void (*serialize)(value v, unsigned long * wsize_32,
-			unsigned long * wsize_64)
-	= Custom_ops_val(v)->serialize;
+                        unsigned long * wsize_64)
+        = Custom_ops_val(v)->serialize;
       if (serialize == NULL) failwith("output_value: abstract value");
       Write(CODE_CUSTOM);
       writeblock(ident, strlen(ident) + 1);

byterun/minor_gc.c

@@ -98,12 +98,12 @@ void oldify_one (value v, value *p)
           Field (result, 0) = field0;
           Field (result, 1) = oldify_todo_list;    /* Add this block */
           oldify_todo_list = v;                    /*  to the "to do" list. */
-	}else{
+        }else{
           Assert (sz == 1);
           p = &Field (result, 0);
-	  v = field0;
+          v = field0;
           goto tail_call;
-	}
+        }
       }else if (tag >= No_scan_tag){
         sz = Wosize_hd (hd);
         result = alloc_shr (sz, tag);

camlp4/CHANGES

@@ -643,7 +643,7 @@ Camlp4 Version 0.6:
 * Added option -where: "camlp4 -where" prints the name of the standard
   library directory of Camlp4 and exit. So, the ocaml toplevel and the
   compiler can use the option:
-	-I `camlp4 -where`
+        -I `camlp4 -where`
 
 * Added option -nolib to not search for objects files in the installed
   library directory of Camlp4.

camlp4/compile/compile.sh

@@ -4,15 +4,15 @@ ARGS=
 FILES=
 ENTRIES=
 while test "" != "$1"; do
-	case $1 in
+        case $1 in
         -e)
            shift;
            if test "$ENTRIES" != ""; then ENTRIES="$ENTRIES; "; fi
            ENTRIES="$ENTRIES$1";;
-	*.ml*) FILES="$FILES $1";;
-	*) ARGS="$ARGS $1";;
-	esac
-	shift
+        *.ml*) FILES="$FILES $1";;
+        *) ARGS="$ARGS $1";;
+        esac
+        shift
 done
 
 cat $FILES | sed -e 's/Pcaml.parse_i.*$//' > tmp.ml

camlp4/config/configure_batch

@@ -58,10 +58,10 @@ touch Makefile.cnf
 
 for i in utils parsing otherlibs/dynlink; do
     if test ! -d "$ocaml_top/$i"; then
-	echo "Bad value $ocaml_top for option -ocaml-top"
+        echo "Bad value $ocaml_top for option -ocaml-top"
         echo "There is no directory $ocaml_top/$i"
-	echo "Configuration script failed"
-	exit 1
+        echo "Configuration script failed"
+        exit 1
     fi
 done
 

camlp4/etc/mkcamlp4.sh.tpl

@@ -11,14 +11,14 @@ while test "" != "$1"; do
     case $1 in
     -I) INCL="$INCL -I $2"; shift;;
     *)
-	j=`basename $1 .cmi`
-	if test "$j.cmi" = "$1"; then
-	    first="`expr "$j" : '\(.\)' | tr 'a-z' 'A-Z'`"
-	    rest="`expr "$j" : '.\(.*\)'`"
-	    INTERFACES="$INTERFACES $first$rest"
-	else
-	    OPTS="$OPTS $1"
-	fi;;
+        j=`basename $1 .cmi`
+        if test "$j.cmi" = "$1"; then
+            first="`expr "$j" : '\(.\)' | tr 'a-z' 'A-Z'`"
+            rest="`expr "$j" : '.\(.*\)'`"
+            INTERFACES="$INTERFACES $first$rest"
+        else
+            OPTS="$OPTS $1"
+        fi;;
     esac
     shift
 done

camlp4/etc/pa_sml.ml

@@ -779,7 +779,7 @@ EXTEND
           | Left x2 -> <:module_expr< $x1$ (struct $list:x2$ end) >>
           | Right x2 -> <:module_expr< $x1$ $x2$ >> ]
       | "let"; x1 = strdecs; "in"; x2 = module_expr; "end" ->
-          not_impl loc "str 4"	
+          not_impl loc "str 4"
       | x1 = module_expr; ":"; x2 = module_type -> not_impl loc "str 5"
       | x1 = module_expr; x2 = ":>"; x3 = module_type ->
           not_impl loc "str 6" ] ]

camlp4/tools/apply.sh

@@ -4,23 +4,23 @@
 ARGS1=
 FILE=
 while test "" != "$1"; do
-	case $1 in
-	*.ml*) FILE=$1;;
-	*) ARGS1="$ARGS1 $1";;
-	esac
-	shift
+        case $1 in
+        *.ml*) FILE=$1;;
+        *) ARGS1="$ARGS1 $1";;
+        esac
+        shift
 done
 
 head -1 $FILE >/dev/null || exit 1
 
 set - `head -1 $FILE`
 if test "$2" = "camlp4r" -o "$2" = "camlp4"; then
-	COMM="../boot/$2 -nolib -I ../boot -I ../etc"
-	shift; shift
-	ARGS2=`echo $* | sed -e "s/[()*]//g"`
+        COMM="../boot/$2 -nolib -I ../boot -I ../etc"
+        shift; shift
+        ARGS2=`echo $* | sed -e "s/[()*]//g"`
 else
-	COMM="../boot/camlp4 -nolib -I ../boot -I ../etc pa_o.cmo"
-	ARGS2=
+        COMM="../boot/camlp4 -nolib -I ../boot -I ../etc pa_o.cmo"
+        ARGS2=
 fi
 
 OTOP=../..

camlp4/tools/camlp4_comm.sh

@@ -4,32 +4,32 @@
 ARGS1=
 FILE=
 while test "" != "$1"; do
-	case $1 in
-	*.ml*) FILE=$1;;
-	*) ARGS1="$ARGS1 $1";;
-	esac
-	shift
+        case $1 in
+        *.ml*) FILE=$1;;
+        *) ARGS1="$ARGS1 $1";;
+        esac
+        shift
 done
 
 head -1 $FILE >/dev/null || exit 1
 
 set - `head -1 $FILE`
 if test "$2" = "camlp4r" -o "$2" = "camlp4"; then
-	COMM="ocamlrun$EXE ../boot/$2$EXE -nolib -I ../boot"
+        COMM="ocamlrun$EXE ../boot/$2$EXE -nolib -I ../boot"
         if test "`basename $OTOP`" != "ocaml_stuff"; then
             COMM="$OTOP/boot/$COMM"
         fi
-	shift; shift
-	ARGS2=`echo $* | sed -e "s/[()*]//g"`
-#	ARGS1="$ARGS1 -verbose"
-	echo $COMM $ARGS2 $ARGS1 $FILE
-	$COMM $ARGS2 $ARGS1 $FILE
+        shift; shift
+        ARGS2=`echo $* | sed -e "s/[()*]//g"`
+#        ARGS1="$ARGS1 -verbose"
+        echo $COMM $ARGS2 $ARGS1 $FILE
+        $COMM $ARGS2 $ARGS1 $FILE
 else
-	if test "`basename $FILE .mli`.mli" = "$FILE"; then
-		OFILE=`basename $FILE .mli`.ppi
-	else
-		OFILE=`basename $FILE .ml`.ppo
-	fi
-	echo cp $FILE $OFILE
-	cp $FILE $OFILE
+        if test "`basename $FILE .mli`.mli" = "$FILE"; then
+                OFILE=`basename $FILE .mli`.ppi
+        else
+                OFILE=`basename $FILE .ml`.ppo
+        fi
+        echo cp $FILE $OFILE
+        cp $FILE $OFILE
 fi

camlp4/tools/conv.sh

@@ -4,19 +4,19 @@ DIR=`expr "$0" : "\(.*\)/.*" "|" "."`
 INCL=
 FILE=
 while test "" != "$1"; do
-	case $1 in
-	-I) INCL="$INCL -I $2"; shift;;
-	*) FILE=$1;;
-	esac
-	shift
+        case $1 in
+        -I) INCL="$INCL -I $2"; shift;;
+        *) FILE=$1;;
+        esac
+        shift
 done
 
 set - `head -1 $FILE`
 if test "$2" = "camlp4r" -o "$2" = "camlp4"; then
-	COMM="$OTOP/boot/ocamlrun $DIR/../boot/$2 -nolib -I $DIR/../boot $INCL $DIR/../etc/pr_o.cmo"
-	shift; shift
-	ARGS=`echo $* | sed -e "s/[()*]//g"`
-	$COMM $ARGS -ss $FILE
+        COMM="$OTOP/boot/ocamlrun $DIR/../boot/$2 -nolib -I $DIR/../boot $INCL $DIR/../etc/pr_o.cmo"
+        shift; shift
+        ARGS=`echo $* | sed -e "s/[()*]//g"`
+        $COMM $ARGS -ss $FILE
 else
-	cat $FILE
+        cat $FILE
 fi

configure

@@ -88,7 +88,7 @@ while : ; do
     -tklibs*|--tklibs*)
         tk_libs=$2; shift;;
     -tk-no-x11|--tk-no-x11)
-	tk_x11=no;;
+        tk_x11=no;;
     -binutils*|--binutils*)
         binutils_dir=$2; shift;;
     -verbose|--verbose)
@@ -467,13 +467,13 @@ if test $withsharedlibs = "yes"; then
             byteccrpath="-Wl,-rpath,"
             mksharedlibrpath="-Wl,-rpath,"
           fi
-	  shared_libraries_supported=true;;
+          shared_libraries_supported=true;;
         *)
           sharedcccompopts="-KPIC"
           byteccrpath="-R"
           mksharedlibrpath="-R"
-	  mksharedlib="/usr/ccs/bin/ld -G -o"
-	  shared_libraries_supported=true;;
+          mksharedlib="/usr/ccs/bin/ld -G -o"
+          shared_libraries_supported=true;;
       esac;;
     mips*-*-irix[56]*)
       case "$bytecc" in
@@ -1134,7 +1134,7 @@ for dir in \
     /usr/unsupported/lib  \
     /usr/athena/lib       \
     /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11	  \
+    /lib/usr/lib/X11      \
                           \
     /usr/openwin/lib      \
     /usr/openwin/share/lib \

emacs/inf-caml.el

@@ -113,8 +113,8 @@ be sent from another buffer in Caml mode.
 Input and output via buffer `*inferior-caml*'."
   (interactive
    (list (if (not (comint-check-proc inferior-caml-buffer-name))
-	     (read-from-minibuffer "Caml toplevel to run: "
-				   inferior-caml-program))))
+             (read-from-minibuffer "Caml toplevel to run: "
+                                   inferior-caml-program))))
   (caml-run-process-if-needed cmd)
   (switch-to-buffer-other-window inferior-caml-buffer-name))
 
@@ -250,15 +250,15 @@ should lies."
           (cond ((re-search-forward
                   " *Characters \\([01-9][01-9]*\\)-\\([1-9][01-9]*\\):\n[^W]"
                   (point-max) t)
-		 (setq beg (string-to-int (caml-match-string 1)))
+                 (setq beg (string-to-int (caml-match-string 1)))
                  (setq end (string-to-int (caml-match-string 2)))
                  (switch-to-buffer buf)
-		 (goto-char orig)
-		 (forward-byte end)
-		 (setq end (point))
-		 (goto-char orig)
-		 (forward-byte beg)
-		 (setq beg (point))
+                 (goto-char orig)
+                 (forward-byte end)
+                 (setq end (point))
+                 (goto-char orig)
+                 (forward-byte beg)
+                 (setq beg (point))
                  (setq err beg)
                  )
                 ((looking-at

lex/Makefile

@@ -38,6 +38,7 @@ ocamllex.opt: $(OBJS:.cmo=.cmx)
 clean::
 	rm -f ocamllex ocamllex.opt
 	rm -f *.cmo *.cmi *.cmx *.o
+	rm -f parser.output
 
 parser.ml parser.mli: parser.mly
 	$(CAMLYACC) $(YACCFLAGS) parser.mly