Declaration de string_length dans <mlvalues.h>. Suppression de <str.h> ainsi rendu inutile.

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

18 files changed, 19 insertions, 56 deletions

diff --git a/byterun/.depend b/byterun/.depend
index 085a3312f..6715f1bfe 100644
--- a/byterun/.depend
+++ b/byterun/.depend
@@ -10,13 +10,13 @@ compact.o: compact.c config.h ../config/m.h ../config/s.h freelist.h \
  roots.h weak.h
 compare.o: compare.c fail.h misc.h config.h ../config/m.h \
  ../config/s.h mlvalues.h memory.h gc.h major_gc.h freelist.h \
- minor_gc.h str.h
+ minor_gc.h
 debugger.o: debugger.c config.h ../config/m.h ../config/s.h debugger.h \
  misc.h mlvalues.h fail.h fix_code.h instruct.h intext.h io.h stacks.h \
  memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
 extern.o: extern.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h fail.h gc.h intext.h io.h fix_code.h memory.h major_gc.h \
- freelist.h minor_gc.h reverse.h str.h
+ freelist.h minor_gc.h reverse.h
 fail.o: fail.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h fail.h io.h gc.h memory.h major_gc.h freelist.h minor_gc.h \
  signals.h stacks.h
@@ -32,7 +32,7 @@ gc_ctrl.o: gc_ctrl.c alloc.h misc.h config.h ../config/m.h \
  ../config/s.h mlvalues.h compact.h gc.h gc_ctrl.h major_gc.h \
  freelist.h minor_gc.h stacks.h memory.h
 hash.o: hash.c mlvalues.h config.h ../config/m.h ../config/s.h misc.h \
- memory.h gc.h major_gc.h freelist.h minor_gc.h str.h
+ memory.h gc.h major_gc.h freelist.h minor_gc.h
 instrtrace.o: instrtrace.c
 intern.o: intern.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h fail.h gc.h intext.h io.h fix_code.h memory.h major_gc.h \
@@ -40,16 +40,14 @@ intern.o: intern.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
 interp.o: interp.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h callback.h debugger.h fail.h fix_code.h instrtrace.h \
  instruct.h interp.h major_gc.h freelist.h memory.h gc.h minor_gc.h \
- prims.h signals.h stacks.h str.h jumptbl.h
+ prims.h signals.h stacks.h jumptbl.h
 ints.o: ints.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
- mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
- str.h
+ mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h minor_gc.h
 io.o: io.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
  mlvalues.h fail.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
  signals.h sys.h
 lexing.o: lexing.c fail.h misc.h config.h ../config/m.h ../config/s.h \
- mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
- str.h
+ mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h
 macintosh.o: macintosh.c
 main.o: main.c misc.h config.h ../config/m.h ../config/s.h mlvalues.h \
  sys.h
@@ -93,7 +91,7 @@ str.o: str.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h fail.h
 sys.o: sys.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
  mlvalues.h debugger.h fail.h instruct.h signals.h stacks.h memory.h \
- gc.h major_gc.h freelist.h minor_gc.h str.h sys.h
+ gc.h major_gc.h freelist.h minor_gc.h sys.h
 terminfo.o: terminfo.c config.h ../config/m.h ../config/s.h alloc.h \
  misc.h mlvalues.h fail.h io.h
 weak.o: weak.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
@@ -111,13 +109,13 @@ compact.d.o: compact.c config.h ../config/m.h ../config/s.h freelist.h \
  roots.h weak.h
 compare.d.o: compare.c fail.h misc.h config.h ../config/m.h \
  ../config/s.h mlvalues.h memory.h gc.h major_gc.h freelist.h \
- minor_gc.h str.h
+ minor_gc.h
 debugger.d.o: debugger.c config.h ../config/m.h ../config/s.h debugger.h \
  misc.h mlvalues.h fail.h fix_code.h instruct.h intext.h io.h stacks.h \
  memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
 extern.d.o: extern.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h fail.h gc.h intext.h io.h fix_code.h memory.h major_gc.h \
- freelist.h minor_gc.h reverse.h str.h
+ freelist.h minor_gc.h reverse.h
 fail.d.o: fail.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h fail.h io.h gc.h memory.h major_gc.h freelist.h minor_gc.h \
  signals.h stacks.h
@@ -133,7 +131,7 @@ gc_ctrl.d.o: gc_ctrl.c alloc.h misc.h config.h ../config/m.h \
  ../config/s.h mlvalues.h compact.h gc.h gc_ctrl.h major_gc.h \
  freelist.h minor_gc.h stacks.h memory.h
 hash.d.o: hash.c mlvalues.h config.h ../config/m.h ../config/s.h misc.h \
