diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2002-01-21 14:36:15 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2002-01-21 14:36:15 +0000 |
| commit | f30db5ed9b22a49e3d1acfa05608e30d807ff04f (patch) | |
| tree | dae47f1ecd1db4508ba5c3e475665408e24c9c27 /otherlibs | |
| parent | b417394600f677b254726f6f6823e5496c090276 (diff) | |
re-changement de warn-error; reparation des backslashes illegaux
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4296 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs')
| -rw-r--r-- | otherlibs/labltk/browser/fileselect.ml | 14 | ||||
| -rw-r--r-- | otherlibs/labltk/jpf/fileselect.ml | 10 | ||||
| -rw-r--r-- | otherlibs/labltk/support/Makefile.common | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/otherlibs/labltk/browser/fileselect.ml b/otherlibs/labltk/browser/fileselect.ml index be6896dbf..dd4ff44df 100644 --- a/otherlibs/labltk/browser/fileselect.ml +++ b/otherlibs/labltk/browser/fileselect.ml @@ -40,16 +40,16 @@ let parse_filter s = (* replace // by / *) let s = global_replace ~!"/+" "/" s in (* replace /./ by / *) - let s = global_replace ~!"/\./" "/" s in + let s = global_replace ~!"/\\./" "/" s in (* replace hoge/../ by "" *) - let s = global_replace ~!"\([^/]\|[^\./][^/]\|[^/][^\./]\|[^/][^/]+\)/\.\./" - "" s in + let s = global_replace + ~!"\\([^/]\\|[^\\./][^/]\\|[^/][^\\./]\\|[^/][^/]+\\)/\\.\\./" "" s in (* replace hoge/..$ by *) - let s = global_replace ~!"\([^/]\|[^\./][^/]\|[^/][^\./]\|[^/][^/]+\)/\.\.$" - "" s in + let s = global_replace + ~!"\\([^/]\\|[^\\./][^/]\\|[^/][^\\./]\\|[^/][^/]+\\)/\\.\\.$" "" s in (* replace ^/hoge/../ by / *) - let s = global_replace ~!"^\(/\.\.\)+/" "/" s in - if string_match ~!"^\([^\*?[]*[/:]\)\(.*\)" s 0 then + let s = global_replace ~!"^\\(/\\.\\.\\)+/" "/" s in + if string_match ~!"^\\([^\\*?[]*[/:]\\)\\(.*\\)" s 0 then let dirs = matched_group 1 s and ptrn = matched_group 2 s in diff --git a/otherlibs/labltk/jpf/fileselect.ml b/otherlibs/labltk/jpf/fileselect.ml index 5deb023bf..28d2349ea 100644 --- a/otherlibs/labltk/jpf/fileselect.ml +++ b/otherlibs/labltk/jpf/fileselect.ml @@ -70,25 +70,25 @@ let subshell cmd = (***************************************************************** Path name *) (* find directory name which doesn't contain "?*[" *) -let dirget = regexp "^\([^\*?[]*/\)\(.*\)" +let dirget = regexp "^\\([^\\*?[]*/\\)\\(.*\\)" let parse_filter src = (* replace // by / *) let s = global_replace (regexp "/+") "/" src in (* replace /./ by / *) - let s = global_replace (regexp "/\./") "/" s in + let s = global_replace (regexp "/\\./") "/" s in (* replace ????/../ by "" *) let s = global_replace - (regexp "\([^/]\|[^\./][^/]\|[^/][^\./]\|[^/][^/]+\)/\.\./") + (regexp "\\([^/]\\|[^\\./][^/]\\|[^/][^\\./]\\|[^/][^/]+\\)/\\.\\./") "" s in (* replace ????/..$ by "" *) let s = global_replace - (regexp "\([^/]\|[^\./][^/]\|[^/][^\./]\|[^/][^/]+\)/\.\.$") + (regexp "\\([^/]\\|[^\\./][^/]\\|[^/][^\\./]\\|[^/][^/]+\\)/\\.\\.$") "" s in (* replace ^/../../ by / *) - let s = global_replace (regexp "^\(/\.\.\)+/") "/" s in + let s = global_replace (regexp "^\\(/\\.\\.\\)+/") "/" s in if string_match dirget s 0 then let dirs = matched_group 1 s and ptrn = matched_group 2 s diff --git a/otherlibs/labltk/support/Makefile.common b/otherlibs/labltk/support/Makefile.common index c463b64e9..f50adf886 100644 --- a/otherlibs/labltk/support/Makefile.common +++ b/otherlibs/labltk/support/Makefile.common @@ -12,7 +12,7 @@ LABLTKDIR=$(LIBDIR)/labltk CAMLRUN=$(TOPDIR)/boot/ocamlrun LABLC=$(CAMLRUN) $(TOPDIR)/ocamlc -I $(TOPDIR)/stdlib -LABLCOMP=$(LABLC) -c -warn-error Ax +LABLCOMP=$(LABLC) -c -warn-error A LABLYACC=$(TOPDIR)/boot/ocamlyacc -v LABLLEX=$(CAMLRUN) $(TOPDIR)/boot/ocamllex LABLLIBR=$(LABLC) -a |