Commit Graph

12170 Commits (4f131e3803f42b955effbc1b492320a1d9b24f63)

Author SHA1 Message Date
octachron 4f131e3803 manual: alternative polymorphic variants intro 2015-12-18 21:42:55 +01:00
pierreweis b8502751d0 Details: prefer * ) to *) in literal definitions. 2015-12-17 20:06:35 +01:00
pierreweis d490e48728 Enhencing Scanf documentation. 2015-12-17 19:47:09 +01:00
pierreweis b26e33ccab Documentation: some rephrasing + adding ! annotations when appropriate. 2015-12-17 19:46:42 +01:00
Damien Doligez e008e53d6f fix typos in doc 2015-12-17 15:13:25 +01:00
alainfrisch 713447b9e4 Fix #7098 (loss of ppx context in toplevel after an exception)
When a ppx raised an exception, it was returned as an error "extension node" to
the caller, without including the "ppx context" which includes in particular ppx
cookies.  This was fine when only one ppx was used, since in that case, the
missing context was not restored.

When multiple ppx are chained, however, the second ppx sees the result of the
first one, and it it does not contains a context, an empty one is created and
returned to the caller, which has the effect of destroying the context for the
next invocation of ppxs.

The current fix is to ensure that when a "error extension node" is returned, the
context is correctly added to it.  In addition to fixing the reported bug, it also
allow ppx to update their cookies before raising an exception, which can be
useful.
2015-12-17 14:59:33 +01:00
Jeremie Dimino b95a642bdc PR#6795, PR#6996: make ocamldep interpret [%ocaml.error] 2015-12-17 10:42:47 +00:00
Gabriel Scherer b1f6abc45c PR#7096: remove wrong superscript CSS from manual/style.css 2015-12-17 09:10:27 +01:00
Gabriel Scherer d55cfb8ae5 PR#7096: fix superscripts in big_int documentation 2015-12-17 09:10:27 +01:00
Gabriel Scherer 1645e88824 PR#7096: ocamldoc uses an incorrect subscript/superscript style 2015-12-17 09:10:27 +01:00
Xavier Leroy 884c1c81bd Revert "PR#6537, PR#5333, PR#4080: fix stack overflow in the compiler when -pack'ing a module that includes a module of the same name."
This reverts commit 02b1696cc2.

Problems with -pack appear while compiling Camlp4.  Temporarily reverting this commit so that Camlp4 compiles again.  To be investigated further.

Attempting to see if this commit is the source of the problem.
2015-12-16 17:32:15 +01:00
maranget 57e031d86d PR#7031 Oups, bug in merged code: union changed into intersection. 2015-12-15 16:39:00 +01:00
Gabriel Scherer 9aaad736cc Merge pull request #344 from gasche/runtop
Makefile: a 'runtop' target to build and run the toplevel
2015-12-15 13:12:52 +01:00
Mark Shinwell f2ad502a37 Merge pull request #345 from trefis/stupéflip-vite
GPR#345: indentation in translmod
2015-12-15 10:45:15 +00:00
pierreweis 2f28c36ba9 Revert Scanf module version to old memo scheme.
Documentation for Pervasives.float_of_string was not correct.
2015-12-15 01:51:09 +01:00
pierreweis 989ba66803 Revert to old version of memo function for fscanf buffer allocation. Comments revisited and minor modifications. 2015-12-15 01:50:46 +01:00
pierreweis aaba08bdb8 Documentation of function unescaped rewritten 2015-12-15 01:48:03 +01:00
pierreweis 376d471c8f Details. 2015-12-15 01:46:04 +01:00
pierreweis c5ffb538b8 Specification for float_of_string were wrong. 2015-12-15 01:45:28 +01:00
Gabriel Scherer 673957f6f0 Merge pull request #354 from Octachron/manual_fix_escape_intfc
Manual: fix missing escape characters in subsection 19.10
2015-12-14 23:22:45 +01:00
octachron 7659a19c1d manual: fix missing escape characters in intf-c 2015-12-14 21:35:09 +01:00
Gabriel Scherer 4ecbed64f8 Merge pull request #353 from dra27/normalise-eol
Normalise line endings in Git repository
2015-12-14 19:14:51 +01:00
David Allsopp cf5daba9fc Normalised line endings in Git repository
Some files were added with CRLF line-endings rather than normalised LF
line-endings which interferes with the .gitattributes file change made
in d8b7a4f48e

