Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ocaml/stdlib
History
Gabriel Scherer 49d3f7b9f8 PR#6418: support "@[<hov %d>" in the new format implementation (Benoît Vaugon) 
The bootstrap procedure, as for commit trunk@14973 (see there for
detailed build instructions), requires to first commit a temporary
patch:

> diff -Naur old/typing/typecore.ml new/typing/typecore.ml
> --- old/typing/typecore.ml        2014-06-11 18:16:24.851647309 +0200
> +++ new/typing/typecore.ml        2014-06-11 18:15:50.075646418 +0200
> @@ -2758,16 +2758,9 @@
>        let mk_int n = mk_cst (Const_int n)
>        and mk_string str = mk_cst (Const_string (str, None))
>        and mk_char chr = mk_cst (Const_char chr) in
> -      let mk_block_type bty = match bty with
> -        | Pp_hbox   -> mk_constr "Pp_hbox"   []
> -        | Pp_vbox   -> mk_constr "Pp_vbox"   []
> -        | Pp_hvbox  -> mk_constr "Pp_hvbox"  []
> -        | Pp_hovbox -> mk_constr "Pp_hovbox" []
> -        | Pp_box    -> mk_constr "Pp_box"    []
> -        | Pp_fits   -> mk_constr "Pp_fits"   [] in
>        let rec mk_formatting_lit fmting = match fmting with
> -        | Open_box (org, bty, idt) ->
> -          mk_constr "Open_box" [ mk_string org; mk_block_type bty; mk_int idt ]
> +        | Open_box _ ->
> +          assert false
>          | Close_box ->
>            mk_constr "Close_box" []
>          | Close_tag ->
> @@ -2950,6 +2943,19 @@
>            mk_constr "Alpha" [ mk_fmt rest ]
>          | Theta rest ->
>            mk_constr "Theta" [ mk_fmt rest ]
> +        | Formatting_lit (Open_box (org, _bty, _idt), rest) ->
> +          mk_constr "Formatting_gen" [
> +            mk_constr "Open_box" [
> +              mk_constr "Format" [
> +                mk_constr "String_literal" [
> +                  mk_string "<>";
> +                  mk_constr "End_of_format" [];
> +                ];
> +                mk_string "@[<>";
> +              ]
> +            ];
> +            mk_fmt rest;
> +          ]
>          | Formatting_lit (fmting, rest) ->
>            mk_constr "Formatting_lit" [ mk_formatting_lit fmting; mk_fmt rest ]
>          | Formatting_gen (fmting, rest) ->

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14984 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
 		2014-06-14 21:08:50 +00:00
