This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository js-of-ocaml.

commit 5e168e22b9fac3cdaa2163a33c4c5f888a2c30b1
Merge: 9122cd1 a5a12c6
Author: Stephane Glondu <st...@glondu.net>
Date:   Thu Jun 12 09:56:30 2014 +0200

    Merge tag 'upstream/2.2'
    
    Upstream version 2.2

 .gitignore                                         |    18 +
 .ocp-indent                                        |     2 +
 CHANGES                                            |    93 +-
 Makefile                                           |    40 +-
 Makefile.conf                                      |    19 +-
 Makefile.filelist                                  |    36 +-
 Makefile.toplevel                                  |    30 +
 README                                             |    81 -
 README.md                                          |   104 +
 TODO.txt                                           |    77 +-
 VERSION                                            |     2 +-
 benchmarks/Makefile                                |   202 +
 benchmarks/lib/common.ml                           |   183 +
 benchmarks/lib/remove_comments.pl                  |     5 +
 benchmarks/report-compiletime.config               |     7 +
 benchmarks/report-js.config                        |     2 +
 benchmarks/report-nativejs.config                  |     2 +
 benchmarks/report-size-ocamljs.config              |     2 +
 benchmarks/report-size-optim.config                |     8 +
 benchmarks/report-size.config                      |    17 +
 benchmarks/report-time-ocamljs.config              |     2 +
 benchmarks/report-time-optim.config                |     3 +
 benchmarks/report-time.config                      |     6 +
 benchmarks/report.config.sample                    |     6 +
 benchmarks/report.ml                               |   480 +
 benchmarks/run.config                              |     4 +
 benchmarks/run.config.sample                       |     3 +
 benchmarks/run.ml                                  |   265 +
 benchmarks/sources/js/bdd.js                       |   280 +
 benchmarks/sources/js/bdd_lists.js                 |   287 +
 benchmarks/sources/js/binary_trees.js              |    51 +
 benchmarks/sources/js/fannkuch_redux.js            |    51 +
 benchmarks/sources/js/fft.js                       |   178 +
 benchmarks/sources/js/fib.js                       |     7 +
 benchmarks/sources/js/loop.js                      |     5 +
 benchmarks/sources/js/raytrace.js                  |   908 +
 benchmarks/sources/js/splay.js                     |   393 +
 benchmarks/sources/ml/almabench.ml                 |   324 +
 benchmarks/sources/ml/bdd.ml                       |   235 +
 benchmarks/sources/ml/binary_trees.ml              |    50 +
 benchmarks/sources/ml/boyer.ml                     |   914 +
 benchmarks/sources/ml/boyer_no_exc.ml              |   921 +
 benchmarks/sources/ml/fannkuch_redux.ml            |    67 +
 benchmarks/sources/ml/fannkuch_redux_2.ml          |    74 +
 benchmarks/sources/ml/fft.ml                       |   192 +
 benchmarks/sources/ml/fib.ml                       |    25 +
 benchmarks/sources/ml/hamming.ml                   |   107 +
 benchmarks/sources/ml/kb.ml                        |   590 +
 benchmarks/sources/ml/kb_no_exc.ml                 |   632 +
 benchmarks/sources/ml/loop.ml                      |     1 +
 benchmarks/sources/ml/nucleic.ml                   |  3241 ++
 benchmarks/sources/ml/quicksort.ml                 |    92 +
 benchmarks/sources/ml/raytrace.ml                  |   498 +
 benchmarks/sources/ml/soli.ml                      |   116 +
 benchmarks/sources/ml/splay.ml                     |   255 +
 benchmarks/sources/ml/takc.ml                      |    26 +
 benchmarks/sources/ml/taku.ml                      |    22 +
 compiler/.depend                                   |   199 +-
 compiler/Makefile                                  |    85 +-
 compiler/{deadcode.mli => annot_lexer.mli}         |     7 +-
 compiler/{driver.mli => annot_lexer.mll}           |    45 +-
 compiler/annot_parser.mly                          |    67 +
 compiler/code.ml                                   |   212 +-
 compiler/code.mli                                  |    42 +-
 compiler/compile.ml                                |   211 +
 compiler/{deadcode.mli => compiler_version.mli}    |     7 +-
 compiler/deadcode.ml                               |     8 +-
 compiler/deadcode.mli                              |     2 -
 compiler/driver.ml                                 |   372 +-
 compiler/driver.mli                                |    11 +-
 compiler/eval.ml                                   |   237 +
 compiler/{deadcode.mli => eval.mli}                |     7 +-
 compiler/flow.ml                                   |   290 +-
 compiler/flow.mli                                  |    22 +-
 compiler/freevars.ml                               |     2 +-
 compiler/generate.ml                               |  1284 +-
 compiler/generate.mli                              |     5 +-
 compiler/inline.ml                                 |    53 +-
 compiler/instr.ml                                  |    50 +-
 compiler/instr.mli                                 |     7 +-
 compiler/javascript.ml                             |   164 +-
 compiler/javascript.mli                            |   111 +-
 compiler/js_assign.ml                              |   303 +
 compiler/{deadcode.mli => js_assign.mli}           |     6 +-
 compiler/js_lexer.mli                              |    24 +
 compiler/js_lexer.mll                              |   345 +
 compiler/js_output.ml                              |  1820 +-
 compiler/js_output.mli                             |     9 +-
 compiler/js_parser.mly                             |   796 +
 compiler/js_rename.ml                              |   175 -
 compiler/js_simpl.ml                               |   181 +-
 compiler/js_simpl.mli                              |    11 +-
 compiler/js_tailcall.ml                            |   187 +
 compiler/{generate.mli => js_tailcall.mli}         |    15 +-
 compiler/js_token.ml                               |   294 +
 compiler/js_token.mli                              |    96 +
 compiler/js_traverse.ml                            |   791 +
 compiler/js_traverse.mli                           |    80 +
 compiler/linker.ml                                 |   407 +-
 compiler/linker.mli                                |    17 +-
 compiler/main.ml                                   |    99 -
 compiler/minify.ml                                 |   138 +
 compiler/option.ml                                 |   123 +
 compiler/option.mli                                |    64 +
 compiler/parse_bytecode.ml                         |  1820 +-
 compiler/parse_bytecode.mli                        |    10 +-
 compiler/parse_info.ml                             |   139 +
 compiler/{parse_bytecode.mli => parse_info.mli}    |    21 +-
 compiler/parse_js.ml                               |   170 +
 compiler/{flow.mli => parse_js.mli}                |    30 +-
 compiler/phisimpl.ml                               |     2 +-
 compiler/pretty_print.ml                           |    96 +-
 compiler/pretty_print.mli                          |    12 +-
 compiler/primitive.ml                              |    40 +-
 compiler/primitive.mli                             |    19 +-
 compiler/pseudoFs.ml                               |   123 +
 compiler/{deadcode.mli => pseudoFs.mli}            |     8 +-
 compiler/pure_fun.ml                               |     8 +-
 compiler/reserved.ml                               |   104 +
 compiler/{deadcode.mli => reserved.mli}            |     8 +-
 compiler/source_map.ml                             |   101 +
 compiler/{flow.mli => source_map.mli}              |    45 +-
 compiler/specialize.ml                             |    87 +
 compiler/{deadcode.mli => specialize.mli}          |     4 +-
 compiler/specialize_js.ml                          |   182 +
 compiler/{deadcode.mli => specialize_js.mli}       |     4 +-
 compiler/tailcall.ml                               |    21 +-
 compiler/util.ml                                   |   271 +-
 compiler/util.mli                                  |    45 +-
 compiler/varPrinter.ml                             |   141 +
 compiler/{js_output.mli => varPrinter.mli}         |    18 +-
 compiler/vlq64.ml                                  |   100 +
 compiler/{deadcode.mli => vlq64.mli}               |     7 +-
 doc/Makefile                                       |    35 +-
 doc/api-index                                      |    21 +-
 doc/api.odocl                                      |    26 +
 doc/manual-aux/boulderdash/boulderdash.js          |  2126 +-
 doc/manual-aux/boulderdash/index.html              |    18 +-
 doc/manual-aux/boulderdash/maps.txt                |     5 -
 doc/manual-aux/boulderdash/maps/level0.map         |     5 -
 doc/manual-aux/boulderdash/maps/level1.map         |     8 -
 doc/manual-aux/boulderdash/maps/level2.map         |     8 -
 doc/manual-aux/boulderdash/maps/level3.map         |     9 -
 doc/manual-aux/boulderdash/maps/level4.map         |    22 -
 doc/manual-aux/cubes/cubes.js                      |   989 +
 doc/manual-aux/{graph => cubes}/index.html         |     4 +-
 doc/manual-aux/graph/jsviewer.js                   |   747 -
 doc/manual-aux/graph/scene.json                    | 10467 -------
 doc/manual-aux/{graph => graph_viewer}/index.html  |     0
 doc/manual-aux/graph_viewer/jsviewer.js            |  1532 +
 doc/manual-aux/hyperbolic/hypertree.js             |  1718 +
 doc/manual-aux/hyperbolic/icons/commons-38.png     |   Bin 0 -> 2075 bytes
 doc/manual-aux/hyperbolic/icons/favicon.png        |   Bin 0 -> 688 bytes
 doc/manual-aux/hyperbolic/icons/globe-38.png       |   Bin 0 -> 2901 bytes
 doc/manual-aux/hyperbolic/icons/info-38.png        |   Bin 0 -> 806 bytes
 .../hyperbolic/icons/meeting-point-38.png          |   Bin 0 -> 1105 bytes
 doc/manual-aux/hyperbolic/icons/wikipedia-38.png   |   Bin 0 -> 3530 bytes
 {examples => doc/manual-aux}/hyperbolic/index.html |     2 +-
 .../manual-aux/minesweeper}/index.html             |     9 +-
 doc/manual-aux/minesweeper/minesweeper.js          |   437 +
 doc/manual-aux/minesweeper/sprites/1.png           |   Bin 0 -> 576 bytes
 doc/manual-aux/minesweeper/sprites/2.png           |   Bin 0 -> 714 bytes
 doc/manual-aux/minesweeper/sprites/3.png           |   Bin 0 -> 718 bytes
 doc/manual-aux/minesweeper/sprites/4.png           |   Bin 0 -> 650 bytes
 doc/manual-aux/minesweeper/sprites/5.png           |   Bin 0 -> 698 bytes
 doc/manual-aux/minesweeper/sprites/6.png           |   Bin 0 -> 764 bytes
 doc/manual-aux/minesweeper/sprites/7.png           |   Bin 0 -> 620 bytes
 doc/manual-aux/minesweeper/sprites/8.png           |   Bin 0 -> 802 bytes
 doc/manual-aux/minesweeper/sprites/bomb.png        |   Bin 0 -> 1090 bytes
 doc/manual-aux/minesweeper/sprites/empty.png       |   Bin 0 -> 403 bytes
 doc/manual-aux/minesweeper/sprites/flag.png        |   Bin 0 -> 735 bytes
 doc/manual-aux/minesweeper/sprites/normal.png      |   Bin 0 -> 434 bytes
 doc/manual-aux/minesweeper/sprites/scalable.svg    |   301 +
 doc/manual-aux/planet/planet.js                    |  3875 +--
 doc/manual-aux/toplevel/index.html                 |   169 +-
 doc/manual-aux/toplevel/toplevel.js                | 31224 +++++++++++++++++--
 doc/manual-aux/webgl/index.html                    |     2 +-
 doc/manual-aux/webgl/monkey.model                  |  1978 --
 doc/manual-aux/webgl/webgl.js                      |  3603 ---
 doc/manual-aux/webgl/webgldemo.js                  |  1337 +
 doc/manual-aux/wiki/index.html                     |    19 +-
 doc/manual-aux/wiki/wiki.js                        |  4771 +--
 {toplevel => doc/manual-aux/wysiwyg}/index.html    |     8 +-
 doc/manual-aux/wysiwyg/wiki.js                     |   949 +
 doc/manual-wiki/bindings.wiki                      |    28 +-
 doc/manual-wiki/boulderdash.wiki                   |     1 -
 doc/manual-wiki/library.wiki                       |    51 +-
 doc/manual-wiki/linker.wiki                        |    48 +
 doc/manual-wiki/menu.wiki                          |     8 +-
 doc/manual-wiki/ocamlbuild.wiki                    |    37 +
 doc/manual-wiki/options.wiki                       |    48 +
 doc/manual-wiki/overview.wiki                      |    58 +-
 doc/manual-wiki/wiki.wiki                          |     3 -
 examples/boulderdash/Makefile                      |     2 +-
 examples/boulderdash/boulderdash.ml                |    11 +-
 examples/cubes/cubes.ml                            |     2 +-
 examples/graph_viewer/Makefile                     |     3 +-
 examples/graph_viewer/viewer_js.ml                 |    10 +-
 examples/hyperbolic/Makefile                       |     2 +-
 examples/hyperbolic/hypertree.ml                   |    31 +-
 examples/hyperbolic/index.html                     |     2 +-
 examples/hyperbolic/index2.html                    |     4 +-
 examples/index.html                                |     5 +
 examples/planet/Makefile                           |     2 -
 examples/planet/planet.ml                          |     8 +-
 examples/webgl/Makefile                            |     2 +-
 examples/webgl/webgldemo.ml                        |    45 +-
 examples/wiki/Makefile                             |     7 +-
 examples/wiki/main.ml                              |     7 +-
 examples/wiki/test.ml                              |    30 +
 examples/wiki/wiki_syntax.ml                       |    13 +-
 examples/wiki/wikicreole.mll                       |    15 +-
 examples/wysiwyg/Makefile                          |     4 +-
 js_of_ocaml.install                                |     4 +
 lib/.depend                                        |    28 +-
 lib/META                                           |    39 +-
 lib/Makefile                                       |    55 +-
 lib/{CSS.ml => cSS.ml}                             |     0
 lib/{CSS.mli => cSS.mli}                           |     0
 lib/deriving_json/deriving_Json.ml                 |    31 +-
 lib/deriving_json/deriving_Json.mli                |    61 +-
 lib/deriving_json/deriving_Json_lexer.mli          |     2 +
 lib/deriving_json/deriving_Json_lexer.mll          |    81 +-
 lib/dom.ml                                         |    15 +-
 lib/dom.mli                                        |    14 +-
 lib/dom_html.ml                                    |   155 +-
 lib/dom_html.mli                                   |   114 +-
 lib/file.ml                                        |     3 +-
 lib/file.mli                                       |     4 +-
 lib/form.ml                                        |     5 +-
 lib/form.mli                                       |     1 +
 lib/graphics/graphics_js.ml                        |   129 +
 lib/graphics/graphics_js.mli                       |    62 +
 lib/js.ml                                          |   128 +-
 lib/js.mli                                         |   140 +-
 lib/json.mli                                       |     5 +-
 lib/lwt_js_events.ml                               |    39 +
 lib/lwt_js_events.mli                              |    45 +
 lib/regexp.ml                                      |    20 +-
 lib/regexp.mli                                     |    15 +-
 lib/syntax/pa_deriving_Json.ml                     |    21 +-
 lib/syntax/pa_deriving_Json.mli                    |    49 +
 lib/syntax/pa_js.ml                                |    97 +-
 lib/sys_js.mli                                     |    55 +
 lib/sys_js.mlp                                     |    44 +
 lib/typed_array.ml                                 |    70 +-
 lib/typed_array.mli                                |    61 +-
 lib/url.ml                                         |    15 +-
 lib/url.mli                                        |     5 +-
 lib/webGL.ml                                       |   145 +-
 lib/webGL.mli                                      |   133 +-
 lib/webSockets.ml                                  |     4 +-
 lib/webSockets.mli                                 |     4 +-
 lib/xmlHttpRequest.ml                              |    62 +-
 lib/xmlHttpRequest.mli                             |    11 +-
 ocamlbuild/.merlin                                 |     3 +
 ocamlbuild/Makefile                                |    10 +
 ocamlbuild/_tags                                   |     1 +
 ocamlbuild/ocamlbuild_js_of_ocaml.ml               |    92 +
 ocamlbuild/ocamlbuild_js_of_ocaml.mli              |    57 +
 opam/descr                                         |     1 +
 opam/opam                                          |    21 +
 opam/url                                           |     1 +
 runtime/Makefile                                   |    13 +-
 runtime/bigarray.js                                |   561 +
 runtime/bigarray.ts                                |   521 +
 runtime/classlist.js                               |   176 +
 runtime/fs.js                                      |   246 +
 runtime/gc.js                                      |    10 +
 runtime/graphics.js                                |   457 +
 runtime/ieee_754.js                                |     2 +-
 runtime/int64.js                                   |     2 +-
 runtime/internalMod.js                             |    47 +
 runtime/io.js                                      |   353 +
 runtime/jslib.js                                   |    49 +-
 runtime/jslib_js_of_ocaml.js                       |    30 +-
 runtime/json.js                                    |    11 +-
 runtime/{marshall.js => marshal.js}                |    56 +-
 runtime/md5.js                                     |    17 +-
 runtime/mlString.js                                |    51 +-
 runtime/parsing.js                                 |     8 +-
 runtime/stdlib.js                                  |   264 +-
 runtime/toplevel.js                                |    70 +
 runtime/unix.js                                    |    44 +
 tests/.gitignore                                   |     2 +
 tests/Makefile                                     |    28 +
 tests/Makefile.common                              |    17 +
 tests/common.ml                                    |    55 +
 tests/dir/closure1.ml                              |    45 +
 tests/dir/css_angle.ml                             |    54 +
 tests/dir/css_color.ml                             |    57 +
 tests/dir/css_length.ml                            |    63 +
 tests/dir/json_convert.ml                          |    84 +
 tests/dir/regexp1.ml                               |    69 +
 compiler/generate.mli => tests/dir/tailcall.ml     |    28 +-
 tests/dir/time_PDT_minus8.ml                       |    62 +
 tests/dir/url1.ml                                  |    42 +
 tests/file/unix.js                                 |     6 +
 {doc/manual-aux/graph => tests}/index.html         |     4 +-
 tools/emacs-format-js.el                           |    30 +
 tools/emacs-format-ocaml.el                        |    24 +
 tools/format-js.sh                                 |     9 +
 tools/format-ocaml.sh                              |    12 +
 tools/linguist.rb                                  |     4 +
 toplevel/.depend                                   |    11 +-
 toplevel/Makefile                                  |    58 +-
 toplevel/errors.mli                                |     5 -
 toplevel/examples.ml                               |    80 +
 toplevel/index.html                                |   170 +-
 toplevel/server.ml                                 |    52 +
 toplevel/toplevel.ml                               |   628 +-
 toplevel/toplevel_runtime.js                       |   148 -
 312 files changed, 68310 insertions(+), 30951 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/js-of-ocaml.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to