diff options
| author | Pierre Habouzit <pierre.habouzit@m4x.org> | 2005-05-31 12:50:12 +0000 |
|---|---|---|
| committer | Pierre Habouzit <pierre.habouzit@m4x.org> | 2005-05-31 12:50:12 +0000 |
| commit | 3b1ade692156b7a82fb51daed793e173d33fc4f2 (patch) | |
| tree | 2c69c725dec2dd9d17fac876cd4226ebe5ab40af | |
| parent | 440fb13ed9d3019de9bd999370716f0ffc77c6ad (diff) | |
| download | ocaml-jocamltrunk+cduce.tar.gz | |
backport from jocamljocamltrunk+cduce
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/jocamltrunk+cduce@6897 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | bytecomp/translcore.ml | 20 | ||||
| -rw-r--r-- | ocamldoc/Makefile | 4 | ||||
| -rw-r--r-- | parsing/parser.mly | 5 |
4 files changed, 9 insertions, 23 deletions
@@ -127,7 +127,8 @@ defaultentry: # Recompile the system using the bootstrap compiler all: runtime ocamlc $(MAKE) ocamllex ocamlyacc ocamltools - $(MAKE) library otherlibraries ocaml + $(MAKE) library otherlibraries + $(MAKE) ocaml $(MAKE) $(DEBUGGER) # camlp4out ocamldoc # The compilation of ocaml will fail if the runtime has changed. diff --git a/bytecomp/translcore.ml b/bytecomp/translcore.ml index 89dc7474a6..084cb958d6 100644 --- a/bytecomp/translcore.ml +++ b/bytecomp/translcore.ml @@ -1120,26 +1120,6 @@ and create_autos some_loc cautos k = cautos k and do_transl_def some_loc autos body = -(* - let trivial_joinmatch auto = - let trivial_clause jc = match jc.jclause_desc with - (pats, e) -> - let new_pats = - List.map - (fun jp -> match jp.jpat_desc with - (chan, arg) -> - let x = Ident.create "jarg" in - let new_jpat = - { jp with - jpat_desc = (chan, { arg with pat_desc = Tpat_var x }) } - and to_match = x, arg in - (new_jpat, to_match)) - pats in - Joinmatch.Reaction - ([List.map fst new_pats], (List.map snd new_pats, e)) in - { auto with - jauto_desc = Array.map trivial_clause auto.jauto_desc } in -*) let autos1 = List.map Transljmatch.transl_jmatch autos in (* compile (and name) guarded processes *) diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile index 6d34e2c0e6..4831b9ad3e 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile @@ -193,7 +193,9 @@ STDLIB_MLIS=../stdlib/*.mli \ ../otherlibs/str/str.mli \ ../otherlibs/bigarray/bigarray.mli -all: exe lib manpages +all: exe lib + $(MAKE) manpages + exe: $(OCAMLDOC) lib: $(OCAMLDOC_LIBCMA) $(OCAMLDOC_LIBCMI) $(ODOC_TEST) diff --git a/parsing/parser.mly b/parsing/parser.mly index f9f407cf3c..bd6c4ee22f 100644 --- a/parsing/parser.mly +++ b/parsing/parser.mly @@ -1056,7 +1056,10 @@ expr: | OBJECT class_structure error { unclosed "object" 1 "end" 3 } /*> JOCAML */ - | REPLY TO joinident { mkexp(Pexp_reply(ghexp(Pexp_ident (Lident "()")), $3)) } + | REPLY TO joinident + { mkexp + (Pexp_reply + (ghexp (Pexp_construct (Lident "()", None, false)), $3)) } | REPLY expr TO joinident { mkexp(Pexp_reply($2,$4)) } | SPAWN expr { mkexp(Pexp_spawn $2) } | DEF joinautomaton_list_AND IN seq_expr { mkexp(Pexp_def($2,$4)) } |