Only alteration is line-endings (i.e. git diff --ignore-space-at-eol
returns no differences)
2015-12-14 17:45:28 +00:00
Alain Frisch 3168430543 Typo. 2015-12-14 17:48:43 +01:00
Alain Frisch 2b4779e73b Document inlined records. 2015-12-14 17:43:12 +01:00
alainfrisch 74ac42c856 PR#6912: more faithful doc for placement of attributes on record label declarations (they can also be put after the semi-colon). 2015-12-14 16:54:18 +01:00
Gabriel Scherer 8cb8123872 Merge pull request #347 from dra27/check-typo-binary
Handle binary files correctly in tools/check-typo
2015-12-14 16:39:05 +01:00
David Allsopp 1a797e9817 Handle binary files correctly in tools/check-typo
I'm not familiar enough with Subversion to know how properties work
there, but the translation for detecting binary files to git using
attributes is incorrect. Checking for the binary attribute with
check-attr only detects if the file has been *specified* as binary.

Script altered to use a "well-known" plumbing command to detect whether
git regards a particular file as binary. This takes into account
.gitattributes, but also works if the file has been automatically
detected as binary by git.
2015-12-14 15:29:04 +00:00
Luc Maranget f33f35e9ca Merge pull request #338 from maranget/ambiguous-var-orpat
Ambiguous var orpat
2015-12-14 16:21:43 +01:00
Gabriel Scherer aa248d3c73 comment and refactor the code: now I understand it all! 2015-12-14 15:58:12 +01:00
Luc Maranget e2309b424a PR#7031 Handle module variables in patterns. 2015-12-14 15:58:12 +01:00
Luc Maranget 1fe21ec4c3 Fix minor bug, avoid douple unpacking in the case of
(module M:S) | (module M:S) -> ... M ..
That is or pattern whose arguments contain module variables
(AST: Ppat_unpack).
2015-12-14 15:58:12 +01:00
Gabriel Scherer f53c1e960c minor: add Path.heads: find all Ident.t free in a Path.t 2015-12-14 15:58:12 +01:00
Luc Maranget c54df509c0 PR#7031, Change file + Tests + error message 2015-12-14 15:58:11 +01:00
Luc Maranget 74356166ac PR#7031 Fix ambiguous orpats + guards in the compiler. 2015-12-14 15:58:11 +01:00
Luc Maranget 6a89000b5c PR#7031 ambiguous guarded or-pattern.
- Check proper (in parmatch.ml)
  - Call check just after unused pattern check (in typecore.ml, correct ?)
  - Define and print warning (in warning.ml)
2015-12-14 15:58:02 +01:00
Gabriel Scherer 2bdc8f610a minor: add Ident.compare to call Set.Make(Ident) directly 2015-12-14 15:20:10 +01:00
Gabriel Scherer ec8203077a Merge pull request #352 from mshinwell/Lazy.from_fun
Improve comment on Lazy.from_fun
2015-12-14 14:20:19 +01:00
Mark Shinwell 1e5f546909 Improve comment on Lazy.from_fun 2015-12-14 10:15:47 +00:00
Jacques Garrigue 7bcfced414 Fix PR#7082 2015-12-14 12:49:51 +09:00
Gabriel Scherer aa27183156 Merge pull request #349 from Chris00/unix-doc
Specify in unix.mli which functions are implemented on Windows
2015-12-13 19:59:49 +01:00
Christophe Troestler 985daea528 unix.mli: Use @raise wherever fit 2015-12-13 18:56:39 +01:00
Christophe Troestler da17e59caa unix.mli: Use "on Windows" everywhere 2015-12-13 18:56:39 +01:00
Christophe Troestler 46d6e28333 Specify in unix.mli which functions are implemented on Windows
Fixes http://caml.inria.fr/mantis/view.php?id=5253
2015-12-13 18:56:32 +01:00
Xavier Leroy eef84c432a PR#7037: don't put temporary asm file names into object files.
This way, builds are reproducible.
2015-12-13 18:40:04 +01:00
Xavier Leroy 644ee022f9 zSystems port: mark stack as nonexecutable, like in other Linux ports. 2015-12-13 12:21:52 -05:00
Gabriel Scherer 1a270b6c8e Merge pull request #346 from dra27/windows-gitattributes
Update .gitattributes for improved Windows support
2015-12-12 17:37:39 +01:00
David Allsopp d8b7a4f48e Update .gitattributes for improved Windows support
Explicitly state which files should always be checked out with LF
endings (shell scripts, especially).
2015-12-12 14:38:11 +00:00
Jacques Garrigue 655f2f3108 Merge branch 'trunk' of github.com:ocaml/ocaml into trunk 2015-12-12 23:20:56 +09:00
Jacques Garrigue 482ecaa185 add more warning tests around PR#7085 2015-12-12 23:20:32 +09:00