..
.depend Fix PR#6417: sprintf broken when local module named Pervasives is in scope 2014-06-09 13:53:45 +00:00
.ignore uniform .ignore system 2011-07-20 15:37:36 +00:00
Compflags Fix PR#6417: sprintf broken when local module named Pervasives is in scope 2014-06-09 13:53:45 +00:00
Makefile fix some of the whitespace problems in the source 2014-04-12 10:17:02 +00:00
Makefile.nt PR#6358: obey DESTDIR in install targets 2014-04-07 07:06:17 +00:00
Makefile.shared Fix PR#6417: sprintf broken when local module named Pervasives is in scope 2014-06-09 13:53:45 +00:00
StdlibModules merge branch "safe-string" 2014-04-29 11:56:17 +00:00
arg.ml minor clean-ups 2014-04-18 15:29:56 +00:00
arg.mli fix wrong type name: string --> usage_msg 2014-04-12 07:18:39 +00:00
array.ml #6180: efficient creation of uninitialized float arrays. 2013-09-17 11:54:31 +00:00
array.mli #6180: efficient creation of uninitialized float arrays. 2013-09-17 11:54:31 +00:00
arrayLabels.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
arrayLabels.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
buffer.ml merge branch "safe-string" 2014-04-29 11:56:17 +00:00
buffer.mli merge branch "safe-string" 2014-04-29 11:56:17 +00:00
bytes.ml merge branch "safe-string" 2014-04-29 11:56:17 +00:00
bytes.mli merge branch "safe-string" 2014-04-29 11:56:17 +00:00
bytesLabels.ml merge branch "safe-string" 2014-04-29 11:56:17 +00:00
bytesLabels.mli merge branch "safe-string" 2014-04-29 11:56:17 +00:00
callback.ml Change the representation of exception slots: instead of being represented as 'string ref', they are now blocks 2013-10-23 14:28:31 +00:00
callback.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
camlinternalFormat.ml PR#6418: support "@[<hov %d>" in the new format implementation (Benoît Vaugon) 2014-06-14 21:08:50 +00:00
camlinternalFormat.mli PR#6418: support "@[<hov %d>" in the new format implementation (Benoît Vaugon) 2014-06-14 21:08:50 +00:00
camlinternalFormatBasics.ml PR#6418: support "@[<hov %d>" in the new format implementation (Benoît Vaugon) 2014-06-14 21:08:50 +00:00
camlinternalFormatBasics.mli PR#6418: support "@[<hov %d>" in the new format implementation (Benoît Vaugon) 2014-06-14 21:08:50 +00:00
camlinternalLazy.ml fix a few problems with whitespace and over-long lines 2013-03-09 22:38:52 +00:00
camlinternalLazy.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
camlinternalMod.ml Fix PR#6307 2014-03-10 02:54:02 +00:00
camlinternalMod.mli Fix PR#6307 2014-03-10 02:54:02 +00:00
camlinternalOO.ml #5779: Revert change on camlinternalOO. 2014-03-07 17:10:02 +00:00
camlinternalOO.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
char.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
char.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
complex.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
complex.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
digest.ml safe-string: documentation fixes and add a couple of functions in Pervasives and Digest 2014-05-01 21:54:15 +00:00
digest.mli safe-string: documentation fixes and add a couple of functions in Pervasives and Digest 2014-05-01 21:54:15 +00:00
filename.ml fix a few problems with whitespace and over-long lines 2013-03-09 22:38:52 +00:00
filename.mli fix a few problems with whitespace and over-long lines 2013-03-09 22:38:52 +00:00
format.ml PR#6418: support "@[<hov %d>" in the new format implementation (Benoît Vaugon) 2014-06-14 21:08:50 +00:00
format.mli PR#6189: items (5) (6) (7) 2014-01-22 14:05:13 +00:00
gc.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
gc.mli safe-string: documentation fixes and add a couple of functions in Pervasives and Digest 2014-05-01 21:54:15 +00:00
genlex.ml merge branch "safe-string" 2014-04-29 11:56:17 +00:00
genlex.mli Wrong quoting chase. 2013-05-29 18:03:55 +00:00
hashtbl.ml fix a few problems with whitespace and over-long lines 2013-03-09 22:38:52 +00:00
hashtbl.mli [minor] documentation typo in Hashtbl 2014-04-19 10:35:07 +00:00
header.c remove all $Id keywords 2012-10-15 17:50:56 +00:00
headernt.c fix a few problems with whitespace and over-long lines 2013-03-09 22:38:52 +00:00
int32.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
int32.mli Wrong quoting chase. 2013-05-29 18:03:55 +00:00
int64.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
int64.mli Wrong quoting chase. 2013-05-29 18:03:55 +00:00
lazy.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
lazy.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
lexing.ml merge branch "safe-string" 2014-04-29 11:56:17 +00:00
lexing.mli merge branch "safe-string" 2014-04-29 11:56:17 +00:00
list.ml #4986. Add two common operations: List.sort_uniq (more efficient that sorting then removing duplicates) and Set.of_list (more efficient than folding Set.add over the list). 2013-07-09 11:01:42 +00:00
list.mli #4986. Add two common operations: List.sort_uniq (more efficient that sorting then removing duplicates) and Set.of_list (more efficient than folding Set.add over the list). 2013-07-09 11:01:42 +00:00
listLabels.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
listLabels.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
map.ml fix a few problems with whitespace and over-long lines 2013-03-09 22:38:52 +00:00
map.mli stdlib/map: Add some usage exemple in the documentation. 2014-05-03 13:24:29 +00:00
marshal.ml merge branch "safe-string" 2014-04-29 11:56:17 +00:00
marshal.mli PR#5584: merge open extensible types, extension-patch-4.0.2 2014-05-04 23:08:45 +00:00
moreLabels.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
moreLabels.mli #4986. Add two common operations: List.sort_uniq (more efficient that sorting then removing duplicates) and Set.of_list (more efficient than folding Set.add over the list). 2013-07-09 11:01:42 +00:00
nativeint.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
nativeint.mli fix a few problems with whitespace and over-long lines 2013-03-09 22:38:52 +00:00
obj.ml PR#5584: merge open extensible types, extension-patch-4.0.2 2014-05-04 23:08:45 +00:00
obj.mli PR#5584: merge open extensible types, extension-patch-4.0.2 2014-05-04 23:08:45 +00:00
oo.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
oo.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
parsing.ml fix a few problems with whitespace and over-long lines 2013-03-09 22:38:52 +00:00
parsing.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
pervasives.ml Fix PR#6417: sprintf broken when local module named Pervasives is in scope 2014-06-09 13:53:45 +00:00
pervasives.mli Fix PR#6417: sprintf broken when local module named Pervasives is in scope 2014-06-09 13:53:45 +00:00
printexc.ml Reformulation of the user-facing slot-access API 2014-05-10 19:20:00 +00:00
printexc.mli Reformulation of the user-facing slot-access API 2014-05-10 19:20:00 +00:00
printf.ml Use a nominal datatype for CamlinternalFormat.format6 2014-05-14 15:07:13 +00:00
printf.mli second part of Benoît Vaugon's format+gadts patch 2014-05-12 15:37:37 +00:00
queue.ml PR#4079: Queue.copy is now tail-recursive (patch from "Cristophe" on the bugtracker) 2013-06-16 16:19:30 +00:00
queue.mli remove broken link in doc comment 2014-04-12 07:20:13 +00:00
random.ml #5977: ensure that bootstrapping on 64-bit does not produce 64-bit constants that cannot be read on 32-bit platforms. 2013-04-09 12:17:05 +00:00
random.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
scanf.ml PR#6418: support "@[<hov %d>" in the new format implementation (Benoît Vaugon) 2014-06-14 21:08:50 +00:00
scanf.mli second part of Benoît Vaugon's format+gadts patch 2014-05-12 15:37:37 +00:00
set.ml fix some of the whitespace problems in the source 2014-04-12 10:17:02 +00:00
set.mli stdlib/map: Add some usage exemple in the documentation. 2014-05-03 13:24:29 +00:00
sharpbang #!space, pas #! 1998-04-27 15:14:31 +00:00
sort.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
sort.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
stack.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
stack.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00
stdLabels.ml merge branch "safe-string" 2014-04-29 11:56:17 +00:00
stdLabels.mli safe-string: documentation fixes and add a couple of functions in Pervasives and Digest 2014-05-01 21:54:15 +00:00
std_exit.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
stdlib.mllib remove all $Id keywords 2012-10-15 17:50:56 +00:00
stream.ml merge branch "safe-string" 2014-04-29 11:56:17 +00:00
stream.mli PR#5644: a dumbed-down fix to fix the observable effect (Stream.of_string) with no change to the underlying code (to avoid regressions) 2013-07-21 20:03:52 +00:00
string.ml merge branch "safe-string" 2014-04-29 11:56:17 +00:00
string.mli safe-string: documentation fixes and add a couple of functions in Pervasives and Digest 2014-05-01 21:54:15 +00:00
stringLabels.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
stringLabels.mli merge branch "safe-string" 2014-04-29 11:56:17 +00:00
sys.mli merge branch "safe-string" 2014-04-29 11:56:17 +00:00
sys.mlp PR#5774: Add bswap primitives for amd64 2012-11-29 09:55:00 +00:00
weak.ml remove all $Id keywords 2012-10-15 17:50:56 +00:00
weak.mli remove all $Id keywords 2012-10-15 17:50:56 +00:00