- memory.h gc.h major_gc.h freelist.h minor_gc.h str.h
+ memory.h gc.h major_gc.h freelist.h minor_gc.h
 instrtrace.d.o: instrtrace.c instruct.h misc.h config.h ../config/m.h \
  ../config/s.h mlvalues.h opnames.h
 intern.d.o: intern.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
@@ -142,16 +140,14 @@ intern.d.o: intern.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
 interp.d.o: interp.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h callback.h debugger.h fail.h fix_code.h instrtrace.h \
  instruct.h interp.h major_gc.h freelist.h memory.h gc.h minor_gc.h \
- prims.h signals.h stacks.h str.h
+ prims.h signals.h stacks.h
 ints.d.o: ints.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
- mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
- str.h
+ mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h minor_gc.h
 io.d.o: io.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
  mlvalues.h fail.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
  signals.h sys.h
 lexing.d.o: lexing.c fail.h misc.h config.h ../config/m.h ../config/s.h \
- mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
- str.h
+ mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h
 macintosh.d.o: macintosh.c
 main.d.o: main.c misc.h config.h ../config/m.h ../config/s.h mlvalues.h \
  sys.h
@@ -195,7 +191,7 @@ str.d.o: str.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h fail.h
 sys.d.o: sys.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
  mlvalues.h debugger.h fail.h instruct.h signals.h stacks.h memory.h \
- gc.h major_gc.h freelist.h minor_gc.h str.h sys.h
+ gc.h major_gc.h freelist.h minor_gc.h sys.h
 terminfo.d.o: terminfo.c config.h ../config/m.h ../config/s.h alloc.h \
  misc.h mlvalues.h fail.h io.h
 weak.d.o: weak.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
diff --git a/byterun/compare.c b/byterun/compare.c
index 98ffd7ba0..02a24d696 100644
--- a/byterun/compare.c
+++ b/byterun/compare.c
@@ -15,7 +15,6 @@
 #include "memory.h"
 #include "misc.h"
 #include "mlvalues.h"
-#include "str.h"
 
 /* Structural comparison on trees.
    May loop on cyclic structures. */
diff --git a/byterun/extern.c b/byterun/extern.c
index 2e0936859..79b6f7092 100644
--- a/byterun/extern.c
+++ b/byterun/extern.c
@@ -23,7 +23,6 @@
 #include "misc.h"
 #include "mlvalues.h"
 #include "reverse.h"
-#include "str.h"
 
 /* To keep track of sharing in externed objects */
 
diff --git a/byterun/hash.c b/byterun/hash.c
index 91bbd1e8c..79567cd75 100644
--- a/byterun/hash.c
+++ b/byterun/hash.c
@@ -15,7 +15,6 @@
 
 #include "mlvalues.h"
 #include "memory.h"
-#include "str.h"
 
 static unsigned long hash_accu;
 static long hash_univ_limit, hash_univ_count;
diff --git a/byterun/interp.c b/byterun/interp.c
index a4c146090..499d5931e 100644
--- a/byterun/interp.c
+++ b/byterun/interp.c
@@ -28,7 +28,6 @@
 #include "prims.h"
 #include "signals.h"
 #include "stacks.h"
-#include "str.h"
 
 #if macintosh
 #include "rotatecursor.h"
diff --git a/byterun/ints.c b/byterun/ints.c
index c05d14b4c..0a1690811 100644
--- a/byterun/ints.c
+++ b/byterun/ints.c
@@ -18,7 +18,6 @@
 #include "memory.h"
 #include "misc.h"
 #include "mlvalues.h"
