[Pkg-ocaml-maint-commits] [ocaml-atd] 03/08: Imported Upstream version 1.1.1

[Stéphane Glondu]

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

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

commit e40ef79c88d76c00e73de0a32e04dc88a87c1f8e
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jan 29 14:19:26 2014 +0100

    Imported Upstream version 1.1.1
---
 Makefile            | 4 ++--
 atd_parser.mly      | 2 ++
 manual/atd-body.mlx | 2 +-
 test.atd            | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 68500a6..9046f02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.1.0
+VERSION = 1.1.1
 ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
 EXE=.exe
 else
@@ -180,7 +180,7 @@ div.atd-doc pre { \
 .PHONY: clean
 clean:
 	rm -f dep
-	rm atd_version.ml
+	rm -f atd_version.ml
 	rm -f $(CMI) $(CMO) $(CMX) $(O) *.annot *.cma *.cmxa *.a
 	rm -f $(patsubst %.mly,%.mli, $(MLY))
 	rm -f $(patsubst %.mly,%.ml, $(MLY))
diff --git a/atd_parser.mly b/atd_parser.mly
index c9d7893..e099d85 100644
--- a/atd_parser.mly
+++ b/atd_parser.mly
@@ -135,6 +135,8 @@ type_expr:
 cartesian_product:
 | x = annot_expr STAR l = cartesian_product   { x :: l }
 | x = annot_expr STAR y = annot_expr          { [ x; y ] }
+| x = annot_expr                              { [ x ] }
+|                                             { [] }
 ;
 
 annot_expr:
diff --git a/manual/atd-body.mlx b/manual/atd-body.mlx
index 8f34aec..21d79a8 100644
--- a/manual/atd-body.mlx
+++ b/manual/atd-body.mlx
@@ -380,7 +380,7 @@ discarding white\rval{space} and \rval{comment}s.
 
 \lval{expr-body} & ::= & \rval{args}? \rval{lident} & \\
                  &  |  & \str{(}
-                           \rval{cell} (\str{*} \rval{cell})*
+                           (\rval{cell} (\str{*} \rval{cell})*)?
                          \str{)} & \com{tuple type} \\
                  &  |  & \str{\{}
                            ((\rval{field} (\str{;} \rval{field})*) \str{;}?)?
diff --git a/test.atd b/test.atd
index 8ea585c..0f6d011 100644
--- a/test.atd
+++ b/test.atd
@@ -56,6 +56,9 @@ type tuple = (z * z * tuple option * kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
 
 type tuple2 = (int * float)
 
+type singleton = (int)
+type zero_tuple = ()
+
 type 'a i1 =
     [ inherit 'a j2
     | I1 ]

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