summaryrefslogtreecommitdiff
path: root/parsing/parsetree.mli
diff options
context:
space:
mode:
authorAlain Frisch <alain@frisch.fr>2014-04-28 08:04:43 +0000
committerAlain Frisch <alain@frisch.fr>2014-04-28 08:04:43 +0000
commitd2de0d7b1855f4c9ec2fe5f109004afb567ef14d (patch)
tree297d9ce254c876b1d46d9b86770d8f39ed9d38b0 /parsing/parsetree.mli
parentbf8d983a51e7734a044a0580f29b7d65f47a6b67 (diff)
downloadocaml-d2de0d7b1855f4c9ec2fe5f109004afb567ef14d.tar.gz
Revert 14616, 14617. Go back to the original syntax for toplevel directives, only allowing capitalized identifiers in addition to lowercase ones. Split #show into variants #show_val, #show_type, etc, and implement a generic #show which combines all the results.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14697 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'parsing/parsetree.mli')
-rw-r--r--parsing/parsetree.mli4
1 files changed, 2 insertions, 2 deletions
diff --git a/parsing/parsetree.mli b/parsing/parsetree.mli
index 5747f51eb3..ce938dd897 100644
--- a/parsing/parsetree.mli
+++ b/parsing/parsetree.mli
@@ -763,12 +763,12 @@ and module_binding =
type toplevel_phrase =
| Ptop_def of structure
- | Ptop_dir of string * directive_argument list
+ | Ptop_dir of string * directive_argument
(* #use, #load ... *)
and directive_argument =
+ | Pdir_none
| Pdir_string of string
| Pdir_int of int
| Pdir_ident of Longident.t
| Pdir_bool of bool
- | Pdir_keyword of string