Permalink
Browse files

detabisation

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5029 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information...
1 parent 0e7e19d commit 5ccc0e38d322489e52a6d886797b1f1b070f8327 doligez committed Jul 23, 2002
Showing with 10,758 additions and 10,756 deletions.
  1. +12 −12 README.win32
  2. +2 −2 byterun/extern.c
  3. +3 −3 byterun/minor_gc.c
  4. +1 −1 camlp4/CHANGES
  5. +5 −5 camlp4/compile/compile.sh
  6. +3 −3 camlp4/config/configure_batch
  7. +8 −8 camlp4/etc/mkcamlp4.sh.tpl
  8. +1 −1 camlp4/etc/pa_sml.ml
  9. +10 −10 camlp4/tools/apply.sh
  10. +18 −18 camlp4/tools/camlp4_comm.sh
  11. +10 −10 camlp4/tools/conv.sh
  12. +5 −5 configure
  13. +9 −9 emacs/inf-caml.el
  14. +1 −0 lex/Makefile
  15. +29 −29 ocamldoc/odoc.ml
  16. +76 −76 ocamldoc/odoc_analyse.ml
  17. +1 −1 ocamldoc/odoc_analyse.mli
  18. +13 −13 ocamldoc/odoc_args.ml
  19. +4 −4 ocamldoc/odoc_args.mli
  20. +1,072 −1,072 ocamldoc/odoc_ast.ml
  21. +29 −29 ocamldoc/odoc_ast.mli
  22. +52 −52 ocamldoc/odoc_class.ml
  23. +197 −197 ocamldoc/odoc_comments.ml
  24. +1 −1 ocamldoc/odoc_comments.mli
  25. +300 −300 ocamldoc/odoc_cross.ml
  26. +58 −58 ocamldoc/odoc_dag2html.ml
  27. +1 −1 ocamldoc/odoc_dag2html.mli
  28. +69 −69 ocamldoc/odoc_dep.ml
  29. +49 −49 ocamldoc/odoc_dot.ml
  30. +36 −36 ocamldoc/odoc_env.ml
  31. +971 −971 ocamldoc/odoc_html.ml
  32. +9 −9 ocamldoc/odoc_info.ml
  33. +206 −206 ocamldoc/odoc_info.mli
  34. +395 −395 ocamldoc/odoc_latex.ml
  35. +210 −210 ocamldoc/odoc_lexer.mll
  36. +523 −523 ocamldoc/odoc_man.ml
  37. +572 −572 ocamldoc/odoc_merge.ml
  38. +2 −2 ocamldoc/odoc_merge.mli
  39. +3 −3 ocamldoc/odoc_messages.ml
  40. +94 −94 ocamldoc/odoc_misc.ml
  41. +101 −101 ocamldoc/odoc_module.ml
  42. +45 −45 ocamldoc/odoc_name.ml
  43. +67 −67 ocamldoc/odoc_ocamlhtml.mll
  44. +11 −11 ocamldoc/odoc_opt.ml
  45. +20 −20 ocamldoc/odoc_parameter.ml
  46. +23 −23 ocamldoc/odoc_parser.mly
  47. +40 −40 ocamldoc/odoc_scan.ml
  48. +168 −168 ocamldoc/odoc_search.ml
  49. +26 −26 ocamldoc/odoc_see_lexer.mll
  50. +969 −969 ocamldoc/odoc_sig.ml
  51. +55 −55 ocamldoc/odoc_sig.mli
  52. +36 −36 ocamldoc/odoc_str.ml
  53. +453 −453 ocamldoc/odoc_texi.ml
  54. +7 −7 ocamldoc/odoc_text.ml
  55. +144 −144 ocamldoc/odoc_text_lexer.mll
  56. +291 −291 ocamldoc/odoc_to_text.ml
  57. +2 −2 ocamldoc/odoc_types.mli
  58. +30 −30 ocamldoc/odoc_value.ml
  59. +3 −3 ocamldoc/runocamldoc
  60. +5 −5 otherlibs/graph/color.c
  61. +3 −3 otherlibs/labltk/README
  62. +36 −36 otherlibs/labltk/Widgets.src
  63. +5 −5 otherlibs/labltk/builtin/builtin_GetCursor.ml
  64. +3 −3 otherlibs/labltk/builtin/builtin_ScrollValue.ml
  65. +26 −26 otherlibs/labltk/builtin/builtin_bind.ml
  66. +2 −2 otherlibs/labltk/builtin/builtin_bindtags.ml
  67. +10 −10 otherlibs/labltk/builtin/builtin_index.ml
  68. +6 −6 otherlibs/labltk/builtin/builtin_text.ml
  69. +36 −36 otherlibs/labltk/builtin/builtinf_bind.ml
  70. +6 −6 otherlibs/labltk/builtin/builtini_GetCursor.ml
  71. +4 −4 otherlibs/labltk/builtin/builtini_bind.ml
  72. +19 −19 otherlibs/labltk/builtin/builtini_index.ml
  73. +2 −2 otherlibs/labltk/builtin/builtini_palette.ml
  74. +8 −8 otherlibs/labltk/builtin/canvas_bind.ml
  75. +12 −12 otherlibs/labltk/builtin/dialog.ml
  76. +2 −2 otherlibs/labltk/builtin/optionmenu.ml
  77. +7 −7 otherlibs/labltk/builtin/selection_handle_set.ml
  78. +2 −2 otherlibs/labltk/builtin/selection_own_set.ml
  79. +18 −18 otherlibs/labltk/builtin/text_tag_bind.ml
  80. +60 −60 otherlibs/labltk/compiler/compile.ml
  81. +15 −15 otherlibs/labltk/compiler/intf.ml
  82. +2 −2 otherlibs/labltk/compiler/lexer.mll
  83. +45 −45 otherlibs/labltk/compiler/maincompile.ml
  84. +17 −17 otherlibs/labltk/compiler/ppexec.ml
  85. +1 −1 otherlibs/labltk/compiler/pplex.mll
  86. +2 −2 otherlibs/labltk/compiler/ppparse.ml
  87. +1 −1 otherlibs/labltk/examples_camltk/addition.ml
  88. +1 −1 otherlibs/labltk/examples_camltk/fileinput.ml
  89. +1 −1 otherlibs/labltk/examples_camltk/taddition.ml
  90. +47 −47 otherlibs/labltk/examples_camltk/tetris.ml
  91. +1 −1 otherlibs/labltk/examples_labltk/lang.ml
  92. +1 −1 otherlibs/labltk/frx/frx_after.ml
  93. +7 −7 otherlibs/labltk/frx/frx_ctext.ml
  94. +13 −13 otherlibs/labltk/frx/frx_dialog.ml
  95. +22 −22 otherlibs/labltk/frx/frx_fillbox.ml
  96. +24 −24 otherlibs/labltk/frx/frx_fit.ml
  97. +4 −4 otherlibs/labltk/frx/frx_font.ml
  98. +7 −7 otherlibs/labltk/frx/frx_listbox.ml
  99. +5 −5 otherlibs/labltk/frx/frx_mem.ml
  100. +28 −28 otherlibs/labltk/frx/frx_misc.ml
  101. +16 −16 otherlibs/labltk/frx/frx_req.ml
  102. +1 −1 otherlibs/labltk/frx/frx_rpc.ml
  103. +17 −17 otherlibs/labltk/frx/frx_synth.ml
  104. +74 −74 otherlibs/labltk/frx/frx_text.ml
  105. +8 −8 otherlibs/labltk/jpf/jpf_font.ml
  106. +6 −6 otherlibs/labltk/jpf/shell.ml
  107. +27 −27 otherlibs/labltk/support/camltkwrap.mli
  108. +4 −4 otherlibs/labltk/support/cltkEval.c
  109. +10 −10 otherlibs/labltk/support/cltkImg.c
  110. +19 −19 otherlibs/labltk/support/cltkMain.c
  111. +1 −1 otherlibs/labltk/support/cltkMisc.c
  112. +4 −4 otherlibs/labltk/support/cltkVar.c
  113. +2 −2 otherlibs/labltk/support/cltkWait.c
  114. +4 −4 otherlibs/labltk/support/protocol.ml
  115. +2 −2 otherlibs/labltk/support/rawwidget.ml
  116. +3 −3 otherlibs/labltk/support/textvariable.ml
  117. +20 −20 otherlibs/labltk/tkanim/gifanimtest.ml
  118. +546 −546 otherlibs/labltk/tkanim/tkAnimGIF.c
  119. +22 −22 otherlibs/labltk/tkanim/tkAppInit.c
  120. +10 −10 otherlibs/labltk/tkanim/tkanim.mli
  121. +1 −1 otherlibs/num/Makefile.Mac
  122. +13 −13 otherlibs/unix/sockopt.c
  123. +65 −65 otherlibs/win32graph/dib.c
  124. +563 −563 otherlibs/win32graph/draw.c
  125. +15 −15 otherlibs/win32graph/libgraph.h
  126. +160 −160 otherlibs/win32graph/open.c
  127. +1 −1 otherlibs/win32unix/README
  128. +109 −109 otherlibs/win32unix/lockf.c
  129. +4 −4 otherlibs/win32unix/read.c
  130. +3 −3 otherlibs/win32unix/rename.c
  131. +7 −7 otherlibs/win32unix/sockopt.c
  132. +1 −1 otherlibs/win32unix/windir.c
  133. +19 −19 otherlibs/win32unix/write.c
  134. +6 −6 parsing/parser.mly
  135. +1 −1 stdlib/headernt.c
  136. +5 −5 stdlib/queue.ml
  137. +1 −0 test/Makefile
  138. +79 −79 typing/ctype.ml
  139. +3 −3 typing/printtyp.ml
  140. +19 −19 typing/typeclass.ml
  141. +17 −17 typing/typetexp.ml
  142. +1 −1 utils/config.mli
  143. +22 −22 win32caml/inria.h
  144. +47 −47 win32caml/inriares.h
  145. +15 −15 win32caml/libgraph.h
  146. +343 −343 win32caml/menu.c
  147. +258 −258 win32caml/ocaml.c
  148. +117 −117 win32caml/startocaml.c
View
@@ -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.
View
@@ -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);
View
@@ -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);
View
@@ -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.
View
@@ -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
@@ -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
View
@@ -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
View
@@ -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" ] ]
View
@@ -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=../..
@@ -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
View
@@ -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
View
@@ -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 \
View
@@ -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
View
@@ -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
Oops, something went wrong.

0 comments on commit 5ccc0e3

Please sign in to comment.