diff options
author | Jun FURUSE / 古瀬 淳 <jun.furuse@gmail.com> | 2008-06-25 12:30:53 +0000 |
---|---|---|
committer | Jun FURUSE / 古瀬 淳 <jun.furuse@gmail.com> | 2008-06-25 12:30:53 +0000 |
commit | d665189e200aa1772cb44cf070ab307ff88a823f (patch) | |
tree | 62839ba3e900d769de15d54eb52a8124fc2f25b4 | |
parent | 981c2069db5110d5ebe0b50288de749755276f84 (diff) | |
download | ocaml-gcaml3101.tar.gz |
regexp temporary disablegcaml3101
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gcaml3101@8896 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r-- | .depend | 4 | ||||
-rwxr-xr-x | boot/ocamlc | bin | 1462951 -> 1417239 bytes | |||
-rw-r--r-- | bytecomp/translcore.ml | 2 | ||||
-rw-r--r-- | typing/typecore.ml | 3 | ||||
-rw-r--r-- | typing/typedtree.ml | 2 | ||||
-rw-r--r-- | typing/typedtree.mli | 2 |
6 files changed, 11 insertions, 2 deletions
@@ -506,9 +506,9 @@ bytecomp/translobj.cmx: typing/primitive.cmx utils/misc.cmx \ utils/clflags.cmx typing/btype.cmx parsing/asttypes.cmx \ bytecomp/translobj.cmi bytecomp/translsig.cmo: typing/types.cmi typing/typedtree.cmi \ - parsing/location.cmi typing/env.cmi + parsing/location.cmi typing/ident.cmi typing/env.cmi bytecomp/translsig.cmx: typing/types.cmx typing/typedtree.cmx \ - parsing/location.cmx typing/env.cmx + parsing/location.cmx typing/ident.cmx typing/env.cmx bytecomp/transltype.cmo: typing/types.cmi typing/typedtree.cmi \ bytecomp/translcore.cmi typing/path.cmi utils/misc.cmi typing/ident.cmi \ typing/env.cmi typing/btype.cmi bytecomp/transltype.cmi diff --git a/boot/ocamlc b/boot/ocamlc Binary files differindex d144aee9fa..66e3c741ab 100755 --- a/boot/ocamlc +++ b/boot/ocamlc diff --git a/bytecomp/translcore.ml b/bytecomp/translcore.ml index dd68fa2e33..952f3de708 100644 --- a/bytecomp/translcore.ml +++ b/bytecomp/translcore.ml @@ -880,11 +880,13 @@ and transl_exp0 e = | Texp_generic cases -> (* FIXME *) lambda_unit +(* | Texp_regexp (r, regexp, t, code) -> Lprim(Pmakeblock(0, Immutable), [ Lconst (Const_base (Const_string r)); Metacomp.transl_constant [] (Obj.repr t); transl_exp code ]) +*) and transl_list expr_list = List.map transl_exp expr_list diff --git a/typing/typecore.ml b/typing/typecore.ml index fd11c11cdf..2da613d2f7 100644 --- a/typing/typecore.ml +++ b/typing/typecore.ml @@ -1763,6 +1763,8 @@ let rec type_exp env kset sexp = assert false | Pexp_regexp r -> + assert false +(* let regexp = Regexp.from_string r in let t = Regexp.type_regexp regexp in let result_creation_code = @@ -1844,6 +1846,7 @@ let rec type_exp env kset sexp = exp_loc = sexp.pexp_loc; exp_type = ty_regexp; exp_env = env } +*) and type_argument env kset sarg ty_expected' = (* ty_expected' may be generic *) diff --git a/typing/typedtree.ml b/typing/typedtree.ml index 5aaa1be454..cc73f6d11e 100644 --- a/typing/typedtree.ml +++ b/typing/typedtree.ml @@ -98,7 +98,9 @@ and expression_desc = | Texp_rtype of type_expr | Texp_typedecl of Path.t | Texp_generic of (type_expr * expression) list +(* | Texp_regexp of string * Regexp.token list * Regexp.typ * expression +*) and meth = Tmeth_name of string diff --git a/typing/typedtree.mli b/typing/typedtree.mli index 87b9eb9bc1..7c0eb7e63b 100644 --- a/typing/typedtree.mli +++ b/typing/typedtree.mli @@ -97,7 +97,9 @@ and expression_desc = | Texp_rtype of type_expr | Texp_typedecl of Path.t | Texp_generic of (type_expr * expression) list +(* | Texp_regexp of string * Regexp.token list * Regexp.typ * expression +*) and meth = Tmeth_name of string |