Commit Graph

64 Commits (082bdf545d178ac87e48f26db5b9bf34df05b675)

Author SHA1 Message Date
Leo White 971ffafffb Apply short-paths to an additional case 2020-03-05 09:44:18 +00:00
Florian Angeletti 816a5088e0 Avoid duplicated mark_loops 2019-10-17 10:03:58 +02:00
Florian Angeletti a2d15b26d1
Merge pull request #8844 from MekhrubonT/trunk+mekh+1task+change_output
Improved error messages for type mismatches
2019-08-16 20:43:02 +02:00
Mekhrubon Turaev fea21a54c4 added documentation for extension_constructor and extension_only_constructor functions in Printtyp; modified Changes file 2019-08-13 11:03:29 +01:00
Florian Angeletti 04a9c8be61 Rename printing function in Printtyp.Conflicts 2019-07-31 13:52:59 +02:00
Florian Angeletti c5dedcd32a Hint: redefinition of types in toplevel sessions 2019-07-31 13:52:20 +02:00
Mekhrubon Turaev 77b876a117 reseting context in constructors and labels methods before printing 2019-07-30 16:20:30 +01:00
Mekhrubon Turaev 407d650f6e Printing additional info about types mismatch during compilation error. 2019-07-30 09:51:02 +01:00
Florian Angeletti 3de40984ba a type for unification traces 2018-10-17 17:27:16 +02:00
Florian Angeletti 349db3d869
PR#6416 et al.: injective mapping between identifiers and printed names (#1120) 2018-06-26 22:03:45 +02:00
David Allsopp b5d1929e87 Whitespace and overlong line fixes. 2018-06-14 15:15:34 +01:00
Jacques Garrigue 3d33bd4ef5
Fix MPR#7751 (#1657)
Fix the toplevel printer, to have it properly load needed cmi's.
2018-03-27 09:25:28 +09:00
Jeremie Dimino 225d1c65b9 Prefix the compilation unit names of all modules in the stdlib
Except for the Camlinternal* modules and the new Stdlib module, all
modules in the stdlib now compile to Stdlib__<module>.

Pervasives is renamed to Stdlib and now contains a list of aliases
from the long names to the short ones, so that from inside and outside
the stdlib we can refer to the standard modules as just List or
Stdlib.List rather than Stdlib__list.

In order to avoid printing the long names in error messages and in the
toplevel, the following heuristic is added to Printtyp: given a path
Foo__bar, if Foo.Bar exists and is a direct or indirect alias to
Foo__bar, then prefer Foo.Bar.

A bootstrap step was required to replace Pervasives by Stdlib as the
module opened by default.
2018-02-12 08:29:16 +00:00
Armaël Guéneau ea00ce020f Add specific error messages in case of type propagated from a keyword 2017-12-21 11:50:54 +01:00
Damien Doligez 5401ce8473 Update headers for the new license.
Remains to be done: remove all headers in testsuite/tests.
2016-02-18 16:59:16 +01:00
Gabriel Scherer 5882fdea22 General translation of french comments
(user 'octachron')

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16474 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-10-09 20:41:38 +00:00
Damien Doligez b860d63145 whitespace cleanup, cut long lines, add some missing headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16415 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-09-11 11:58:31 +00:00
Jacques Garrigue 158480371a exhauce PR#6367: introduce Asttypes.arg_label to encode labelled arguments
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15737 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-12-22 08:45:55 +00:00
Jacques Garrigue 5adbb67a45 PR#6648: show_module should indicate its elision (add Osig_ellipsis to outcometree)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15573 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-11-10 09:09:23 +00:00
Alain Frisch e3ad818fb5 Reintegrate-merge constructors_with_record5 branch.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15556 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-10-14 15:51:30 +00:00
Alain Frisch 37f4743986 Factorize.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15459 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-10-03 15:59:37 +00:00
Jacques Garrigue b56dc4b3df PR#5584: merge open extensible types, extension-patch-4.0.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14737 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-04 23:08:45 +00:00
Alain Frisch d416414ccd Adapt printer.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/constructors_with_record2@14548 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07 12:42:49 +00:00
Damien Doligez 7844495624 Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
  svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-04 15:12:37 +00:00
