diff --git a/_oasis b/_oasis index bc07ccba3b0f2acab5909d840691f480fda34d68..3e5858b0727c838e01d0e984296c418fa584d1be 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lustre-v6 -Version: 1.644 +Version: 1.645 Synopsis: The Lustre V6 Verimag compiler Description: This package contains: - lus2lic: the (current) name of the compiler (and interpreter via -exec). diff --git a/lv6-ref-man/Makefile b/lv6-ref-man/Makefile index ab947824d921e234c5dd70f11f0a972b21670e77..815850811d0e54e8f4ea52203503c6df02773ea0 100644 --- a/lv6-ref-man/Makefile +++ b/lv6-ref-man/Makefile @@ -80,8 +80,9 @@ h:$(SRCS) #------------------------------ #------------------------------ $(MAIN).pdf : $(PARSER) $(SRCS) $(LUS2TEX) $(SUMMARY) $(FIGS) $(OBJPDF)/version.tex - (cd objpdf; pdflatex ../$(MAIN).tex) + (cd objpdf; pdflatex ../$(MAIN).tex ; bibtex $(MAIN) ) mv objpdf/$(MAIN).pdf . + cp $(MAIN).pdf /import/www/DIST-TOOLS/SYNCHRONE/lustre-v6/doc #------------------------------ # Special : fig 2 latex 2 pdf diff --git a/lv6-ref-man/lv6-ref-man.tex b/lv6-ref-man/lv6-ref-man.tex index aab294e67a0aea94caae4838a6dabc88f7641165..cc8383f55cebd64edc7926d6609af0149943c553 100644 --- a/lv6-ref-man/lv6-ref-man.tex +++ b/lv6-ref-man/lv6-ref-man.tex @@ -1,12 +1,11 @@ \input{preambule} \input{version} -\title{The Lustre V6 Reference Manual (draft)} -\author{ -} +\title{The Lustre V6 Reference Manual} +\author{Erwan Jahier, Pascal Raymond, Nicolas Halbwachs} \date{ -Software Version:\version +Software Version: \version{} (\versiondate) } @@ -48,7 +47,7 @@ read directly this chapter. \chapter{An Overview of the Lustre Language} % {Basic Lustre} % {Simple Lustre} -% {Lustre basics} +% {Lustre basics} % {Lustre kernel} % {Lustre} @@ -1293,9 +1292,8 @@ Here are a few examples of array declarations and definitions. One the main novelty of Lustre-V6 is to provide a (restricted) notion of higher-order programming by defining \emph{array iterators} to operate over arrays. Iterators replace the use of Lustre V4 -homomorphic extension: - -\cite{papier_tableau} +homomorphic extension +\cite{v4tuto}. @@ -2073,5 +2071,8 @@ Lustre V1, v2, v3, ..., v6 \label{potatoes} \end{center} \end{figure} +\bibliographystyle{abbrv} + +\bibliography{bib} \end{document} diff --git a/src/astV6Dump.ml b/src/astV6Dump.ml index dc0eae9c74ddfa690787e62c4a7891200cbd6ed8..c4d7dde455a5143567fb06b03b9c766be68ee405 100644 --- a/src/astV6Dump.ml +++ b/src/astV6Dump.ml @@ -1,4 +1,4 @@ -(* Time-stamp: <modified the 26/02/2015 (at 11:20) by Erwan Jahier> *) +(* Time-stamp: <modified the 25/02/2016 (at 17:29) by Erwan Jahier> *) open Lxm @@ -35,6 +35,11 @@ let rec (op2string : AstCore.by_pos_op -> string) = (***********************************************************************************) (* exported *) +and t (os: Format.formatter) (tree: AstV6.t) = + match tree with + | PRPackBody(_sl,pbody) -> packbody os pbody + | PRPack_or_models(_,_) -> assert false + and packbody (os: Format.formatter) (pkg: AstV6.packbody) = let dump_def (d: item_ident) = try ( diff --git a/src/astV6Dump.mli b/src/astV6Dump.mli index 899073048e8759bcec692085a9eb1ef5b3af03a1..1fa16ce283dea5f9ac23ae874d6e59276abac668 100644 --- a/src/astV6Dump.mli +++ b/src/astV6Dump.mli @@ -1,4 +1,4 @@ -(* Time-stamp: <modified the 26/02/2015 (at 13:45) by Erwan Jahier> *) +(* Time-stamp: <modified the 25/02/2016 (at 17:24) by Erwan Jahier> *) (** Pretty-printing the Syntax Tree *) @@ -6,6 +6,10 @@ val packinfo : Format.formatter -> AstV6.pack_info Lxm.srcflagged -> unit val packbody : Format.formatter -> AstV6.packbody -> unit +val t : Format.formatter -> AstV6.t -> unit + + + val modelinfo : Format.formatter -> AstV6.model_info Lxm.srcflagged -> unit val op2string : AstCore.by_pos_op -> string diff --git a/src/lv6version.ml b/src/lv6version.ml index 463a486fa6cb2db8d15bf0a7eb5166cef97ed838..1f9b9616f707336c0437803ce8902819b74cf620 100644 --- a/src/lv6version.ml +++ b/src/lv6version.ml @@ -1,7 +1,7 @@ (** Automatically generated from Makefile *) let tool = "lus2lic" let branch = "master" -let commit = "644" -let sha_1 = "d9b6a0a4a2d8d02374403410fc3ba29b1c40efdf" +let commit = "645" +let sha_1 = "099bb28416511cb8ed4d182290d387dc7dc8b538" let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")") let maintainer = "jahier@imag.fr"