-#include "str.h"
 
 value int_of_string(value s)          /* ML */
 {
diff --git a/byterun/lexing.c b/byterun/lexing.c
index 9105bce60..6a7dc2bfe 100644
--- a/byterun/lexing.c
+++ b/byterun/lexing.c
@@ -16,7 +16,6 @@
 #include "fail.h"
 #include "mlvalues.h"
 #include "stacks.h"
-#include "str.h"
 
 struct lexer_buffer {
   value refill_buff;
diff --git a/byterun/mlvalues.h b/byterun/mlvalues.h
index b976307ae..e52da1e92 100644
--- a/byterun/mlvalues.h
+++ b/byterun/mlvalues.h
@@ -202,6 +202,7 @@ typedef opcode_t * code_t;
 /* Strings. */
 #define String_tag 252
 #define String_val(x) ((char *) Bp_val(x))
+mlsize_t string_length (value);
 
 /* Floating-point numbers. */
 #define Double_tag 253
diff --git a/byterun/startup.c b/byterun/startup.c
index 852c845ac..b866c04a2 100644
--- a/byterun/startup.c
+++ b/byterun/startup.c
@@ -178,6 +178,10 @@ static int parse_command_line(char **argv)
     case 't':
       trace_flag = 1;
       break;
+    case 'P':
+      { extern int parser_trace;
+        parser_trace = 1;
+        break; }
 #endif
     case 'v':
       verbose_init = 1+4+8+16+32;
diff --git a/byterun/str.h b/byterun/str.h
deleted file mode 100644
index a3517e9b6..000000000
--- a/byterun/str.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/***********************************************************************/
-/*                                                                     */
-/*                           Objective Caml                            */
-/*                                                                     */
-/*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         */
-/*                                                                     */
-/*  Copyright 1996 Institut National de Recherche en Informatique et   */
-/*  Automatique.  Distributed only by permission.                      */
-/*                                                                     */
-/***********************************************************************/
-
-/* $Id$ */
-
-#ifndef _str_
-#define _str_
-
-
-#include "misc.h"
-#include "mlvalues.h"
-
-mlsize_t string_length (value);
-
-
-#endif /* _str_ */
diff --git a/byterun/sys.c b/byterun/sys.c
index 812252551..7dc772207 100644
--- a/byterun/sys.c
+++ b/byterun/sys.c
@@ -38,7 +38,6 @@
 #include "mlvalues.h"
 #include "signals.h"
 #include "stacks.h"
-#include "str.h"
 #include "sys.h"
 #ifdef HAS_UI
 #include "ui.h"
diff --git a/maccaml/graph.c b/maccaml/graph.c
index 58290b2ce..73f119646 100644
--- a/maccaml/graph.c
+++ b/maccaml/graph.c
@@ -17,7 +17,6 @@
 #include "memory.h"
 #include "mlvalues.h"
 #include "signals.h"
-#include "str.h"
 
 #include "main.h"      /* Include main.h last or Assert will not work. */
 
diff --git a/otherlibs/db/dbstubs.c b/otherlibs/db/dbstubs.c
index ebe378df3..dd5c86c5c 100644
--- a/otherlibs/db/dbstubs.c
+++ b/otherlibs/db/dbstubs.c
@@ -15,7 +15,6 @@
 #include <alloc.h>
 #include <memory.h>
 #include <fail.h>
-#include <str.h>
 #include <callback.h>
 
 
diff --git a/otherlibs/dbm/cldbm.c b/otherlibs/dbm/cldbm.c
index e078fd736..0e426947e 100644
--- a/otherlibs/dbm/cldbm.c
+++ b/otherlibs/dbm/cldbm.c
@@ -18,7 +18,6 @@
 #include <alloc.h>
 #include <memory.h>
 #include <fail.h>
-#include <str.h>
 #include <callback.h>
 
 /* Quite close to sys_open_flags, but we need RDWR */
diff --git a/otherlibs/graph/text.c b/otherlibs/graph/text.c
index 3a81b70d1..1efd60629 100644
--- a/otherlibs/graph/text.c
+++ b/otherlibs/graph/text.c
@@ -13,7 +13,6 @@
 
 #include "libgraph.h"
 #include <alloc.h>
-#include <str.h>
 
 XFontStruct * grfont = NULL;
 
diff --git a/otherlibs/str/strstubs.c b/otherlibs/str/strstubs.c
index 56a205a78..caa03e423 100644
--- a/otherlibs/str/strstubs.c
+++ b/otherlibs/str/strstubs.c
@@ -9,7 +9,6 @@
 #include <alloc.h>
 #include <fail.h>
 #include <memory.h>
-#include <str.h>
 
 struct regexp_struct {
   final_fun finalization;
diff --git a/otherlibs/unix/putenv.c b/otherlibs/unix/putenv.c
index 3bd7b4519..5b2bcd2a7 100644
--- a/otherlibs/unix/putenv.c
+++ b/otherlibs/unix/putenv.c
@@ -16,7 +16,6 @@
 
 #include <memory.h>
 #include <mlvalues.h>
-#include <str.h>
 
 #include "unixsupport.h"
 
diff --git a/otherlibs/unix/socketaddr.c b/otherlibs/unix/socketaddr.c
index ebadf6340..8c53ca0ca 100644
--- a/otherlibs/unix/socketaddr.c
+++ b/otherlibs/unix/socketaddr.c
@@ -15,7 +15,6 @@
 #include <mlvalues.h>
 #include <alloc.h>
 #include <memory.h>
-#include <str.h>
 #include <errno.h>
 #include "unixsupport.h"