Jacques Garrigue f35c7d123f Take ambiguity into account when using -short-paths option.
Namely, do not use an abbreviated form which doesn't correspond
directly to a physical definition when it might point to
several definitions, due to multiple opens.
Also be careful about not abbreviating types we are defining
in type definitions.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13635 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-04-30 09:05:26 +00:00
Jacques Garrigue 35d1dde122 Improve message for warning 40
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13612 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-04-26 13:09:24 +00:00
Jacques Garrigue 26e1ff7138 Merge short-paths into a fresh branch of trunk.
Also fix a bit unification and subtyping errors.
You now need the flag -short-path to activate short paths.



git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths-4.01@13285 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-01-29 14:21:12 +00:00
Jacques Garrigue 17fc404e78 merge patch new-error.diff by lpw25
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/record-disambiguation@13090 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-11-11 03:46:59 +00:00
Damien Doligez def31744f9 remove all $Id keywords
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13013 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-15 17:50:56 +00:00
Jacques Garrigue 35185d610b merge version/4.00 at revision 12866
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths@12869 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-21 07:10:35 +00:00
Jacques Garrigue d8f8f9ee3b keep the text width to 80 columns
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12522 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-31 08:07:31 +00:00
Fabrice Le Fessant d39d43e55f merge with branch bin-annot
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12516 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-30 14:52:37 +00:00
Jacques Garrigue 875aab099e revert wrong commit of experiments
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12260 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-23 07:17:42 +00:00
Jacques Garrigue b3e0f2e72a Fix PR#5553: do not allow a type variable to have the same name as a local type
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12257 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-23 02:20:24 +00:00
Jacques Garrigue 477b2dd743 propagate path-expansion environment everywhere
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths@12068 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-23 07:59:45 +00:00
Jacques Garrigue 21301af8c8 shorten paths in signatures and toplevel output
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths@12066 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-22 05:56:11 +00:00
Jacques Garrigue 50de05d31d first attempt: handles only unification errors
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths@12065 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-22 03:15:14 +00:00
Damien Doligez 3b507dd1aa renaming of Objective Caml to OCaml and cleanup of copyright headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11156 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-27 14:17:02 +00:00
Damien Doligez 1279ab4b76 fusion des changements 3.09.1 -> 3.09.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7382 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-04-16 23:28:22 +00:00
Xavier Leroy 762a006652 Impression des 'rec' et des 'and' dans les signatures inferees (PR#1981,2585)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6386 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-06-12 08:55:49 +00:00
Jacques Garrigue 303ca193e8 tools for debugging the type checker
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5897 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-11-07 01:07:32 +00:00
Daniel de Rauglaudre 50161b7513 Regroupement des impressions "outcometree" dans un seul module oprint.ml.
Ajout de hooks de print dans toploop.mli.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4396 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-02-13 11:09:19 +00:00
Damien Doligez 13356e7c5e detabisation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4281 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-01-20 15:12:21 +00:00
Maxence Guesdon 263de502b9 Ajout de reset_names dans l'interface
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3966 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-10-31 15:41:11 +00:00
Maxence Guesdon 6cadb65dba Ajout d'une fonction type_cheme_max utilisée pour ocamldoc. Elle est susceptible d'etre modifiée selon les besoins d'ocamldoc. Elle est identique à type_scheme à ceci près qu'elle ne fait pas de reset_names.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3818 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-10-01 14:09:52 +00:00
Daniel de Rauglaudre 91bcc9039b -
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3639 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-08-15 23:37:59 +00:00
Jacques Garrigue fbe4ff190f corrige bug PR#449
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3620 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-08-08 06:58:58 +00:00
Daniel de Rauglaudre a9de661f1a Un peu de nettoyage de code + ajout personnalisation des "phrases" toplevel
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3617 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-08-07 12:12:33 +00:00
Daniel de Rauglaudre 3ed3b7bdda Ajouté personalisation de l'affichage des items de signature dans le toplevel
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3614 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-08-06 12:28:50 +00:00
Daniel de Rauglaudre 3b5da7725e Personalisation de l'affichage des valeurs et des types dans le toplevel.
Ajouté module Outcometree et des hooks dans le toplevel: print_out_value et
print_out_type. (j'ai oublié de mettre un message log dans le 1er commit)


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3612 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2001-08-04 10:08:19 +00:00